@definitelytyped/eslint-plugin 0.0.195 → 0.0.197

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @definitelytyped/eslint-plugin
 
+## 0.0.197
+
+### Patch Changes
+
+- 3d6c2ffd: Port expect rule from tslint to eslint
+
+## 0.0.196
+
+### Patch Changes
+
+- 7805956b: Require eslint ^8.40.0 as peerDependency
+
 ## 0.0.195
 
 ### Patch Changes

package/dist/rules/expect.d.ts

@@ -0,0 +1,11 @@
+type Options = [
+    {
+        versionsToTest?: {
+            readonly versionName: string;
+            readonly path: string;
+        }[];
+    }
+];
+type MessageIds = "noTsconfig" | "twoAssertions" | "failure" | "diagnostic" | "programContents" | "noMatch" | "needInstall";
+declare const rule: import("../util").RuleModule<Options, MessageIds>;
+export = rule;

package/dist/rules/expect.js

@@ -0,0 +1,428 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const utils_1 = require("@definitelytyped/utils");
+const util_1 = require("../util");
+const utils_2 = require("@typescript-eslint/utils");
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const builtinTypeScript = require("typescript");
+const rule = (0, util_1.createRule)({
+    name: "expect",
+    meta: {
+        type: "problem",
+        docs: {
+            description: "Asserts types with $ExpectType.",
+        },
+        messages: {
+            noTsconfig: `Could not find a tsconfig.json file.`,
+            twoAssertions: "This line has 2 $ExpectType assertions.",
+            failure: `TypeScript{{versionNameString}} expected type to be:\n  {{expectedType}}\ngot:\n  {{actualType}}`,
+            diagnostic: `TypeScript{{versionNameString}} {{message}}`,
+            programContents: `Program source files differ between TypeScript versions. This may be a dtslint bug.\n` +
+                `Expected to find a file '{{fileName}}' present in ${builtinTypeScript.versionMajorMinor}, but did not find it in ts@{{versionName}}.`,
+            noMatch: "Cannot match a node to this assertion. If this is a multiline function call, ensure the assertion is on the line above.",
+            needInstall: `A module look-up failed, this often occurs when you need to run \`pnpm install\` on a dependent module before you can lint.
+
+Before you debug, first try running:
+
+   pnpm install -w --filter '...{./types/{{dirPath}}}...'
+
+Then re-run.`,
+        },
+        schema: [
+            {
+                type: "object",
+                properties: {
+                    versionsToTest: {
+                        type: "array",
+                        items: {
+                            type: "object",
+                            properties: {
+                                versionName: { type: "string" },
+                                path: { type: "string" },
+                            },
+                            required: ["versionName", "path"],
+                            additionalProperties: false,
+                        },
+                    },
+                },
+                additionalProperties: false,
+            },
+        ],
+    },
+    defaultOptions: [{}],
+    create(context) {
+        if ((0, utils_1.isDeclarationPath)(context.filename) || !context.sourceCode.text.includes("$ExpectType")) {
+            return {};
+        }
+        const tsconfigPath = (0, util_1.findUp)(context.filename, (dir) => {
+            const tsconfig = path_1.default.join(dir, "tsconfig.json");
+            return fs_1.default.existsSync(tsconfig) ? tsconfig : undefined;
+        });
+        if (!tsconfigPath) {
+            context.report({
+                messageId: "noTsconfig",
+                loc: zeroSourceLocation,
+            });
+            return {};
+        }
+        // TODO: determine TS versions to run based on this package
+        const dirPath = path_1.default.dirname(tsconfigPath);
+        const parserServices = utils_2.ESLintUtils.getParserServices(context);
+        return {
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            Program(node) {
+                var _a;
+                // Grab the filename as known by TS, just to make sure we get the right normalization.
+                const fileName = parserServices.esTreeNodeToTSNodeMap.get(node).fileName;
+                const getLocFromIndex = (index) => context.sourceCode.getLocFromIndex(index);
+                const toReport = new Map();
+                const reporter = ({ versionName, messageId, data, loc }) => {
+                    const key = JSON.stringify({ messageId, data, loc });
+                    let existing = toReport.get(key);
+                    if (existing === undefined) {
+                        toReport.set(key, (existing = { messageId, data, loc, versions: new Set() }));
+                    }
+                    existing.versions.add(versionName);
+                };
+                let versionsToTest = (_a = context.options[0]) === null || _a === void 0 ? void 0 : _a.versionsToTest;
+                if (!(versionsToTest === null || versionsToTest === void 0 ? void 0 : versionsToTest.length)) {
+                    // In the editor, just use the built-in install of TypeScript.
+                    versionsToTest = [{ versionName: "", path: require.resolve("typescript") }];
+                }
+                for (const version of versionsToTest) {
+                    const ts = require(version.path);
+                    const program = getProgram(tsconfigPath, ts, version.versionName, parserServices.program);
+                    walk(getLocFromIndex, reporter, fileName, program, ts, version.versionName, 
+                    /*nextHigherVersion*/ undefined, dirPath);
+                }
+                for (const { messageId, data, loc, versions } of toReport.values()) {
+                    const versionNames = [...versions].sort().join(", ");
+                    context.report({
+                        messageId,
+                        data: { ...data, versionNameString: versionNames ? `@${versionNames}` : "" },
+                        loc,
+                    });
+                }
+            },
+        };
+    },
+});
+const programCache = new WeakMap();
+/** Maps a tslint Program to one created with the version specified in `options`. */
+function getProgram(configFile, ts, versionName, lintProgram) {
+    let versionToProgram = programCache.get(lintProgram);
+    if (versionToProgram === undefined) {
+        versionToProgram = new Map();
+        programCache.set(lintProgram, versionToProgram);
+    }
+    let newProgram = versionToProgram.get(versionName);
+    if (newProgram === undefined) {
+        newProgram = createProgram(configFile, ts);
+        versionToProgram.set(versionName, newProgram);
+    }
+    return newProgram;
+}
+function createProgram(configFile, ts) {
+    var _a;
+    const projectDirectory = path_1.default.dirname(configFile);
+    const { config } = ts.readConfigFile(configFile, ts.sys.readFile);
+    const parseConfigHost = {
+        fileExists: fs_1.default.existsSync,
+        readDirectory: ts.sys.readDirectory,
+        readFile: (file) => fs_1.default.readFileSync(file, "utf8"),
+        useCaseSensitiveFileNames: true,
+    };
+    const parsed = ts.parseJsonConfigFileContent(config, parseConfigHost, path_1.default.resolve(projectDirectory), {
+        noEmit: true,
+    });
+    if (((_a = config.compilerOptions) === null || _a === void 0 ? void 0 : _a.module) === "node16" && parsed.options.module === undefined) {
+        // TypeScript version is too old to handle the "node16" module option,
+        // but we can run tests falling back to commonjs/node.
+        parsed.options.module = ts.ModuleKind.CommonJS;
+        parsed.options.moduleResolution = ts.ModuleResolutionKind.NodeJs;
+    }
+    const host = ts.createCompilerHost(parsed.options, true);
+    return ts.createProgram(parsed.fileNames, parsed.options, host);
+}
+const zeroSourceLocation = {
+    start: { line: 0, column: 0 },
+    end: { line: 0, column: 0 },
+};
+function walk(getLocFromIndex, report, fileName, program, ts, versionName, nextHigherVersion, dirPath) {
+    const sourceFile = program.getSourceFile(fileName);
+    if (!sourceFile) {
+        report({
+            versionName,
+            messageId: "programContents",
+            data: { fileName, versionName },
+            loc: zeroSourceLocation,
+        });
+        return;
+    }
+    const checker = program.getTypeChecker();
+    if (versionName) {
+        // If we're using the built-in version of TS, then we're in the editor and tsserver will report diagnostics.
+        // Don't care about emit errors.
+        const diagnostics = ts.getPreEmitDiagnostics(program, sourceFile);
+        for (const diagnostic of diagnostics) {
+            addDiagnosticFailure(diagnostic);
+        }
+        const cannotFindDepsDiags = diagnostics
+            .filter((d) => !d.file || isExternalDependency(d.file, dirPath, program))
+            .find((d) => d.code === 2307 && d.messageText.toString().includes("Cannot find module"));
+        if (cannotFindDepsDiags && cannotFindDepsDiags.file) {
+            const packageInfo = (0, util_1.findTypesPackage)(fileName);
+            if (!packageInfo) {
+                throw new Error("Could not find package info for " + fileName);
+            }
+            const dtRoot = (0, util_1.findUp)(packageInfo.dir, (dir) => {
+                if (fs_1.default.existsSync(path_1.default.join(dir, "notNeededPackages.json"))) {
+                    return dir;
+                }
+                return undefined;
+            });
+            if (dtRoot) {
+                const dirPath = path_1.default.relative(dtRoot, path_1.default.dirname(packageInfo.dir));
+                report({
+                    versionName,
+                    messageId: "needInstall",
+                    data: { dirPath },
+                    loc: zeroSourceLocation,
+                });
+            }
+        }
+    }
+    if (sourceFile.isDeclarationFile || !sourceFile.text.includes("$ExpectType")) {
+        // Normal file.
+        return;
+    }
+    const { typeAssertions, duplicates } = parseAssertions(sourceFile);
+    for (const line of duplicates) {
+        addFailureAtLine(report, { versionName, messageId: "twoAssertions" }, line);
+    }
+    const { unmetExpectations, unusedAssertions } = getExpectTypeFailures(sourceFile, typeAssertions, checker, ts);
+    for (const { node, expected, actual } of unmetExpectations) {
+        report({
+            versionName,
+            messageId: "failure",
+            data: {
+                expectedType: expected,
+                actualType: actual,
+            },
+            loc: {
+                start: getLocFromIndex(node.getStart(sourceFile)),
+                end: getLocFromIndex(node.getEnd()),
+            },
+        });
+    }
+    for (const line of unusedAssertions) {
+        addFailureAtLine(report, {
+            versionName,
+            messageId: "noMatch",
+        }, line - 1);
+    }
+    function addDiagnosticFailure(diagnostic) {
+        const intro = getIntro();
+        if (diagnostic.file === sourceFile) {
+            const msg = `${intro}\n${ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n")}`;
+            report({
+                versionName,
+                messageId: "diagnostic",
+                data: { message: msg },
+                loc: {
+                    start: getLocFromIndex(diagnostic.start),
+                    end: getLocFromIndex(diagnostic.start + diagnostic.length),
+                },
+            });
+        }
+        else {
+            report({
+                versionName,
+                messageId: "diagnostic",
+                data: { message: `${intro}\n${fileName}${ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n")}` },
+                loc: zeroSourceLocation,
+            });
+        }
+    }
+    function getIntro() {
+        if (nextHigherVersion === undefined) {
+            return `compile error: `;
+        }
+        else {
+            const msg = `Compile error in typescript@${versionName} but not in typescript@${nextHigherVersion}.\n`;
+            const explain = nextHigherVersion === "next"
+                ? "TypeScript@next features not yet supported."
+                : `Fix by adding '"minimumTypeScriptVersion": "${nextHigherVersion}"' to package.json.`;
+            return msg + explain;
+        }
+    }
+    function addFailureAtLine(report, info, line) {
+        const start = sourceFile.getPositionOfLineAndCharacter(line, 0);
+        let end = start + sourceFile.text.split("\n")[line].length;
+        if (sourceFile.text[end - 1] === "\r") {
+            end--;
+        }
+        report({
+            ...info,
+            loc: {
+                start: getLocFromIndex(start),
+                end: getLocFromIndex(end),
+            },
+        });
+    }
+}
+// TODO(jakebailey): dedupe these copied frunctions from dtslint
+function normalizePath(file) {
+    // replaces '\' with '/' and forces all DOS drive letters to be upper-case
+    return path_1.default
+        .normalize(file)
+        .replace(/\\/g, "/")
+        .replace(/^[a-z](?=:)/, (c) => c.toUpperCase());
+}
+function startsWithDirectory(filePath, dirPath) {
+    const normalFilePath = normalizePath(filePath);
+    const normalDirPath = normalizePath(dirPath).replace(/\/$/, "");
+    return normalFilePath.startsWith(normalDirPath + "/") || normalFilePath.startsWith(normalDirPath + "\\");
+}
+function isExternalDependency(file, dirPath, program) {
+    return !startsWithDirectory(file.fileName, dirPath) || program.isSourceFileFromExternalLibrary(file);
+}
+function parseAssertions(sourceFile) {
+    const typeAssertions = new Map();
+    const duplicates = [];
+    const { text } = sourceFile;
+    const commentRegexp = /\/\/(.*)/g;
+    const lineStarts = sourceFile.getLineStarts();
+    let curLine = 0;
+    while (true) {
+        const commentMatch = commentRegexp.exec(text);
+        if (commentMatch === null) {
+            break;
+        }
+        // Match on the contents of that comment so we do nothing in a commented-out assertion,
+        // i.e. `// foo; // $ExpectType number`
+        if (!commentMatch[1].startsWith(" $ExpectType ")) {
+            continue;
+        }
+        const line = getLine(commentMatch.index);
+        const expectedType = commentMatch[1].slice(" $ExpectType ".length);
+        // Don't bother with the assertion if there are 2 assertions on 1 line. Just fail for the duplicate.
+        if (typeAssertions.delete(line)) {
+            duplicates.push(line);
+        }
+        else {
+            typeAssertions.set(line, expectedType);
+        }
+    }
+    return { typeAssertions, duplicates };
+    function getLine(pos) {
+        // advance curLine to be the line preceding 'pos'
+        while (lineStarts[curLine + 1] <= pos) {
+            curLine++;
+        }
+        // If this is the first token on the line, it applies to the next line.
+        // Otherwise, it applies to the text to the left of it.
+        return isFirstOnLine(text, lineStarts[curLine], pos) ? curLine + 1 : curLine;
+    }
+}
+function isFirstOnLine(text, lineStart, pos) {
+    for (let i = lineStart; i < pos; i++) {
+        if (text[i] !== " ") {
+            return false;
+        }
+    }
+    return true;
+}
+function getExpectTypeFailures(sourceFile, typeAssertions, checker, ts) {
+    const unmetExpectations = [];
+    // Match assertions to the first node that appears on the line they apply to.
+    // `forEachChild` isn't available as a method in older TypeScript versions, so must use `ts.forEachChild` instead.
+    ts.forEachChild(sourceFile, function iterate(node) {
+        if (node.kind === ts.SyntaxKind.EndOfFileToken) {
+            return;
+        }
+        const line = lineOfPosition(node.getStart(sourceFile), sourceFile);
+        const expected = typeAssertions.get(line);
+        if (expected !== undefined) {
+            // https://github.com/Microsoft/TypeScript/issues/14077
+            if (node.kind === ts.SyntaxKind.ExpressionStatement) {
+                node = node.expression;
+            }
+            const type = checker.getTypeAtLocation(getNodeForExpectType(node, ts));
+            const actual = type
+                ? checker.typeToString(type, /*enclosingDeclaration*/ undefined, ts.TypeFormatFlags.NoTruncation)
+                : "";
+            let actualNormalized;
+            const candidates = expected.split(/\s*\|\|\s*/).map((s) => s.trim());
+            if (!(
+            // Fast path
+            (candidates.some((s) => s === actual) ||
+                candidates.some((s) => {
+                    actualNormalized !== null && actualNormalized !== void 0 ? actualNormalized : (actualNormalized = normalizedTypeToString(ts, actual));
+                    const normalized = normalizedTypeToString(ts, s);
+                    return normalized === actualNormalized;
+                })))) {
+                unmetExpectations.push({ node, expected, actual });
+            }
+            typeAssertions.delete(line);
+        }
+        ts.forEachChild(node, iterate);
+    });
+    return { unmetExpectations, unusedAssertions: typeAssertions.keys() };
+}
+function normalizedTypeToString(ts, type) {
+    const sourceFile = ts.createSourceFile("foo.ts", `declare var x: ${type};`, ts.ScriptTarget.Latest);
+    const typeNode = sourceFile.statements[0].declarationList.declarations[0].type;
+    const printer = ts.createPrinter({});
+    function print(node) {
+        return printer.printNode(ts.EmitHint.Unspecified, node, sourceFile);
+    }
+    // TODO: pass undefined instead once https://github.com/microsoft/TypeScript/pull/52941 is released
+    const context = ts.nullTransformationContext;
+    function visit(node) {
+        node = ts.visitEachChild(node, visit, context);
+        if (ts.isUnionTypeNode(node)) {
+            const types = node.types
+                .map((t) => [t, print(t)])
+                .sort((a, b) => (a[1] < b[1] ? -1 : 1))
+                .map((t) => t[0]);
+            return ts.factory.updateUnionTypeNode(node, ts.factory.createNodeArray(types));
+        }
+        if (ts.isTypeOperatorNode(node) &&
+            node.operator === ts.SyntaxKind.ReadonlyKeyword &&
+            ts.isArrayTypeNode(node.type)) {
+            // It's possible that this would conflict with a library which defines their own type with this name,
+            // but that's unlikely (and was not previously handled in a prior revision of type string normalization).
+            return ts.factory.createTypeReferenceNode("ReadonlyArray", [skipTypeParentheses(ts, node.type.elementType)]);
+        }
+        return node;
+    }
+    const visited = visit(typeNode);
+    return print(visited);
+}
+function skipTypeParentheses(ts, node) {
+    while (ts.isParenthesizedTypeNode(node))
+        node = node.type;
+    return node;
+}
+function getNodeForExpectType(node, ts) {
+    if (node.kind === ts.SyntaxKind.VariableStatement) {
+        // ts2.0 doesn't have `isVariableStatement`
+        const { declarationList: { declarations }, } = node;
+        if (declarations.length === 1) {
+            const { initializer } = declarations[0];
+            if (initializer) {
+                return initializer;
+            }
+        }
+    }
+    return node;
+}
+function lineOfPosition(pos, sourceFile) {
+    return sourceFile.getLineAndCharacterOfPosition(pos).line;
+}
+module.exports = rule;
+//# sourceMappingURL=expect.js.map

package/dist/rules/expect.js.map

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

package/dist/rules/index.d.ts

@@ -17,4 +17,10 @@ export declare const rules: {
     "no-single-declare-module": import("../util").RuleModule<never[], "oneModuleDeclaration">;
     "no-old-dt-header": import("../util").RuleModule<never[], "noOldDTHeader">;
     "no-import-of-dev-dependencies": import("../util").RuleModule<never[], "noImportOfDevDependencies" | "noReferenceOfDevDependencies">;
+    expect: import("../util").RuleModule<[{
+        versionsToTest?: {
+            readonly versionName: string;
+            readonly path: string;
+        }[] | undefined;
+    }], "noTsconfig" | "twoAssertions" | "failure" | "diagnostic" | "programContents" | "noMatch" | "needInstall">;
 };

package/dist/rules/index.js

@@ -19,6 +19,7 @@ const strictExportDeclareModifiers = require("./strict-export-declare-modifiers"
 const noSingleDeclareModule = require("./no-single-declare-module");
 const noOldDTHeader = require("./no-old-dt-header");
 const noImportOfDevDependencies = require("./no-import-of-dev-dependencies");
+const expect = require("./expect");
 exports.rules = {
     "export-just-namespace": exportJustNamespace,
     "no-any-union": noAnyUnion,
@@ -38,5 +39,6 @@ exports.rules = {
     "no-single-declare-module": noSingleDeclareModule,
     "no-old-dt-header": noOldDTHeader,
     "no-import-of-dev-dependencies": noImportOfDevDependencies,
+    expect,
 };
 //# sourceMappingURL=index.js.map

package/dist/rules/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/rules/index.ts"],"names":[],"mappings":";;;AAAA,+DAAgE;AAChE,6CAA8C;AAC9C,qDAAsD;AACtD,+CAAgD;AAChD,uDAAwD;AACxD,wEAAyE;AACzE,sFAAuF;AACvF,uEAAwE;AACxE,iDAAkD;AAClD,2EAA4E;AAC5E,mEAAoE;AACpE,qDAAsD;AACtD,mEAAoE;AACpE,4DAA6D;AAC7D,kFAAmF;AACnF,oEAAqE;AACrE,oDAAqD;AACrD,6EAA8E;AAEjE,QAAA,KAAK,GAAG;IACnB,uBAAuB,EAAE,mBAAmB;IAC5C,cAAc,EAAE,UAAU;IAC1B,kBAAkB,EAAE,cAAc;IAClC,eAAe,EAAE,WAAW;IAC5B,mBAAmB,EAAE,eAAe;IACpC,4BAA4B,EAAE,uBAAuB;IACrD,oCAAoC,EAAE,6BAA6B;IACnE,4BAA4B,EAAE,sBAAsB;IACpD,gBAAgB,EAAE,YAAY;IAC9B,8BAA8B,EAAE,wBAAwB;IACxD,yBAAyB,EAAE,qBAAqB;IAChD,kBAAkB,EAAE,cAAc;IAClC,yBAAyB,EAAE,qBAAqB;IAChD,qBAAqB,EAAE,kBAAkB;IACzC,iCAAiC,EAAE,4BAA4B;IAC/D,0BAA0B,EAAE,qBAAqB;IACjD,kBAAkB,EAAE,aAAa;IACjC,+BAA+B,EAAE,yBAAyB;CAC3D,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/rules/index.ts"],"names":[],"mappings":";;;AAAA,+DAAgE;AAChE,6CAA8C;AAC9C,qDAAsD;AACtD,+CAAgD;AAChD,uDAAwD;AACxD,wEAAyE;AACzE,sFAAuF;AACvF,uEAAwE;AACxE,iDAAkD;AAClD,2EAA4E;AAC5E,mEAAoE;AACpE,qDAAsD;AACtD,mEAAoE;AACpE,4DAA6D;AAC7D,kFAAmF;AACnF,oEAAqE;AACrE,oDAAqD;AACrD,6EAA8E;AAC9E,mCAAoC;AAEvB,QAAA,KAAK,GAAG;IACnB,uBAAuB,EAAE,mBAAmB;IAC5C,cAAc,EAAE,UAAU;IAC1B,kBAAkB,EAAE,cAAc;IAClC,eAAe,EAAE,WAAW;IAC5B,mBAAmB,EAAE,eAAe;IACpC,4BAA4B,EAAE,uBAAuB;IACrD,oCAAoC,EAAE,6BAA6B;IACnE,4BAA4B,EAAE,sBAAsB;IACpD,gBAAgB,EAAE,YAAY;IAC9B,8BAA8B,EAAE,wBAAwB;IACxD,yBAAyB,EAAE,qBAAqB;IAChD,kBAAkB,EAAE,cAAc;IAClC,yBAAyB,EAAE,qBAAqB;IAChD,qBAAqB,EAAE,kBAAkB;IACzC,iCAAiC,EAAE,4BAA4B;IAC/D,0BAA0B,EAAE,qBAAqB;IACjD,kBAAkB,EAAE,aAAa;IACjC,+BAA+B,EAAE,yBAAyB;IAC1D,MAAM;CACP,CAAC"}

package/dist/util.d.ts

@@ -3,6 +3,7 @@ export type RuleModule<TOptions extends readonly unknown[], TMessageIds extends
 export declare const createRule: <TOptions extends readonly unknown[], TMessageIds extends string>(opts: Readonly<ESLintUtils.RuleWithMetaAndName<TOptions, TMessageIds>>) => RuleModule<TOptions, TMessageIds>;
 export declare function getTypesPackageForDeclarationFile(file: string): string | undefined;
 export declare function commentsMatching(sourceFile: Readonly<TSESLint.SourceCode>, regex: RegExp, f: (match: string, c: TSESTree.Comment) => void): void;
+export declare function findUp<T extends {}>(p: string, fn: (p: string) => T | undefined): T | undefined;
 export interface TypesPackageInfo {
     dir: string;
     /** package.json with name="@types/foo__bar-baz" */

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.getImportSource = exports.findTypesPackage = exports.commentsMatching = exports.getTypesPackageForDeclarationFile = exports.createRule = void 0;
+exports.getImportSource = exports.findTypesPackage = exports.findUp = 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"));
@@ -40,6 +40,7 @@ function findUp(p, fn) {
     }
     return undefined;
 }
+exports.findUp = findUp;
 // TODO(jakebailey): pull this helper out to util package?
 function isTypesPackage(packageJson) {
     return (typeof packageJson.name === "string" &&

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/eslint-plugin",
-  "version": "0.0.195",
+  "version": "0.0.197",
   "description": "ESLint rules for DefinitelyTyped",
   "main": "./dist/index.js",
   "publishConfig": {
@@ -25,7 +25,7 @@
   "peerDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.11.0",
     "@typescript-eslint/parser": "^6.11.0",
-    "eslint": "^8.0.0",
+    "eslint": "^8.40.0",
     "eslint-plugin-jsdoc": "^44.0.0",
     "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"
   },