@definitelytyped/eslint-plugin 0.0.192 → 0.0.194

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @definitelytyped/eslint-plugin
 
+## 0.0.194
+
+### Patch Changes
+
+- 59076828: Remove void-return, switch on no-invalid-void-type
+
+## 0.0.193
+
+### Patch Changes
+
+- 0a3c2d5b: Fully type eslint plugin export and add metadata
+- 7af66e7d: Handle `import = require()` in lint rules
+
 ## 0.0.192
 
 ### Patch Changes

package/dist/configs/all.js

@@ -174,6 +174,10 @@ exports.all = {
                 "@typescript-eslint/explicit-member-accessibility": ["error", { accessibility: "no-public" }],
                 "@typescript-eslint/no-misused-new": "error",
                 "@typescript-eslint/consistent-type-definitions": "error",
+                "@typescript-eslint/no-invalid-void-type": [
+                    "error",
+                    { allowAsThisParameter: true, allowInGenericTypeArguments: true },
+                ],
             },
         },
     ],

package/dist/configs/all.js.map

@@ -1 +1 @@
-{"version":3,"file":"all.js","sourceRoot":"","sources":["../../src/configs/all.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"all.js","sourceRoot":"","sources":["../../src/configs/all.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,11 @@
-export { rules } from "./rules/index";
-export declare const configs: {
-    all: import("eslint").Linter.BaseConfig<import("eslint").Linter.RulesRecord, import("eslint").Linter.RulesRecord>;
+declare const plugin: {
+    meta: {
+        name: any;
+        version: any;
+    };
+    configs: {
+        all: import("eslint").Linter.BaseConfig<import("eslint").Linter.RulesRecord, import("eslint").Linter.RulesRecord>;
+    };
+    rules: any;
 };
+export = plugin;

package/dist/index.js

@@ -1,10 +1,16 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configs = exports.rules = void 0;
 const all_1 = require("./configs/all");
-var index_1 = require("./rules/index");
-Object.defineProperty(exports, "rules", { enumerable: true, get: function () { return index_1.rules; } });
-exports.configs = {
-    all: all_1.all,
+const index_1 = require("./rules/index");
+const packageJson = require("../package.json");
+const plugin = {
+    meta: {
+        name: packageJson.name,
+        version: packageJson.version,
+    },
+    configs: {
+        all: all_1.all,
+    },
+    rules: index_1.rules,
 };
+module.exports = plugin;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AACpC,uCAAsC;AAA7B,8FAAA,KAAK,OAAA;AAED,QAAA,OAAO,GAAG;IACrB,GAAG,EAAH,SAAG;CACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,uCAAoC;AACpC,yCAAsC;AAEtC,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE/C,MAAM,MAAM,GAAG;IACb,IAAI,EAAE;QACJ,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B;IACD,OAAO,EAAE;QACP,GAAG,EAAH,SAAG;KACJ;IACD,KAAK,EAAE,aAAY;CACI,CAAC;AAE1B,iBAAS,MAAM,CAAC"}

package/dist/rules/no-import-of-dev-dependencies.js

@@ -40,15 +40,26 @@ const rule = (0, util_1.createRule)({
                 report(comment, "noReferenceOfDevDependencies");
             }
         });
+        function lint(node) {
+            const source = (0, util_1.getImportSource)(node);
+            if (!source) {
+                return;
+            }
+            if (devDeps.includes(source.value)) {
+                context.report({
+                    messageId: "noImportOfDevDependencies",
+                    node,
+                });
+            }
+        }
         return {
             // eslint-disable-next-line @typescript-eslint/naming-convention
             ImportDeclaration(node) {
-                if (devDeps.includes(node.source.value)) {
-                    context.report({
-                        messageId: "noImportOfDevDependencies",
-                        node,
-                    });
-                }
+                lint(node);
+            },
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            TSImportEqualsDeclaration(node) {
+                lint(node);
             },
         };
         function report(comment, messageId) {

package/dist/rules/no-import-of-dev-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"no-import-of-dev-dependencies.js","sourceRoot":"","sources":["../../src/rules/no-import-of-dev-dependencies.ts"],"names":[],"mappings":";AACA,kCAAyE;AACzE,kDAA2G;AAG3G,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;IACtB,IAAI,EAAE,+BAA+B;IACrC,cAAc,EAAE,EAAE;IAClB,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,sEAAsE;SACpF;QACD,QAAQ,EAAE;YACR,yBAAyB,EAAE,yDAAyD;YACpF,4BAA4B,EAAE,yEAAyE;SACxG;QACD,MAAM,EAAE,EAAE;KACX;IACD,MAAM,CAAC,OAAO;QACZ,IAAI,CAAC,IAAA,yBAAiB,EAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACxC,OAAO,EAAE,CAAC;SACX;QAED,MAAM,IAAI,GAAG,IAAA,uBAAgB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,EAAE,CAAC;SACX;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE;YAChC,OAAO,EAAE,CAAC;SACX;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;aACrD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,IAAI,IAAA,0BAAkB,EAAC,GAAG,CAAC,EAAE;gBAC3B,OAAO,IAAA,kCAA0B,EAAC,GAAG,CAAC,CAAC;aACxC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,GAAG,KAAK,IAAI,CAAC,QAAQ,IAAI,CAAA,MAAA,WAAW,CAAC,YAAY,0CAAG,GAAG,CAAC,MAAK,SAAS,CAAA,EAAA,CAAC,CAAC,CAAC,4GAA4G;QAExM,IAAA,uBAAgB,EAAC,OAAO,CAAC,UAAU,EAAE,uCAAuC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;YAC7F,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACzB,MAAM,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;aACjD;QACH,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,gEAAgE;YAChE,iBAAiB,CAAC,IAAI;gBACpB,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oBACvC,OAAO,CAAC,MAAM,CAAC;wBACb,SAAS,EAAE,2BAA2B;wBACtC,IAAI;qBACL,CAAC,CAAC;iBACJ;YACH,CAAC;SACF,CAAC;QAEF,SAAS,MAAM,CAAC,OAAyB,EAAE,SAAoB;YAC7D,OAAO,CAAC,MAAM,CAAC;gBACb,GAAG,EAAE;oBACH,GAAG,EAAE;wBACH,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC;wBACtC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI;qBAC3B;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;wBACtC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI;qBAC7B;iBACF;gBACD,SAAS;aACV,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,iBAAS,IAAI,CAAC"}
+{"version":3,"file":"no-import-of-dev-dependencies.js","sourceRoot":"","sources":["../../src/rules/no-import-of-dev-dependencies.ts"],"names":[],"mappings":"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"}

package/dist/rules/no-relative-import-in-test.js

@@ -45,26 +45,40 @@ const rule = (0, util_1.createRule)({
         }
         const services = utils_1.ESLintUtils.getParserServices(context);
         const checker = services.program.getTypeChecker();
+        function lint(node) {
+            const source = (0, util_1.getImportSource)(node);
+            if (!source) {
+                return;
+            }
+            if (!source.value.startsWith(".")) {
+                return;
+            }
+            const moduleSymbol = checker.getSymbolAtLocation(services.esTreeNodeToTSNodeMap.get(source));
+            if (!moduleSymbol) {
+                // TODO(jakebailey): generally speaking, this should be an error; you can't import a non-module.
+                return;
+            }
+            if (!moduleSymbol.declarations) {
+                return;
+            }
+            for (const declaration of moduleSymbol.declarations) {
+                if (ts.isSourceFile(declaration) && declaration.isDeclarationFile) {
+                    context.report({
+                        messageId: "useGlobalImport",
+                        node: source,
+                    });
+                    return;
+                }
+            }
+        }
         return {
             // eslint-disable-next-line @typescript-eslint/naming-convention
             ImportDeclaration(node) {
-                const { source } = node;
-                if (!source.value.startsWith(".")) {
-                    return;
-                }
-                const moduleSymbol = checker.getSymbolAtLocation(services.esTreeNodeToTSNodeMap.get(source));
-                if (!(moduleSymbol === null || moduleSymbol === void 0 ? void 0 : moduleSymbol.declarations)) {
-                    return;
-                }
-                for (const declaration of moduleSymbol.declarations) {
-                    if (ts.isSourceFile(declaration) && declaration.isDeclarationFile) {
-                        context.report({
-                            messageId: "useGlobalImport",
-                            node: source,
-                        });
-                        return;
-                    }
-                }
+                lint(node);
+            },
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            TSImportEqualsDeclaration(node) {
+                lint(node);
             },
         };
     },

package/dist/rules/no-relative-import-in-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"no-relative-import-in-test.js","sourceRoot":"","sources":["../../src/rules/no-relative-import-in-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuD;AACvD,+CAAiC;AACjC,kCAAqC;AACrC,kDAA2D;AAE3D,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;IACtB,IAAI,EAAE,4BAA4B;IAClC,cAAc,EAAE,EAAE;IAClB,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,+DAA+D;SAC7E;QACD,QAAQ,EAAE;YACR,eAAe,EACb,wGAAwG;SAC3G;QACD,MAAM,EAAE,EAAE;KACX;IACD,MAAM,CAAC,OAAO;QACZ,IAAI,IAAA,yBAAiB,EAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACvC,OAAO,EAAE,CAAC;SACX;QAED,MAAM,QAAQ,GAAG,mBAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAElD,OAAO;YACL,gEAAgE;YAChE,iBAAiB,CAAC,IAAI;gBACpB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;oBACjC,OAAO;iBACR;gBAED,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC7F,IAAI,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,EAAE;oBAC/B,OAAO;iBACR;gBAED,KAAK,MAAM,WAAW,IAAI,YAAY,CAAC,YAAY,EAAE;oBACnD,IAAI,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,iBAAiB,EAAE;wBACjE,OAAO,CAAC,MAAM,CAAC;4BACb,SAAS,EAAE,iBAAiB;4BAC5B,IAAI,EAAE,MAAM;yBACb,CAAC,CAAC;wBACH,OAAO;qBACR;iBACF;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,iBAAS,IAAI,CAAC"}
+{"version":3,"file":"no-relative-import-in-test.js","sourceRoot":"","sources":["../../src/rules/no-relative-import-in-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAiE;AACjE,+CAAiC;AACjC,kCAAsD;AACtD,kDAA2D;AAE3D,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;IACtB,IAAI,EAAE,4BAA4B;IAClC,cAAc,EAAE,EAAE;IAClB,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,+DAA+D;SAC7E;QACD,QAAQ,EAAE;YACR,eAAe,EACb,wGAAwG;SAC3G;QACD,MAAM,EAAE,EAAE;KACX;IACD,MAAM,CAAC,OAAO;QACZ,IAAI,IAAA,yBAAiB,EAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACvC,OAAO,EAAE,CAAC;SACX;QAED,MAAM,QAAQ,GAAG,mBAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAElD,SAAS,IAAI,CAAC,IAAqE;YACjF,MAAM,MAAM,GAAG,IAAA,sBAAe,EAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO;aACR;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACjC,OAAO;aACR;YAED,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;YAC7F,IAAI,CAAC,YAAY,EAAE;gBACjB,gGAAgG;gBAChG,OAAO;aACR;YAED,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE;gBAC9B,OAAO;aACR;YAED,KAAK,MAAM,WAAW,IAAI,YAAY,CAAC,YAAY,EAAE;gBACnD,IAAI,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,iBAAiB,EAAE;oBACjE,OAAO,CAAC,MAAM,CAAC;wBACb,SAAS,EAAE,iBAAiB;wBAC5B,IAAI,EAAE,MAAM;qBACb,CAAC,CAAC;oBACH,OAAO;iBACR;aACF;QACH,CAAC;QAED,OAAO;YACL,gEAAgE;YAChE,iBAAiB,CAAC,IAAI;gBACpB,IAAI,CAAC,IAAI,CAAC,CAAC;YACb,CAAC;YACD,gEAAgE;YAChE,yBAAyB,CAAC,IAAI;gBAC5B,IAAI,CAAC,IAAI,CAAC,CAAC;YACb,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,iBAAS,IAAI,CAAC"}

package/dist/rules/no-self-import.js

@@ -19,21 +19,32 @@ const rule = (0, util_1.createRule)({
         if (!packageName) {
             return {};
         }
+        function lint(node) {
+            const source = (0, util_1.getImportSource)(node);
+            if (!source) {
+                return;
+            }
+            if (source.value === packageName || source.value.startsWith(packageName + "/")) {
+                context.report({
+                    messageId: "useRelativeImport",
+                    node,
+                });
+            }
+            else if (source.value.match(/^\.\/v\d+(?:\.\d+)?(?:\/.*)?$/)) {
+                context.report({
+                    messageId: "useOnlyCurrentVersion",
+                    node,
+                });
+            }
+        }
         return {
             // eslint-disable-next-line @typescript-eslint/naming-convention
             ImportDeclaration(node) {
-                if (node.source.value === packageName || node.source.value.startsWith(packageName + "/")) {
-                    context.report({
-                        messageId: "useRelativeImport",
-                        node,
-                    });
-                }
-                else if (node.source.value.match(/^\.\/v\d+(?:\.\d+)?(?:\/.*)?$/)) {
-                    context.report({
-                        messageId: "useOnlyCurrentVersion",
-                        node,
-                    });
-                }
+                lint(node);
+            },
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            TSImportEqualsDeclaration(node) {
+                lint(node);
             },
         };
     },

package/dist/rules/no-self-import.js.map

@@ -1 +1 @@
-{"version":3,"file":"no-self-import.js","sourceRoot":"","sources":["../../src/rules/no-self-import.ts"],"names":[],"mappings":";AAAA,kCAAwE;AACxE,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;IACtB,IAAI,EAAE,gBAAgB;IACtB,cAAc,EAAE,EAAE;IAClB,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EACT,uHAAuH;SAC1H;QACD,QAAQ,EAAE;YACR,iBAAiB,EAAE,mFAAmF;YACtG,qBAAqB,EAAE,qDAAqD;SAC7E;QACD,MAAM,EAAE,EAAE;KACX;IACD,MAAM,CAAC,OAAO;QACZ,MAAM,WAAW,GAAG,IAAA,wCAAiC,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxE,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,EAAE,CAAC;SACX;QAED,OAAO;YACL,gEAAgE;YAChE,iBAAiB,CAAC,IAAI;gBACpB,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,GAAG,GAAG,CAAC,EAAE;oBACxF,OAAO,CAAC,MAAM,CAAC;wBACb,SAAS,EAAE,mBAAmB;wBAC9B,IAAI;qBACL,CAAC,CAAC;iBACJ;qBAAM,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,+BAA+B,CAAC,EAAE;oBACnE,OAAO,CAAC,MAAM,CAAC;wBACb,SAAS,EAAE,uBAAuB;wBAClC,IAAI;qBACL,CAAC,CAAC;iBACJ;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,iBAAS,IAAI,CAAC"}
+{"version":3,"file":"no-self-import.js","sourceRoot":"","sources":["../../src/rules/no-self-import.ts"],"names":[],"mappings":";AACA,kCAAyF;AACzF,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;IACtB,IAAI,EAAE,gBAAgB;IACtB,cAAc,EAAE,EAAE;IAClB,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EACT,uHAAuH;SAC1H;QACD,QAAQ,EAAE;YACR,iBAAiB,EAAE,mFAAmF;YACtG,qBAAqB,EAAE,qDAAqD;SAC7E;QACD,MAAM,EAAE,EAAE;KACX;IACD,MAAM,CAAC,OAAO;QACZ,MAAM,WAAW,GAAG,IAAA,wCAAiC,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxE,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,EAAE,CAAC;SACX;QAED,SAAS,IAAI,CAAC,IAAqE;YACjF,MAAM,MAAM,GAAG,IAAA,sBAAe,EAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO;aACR;YAED,IAAI,MAAM,CAAC,KAAK,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,GAAG,GAAG,CAAC,EAAE;gBAC9E,OAAO,CAAC,MAAM,CAAC;oBACb,SAAS,EAAE,mBAAmB;oBAC9B,IAAI;iBACL,CAAC,CAAC;aACJ;iBAAM,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,+BAA+B,CAAC,EAAE;gBAC9D,OAAO,CAAC,MAAM,CAAC;oBACb,SAAS,EAAE,uBAAuB;oBAClC,IAAI;iBACL,CAAC,CAAC;aACJ;QACH,CAAC;QAED,OAAO;YACL,gEAAgE;YAChE,iBAAiB,CAAC,IAAI;gBACpB,IAAI,CAAC,IAAI,CAAC,CAAC;YACb,CAAC;YACD,gEAAgE;YAChE,yBAAyB,CAAC,IAAI;gBAC5B,IAAI,CAAC,IAAI,CAAC,CAAC;YACb,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,iBAAS,IAAI,CAAC"}

package/dist/util.d.ts

@@ -18,3 +18,4 @@ export interface PackageJSON {
     devDependencies?: Record<string, string | undefined>;
 }
 export declare function findTypesPackage(file: string): TypesPackageInfo | undefined;
+export declare function getImportSource(node: TSESTree.ImportDeclaration | TSESTree.TSImportEqualsDeclaration): TSESTree.StringLiteral | undefined;

package/dist/util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findTypesPackage = exports.commentsMatching = exports.getTypesPackageForDeclarationFile = exports.createRule = void 0;
+exports.getImportSource = exports.findTypesPackage = exports.commentsMatching = exports.getTypesPackageForDeclarationFile = exports.createRule = void 0;
 const utils_1 = require("@definitelytyped/utils");
 const utils_2 = require("@typescript-eslint/utils");
 const path_1 = __importDefault(require("path"));
@@ -66,4 +66,16 @@ function findTypesPackage(file) {
     });
 }
 exports.findTypesPackage = findTypesPackage;
+function getImportSource(node) {
+    if (node.type === "ImportDeclaration") {
+        return node.source;
+    }
+    if (node.moduleReference.type === "TSExternalModuleReference" &&
+        node.moduleReference.expression.type === "Literal" &&
+        typeof node.moduleReference.expression.value === "string") {
+        return node.moduleReference.expression;
+    }
+    return undefined;
+}
+exports.getImportSource = getImportSource;
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuF;AACvF,oDAA2E;AAC3E,gDAAwB;AACxB,4CAAoB;AASP,QAAA,UAAU,GAEkB,mBAAW,CAAC,WAAW,CAC9D,CAAC,IAAI,EAAE,EAAE,CACP,oGAAoG,IAAI,KAAK,CAChH,CAAC;AAEF,SAAgB,iCAAiC,CAAC,IAAY;;IAC5D,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,EAAE;QAC5B,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,MAAA,gBAAgB,CAAC,IAAI,CAAC,0CAAE,QAAQ,CAAC;AAC1C,CAAC;AALD,8EAKC;AAED,SAAgB,gBAAgB,CAC9B,UAAyC,EACzC,KAAa,EACb,CAA+C;IAE/C,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;QAC7C,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC;YAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;KACzB;AACH,CAAC;AATD,4CASC;AAED,SAAS,MAAM,CAAe,CAAS,EAAE,EAAgC;IACvE,CAAC,GAAG,cAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,MAAM,IAAI,GAAG,cAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEhC,OAAO,IAAI,EAAE;QACX,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,SAAS,EAAE;YACnB,OAAO,CAAC,CAAC;SACV;QACD,IAAI,CAAC,KAAK,IAAI,EAAE;YACd,MAAM;SACP;QACD,CAAC,GAAG,cAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KACrB;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAkBD,0DAA0D;AAC1D,SAAS,cAAc,CAAC,WAAiC;IACvD,OAAO,CACL,OAAO,WAAW,CAAC,IAAI,KAAK,QAAQ;QACpC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;QACtC,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ;QACvC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAClC,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;QACxB,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QACrD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;YACnC,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,mBAAmB,GAAG,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACrE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;YAChC,OAAO,SAAS,CAAC;SAClB;QACD,OAAO;YACL,GAAG,EAAE,CAAC;YACN,WAAW;YACX,QAAQ,EAAE,IAAA,kCAA0B,EAAC,WAAW,CAAC,IAAI,CAAC;SACvD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAlBD,4CAkBC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@definitelytyped/eslint-plugin",
-  "version": "0.0.192",
+  "version": "0.0.194",
   "description": "ESLint rules for DefinitelyTyped",
   "main": "./dist/index.js",
   "publishConfig": {

package/src/configs/all.ts

@@ -174,6 +174,10 @@ export const all: Linter.BaseConfig = {
         "@typescript-eslint/explicit-member-accessibility": ["error", { accessibility: "no-public" }],
         "@typescript-eslint/no-misused-new": "error",
         "@typescript-eslint/consistent-type-definitions": "error",
+        "@typescript-eslint/no-invalid-void-type": [
+          "error",
+          { allowAsThisParameter: true, allowInGenericTypeArguments: true },
+        ],
       },
     },
   ],

package/src/index.ts

@@ -1,6 +1,18 @@
+import { ESLint } from "eslint";
 import { all } from "./configs/all";
-export { rules } from "./rules/index";
+import { rules } from "./rules/index";
 
-export const configs = {
-  all,
-};
+const packageJson = require("../package.json");
+
+const plugin = {
+  meta: {
+    name: packageJson.name,
+    version: packageJson.version,
+  },
+  configs: {
+    all,
+  },
+  rules: rules as any,
+} satisfies ESLint.Plugin;
+
+export = plugin;

package/src/rules/no-import-of-dev-dependencies.ts

@@ -1,5 +1,5 @@
 import { TSESTree } from "@typescript-eslint/utils";
-import { createRule, commentsMatching, findTypesPackage } from "../util";
+import { createRule, commentsMatching, findTypesPackage, getImportSource } from "../util";
 import { isDeclarationPath, isTypesPackageName, typesPackageNameToRealName } from "@definitelytyped/utils";
 
 type MessageId = "noImportOfDevDependencies" | "noReferenceOfDevDependencies";
@@ -47,15 +47,28 @@ const rule = createRule({
       }
     });
 
+    function lint(node: TSESTree.ImportDeclaration | TSESTree.TSImportEqualsDeclaration) {
+      const source = getImportSource(node);
+      if (!source) {
+        return;
+      }
+
+      if (devDeps.includes(source.value)) {
+        context.report({
+          messageId: "noImportOfDevDependencies",
+          node,
+        });
+      }
+    }
+
     return {
       // eslint-disable-next-line @typescript-eslint/naming-convention
       ImportDeclaration(node) {
-        if (devDeps.includes(node.source.value)) {
-          context.report({
-            messageId: "noImportOfDevDependencies",
-            node,
-          });
-        }
+        lint(node);
+      },
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      TSImportEqualsDeclaration(node) {
+        lint(node);
       },
     };
 

package/src/rules/no-relative-import-in-test.ts

@@ -1,6 +1,6 @@
-import { ESLintUtils } from "@typescript-eslint/utils";
+import { ESLintUtils, TSESTree } from "@typescript-eslint/utils";
 import * as ts from "typescript";
-import { createRule } from "../util";
+import { createRule, getImportSource } from "../util";
 import { isDeclarationPath } from "@definitelytyped/utils";
 
 const rule = createRule({
@@ -25,28 +25,45 @@ const rule = createRule({
     const services = ESLintUtils.getParserServices(context);
     const checker = services.program.getTypeChecker();
 
-    return {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      ImportDeclaration(node) {
-        const { source } = node;
-        if (!source.value.startsWith(".")) {
-          return;
-        }
+    function lint(node: TSESTree.ImportDeclaration | TSESTree.TSImportEqualsDeclaration) {
+      const source = getImportSource(node);
+      if (!source) {
+        return;
+      }
+
+      if (!source.value.startsWith(".")) {
+        return;
+      }
+
+      const moduleSymbol = checker.getSymbolAtLocation(services.esTreeNodeToTSNodeMap.get(source));
+      if (!moduleSymbol) {
+        // TODO(jakebailey): generally speaking, this should be an error; you can't import a non-module.
+        return;
+      }
+
+      if (!moduleSymbol.declarations) {
+        return;
+      }
 
-        const moduleSymbol = checker.getSymbolAtLocation(services.esTreeNodeToTSNodeMap.get(source));
-        if (!moduleSymbol?.declarations) {
+      for (const declaration of moduleSymbol.declarations) {
+        if (ts.isSourceFile(declaration) && declaration.isDeclarationFile) {
+          context.report({
+            messageId: "useGlobalImport",
+            node: source,
+          });
           return;
         }
+      }
+    }
 
-        for (const declaration of moduleSymbol.declarations) {
-          if (ts.isSourceFile(declaration) && declaration.isDeclarationFile) {
-            context.report({
-              messageId: "useGlobalImport",
-              node: source,
-            });
-            return;
-          }
-        }
+    return {
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      ImportDeclaration(node) {
+        lint(node);
+      },
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      TSImportEqualsDeclaration(node) {
+        lint(node);
       },
     };
   },

package/src/rules/no-self-import.ts

@@ -1,4 +1,5 @@
-import { createRule, getTypesPackageForDeclarationFile } from "../util";
+import { TSESTree } from "@typescript-eslint/utils";
+import { createRule, getImportSource, getTypesPackageForDeclarationFile } from "../util";
 const rule = createRule({
   name: "no-self-import",
   defaultOptions: [],
@@ -20,20 +21,33 @@ const rule = createRule({
       return {};
     }
 
+    function lint(node: TSESTree.ImportDeclaration | TSESTree.TSImportEqualsDeclaration) {
+      const source = getImportSource(node);
+      if (!source) {
+        return;
+      }
+
+      if (source.value === packageName || source.value.startsWith(packageName + "/")) {
+        context.report({
+          messageId: "useRelativeImport",
+          node,
+        });
+      } else if (source.value.match(/^\.\/v\d+(?:\.\d+)?(?:\/.*)?$/)) {
+        context.report({
+          messageId: "useOnlyCurrentVersion",
+          node,
+        });
+      }
+    }
+
     return {
       // eslint-disable-next-line @typescript-eslint/naming-convention
       ImportDeclaration(node) {
-        if (node.source.value === packageName || node.source.value.startsWith(packageName + "/")) {
-          context.report({
-            messageId: "useRelativeImport",
-            node,
-          });
-        } else if (node.source.value.match(/^\.\/v\d+(?:\.\d+)?(?:\/.*)?$/)) {
-          context.report({
-            messageId: "useOnlyCurrentVersion",
-            node,
-          });
-        }
+        lint(node);
+      },
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      TSImportEqualsDeclaration(node) {
+        lint(node);
       },
     };
   },

package/src/util.ts

@@ -98,3 +98,21 @@ export function findTypesPackage(file: string): TypesPackageInfo | undefined {
     };
   });
 }
+
+export function getImportSource(
+  node: TSESTree.ImportDeclaration | TSESTree.TSImportEqualsDeclaration,
+): TSESTree.StringLiteral | undefined {
+  if (node.type === "ImportDeclaration") {
+    return node.source;
+  }
+
+  if (
+    node.moduleReference.type === "TSExternalModuleReference" &&
+    node.moduleReference.expression.type === "Literal" &&
+    typeof node.moduleReference.expression.value === "string"
+  ) {
+    return node.moduleReference.expression;
+  }
+
+  return undefined;
+}

package/test/__file_snapshots__/types/no-import-of-dev-dependencies/bad.d.ts.lint

@@ -1,22 +1,30 @@
 types/no-import-of-dev-dependencies/bad.d.ts
+  1:1   error  Do not use a triple slash reference for devdep, use `import` style instead       @typescript-eslint/triple-slash-reference
   1:1   error  Do not use a triple slash reference for devdep, use `import` style instead       @typescript-eslint/triple-slash-reference
   1:21  error  .d.ts files may not triple-slash reference packages in devDependencies           @definitelytyped/no-import-of-dev-dependencies
   2:1   error  Do not use a triple slash reference for otherdevdep, use `import` style instead  @typescript-eslint/triple-slash-reference
+  2:1   error  Do not use a triple slash reference for otherdevdep, use `import` style instead  @typescript-eslint/triple-slash-reference
   2:21  error  .d.ts files may not triple-slash reference packages in devDependencies           @definitelytyped/no-import-of-dev-dependencies
   4:1   error  .d.ts files may not import packages in devDependencies                           @definitelytyped/no-import-of-dev-dependencies
   5:1   error  .d.ts files may not import packages in devDependencies                           @definitelytyped/no-import-of-dev-dependencies
+  7:1   error  .d.ts files may not import packages in devDependencies                           @definitelytyped/no-import-of-dev-dependencies
+  8:1   error  .d.ts files may not import packages in devDependencies                           @definitelytyped/no-import-of-dev-dependencies
 
-✖ 6 problems (6 errors, 0 warnings)
+✖ 10 problems (10 errors, 0 warnings)
 
 ==== types/no-import-of-dev-dependencies/bad.d.ts ====
 
     /// <reference types="devdep"/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! @typescript-eslint/triple-slash-reference: Do not use a triple slash reference for devdep, use `import` style instead.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! @typescript-eslint/triple-slash-reference: Do not use a triple slash reference for devdep, use `import` style instead.
                         ~~~~~~
 !!! @definitelytyped/no-import-of-dev-dependencies: .d.ts files may not triple-slash reference packages in devDependencies.
     /// <reference types="otherdevdep"/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! @typescript-eslint/triple-slash-reference: Do not use a triple slash reference for otherdevdep, use `import` style instead.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! @typescript-eslint/triple-slash-reference: Do not use a triple slash reference for otherdevdep, use `import` style instead.
                         ~~~~~~~~~~~
 !!! @definitelytyped/no-import-of-dev-dependencies: .d.ts files may not triple-slash reference packages in devDependencies.
@@ -27,3 +35,10 @@ types/no-import-of-dev-dependencies/bad.d.ts
     import * as otherdevdep from "otherdevdep";
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! @definitelytyped/no-import-of-dev-dependencies: .d.ts files may not import packages in devDependencies.
+    
+    import devdep2 = require("devdep");
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! @definitelytyped/no-import-of-dev-dependencies: .d.ts files may not import packages in devDependencies.
+    import otherdevdep2 = require("otherdevdep");
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! @definitelytyped/no-import-of-dev-dependencies: .d.ts files may not import packages in devDependencies.

package/test/__file_snapshots__/types/no-import-of-dev-dependencies/index.d.ts.lint

@@ -1,16 +1,25 @@
 types/no-import-of-dev-dependencies/index.d.ts
+  1:1  error  Do not use a triple slash reference for other, use `import` style instead         @typescript-eslint/triple-slash-reference
   1:1  error  Do not use a triple slash reference for other, use `import` style instead         @typescript-eslint/triple-slash-reference
   4:1  error  Declaration file should not use a global import of itself. Use a relative import  @definitelytyped/no-self-import
+  7:1  error  Declaration file should not use a global import of itself. Use a relative import  @definitelytyped/no-self-import
 
-✖ 2 problems (2 errors, 0 warnings)
+✖ 4 problems (4 errors, 0 warnings)
 
 ==== types/no-import-of-dev-dependencies/index.d.ts ====
 
     /// <reference types="other"/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! @typescript-eslint/triple-slash-reference: Do not use a triple slash reference for other, use `import` style instead.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! @typescript-eslint/triple-slash-reference: Do not use a triple slash reference for other, use `import` style instead.
     
     import other from "other";
     import self from "no-import-of-dev-dependencies";
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! @definitelytyped/no-self-import: Declaration file should not use a global import of itself. Use a relative import.
+    
+    import other2 = require("other");
+    import self2 = require("no-import-of-dev-dependencies");
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! @definitelytyped/no-self-import: Declaration file should not use a global import of itself. Use a relative import.