@definitelytyped/header-parser 0.0.177 → 0.0.179

package/CHANGELOG.md

@@ -0,0 +1,11 @@
+# @definitelytyped/header-parser
+
+## 0.0.179
+
+### Patch Changes
+
+- 024c3e73: Update @definitelytyped for Definitely Typed's monorepo upgrade
+- Updated dependencies [024c3e73]
+- Updated dependencies [9fffa8ff]
+  - @definitelytyped/typescript-versions@0.0.179
+  - @definitelytyped/utils@0.0.179

package/README.md

@@ -1,10 +1,11 @@
 # DefinitelyTyped Header Parser
 
-This library parses headers of [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped) types.
+This library parses package.jsons of [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped) types.
+Its name is left over from when package information was stored in textual headers.
 
 # Contributing
 
-To build: `npm run build`.
-To test: `npm run test`. (Currently requires a re-build to test changes.)
+To build: `pnpm run build`.
+To test: `pnpm test`.
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

package/dist/index.d.ts

@@ -1,31 +1,34 @@
-import pm = require("parsimmon");
 import { AllTypeScriptVersion, TypeScriptVersion } from "@definitelytyped/typescript-versions";
 export interface Header {
     readonly nonNpm: boolean;
-    readonly libraryName: string;
+    readonly nonNpmDescription?: string;
+    readonly name: string;
     readonly libraryMajorVersion: number;
     readonly libraryMinorVersion: number;
-    readonly typeScriptVersion: AllTypeScriptVersion;
+    readonly minimumTypeScriptVersion: AllTypeScriptVersion;
     readonly projects: readonly string[];
-    readonly contributors: readonly Author[];
+    readonly owners: readonly Owner[];
 }
-export interface Author {
+export type Owner = {
     readonly name: string;
     readonly url: string;
-    readonly githubUsername: string | undefined;
-}
-export interface ParseError {
-    readonly index: number;
-    readonly line: number;
-    readonly column: number;
-    readonly expected: readonly string[];
-}
-export declare function makeTypesVersionsForPackageJson(typesVersions: readonly TypeScriptVersion[]): unknown;
-export declare function parseHeaderOrFail(descriptor: string, mainFileContent: string): Header;
-export declare function validate(mainFileContent: string): ParseError | undefined;
-export declare function renderExpected(expected: readonly string[]): string;
-export declare function parseTypeScriptVersionLine(line: string): AllTypeScriptVersion;
-declare module "parsimmon" {
-    type Pr<T> = pm.Parser<T>;
-    function seqMap<T, U, V, W, X, Y, Z, A, B, C>(p1: Pr<T>, p2: Pr<U>, p3: Pr<V>, p4: Pr<W>, p5: Pr<X>, p6: Pr<Y>, p7: Pr<Z>, p8: Pr<A>, p9: Pr<B>, cb: (a1: T, a2: U, a3: V, a4: W, a5: X, a6: Y, a7: Z, a8: A, a9: B) => C): Pr<C>;
+} | {
+    readonly name: string;
+    readonly githubUsername: string;
+    readonly url?: undefined;
+};
+export declare function makeTypesVersionsForPackageJson(typesVersions: readonly AllTypeScriptVersion[]): unknown;
+export declare function validatePackageJson(typesDirectoryName: string, packageJson: Record<string, unknown>, typesVersions: readonly AllTypeScriptVersion[]): Header | string[];
+export declare function getTypesVersions(dirPath: string): readonly TypeScriptVersion[];
+export declare const enum License {
+    MIT = "MIT",
+    Apache20 = "Apache-2.0"
 }
+export declare function getLicenseFromPackageJson(packageJsonLicense: unknown): License | string[];
+export declare function checkPackageJsonExportsAndAddPJsonEntry(exports: unknown, path: string): string | object | undefined;
+export declare function checkPackageJsonImports(imports: unknown, path: string): object | string[] | undefined;
+export declare function checkPackageJsonType(type: unknown, path: string): string[] | "module" | undefined;
+/**
+ * @param devDependencySelfName - pass the package name only for devDependencies
+ */
+export declare function checkPackageJsonDependencies(dependencies: unknown, path: string, allowedDependencies: ReadonlySet<string>, devDependencySelfName?: string): string[];

package/dist/index.js

@@ -1,8 +1,34 @@
 "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.parseTypeScriptVersionLine = exports.renderExpected = exports.validate = exports.parseHeaderOrFail = exports.makeTypesVersionsForPackageJson = void 0;
-const pm = require("parsimmon");
+exports.checkPackageJsonDependencies = exports.checkPackageJsonType = exports.checkPackageJsonImports = exports.checkPackageJsonExportsAndAddPJsonEntry = exports.getLicenseFromPackageJson = exports.getTypesVersions = exports.validatePackageJson = exports.makeTypesVersionsForPackageJson = void 0;
 const typescript_versions_1 = require("@definitelytyped/typescript-versions");
+const assert = require("assert");
+const fs = require("fs");
+const semver = __importStar(require("semver"));
+const utils_1 = require("@definitelytyped/utils");
 function makeTypesVersionsForPackageJson(typesVersions) {
     if (typesVersions.length === 0) {
         return undefined;
@@ -16,176 +42,412 @@ function makeTypesVersionsForPackageJson(typesVersions) {
     return out;
 }
 exports.makeTypesVersionsForPackageJson = makeTypesVersionsForPackageJson;
-function parseHeaderOrFail(descriptor, mainFileContent) {
-    const header = parseHeader(mainFileContent, /*strict*/ false);
-    if (isParseError(header)) {
-        throw new Error(renderParseError(descriptor, header));
-    }
-    return header;
-}
-exports.parseHeaderOrFail = parseHeaderOrFail;
-function validate(mainFileContent) {
-    const h = parseHeader(mainFileContent, /*strict*/ true);
-    return isParseError(h) ? h : undefined;
-}
-exports.validate = validate;
-function renderExpected(expected) {
-    return expected.length === 1 ? expected[0] : `one of\n\t${expected.join("\n\t")}`;
-}
-exports.renderExpected = renderExpected;
-function renderParseError(descriptor, { line, column, expected }) {
-    return `At ${line}:${column} in ${descriptor}: Expected ${renderExpected(expected)}`;
-}
-function isParseError(x) {
-    // tslint:disable-next-line strict-type-predicates
-    return x.expected !== undefined;
-}
-/** @param strict If true, we allow fewer things to be parsed. Turned on by linting. */
-function parseHeader(text, strict) {
-    const res = headerParser(strict).parse(text);
-    return res.status
-        ? res.value
-        : { index: res.index.offset, line: res.index.line, column: res.index.column, expected: res.expected };
-}
-function headerParser(strict) {
-    return pm.seqMap(pm.regex(/\/\/ Type definitions for (non-npm package )?/), parseLabel(strict), pm.string("// Project: "), projectParser, pm.regexp(/\r?\n\/\/ Definitions by: /), contributorsParser(strict), definitionsParser, typeScriptVersionParser, pm.all, // Don't care about the rest of the file
-    // tslint:disable-next-line:variable-name
-    (str, label, _project, projects, _defsBy, contributors, _definitions, typeScriptVersion) => ({
-        libraryName: label.name,
-        libraryMajorVersion: label.major,
-        libraryMinorVersion: label.minor,
-        nonNpm: str.endsWith("non-npm package "),
-        projects,
-        contributors,
-        typeScriptVersion,
-    }));
-}
-/*
-Allow any of the following:
-
-// Project: https://foo.com
-//          https://bar.com
-
-// Project: https://foo.com,
-//          https://bar.com
-
-// Project: https://foo.com, https://bar.com
-
-Use `\s\s+` to ensure at least 2 spaces, to  disambiguate from the next line being `// Definitions by:`.
-*/
-const separator = pm.regexp(/(, )|(,?\r?\n\/\/\s\s+)/);
-const projectParser = pm.sepBy1(pm.regexp(/[^,\r\n]+/), separator);
-function contributorsParser(strict) {
-    const contributor = strict
-        ? pm.seqMap(pm.regexp(/([^<]+) /, 1), pm.regexp(/\<https\:\/\/github\.com\/([a-zA-Z\d\-]+)\/?\>/, 1), (name, githubUsername) => ({ name, url: `https://github.com/${githubUsername}`, githubUsername }))
-        : // In non-strict mode, allows arbitrary URL, and trailing whitespace.
-            pm.seqMap(pm.regexp(/([^<]+) /, 1), pm.regexp(/<([^>]+)> */, 1), (name, url) => {
-                const rgx = /^https\:\/\/github.com\/([a-zA-Z\d\-]+)\/?$/;
-                const match = rgx.exec(url);
-                const githubUsername = match === null ? undefined : match[1];
-                // tslint:disable-next-line no-null-keyword
-                return { name, url: githubUsername ? `https://github.com/${githubUsername}` : url, githubUsername };
-            });
-    return pm.sepBy1(contributor, separator);
-}
-const definitionsParser = pm.regexp(/\r?\n\/\/ Definitions: [^\r\n]+/);
-function parseLabel(strict) {
-    return pm.Parser((input, index) => {
-        // Take all until the first newline.
-        const endIndex = regexpIndexOf(input, /\r|\n/, index);
-        if (endIndex === -1) {
-            return fail("EOF");
-        }
-        // Index past the end of the newline.
-        const end = input[endIndex] === "\r" ? endIndex + 2 : endIndex + 1;
-        const tilNewline = input.slice(index, endIndex);
-        // Parse in reverse. Once we've stripped off the version, the rest is the libary name.
-        const reversed = reverse(tilNewline);
-        // Last digit is allowed to be "x", which acts like "0"
-        const rgx = /((\d+|x)\.(\d+)(\.\d+)?(v)? )?(.+)/;
-        const match = rgx.exec(reversed);
-        if (match === null) {
-            // tslint:disable-line no-null-keyword
-            return fail();
-        }
-        const [, version, a, b, c, v, nameReverse] = match;
-        let majorReverse;
-        let minorReverse;
-        if (version !== undefined) {
-            // tslint:disable-line strict-type-predicates
-            if (c !== undefined) {
-                // tslint:disable-line strict-type-predicates
-                // There is a patch version
-                majorReverse = c;
-                minorReverse = b;
-                if (strict) {
-                    return fail("patch version not allowed");
+function validatePackageJson(typesDirectoryName, packageJson, typesVersions) {
+    const errors = [];
+    const needsTypesVersions = typesVersions.length !== 0;
+    for (const key in packageJson) {
+        switch (key) {
+            case "private":
+            case "dependencies":
+            case "license":
+            case "imports":
+            case "exports":
+            case "type":
+            case "name":
+            case "version":
+            case "devDependencies":
+            case "projects":
+            case "minimumTypeScriptVersion":
+            case "owners":
+            case "nonNpm":
+            case "nonNpmDescription":
+            case "pnpm":
+                break;
+            case "typesVersions":
+            case "types":
+                if (!needsTypesVersions) {
+                    errors.push(`${typesDirectoryName}'s package.json doesn't need to set "${key}" when no 'tsX.X' directories exist.`);
                 }
+                break;
+            default:
+                errors.push(`${typesDirectoryName}'s package.json should not include property ${key}`);
+        }
+    }
+    // private
+    if (packageJson.private !== true) {
+        errors.push(`${typesDirectoryName}'s package.json has bad "private": must be \`"private": true\``);
+    }
+    // devDependencies
+    if (typeof packageJson.devDependencies !== "object" ||
+        packageJson.devDependencies === null ||
+        packageJson.devDependencies["@types/" + typesDirectoryName] !== "workspace:.") {
+        errors.push(`${typesDirectoryName}'s package.json has bad "devDependencies": must include \`"@types/${typesDirectoryName}": "workspace:."\``);
+    }
+    // typesVersions
+    if (needsTypesVersions) {
+        assert.strictEqual(packageJson.types, "index", `"types" in '${typesDirectoryName}'s package.json' should be "index".`);
+        const expected = makeTypesVersionsForPackageJson(typesVersions);
+        if (!(0, utils_1.deepEquals)(packageJson.typesVersions, expected)) {
+            errors.push(`'${typesDirectoryName}'s package.json' has bad "typesVersions". Should be: ${JSON.stringify(expected, undefined, 4)}`);
+        }
+    }
+    // building the header object uses a monadic error pattern based on the one in the old header parser
+    // It's verbose and repetitive, but I didn't feel like writing a monadic `seq` to be used in only one place.
+    let name = "ERROR";
+    let libraryMajorVersion = 0;
+    let libraryMinorVersion = 0;
+    let nonNpm = false;
+    let minimumTypeScriptVersion = typescript_versions_1.TypeScriptVersion.lowest;
+    let projects = [];
+    let owners = [];
+    const nameResult = validateName();
+    const versionResult = validateVersion();
+    const nonNpmResult = validateNonNpm();
+    const typeScriptVersionResult = validateTypeScriptVersion();
+    const projectsResult = validateProjects();
+    const ownersResult = validateOwners();
+    const pnpmResult = validatePnpm();
+    const licenseResult = getLicenseFromPackageJson(packageJson.license);
+    if (typeof nameResult === "object") {
+        errors.push(...nameResult.errors);
+    }
+    else {
+        name = packageJson.name;
+    }
+    if ("errors" in versionResult) {
+        errors.push(...versionResult.errors);
+    }
+    else {
+        libraryMajorVersion = versionResult.major;
+        libraryMinorVersion = versionResult.minor;
+    }
+    if (typeof nonNpmResult === "object") {
+        errors.push(...nonNpmResult.errors);
+    }
+    else {
+        nonNpm = nonNpmResult;
+    }
+    if (typeof typeScriptVersionResult === "object") {
+        errors.push(...typeScriptVersionResult.errors);
+    }
+    else {
+        minimumTypeScriptVersion = typeScriptVersionResult;
+    }
+    if ("errors" in projectsResult) {
+        errors.push(...projectsResult.errors);
+    }
+    else {
+        projects = projectsResult;
+    }
+    if ("errors" in ownersResult) {
+        errors.push(...ownersResult.errors);
+    }
+    else {
+        owners = ownersResult;
+    }
+    if (typeof pnpmResult === "object") {
+        errors.push(...pnpmResult.errors);
+    }
+    if (Array.isArray(licenseResult)) {
+        errors.push(...licenseResult);
+    }
+    if (errors.length) {
+        return errors;
+    }
+    else {
+        return {
+            name,
+            libraryMajorVersion,
+            libraryMinorVersion,
+            nonNpm,
+            minimumTypeScriptVersion,
+            projects,
+            owners,
+        };
+    }
+    function validateName() {
+        if (packageJson.name !== "@types/" + typesDirectoryName) {
+            return {
+                errors: [`${typesDirectoryName}'s package.json should have \`"name": "@types/${typesDirectoryName}"\``],
+            };
+        }
+        else {
+            return typesDirectoryName;
+        }
+    }
+    function validateVersion() {
+        const errors = [];
+        if (!packageJson.version || typeof packageJson.version !== "string") {
+            errors.push(`${typesDirectoryName}'s package.json should have \`"version"\` matching the version of the implementation package.`);
+        }
+        else {
+            const version = semver.parse(packageJson.version);
+            if (version === null) {
+                errors.push(`${typesDirectoryName}'s package.json has bad "version": ${JSON.stringify(packageJson.version)} should look like "NN.NN.9999"`);
+            }
+            else if (version.patch !== 9999) {
+                errors.push(`${typesDirectoryName}'s package.json has bad "version": ${version} must end with ".9999"`);
             }
             else {
-                majorReverse = b;
-                minorReverse = a;
+                return { major: version.major, minor: version.minor };
             }
-            if (v !== undefined && strict) {
-                // tslint:disable-line strict-type-predicates
-                return fail("'v' not allowed");
+        }
+        return { errors };
+    }
+    function validateNonNpm() {
+        const errors = [];
+        if (packageJson.nonNpm !== undefined) {
+            if (packageJson.nonNpm !== true) {
+                errors.push(`${typesDirectoryName}'s package.json has bad "nonNpm": must be true if present.`);
+            }
+            else if (!packageJson.nonNpmDescription) {
+                errors.push(`${typesDirectoryName}'s package.json has missing "nonNpmDescription", which is required with "nonNpm": true.`);
             }
+            else if (typeof packageJson.nonNpmDescription !== "string") {
+                errors.push(`${typesDirectoryName}'s package.json has bad "nonNpmDescription": must be a string if present.`);
+            }
+            else {
+                return true;
+            }
+            return { errors };
+        }
+        else if (packageJson.nonNpmDescription !== undefined) {
+            errors.push(`${typesDirectoryName}'s package.json has "nonNpmDescription" without "nonNpm": true.`);
+        }
+        if (errors.length) {
+            return { errors };
         }
         else {
-            if (strict) {
-                return fail("Needs MAJOR.MINOR");
+            return false;
+        }
+    }
+    function validateTypeScriptVersion() {
+        if (packageJson.minimumTypeScriptVersion) {
+            if (typeof packageJson.minimumTypeScriptVersion !== "string" ||
+                !typescript_versions_1.TypeScriptVersion.isTypeScriptVersion(packageJson.minimumTypeScriptVersion)) {
+                return {
+                    errors: [
+                        `${typesDirectoryName}'s package.json has bad "minimumTypeScriptVersion": if present, must be a MAJOR.MINOR semver string up to "${typescript_versions_1.TypeScriptVersion.latest}".
+(Defaults to "${typescript_versions_1.TypeScriptVersion.lowest}" if not provided.)`,
+                    ],
+                };
+            }
+            else {
+                return packageJson.minimumTypeScriptVersion;
             }
-            majorReverse = "0";
-            minorReverse = "0";
         }
-        const [name, major, minor] = [reverse(nameReverse), reverse(majorReverse), reverse(minorReverse)];
-        return pm.makeSuccess(end, {
-            name,
-            major: intOfString(major),
-            minor: minor === "x" ? 0 : intOfString(minor),
-        });
-        function fail(msg) {
-            let expected = "foo MAJOR.MINOR";
-            if (msg !== undefined) {
-                expected += ` (${msg})`;
+        return typescript_versions_1.TypeScriptVersion.lowest;
+    }
+    function validateProjects() {
+        const errors = [];
+        if (!packageJson.projects ||
+            !Array.isArray(packageJson.projects) ||
+            !packageJson.projects.every((p) => typeof p === "string")) {
+            errors.push(`${typesDirectoryName}'s package.json has bad "projects": must be an array of strings that point to the project web site(s).`);
+        }
+        else if (packageJson.projects.length === 0) {
+            errors.push(`${typesDirectoryName}'s package.json has bad "projects": must have at least one project URL.`);
+        }
+        else {
+            return packageJson.projects;
+        }
+        return { errors };
+    }
+    function validateOwners() {
+        const errors = [];
+        if (!packageJson.owners || !Array.isArray(packageJson.owners)) {
+            errors.push(`${typesDirectoryName}'s package.json has bad "owners": must be an array of type Array<{ name: string, url: string, githubUsername: string}>.`);
+        }
+        else {
+            const es = checkPackageJsonOwners(typesDirectoryName, packageJson.owners);
+            if (es.length) {
+                errors.push(...es);
+            }
+            else {
+                return packageJson.owners;
             }
-            return pm.makeFailure(index, expected);
         }
+        return { errors };
+    }
+    function validatePnpm() {
+        const errors = [];
+        if (packageJson.pnpm) {
+            if (typeof packageJson.pnpm !== "object" || packageJson.pnpm === null) {
+                errors.push(`${typesDirectoryName}'s package.json has bad "pnpm": must be an object like { "overrides": { "@types/react": "^16" } }`);
+            }
+            else {
+                for (const key in packageJson.pnpm) {
+                    if (key !== "overrides") {
+                        errors.push(`${typesDirectoryName}'s package.json has bad "pnpm": it should not include property "${key}", only "overrides".`);
+                    }
+                }
+                const overrides = packageJson.pnpm.overrides;
+                if (overrides && typeof overrides === "object" && overrides !== null) {
+                    for (const key in overrides) {
+                        if (!key.startsWith("@types/")) {
+                            errors.push(`${typesDirectoryName}'s package.json has bad "pnpm": pnpm overrides may only override @types/ packages.`);
+                        }
+                    }
+                }
+                else {
+                    errors.push(`${typesDirectoryName}'s package.json has bad "pnpm": it must contain an "overrides" object.`);
+                }
+            }
+        }
+        if (errors.length) {
+            return { errors };
+        }
+        return undefined;
+    }
+}
+exports.validatePackageJson = validatePackageJson;
+function getTypesVersions(dirPath) {
+    return (0, utils_1.mapDefined)(fs.readdirSync(dirPath), (name) => {
+        if (name === "tsconfig.json" || name === "tslint.json" || name === "tsutils") {
+            return undefined;
+        }
+        const version = (0, utils_1.withoutStart)(name, "ts");
+        if (version === undefined || !fs.statSync((0, utils_1.joinPaths)(dirPath, name)).isDirectory()) {
+            return undefined;
+        }
+        if (!typescript_versions_1.TypeScriptVersion.isTypeScriptVersion(version)) {
+            throw new Error(`There is an entry named ${name}, but ${version} is not a valid TypeScript version.`);
+        }
+        if (!typescript_versions_1.TypeScriptVersion.isSupported(version)) {
+            throw new Error(`At ${dirPath}/${name}: TypeScript version ${version} is not supported on Definitely Typed.`);
+        }
+        return version;
     });
 }
-const typeScriptVersionLineParser = pm
-    .regexp(/\/\/ (?:Minimum )?TypeScript Version: (\d.(\d))/, 1)
-    .chain((v) => typescript_versions_1.TypeScriptVersion.all.includes(v)
-    ? pm.succeed(v)
-    : pm.fail(`TypeScript ${v} is not yet supported.`));
-const typeScriptVersionParser = pm
-    .regexp(/\r?\n/)
-    .then(typeScriptVersionLineParser)
-    .fallback(typescript_versions_1.TypeScriptVersion.shipped[0]);
-function parseTypeScriptVersionLine(line) {
-    const result = typeScriptVersionLineParser.parse(line);
-    if (!result.status) {
-        throw new Error(`Could not parse version: line is '${line}'`);
-    }
-    return result.value;
+exports.getTypesVersions = getTypesVersions;
+function checkPackageJsonOwners(packageName, packageJsonOwners) {
+    const errors = [];
+    for (const c of packageJsonOwners) {
+        if (typeof c !== "object" || c === null) {
+            errors.push(`${packageName}'s package.json has bad "owners": must be an array of type Array<{ name: string, url: string } | { name: string, githubUsername: string}>.`);
+            continue;
+        }
+        if (!("name" in c) || typeof c.name !== "string") {
+            errors.push(`${packageName}'s package.json has bad "name" in owner ${JSON.stringify(c)}
+Must be an object of type { name: string, url: string } | { name: string, githubUsername: string}.`);
+        }
+        else if (c.name === "My Self") {
+            errors.push(`${packageName}'s package.json has bad "name" in owner ${JSON.stringify(c)}
+Author name should be your name, not the default.`);
+        }
+        if ("githubUsername" in c) {
+            if (typeof c.githubUsername !== "string") {
+                errors.push(`${packageName}'s package.json has bad "githubUsername" in owner ${JSON.stringify(c)}
+Must be an object of type { name: string, url: string } | { name: string, githubUsername: string}.`);
+            }
+            else if ("url" in c) {
+                errors.push(`${packageName}'s package.json has bad owner: should not have both "githubUsername" and "url" properties in owner ${JSON.stringify(c)}`);
+            }
+        }
+        else if ("url" in c && typeof c.url !== "string") {
+            errors.push(`${packageName}'s package.json has bad "url" in owner ${JSON.stringify(c)}
+Must be an object of type { name: string, url: string } | { name: string, githubUsername: string}.`);
+        }
+        for (const key in c) {
+            switch (key) {
+                case "name":
+                case "url":
+                case "githubUsername":
+                    break;
+                default:
+                    errors.push(`${packageName}'s package.json has bad owner: should not include property ${key} in ${JSON.stringify(c)}`);
+            }
+        }
+    }
+    return errors;
 }
-exports.parseTypeScriptVersionLine = parseTypeScriptVersionLine;
-function reverse(s) {
-    let out = "";
-    for (let i = s.length - 1; i >= 0; i--) {
-        out += s[i];
+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 */;
     }
-    return out;
+    if (typeof packageJsonLicense === "string" && packageJsonLicense === "MIT") {
+        return [`Specifying '"license": "MIT"' is redundant, this is the default.`];
+    }
+    if (allLicenses.includes(packageJsonLicense)) {
+        return packageJsonLicense;
+    }
+    return [
+        `'package.json' license is ${JSON.stringify(packageJsonLicense)}.\nExpected one of: ${JSON.stringify(allLicenses)}}`,
+    ];
+}
+exports.getLicenseFromPackageJson = getLicenseFromPackageJson;
+// TODO: Move these checks into validatePackageJson and make it return an entire package.json type, not just Header
+// TODO: Expand these checks too, adding name and version just like dtslint
+function checkPackageJsonExportsAndAddPJsonEntry(exports, path) {
+    if (exports === undefined)
+        return exports;
+    if (typeof exports === "string") {
+        return exports;
+    }
+    if (typeof exports !== "object") {
+        return [`Package exports at path ${path} should be an object or string.`];
+    }
+    if (exports === null) {
+        return [`Package exports at path ${path} should not be null.`];
+    }
+    if (!exports["./package.json"]) {
+        exports["./package.json"] = "./package.json";
+    }
+    return exports;
 }
-function regexpIndexOf(s, rgx, start) {
-    const index = s.slice(start).search(rgx);
-    return index === -1 ? index : index + start;
+exports.checkPackageJsonExportsAndAddPJsonEntry = checkPackageJsonExportsAndAddPJsonEntry;
+function checkPackageJsonImports(imports, path) {
+    if (imports === undefined)
+        return imports;
+    if (typeof imports !== "object") {
+        return [`Package imports at path ${path} should be an object or string.`];
+    }
+    else if (imports === null) {
+        return [`Package imports at path ${path} should not be null.`];
+    }
+    return imports;
+}
+exports.checkPackageJsonImports = checkPackageJsonImports;
+function checkPackageJsonType(type, path) {
+    if (type === undefined)
+        return type;
+    if (type !== "module") {
+        return [`Package type at path ${path} can only be 'module'.`];
+    }
+    return type;
 }
-function intOfString(str) {
-    const n = Number.parseInt(str, 10);
-    if (Number.isNaN(n)) {
-        throw new Error(`Error in parseInt(${JSON.stringify(str)})`);
+exports.checkPackageJsonType = checkPackageJsonType;
+/**
+ * @param devDependencySelfName - pass the package name only for devDependencies
+ */
+function checkPackageJsonDependencies(dependencies, path, allowedDependencies, devDependencySelfName) {
+    if (dependencies === undefined) {
+        return [];
+    }
+    if (dependencies === null || typeof dependencies !== "object") {
+        return [`${path} should contain ${devDependencySelfName ? "devDependencies" : "dependencies"} or not exist.`];
+    }
+    const errors = [];
+    for (const dependencyName of Object.keys(dependencies)) {
+        if (!dependencyName.startsWith("@types/") && !allowedDependencies.has(dependencyName)) {
+            const msg = `Dependency ${dependencyName} not in the allowed dependencies list.
+Please make a pull request to microsoft/DefinitelyTyped-tools adding it to \`packages/definitions-parser/allowedPackageJsonDependencies.txt\`.`;
+            errors.push(`In ${path}: ${msg}`);
+        }
+        const version = dependencies[dependencyName];
+        if (typeof version !== "string") {
+            errors.push(`In ${path}: Dependency version for ${dependencyName} should be a string.`);
+        }
+    }
+    if (devDependencySelfName) {
+        const selfDependency = dependencies[devDependencySelfName];
+        if (selfDependency === undefined || selfDependency !== "workspace:.") {
+            errors.push(`In ${path}: devDependencies must contain a self-reference to the current package like  ${JSON.stringify(devDependencySelfName)}: "workspace:."`);
+        }
     }
-    return n;
+    return errors;
 }
+exports.checkPackageJsonDependencies = checkPackageJsonDependencies;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@definitelytyped/header-parser",
-  "version": "0.0.177",
+  "version": "0.0.179",
   "description": "",
   "author": "Nathan Shively-Sanders <nathansa@microsoft.com>",
   "homepage": "https://github.com/microsoft/DefinitelyTyped-tools/tree/master/packages/header-parser#readme",
@@ -12,20 +12,22 @@
     "url": "https://github.com/microsoft/DefinitelyTyped-tools.git",
     "directory": "packages/header-parser"
   },
-  "scripts": {
-    "build": "tsc -b",
-    "test": "../../node_modules/.bin/jest --config ../../jest.config.js packages/header-parser"
-  },
   "bugs": {
     "url": "https://github.com/microsoft/DefinitelyTyped-tools/issues"
   },
   "dependencies": {
-    "@definitelytyped/typescript-versions": "^0.0.177",
-    "@types/parsimmon": "^1.10.1",
-    "parsimmon": "^1.13.0"
+    "semver": "^7.3.7",
+    "@definitelytyped/typescript-versions": "0.0.179",
+    "@definitelytyped/utils": "0.0.179"
+  },
+  "devDependencies": {
+    "@types/semver": "^7.5.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "962f06bd86ded720d4351c761b6a7af6cf79f97e"
-}
+  "scripts": {
+    "build": "tsc -b",
+    "test": "../../node_modules/.bin/jest --config ../../jest.config.js packages/header-parser"
+  }
+}