CLI: Extend list of ignored ESLint rules for pbjs, fixes #1085

dcodeIO · dcodeIO · commit 2c5ef95818a3 · 2018-07-17T22:28:03.000+02:00
diff --git a/bench/data/static_pbjs.js b/bench/data/static_pbjs.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/cli/pbjs.js b/cli/pbjs.js
@@ -20,7 +20,17 @@ var targets  = util.requireAll("./targets");
  * @returns {number|undefined} Exit code, if known
  */
 exports.main = function main(args, callback) {
-    var lintDefault = "eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins";
+    var lintDefault = "eslint-disable " + [
+        "block-scoped-var",
+        "id-length",
+        "no-control-regex",
+        "no-magic-numbers",
+        "no-prototype-builtins",
+        "no-redeclare",
+        "no-shadow",
+        "no-var",
+        "sort-vars"
+    ].join(", ");
     var argv = minimist(args, {
         alias: {
             target: "t",
diff --git a/cli/pbts.js b/cli/pbts.js
@@ -139,8 +139,7 @@ exports.main = function(args, callback) {
         });
 
         function getImportName(importItem) {
-            var result = path.basename(importItem, ".js")
-            return result.replace(/([-_~.+]\w)/g, match => {
+            return path.basename(importItem, ".js").replace(/([-_~.+]\w)/g, function(match) {
                 return match[1].toUpperCase();
             });
         }
diff --git a/dist/light/protobuf.js b/dist/light/protobuf.js
diff --git a/dist/light/protobuf.min.js b/dist/light/protobuf.min.js
diff --git a/dist/minimal/protobuf.js b/dist/minimal/protobuf.js
diff --git a/dist/minimal/protobuf.min.js b/dist/minimal/protobuf.min.js
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/ext/descriptor/index.d.ts b/ext/descriptor/index.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export const FileDescriptorSet: $protobuf.Type;
 
 export const FileDescriptorProto: $protobuf.Type;
diff --git a/index.d.ts b/index.d.ts
@@ -507,7 +507,7 @@ export interface IExtensionMapField extends IMapField {
 }
 
 /** Abstract runtime message. */
-export class Message<T extends object = object> {
+export class Message<T extends object> {
 
     /**
      * Constructs a new message instance.
diff --git a/tests/data/comments.d.ts b/tests/data/comments.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export interface ITest1 {
     field1?: (string|null);
     field2?: (number|null);
diff --git a/tests/data/comments.js b/tests/data/comments.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/convert.d.ts b/tests/data/convert.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export interface IMessage {
     stringVal?: (string|null);
     stringRepeated?: (string[]|null);
diff --git a/tests/data/convert.js b/tests/data/convert.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/mapbox/vector_tile.d.ts b/tests/data/mapbox/vector_tile.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../../..";
-
 export namespace vector_tile {
 
     interface ITile {
diff --git a/tests/data/mapbox/vector_tile.js b/tests/data/mapbox/vector_tile.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../../minimal");
diff --git a/tests/data/package.d.ts b/tests/data/package.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export interface IPackage {
     name?: (string|null);
     version?: (string|null);
diff --git a/tests/data/package.js b/tests/data/package.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/rpc-es6.d.ts b/tests/data/rpc-es6.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export class MyService extends $protobuf.rpc.Service {
     constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean);
     public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): MyService;
diff --git a/tests/data/rpc-es6.js b/tests/data/rpc-es6.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 import * as $protobuf from "../../minimal";
 
 // Common aliases
diff --git a/tests/data/rpc-reserved.d.ts b/tests/data/rpc-reserved.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export class MyService extends $protobuf.rpc.Service {
     constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean);
     public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): MyService;
diff --git a/tests/data/rpc-reserved.js b/tests/data/rpc-reserved.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/rpc.d.ts b/tests/data/rpc.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export class MyService extends $protobuf.rpc.Service {
     constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean);
     public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): MyService;
diff --git a/tests/data/rpc.js b/tests/data/rpc.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/test.d.ts b/tests/data/test.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export namespace jspb {
 
     namespace test {
diff --git a/tests/data/test.js b/tests/data/test.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins/`
	`1`	`+/eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars/`
`2`	`2`	`"use strict";`
`3`	`3`
`4`	`4`	`var $protobuf = require("../../minimal");`
Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,7 @@ exports.main = function(args, callback) {`
`139`	`139`	`});`
`140`	`140`
`141`	`141`	`function getImportName(importItem) {`
`142`		`- var result = path.basename(importItem, ".js")`
`143`		`- return result.replace(/([-_~.+]\w)/g, match => {`
	`142`	`+ return path.basename(importItem, ".js").replace(/([-_~.+]\w)/g, function(match) {`
`144`	`143`	`return match[1].toUpperCase();`
`145`	`144`	`});`
`146`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as $protobuf from "../..";`
`2`		`-`
`3`	`2`	`export const FileDescriptorSet: $protobuf.Type;`
`4`	`3`
`5`	`4`	`export const FileDescriptorProto: $protobuf.Type;`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ export interface IExtensionMapField extends IMapField {`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`/** Abstract runtime message. */`
`510`		`-export class Message<T extends object = object> {`
	`510`	`+export class Message<T extends object> {`
`511`	`511`
`512`	`512`	`/**`
`513`	`513`	`* Constructs a new message instance.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as $protobuf from "../..";`
`2`		`-`
`3`	`2`	`export interface ITest1 {`
`4`	`3`	`field1?: (string\|null);`
`5`	`4`	`field2?: (number\|null);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as $protobuf from "../..";`
`2`		`-`
`3`	`2`	`export interface IMessage {`
`4`	`3`	`stringVal?: (string\|null);`
`5`	`4`	`stringRepeated?: (string[]\|null);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as $protobuf from "../../..";`
`2`		`-`
`3`	`2`	`export namespace vector_tile {`
`4`	`3`
`5`	`4`	`interface ITile {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as $protobuf from "../..";`
`2`		`-`
`3`	`2`	`export interface IPackage {`
`4`	`3`	`name?: (string\|null);`
`5`	`4`	`version?: (string\|null);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as $protobuf from "../..";`
`2`		`-`
`3`	`2`	`export class MyService extends $protobuf.rpc.Service {`
`4`	`3`	`constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean);`
`5`	`4`	`public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): MyService;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as $protobuf from "../..";`
`2`		`-`
`3`	`2`	`export namespace jspb {`
`4`	`3`
`5`	`4`	`namespace test {`