Update imports for publisher

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 .DS_Store
 *.log
-dist
+dist
+*.tsbuildinfo

jest.config.js

@@ -3,7 +3,8 @@ module.exports = {
   testEnvironment: "node",
   globals: {
     "ts-jest": {
-      tsConfig: "./tsconfig.test.json"
+      tsConfig: "./tsconfig.test.json",
+      diagnostics: false
     }
   }
 };

packages/definitions-parser/.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "parse-definitions.js",
+      "cwd": "${workspaceFolder}",
+      "program": "${workspaceFolder}/bin/parse-definitions.js",
+      "args": [],
+      "sourceMaps": true
+    }
+  ]
+}

packages/definitions-parser/src/dataFile.ts

@@ -0,0 +1,16 @@
+import { ensureDir } from "fs-extra";
+import { writeJson, joinPaths, readFileAndWarn } from "@definitelytyped/utils";
+import { dataDirPath } from "./lib/settings";
+
+export function readDataFile(generatedBy: string, fileName: string): Promise<object> {
+  return readFileAndWarn(generatedBy, dataFilePath(fileName));
+}
+
+export async function writeDataFile(filename: string, content: {}, formatted = true): Promise<void> {
+  await ensureDir(dataDirPath);
+  await writeJson(dataFilePath(filename), content, formatted);
+}
+
+export function dataFilePath(filename: string): string {
+  return joinPaths(dataDirPath, filename);
+}

packages/definitions-parser/src/getDefinitelyTyped.ts

@@ -8,7 +8,20 @@ import {
 } from "@definitelytyped/utils";
 
 import { dataDirPath, definitelyTypedZipUrl } from "./lib/settings";
-import { ParseDefinitionsOptions } from "./lib/common";
+
+/** Settings that may be determined dynamically. */
+export interface ParseDefinitionsOptions {
+    /**
+     * e.g. '../DefinitelyTyped'
+     * This is overridden to `cwd` when running the tester, as that is run from within DefinitelyTyped.
+     * If undefined, downloads instead.
+     */
+    readonly definitelyTypedPath: string | undefined;
+    /** Whether to show progress bars. Good when running locally, bad when running in CI. */
+    readonly progress: boolean;
+    /** Disabled in CI since it has problems logging errors from other processes. */
+    readonly parseInParallel: boolean;
+  }
 
 export async function getDefinitelyTyped(options: ParseDefinitionsOptions, log: LoggerWithErrors): Promise<FS> {
     if (options.definitelyTypedPath === undefined) {
@@ -27,3 +40,4 @@ export async function getDefinitelyTyped(options: ParseDefinitionsOptions, log:
 export function getLocallyInstalledDefinitelyTyped(path: string): FS {
     return new DiskFS(`${path}/`);
 }
+

packages/definitions-parser/src/index.ts

@@ -1,2 +1,4 @@
+export * from "./dataFile";
 export * from "./getDefinitelyTyped";
 export * from "./parseDefinitions";
+export * from "./packages";

packages/definitions-parser/src/lib/definition-parser.ts

@@ -10,7 +10,7 @@ import {
     TypingsDataRaw,
     TypingsVersionsRaw,
     TypingVersion,
-} from "./packages";
+} from "../packages";
 import { dependenciesWhitelist } from "./settings";
 import { FS, split, mapDefined, filter, sort, withoutStart, computeHash, hasWindowsSlashes, join, flatMap, unique, unmangleScopedPackage } from "@definitelytyped/utils";
 

packages/definitions-parser/src/lib/settings.ts

@@ -11,3 +11,6 @@ export const definitelyTypedZipUrl = "https://codeload.github.com/DefinitelyType
 
 export const dependenciesWhitelist: ReadonlySet<string> =
   new Set(readFileSync(joinPaths(root, "dependenciesWhitelist.txt")).split(/\r?\n/));
+
+/** Note: this is 'types' and not '@types' */
+export const scopeName = "types";

packages/definitions-parser/src/lib/packages.ts → packages/definitions-parser/src/packages.ts

@@ -1,12 +1,8 @@
 import assert = require("assert");
-import { AllTypeScriptVersion, Author, TypeScriptVersion } from "definitelytyped-header-parser";
-
-import { FS } from "../getDefinitelyTyped";
-import { assertSorted, joinPaths, mapValues, unmangleScopedPackage } from "../util/util";
-
-import { readDataFile } from "./common";
-import { outputDirPath, scopeName } from "./settings";
-import { compare as compareSemver, Semver } from "./versions";
+import { AllTypeScriptVersion, Author, TypeScriptVersion } from "@definitelytyped/header-parser";
+import { FS, mapValues, assertSorted, unmangleScopedPackage, joinPaths, Semver } from "@definitelytyped/utils";
+import { readDataFile } from "./dataFile";
+import { outputDirPath, scopeName } from "./lib/settings";
 
 export class AllPackages {
     static async read(dt: FS): Promise<AllPackages> {
@@ -451,7 +447,7 @@ export class TypingsVersions {
          * 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 = Array.from(versionMappings.keys()).sort(compareSemver).reverse();
+        this.versions = Array.from(versionMappings.keys()).sort(Semver.compare).reverse();
 
         this.map = new Map(this.versions.map(version => {
             const dataKey = versionMappings.get(version)!;

packages/definitions-parser/src/parseDefinitions.ts

@@ -1,15 +1,15 @@
 import { FS, LoggerWithErrors, filterNAtATimeOrdered, runWithChildProcesses } from "@definitelytyped/utils";
-import { writeDataFile } from "./lib/common";
+import { writeDataFile } from "./dataFile";
 import { getTypingInfo } from "./lib/definition-parser";
 import { definitionParserWorkerFilename } from "./lib/definition-parser-worker";
-import { AllPackages, readNotNeededPackages, typesDataFilename, TypingsVersionsRaw } from "./lib/packages";
+import { AllPackages, readNotNeededPackages, typesDataFilename, TypingsVersionsRaw } from "./packages";
 
 export interface ParallelOptions {
     readonly nProcesses: number;
     readonly definitelyTypedPath: string;
 }
 
-export default async function parseDefinitions(dt: FS, parallel: ParallelOptions | undefined, log: LoggerWithErrors): Promise<AllPackages> {
+export async function parseDefinitions(dt: FS, parallel: ParallelOptions | undefined, log: LoggerWithErrors): Promise<AllPackages> {
     log.info("Parsing definitions...");
     const typesFS = dt.subDir("types");
     const packageNames = await filterNAtATimeOrdered(parallel ? parallel.nProcesses : 1, typesFS.readdir(), name => typesFS.isDirectory(name));

packages/definitions-parser/test/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "types": ["node", "jest"]
+  },
+  "references": [
+    { "path": ".." },
+    { "path": "../../definitions-parser" }
+  ]
+}

packages/header-parser/test/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

packages/header-parser/tsconfig.json

@@ -2,8 +2,7 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": {
       "outDir": "dist",
-      "rootDir": "src",
-      "noFallthroughCasesInSwitch": true
+      "rootDir": "src"
     }
   }