@atlaspack/package-manager 2.14.20 → 2.14.21-typescript-08dcc1c9b.0

package/src/{Pnpm.js → Pnpm.ts}

@@ -1,70 +1,83 @@
-// @flow strict-local
-
 import type {PackageInstaller, InstallerOptions} from '@atlaspack/types';
 
 import path from 'path';
 import fs from 'fs';
+// @ts-expect-error TS7016
 import commandExists from 'command-exists';
+// @ts-expect-error TS7016
 import spawn from 'cross-spawn';
 import {registerSerializableClass} from '@atlaspack/build-cache';
 import logger from '@atlaspack/logger';
+// @ts-expect-error TS7016
 import split from 'split2';
 import JSONParseStream from './JSONParseStream';
 import promiseFromProcess from './promiseFromProcess';
 import {exec, npmSpecifierFromModuleRequest} from './utils';
 
-// $FlowFixMe
 import pkg from '../package.json';
 
 const PNPM_CMD = 'pnpm';
 
 type LogLevel = 'error' | 'warn' | 'info' | 'debug';
 
-type ErrorLog = {|
-  err: {|
-    message: string,
-    code: string,
-    stack: string,
-  |},
-|};
+type ErrorLog = {
+  err: {
+    message: string;
+    code: string;
+    stack: string;
+  };
+};
 
 type PNPMLog =
-  | {|
-      +name: 'pnpm:progress',
-      packageId: string,
-      status: 'fetched' | 'found_in_store' | 'resolved',
-    |}
-  | {|
-      +name: 'pnpm:root',
-      added?: {|
-        id?: string,
-        name: string,
-        realName: string,
-        version?: string,
-        dependencyType?: 'prod' | 'dev' | 'optional',
-        latest?: string,
-        linkedFrom?: string,
-      |},
-      removed?: {|
-        name: string,
-        version?: string,
-        dependencyType?: 'prod' | 'dev' | 'optional',
-      |},
-    |}
-  | {|+name: 'pnpm:importing', from: string, method: string, to: string|}
-  | {|+name: 'pnpm:link', target: string, link: string|}
-  | {|+name: 'pnpm:stats', prefix: string, removed?: number, added?: number|};
-
-type PNPMResults = {|
-  level: LogLevel,
-  prefix?: string,
-  message?: string,
-  ...ErrorLog,
-  ...PNPMLog,
-|};
-
-let hasPnpm: ?boolean;
-let pnpmVersion: ?number;
+  | {
+      readonly name: 'pnpm:progress';
+      packageId: string;
+      status: 'fetched' | 'found_in_store' | 'resolved';
+    }
+  | {
+      readonly name: 'pnpm:root';
+      added?: {
+        id?: string;
+        name: string;
+        realName: string;
+        version?: string;
+        dependencyType?: 'prod' | 'dev' | 'optional';
+        latest?: string;
+        linkedFrom?: string;
+      };
+      removed?: {
+        name: string;
+        version?: string;
+        dependencyType?: 'prod' | 'dev' | 'optional';
+      };
+    }
+  | {
+      readonly name: 'pnpm:importing';
+      from: string;
+      method: string;
+      to: string;
+    }
+  | {
+      readonly name: 'pnpm:link';
+      target: string;
+      link: string;
+    }
+  | {
+      readonly name: 'pnpm:stats';
+      prefix: string;
+      removed?: number;
+      added?: number;
+    };
+
+type PNPMResults = {
+  level: LogLevel;
+  prefix?: string;
+  message?: string;
+} & ErrorLog &
+  PNPMLog;
+
+let hasPnpm: boolean | null | undefined;
+let pnpmVersion: number | null | undefined;
 
 export class Pnpm implements PackageInstaller {
   static async exists(): Promise<boolean> {
@@ -74,7 +87,7 @@ export class Pnpm implements PackageInstaller {
 
     try {
       hasPnpm = Boolean(await commandExists('pnpm'));
-    } catch (err) {
+    } catch (err: any) {
       hasPnpm = false;
     }
 
@@ -88,6 +101,7 @@ export class Pnpm implements PackageInstaller {
   }: InstallerOptions): Promise<void> {
     if (pnpmVersion == null) {
       let version = await exec('pnpm --version');
+      // @ts-expect-error TS2345
       pnpmVersion = parseInt(version.stdout, 10);
     }
 
@@ -106,7 +120,7 @@ export class Pnpm implements PackageInstaller {
     }
     args = args.concat(modules.map(npmSpecifierFromModuleRequest));
 
-    let env = {};
+    let env: Record<string, any> = {};
     for (let key in process.env) {
       if (!key.startsWith('npm_') && key !== 'INIT_CWD' && key !== 'NODE_ENV') {
         env[key] = process.env[key];
@@ -122,7 +136,9 @@ export class Pnpm implements PackageInstaller {
     });
     installProcess.stdout
       .pipe(split())
+      // @ts-expect-error TS2554
       .pipe(new JSONParseStream())
+      // @ts-expect-error TS7006
       .on('error', (e) => {
         logger.warn({
           origin: '@atlaspack/package-manager',
@@ -148,11 +164,13 @@ export class Pnpm implements PackageInstaller {
         }
       });
 
-    let stderr = [];
+    let stderr: Array<any> = [];
     installProcess.stderr
+      // @ts-expect-error TS7006
       .on('data', (str) => {
         stderr.push(str.toString());
       })
+      // @ts-expect-error TS7006
       .on('error', (e) => {
         logger.warn({
           origin: '@atlaspack/package-manager',
@@ -181,7 +199,7 @@ export class Pnpm implements PackageInstaller {
           message,
         });
       }
-    } catch (e) {
+    } catch (e: any) {
       throw new Error('pnpm failed to install modules');
     }
   }

package/src/{Yarn.js → Yarn.ts}

@@ -1,41 +1,49 @@
-// @flow strict-local
-
 import type {PackageInstaller, InstallerOptions} from '@atlaspack/types';
 
+// @ts-expect-error TS7016
 import commandExists from 'command-exists';
+// @ts-expect-error TS7016
 import spawn from 'cross-spawn';
 import {registerSerializableClass} from '@atlaspack/build-cache';
 import logger from '@atlaspack/logger';
+// @ts-expect-error TS7016
 import split from 'split2';
 import JSONParseStream from './JSONParseStream';
 import promiseFromProcess from './promiseFromProcess';
 import {exec, npmSpecifierFromModuleRequest} from './utils';
 
-// $FlowFixMe
 import pkg from '../package.json';
 
 const YARN_CMD = 'yarn';
 
 type YarnStdOutMessage =
-  | {|
-      +type: 'step',
-      data: {|
-        message: string,
-        current: number,
-        total: number,
-      |},
-    |}
-  | {|+type: 'success', data: string|}
-  | {|+type: 'info', data: string|}
-  | {|+type: 'tree' | 'progressStart' | 'progressTick'|};
-
-type YarnStdErrMessage = {|
-  +type: 'error' | 'warning',
-  data: string,
-|};
-
-let hasYarn: ?boolean;
-let yarnVersion: ?number;
+  | {
+      readonly type: 'step';
+      data: {
+        message: string;
+        current: number;
+        total: number;
+      };
+    }
+  | {
+      readonly type: 'success';
+      data: string;
+    }
+  | {
+      readonly type: 'info';
+      data: string;
+    }
+  | {
+      readonly type: 'tree' | 'progressStart' | 'progressTick';
+    };
+
+type YarnStdErrMessage = {
+  readonly type: 'error' | 'warning';
+  data: string;
+};
+
+let hasYarn: boolean | null | undefined;
+let yarnVersion: number | null | undefined;
 
 export class Yarn implements PackageInstaller {
   static async exists(): Promise<boolean> {
@@ -45,7 +53,7 @@ export class Yarn implements PackageInstaller {
 
     try {
       hasYarn = Boolean(await commandExists('yarn'));
-    } catch (err) {
+    } catch (err: any) {
       hasYarn = false;
     }
 
@@ -59,6 +67,7 @@ export class Yarn implements PackageInstaller {
   }: InstallerOptions): Promise<void> {
     if (yarnVersion == null) {
       let version = await exec('yarn --version');
+      // @ts-expect-error TS2345
       yarnVersion = parseInt(version.stdout, 10);
     }
 
@@ -76,7 +85,7 @@ export class Yarn implements PackageInstaller {
     // When Parcel is run by Yarn (e.g. via package.json scripts), several environment variables are
     // added. When parcel in turn calls Yarn again, these can cause Yarn to behave stragely, so we
     // filter them out when installing packages.
-    let env = {};
+    let env: Record<string, any> = {};
     for (let key in process.env) {
       if (
         !key.startsWith('npm_') &&
@@ -92,7 +101,9 @@ export class Yarn implements PackageInstaller {
     installProcess.stdout
       // Invoking yarn with --json provides streaming, newline-delimited JSON output.
       .pipe(split())
+      // @ts-expect-error TS2554
       .pipe(new JSONParseStream())
+      // @ts-expect-error TS7006
       .on('error', (e) => {
         logger.error(e, '@atlaspack/package-manager');
       })
@@ -119,7 +130,9 @@ export class Yarn implements PackageInstaller {
 
     installProcess.stderr
       .pipe(split())
+      // @ts-expect-error TS2554
       .pipe(new JSONParseStream())
+      // @ts-expect-error TS7006
       .on('error', (e) => {
         logger.error(e, '@atlaspack/package-manager');
       })
@@ -144,7 +157,7 @@ export class Yarn implements PackageInstaller {
 
     try {
       return await promiseFromProcess(installProcess);
-    } catch (e) {
+    } catch (e: any) {
       throw new Error('Yarn failed to install modules:' + e.message);
     }
   }

package/src/{getCurrentPackageManager.js → getCurrentPackageManager.ts}

@@ -1,8 +1,13 @@
-// @flow
-
 export default function getCurrentPackageManager(
-  userAgent: ?string = process.env.npm_config_user_agent,
-): ?{|name: string, version: string|} {
+  // @ts-expect-error TS2322
+  userAgent: string | null = process.env.npm_config_user_agent,
+):
+  | {
+      name: string;
+      version: string;
+    }
+  | null
+  | undefined {
   if (!userAgent) {
     return undefined;
   }

package/src/{index.js → index.ts}

@@ -1,5 +1,3 @@
-// @flow
-
 import type {PackageManagerResolveResult} from '@atlaspack/types';
 
 export type {

package/src/{installPackage.js → installPackage.ts}

@@ -1,5 +1,3 @@
-// @flow
-
 import type {FilePath, PackageJSON} from '@atlaspack/types';
 import type {
   ModuleRequest,
@@ -62,7 +60,7 @@ async function install(
       packagePath: fromPkgPath,
       fs,
     });
-  } catch (err) {
+  } catch (err: any) {
     throw new Error(`Failed to install ${moduleNames}: ${err.message}`);
   }
 
@@ -88,7 +86,7 @@ async function installPeerDependencies(
   module: ModuleRequest,
   from: FilePath,
   projectRoot: FilePath,
-  options,
+  options: InstallOptions,
 ) {
   const {resolved} = await packageManager.resolve(module.name, from);
   const modulePkg: PackageJSON = nullthrows(
@@ -112,6 +110,7 @@ async function installPeerDependencies(
       if (!semver.satisfies(pkg.version, range)) {
         throw new ThrowableDiagnostic({
           diagnostic: {
+            // @ts-expect-error TS2345
             message: md`Could not install the peer dependency "${name}" for "${module.name}", installed version ${pkg.version} is incompatible with ${range}`,
             origin: '@atlaspack/package-manager',
             codeFrames: [
@@ -205,7 +204,7 @@ export function _addToInstallQueue(
   filePath: FilePath,
   projectRoot: FilePath,
   options?: InstallOptions,
-): Promise<mixed> {
+): Promise<unknown> {
   modules = modules.map((request) => ({
     name: validateModuleSpecifier(request.name),
     range: request.range,
@@ -248,7 +247,7 @@ export function installPackage(
   filePath: FilePath,
   projectRoot: FilePath,
   options?: InstallOptions,
-): Promise<mixed> {
+): Promise<unknown> {
   if (WorkerFarm.isWorker()) {
     let workerApi = WorkerFarm.getWorkerApi();
     // TODO this should really be `__filename` but without the rewriting.

package/src/{nodejsConditions.js → nodejsConditions.ts}

@@ -1,8 +1,8 @@
-// @flow
 import process from 'process';
 
 // https://nodejs.org/api/packages.html#conditional-exports
 // TODO We don't support { "type": "module" }
+// @ts-expect-error TS4104
 export const defaultNodejsConditions: Array<string> = Object.freeze([
   'node-addons',
   'node',
@@ -12,24 +12,27 @@ export const defaultNodejsConditions: Array<string> = Object.freeze([
   'default',
 ]);
 
-let envConditions: void | Array<string> = undefined;
+let envConditions: undefined | Array<string> = undefined;
 
 /** @description Gets the export conditions from NODE_OPTIONS and node arguments */
 export function getConditionsFromEnv(): Array<string> {
   if (!envConditions) {
-    const conditions = [];
+    const conditions: Array<never> = [];
 
     for (const arg of [
       ...process.execArgv,
       ...(process.env.NODE_OPTIONS || '').split(' '),
     ]) {
       if (arg.startsWith('--conditions=')) {
+        // @ts-expect-error TS2345
         conditions.push(arg.substring(13));
       }
     }
 
+    // @ts-expect-error TS4104
     envConditions = Object.freeze([...conditions, ...defaultNodejsConditions]);
   }
 
+  // @ts-expect-error TS2322
   return envConditions;
 }

package/src/promiseFromProcess.ts

@@ -0,0 +1,23 @@
+import type {ChildProcess} from 'child_process';
+
+export default function promiseFromProcess(
+  childProcess: ChildProcess,
+): Promise<void> {
+  return new Promise(
+    (
+      resolve: (result: Promise<undefined> | undefined) => void,
+      reject: (error?: any) => void,
+    ) => {
+      childProcess.on('error', reject);
+      childProcess.on('close', (code) => {
+        if (code !== 0) {
+          reject(new Error('Child process failed'));
+          return;
+        }
+
+        // @ts-expect-error TS2794
+        resolve();
+      });
+    },
+  );
+}

package/src/{utils.js → utils.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import type {FilePath, ModuleRequest} from '@atlaspack/types';
 import type {FileSystem} from '@atlaspack/fs';
 
@@ -11,8 +9,12 @@ import {promisify} from 'util';
 
 export const exec: (
   command: string,
-  options?: child_process$execOpts,
-) => Promise<{|stdout: string | Buffer, stderr: string | Buffer|}> = _exec
+  // @ts-expect-error TS2503
+  options?: child_process.execOpts,
+) => Promise<{
+  stdout: string | Buffer;
+  stderr: string | Buffer;
+}> = _exec
   ? promisify(_exec)
   : // _exec is undefined in browser builds
     _exec;
@@ -25,10 +27,10 @@ export function npmSpecifierFromModuleRequest(
     : moduleRequest.name;
 }
 
-export function moduleRequestsFromDependencyMap(dependencyMap: {|
-  [string]: string,
-|}): Array<ModuleRequest> {
-  return Object.entries(dependencyMap).map(([name, range]) => {
+export function moduleRequestsFromDependencyMap(dependencyMap: {
+  [key: string]: string;
+}): Array<ModuleRequest> {
+  return Object.entries(dependencyMap).map(([name, range]: [any, any]) => {
     invariant(typeof range === 'string');
     return {
       name,
@@ -42,7 +44,15 @@ export async function getConflictingLocalDependencies(
   name: string,
   local: FilePath,
   projectRoot: FilePath,
-): Promise<?{|json: string, filePath: FilePath, fields: Array<string>|}> {
+): Promise<
+  | {
+      json: string;
+      filePath: FilePath;
+      fields: Array<string>;
+    }
+  | null
+  | undefined
+> {
   let pkgPath = await resolveConfig(fs, local, ['package.json'], projectRoot);
   if (pkgPath == null) {
     return;
@@ -52,7 +62,7 @@ export async function getConflictingLocalDependencies(
   let pkg;
   try {
     pkg = JSON.parse(pkgStr);
-  } catch (e) {
+  } catch (e: any) {
     // TODO: codeframe
     throw new ThrowableDiagnostic({
       diagnostic: {
@@ -72,7 +82,7 @@ export async function getConflictingLocalDependencies(
     });
   }
 
-  let fields = [];
+  let fields: Array<string> = [];
   for (let field of ['dependencies', 'devDependencies', 'peerDependencies']) {
     if (
       typeof pkg[field] === 'object' &&

package/src/{validateModuleSpecifier.js → validateModuleSpecifier.ts}

@@ -1,5 +1,3 @@
-// @flow
-
 const MODULE_REGEX = /^((@[^/\s]+\/){0,1}([^/\s.~]+[^/\s]*)){1}(@[^/\s]+){0,1}/;
 
 export default function validateModuleSpecifier(moduleName: string): string {

package/test/{NodePackageManager.test.js → NodePackageManager.test.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import {MemoryFS, NodeFS, OverlayFS} from '@atlaspack/fs';
 import assert from 'assert';
 import invariant from 'assert';
@@ -14,11 +12,11 @@ import {MockPackageInstaller, NodePackageManager} from '../src';
 const FIXTURES_DIR = path.join(__dirname, 'fixtures');
 const ROOT_DIR = path.normalize(path.join(__dirname, '..', '..', '..', '..'));
 
-function normalize(res) {
+function normalize(res: any) {
   return {
     ...res,
     invalidateOnFileCreate:
-      res?.invalidateOnFileCreate?.sort((a, b) => {
+      res?.invalidateOnFileCreate?.sort((a: any, b: any) => {
         let ax =
           a.filePath ??
           a.glob ??
@@ -36,15 +34,15 @@ function normalize(res) {
   };
 }
 
-function check(resolved, expected) {
+function check(resolved: any, expected: any) {
   assert.deepEqual(normalize(resolved), normalize(expected));
 }
 
 describe('NodePackageManager', function () {
-  let fs;
-  let packageManager;
-  let packageInstaller;
-  let workerFarm;
+  let fs: any;
+  let packageManager: any;
+  let packageInstaller: any;
+  let workerFarm: any;
 
   // These can sometimes take a lil while
   this.timeout(20000);
@@ -77,6 +75,7 @@ describe('NodePackageManager', function () {
         type: 1,
         invalidateOnFileChange: new Set([
           path.join(FIXTURES_DIR, 'has-foo/node_modules/foo/package.json'),
+          path.join(ROOT_DIR, '/packages/core/package-manager/tsconfig.json'),
           path.join(ROOT_DIR, 'tsconfig.json'),
         ]),
         invalidateOnFileCreate: [
@@ -132,6 +131,7 @@ describe('NodePackageManager', function () {
         type: 1,
         invalidateOnFileChange: new Set([
           path.join(FIXTURES_DIR, 'has-foo/node_modules/a/package.json'),
+          path.join(ROOT_DIR, '/packages/core/package-manager/tsconfig.json'),
           path.join(ROOT_DIR, 'tsconfig.json'),
         ]),
         invalidateOnFileCreate: [
@@ -163,7 +163,6 @@ describe('NodePackageManager', function () {
   it('does not autoinstall packages that are already listed in package.json', async () => {
     packageInstaller.register('a', fs, path.join(FIXTURES_DIR, 'packages/a'));
 
-    // $FlowFixMe assert.rejects is Node 10+
     await assert.rejects(
       () =>
         packageManager.resolve(
@@ -171,7 +170,7 @@ describe('NodePackageManager', function () {
           path.join(FIXTURES_DIR, 'has-a-not-yet-installed/index.js'),
           {shouldAutoInstall: true},
         ),
-      (err) => {
+      (err: any) => {
         invariant(err instanceof ThrowableDiagnostic);
         assert(err.message.includes('Run your package manager'));
         return true;
@@ -252,7 +251,6 @@ describe('NodePackageManager', function () {
         path.join(FIXTURES_DIR, 'has-foo/index.js'),
       );
 
-      // $FlowFixMe assert.rejects is Node 10+
       await assert.rejects(
         () =>
           packageManager.resolve(
@@ -262,7 +260,7 @@ describe('NodePackageManager', function () {
               range: '^2.0.0',
             },
           ),
-        (err) => {
+        (err: any) => {
           invariant(err instanceof ThrowableDiagnostic);
           assert.equal(
             err.message,
@@ -305,6 +303,7 @@ describe('NodePackageManager', function () {
               FIXTURES_DIR,
               'has-foo/subpackage/node_modules/foo/package.json',
             ),
+            path.join(ROOT_DIR, '/packages/core/package-manager/tsconfig.json'),
             path.join(ROOT_DIR, 'tsconfig.json'),
           ]),
           invalidateOnFileCreate: [
@@ -364,7 +363,6 @@ describe('NodePackageManager', function () {
         path.join(FIXTURES_DIR, 'packages/peers-2.0'),
       );
 
-      // $FlowFixMe assert.rejects is Node 10+
       await assert.rejects(
         () =>
           packageManager.resolve(
@@ -375,7 +373,7 @@ describe('NodePackageManager', function () {
               shouldAutoInstall: true,
             },
           ),
-        (err) => {
+        (err: any) => {
           assert(err instanceof ThrowableDiagnostic);
           assert.equal(
             err.message,

package/test/{getCurrentPackageManager.test.js → getCurrentPackageManager.test.ts}

@@ -1,4 +1,3 @@
-// @flow
 import assert from 'assert';
 import getCurrentPackageManager from '../src/getCurrentPackageManager';
 

package/test/{validateModuleSpecifiers.test.js → validateModuleSpecifiers.test.ts}

@@ -1,4 +1,3 @@
-// @flow
 import assert from 'assert';
 
 import validateModuleSpecifier from '../src/validateModuleSpecifier';
@@ -15,7 +14,7 @@ describe('Validate Module Specifiers', () => {
     ];
 
     assert.deepEqual(
-      modules.map((module) => validateModuleSpecifier(module)),
+      modules.map((module: any) => validateModuleSpecifier(module)),
       [
         '@atlaspack/transformer-posthtml',
         '@some-org/package@v1.0.0',
@@ -31,7 +30,7 @@ describe('Validate Module Specifiers', () => {
     let modules = ['./somewhere.js', './hello/world.js', '~/hello/world.js'];
 
     assert.deepEqual(
-      modules.map((module) => validateModuleSpecifier(module)),
+      modules.map((module: any) => validateModuleSpecifier(module)),
       ['', '', ''],
     );
   });

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}