@definitelytyped/definitions-parser 0.0.178 → 0.0.180

package/CHANGELOG.md

@@ -0,0 +1,19 @@
+# @definitelytyped/definitions-parser
+
+## 0.0.180
+
+### Patch Changes
+
+- 3c8512ad: dtslint-runner checks new packages, even malformed ones.
+
+## 0.0.179
+
+### Patch Changes
+
+- 024c3e73: Update @definitelytyped for Definitely Typed's monorepo upgrade
+- 9fffa8ff: Fix entrypoint scripts to ensure they don’t run when being imported by an ES module
+- Updated dependencies [024c3e73]
+- Updated dependencies [9fffa8ff]
+  - @definitelytyped/typescript-versions@0.0.179
+  - @definitelytyped/header-parser@0.0.179
+  - @definitelytyped/utils@0.0.179

package/allowedPackageJsonDependencies.txt

@@ -478,6 +478,7 @@
 @react-navigation/native
 @react-navigation/stack
 @sentry/browser
+@serverless/typescript
 @sinonjs/fake-timers
 @storybook/addons
 @storybook/csf
@@ -604,6 +605,7 @@ bl
 bookshelf
 boxen
 broadcast-channel
+broccoli-node-api
 broccoli-plugin
 bson
 buffer
@@ -723,9 +725,11 @@ log4js
 logform
 loglevel
 logrocket
+long
 lottie-web
 magic-string
 markdownlint
+marked
 mali
 meshoptimizer
 metascraper
@@ -856,6 +860,7 @@ typeorm
 typescript
 typescript-tuple
 types-ramda
+undici-types
 unified
 url-pattern
 utility-types

package/dist/get-affected-packages.d.ts

@@ -1,10 +1,12 @@
-import { TypingsData, AllPackages, PackageId } from "./packages";
-export interface Affected {
-    readonly changedPackages: readonly TypingsData[];
-    readonly dependentPackages: readonly TypingsData[];
-    allPackages: AllPackages;
+import { AllPackages } from "./packages";
+import { GitDiff } from "./git";
+export interface PreparePackagesResult {
+    readonly packageNames: Set<string>;
+    readonly dependents: Set<string>;
 }
 /** Gets all packages that have changed on this branch, plus all packages affected by the change. */
-export declare function getAffectedPackages(allPackages: AllPackages, changedPackageIds: PackageId[]): Affected;
-/** Every package name in the original list, plus their dependencies (incl. dependencies' dependencies). */
-export declare function allDependencies(allPackages: AllPackages, packages: Iterable<TypingsData>): TypingsData[];
+export declare function getAffectedPackages(allPackages: AllPackages, diffs: GitDiff[], definitelyTypedPath: string): Promise<{
+    errors: string[];
+} | PreparePackagesResult>;
+/** This function is exported for testing, since it's determined entirely by its inputs. */
+export declare function getAffectedPackagesWorker(allPackages: AllPackages, changedOutput: string, additions: string[], dependentOutputs: string[], definitelyTypedPath: string): PreparePackagesResult;

package/dist/get-affected-packages.js

@@ -1,83 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allDependencies = exports.getAffectedPackages = void 0;
+exports.getAffectedPackagesWorker = exports.getAffectedPackages = void 0;
 const utils_1 = require("@definitelytyped/utils");
+const settings_1 = require("./lib/settings");
 const packages_1 = require("./packages");
+const path_1 = require("path");
+const semver_1 = require("semver");
+const git_1 = require("./git");
 /** Gets all packages that have changed on this branch, plus all packages affected by the change. */
-function getAffectedPackages(allPackages, changedPackageIds) {
-    const resolved = changedPackageIds.map((id) => allPackages.tryResolve(id));
-    // If a package doesn't exist, that's because it was deleted.
-    const changed = (0, utils_1.mapDefined)(resolved, (id) => allPackages.tryGetTypingsData(id));
-    const dependent = (0, utils_1.mapIterable)(collectDependers(resolved, getReverseDependencies(allPackages, resolved)), (p) => allPackages.getTypingsData(p));
-    return { changedPackages: changed, dependentPackages: sortPackages(dependent), allPackages };
-}
-exports.getAffectedPackages = getAffectedPackages;
-/** Every package name in the original list, plus their dependencies (incl. dependencies' dependencies). */
-function allDependencies(allPackages, packages) {
-    return sortPackages(transitiveClosure(packages, (pkg) => allPackages.allDependencyTypings(pkg)));
-}
-exports.allDependencies = allDependencies;
-/** Collect all packages that depend on changed packages, and all that depend on those, etc. */
-function collectDependers(changedPackages, reverseDependencies) {
-    const dependers = transitiveClosure(changedPackages, (pkg) => reverseDependencies.get(pkg) || []);
-    // Don't include the original changed packages, just their dependers
-    for (const original of changedPackages) {
-        dependers.delete(original);
+async function getAffectedPackages(allPackages, diffs, definitelyTypedPath) {
+    const errors = [];
+    const changedPackageDirectories = await (0, utils_1.execAndThrowErrors)(`pnpm ls -r --depth -1 --parseable --filter '[${settings_1.sourceRemote}/${settings_1.sourceBranch}]'`, definitelyTypedPath);
+    const git = (0, git_1.gitChanges)(diffs);
+    if ("errors" in git) {
+        errors.push(...git.errors);
+        return { errors };
     }
-    return dependers;
-}
-function sortPackages(packages) {
-    return (0, utils_1.sort)(packages, packages_1.PackageBase.compare); // tslint:disable-line no-unbound-method
-}
-function transitiveClosure(initialItems, getRelatedItems) {
-    const all = new Set();
-    const workList = [];
-    function add(item) {
-        if (!all.has(item)) {
-            all.add(item);
-            workList.push(item);
+    const { additions, deletions } = git;
+    const addedPackageDirectories = (0, utils_1.mapDefined)(additions, (id) => id.typesDirectoryName);
+    const allDependentDirectories = [];
+    const filters = [`--filter '...[${settings_1.sourceRemote}/${settings_1.sourceBranch}]'`];
+    for (const d of deletions) {
+        for (const dep of allPackages.allTypings()) {
+            for (const [name, version] of dep.allPackageJsonDependencies()) {
+                if ("@types/" + d.typesDirectoryName === name &&
+                    (d.version === "*" || (0, semver_1.satisfies)((0, packages_1.formatTypingVersion)(d.version), version))) {
+                    filters.push(`--filter '...${dep.name}'`);
+                    break;
+                }
+            }
         }
     }
-    for (const item of initialItems) {
-        add(item);
-    }
-    while (workList.length) {
-        const item = workList.pop();
-        for (const newItem of getRelatedItems(item)) {
-            add(newItem);
-        }
+    // Chunk into 100-package chunks because of CMD.COM's command-line length limit
+    for (let i = 0; i < filters.length; i += 100) {
+        allDependentDirectories.push(await (0, utils_1.execAndThrowErrors)(`pnpm ls -r --depth -1 --parseable ${filters.slice(i, i + 100).join(" ")}`, definitelyTypedPath));
     }
-    return all;
+    return getAffectedPackagesWorker(allPackages, changedPackageDirectories, addedPackageDirectories, allDependentDirectories, definitelyTypedPath);
 }
-/** Generate a map from a package to packages that depend on it. */
-function getReverseDependencies(allPackages, changedPackages) {
-    const map = new Map();
-    for (const changed of changedPackages) {
-        map.set(packageIdToKey(changed), [changed, new Set()]);
-    }
-    for (const typing of allPackages.allTypings()) {
-        if (!map.has(packageIdToKey(typing.id))) {
-            map.set(packageIdToKey(typing.id), [typing.id, new Set()]);
-        }
-    }
-    for (const typing of allPackages.allTypings()) {
-        for (const [name, version] of Object.entries(typing.dependencies)) {
-            const dependencies = map.get(packageIdToKey(allPackages.tryResolve({ name, version })));
-            if (dependencies) {
-                dependencies[1].add(typing.id);
-            }
-        }
-        for (const dependencyName of typing.testDependencies) {
-            const version = typing.pathMappings[dependencyName] || "*";
-            const dependencies = map.get(packageIdToKey(allPackages.tryResolve({ name: dependencyName, version })));
-            if (dependencies) {
-                dependencies[1].add(typing.id);
-            }
-        }
-    }
-    return new Map(map.values());
+exports.getAffectedPackages = getAffectedPackages;
+/** This function is exported for testing, since it's determined entirely by its inputs. */
+function getAffectedPackagesWorker(allPackages, changedOutput, additions, dependentOutputs, definitelyTypedPath) {
+    const dt = (0, path_1.resolve)(definitelyTypedPath);
+    const changedDirs = (0, utils_1.mapDefined)(changedOutput.split("\n"), getDirectoryName(dt));
+    const dependentDirs = (0, utils_1.mapDefined)(dependentOutputs.join("\n").split("\n"), getDirectoryName(dt));
+    const packageNames = new Set([
+        ...additions,
+        ...changedDirs.map((c) => (0, utils_1.assertDefined)(allPackages.tryGetTypingsData((0, utils_1.assertDefined)((0, packages_1.getDependencyFromFile)(c + "/index.d.ts"), "bad path " + c)), "bad path " + JSON.stringify((0, packages_1.getDependencyFromFile)(c + "/index.d.ts"))).subDirectoryPath),
+    ]);
+    const dependents = new Set(dependentDirs
+        .map((d) => (0, utils_1.assertDefined)(allPackages.tryGetTypingsData((0, utils_1.assertDefined)((0, packages_1.getDependencyFromFile)(d + "/index.d.ts"), "bad path " + d)), d + " package not found").subDirectoryPath)
+        .filter((d) => !packageNames.has(d)));
+    return { packageNames, dependents };
 }
-function packageIdToKey(pkg) {
-    return (0, packages_1.getMangledNameForScopedPackage)(pkg.name) + "/v" + (0, packages_1.formatDependencyVersion)(pkg.version);
+exports.getAffectedPackagesWorker = getAffectedPackagesWorker;
+function getDirectoryName(dt) {
+    return (line) => line && line !== dt ? (0, utils_1.assertDefined)((0, utils_1.withoutStart)(line, dt + "/"), line + " is missing prefix " + dt) : undefined;
 }
 //# sourceMappingURL=get-affected-packages.js.map

package/dist/get-affected-packages.js.map

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

package/dist/git.d.ts

@@ -1,21 +1,28 @@
 import { PackageId, AllPackages, NotNeededPackage } from "./packages";
-import { Logger, FS } from "@definitelytyped/utils";
+import { Logger } from "@definitelytyped/utils";
+import { PreparePackagesResult } from "./get-affected-packages";
 export interface GitDiff {
     status: "A" | "D" | "M";
     file: string;
 }
 export declare function gitDiff(log: Logger, definitelyTypedPath: string): Promise<GitDiff[]>;
-/** Returns all immediate subdirectories of the root directory that have changed. */
-export declare function gitChanges(diffs: GitDiff[]): PackageId[];
-export declare function getAffectedPackagesFromDiff(dt: FS, definitelyTypedPath: string, selection: "all" | "affected" | RegExp): Promise<import("./get-affected-packages").Affected>;
+export declare function gitChanges(diffs: GitDiff[]): {
+    errors: string[];
+} | {
+    deletions: PackageId[];
+    additions: PackageId[];
+};
+export declare function getAffectedPackagesFromDiff(allPackages: AllPackages, definitelyTypedPath: string): Promise<string[] | PreparePackagesResult>;
 /**
  * 1. libraryName must exist on npm (SKIPPED and preferably/optionally have been the libraryName in just-deleted header)
  * 2. asOfVersion must be newer than `@types/name@latest` on npm
  * 3. `name@asOfVersion` must exist on npm
  */
-export declare function checkNotNeededPackage(unneeded: NotNeededPackage): Promise<void>;
+export declare function checkNotNeededPackage(unneeded: NotNeededPackage): Promise<string[]>;
 /**
  * 1. Find all the deleted files and group by package (error on deleted files outside a package).
  * 2. Make sure that all deleted packages in notNeededPackages have no files left.
  */
-export declare function getNotNeededPackages(allPackages: AllPackages, diffs: GitDiff[]): NotNeededPackage[];
+export declare function getNotNeededPackages(allPackages: AllPackages, diffs: GitDiff[]): {
+    errors: string[];
+} | NotNeededPackage[];

package/dist/git.js

@@ -22,22 +22,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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.getNotNeededPackages = exports.checkNotNeededPackage = exports.getAffectedPackagesFromDiff = exports.gitChanges = exports.gitDiff = void 0;
-const assert_1 = __importDefault(require("assert"));
 const settings_1 = require("./lib/settings");
 const packages_1 = require("./packages");
 const utils_1 = require("@definitelytyped/utils");
 const pacote = __importStar(require("pacote"));
 const semver = __importStar(require("semver"));
+const util_1 = require("util");
 const get_affected_packages_1 = require("./get-affected-packages");
 /*
-We have to be careful about how we get the diff because travis uses a shallow clone.
+We have to be careful about how we get the diff because Actions uses a shallow clone.
 
-Travis runs:
+Actions runs:
     git clone --depth=50 https://github.com/DefinitelyTyped/DefinitelyTyped.git DefinitelyTyped
     cd DefinitelyTyped
     git fetch origin +refs/pull/123/merge
@@ -52,7 +49,7 @@ async function gitDiff(log, definitelyTypedPath) {
     }
     catch (_) {
         // This is a shallow clone.
-        await run(`git fetch origin ${settings_1.sourceBranch}`);
+        await run(`git fetch ${settings_1.sourceRemote} ${settings_1.sourceBranch}`);
         await run(`git branch ${settings_1.sourceBranch} FETCH_HEAD`);
     }
     let diff = (await run(`git diff ${settings_1.sourceBranch} --name-status`)).trim();
@@ -72,47 +69,53 @@ async function gitDiff(log, definitelyTypedPath) {
     }
 }
 exports.gitDiff = gitDiff;
-/** Returns all immediate subdirectories of the root directory that have changed. */
 function gitChanges(diffs) {
-    const changedPackages = new Map();
+    const addedPackages = new Map();
+    const errors = [];
     for (const diff of diffs) {
+        if (diff.status === "M")
+            continue;
         const dep = (0, packages_1.getDependencyFromFile)(diff.file);
         if (dep) {
-            const versions = changedPackages.get(dep.name);
-            if (!versions) {
-                changedPackages.set(dep.name, new Map([[(0, packages_1.formatDependencyVersion)(dep.version), dep.version]]));
-            }
-            else {
-                versions.set((0, packages_1.formatDependencyVersion)(dep.version), dep.version);
-            }
+            const key = `${dep.typesDirectoryName}/v${dep.version === "*" ? "*" : (0, packages_1.formatTypingVersion)(dep.version)}`;
+            addedPackages.set(key, [dep, diff.status]);
         }
+        else {
+            errors.push(`Unexpected file ${diff.status === "A" ? "added" : "deleted"}: ${diff.file}
+You should ` +
+                (diff.status === "A"
+                    ? `only add files that are part of packages.`
+                    : "only delete files that are a part of removed packages."));
+        }
+    }
+    if (errors.length)
+        return { errors };
+    const deletions = [];
+    const additions = [];
+    for (const [dep, status] of Array.from(addedPackages.values())) {
+        (status === "D" ? deletions : additions).push(dep);
     }
-    return Array.from((0, utils_1.flatMapIterable)(changedPackages, ([name, versions]) => (0, utils_1.mapIterable)(versions, ([_, version]) => ({ name, version }))));
+    return { deletions, additions };
 }
 exports.gitChanges = gitChanges;
-async function getAffectedPackagesFromDiff(dt, definitelyTypedPath, selection) {
-    const allPackages = await packages_1.AllPackages.read(dt);
+async function getAffectedPackagesFromDiff(allPackages, definitelyTypedPath) {
+    const errors = [];
     const diffs = await gitDiff(utils_1.consoleLogger.info, definitelyTypedPath);
     if (diffs.find((d) => d.file === "notNeededPackages.json")) {
-        for (const deleted of getNotNeededPackages(allPackages, diffs)) {
-            checkNotNeededPackage(deleted);
-        }
+        const deleteds = getNotNeededPackages(allPackages, diffs);
+        if ("errors" in deleteds)
+            errors.push(...deleteds.errors);
+        else
+            for (const deleted of deleteds) {
+                errors.push(...(await checkNotNeededPackage(deleted)));
+            }
+    }
+    const affected = await (0, get_affected_packages_1.getAffectedPackages)(allPackages, diffs, definitelyTypedPath);
+    if ("errors" in affected) {
+        return errors;
     }
-    const affected = selection === "all"
-        ? { changedPackages: allPackages.allTypings(), dependentPackages: [], allPackages }
-        : selection === "affected"
-            ? (0, get_affected_packages_1.getAffectedPackages)(allPackages, gitChanges(diffs))
-            : {
-                changedPackages: allPackages.allTypings().filter((t) => selection.test(t.name)),
-                dependentPackages: [],
-                allPackages,
-            };
-    console.log(`Testing ${affected.changedPackages.length} changed packages: ${affected.changedPackages
-        .map((t) => t.desc)
-        .toString()}`);
-    console.log(`Testing ${affected.dependentPackages.length} dependent packages: ${affected.dependentPackages
-        .map((t) => t.desc)
-        .toString()}`);
+    console.log(`Testing ${affected.packageNames.size} changed packages: ${(0, util_1.inspect)(affected.packageNames)}`);
+    console.log(`Testing ${affected.dependents.size} dependent packages: ${(0, util_1.inspect)(affected.dependents)}`);
     return affected;
 }
 exports.getAffectedPackagesFromDiff = getAffectedPackagesFromDiff;
@@ -122,24 +125,35 @@ exports.getAffectedPackagesFromDiff = getAffectedPackagesFromDiff;
  * 3. `name@asOfVersion` must exist on npm
  */
 async function checkNotNeededPackage(unneeded) {
-    await pacote.manifest(`${unneeded.libraryName}@${unneeded.version}`, { cache: utils_1.cacheDir }).catch((reason) => {
-        throw reason.code === "E404"
-            ? new Error(`The entry for ${unneeded.fullNpmName} in notNeededPackages.json has
+    const errors = [];
+    const replacementPackage = await pacote
+        .manifest(`${unneeded.libraryName}@${unneeded.version}`, { cache: utils_1.cacheDir })
+        .catch((reason) => {
+        if (reason.code === "E404")
+            return `The entry for ${unneeded.name} in notNeededPackages.json has
 "libraryName": "${unneeded.libraryName}", but there is no npm package with this name.
-Unneeded packages have to be replaced with a package on npm.`, { cause: reason })
-            : reason.code === "ETARGET"
-                ? new Error(`The specified version ${unneeded.version} of ${unneeded.libraryName} is not on npm.`, {
-                    cause: reason,
-                })
-                : reason;
+Unneeded packages have to be replaced with a package on npm.`;
+        else if (reason.code === "ETARGET")
+            return `The specified version ${unneeded.version} of ${unneeded.libraryName} is not on npm.`;
+        else
+            throw reason;
     }); // eg @babel/parser
-    const typings = await pacote.manifest(unneeded.fullNpmName, { cache: utils_1.cacheDir }).catch((reason) => {
-        throw reason.code === "E404"
-            ? new Error(`Unexpected error: @types package not found for ${unneeded.fullNpmName}`, { cause: reason })
-            : reason;
+    if (typeof replacementPackage === "string")
+        errors.push(replacementPackage);
+    const typings = await pacote.manifest(unneeded.name, { cache: utils_1.cacheDir }).catch((reason) => {
+        if (reason.code === "E404")
+            return `Unexpected error: @types package not found for ${unneeded.name}`;
+        else
+            throw reason;
     }); // eg @types/babel__parser
-    (0, assert_1.default)(semver.gt(unneeded.version, typings.version), `The specified version ${unneeded.version} of ${unneeded.libraryName} must be newer than the version
-it is supposed to replace, ${typings.version} of ${unneeded.fullNpmName}.`);
+    if (typeof typings === "string") {
+        errors.push(typings);
+        return errors;
+    }
+    if (!semver.gt(unneeded.version, typings.version))
+        errors.push(`The specified version ${unneeded.version} of ${unneeded.libraryName} must be newer than the version
+it is supposed to replace, ${typings.version} of ${unneeded.name}.`);
+    return errors;
 }
 exports.checkNotNeededPackage = checkNotNeededPackage;
 /**
@@ -147,23 +161,24 @@ exports.checkNotNeededPackage = checkNotNeededPackage;
  * 2. Make sure that all deleted packages in notNeededPackages have no files left.
  */
 function getNotNeededPackages(allPackages, diffs) {
-    const deletedPackages = new Set(diffs
-        .filter((d) => d.status === "D")
-        .map((d) => (0, utils_1.assertDefined)((0, packages_1.getDependencyFromFile)(d.file), `Unexpected file deleted: ${d.file}
-When removing packages, you should only delete files that are a part of removed packages.`).name));
-    return (0, utils_1.mapDefined)(deletedPackages, (p) => {
-        const hasTyping = allPackages.hasTypingFor({ name: p, version: "*" });
+    const changes = gitChanges(diffs);
+    if ("errors" in changes)
+        return changes;
+    const { deletions } = changes;
+    const deletedPackages = new Set(deletions.map((p) => (0, utils_1.assertDefined)(p.typesDirectoryName)));
+    const notNeededs = [];
+    const errors = [];
+    for (const p of deletedPackages) {
+        const hasTyping = allPackages.hasTypingFor({ typesDirectoryName: p, version: "*" });
         const notNeeded = allPackages.getNotNeededPackage(p);
-        if (hasTyping) {
-            if (notNeeded) {
-                throw new Error(`Please delete all files in ${p} when adding it to notNeededPackages.json.`);
-            }
-            return undefined;
+        if (hasTyping && notNeeded) {
+            errors.push(`Please delete all files in ${p} when adding it to notNeededPackages.json.`);
         }
-        else {
-            return notNeeded;
+        else if (notNeeded) {
+            notNeededs.push(notNeeded);
         }
-    });
+    }
+    return errors.length ? { errors } : notNeededs;
 }
 exports.getNotNeededPackages = getNotNeededPackages;
 //# sourceMappingURL=git.js.map

package/dist/git.js.map

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

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

@@ -9,7 +9,7 @@ const definition_parser_1 = require("./definition-parser");
 const path_1 = require("path");
 // This file is "called" by runWithChildProcesses from parse-definition.ts
 exports.definitionParserWorkerFilename = __filename;
-if (!module.parent) {
+if (require.main === module) {
     process.on("message", (message) => {
         assert(process.argv.length === 3);
         const typesPath = process.argv[2];

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

@@ -1 +1 @@
-{"version":3,"file":"definition-parser-worker.js","sourceRoot":"","sources":["../../src/lib/definition-parser-worker.ts"],"names":[],"mappings":";;;AAAA,iCAAkC;AAClC,mCAAoC;AACpC,kDAA2D;AAC3D,kEAA6E;AAC7E,2DAAoD;AACpD,+BAA+B;AAE/B,0EAA0E;AAC7D,QAAA,8BAA8B,GAAG,UAAU,CAAC;AAEzD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;IAClB,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;QAChC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClC,kDAAkD;QAClD,IAAA,yBAAiB,EAAC,KAAK,IAAI,EAAE;YAC3B,KAAK,MAAM,WAAW,IAAI,OAA4B,EAAE;gBACtD,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAa,EAAC,WAAW,EAAE,IAAA,yDAAkC,EAAC,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBACtG,OAAO,CAAC,IAAK,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;aACtC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;CACJ"}
+{"version":3,"file":"definition-parser-worker.js","sourceRoot":"","sources":["../../src/lib/definition-parser-worker.ts"],"names":[],"mappings":";;;AAAA,iCAAkC;AAClC,mCAAoC;AACpC,kDAA2D;AAC3D,kEAA6E;AAC7E,2DAAoD;AACpD,+BAA+B;AAE/B,0EAA0E;AAC7D,QAAA,8BAA8B,GAAG,UAAU,CAAC;AAEzD,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC3B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;QAChC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClC,kDAAkD;QAClD,IAAA,yBAAiB,EAAC,KAAK,IAAI,EAAE;YAC3B,KAAK,MAAM,WAAW,IAAI,OAA4B,EAAE;gBACtD,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAa,EAAC,WAAW,EAAE,IAAA,yDAAkC,EAAC,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBACtG,OAAO,CAAC,IAAK,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;aACtC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;CACJ"}

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

@@ -1,6 +1,8 @@
-import { DependencyVersion, TypingsVersionsRaw, DirectoryParsedTypingVersion } from "../packages";
 import { FS } from "@definitelytyped/utils";
-export declare function getTypingInfo(packageName: string, dt: FS): Promise<TypingsVersionsRaw>;
+import { DirectoryParsedTypingVersion, TypingsVersionsRaw } from "../packages";
+export declare function getTypingInfo(packageName: string, dt: FS): Promise<TypingsVersionsRaw | {
+    errors: string[];
+}>;
 /**
  * Parses a directory name into a version that either holds a single major version or a major and minor version.
  *
@@ -12,13 +14,4 @@ export declare function getTypingInfo(packageName: string, dt: FS): Promise<Typi
  * ```
  */
 export declare function parseVersionFromDirectoryName(directoryName: string | undefined): DirectoryParsedTypingVersion | undefined;
-/**
- * Like `parseVersionFromDirectoryName`, but the leading 'v' is optional,
- * and falls back to '*' if the input format is not parseable.
- */
-export declare function tryParsePackageVersion(versionString: string | undefined): DependencyVersion;
-/**
- * Like `tryParsePackageVersion`, but throws if the input format is not parseable.
- */
-export declare function parsePackageVersion(versionString: string): DirectoryParsedTypingVersion;
 export declare function readFileAndThrowOnBOM(fileName: string, fs: FS): string;