@definitelytyped/definitions-parser 0.0.187 → 0.0.189

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @definitelytyped/definitions-parser
 
+## 0.0.189
+
+### Patch Changes
+
+- a18ce6b1: Remove use of module resolution and OTHER_FILES, instead include all dts files in packages
+
+  Files in packages are no longer determined by import resolution stemming from `index.d.ts` and tests (along with those listed in `OTHER_FILES.txt`).
+  Instead, all files matching the glob `**/*.d.{ts,cts,mts,*.d.ts}` are included in the package, excluding those inside of versioned subdirectories.
+
+  While not used for automated package publishing, an `.npmignore` is now required in each package.
+  This allows for one-off `npm pack`-ing of packages, such that external tooling can get a rough approximation of what will be published for analysis.
+
+- Updated dependencies [a18ce6b1]
+  - @definitelytyped/header-parser@0.0.186
+  - @definitelytyped/utils@0.0.184
+
+## 0.0.188
+
+### Patch Changes
+
+- Updated dependencies [90e1d0ae]
+  - @definitelytyped/typescript-versions@0.0.180
+  - @definitelytyped/header-parser@0.0.185
+  - @definitelytyped/utils@0.0.183
+
 ## 0.0.187
 
 ### Patch Changes

package/allowedPackageJsonDependencies.txt

@@ -8,6 +8,7 @@
 @babel/template
 @babel/traverse
 @babel/types
+@commander-js/extra-typings
 @elastic/elasticsearch
 @electron/get
 @ember/test-helpers

package/dist/lib/definition-parser.d.ts

@@ -1,6 +1,4 @@
-import { TypeScriptVersion } from "@definitelytyped/typescript-versions";
 import { FS } from "@definitelytyped/utils";
-import * as ts from "typescript";
 import { DirectoryParsedTypingVersion, TypingsData, TypingsVersionsRaw } from "../packages";
 export declare function getTypingInfo(packageNameOrTypesDirectoryName: string, dt: FS): Promise<TypingsVersionsRaw | undefined | {
     errors: string[];
@@ -16,11 +14,4 @@ export declare function getTypingInfo(packageNameOrTypesDirectoryName: string, d
  * ```
  */
 export declare function parseVersionFromDirectoryName(directoryName: string | undefined): DirectoryParsedTypingVersion | undefined;
-export declare function getFiles(dt: FS, typingsData: TypingsData, moduleResolutionHost: ts.ModuleResolutionHost): readonly FilesForSingleTypeScriptVersion[];
-export interface FilesForSingleTypeScriptVersion {
-    /** Undefined for root (which uses typeScriptVersion in package.json instead) */
-    readonly typescriptVersion: TypeScriptVersion | undefined;
-    readonly declFiles: readonly string[];
-    readonly tsconfigPathsForHash: string | undefined;
-}
-export declare function readFileAndThrowOnBOM(fileName: string, fs: FS): string;
+export declare function getFiles(dt: FS, typingsData: TypingsData, olderVersionDirectories: readonly string[]): readonly string[];

package/dist/lib/definition-parser.js

@@ -1,41 +1,14 @@
 "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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readFileAndThrowOnBOM = exports.getFiles = exports.parseVersionFromDirectoryName = exports.getTypingInfo = void 0;
+exports.getFiles = exports.parseVersionFromDirectoryName = exports.getTypingInfo = void 0;
 const header_parser_1 = require("@definitelytyped/header-parser");
 const utils_1 = require("@definitelytyped/utils");
 const assert_1 = __importDefault(require("assert"));
-const path_1 = __importDefault(require("path"));
-const ts = __importStar(require("typescript"));
 const packages_1 = require("../packages");
-const module_info_1 = require("./module-info");
 const settings_1 = require("./settings");
-const utils_2 = require("./utils");
 function matchesVersion(typingsDataRaw, version, considerLibraryMinorVersion) {
     return (typingsDataRaw.header.libraryMajorVersion === version.major &&
         (considerLibraryMinorVersion
@@ -60,7 +33,7 @@ async function getTypingInfo(packageNameOrTypesDirectoryName, dt) {
         return version === undefined ? undefined : { directoryName: fileOrDirectoryName, version };
     });
     const considerLibraryMinorVersion = olderVersionDirectories.some(({ version }) => version.minor !== undefined);
-    const latestDataResult = await getPackageJsonInfoForPackage(packageNameOrTypesDirectoryName, rootDirectoryLs, fs);
+    const latestDataResult = await getPackageJsonInfoForPackage(packageNameOrTypesDirectoryName, rootDirectoryLs, fs, olderVersionDirectories.map(({ directoryName }) => directoryName));
     if (Array.isArray(latestDataResult)) {
         return { errors: [...errors, ...latestDataResult] };
     }
@@ -76,7 +49,7 @@ async function getTypingInfo(packageNameOrTypesDirectoryName, dt) {
         }
         // tslint:disable-next-line:non-literal-fs-path -- Not a reference to the fs package
         const ls = fs.readdir(directoryName);
-        const result = await getPackageJsonInfoForPackage(packageNameOrTypesDirectoryName, ls, fs.subDir(directoryName));
+        const result = await getPackageJsonInfoForPackage(packageNameOrTypesDirectoryName, ls, fs.subDir(directoryName), []);
         if (Array.isArray(result)) {
             errors.push(...result);
             return result;
@@ -147,7 +120,7 @@ function parseVersionFromDirectoryName(directoryName) {
     };
 }
 exports.parseVersionFromDirectoryName = parseVersionFromDirectoryName;
-async function getPackageJsonInfoForPackage(typingsPackageName, ls, fs) {
+async function getPackageJsonInfoForPackage(typingsPackageName, ls, fs, olderVersionDirectories) {
     const errors = [];
     const typesVersionAndPackageJson = getTypesVersionsAndPackageJson(ls);
     if (Array.isArray(typesVersionAndPackageJson)) {
@@ -168,7 +141,7 @@ async function getPackageJsonInfoForPackage(typingsPackageName, ls, fs) {
     const header = Array.isArray(packageJsonResult) ? undefined : packageJsonResult;
     const allowedDependencies = await (0, settings_1.getAllowedPackageJsonDependencies)();
     errors.push(...(0, header_parser_1.checkPackageJsonDependencies)(packageJson.dependencies, packageJsonName, allowedDependencies));
-    errors.push(...(0, header_parser_1.checkPackageJsonDependencies)(packageJson.devDependencies, packageJsonName, allowedDependencies, `@${settings_1.scopeName}/${typingsPackageName}`));
+    errors.push(...(0, header_parser_1.checkPackageJsonDependencies)(packageJson.devDependencies, packageJsonName, allowedDependencies, `${utils_1.atTypesSlash}${typingsPackageName}`));
     const imports = (0, header_parser_1.checkPackageJsonImports)(packageJson.imports, packageJsonName);
     if (Array.isArray(imports)) {
         errors.push(...imports);
@@ -194,211 +167,39 @@ async function getPackageJsonInfoForPackage(typingsPackageName, ls, fs) {
         imports: imports,
         exports: exports,
         type: packageJsonType,
+        olderVersionDirectories,
     };
 }
-function getFiles(dt, typingsData, moduleResolutionHost) {
-    const errors = [];
+function getFiles(dt, typingsData, olderVersionDirectories) {
     const rootDir = dt.subDir("types").subDir(typingsData.subDirectoryPath);
-    const typesVersionAndPackageJson = getTypesVersionsAndPackageJson(rootDir.readdir());
-    if (Array.isArray(typesVersionAndPackageJson)) {
-        errors.push(...typesVersionAndPackageJson);
-    }
-    const { remainingLs, typesVersions } = Array.isArray(typesVersionAndPackageJson)
-        ? { remainingLs: [], typesVersions: [] }
-        : typesVersionAndPackageJson;
-    const dataForRoot = getFilesForSingleTypeScriptVersion(undefined, typingsData.typesDirectoryName, remainingLs, rootDir, moduleResolutionHost);
-    if (Array.isArray(dataForRoot)) {
-        errors.push(...dataForRoot);
-    }
-    const dataForOtherTypesVersions = typesVersions.map((tsVersion) => {
-        const subFs = rootDir.subDir(`ts${tsVersion}`);
-        const data = getFilesForSingleTypeScriptVersion(tsVersion, typingsData.typesDirectoryName, subFs.readdir(), subFs, moduleResolutionHost);
-        if (Array.isArray(data)) {
-            errors.push(...data);
+    const files = [];
+    function addFileIfDeclaration(path) {
+        if ((0, utils_1.isDeclarationPath)(path)) {
+            files.push(path);
         }
-        return data;
-    });
-    if (errors.length) {
-        throw new Error(`Errors encountered resolving files for ${typingsData.name}:\n${errors.join("\n")}`);
-    }
-    return [dataForRoot, ...dataForOtherTypesVersions];
-}
-exports.getFiles = getFiles;
-/**
- * @param typescriptVersion Set if this is in e.g. a `ts3.1` directory.
- * @param typesDirectoryName Name of the outermost directory; e.g. for "node/v4" this is just "node".
- * @param ls All file/directory names in `directory`.
- * @param fs FS rooted at the directory for this particular TS version, e.g. `types/abs/ts3.1` or `types/abs` when typescriptVersion is undefined.
- */
-function getFilesForSingleTypeScriptVersion(typescriptVersion, typesDirectoryName, ls, fs, moduleResolutionHost) {
-    var _a, _b;
-    const errors = [];
-    const tsconfig = fs.readJson("tsconfig.json");
-    const configHost = {
-        ...moduleResolutionHost,
-        readDirectory: (dir) => fs.readdir(dir),
-        useCaseSensitiveFileNames: true,
-    };
-    const compilerOptions = ts.parseJsonConfigFileContent(tsconfig, configHost, path_1.default.resolve("/", fs.debugPath())).options;
-    errors.push(...checkFilesFromTsConfig(typesDirectoryName, tsconfig, fs.debugPath()));
-    let types, tests;
-    try {
-        ({ types, tests } = (0, module_info_1.allReferencedFiles)((_a = tsconfig.files) !== null && _a !== void 0 ? _a : [], fs, typesDirectoryName, moduleResolutionHost, compilerOptions));
     }
-    catch (err) {
-        if (err instanceof Error) {
-            errors.push(err.message);
+    function addFiles(root, rootName, name) {
+        const path = rootName ? `${rootName}/${name}` : name;
+        if (!root.isDirectory(name)) {
+            addFileIfDeclaration(path);
+            return;
         }
-        else {
-            throw err;
-        }
-        return errors;
-    }
-    const usedFiles = new Set([...types.keys(), ...tests, "tsconfig.json", "tslint.json"].map((f) => (0, utils_2.slicePrefixes)(f, "node_modules/@types/" + typesDirectoryName + "/")));
-    const otherFiles = ls.includes(unusedFilesName)
-        ? fs
-            // tslint:disable-next-line:non-literal-fs-path -- Not a reference to the fs package
-            .readFile(unusedFilesName)
-            .split(/\r?\n/g)
-            .filter(Boolean)
-        : [];
-    if (ls.includes(unusedFilesName) && !otherFiles.length) {
-        errors.push(`In ${typesDirectoryName}: OTHER_FILES.txt is empty.`);
-    }
-    for (const file of otherFiles) {
-        if (!isRelativePath(file)) {
-            errors.push(`In ${typesDirectoryName}: A path segment is empty or all dots ${file}`);
+        const newRoot = root.subDir(name);
+        for (const sub of root.readdir(name)) {
+            addFiles(newRoot, path, sub);
         }
     }
-    // Note: findAllUnusedFiles also modifies usedFiles and otherFiles and errors
-    const unusedFiles = findAllUnusedFiles(ls, usedFiles, otherFiles, errors, typesDirectoryName, fs);
-    if (unusedFiles.length) {
-        errors.push("\n\t* " +
-            unusedFiles.map((unused) => `Unused file ${unused}`).join("\n\t* ") +
-            `\n\t(used files: ${JSON.stringify(Array.from(usedFiles))})`);
-    }
-    for (const untestedTypeFile of (0, utils_1.filter)(otherFiles, (name) => name.endsWith(".d.ts") || name.endsWith(".d.mts") || name.endsWith(".d.cts"))) {
-        // add d.ts files from OTHER_FILES.txt in order get their dependencies
-        // tslint:disable-next-line:non-literal-fs-path -- Not a reference to the fs package
-        types.set(untestedTypeFile, (0, module_info_1.createSourceFile)(untestedTypeFile, fs.readFile(untestedTypeFile), moduleResolutionHost, compilerOptions));
-    }
-    if (errors.length)
-        return errors;
-    const declFiles = (0, utils_1.sort)(types.keys());
-    return {
-        typescriptVersion,
-        declFiles: typescriptVersion === undefined ? declFiles : declFiles.map((f) => `ts${typescriptVersion}/${f}`),
-        tsconfigPathsForHash: JSON.stringify((_b = tsconfig.compilerOptions) === null || _b === void 0 ? void 0 : _b.paths),
-    };
-}
-function checkFilesFromTsConfig(packageName, tsconfig, directoryPath) {
-    const errors = [];
-    const tsconfigPath = `${directoryPath}/tsconfig.json`;
-    if (tsconfig.include) {
-        errors.push(`In tsconfig, don't use "include", must use "files"`);
-    }
-    const files = tsconfig.files;
-    if (!files) {
-        errors.push(`${tsconfigPath} needs to specify  "files"`);
-        return errors;
-    }
-    for (const file of files) {
-        if (file.startsWith("./")) {
-            errors.push(`In ${tsconfigPath}: Unnecessary "./" at the start of ${file}`);
-        }
-        if (!isRelativePath(file)) {
-            errors.push(`In ${tsconfigPath}: A path segment is empty or all dots ${file}`);
-        }
-        if (file.endsWith(".d.ts") && file !== "index.d.ts") {
-            errors.push(`${packageName}: Only index.d.ts may be listed explicitly in tsconfig's "files" entry.
-Other d.ts files must either be referenced through index.d.ts, tests, or added to OTHER_FILES.txt.`);
-        }
-        if (!file.endsWith(".d.ts") && !file.startsWith("test/")) {
-            const expectedName = `${packageName}-tests.ts`;
-            if (file !== expectedName && file !== `${expectedName}x`) {
-                const message = file.endsWith(".ts") || file.endsWith(".tsx")
-                    ? `Expected file '${file}' to be named '${expectedName}' or to be inside a '${directoryPath}/test/' directory`
-                    : `Unexpected file extension for '${file}' -- expected '.ts' or '.tsx' (maybe this should not be in "files", but ` +
-                        "OTHER_FILES.txt)";
-                errors.push(message);
-            }
-        }
-    }
-    return errors;
-}
-function isRelativePath(path) {
-    return path.split(/\//).every((part) => part.length > 0 && !part.match(/^\.+$|[\\\n\r]/));
-}
-function readFileAndThrowOnBOM(fileName, fs) {
-    // tslint:disable-next-line:non-literal-fs-path -- Not a reference to the fs package
-    const text = fs.readFile(fileName);
-    if (text.charCodeAt(0) === 0xfeff) {
-        const commands = ["npm install -g strip-bom-cli", `strip-bom ${fileName} > fix`, `mv fix ${fileName}`];
-        throw new Error(`File '${fileName}' has a BOM. Try using:\n${commands.join("\n")}`);
-    }
-    return text;
-}
-exports.readFileAndThrowOnBOM = readFileAndThrowOnBOM;
-const unusedFilesName = "OTHER_FILES.txt";
-/** Modifies usedFiles and otherFiles and errors */
-function findAllUnusedFiles(ls, usedFiles, otherFiles, errors, packageName, fs) {
-    // Double-check that no windows "\\" broke in.
-    for (const fileName of usedFiles) {
-        if ((0, utils_1.hasWindowsSlashes)(fileName)) {
-            errors.push(`In ${packageName}: windows slash detected in ${fileName}`);
-        }
-    }
-    return findAllUnusedRecur(new Set(ls), usedFiles, new Set(otherFiles), errors, fs);
-}
-function findAllUnusedRecur(ls, usedFiles, otherFiles, errors, fs) {
-    const unused = [];
-    for (const lsEntry of ls) {
-        if (usedFiles.has(lsEntry)) {
-            continue;
-        }
-        if (otherFiles.has(lsEntry)) {
-            otherFiles.delete(lsEntry);
-            continue;
-        }
-        if (fs.isDirectory(lsEntry)) {
-            const subdir = fs.subDir(lsEntry);
-            // We allow a "scripts" directory to be used for scripts.
-            if (lsEntry === "node_modules" || lsEntry === "scripts") {
+    for (const name of rootDir.readdir()) {
+        if (rootDir.isDirectory(name)) {
+            // This emulates writing `!v16/**`, `!v0.2/**`, etc. in the files array,
+            // without trusting the user to have written the right thing.
+            if (olderVersionDirectories.includes(name)) {
                 continue;
             }
-            const lssubdir = subdir.readdir();
-            if (lssubdir.length === 0) {
-                errors.push(`Empty directory ${subdir.debugPath()} (${(0, utils_1.join)(usedFiles)})`);
-            }
-            function takeSubdirectoryOutOfSet(originalSet) {
-                const subdirSet = new Set();
-                for (const file of originalSet) {
-                    const sub = (0, utils_1.withoutStart)(file, `${lsEntry}/`);
-                    if (sub !== undefined) {
-                        originalSet.delete(file);
-                        subdirSet.add(sub);
-                    }
-                }
-                return subdirSet;
-            }
-            findAllUnusedRecur(lssubdir, takeSubdirectoryOutOfSet(usedFiles), takeSubdirectoryOutOfSet(otherFiles), errors, subdir);
-        }
-        else {
-            if (lsEntry.toLowerCase() !== "readme.md" &&
-                lsEntry !== "NOTICE" &&
-                lsEntry !== ".editorconfig" &&
-                lsEntry !== ".eslintrc.json" &&
-                lsEntry !== unusedFilesName) {
-                unused.push(`${fs.debugPath()}/${lsEntry}`);
-            }
         }
+        addFiles(rootDir, "", name);
     }
-    for (const otherFile of otherFiles) {
-        if (usedFiles.has(otherFile)) {
-            errors.push(`File ${fs.debugPath()}${otherFile} listed in ${unusedFilesName} is already reachable from tsconfig.json.`);
-        }
-        errors.push(`File ${fs.debugPath()}/${otherFile} listed in ${unusedFilesName} does not exist.`);
-    }
-    return unused;
+    return files;
 }
+exports.getFiles = getFiles;
 //# sourceMappingURL=definition-parser.js.map

package/dist/lib/definition-parser.js.map

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

package/dist/lib/settings.d.ts

@@ -4,6 +4,4 @@ export declare const sourceRemote = "origin";
 export declare const typesDirectoryName = "types";
 /** URL to download the repository from. */
 export declare const definitelyTypedZipUrl = "https://codeload.github.com/DefinitelyTyped/DefinitelyTyped/tar.gz/master";
-/** Note: this is 'types' and not '@types' */
-export declare const scopeName = "types";
 export declare const getAllowedPackageJsonDependencies: () => Promise<ReadonlySet<string>>;

package/dist/lib/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllowedPackageJsonDependencies = exports.scopeName = exports.definitelyTypedZipUrl = exports.typesDirectoryName = exports.sourceRemote = exports.sourceBranch = exports.dataDirPath = void 0;
+exports.getAllowedPackageJsonDependencies = exports.definitelyTypedZipUrl = exports.typesDirectoryName = exports.sourceRemote = exports.sourceBranch = exports.dataDirPath = void 0;
 const utils_1 = require("@definitelytyped/utils");
 const utils_2 = require("./utils");
 const root = (0, utils_1.joinPaths)(__dirname, "..", "..");
@@ -11,8 +11,6 @@ exports.sourceRemote = "origin";
 exports.typesDirectoryName = "types";
 /** URL to download the repository from. */
 exports.definitelyTypedZipUrl = "https://codeload.github.com/DefinitelyTyped/DefinitelyTyped/tar.gz/master";
-/** Note: this is 'types' and not '@types' */
-exports.scopeName = "types";
 const allowedPackageJsonDependenciesUrl = "https://raw.githubusercontent.com/microsoft/DefinitelyTyped-tools/master/packages/definitions-parser/allowedPackageJsonDependencies.txt";
 exports.getAllowedPackageJsonDependencies = (0, utils_2.withCache)(60 * 60 * 1000, () => {
     return new Promise(async (resolve) => {

package/dist/lib/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/lib/settings.ts"],"names":[],"mappings":";;;AAAA,kDAAiE;AACjE,mCAA4D;AAE5D,MAAM,IAAI,GAAG,IAAA,iBAAS,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC;AAC1C,QAAA,WAAW,GAAG,IAAA,iBAAS,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;AAChD,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAE1C,2CAA2C;AAC9B,QAAA,qBAAqB,GAAG,2EAA2E,CAAC;AAEjH,6CAA6C;AAChC,QAAA,SAAS,GAAG,OAAO,CAAC;AAEjC,MAAM,iCAAiC,GACrC,yIAAyI,CAAC;AAE/H,QAAA,iCAAiC,GAAG,IAAA,iBAAS,EAAC,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAC9E,OAAO,IAAI,OAAO,CAAsB,KAAK,EAAE,OAAO,EAAE,EAAE;QACxD,IAAI,GAAG,GAAG,IAAA,oBAAY,EAAC,IAAA,iBAAS,EAAC,IAAI,EAAE,oCAAoC,CAAC,CAAC,CAAC;QAC9E,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;YACnC,IAAI;gBACF,GAAG,GAAG,MAAM,IAAA,8BAAsB,EAAC,iCAAiC,CAAC,CAAC;aACvE;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,KAAK,CACX,yGAAyG;oBACtG,GAAa,CAAC,OAAO,CACzB,CAAC;aACH;SACF;QACD,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/lib/settings.ts"],"names":[],"mappings":";;;AAAA,kDAAiE;AACjE,mCAA4D;AAE5D,MAAM,IAAI,GAAG,IAAA,iBAAS,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC;AAC1C,QAAA,WAAW,GAAG,IAAA,iBAAS,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;AAChD,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAE1C,2CAA2C;AAC9B,QAAA,qBAAqB,GAAG,2EAA2E,CAAC;AAEjH,MAAM,iCAAiC,GACrC,yIAAyI,CAAC;AAE/H,QAAA,iCAAiC,GAAG,IAAA,iBAAS,EAAC,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAC9E,OAAO,IAAI,OAAO,CAAsB,KAAK,EAAE,OAAO,EAAE,EAAE;QACxD,IAAI,GAAG,GAAG,IAAA,oBAAY,EAAC,IAAA,iBAAS,EAAC,IAAI,EAAE,oCAAoC,CAAC,CAAC,CAAC;QAC9E,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;YACnC,IAAI;gBACF,GAAG,GAAG,MAAM,IAAA,8BAAsB,EAAC,iCAAiC,CAAC,CAAC;aACvE;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,KAAK,CACX,yGAAyG;oBACtG,GAAa,CAAC,OAAO,CACzB,CAAC;aACH;SACF;QACD,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/lib/utils.d.ts

@@ -1,3 +1,2 @@
 export declare function getUrlContentsAsString(url: string): Promise<string>;
 export declare function withCache<T>(expiresInMs: number, getValue: () => Promise<T>): () => Promise<T>;
-export declare function slicePrefixes(s: string, prefix: string): string;

package/dist/lib/utils.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.slicePrefixes = exports.withCache = exports.getUrlContentsAsString = void 0;
+exports.withCache = exports.getUrlContentsAsString = void 0;
 const https = __importStar(require("https"));
 function getUrlContentsAsString(url) {
     return new Promise((resolve, reject) => {
@@ -51,11 +51,4 @@ function withCache(expiresInMs, getValue) {
     };
 }
 exports.withCache = withCache;
-function slicePrefixes(s, prefix) {
-    while (s.startsWith(prefix)) {
-        s = s.slice(prefix.length);
-    }
-    return s;
-}
-exports.slicePrefixes = slicePrefixes;
 //# sourceMappingURL=utils.js.map

package/dist/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAE/B,SAAgB,sBAAsB,CAAC,GAAW;IAChD,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,KAAK;aACF,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YAChB,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;YACnC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,wDAYC;AAED,SAAgB,SAAS,CAAI,WAAmB,EAAE,QAA0B;IAC1E,IAAI,KAAoB,CAAC;IACzB,IAAI,UAA8B,CAAC;IACnC,OAAO,KAAK,IAAI,EAAE;QAChB,IAAI,UAAU,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,GAAG,WAAW,EAAE;YACrE,KAAK,GAAG,MAAM,QAAQ,EAAE,CAAC;YACzB,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;SACzB;QACD,OAAO,KAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAVD,8BAUC;AAED,SAAgB,aAAa,CAAC,CAAS,EAAE,MAAc;IACrD,OAAO,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC3B,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;KAC5B;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AALD,sCAKC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAE/B,SAAgB,sBAAsB,CAAC,GAAW;IAChD,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,KAAK;aACF,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YAChB,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;YACnC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,wDAYC;AAED,SAAgB,SAAS,CAAI,WAAmB,EAAE,QAA0B;IAC1E,IAAI,KAAoB,CAAC;IACzB,IAAI,UAA8B,CAAC;IACnC,OAAO,KAAK,IAAI,EAAE;QAChB,IAAI,UAAU,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,GAAG,WAAW,EAAE;YACrE,KAAK,GAAG,MAAM,QAAQ,EAAE,CAAC;YACzB,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;SACzB;QACD,OAAO,KAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAVD,8BAUC"}

package/dist/mocks.js

@@ -129,9 +129,6 @@ import { drills } from "boring";
 import { hovercars } from "boring/secondary";
 import australia = require('boring/commonjs');
 import { inane } from "boring/v1";
-`);
-    boring.set("OTHER_FILES.txt", `
-untested.d.ts
 `);
     boring.set("tsconfig.json", tsconfig(["boring-tests.ts"]));
     boring.set("package.json", packageJson("boring", "1.0", {

package/dist/mocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.js","sourceRoot":"","sources":["../src/mocks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kEAAqE;AACrE,kDAAkF;AAClF,+CAAiC;AAEjC,MAAa,MAAM;IAIjB;QACE,IAAI,CAAC,IAAI,GAAG,IAAI,WAAG,CAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,CACX,wBAAwB,EACxB,IAAI,CAAC,SAAS,CAAC;YACb,QAAQ,EAAE;gBACR,OAAO,EAAE;oBACP,WAAW,EAAE,SAAS;oBACtB,WAAW,EAAE,OAAO;iBACrB;aACF;SACF,CAAC,CACH,CAAC;QACF,IAAI,CAAC,EAAE,GAAG,IAAI,kBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,WAAmB;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAEM,KAAK,CAAC,WAAmB;QAC9B,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IAED;;;;;;;;OAQG;IACI,sBAAsB,CAAC,WAAmB,EAAE,YAAyB,EAAE,WAAmB;QAC/F,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,2BAAmB,EAAC,WAAW,CAAC,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,YAAY,CAAW,CAAC;QACpD,IAAI,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,SAAS,EAAE;YAC/C,MAAM,IAAI,KAAK,CAAC,WAAW,WAAW,+BAA+B,CAAC,CAAC;SACxE;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAW,CAAC,CAAC;QACxE,MAAM,YAAY,GAAG,IAAA,mCAAmB,EAAC,IAAA,2BAAmB,EAAC,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;QAC5F,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1C;QACD,MAAM,aAAa,GAAG,GAAG,YAAY,CAAC,mBAAmB,IAAI,YAAY,CAAC,mBAAmB,EAAE,CAAC;QAChG,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAE,CAAC;QAExD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,CAAW,CAAC,CAAC;QAEtE,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,kBAAkB,CAAC,KAAK,IAAI,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAClH,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QAErF,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YACnC,IACE,OAAO,KAAK,MAAM;gBAClB,KAAK,KAAK,YAAY;gBACtB,KAAK,KAAK,eAAe;gBACzB,KAAK,KAAK,cAAc;gBACxB,CAAC,CAAC,OAAO,YAAY,WAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EACzD;gBACA,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAxED,wBAwEC;AAED,SAAgB,YAAY;IAC1B,MAAM,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC;IAExB,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,CACR,YAAY,EACZ;;;CAGH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,gBAAgB,EAChB;;;;;;;;;;CAUH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,eAAe,EACf;;;CAGH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,iBAAiB,EACjB;;CAEH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,eAAe,EACf;;;;CAIH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,SAAS,EACT;;CAEH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,eAAe,EACf;;;CAGH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,iBAAiB,EACjB;;;;;;CAMH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,iBAAiB,EACjB;;CAEH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAC3D,MAAM,CAAC,GAAG,CACR,cAAc,EACd,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE;QAC3B,cAAc,EAAE,GAAG;QACnB,sBAAsB,EAAE,GAAG;QAC3B,eAAe,EAAE,GAAG;QACpB,iBAAiB,EAAE,GAAG;QACtB,eAAe,EAAE,GAAG;QACpB,0BAA0B,EAAE,GAAG;KAChC,CAAC,CACH,CAAC;IAEF,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,CACR,YAAY,EACZ;;;CAGH,CACE,CAAC;IAEF,MAAM,CAAC,GAAG,CACR,aAAa,EACb;;CAEH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,iBAAiB,EACjB;;CAEH,CACE,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpC,KAAK,CAAC,GAAG,CACP,gBAAgB,EAChB;;CAEH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAClF,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAEnF,MAAM,aAAa,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAClD,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,wBAAwB,CAAC,CAAC;IAC1D,aAAa,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;IACjD,aAAa,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;IAC1E,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAEzF,MAAM,sBAAsB,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACtE,sBAAsB,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAC7C,sBAAsB,CAAC,GAAG,CACxB,oCAAoC,EACpC;CACH,CACE,CAAC;IACF,sBAAsB,CAAC,GAAG,CACxB,eAAe,EACf,IAAI,CAAC,SAAS,CAAC;QACb,eAAe,EAAE,EAAE;QACnB,KAAK,EAAE,CAAC,YAAY,EAAE,oCAAoC,CAAC;KAC5D,CAAC,CACH,CAAC;IACF,sBAAsB,CAAC,GAAG,CACxB,cAAc,EACd,WAAW,CAAC,2BAA2B,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAC5E,CAAC;IAEF,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,CACR,aAAa,EACb;;CAEH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,YAAY,EACZ;;;CAGH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,iBAAiB,EACjB;;CAEH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAC3D,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IAE7D,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAC/C,MAAM,CAAC,GAAG,CACR,YAAY,EACZ;CACH,CACE,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,oBAAoB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IACzE,MAAM,CAAC,GAAG,CACR,eAAe,EACf,IAAI,CAAC,SAAS,CAAC;QACb,eAAe,EAAE;YACf,KAAK,EAAE;gBACL,cAAc,EAAE,CAAC,cAAc,CAAC;aACjC;SACF;QACD,KAAK,EAAE,CAAC,YAAY,CAAC;KACtB,CAAC,CACH,CAAC;IAEF,OAAO,EAAE,CAAC;AACZ,CAAC;AA3LD,oCA2LC;AAED,SAAS,QAAQ,CAAC,SAAmB;IACnC,OAAO;;;;;;;;;;;;;;;;;;;;;;EAsBP,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;;EAEhE,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,WAAmB,EAAE,OAAe,EAAE,YAAoC;IAC7F,OAAO;;sBAEa,WAAW;kBACf,OAAO;;;;;;;UAOf,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;SAC3B,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,YAAY,IAAI,OAAO,OAAO,GAAG,CAAC;SAC3D,IAAI,CAAC,KAAK,CAAC;;;kBAGJ,WAAW;;EAE3B,CAAC;AACH,CAAC"}
+{"version":3,"file":"mocks.js","sourceRoot":"","sources":["../src/mocks.ts"],"names":[],"mappings":"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"}

package/dist/packages.d.ts

@@ -14,7 +14,6 @@ export declare class AllPackages {
     /** Keys are `typesDirectoryName` strings */
     private readonly errors;
     private isComplete;
-    private moduleResolutionHost;
     private constructor();
     getNotNeededPackage(typesDirectoryName: string): NotNeededPackage | undefined;
     hasTypingFor(dep: PackageId): Promise<boolean>;
@@ -42,7 +41,6 @@ export declare class AllPackages {
     allDependencyTypings(pkg: TypingsData): AsyncIterable<TypingsData>;
     private readAllTypings;
 }
-export declare function removeTypesScope(name: string): string;
 export declare function getMangledNameForScopedPackage(packageName: string): string;
 export type AnyPackage = NotNeededPackage | TypingsData;
 /** Prefer to use `AnyPackage` instead of this. */
@@ -153,15 +151,18 @@ export interface TypingsDataRaw {
      * Can be either MIT or Apache v2, defaults to MIT when not explicitly defined in this package’s "package.json".
      */
     readonly license: License;
+    /**
+     * Which subdirectories of this package are older versions, e.g. `v1`, `v0.1`, `v15`.
+     */
+    readonly olderVersionDirectories: readonly string[];
 }
 export declare class TypingsVersions {
-    private moduleResolutionHost;
     private readonly map;
     /**
      * Sorted from latest to oldest.
      */
     private readonly versions;
-    constructor(dt: FS, data: TypingsVersionsRaw, moduleResolutionHost?: import("typescript").ModuleResolutionHost);
+    constructor(dt: FS, data: TypingsVersionsRaw);
     getAll(): Iterable<TypingsData>;
     get(version: semver.Range, errorMessage?: string): TypingsData;
     tryGet(version: semver.Range): TypingsData | undefined;
@@ -171,8 +172,7 @@ export declare class TypingsData extends PackageBase {
     private dt;
     private readonly data;
     readonly isLatest: boolean;
-    private moduleResolutionHost;
-    constructor(dt: FS, data: TypingsDataRaw, isLatest: boolean, moduleResolutionHost?: import("typescript").ModuleResolutionHost);
+    constructor(dt: FS, data: TypingsDataRaw, isLatest: boolean);
     get name(): string;
     get libraryName(): string;
     get contributors(): readonly Contributor[];
@@ -180,7 +180,7 @@ export declare class TypingsData extends PackageBase {
     get minor(): number;
     get minTypeScriptVersion(): TypeScriptVersion;
     get typesVersions(): readonly TypeScriptVersion[];
-    private typesVersionsFiles;
+    private _files;
     getFiles(): readonly string[];
     getDtsFiles(): readonly string[];
     get license(): License;

package/dist/packages.js

@@ -23,14 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDependencyFromFile = exports.readNotNeededPackages = exports.TypingsData = exports.TypingsVersions = exports.formatTypingVersion = exports.NotNeededPackage = exports.PackageBase = exports.getMangledNameForScopedPackage = exports.removeTypesScope = exports.AllPackages = void 0;
+exports.getDependencyFromFile = exports.readNotNeededPackages = exports.TypingsData = exports.TypingsVersions = exports.formatTypingVersion = exports.NotNeededPackage = exports.PackageBase = exports.getMangledNameForScopedPackage = exports.AllPackages = void 0;
 const assert = require("assert");
 const typescript_versions_1 = require("@definitelytyped/typescript-versions");
 const utils_1 = require("@definitelytyped/utils");
 const semver = __importStar(require("semver"));
 const definition_parser_1 = require("./lib/definition-parser");
 const settings_1 = require("./lib/settings");
-const utils_2 = require("./lib/utils");
 class AllPackages {
     static fromFS(dt) {
         return new AllPackages(dt, new Map(), readNotNeededPackages(dt));
@@ -65,7 +64,6 @@ class AllPackages {
         /** Keys are `typesDirectoryName` strings */
         this.errors = new Map();
         this.isComplete = false;
-        this.moduleResolutionHost = (0, utils_1.createModuleResolutionHost)(this.dt, this.dt.debugPath());
     }
     getNotNeededPackage(typesDirectoryName) {
         return this.notNeeded.find((p) => p.typesDirectoryName === typesDirectoryName);
@@ -87,14 +85,14 @@ class AllPackages {
     }
     async tryResolve(dep) {
         var _a, _b;
-        const typesDirectoryName = (_a = dep.typesDirectoryName) !== null && _a !== void 0 ? _a : dep.name.slice(settings_1.scopeName.length + 2);
+        const typesDirectoryName = (_a = dep.typesDirectoryName) !== null && _a !== void 0 ? _a : (0, utils_1.trimAtTypesPrefixIfPresent)(dep.name);
         const versions = await this.tryGetTypingsVersions(typesDirectoryName);
         const depVersion = new semver.Range(dep.version === "*" ? "*" : `^${formatTypingVersion(dep.version)}`);
         return (versions && ((_b = versions.tryGet(depVersion)) === null || _b === void 0 ? void 0 : _b.id)) || dep;
     }
     async resolve(dep) {
         var _a;
-        const typesDirectoryName = (_a = dep.typesDirectoryName) !== null && _a !== void 0 ? _a : dep.name.slice(settings_1.scopeName.length + 2);
+        const typesDirectoryName = (_a = dep.typesDirectoryName) !== null && _a !== void 0 ? _a : (0, utils_1.trimAtTypesPrefixIfPresent)(dep.name);
         const versions = await this.tryGetTypingsVersions(typesDirectoryName);
         if (!versions) {
             throw new Error(`No typings found with directory name '${dep.typesDirectoryName}'.`);
@@ -126,7 +124,7 @@ class AllPackages {
     }
     async tryGetTypingsData(pkg) {
         var _a;
-        const typesDirectoryName = (_a = pkg.typesDirectoryName) !== null && _a !== void 0 ? _a : pkg.name.slice(settings_1.scopeName.length + 2);
+        const typesDirectoryName = (_a = pkg.typesDirectoryName) !== null && _a !== void 0 ? _a : (0, utils_1.trimAtTypesPrefixIfPresent)(pkg.name);
         const versions = await this.tryGetTypingsVersions(typesDirectoryName);
         return (versions && versions.tryGet(new semver.Range(pkg.version === "*" ? "*" : `^${formatTypingVersion(pkg.version)}`)));
     }
@@ -146,7 +144,7 @@ class AllPackages {
             this.errors.set(typesDirectoryName, raw.errors);
             return undefined;
         }
-        versions = new TypingsVersions(this.dt, raw, this.moduleResolutionHost);
+        versions = new TypingsVersions(this.dt, raw);
         this.types.set(typesDirectoryName, versions);
         return versions;
     }
@@ -168,11 +166,11 @@ class AllPackages {
     /** Returns all of the dependencies *that are typed on DT*, ignoring others, and including test dependencies. */
     async *allDependencyTypings(pkg) {
         for (const [name, version] of pkg.allPackageJsonDependencies()) {
-            if (!name.startsWith(`@${settings_1.scopeName}/`))
+            if (!(0, utils_1.isTypesPackageName)(name))
                 continue;
             if (pkg.name === name)
                 continue;
-            const typesDirectoryName = removeTypesScope(name);
+            const typesDirectoryName = (0, utils_1.mustTrimAtTypesPrefix)(name);
             const versions = await this.tryGetTypingsVersions(typesDirectoryName);
             if (versions) {
                 yield versions.get(new semver.Range(version), pkg.name + ":" + JSON.stringify(versions.versions));
@@ -196,10 +194,6 @@ class AllPackages {
     }
 }
 exports.AllPackages = AllPackages;
-function removeTypesScope(name) {
-    return (0, utils_2.slicePrefixes)(name, `@${settings_1.scopeName}/`);
-}
-exports.removeTypesScope = removeTypesScope;
 // Same as the function in moduleNameResolver.ts in typescript
 function getMangledNameForScopedPackage(packageName) {
     if (packageName.startsWith("@")) {
@@ -227,7 +221,7 @@ class PackageBase {
      * Does not include the version directory.
      */
     get typesDirectoryName() {
-        return this.name.slice(settings_1.scopeName.length + 2);
+        return (0, utils_1.mustTrimAtTypesPrefix)(this.name);
     }
     /** Short description for debug output. */
     get desc() {
@@ -265,7 +259,7 @@ class NotNeededPackage extends PackageBase {
         this.libraryName = libraryName;
         assert(libraryName && name && asOfVersion);
         this.version = new semver.SemVer(asOfVersion);
-        this.name = name.startsWith(`@${settings_1.scopeName}/`) ? name : `@${settings_1.scopeName}/${name}`;
+        this.name = (0, utils_1.isTypesPackageName)(name) ? name : `${utils_1.atTypesSlash}${name}`;
     }
     get major() {
         return this.version.major;
@@ -290,18 +284,14 @@ function formatTypingVersion(version) {
 }
 exports.formatTypingVersion = formatTypingVersion;
 class TypingsVersions {
-    constructor(dt, data, moduleResolutionHost = (0, utils_1.createModuleResolutionHost)(dt, dt.debugPath())) {
-        this.moduleResolutionHost = moduleResolutionHost;
+    constructor(dt, data) {
         /**
          * Sorted from latest to oldest so that we publish the current version first.
          * This is important because older versions repeatedly reset the "latest" tag to the current version.
          */
         this.versions = Object.keys(data).map((key) => new semver.SemVer(`${key}.9999`));
         this.versions.sort(semver.rcompare);
-        this.map = new Map(this.versions.map((version, i) => [
-            version,
-            new TypingsData(dt, data[`${version.major}.${version.minor}`], !i, this.moduleResolutionHost),
-        ]));
+        this.map = new Map(this.versions.map((version, i) => [version, new TypingsData(dt, data[`${version.major}.${version.minor}`], !i)]));
     }
     getAll() {
         return this.map.values();
@@ -329,12 +319,11 @@ class TypingsVersions {
 }
 exports.TypingsVersions = TypingsVersions;
 class TypingsData extends PackageBase {
-    constructor(dt, data, isLatest, moduleResolutionHost = (0, utils_1.createModuleResolutionHost)(dt, dt.debugPath())) {
+    constructor(dt, data, isLatest) {
         super();
         this.dt = dt;
         this.data = data;
         this.isLatest = isLatest;
-        this.moduleResolutionHost = moduleResolutionHost;
     }
     get name() {
         return this.data.header.name;
@@ -364,14 +353,14 @@ class TypingsData extends PackageBase {
         return this.data.typesVersions;
     }
     getFiles() {
-        if (!this.typesVersionsFiles) {
-            const files = (0, definition_parser_1.getFiles)(this.dt, this, this.moduleResolutionHost);
-            this.typesVersionsFiles = files;
+        if (!this._files) {
+            const files = (0, definition_parser_1.getFiles)(this.dt, this, this.data.olderVersionDirectories);
+            this._files = files;
         }
-        return this.typesVersionsFiles.flatMap((v) => v.declFiles);
+        return this._files;
     }
     getDtsFiles() {
-        return this.getFiles().filter((f) => f.endsWith(".d.ts") || f.endsWith(".d.mts") || f.endsWith(".d.cts"));
+        return this.getFiles().filter(utils_1.isDeclarationPath);
     }
     get license() {
         return this.data.license;
@@ -394,7 +383,7 @@ class TypingsData extends PackageBase {
     }
     getContentHash() {
         var _a;
-        return ((_a = this._contentHash) !== null && _a !== void 0 ? _a : (this._contentHash = hash([...this.getFiles(), "package.json"], (0, utils_1.mapDefined)(this.typesVersionsFiles, (a) => a.tsconfigPathsForHash), this.dt.subDir("types").subDir(this.subDirectoryPath))));
+        return ((_a = this._contentHash) !== null && _a !== void 0 ? _a : (this._contentHash = hash([...this.getFiles(), "package.json"], this.dt.subDir("types").subDir(this.subDirectoryPath))));
     }
     get projectName() {
         return this.data.header.projects[0];
@@ -449,12 +438,23 @@ function getDependencyFromFile(file) {
     return { typesDirectoryName: name, version: "*" };
 }
 exports.getDependencyFromFile = getDependencyFromFile;
-function hash(files, tsconfigPathsForHash, fs) {
-    const fileContents = files.map((f) => `${f}**${(0, definition_parser_1.readFileAndThrowOnBOM)(f, fs)}`);
-    let allContent = fileContents.join("||");
-    for (const path of tsconfigPathsForHash) {
-        allContent += path;
-    }
+function hash(files, fs) {
+    const fileContents = files.map((f) => {
+        let contents = fs.readFile(f);
+        if (f === "package.json") {
+            const parsed = JSON.parse(contents);
+            contents = JSON.stringify(sortedObject(parsed));
+        }
+        return `${f}**${contents}`;
+    });
+    const allContent = fileContents.join("||");
     return (0, utils_1.computeHash)(allContent);
 }
+function sortedObject(o) {
+    const out = {};
+    for (const key of Object.keys(o).sort()) {
+        out[key] = o[key];
+    }
+    return out;
+}
 //# sourceMappingURL=packages.js.map

package/dist/packages.js.map

@@ -1 +1 @@
-{"version":3,"file":"packages.js","sourceRoot":"","sources":["../src/packages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAkC;AAElC,8EAAyE;AACzE,kDAUgC;AAChC,+CAAiC;AACjC,+DAMiC;AACjC,6CAAkG;AAClG,uCAA4C;AAE5C,MAAa,WAAW;IACtB,MAAM,CAAC,MAAM,CAAC,EAAM;QAClB,OAAO,IAAI,WAAW,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,kBAAsD,EAAE,SAAsC;QAChH,MAAM,OAAO,GAAG,IAAI,WAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,WAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAClD,MAAM,EAAE,GAAG,IAAI,kBAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACxC,OAAO,IAAI,WAAW,CACpB,EAAE,EACF,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EACtG,SAAS,CACV,CAAC;IACJ,CAAC;IAED,mEAAmE;IACnE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAAM,EAAE,IAAY;QAC1C,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAa,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;SAC/C;QACD,IAAI,QAAQ,IAAI,IAAI,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACpF;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,yBAAyB,CAAC,CAAC;SAC3D;QACD,OAAO,IAAI,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAOD,YACU,EAAM;IACd,4CAA4C;IAC3B,KAAmC,EACnC,SAAsC;QAH/C,OAAE,GAAF,EAAE,CAAI;QAEG,UAAK,GAAL,KAAK,CAA8B;QACnC,cAAS,GAAT,SAAS,CAA6B;QATzD,4CAA4C;QAC3B,WAAM,GAA0B,IAAI,GAAG,EAAE,CAAC;QACnD,eAAU,GAAG,KAAK,CAAC;QACnB,yBAAoB,GAAG,IAAA,kCAA0B,EAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;IAOrF,CAAC;IAEJ,mBAAmB,CAAC,kBAA0B;QAC5C,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,KAAK,kBAAkB,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAc;QAC/B,OAAO,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS,CAAC;IAC3D,CAAC;IAED,gBAAgB;QACd,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpG,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,wBAAwB,CAAC,kBAA0B;QACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAA,qBAAa,EAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1G,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,OAAO,MAAM,CAAC,MAAM,KAAK,IAAA,cAAM,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAc;;QAC7B,MAAM,kBAAkB,GAAG,MAAA,GAAG,CAAC,kBAAkB,mCAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC1F,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACtE,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxG,OAAO,CAAC,QAAQ,KAAI,MAAA,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,0CAAE,EAAE,CAAA,CAAC,IAAI,GAAG,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAc;;QAC1B,MAAM,kBAAkB,GAAG,MAAA,GAAG,CAAC,kBAAkB,mCAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC1F,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACtE,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,CAAC,kBAAkB,IAAI,CAAC,CAAC;SACtF;QACD,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxG,OAAO,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;IACrC,CAAC;IAED,6GAA6G;IAC7G,KAAK,CAAC,SAAS,CAAC,GAAgB;QAC9B,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC5E,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,kBAA0B;QACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,kBAAkB,GAAG,CAAC,CAAC;SAC3D;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,kBAA0B;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACtE,OAAO,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EAAa;QAChC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACnE;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAc;;QACpC,MAAM,kBAAkB,GAAG,MAAA,GAAG,CAAC,kBAAkB,mCAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC1F,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACtE,OAAO,CACL,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAClH,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,kBAA0B;QAC5D,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAClD,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC;SACjB;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE;YACvC,OAAO,SAAS,CAAC;SAClB;QACD,MAAM,GAAG,GAAG,MAAM,IAAA,iCAAa,EAAC,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,SAAS,CAAC;SAClB;QACD,IAAI,QAAQ,IAAI,GAAG,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAChD,OAAO,SAAS,CAAC;SAClB;QACD,QAAQ,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACxE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,+DAA+D;IAC/D,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,gHAAgH;IAChH,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAgB;QAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,GAAG,CAAC,0BAA0B,EAAE,EAAE;YAC9D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,oBAAS,GAAG,CAAC;gBAAE,SAAS;YACjD,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI;gBAAE,SAAS;YAChC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAClD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;YACtE,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAE,QAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;aAC5G;SACF;IACH,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,OAAO;SACR;QACD,wEAAwE;QACxE,MAAM,IAAA,4CAAiC,GAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;YAC/C,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;gBACtG,OAAO;aACR;YACD,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACvD,CAAC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;CACF;AA3LD,kCA2LC;AAED,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAA,qBAAa,EAAC,IAAI,EAAE,IAAI,oBAAS,GAAG,CAAC,CAAC;AAC/C,CAAC;AAFD,4CAEC;AAED,8DAA8D;AAC9D,SAAgB,8BAA8B,CAAC,WAAmB;IAChE,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC/B,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACpD,IAAI,YAAY,KAAK,WAAW,EAAE;YAChC,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB;SAClD;KACF;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AARD,wEAQC;AAED,QAAQ,CAAC,CAAC,WAAW,CAAC,IAA0C;IAC9D,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;QACpC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;KAC1B;AACH,CAAC;AAID,kDAAkD;AAClD,MAAsB,WAAW;IAC/B,MAAM,CAAC,OAAO,CAAC,CAAc,EAAE,CAAc;QAC3C,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAcD;;;;OAIG;IACH,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,0CAA0C;IAC1C,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;IACjF,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,EAAE,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;IAC5G,CAAC;IAED,WAAW;QACT,OAAO,IAAI,YAAY,gBAAgB,CAAC;IAC1C,CAAC;CACF;AAtCD,kCAsCC;AAeD,MAAa,gBAAiB,SAAQ,WAAW;IAG/C,IAAI,OAAO;QACT,+BAAmB;IACrB,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,IAAY,EAAE,GAAwB;QACnD,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,oCAAoC,CAAC,CAAC;SAClF;QACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAClC,IAAI,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAClE,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,EAAE,CAAC,CAAC;aACjE;SACF;QACD,IAAI,GAAG,CAAC,WAAW,KAAK,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE;YACrD,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,0DAA0D,CAAC,CAAC;SACxG;QAED,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IACtE,CAAC;IAED,YAAqB,IAAY,EAAW,WAAmB,EAAE,WAAmB;QAClF,KAAK,EAAE,CAAC;QADW,SAAI,GAAJ,IAAI,CAAQ;QAAW,gBAAW,GAAX,WAAW,CAAQ;QAE7D,MAAM,CAAC,WAAW,IAAI,IAAI,IAAI,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,oBAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,oBAAS,IAAI,IAAI,EAAE,CAAC;IACjF,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,CAAC;IAED,oHAAoH;IACpH,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,oBAAoB;QACtB,OAAO,uCAAiB,CAAC,MAAM,CAAC;IAClC,CAAC;IAED,iBAAiB;QACf,OAAO,oCAAoC,IAAI,CAAC,WAAW,wEAAwE,CAAC;IACtI,CAAC;CACF;AAhDD,4CAgDC;AAkBD,SAAgB,mBAAmB,CAAC,OAAqC;IACvE,OAAO,GAAG,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;AACrF,CAAC;AAFD,kDAEC;AA0DD,MAAa,eAAe;IAQ1B,YACE,EAAM,EACN,IAAwB,EAChB,uBAAuB,IAAA,kCAA0B,EAAC,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC;QAArE,yBAAoB,GAApB,oBAAoB,CAAiD;QAE7E;;;WAGG;QACH,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEpC,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAChB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,OAAO;YACP,IAAI,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,oBAAoB,CAAC;SAC9F,CAAC,CACH,CAAC;IACJ,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC;IACD,GAAG,CAAC,OAAqB,EAAE,YAAqB;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,OAAO,IAAI,CAAC,QAAQ,KAAK,YAAY,IAAI,EAAE,EAAE,CAAC,CAAC;SAClG;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,CAAC,OAAqB;QAC1B,IAAI;YACF,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,OAAO,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACrC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC;IACzC,CAAC;CACF;AAnDD,0CAmDC;AAED,MAAa,WAAY,SAAQ,WAAW;IAC1C,YACU,EAAM,EACG,IAAoB,EAC5B,QAAiB,EAClB,uBAAuB,IAAA,kCAA0B,EAAC,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC;QAE7E,KAAK,EAAE,CAAC;QALA,OAAE,GAAF,EAAE,CAAI;QACG,SAAI,GAAJ,IAAI,CAAgB;QAC5B,aAAQ,GAAR,QAAQ,CAAS;QAClB,yBAAoB,GAApB,oBAAoB,CAAiD;IAG/E,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC/B,CAAC;IACD,IAAI,WAAW;;QACb,OAAO,CACL,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,mCAAI,IAAA,6BAAqB,EAAC,IAAI,CAAC,kBAAkB,CAAC,mCAAI,IAAI,CAAC,kBAAkB,CAChH,CAAC;IACJ,CAAC;IACD,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACzC,GAAG,CAAC;YACJ,GAAG,EAAE,gBAAgB,IAAI,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;SAC9E,CAAC,CAAC,CAAC;IACN,CAAC;IACD,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAC9C,CAAC;IACD,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAC9C,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,uCAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC;YAC7E,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,wBAAwB;YAC3C,CAAC,CAAC,uCAAiB,CAAC,MAAM,CAAC;IAC/B,CAAC;IACD,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;IACjC,CAAC;IAGD,QAAQ;QACN,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,MAAM,KAAK,GAAG,IAAA,4BAAQ,EAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACjE,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC5G,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3B,CAAC;IACD,IAAI,YAAY;;QACd,OAAO,MAAA,IAAI,CAAC,IAAI,CAAC,YAAY,mCAAI,EAAE,CAAC;IACtC,CAAC;IACD,IAAI,eAAe;;QACjB,OAAO,MAAA,IAAI,CAAC,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC;IACzC,CAAC;IACD,CAAC,0BAA0B;QACzB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;YAC/D,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACvB;QACD,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YAClE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACvB;IACH,CAAC;IAGD,cAAc;;QACZ,OAAO,OAAC,IAAI,CAAC,YAAY,oCAAjB,IAAI,CAAC,YAAY,GAAK,IAAI,CAChC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,EAAE,cAAc,CAAC,EACpC,IAAA,kBAAU,EAAC,IAAI,CAAC,kBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,EACnE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CACtD,EAAC,CAAC;IACL,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IACjC,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,2BAA2B,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC;IAC9F,CAAC;IAED,yEAAyE;IACzE,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC7G,CAAC;CACF;AA1GD,kCA0GC;AAmBD,SAAgB,qBAAqB,CAAC,EAAM;IAC1C,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC,iDAAiD;IACxG,OAAO,MAAM,CAAC,OAAO,CAAE,OAAiE,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC/G,gBAAgB,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,CACnC,CAAC;AACJ,CAAC;AALD,sDAKC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,IAAY;IAEZ,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QACrB,0CAA0C;QAC1C,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,CAAC,yBAAyB;IAEzE,IAAI,YAAY,KAAK,6BAAkB,EAAE;QACvC,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,UAAU,EAAE;QACd,MAAM,OAAO,GAAG,IAAA,iDAA6B,EAAC,UAAU,CAAC,CAAC;QAC1D,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SAC9C;KACF;IAED,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;AACpD,CAAC;AAvBD,sDAuBC;AAED,SAAS,IAAI,CAAC,KAAwB,EAAE,oBAAuC,EAAE,EAAM;IACrF,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,IAAA,yCAAqB,EAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/E,IAAI,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE;QACvC,UAAU,IAAI,IAAI,CAAC;KACpB;IACD,OAAO,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"packages.js","sourceRoot":"","sources":["../src/packages.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@definitelytyped/definitions-parser",
-  "version": "0.0.187",
+  "version": "0.0.189",
   "description": "Reads the DefinitelyTyped repository and provides an API for querying its metadata",
   "homepage": "https://github.com/microsoft/DefinitelyTyped-tools/tree/master/packages/definitions-parser#readme",
   "license": "MIT",
@@ -20,9 +20,9 @@
     "fs-extra": "^9.1.0",
     "pacote": "^13.6.1",
     "semver": "^7.3.7",
-    "@definitelytyped/header-parser": "0.0.184",
-    "@definitelytyped/typescript-versions": "0.0.179",
-    "@definitelytyped/utils": "0.0.182"
+    "@definitelytyped/header-parser": "0.0.186",
+    "@definitelytyped/typescript-versions": "0.0.180",
+    "@definitelytyped/utils": "0.0.184"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.8",

package/dist/lib/module-info.d.ts

@@ -1,8 +0,0 @@
-import * as ts from "typescript";
-import { FS } from "@definitelytyped/utils";
-/** Returns a map from filename (path relative to `directory`) to the SourceFile we parsed for it. */
-export declare function allReferencedFiles(entryFilenames: readonly string[], fs: FS, packageName: string, moduleResolutionHost: ts.ModuleResolutionHost, compilerOptions: ts.CompilerOptions): {
-    types: Map<string, ts.SourceFile>;
-    tests: Set<string>;
-};
-export declare function createSourceFile(filename: string, content: string, moduleResolutionHost: ts.ModuleResolutionHost, compilerOptions: ts.CompilerOptions): ts.SourceFile;

package/dist/lib/module-info.js

@@ -1,208 +0,0 @@
-"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.createSourceFile = exports.allReferencedFiles = void 0;
-const path = __importStar(require("path"));
-const ts = __importStar(require("typescript"));
-const utils_1 = require("@definitelytyped/utils");
-const definition_parser_1 = require("./definition-parser");
-const packages_1 = require("../packages");
-/** Returns a map from filename (path relative to `directory`) to the SourceFile we parsed for it. */
-function allReferencedFiles(entryFilenames, fs, packageName, moduleResolutionHost, compilerOptions) {
-    const seenReferences = new Set();
-    const types = new Map();
-    const tests = new Set();
-    // The directory where the tsconfig/index.d.ts is - i.e., may be a version within the package
-    const baseDirectory = path.resolve("/", fs.debugPath());
-    // The root of the package and all versions, i.e., the direct subdirectory of types/
-    const packageDirectory = baseDirectory.slice(0, baseDirectory.lastIndexOf(`types/${(0, packages_1.getMangledNameForScopedPackage)(packageName)}`) +
-        `types/${(0, packages_1.getMangledNameForScopedPackage)(packageName)}`.length);
-    entryFilenames.forEach((fileName) => recur(undefined, { text: fileName, kind: "path" }));
-    return { types, tests };
-    function recur(containingFileName, ref) {
-        // An absolute file name for use with TS resolution, e.g. '/DefinitelyTyped/types/foo/index.d.ts'
-        let resolvedFileName = resolveReference(containingFileName, ref);
-        if (!resolvedFileName) {
-            return;
-        }
-        resolvedFileName = fs.realPath(resolvedFileName);
-        if (seenReferences.has(resolvedFileName)) {
-            return;
-        }
-        seenReferences.add(resolvedFileName);
-        // E.g. 'index.d.ts' - suitable for lookups in `fs` and for our result
-        const relativeFileName = path.relative(baseDirectory, resolvedFileName);
-        if (path.relative(packageDirectory, resolvedFileName).startsWith("..")) {
-            // We only collected references that started with the current package name or were relative,
-            // so if we resolve an import to something outside the package, we know it was a relative
-            // import to a different package.
-            throw new Error(`${containingFileName !== null && containingFileName !== void 0 ? containingFileName : "tsconfig.json"}: ` +
-                'Definitions must use global references to other packages, not parent ("../xxx") references. ' +
-                `(Based on reference '${ref.text}')`);
-        }
-        // tslint:disable-next-line:non-literal-fs-path -- Not a reference to the fs package
-        if (fs.exists(relativeFileName)) {
-            const src = createSourceFile(resolvedFileName, (0, definition_parser_1.readFileAndThrowOnBOM)(relativeFileName, fs), moduleResolutionHost, compilerOptions);
-            if (relativeFileName.endsWith(".d.ts") ||
-                relativeFileName.endsWith(".d.mts") ||
-                relativeFileName.endsWith(".d.cts")) {
-                types.set(relativeFileName, src);
-            }
-            else {
-                tests.add(relativeFileName);
-            }
-            const refs = findReferencedFiles(src, packageName);
-            refs.forEach((ref) => recur(resolvedFileName, ref));
-        }
-    }
-    function resolveReference(containingFileName, { kind, text, resolutionMode }) {
-        var _a, _b;
-        switch (kind) {
-            case "path":
-                if (containingFileName) {
-                    return ts.resolveTripleslashReference(text, containingFileName);
-                }
-                else {
-                    return path.resolve(baseDirectory, text);
-                }
-            case "types":
-                return (_a = ts.resolveTypeReferenceDirective(text, (0, utils_1.assertDefined)(containingFileName, "Must have a containing file to resolve a type reference directive"), compilerOptions, moduleResolutionHost, 
-                /*redirectedReference*/ undefined, 
-                /*cache*/ undefined, resolutionMode).resolvedTypeReferenceDirective) === null || _a === void 0 ? void 0 : _a.resolvedFileName;
-            case "import":
-                return (_b = ts.resolveModuleName(text, (0, utils_1.assertDefined)(containingFileName, "Must have an containing file to resolve an import"), compilerOptions, moduleResolutionHost, 
-                /*cache*/ undefined, 
-                /*redirectedReference*/ undefined, resolutionMode).resolvedModule) === null || _b === void 0 ? void 0 : _b.resolvedFileName;
-        }
-    }
-}
-exports.allReferencedFiles = allReferencedFiles;
-/**
- * @param subDirectory The specific directory within the DefinitelyTyped directory we are in.
- * For example, `baseDirectory` may be `react-router` and `subDirectory` may be `react-router/lib`.
- * versionsBaseDirectory may be "" when not in typesVersions or ".." when inside `react-router/ts3.1`
- */
-function findReferencedFiles(src, packageName) {
-    const refs = [];
-    for (const ref of src.referencedFiles) {
-        refs.push({
-            text: ref.fileName,
-            kind: "path",
-            resolutionMode: ref.resolutionMode,
-        });
-    }
-    for (const ref of src.typeReferenceDirectives) {
-        // only <reference types="../packagename/x" /> references are local (or "packagename/x", though in 3.7 that doesn't work in DT).
-        if (ref.fileName.startsWith("../" + packageName + "/") || ref.fileName.startsWith(packageName + "/")) {
-            refs.push({ kind: "types", text: ref.fileName, resolutionMode: ref.resolutionMode });
-        }
-    }
-    for (const ref of imports(src)) {
-        const resolutionMode = ts.getModeForUsageLocation(src, ref);
-        if (ref.text.startsWith(".") || (0, packages_1.getMangledNameForScopedPackage)(ref.text).startsWith(packageName + "/")) {
-            refs.push({ kind: "import", text: ref.text, resolutionMode });
-        }
-    }
-    return refs;
-}
-/**
- * All strings referenced in `import` statements.
- * Does *not* include <reference> directives.
- */
-function imports({ statements }) {
-    const result = [];
-    for (const node of statements) {
-        recur(node);
-    }
-    return result;
-    function recur(node) {
-        switch (node.kind) {
-            case ts.SyntaxKind.ImportDeclaration:
-            case ts.SyntaxKind.ExportDeclaration: {
-                const { moduleSpecifier } = node;
-                if (moduleSpecifier && moduleSpecifier.kind === ts.SyntaxKind.StringLiteral) {
-                    result.push(moduleSpecifier);
-                }
-                break;
-            }
-            case ts.SyntaxKind.ImportEqualsDeclaration: {
-                const { moduleReference } = node;
-                if (moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
-                    result.push(parseRequire(moduleReference));
-                }
-                break;
-            }
-            case ts.SyntaxKind.ImportType: {
-                const { argument } = node;
-                if (ts.isLiteralTypeNode(argument) && ts.isStringLiteral(argument.literal)) {
-                    result.push(argument.literal);
-                }
-                break;
-            }
-            default:
-                ts.forEachChild(node, recur);
-        }
-    }
-}
-function parseRequire(reference) {
-    const { expression } = reference;
-    if (!expression || !ts.isStringLiteral(expression)) {
-        throw new Error(`Bad 'import =' reference: ${reference.getText()}`);
-    }
-    return expression;
-}
-function isValueNamespace(ns) {
-    if (!ns.body) {
-        throw new Error("@types should not use shorthand ambient modules");
-    }
-    return ns.body.kind === ts.SyntaxKind.ModuleDeclaration
-        ? isValueNamespace(ns.body)
-        : ns.body.statements.some(statementDeclaresValue);
-}
-function statementDeclaresValue(statement) {
-    switch (statement.kind) {
-        case ts.SyntaxKind.VariableStatement:
-        case ts.SyntaxKind.ClassDeclaration:
-        case ts.SyntaxKind.FunctionDeclaration:
-        case ts.SyntaxKind.EnumDeclaration:
-            return true;
-        case ts.SyntaxKind.ModuleDeclaration:
-            return isValueNamespace(statement);
-        case ts.SyntaxKind.InterfaceDeclaration:
-        case ts.SyntaxKind.TypeAliasDeclaration:
-        case ts.SyntaxKind.ImportEqualsDeclaration:
-            return false;
-        default:
-            throw new Error(`Forgot to implement ambient namespace statement ${ts.SyntaxKind[statement.kind]}`);
-    }
-}
-function createSourceFile(filename, content, moduleResolutionHost, compilerOptions) {
-    const file = ts.createSourceFile(filename, content, ts.ScriptTarget.Latest, /*setParentNodes*/ true);
-    file.impliedNodeFormat = ts.getImpliedNodeFormatForFile(filename, 
-    /*packageJsonInfoCache*/ undefined, moduleResolutionHost, compilerOptions);
-    return file;
-}
-exports.createSourceFile = createSourceFile;
-//# sourceMappingURL=module-info.js.map

package/dist/lib/module-info.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../src/lib/module-info.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,+CAAiC;AACjC,kDAA2D;AAE3D,2DAA4D;AAC5D,0CAA6D;AAE7D,qGAAqG;AACrG,SAAgB,kBAAkB,CAChC,cAAiC,EACjC,EAAM,EACN,WAAmB,EACnB,oBAA6C,EAC7C,eAAmC;IAEnC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,6FAA6F;IAC7F,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;IACxD,oFAAoF;IACpF,MAAM,gBAAgB,GAAG,aAAa,CAAC,KAAK,CAC1C,CAAC,EACD,aAAa,CAAC,WAAW,CAAC,SAAS,IAAA,yCAA8B,EAAC,WAAW,CAAC,EAAE,CAAC;QAC/E,SAAS,IAAA,yCAA8B,EAAC,WAAW,CAAC,EAAE,CAAC,MAAM,CAChE,CAAC;IACF,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACzF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAExB,SAAS,KAAK,CAAC,kBAAsC,EAAE,GAAc;QACnE,iGAAiG;QACjG,IAAI,gBAAgB,GAAG,gBAAgB,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;QACjE,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO;SACR;QACD,gBAAgB,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAEjD,IAAI,cAAc,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;YACxC,OAAO;SACR;QACD,cAAc,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAErC,sEAAsE;QACtE,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QACxE,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACtE,4FAA4F;YAC5F,yFAAyF;YACzF,iCAAiC;YACjC,MAAM,IAAI,KAAK,CACb,GAAG,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,eAAe,IAAI;gBAC1C,8FAA8F;gBAC9F,wBAAwB,GAAG,CAAC,IAAI,IAAI,CACvC,CAAC;SACH;QAED,oFAAoF;QACpF,IAAI,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;YAC/B,MAAM,GAAG,GAAG,gBAAgB,CAC1B,gBAAgB,EAChB,IAAA,yCAAqB,EAAC,gBAAgB,EAAE,EAAE,CAAC,EAC3C,oBAAoB,EACpB,eAAe,CAChB,CAAC;YACF,IACE,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAClC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACnC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACnC;gBACA,KAAK,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;aAClC;iBAAM;gBACL,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;aAC7B;YAED,MAAM,IAAI,GAAG,mBAAmB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,CAAC;SACrD;IACH,CAAC;IAED,SAAS,gBAAgB,CACvB,kBAAsC,EACtC,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAa;;QAEzC,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM;gBACT,IAAI,kBAAkB,EAAE;oBACtB,OAAO,EAAE,CAAC,2BAA2B,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;iBACjE;qBAAM;oBACL,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;iBAC1C;YACH,KAAK,OAAO;gBACV,OAAO,MAAA,EAAE,CAAC,6BAA6B,CACrC,IAAI,EACJ,IAAA,qBAAa,EAAC,kBAAkB,EAAE,mEAAmE,CAAC,EACtG,eAAe,EACf,oBAAoB;gBACpB,uBAAuB,CAAC,SAAS;gBACjC,SAAS,CAAC,SAAS,EACnB,cAAc,CACf,CAAC,8BAA8B,0CAAE,gBAAgB,CAAC;YACrD,KAAK,QAAQ;gBACX,OAAO,MAAA,EAAE,CAAC,iBAAiB,CACzB,IAAI,EACJ,IAAA,qBAAa,EAAC,kBAAkB,EAAE,mDAAmD,CAAC,EACtF,eAAe,EACf,oBAAoB;gBACpB,SAAS,CAAC,SAAS;gBACnB,uBAAuB,CAAC,SAAS,EACjC,cAAc,CACf,CAAC,cAAc,0CAAE,gBAAgB,CAAC;SACtC;IACH,CAAC;AACH,CAAC;AAvGD,gDAuGC;AAQD;;;;GAIG;AACH,SAAS,mBAAmB,CAAC,GAAkB,EAAE,WAAmB;IAClE,MAAM,IAAI,GAAgB,EAAE,CAAC;IAC7B,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,eAAe,EAAE;QACrC,IAAI,CAAC,IAAI,CAAC;YACR,IAAI,EAAE,GAAG,CAAC,QAAQ;YAClB,IAAI,EAAE,MAAM;YACZ,cAAc,EAAE,GAAG,CAAC,cAAc;SACnC,CAAC,CAAC;KACJ;IACD,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,uBAAuB,EAAE;QAC7C,gIAAgI;QAChI,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,GAAG,WAAW,GAAG,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,GAAG,GAAG,CAAC,EAAE;YACpG,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;SACtF;KACF;IAED,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;QAC9B,MAAM,cAAc,GAAG,EAAE,CAAC,uBAAuB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAA,yCAA8B,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,WAAW,GAAG,GAAG,CAAC,EAAE;YACtG,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;SAC/D;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAS,OAAO,CAAC,EAAE,UAAU,EAAiB;IAC5C,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;QAC7B,KAAK,CAAC,IAAI,CAAC,CAAC;KACb;IACD,OAAO,MAAM,CAAC;IAEd,SAAS,KAAK,CAAC,IAAa;QAC1B,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;YACrC,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;gBACpC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAmD,CAAC;gBAChF,IAAI,eAAe,IAAI,eAAe,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE;oBAC3E,MAAM,CAAC,IAAI,CAAC,eAAmC,CAAC,CAAC;iBAClD;gBACD,MAAM;aACP;YAED,KAAK,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;gBAC1C,MAAM,EAAE,eAAe,EAAE,GAAG,IAAkC,CAAC;gBAC/D,IAAI,eAAe,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,uBAAuB,EAAE;oBAClE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC;iBAC5C;gBACD,MAAM;aACP;YAED,KAAK,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBAC7B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAyB,CAAC;gBAC/C,IAAI,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;oBAC1E,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;iBAC/B;gBACD,MAAM;aACP;YAED;gBACE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAChC;IACH,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,SAAqC;IACzD,MAAM,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;IACjC,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;QAClD,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;KACrE;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAwB;IAChD,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;KACpE;IACD,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB;QACrD,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,IAA4B,CAAC;QACnD,CAAC,CAAE,EAAE,CAAC,IAAuB,CAAC,UAAU,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,sBAAsB,CAAC,SAAuB;IACrD,QAAQ,SAAS,CAAC,IAAI,EAAE;QACtB,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;QACrC,KAAK,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;QACpC,KAAK,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC;QACvC,KAAK,EAAE,CAAC,UAAU,CAAC,eAAe;YAChC,OAAO,IAAI,CAAC;QAEd,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB;YAClC,OAAO,gBAAgB,CAAC,SAAiC,CAAC,CAAC;QAE7D,KAAK,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC;QACxC,KAAK,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC;QACxC,KAAK,EAAE,CAAC,UAAU,CAAC,uBAAuB;YACxC,OAAO,KAAK,CAAC;QAEf;YACE,MAAM,IAAI,KAAK,CAAC,mDAAmD,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACvG;AACH,CAAC;AAED,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,OAAe,EACf,oBAA6C,EAC7C,eAAmC;IAEnC,MAAM,IAAI,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACrG,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC,2BAA2B,CACrD,QAAmB;IACnB,wBAAwB,CAAC,SAAS,EAClC,oBAAoB,EACpB,eAAe,CAChB,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAdD,4CAcC"}