@definitelytyped/definitions-parser 0.0.178 → 0.0.179

package/dist/packages.js

@@ -23,14 +23,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDependencyFromFile = exports.readNotNeededPackages = exports.TypingsData = exports.TypingsVersions = exports.getLicenseFromPackageJson = exports.formatDependencyVersion = exports.formatTypingVersion = exports.NotNeededPackage = exports.getFullNpmName = exports.PackageBase = exports.typesDataFilename = exports.getMangledNameForScopedPackage = exports.AllPackages = void 0;
+exports.getDependencyFromFile = exports.readNotNeededPackages = exports.TypingsData = exports.TypingsVersions = exports.formatTypingVersion = exports.NotNeededPackage = exports.PackageBase = exports.typesDataFilename = exports.getMangledNameForScopedPackage = exports.removeTypesScope = exports.AllPackages = void 0;
 const assert = require("assert");
-const utils_1 = require("@definitelytyped/utils");
 const typescript_versions_1 = require("@definitelytyped/typescript-versions");
+const utils_1 = require("@definitelytyped/utils");
 const semver = __importStar(require("semver"));
 const data_file_1 = require("./data-file");
-const settings_1 = require("./lib/settings");
 const definition_parser_1 = require("./lib/definition-parser");
+const settings_1 = require("./lib/settings");
+const utils_2 = require("./lib/utils");
 class AllPackages {
     static async read(dt) {
         return AllPackages.from(await readTypesDataFile(), readNotNeededPackages(dt));
@@ -57,20 +58,14 @@ class AllPackages {
         }
         return new TypingsData(versions[0], /*isLatest*/ true);
     }
-    static readSingleNotNeeded(name, dt) {
-        const notNeeded = readNotNeededPackages(dt);
-        const pkg = notNeeded.find((p) => p.name === name);
-        if (pkg === undefined) {
-            throw new Error(`Cannot find not-needed package ${name}`);
-        }
-        return pkg;
-    }
-    constructor(data, notNeeded) {
+    constructor(
+    /** Keys are `typesDirectoryName` strings */
+    data, notNeeded) {
         this.data = data;
         this.notNeeded = notNeeded;
     }
-    getNotNeededPackage(name) {
-        return this.notNeeded.find((p) => p.name === name);
+    getNotNeededPackage(typesDirectoryName) {
+        return this.notNeeded.find((p) => p.typesDirectoryName === typesDirectoryName);
     }
     hasTypingFor(dep) {
         return this.tryGetTypingsData(dep) !== undefined;
@@ -79,36 +74,41 @@ class AllPackages {
      * Whether a package maintains multiple minor versions of typings simultaneously by
      * using minor-versioned directories like 'react-native/v14.1'
      */
-    hasSeparateMinorVersions(name) {
-        const versions = Array.from((0, utils_1.assertDefined)(this.data.get(getMangledNameForScopedPackage(name))).getAll());
+    hasSeparateMinorVersions(typesDirectoryName) {
+        const versions = Array.from((0, utils_1.assertDefined)(this.data.get(typesDirectoryName)).getAll());
         const minors = versions.map((v) => v.minor);
         return minors.length !== (0, utils_1.unique)(minors).length;
     }
     tryResolve(dep) {
-        var _a;
-        const versions = this.data.get(getMangledNameForScopedPackage(dep.name));
-        return (versions && ((_a = versions.tryGet(dep.version)) === null || _a === void 0 ? void 0 : _a.id)) || dep;
+        var _a, _b;
+        const typesDirectoryName = (_a = dep.typesDirectoryName) !== null && _a !== void 0 ? _a : dep.name.slice(settings_1.scopeName.length + 2);
+        const versions = this.data.get(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;
     }
     resolve(dep) {
-        const versions = this.data.get(getMangledNameForScopedPackage(dep.name));
+        var _a;
+        const typesDirectoryName = (_a = dep.typesDirectoryName) !== null && _a !== void 0 ? _a : dep.name.slice(settings_1.scopeName.length + 2);
+        const versions = this.data.get(typesDirectoryName);
         if (!versions) {
-            throw new Error(`No typings found with name '${dep.name}'.`);
+            throw new Error(`No typings found with directory name '${dep.typesDirectoryName}'.`);
         }
-        return versions.get(dep.version).id;
+        const depVersion = new semver.Range(dep.version === "*" ? "*" : `^${formatTypingVersion(dep.version)}`);
+        return versions.get(depVersion).id;
     }
     /** Gets the latest version of a package. E.g. getLatest(node v6) was node v10 (before node v11 came out). */
     getLatest(pkg) {
-        return pkg.isLatest ? pkg : this.getLatestVersion(pkg.name);
+        return pkg.isLatest ? pkg : this.getLatestVersion(pkg.typesDirectoryName);
     }
-    getLatestVersion(packageName) {
-        const latest = this.tryGetLatestVersion(packageName);
+    getLatestVersion(typesDirectoryName) {
+        const latest = this.tryGetLatestVersion(typesDirectoryName);
         if (!latest) {
-            throw new Error(`No such package ${packageName}.`);
+            throw new Error(`No such package ${typesDirectoryName}.`);
         }
         return latest;
     }
-    tryGetLatestVersion(packageName) {
-        const versions = this.data.get(getMangledNameForScopedPackage(packageName));
+    tryGetLatestVersion(typesDirectoryName) {
+        const versions = this.data.get(typesDirectoryName);
         return versions && versions.getLatest();
     }
     getTypingsData(id) {
@@ -118,9 +118,11 @@ class AllPackages {
         }
         return pkg;
     }
-    tryGetTypingsData({ name, version }) {
-        const versions = this.data.get(getMangledNameForScopedPackage(name));
-        return versions && versions.tryGet(version);
+    tryGetTypingsData(pkg) {
+        var _a;
+        const typesDirectoryName = (_a = pkg.typesDirectoryName) !== null && _a !== void 0 ? _a : pkg.name.slice(settings_1.scopeName.length + 2);
+        const versions = this.data.get(typesDirectoryName);
+        return (versions && versions.tryGet(new semver.Range(pkg.version === "*" ? "*" : `^${formatTypingVersion(pkg.version)}`)));
     }
     allPackages() {
         return [...this.allTypings(), ...this.allNotNeeded()];
@@ -135,26 +137,26 @@ class AllPackages {
     allNotNeeded() {
         return this.notNeeded;
     }
-    /** Returns all of the dependences *that have typings*, ignoring others, and including test dependencies. */
+    /** Returns all of the dependencies *that are typed on DT*, ignoring others, and including test dependencies. */
     *allDependencyTypings(pkg) {
-        for (const [name, version] of Object.entries(pkg.dependencies)) {
-            const versions = this.data.get(getMangledNameForScopedPackage(name));
+        for (const [name, version] of pkg.allPackageJsonDependencies()) {
+            if (!name.startsWith(`@${settings_1.scopeName}/`))
+                continue;
+            if (pkg.name === name)
+                continue;
+            const typesDirectoryName = removeTypesScope(name);
+            const versions = this.data.get(typesDirectoryName);
             if (versions) {
-                yield versions.get(version, pkg.pathMappings[name]
-                    ? `${pkg.name} references this version of ${name} in its path mappings in tsconfig.json. If you are deleting this version, update ${pkg.name}’s path mappings accordingly.\n`
-                    : undefined);
-            }
-        }
-        for (const name of pkg.testDependencies) {
-            const versions = this.data.get(getMangledNameForScopedPackage(name));
-            if (versions) {
-                const version = pkg.pathMappings[name];
-                yield version ? versions.get(version) : versions.getLatest();
+                yield versions.get(new semver.Range(version), pkg.name + ":" + JSON.stringify(versions.versions));
             }
         }
     }
 }
 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("@")) {
@@ -177,32 +179,26 @@ class PackageBase {
     static compare(a, b) {
         return a.name.localeCompare(b.name);
     }
-    get unescapedName() {
-        return (0, utils_1.unmangleScopedPackage)(this.name) || this.name;
+    /**
+     * The immediate subdirectory name in DefinitelyTyped/types/.
+     * Must be equal to the package.json "name" field without the "@types/" prefix.
+     * Does not include the version directory.
+     */
+    get typesDirectoryName() {
+        return this.name.slice(settings_1.scopeName.length + 2);
     }
     /** Short description for debug output. */
     get desc() {
         return this.isLatest ? this.name : `${this.name} v${this.major}.${this.minor}`;
     }
-    constructor(data) {
-        this.libraryName = data.libraryName;
+    get id() {
+        return { typesDirectoryName: this.typesDirectoryName, version: { major: this.major, minor: this.minor } };
     }
     isNotNeeded() {
         return this instanceof NotNeededPackage;
     }
-    /** '@types/foo' for a package 'foo'. */
-    get fullNpmName() {
-        return getFullNpmName(this.name);
-    }
-    get id() {
-        return { name: this.name, version: { major: this.major, minor: this.minor } };
-    }
 }
 exports.PackageBase = PackageBase;
-function getFullNpmName(packageName) {
-    return `@${settings_1.scopeName}/${getMangledNameForScopedPackage(packageName)}`;
-}
-exports.getFullNpmName = getFullNpmName;
 class NotNeededPackage extends PackageBase {
     get license() {
         return "MIT" /* License.MIT */;
@@ -222,11 +218,12 @@ class NotNeededPackage extends PackageBase {
         return new NotNeededPackage(name, raw.libraryName, raw.asOfVersion);
     }
     constructor(name, libraryName, asOfVersion) {
-        super({ libraryName });
+        super();
         this.name = name;
         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}`;
     }
     get major() {
         return this.version.major;
@@ -238,12 +235,6 @@ class NotNeededPackage extends PackageBase {
     get isLatest() {
         return true;
     }
-    get declaredModules() {
-        return [];
-    }
-    get globals() {
-        return this.globals;
-    }
     get minTypeScriptVersion() {
         return typescript_versions_1.TypeScriptVersion.lowest;
     }
@@ -256,32 +247,13 @@ function formatTypingVersion(version) {
     return `${version.major}${version.minor === undefined ? "" : `.${version.minor}`}`;
 }
 exports.formatTypingVersion = formatTypingVersion;
-function formatDependencyVersion(version) {
-    return version === "*" ? "*" : formatTypingVersion(version);
-}
-exports.formatDependencyVersion = formatDependencyVersion;
-const allLicenses = ["MIT" /* License.MIT */, "Apache-2.0" /* License.Apache20 */];
-function getLicenseFromPackageJson(packageJsonLicense) {
-    if (packageJsonLicense === undefined) {
-        // tslint:disable-line strict-type-predicates (false positive)
-        return "MIT" /* License.MIT */;
-    }
-    if (typeof packageJsonLicense === "string" && packageJsonLicense === "MIT") {
-        throw new Error(`Specifying '"license": "MIT"' is redundant, this is the default.`);
-    }
-    if (allLicenses.includes(packageJsonLicense)) {
-        return packageJsonLicense;
-    }
-    throw new Error(`'package.json' license is ${JSON.stringify(packageJsonLicense)}.\nExpected one of: ${JSON.stringify(allLicenses)}}`);
-}
-exports.getLicenseFromPackageJson = getLicenseFromPackageJson;
 class TypingsVersions {
     constructor(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}.0`));
+        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(data[`${version.major}.${version.minor}`], !i)]));
     }
@@ -289,51 +261,53 @@ class TypingsVersions {
         return this.map.values();
     }
     get(version, errorMessage) {
-        return version === "*" ? this.getLatest() : this.getLatestMatch(version, errorMessage);
+        const data = this.tryGet(version);
+        if (!data) {
+            throw new Error(`Could not match version ${version} in ${this.versions}. ${errorMessage || ""}`);
+        }
+        return data;
     }
     tryGet(version) {
-        return version === "*" ? this.getLatest() : this.tryGetLatestMatch(version);
+        try {
+            const found = this.versions.find((v) => version.test(v));
+            return found && this.map.get(found);
+        }
+        catch (e) {
+            console.log(version);
+            throw e;
+        }
     }
     getLatest() {
         return this.map.get(this.versions[0]);
     }
-    getLatestMatch(version, errorMessage) {
-        var _a;
-        const data = this.tryGetLatestMatch(version);
-        if (!data) {
-            throw new Error(`Could not find version ${version.major}.${(_a = version.minor) !== null && _a !== void 0 ? _a : "*"}. ${errorMessage || ""}`);
-        }
-        return data;
-    }
-    tryGetLatestMatch(version) {
-        const found = this.versions.find((v) => v.major === version.major && (version.minor === undefined || v.minor === version.minor));
-        return found && this.map.get(found);
-    }
 }
 exports.TypingsVersions = TypingsVersions;
 class TypingsData extends PackageBase {
     constructor(data, isLatest) {
-        super(data);
+        super();
         this.data = data;
         this.isLatest = isLatest;
     }
     get name() {
-        return this.data.typingsPackageName;
+        return this.data.header.name;
     }
-    get testDependencies() {
-        return this.data.testDependencies;
+    get libraryName() {
+        var _a, _b;
+        return ((_b = (_a = this.data.header.nonNpmDescription) !== null && _a !== void 0 ? _a : (0, utils_1.unmangleScopedPackage)(this.typesDirectoryName)) !== null && _b !== void 0 ? _b : this.typesDirectoryName);
     }
     get contributors() {
-        return this.data.contributors;
+        return this.data.header.owners;
     }
     get major() {
-        return this.data.libraryMajorVersion;
+        return this.data.header.libraryMajorVersion;
     }
     get minor() {
-        return this.data.libraryMinorVersion;
+        return this.data.header.libraryMinorVersion;
     }
     get minTypeScriptVersion() {
-        return typescript_versions_1.TypeScriptVersion.isSupported(this.data.minTsVersion) ? this.data.minTsVersion : typescript_versions_1.TypeScriptVersion.lowest;
+        return typescript_versions_1.TypeScriptVersion.isSupported(this.data.header.minimumTypeScriptVersion)
+            ? this.data.header.minimumTypeScriptVersion
+            : typescript_versions_1.TypeScriptVersion.lowest;
     }
     get typesVersions() {
         return this.data.typesVersions;
@@ -347,26 +321,27 @@ class TypingsData extends PackageBase {
     get license() {
         return this.data.license;
     }
-    get packageJsonDependencies() {
-        return this.data.packageJsonDependencies;
+    get dependencies() {
+        var _a;
+        return (_a = this.data.dependencies) !== null && _a !== void 0 ? _a : {};
+    }
+    get devDependencies() {
+        var _a;
+        return (_a = this.data.devDependencies) !== null && _a !== void 0 ? _a : {};
+    }
+    *allPackageJsonDependencies() {
+        for (const [name, version] of Object.entries(this.dependencies)) {
+            yield [name, version];
+        }
+        for (const [name, version] of Object.entries(this.devDependencies)) {
+            yield [name, version];
+        }
     }
     get contentHash() {
         return this.data.contentHash;
     }
-    get declaredModules() {
-        return this.data.declaredModules;
-    }
     get projectName() {
-        return this.data.projectName;
-    }
-    get globals() {
-        return this.data.globals;
-    }
-    get pathMappings() {
-        return this.data.pathMappings;
-    }
-    get dependencies() {
-        return this.data.dependencies;
+        return this.data.header.projects[0];
     }
     get type() {
         return this.data.type;
@@ -377,12 +352,15 @@ class TypingsData extends PackageBase {
     get exports() {
         return this.data.exports;
     }
+    get nonNpm() {
+        return this.data.header.nonNpm;
+    }
     get versionDirectoryName() {
         return this.data.libraryVersionDirectoryName && `v${this.data.libraryVersionDirectoryName}`;
     }
     /** Path to this package, *relative* to the DefinitelyTyped directory. */
     get subDirectoryPath() {
-        return this.isLatest ? this.name : `${this.name}/${this.versionDirectoryName}`;
+        return this.isLatest ? this.typesDirectoryName : `${this.typesDirectoryName}/${this.versionDirectoryName}`;
     }
 }
 exports.TypingsData = TypingsData;
@@ -412,10 +390,10 @@ function getDependencyFromFile(file) {
     if (subDirName) {
         const version = (0, definition_parser_1.parseVersionFromDirectoryName)(subDirName);
         if (version !== undefined) {
-            return { name, version };
+            return { typesDirectoryName: name, version };
         }
     }
-    return { name, version: "*" };
+    return { typesDirectoryName: name, version: "*" };
 }
 exports.getDependencyFromFile = getDependencyFromFile;
 //# sourceMappingURL=packages.js.map

package/dist/packages.js.map

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

package/dist/parse-definitions.d.ts

@@ -1,6 +1,5 @@
 import { FS, LoggerWithErrors } from "@definitelytyped/utils";
 import { AllPackages } from "./packages";
-export { tryParsePackageVersion, parsePackageVersion } from "./lib/definition-parser";
 export interface ParallelOptions {
     readonly nProcesses: number;
     readonly definitelyTypedPath: string;

package/dist/parse-definitions.js

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDefinitions = exports.parsePackageVersion = exports.tryParsePackageVersion = void 0;
+exports.parseDefinitions = void 0;
 const utils_1 = require("@definitelytyped/utils");
 const data_file_1 = require("./data-file");
 const definition_parser_1 = require("./lib/definition-parser");
 const definition_parser_worker_1 = require("./lib/definition-parser-worker");
 const packages_1 = require("./packages");
-var definition_parser_2 = require("./lib/definition-parser");
-Object.defineProperty(exports, "tryParsePackageVersion", { enumerable: true, get: function () { return definition_parser_2.tryParsePackageVersion; } });
-Object.defineProperty(exports, "parsePackageVersion", { enumerable: true, get: function () { return definition_parser_2.parsePackageVersion; } });
 async function parseDefinitions(dt, parallel, log) {
     log.info("Parsing definitions...");
     const typesFS = dt.subDir("types");
-    const packageNames = await (0, utils_1.filterNAtATimeOrdered)(parallel ? parallel.nProcesses : 1, typesFS.readdir(), (name) => typesFS.isDirectory(name));
+    const packageNames = await (0, utils_1.filterNAtATimeOrdered)(parallel ? parallel.nProcesses : 1, typesFS.readdir(), (name) => typesFS.isDirectory(name) && typesFS.exists((0, utils_1.joinPaths)(name, "package.json")));
     log.info(`Found ${packageNames.length} packages.`);
     const typings = {};
+    const errors = [];
     const start = Date.now();
     if (parallel) {
         log.info(`Parsing in ${parallel.nProcesses} child process(es)...`);
@@ -24,19 +22,35 @@ async function parseDefinitions(dt, parallel, log) {
             workerFile: definition_parser_worker_1.definitionParserWorkerFilename,
             nProcesses: parallel.nProcesses,
             handleOutput({ data, packageName }) {
-                typings[packageName] = data;
+                if ("errors" in data) {
+                    errors.push(...data.errors);
+                }
+                else {
+                    typings[packageName] = data;
+                }
             },
         });
     }
     else {
+        const errors = [];
         log.info("Parsing in main process...");
         for (const packageName of packageNames) {
-            typings[packageName] = await (0, definition_parser_1.getTypingInfo)(packageName, dt);
+            const info = await (0, definition_parser_1.getTypingInfo)(packageName, dt);
+            if ("errors" in info) {
+                errors.push(...info.errors);
+            }
+            else {
+                typings[packageName] = info;
+            }
         }
     }
+    if (errors.length > 0) {
+        throw new Error(errors.join("\n"));
+    }
     log.info("Parsing took " + (Date.now() - start) / 1000 + " s");
-    await (0, data_file_1.writeDataFile)(packages_1.typesDataFilename, sorted(typings));
-    return packages_1.AllPackages.from(typings, (0, packages_1.readNotNeededPackages)(dt));
+    const sortedTypings = sorted(typings);
+    await (0, data_file_1.writeDataFile)(packages_1.typesDataFilename, sortedTypings);
+    return packages_1.AllPackages.from(sortedTypings, (0, packages_1.readNotNeededPackages)(dt));
 }
 exports.parseDefinitions = parseDefinitions;
 function sorted(obj) {

package/dist/parse-definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-definitions.js","sourceRoot":"","sources":["../src/parse-definitions.ts"],"names":[],"mappings":";;;AAAA,kDAA4G;AAC5G,2CAA4C;AAC5C,+DAAwD;AACxD,6EAAgF;AAChF,yCAAuG;AAEvG,6DAAsF;AAA7E,2HAAA,sBAAsB,OAAA;AAAE,wHAAA,mBAAmB,OAAA;AAO7C,KAAK,UAAU,gBAAgB,CACpC,EAAM,EACN,QAAqC,EACrC,GAAqB;IAErB,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,MAAM,IAAA,6BAAqB,EAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAC/G,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAC1B,CAAC;IACF,GAAG,CAAC,IAAI,CAAC,SAAS,YAAY,CAAC,MAAM,YAAY,CAAC,CAAC;IAEnD,MAAM,OAAO,GAA2C,EAAE,CAAC;IAE3D,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,QAAQ,EAAE;QACZ,GAAG,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,UAAU,uBAAuB,CAAC,CAAC;QACnE,MAAM,IAAA,6BAAqB,EAAC;YAC1B,MAAM,EAAE,YAAY;YACpB,eAAe,EAAE,CAAC,GAAG,QAAQ,CAAC,mBAAmB,QAAQ,CAAC;YAC1D,UAAU,EAAE,yDAA8B;YAC1C,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,YAAY,CAAC,EAAE,IAAI,EAAE,WAAW,EAAqD;gBACnF,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;YAC9B,CAAC;SACF,CAAC,CAAC;KACJ;SAAM;QACL,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACvC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,OAAO,CAAC,WAAW,CAAC,GAAG,MAAM,IAAA,iCAAa,EAAC,WAAW,EAAE,EAAE,CAAC,CAAC;SAC7D;KACF;IACD,GAAG,CAAC,IAAI,CAAC,eAAe,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;IAC/D,MAAM,IAAA,yBAAa,EAAC,4BAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,OAAO,sBAAW,CAAC,IAAI,CAAC,OAAO,EAAE,IAAA,gCAAqB,EAAC,EAAE,CAAC,CAAC,CAAC;AAC9D,CAAC;AAnCD,4CAmCC;AAED,SAAS,MAAM,CAAI,GAA0B;IAC3C,MAAM,GAAG,GAA0B,EAAE,CAAC;IACtC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzC,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;KACrB;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"parse-definitions.js","sourceRoot":"","sources":["../src/parse-definitions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@definitelytyped/definitions-parser",
-  "version": "0.0.178",
+  "version": "0.0.179",
   "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",
@@ -11,25 +11,22 @@
     "url": "https://github.com/microsoft/DefinitelyTyped-tools.git",
     "directory": "packages/definitions-parser"
   },
-  "scripts": {
-    "build": "tsc -b",
-    "test": "../../node_modules/.bin/jest --config ../../jest.config.js packages/definitions-parser"
-  },
   "bugs": {
     "url": "https://github.com/microsoft/DefinitelyTyped-tools/issues"
   },
   "dependencies": {
-    "@definitelytyped/header-parser": "^0.0.178",
-    "@definitelytyped/typescript-versions": "^0.0.178",
-    "@definitelytyped/utils": "^0.0.178",
     "@types/node": "^14.14.35",
     "fs-extra": "^9.1.0",
     "pacote": "^13.6.1",
-    "semver": "^7.3.7"
+    "semver": "^7.3.7",
+    "@definitelytyped/header-parser": "0.0.179",
+    "@definitelytyped/typescript-versions": "0.0.179",
+    "@definitelytyped/utils": "0.0.179"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.8",
-    "@types/pacote": "^11.1.5"
+    "@types/pacote": "^11.1.5",
+    "@types/semver": "^7.5.2"
   },
   "peerDependencies": {
     "typescript": "*"
@@ -37,5 +34,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "41ba894ba571e55fa91ef0bb0d44d6eb6d201943"
-}
+  "scripts": {
+    "build": "tsc -b",
+    "test": "../../node_modules/.bin/jest --config ../../jest.config.js packages/definitions-parser"
+  }
+}