@definitelytyped/dtslint 0.0.158-next.2 → 0.0.158-next.4

package/dist/rules/voidReturnRule.js.map

@@ -1 +1 @@
-{"version":3,"file":"voidReturnRule.js","sourceRoot":"","sources":["../../src/rules/voidReturnRule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,+CAAiC;AAEjC,kCAAkC;AAElC,MAAa,IAAK,SAAQ,IAAI,CAAC,KAAK,CAAC,YAAY;IAgB/C,KAAK,CAAC,UAAyB;QAC7B,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;;AAlBH,oBAmBC;AAlBQ,aAAQ,GAAuB;IACpC,QAAQ,EAAE,aAAa;IACvB,WAAW,EAAE,2CAA2C;IACxD,SAAS,EAAE,OAAO;IAClB,kBAAkB,EAAE,mBAAmB;IACvC,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,OAAO;IACb,cAAc,EAAE,IAAI;CACrB,CAAC;AAEK,mBAAc,GAAG,IAAA,cAAO,EAC7B,IAAI,CAAC,QAAQ,CAAC,QAAQ,EACtB,wEAAwE,CACzE,CAAC;AAOJ,SAAS,IAAI,CAAC,GAA2B;IACvC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI;QAC1C,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;YACnG,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;SACjD;aAAM;YACL,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;SACvB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,EAAE,IAAI,EAAW;IACvC,QAAQ,IAAI,EAAE;QACZ,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,2BAA2B,CAAC;QAC/C,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;QAClC,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,oBAAoB;YACpD,OAAO,IAAI,CAAC;QACd;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC;AAED,SAAS,YAAY,CAAC,IAAa;IACjC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAO,CAAC;IAC1B,IAAI,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE;QAC3C,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAO,CAAC,CAAC;KAC3C;IACD,OAAO,sBAAsB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;AAChE,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAa;IAC3C,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC;QACvC,KAAK,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC;QACtC,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAChC,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;QACrC,KAAK,EAAE,CAAC,UAAU,CAAC,eAAe;YAChC,OAAO,IAAI,CAAC;QACd;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC"}
+{"version":3,"file":"voidReturnRule.js","sourceRoot":"","sources":["../../src/rules/voidReturnRule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,+CAAiC;AAEjC,kCAAkC;AAElC,MAAa,IAAK,SAAQ,IAAI,CAAC,KAAK,CAAC,YAAY;IAgB/C,KAAK,CAAC,UAAyB;QAC7B,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;;AAjBM,aAAQ,GAAuB;IACpC,QAAQ,EAAE,aAAa;IACvB,WAAW,EAAE,2CAA2C;IACxD,SAAS,EAAE,OAAO;IAClB,kBAAkB,EAAE,mBAAmB;IACvC,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,OAAO;IACb,cAAc,EAAE,IAAI;CACrB,CAAC;AAEK,mBAAc,GAAG,IAAA,cAAO,EAC7B,IAAI,CAAC,QAAQ,CAAC,QAAQ,EACtB,wEAAwE,CACzE,CAAC;AAdS,oBAAI;AAqBjB,SAAS,IAAI,CAAC,GAA2B;IACvC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI;QAC1C,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;YACnG,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;SACjD;aAAM;YACL,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;SACvB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,EAAE,IAAI,EAAW;IACvC,QAAQ,IAAI,EAAE;QACZ,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,2BAA2B,CAAC;QAC/C,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;QAClC,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,oBAAoB;YACpD,OAAO,IAAI,CAAC;QACd;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC;AAED,SAAS,YAAY,CAAC,IAAa;IACjC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAO,CAAC;IAC1B,IAAI,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE;QAC3C,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAO,CAAC,CAAC;KAC3C;IACD,OAAO,sBAAsB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;AAChE,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAa;IAC3C,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC;QACvC,KAAK,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC;QACtC,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAChC,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;QACrC,KAAK,EAAE,CAAC,UAAU,CAAC,eAAe;YAChC,OAAO,IAAI,CAAC;QACd;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC"}

package/dist/util.d.ts

@@ -4,8 +4,6 @@ export declare const createRule: <TOptions extends readonly unknown[], TMessageI
 export declare function readJson(path: string): Promise<any>;
 export declare function failure(ruleName: string, s: string): string;
 export declare function getCommonDirectoryName(files: readonly string[]): string;
-export declare function eachModuleStatement(sourceFile: ts.SourceFile, action: (statement: ts.Statement) => void): void;
-export declare function getModuleDeclarationStatements(node: ts.ModuleDeclaration): readonly ts.Statement[] | undefined;
 export declare function getCompilerOptions(dirPath: string): Promise<ts.CompilerOptions>;
 export declare function withoutPrefix(s: string, prefix: string): string | undefined;
 export declare function last<T>(a: readonly T[]): T;

package/dist/util.js

@@ -1,35 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMainFile = exports.mapDefinedAsync = exports.assertDefined = exports.last = exports.withoutPrefix = exports.getCompilerOptions = exports.getModuleDeclarationStatements = exports.eachModuleStatement = exports.getCommonDirectoryName = exports.failure = exports.readJson = exports.createRule = void 0;
+exports.isMainFile = exports.mapDefinedAsync = exports.assertDefined = exports.last = exports.withoutPrefix = exports.getCompilerOptions = exports.getCommonDirectoryName = exports.failure = exports.readJson = exports.createRule = void 0;
 const utils_1 = require("@typescript-eslint/utils");
 const assert = require("assert");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const stripJsonComments = require("strip-json-comments");
-const ts = __importStar(require("typescript"));
 exports.createRule = utils_1.ESLintUtils.RuleCreator((name) => `https://github.com/microsoft/DefinitelyTyped-tools/tree/master/packages/dtslint/src/rules/${name}.ts`);
 async function readJson(path) {
     const text = await (0, fs_extra_1.readFile)(path, "utf-8");
@@ -53,33 +29,6 @@ function getCommonDirectoryName(files) {
     return (0, path_1.basename)(minDir);
 }
 exports.getCommonDirectoryName = getCommonDirectoryName;
-function eachModuleStatement(sourceFile, action) {
-    if (!sourceFile.isDeclarationFile) {
-        return;
-    }
-    for (const node of sourceFile.statements) {
-        if (ts.isModuleDeclaration(node)) {
-            const statements = getModuleDeclarationStatements(node);
-            if (statements) {
-                for (const statement of statements) {
-                    action(statement);
-                }
-            }
-        }
-        else {
-            action(node);
-        }
-    }
-}
-exports.eachModuleStatement = eachModuleStatement;
-function getModuleDeclarationStatements(node) {
-    let { body } = node;
-    while (body && body.kind === ts.SyntaxKind.ModuleDeclaration) {
-        body = body.body;
-    }
-    return body && ts.isModuleBlock(body) ? body.statements : undefined;
-}
-exports.getModuleDeclarationStatements = getModuleDeclarationStatements;
 async function getCompilerOptions(dirPath) {
     const tsconfigPath = (0, path_1.join)(dirPath, "tsconfig.json");
     if (!(await (0, fs_extra_1.pathExists)(tsconfigPath))) {

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"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/dtslint",
-  "version": "0.0.158-next.2",
+  "version": "0.0.158-next.4",
   "description": "Runs tests on TypeScript definition files",
   "main": "./dist/index.js",
   "bin": "./dist/index.js",
@@ -22,7 +22,7 @@
     "test": "../../node_modules/.bin/jest --config ../../jest.config.js packages/dtslint"
   },
   "dependencies": {
-    "@definitelytyped/dts-critic": "^0.0.157",
+    "@definitelytyped/dts-critic": "^0.0.158-next.4",
     "@definitelytyped/header-parser": "^0.0.157",
     "@definitelytyped/typescript-versions": "^0.0.157",
     "@definitelytyped/utils": "^0.0.157",
@@ -39,18 +39,18 @@
     "yargs": "^15.1.0"
   },
   "peerDependencies": {
-    "typescript": ">= 3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.7.0-dev || >= 3.8.0-dev || >= 3.9.0-dev || >= 4.0.0-dev"
+    "typescript": ">= 3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.7.0-dev || >= 3.8.0-dev || >= 3.9.0-dev || >= 4.0.0-dev || >=5.0.0-dev"
   },
   "devDependencies": {
     "@types/eslint": "^8.4.2",
     "@types/fs-extra": "^5.0.2",
     "@types/json-stable-stringify": "^1.0.32",
     "@types/strip-json-comments": "^0.0.28",
-    "typescript": "4.7.4"
+    "typescript": "^5.0.2"
   },
   "engines": {
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "f02f34cadd522fe84bd7be70a3945ac2d3bf7c0a"
+  "gitHead": "e4c9437b79c4b229e0b9774f42c399472995d315"
 }

package/src/rules/no-import-default-of-export-equals.ts

@@ -0,0 +1,62 @@
+import { createRule } from "../util";
+import { ESLintUtils } from "@typescript-eslint/utils";
+import * as ts from "typescript";
+
+const rule = createRule({
+  name: "no-import-default-of-export-equals",
+  defaultOptions: [],
+  meta: {
+    type: "problem",
+    docs: {
+      description: "Forbid a default import to reference an `export =` module.",
+      recommended: "error",
+    },
+    messages: {
+      noImportDefaultOfExportEquals: `The module {{moduleName}} uses \`export = \`. Import with \`import {{importName}} = require({{moduleName}})\`.`,
+    },
+    schema: [],
+  },
+  create(context) {
+    const parserServices = ESLintUtils.getParserServices(context);
+    const checker = parserServices.program.getTypeChecker();
+    return {
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      ImportDeclaration(node) {
+        const defaultName = node.specifiers.find((spec) => spec.type === "ImportDefaultSpecifier")?.local;
+        if (!defaultName) {
+          return;
+        }
+        const importName = defaultName.name;
+        const source = parserServices.esTreeNodeToTSNodeMap.get(node.source);
+        const sym = checker.getSymbolAtLocation(source);
+        if (
+          sym?.declarations?.some((d) => getStatements(d)?.some((s) => ts.isExportAssignment(s) && !!s.isExportEquals))
+        ) {
+          context.report({
+            messageId: "noImportDefaultOfExportEquals",
+            data: { moduleName: node.source, importName },
+            node: defaultName,
+          });
+        }
+      },
+    };
+  },
+});
+
+function getStatements(decl: ts.Declaration): readonly ts.Statement[] | undefined {
+  return ts.isSourceFile(decl)
+    ? decl.statements
+    : ts.isModuleDeclaration(decl)
+    ? getModuleDeclarationStatements(decl)
+    : undefined;
+}
+
+function getModuleDeclarationStatements(node: ts.ModuleDeclaration): readonly ts.Statement[] | undefined {
+  let { body } = node;
+  while (body && body.kind === ts.SyntaxKind.ModuleDeclaration) {
+    body = body.body;
+  }
+  return body && ts.isModuleBlock(body) ? body.statements : undefined;
+}
+
+export = rule;

package/src/rules/no-single-element-tuple-type.ts

@@ -0,0 +1,31 @@
+import { createRule } from "../util";
+import { TSESTree } from "@typescript-eslint/utils";
+
+const rule = createRule({
+  name: "no-single-element-tuple-type",
+  defaultOptions: [],
+  meta: {
+    type: "problem",
+    docs: {
+      description: "Forbids `[T]`, which should be `T[]`.",
+      recommended: "error",
+    },
+    messages: {
+      singleElementTupleType: `Type [T] is a single-element tuple type. You probably meant T[].`,
+    },
+    schema: [],
+  },
+  create(context) {
+    return {
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      "TSTupleType[elementTypes.length=1]"(node: TSESTree.TSTupleType) {
+        context.report({
+          messageId: "singleElementTupleType",
+          node,
+        });
+      },
+    };
+  },
+});
+
+export = rule;

package/src/rules/noRedundantJsdoc2Rule.ts

@@ -222,7 +222,8 @@ function removeTypeExpression(
 function isInAmbientContext(node: ts.Node): boolean {
   return ts.isSourceFile(node)
     ? node.isDeclarationFile
-    : Lint.hasModifier(node.modifiers, ts.SyntaxKind.DeclareKeyword) || isInAmbientContext(node.parent!);
+    : (ts.canHaveModifiers(node) && ts.getModifiers(node)?.some((m) => m.kind === ts.SyntaxKind.DeclareKeyword)) ||
+        isInAmbientContext(node.parent!);
 }
 
 const redundantTags = new Set([

package/src/rules/strictExportDeclareModifiersRule.ts

@@ -54,7 +54,7 @@ function walk(ctx: Lint.WalkContext<void>): void {
     // `declare global` and `declare module "foo"` OK. `declare namespace N` not OK, should be `export namespace`.
     if (!isDeclareGlobalOrExternalModuleDeclaration(node)) {
       if (isDeclare(node)) {
-        fail(mod(node, ts.SyntaxKind.DeclareKeyword), "'declare' keyword is redundant here.");
+        fail(mod(node, ts.SyntaxKind.DeclareKeyword)!, "'declare' keyword is redundant here.");
       }
       if (autoExportEnabled && !isExport(node)) {
         fail(
@@ -76,7 +76,7 @@ function walk(ctx: Lint.WalkContext<void>): void {
         node.kind === ts.SyntaxKind.InterfaceDeclaration ||
         node.kind === ts.SyntaxKind.TypeAliasDeclaration
       ) {
-        fail(mod(node, ts.SyntaxKind.DeclareKeyword), "'declare' keyword is redundant here.");
+        fail(mod(node, ts.SyntaxKind.DeclareKeyword)!, "'declare' keyword is redundant here.");
       }
     }
   }
@@ -85,8 +85,8 @@ function walk(ctx: Lint.WalkContext<void>): void {
     ctx.addFailureAtNode(node, failure(Rule.metadata.ruleName, reason));
   }
 
-  function mod(node: ts.Statement, kind: ts.SyntaxKind): ts.Node {
-    return node.modifiers!.find((m) => m.kind === kind)!;
+  function mod(node: ts.Statement, kind: ts.SyntaxKind): ts.Node | undefined {
+    return ts.canHaveModifiers(node) ? ts.getModifiers(node)?.find((m) => m.kind === kind) : undefined;
   }
 
   function checkModule(moduleDeclaration: ts.ModuleDeclaration): void {
@@ -110,7 +110,7 @@ function walk(ctx: Lint.WalkContext<void>): void {
       // Compiler will error for 'declare' here anyway, so just check for 'export'.
       if (isExport(s) && autoExportEnabled && !isDefault(s)) {
         fail(
-          mod(s, ts.SyntaxKind.ExportKeyword),
+          mod(s, ts.SyntaxKind.ExportKeyword)!,
           "'export' keyword is redundant here because " +
             "all declarations in this module are exported automatically. " +
             "If you have a good reason to export some declarations and not others, " +
@@ -138,15 +138,15 @@ function isModuleDeclaration(node: ts.Node): node is ts.ModuleDeclaration {
 }
 
 function isDeclare(node: ts.Node): boolean {
-  return Lint.hasModifier(node.modifiers, ts.SyntaxKind.DeclareKeyword);
+  return ts.canHaveModifiers(node) && !!ts.getModifiers(node)?.some((m) => m.kind === ts.SyntaxKind.DeclareKeyword);
 }
 
 function isExport(node: ts.Node): boolean {
-  return Lint.hasModifier(node.modifiers, ts.SyntaxKind.ExportKeyword);
+  return ts.canHaveModifiers(node) && !!ts.getModifiers(node)?.some((m) => m.kind === ts.SyntaxKind.ExportKeyword);
 }
 
 function isDefault(node: ts.Node): boolean {
-  return Lint.hasModifier(node.modifiers, ts.SyntaxKind.DefaultKeyword);
+  return ts.canHaveModifiers(node) && !!ts.getModifiers(node)?.some((m) => m.kind === ts.SyntaxKind.DefaultKeyword);
 }
 
 // tslint:disable-next-line:max-line-length

package/src/util.ts

@@ -31,33 +31,6 @@ export function getCommonDirectoryName(files: readonly string[]): string {
   return basename(minDir);
 }
 
-export function eachModuleStatement(sourceFile: ts.SourceFile, action: (statement: ts.Statement) => void): void {
-  if (!sourceFile.isDeclarationFile) {
-    return;
-  }
-
-  for (const node of sourceFile.statements) {
-    if (ts.isModuleDeclaration(node)) {
-      const statements = getModuleDeclarationStatements(node);
-      if (statements) {
-        for (const statement of statements) {
-          action(statement);
-        }
-      }
-    } else {
-      action(node);
-    }
-  }
-}
-
-export function getModuleDeclarationStatements(node: ts.ModuleDeclaration): readonly ts.Statement[] | undefined {
-  let { body } = node;
-  while (body && body.kind === ts.SyntaxKind.ModuleDeclaration) {
-    body = body.body;
-  }
-  return body && ts.isModuleBlock(body) ? body.statements : undefined;
-}
-
 export async function getCompilerOptions(dirPath: string): Promise<ts.CompilerOptions> {
   const tsconfigPath = join(dirPath, "tsconfig.json");
   if (!(await pathExists(tsconfigPath))) {

package/test/no-import-default-of-export-equals.test.ts

@@ -0,0 +1,48 @@
+import { ESLintUtils } from "@typescript-eslint/utils";
+
+import * as noImportDefaultOfExportEquals from "../src/rules/no-import-default-of-export-equals";
+
+const ruleTester = new ESLintUtils.RuleTester({
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    ecmaVersion: 2018,
+    tsconfigRootDir: __dirname,
+    project: "./tsconfig.no-import-default-of-export-equals.json",
+  },
+});
+
+ruleTester.run("no-import-default-of-export-equals", noImportDefaultOfExportEquals, {
+  invalid: [
+    {
+      filename: "index.d.ts",
+      code: `declare module "a" {
+    interface I {}
+    export = I;
+}
+
+declare module "b" {
+import a from "a";
+}`,
+      errors: [
+        {
+          line: 7,
+          messageId: "noImportDefaultOfExportEquals",
+        },
+      ],
+    },
+  ],
+  valid: [
+    {
+      filename: "index.d.ts",
+      code: `declare module "a" {
+    interface I {}
+    export default I;
+}
+
+declare module "b" {
+    import a from "a";
+}
+`,
+    },
+  ],
+});

package/test/no-single-element-tuple-type.test.ts

@@ -0,0 +1,28 @@
+import { ESLintUtils } from "@typescript-eslint/utils";
+
+import * as noDeclareCurrentPackage from "../src/rules/no-single-element-tuple-type";
+
+const ruleTester = new ESLintUtils.RuleTester({
+  parser: "@typescript-eslint/parser",
+});
+
+ruleTester.run("no-single-element-tuple-type", noDeclareCurrentPackage, {
+  invalid: [
+    {
+      code: `type Test<T> = [T];`,
+      errors: [
+        {
+          line: 1,
+          messageId: "singleElementTupleType",
+        },
+      ],
+    },
+  ],
+  valid: [
+    `type Test = number[];`,
+    `type Test<T> = T;`,
+    `type Test<T> = T[];`,
+    `type Test<T> = [T, number];`,
+    `type Test<T> = [T, T];`,
+  ],
+});

package/test/tsconfig.no-import-default-of-export-equals.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "esnext"
+  },
+    "files": [
+        "index.d.ts",
+        "file.ts"
+    ]
+}