@atlaspack/utils 2.17.3-typescript-bc4459c37.0 → 2.17.3

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

@@ -1,7 +1,9 @@
+// @flow strict-local
+
 export class DefaultMap<K, V> extends Map<K, V> {
-  _getDefault: (arg1: K) => V;
+  _getDefault: (K) => V;
 
-  constructor(getDefault: (arg1: K) => V, entries?: Iterable<[K, V]>) {
+  constructor(getDefault: (K) => V, entries?: Iterable<[K, V]>) {
     super(entries);
     this._getDefault = getDefault;
   }
@@ -15,7 +17,8 @@ export class DefaultMap<K, V> extends Map<K, V> {
       this.set(key, ret);
     }
 
-    return ret as V;
+    // $FlowFixMe
+    return ret;
   }
 }
 
@@ -23,11 +26,11 @@ interface Key {}
 
 // Duplicated from DefaultMap implementation for Flow
 // Roughly mirrors https://github.com/facebook/flow/blob/2eb5a78d92c167117ba9caae070afd2b9f598599/lib/core.js#L617
-export class DefaultWeakMap<K extends Key, V> extends WeakMap<K, V> {
-  _getDefault: (arg1: K) => V;
+export class DefaultWeakMap<K: Key, V> extends WeakMap<K, V> {
+  _getDefault: (K) => V;
 
-  constructor(getDefault: (arg1: K) => V, entries?: Iterable<[K, V]>) {
-    super(entries as Iterable<readonly [K, V]>);
+  constructor(getDefault: (K) => V, entries?: Iterable<[K, V]>) {
+    super(entries);
     this._getDefault = getDefault;
   }
 
@@ -40,6 +43,7 @@ export class DefaultWeakMap<K extends Key, V> extends WeakMap<K, V> {
       this.set(key, ret);
     }
 
-    return ret as V;
+    // $FlowFixMe
+    return ret;
   }
 }

package/src/Deferred.js

@@ -0,0 +1,23 @@
+// @flow strict-local
+
+import invariant from 'assert';
+
+export type Deferred<T> = {|
+  resolve(T): void,
+  reject(mixed): void,
+|};
+
+export function makeDeferredWithPromise<T>(): {|
+  deferred: Deferred<T>,
+  promise: Promise<T>,
+|} {
+  let deferred: ?Deferred<T>;
+  let promise = new Promise<T>((resolve, reject) => {
+    deferred = {resolve, reject};
+  });
+
+  // Promise constructor callback executes synchronously, so this is defined
+  invariant(deferred != null);
+
+  return {deferred, promise};
+}

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

@@ -1,16 +1,16 @@
+// @flow strict-local
+
 import {makeDeferredWithPromise, type Deferred} from './Deferred';
 
-type PromiseQueueOpts = {
-  maxConcurrent: number;
-};
+type PromiseQueueOpts = {|maxConcurrent: number|};
 
 export default class PromiseQueue<T> {
-  _deferred: Deferred<Array<T>> | null | undefined;
+  _deferred: ?Deferred<Array<T>>;
   _maxConcurrent: number;
   _numRunning: number = 0;
   _queue: Array<() => Promise<void>> = [];
-  _runPromise: Promise<Array<T>> | null | undefined = null;
-  _error: unknown;
+  _runPromise: ?Promise<Array<T>> = null;
+  _error: mixed;
   _count: number = 0;
   _results: Array<T> = [];
   _addSubscriptions: Set<() => void> = new Set();
@@ -28,35 +28,30 @@ export default class PromiseQueue<T> {
   }
 
   add(fn: () => Promise<T>): void {
-    new Promise(
-      (
-        resolve: (result: Promise<T> | T) => void,
-        reject: (error?: any) => void,
-      ) => {
-        let i = this._count++;
-        let wrapped = () =>
-          fn().then(
-            (result) => {
-              this._results[i] = result;
-              resolve(result);
-            },
-            (err) => {
-              reject(err);
-              throw err;
-            },
-          );
-
-        this._queue.push(wrapped);
-
-        for (const addFn of this._addSubscriptions) {
-          addFn();
-        }
-
-        if (this._numRunning > 0 && this._numRunning < this._maxConcurrent) {
-          this._next();
-        }
-      },
-    ).catch(() => {});
+    new Promise((resolve, reject) => {
+      let i = this._count++;
+      let wrapped = () =>
+        fn().then(
+          (result) => {
+            this._results[i] = result;
+            resolve(result);
+          },
+          (err) => {
+            reject(err);
+            throw err;
+          },
+        );
+
+      this._queue.push(wrapped);
+
+      for (const addFn of this._addSubscriptions) {
+        addFn();
+      }
+
+      if (this._numRunning > 0 && this._numRunning < this._maxConcurrent) {
+        this._next();
+      }
+    }).catch(() => {});
   }
 
   subscribeToAdd(fn: () => void): () => void {
@@ -76,9 +71,9 @@ export default class PromiseQueue<T> {
       return Promise.resolve([]);
     }
 
-    let {deferred, promise} = makeDeferredWithPromise<Array<T>>();
+    let {deferred, promise} = makeDeferredWithPromise();
     this._deferred = deferred;
-    this._runPromise = promise as Promise<Array<T>>;
+    this._runPromise = promise;
 
     while (this._queue.length && this._numRunning < this._maxConcurrent) {
       this._next();
@@ -89,7 +84,7 @@ export default class PromiseQueue<T> {
 
   async _next(): Promise<void> {
     let fn = this._queue.shift();
-    await this._runFn(fn as () => unknown);
+    await this._runFn(fn);
     if (this._queue.length) {
       this._next();
     } else if (this._numRunning === 0) {
@@ -97,11 +92,11 @@ export default class PromiseQueue<T> {
     }
   }
 
-  async _runFn(fn: () => unknown): Promise<void> {
+  async _runFn(fn: () => mixed): Promise<void> {
     this._numRunning++;
     try {
       await fn();
-    } catch (e: any) {
+    } catch (e) {
       // Only store the first error that occurs.
       // We don't reject immediately so that any other concurrent
       // requests have time to complete.

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

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import {Transform} from 'stream';
 
 /*
@@ -5,24 +7,21 @@ import {Transform} from 'stream';
  * callback. Continues to pass data chunks down the stream.
  */
 export default class TapStream extends Transform {
-  _tap: (arg1: Buffer) => unknown;
-  constructor(tap: (arg1: Buffer) => unknown, options: unknown) {
-    super({...(options as any)});
+  _tap: (Buffer) => mixed;
+  constructor(tap: (Buffer) => mixed, options: mixed) {
+    super({...options});
     this._tap = tap;
   }
 
   _transform(
     chunk: Buffer | string,
     encoding: string,
-    callback: (
-      err?: Error | null | undefined,
-      chunk?: Buffer | string,
-    ) => unknown,
+    callback: (err: ?Error, chunk?: Buffer | string) => mixed,
   ) {
     try {
       this._tap(Buffer.from(chunk));
       callback(null, chunk);
-    } catch (err: any) {
+    } catch (err) {
       callback(err);
     }
   }

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

@@ -1,3 +1,4 @@
+// @flow
 import path from 'path';
 import type {FileSystem} from '@atlaspack/types';
 import {fuzzySearch} from './schema';
@@ -47,7 +48,7 @@ export async function findAlternativeNodeModules(
           potentialModules.push(...modules);
         }
       }
-    } catch (err: any) {
+    } catch (err) {
       // ignore
     }
 
@@ -67,16 +68,16 @@ async function findAllFilesUp({
   collected,
   leadingDotSlash = true,
   includeDirectories = true,
-}: {
-  fs: FileSystem;
-  dir: string;
-  root: string;
-  basedir: string;
-  maxlength: number;
-  collected: Array<string>;
-  leadingDotSlash?: boolean;
-  includeDirectories?: boolean;
-}): Promise<unknown> {
+}: {|
+  fs: FileSystem,
+  dir: string,
+  root: string,
+  basedir: string,
+  maxlength: number,
+  collected: Array<string>,
+  leadingDotSlash?: boolean,
+  includeDirectories?: boolean,
+|}): Promise<mixed> {
   let dirContent = (await fs.readdir(dir)).sort();
   return Promise.all(
     dirContent.map(async (item) => {
@@ -110,9 +111,9 @@ export async function findAlternativeFiles(
   fileSpecifier: string,
   dir: string,
   projectRoot: string,
-  leadingDotSlash: boolean = true,
-  includeDirectories: boolean = true,
-  includeExtension: boolean = false,
+  leadingDotSlash?: boolean = true,
+  includeDirectories?: boolean = true,
+  includeExtension?: boolean = false,
 ): Promise<Array<string>> {
   let potentialFiles: Array<string> = [];
   // Find our root, we won't recommend files above the package root as that's bad practise

package/src/{ansi-html.ts → ansi-html.js}

@@ -1,4 +1,4 @@
-// @ts-expect-error ansi-html-community is not typed
+// @flow strict-local
 import ansiHTML from 'ansi-html-community';
 import {escapeHTML} from './escape-html';
 

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

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import type {Blob} from '@atlaspack/types';
 
 import {Buffer} from 'buffer';
@@ -10,7 +12,7 @@ export function blobToBuffer(blob: Blob): Promise<Buffer> {
   } else if (blob instanceof Buffer) {
     return Promise.resolve(Buffer.from(blob));
   } else {
-    return Promise.resolve(Buffer.from(blob as string, 'utf8'));
+    return Promise.resolve(Buffer.from(blob, 'utf8'));
   }
 }
 
@@ -20,6 +22,6 @@ export async function blobToString(blob: Blob): Promise<string> {
   } else if (blob instanceof Buffer) {
     return blob.toString();
   } else {
-    return blob as string;
+    return blob;
   }
 }

package/src/{bundle-url.ts → bundle-url.js}

@@ -1,4 +1,6 @@
-let bundleURL: string | null | undefined = null;
+// @flow strict-local
+
+let bundleURL: ?string = null;
 function getBundleURLCached(): string {
   if (bundleURL == null) {
     bundleURL = _getBundleURL();
@@ -11,7 +13,7 @@ function _getBundleURL(): string {
   // Attempt to find the URL of the current script and use that as the base URL
   try {
     throw new Error();
-  } catch (err: any) {
+  } catch (err) {
     let stack: string = typeof err.stack === 'string' ? err.stack : '';
     let matches = stack.match(/(https?|file|ftp):\/\/[^)\n]+/g);
     if (matches) {
@@ -22,7 +24,7 @@ function _getBundleURL(): string {
   return '/';
 }
 
-export function getBaseURL(url?: string | null): string {
+export function getBaseURL(url: ?string): string {
   if (url == null) {
     return '/';
   }

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

@@ -1,16 +1,20 @@
+// @flow strict-local
+
 export function unique<T>(array: Array<T>): Array<T> {
   return [...new Set(array)];
 }
 
 export function objectSortedEntries(obj: {
-  readonly [key: string]: unknown;
-}): Array<[string, unknown]> {
+  +[string]: mixed,
+  ...
+}): Array<[string, mixed]> {
   return Object.entries(obj).sort(([keyA], [keyB]) => keyA.localeCompare(keyB));
 }
 
 export function objectSortedEntriesDeep(object: {
-  readonly [key: string]: unknown;
-}): Array<[string, unknown]> {
+  +[string]: mixed,
+  ...
+}): Array<[string, mixed]> {
   let sortedEntries = objectSortedEntries(object);
   for (let i = 0; i < sortedEntries.length; i++) {
     sortedEntries[i][1] = sortEntry(sortedEntries[i][1]);
@@ -18,13 +22,13 @@ export function objectSortedEntriesDeep(object: {
   return sortedEntries;
 }
 
-function sortEntry(entry: unknown): unknown {
+function sortEntry(entry: mixed) {
   if (Array.isArray(entry)) {
     return entry.map(sortEntry);
   }
 
   if (typeof entry === 'object' && entry != null) {
-    return objectSortedEntriesDeep(entry as {readonly [key: string]: unknown});
+    return objectSortedEntriesDeep(entry);
   }
 
   return entry;
@@ -40,8 +44,11 @@ function sortEntry(entry: unknown): unknown {
  * @param {*} b Set B
  * @returns A \ B
  */
-export function setDifference<T>(a: ReadonlySet<T>, b: ReadonlySet<T>): Set<T> {
-  let difference = new Set<T>();
+export function setDifference<T>(
+  a: $ReadOnlySet<T>,
+  b: $ReadOnlySet<T>,
+): Set<T> {
+  let difference = new Set();
   for (let e of a) {
     if (!b.has(e)) {
       difference.add(e);
@@ -62,10 +69,10 @@ export function setDifference<T>(a: ReadonlySet<T>, b: ReadonlySet<T>): Set<T> {
  * @returns A Δ B
  */
 export function setSymmetricDifference<T>(
-  a: ReadonlySet<T>,
-  b: ReadonlySet<T>,
+  a: $ReadOnlySet<T>,
+  b: $ReadOnlySet<T>,
 ): Set<T> {
-  let difference = new Set<T>();
+  let difference = new Set();
   for (let e of a) {
     if (!b.has(e)) {
       difference.add(e);
@@ -79,7 +86,7 @@ export function setSymmetricDifference<T>(
   return difference;
 }
 
-export function setIntersect<T>(a: Set<T>, b: ReadonlySet<T>): void {
+export function setIntersect<T>(a: Set<T>, b: $ReadOnlySet<T>): void {
   for (let entry of a) {
     if (!b.has(entry)) {
       a.delete(entry);
@@ -88,7 +95,7 @@ export function setIntersect<T>(a: Set<T>, b: ReadonlySet<T>): void {
 }
 
 export function setIntersectStatic<T>(a: Set<T>, b: Set<T>): Set<T> {
-  let intersection = new Set<T>();
+  let intersection = new Set();
   for (let entry of a) {
     if (b.has(entry)) {
       intersection.add(entry);
@@ -101,7 +108,7 @@ export function setUnion<T>(a: Iterable<T>, b: Iterable<T>): Set<T> {
   return new Set([...a, ...b]);
 }
 
-export function setEqual<T>(a: ReadonlySet<T>, b: ReadonlySet<T>): boolean {
+export function setEqual<T>(a: $ReadOnlySet<T>, b: $ReadOnlySet<T>): boolean {
   if (a.size != b.size) {
     return false;
   }

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

@@ -1,24 +1,24 @@
+// @flow
+
 import type {ConfigResult, File, FilePath} from '@atlaspack/types';
 import type {FileSystem} from '@atlaspack/fs';
 import ThrowableDiagnostic from '@atlaspack/diagnostic';
 import path from 'path';
-// @ts-expect-error TS7016
 import clone from 'clone';
 import json5 from 'json5';
 import {parse as toml} from '@iarna/toml';
 import LRU from 'lru-cache';
 
-export type ConfigOutput = {
-  config: ConfigResult;
-  files: Array<File>;
-};
+export type ConfigOutput = {|
+  config: ConfigResult,
+  files: Array<File>,
+|};
 
-export type ConfigOptions = {
-  parse?: boolean;
-  parser?: (arg1: string) => any;
-};
+export type ConfigOptions = {|
+  parse?: boolean,
+  parser?: (string) => any,
+|};
 
-// @ts-expect-error TS2351
 const configCache = new LRU<FilePath, ConfigOutput>({max: 500});
 const resolveCache = new Map();
 
@@ -27,7 +27,7 @@ export function resolveConfig(
   filepath: FilePath,
   filenames: Array<FilePath>,
   projectRoot: FilePath,
-): Promise<FilePath | null | undefined> {
+): Promise<?FilePath> {
   // Cache the result of resolving config for this directory.
   // This is automatically invalidated at the end of the current build.
   let key = path.dirname(filepath) + filenames.join(',');
@@ -50,7 +50,7 @@ export function resolveConfigSync(
   filepath: FilePath,
   filenames: Array<FilePath>,
   projectRoot: FilePath,
-): FilePath | null | undefined {
+): ?FilePath {
   return fs.findAncestorFile(filenames, path.dirname(filepath), projectRoot);
 }
 
@@ -59,7 +59,7 @@ export async function loadConfig(
   filepath: FilePath,
   filenames: Array<FilePath>,
   projectRoot: FilePath,
-  opts?: ConfigOptions | null,
+  opts: ?ConfigOptions,
 ): Promise<ConfigOutput | null> {
   let parse = opts?.parse ?? true;
   let configFile = await resolveConfig(fs, filepath, filenames, projectRoot);
@@ -73,6 +73,7 @@ export async function loadConfig(
       let extname = path.extname(configFile).slice(1);
       if (extname === 'js' || extname === 'cjs') {
         let output = {
+          // $FlowFixMe
           config: clone(module.require(configFile)),
           files: [{filePath: configFile}],
         };
@@ -82,7 +83,7 @@ export async function loadConfig(
       }
 
       return readConfig(fs, configFile, opts);
-    } catch (err: any) {
+    } catch (err) {
       if (err.code === 'MODULE_NOT_FOUND' || err.code === 'ENOENT') {
         return null;
       }
@@ -102,7 +103,7 @@ loadConfig.clear = () => {
 export async function readConfig(
   fs: FileSystem,
   configFile: FilePath,
-  opts?: ConfigOptions | null,
+  opts: ?ConfigOptions,
 ): Promise<ConfigOutput | null> {
   let parse = opts?.parse ?? true;
   let cachedOutput = configCache.get(String(parse) + configFile);
@@ -120,7 +121,7 @@ export async function readConfig(
       let parse = opts?.parser ?? getParser(extname);
       try {
         config = parse(configContent);
-      } catch (e: any) {
+      } catch (e) {
         if (extname !== '' && extname !== 'json') {
           throw e;
         }
@@ -160,7 +161,7 @@ export async function readConfig(
 
     configCache.set(String(parse) + configFile, output);
     return output;
-  } catch (err: any) {
+  } catch (err) {
     if (err.code === 'MODULE_NOT_FOUND' || err.code === 'ENOENT') {
       return null;
     }
@@ -169,7 +170,7 @@ export async function readConfig(
   }
 }
 
-function getParser(extname: string) {
+function getParser(extname) {
   switch (extname) {
     case 'toml':
       return toml;

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

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 export default function countLines(
   string: string,
   startIndex: number = 0,

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

@@ -1,8 +1,10 @@
-export default function debounce<TArgs extends Array<unknown>>(
-  fn: (...args: TArgs) => unknown,
+// @flow strict-local
+
+export default function debounce<TArgs: Array<mixed>>(
+  fn: (...args: TArgs) => mixed,
   delay: number,
 ): (...args: TArgs) => void {
-  let timeout: NodeJS.Timeout | undefined | null;
+  let timeout;
 
   return function (...args: TArgs) {
     if (timeout) {

package/src/{debug-tools.ts → debug-tools.js}

@@ -1,3 +1,5 @@
+// @flow
+
 /*
  * These tools are intended for Atlaspack developers, to provide extra utilities
  * to make debugging Atlaspack issues more straightforward.
@@ -9,10 +11,10 @@
  * You can enable all tools by setting `ATLASPACK_DEBUG_TOOLS=all`.
  */
 
-type DebugTools = {
-  ['asset-file-names-in-output']: boolean;
-  ['simple-cli-reporter']: boolean;
-};
+type DebugTools = {|
+  'asset-file-names-in-output': boolean,
+  'simple-cli-reporter': boolean,
+|};
 
 export let debugTools: DebugTools = {
   'asset-file-names-in-output': false,
@@ -26,11 +28,11 @@ for (let tool of envVarValue.split(',')) {
 
   if (tool === 'all') {
     for (let key in debugTools) {
-      debugTools[key as keyof DebugTools] = true;
+      debugTools[key] = true;
     }
     break;
   } else if (debugTools.hasOwnProperty(tool)) {
-    debugTools[tool as keyof DebugTools] = true;
+    debugTools[tool] = true;
   } else if (tool === '') {
     continue;
   } else {

package/src/{dependency-location.ts → dependency-location.js}

@@ -1,24 +1,20 @@
+// @flow
+
 export default function createDependencyLocation(
-  start: {
-    line: number;
-    column: number;
-  },
+  start: {|
+    line: number,
+    column: number,
+  |},
   specifier: string,
   lineOffset: number = 0,
   columnOffset: number = 0,
   // Imports are usually wrapped in quotes
   importWrapperLength: number = 2,
-): {
-  end: {
-    column: number;
-    line: number;
-  };
-  filePath: string;
-  start: {
-    column: number;
-    line: number;
-  };
-} {
+): {|
+  end: {|column: number, line: number|},
+  filePath: string,
+  start: {|column: number, line: number|},
+|} {
   return {
     filePath: specifier,
     start: {

package/src/{escape-html.ts → escape-html.js}

@@ -1,3 +1,4 @@
+// @flow
 // Based on _.escape https://github.com/lodash/lodash/blob/master/escape.js
 const reUnescapedHtml = /[&<>"']/g;
 const reHasUnescapedHtml = RegExp(reUnescapedHtml.source);
@@ -8,14 +9,11 @@ const htmlEscapes = {
   '>': '&gt;',
   '"': '&quot;',
   "'": '&#39;',
-} as const;
+};
 
 export function escapeHTML(s: string): string {
   if (reHasUnescapedHtml.test(s)) {
-    return s.replace(
-      reUnescapedHtml,
-      (c) => htmlEscapes[c as keyof typeof htmlEscapes],
-    );
+    return s.replace(reUnescapedHtml, (c) => htmlEscapes[c]);
   }
 
   return s;