@atlaspack/utils 2.14.5-canary.24 → 2.14.5-canary.241

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

@@ -1,35 +1,33 @@
-// @flow
-
-import type {FilePath, PackagedBundle} from '@atlaspack/types';
-import type {FileSystem} from '@atlaspack/fs';
+import type {FilePath, PackagedBundle} from '@atlaspack/types-internal';
+import type {FileSystem} from '@atlaspack/types-internal';
 import SourceMap from '@parcel/source-map';
 import nullthrows from 'nullthrows';
 import path from 'path';
 import {loadSourceMapUrl} from './';
 
-export type AssetStats = {|
-  filePath: string,
-  size: number,
-  originalSize: number,
-  time: number,
-|};
+export type AssetStats = {
+  filePath: string;
+  size: number;
+  originalSize: number;
+  time: number;
+};
 
-export type BundleStats = {|
-  filePath: string,
-  size: number,
-  time: number,
-  assets: Array<AssetStats>,
-|};
+export type BundleStats = {
+  filePath: string;
+  size: number;
+  time: number;
+  assets: Array<AssetStats>;
+};
 
-export type BuildMetrics = {|
-  bundles: Array<BundleStats>,
-|};
+export type BuildMetrics = {
+  bundles: Array<BundleStats>;
+};
 
 async function getSourcemapSizes(
   filePath: FilePath,
   fs: FileSystem,
   projectRoot: FilePath,
-): Promise<?Map<string, number>> {
+): Promise<Map<string, number> | null | undefined> {
   let bundleContents = await fs.readFile(filePath, 'utf-8');
   let mapUrlData = await loadSourceMapUrl(fs, filePath, bundleContents);
   if (!mapUrlData) {

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

@@ -1,5 +1,4 @@
-// @flow
-import type {FileSystem} from '@atlaspack/fs';
+import type {FileSystem} from '@atlaspack/types-internal';
 import forge from 'node-forge';
 import path from 'path';
 import logger from '@atlaspack/logger';
@@ -7,8 +6,11 @@ import logger from '@atlaspack/logger';
 export default async function generateCertificate(
   fs: FileSystem,
   cacheDir: string,
-  host: ?string,
-): Promise<{|cert: Buffer, key: Buffer|}> {
+  host?: string | null,
+): Promise<{
+  cert: Buffer;
+  key: Buffer;
+}> {
   let certDirectory = cacheDir;
 
   const privateKeyPath = path.join(certDirectory, 'private.pem');
@@ -134,7 +136,7 @@ export default async function generateCertificate(
   await fs.writeFile(certPath, certPem);
 
   return {
-    key: privPem,
-    cert: certPem,
+    key: privPem as unknown as Buffer,
+    cert: certPem as unknown as Buffer,
   };
 }

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

@@ -1,17 +1,18 @@
-// @flow
-import type {HTTPSOptions} from '@atlaspack/types';
-import type {FileSystem} from '@atlaspack/fs';
+import type {HTTPSOptions, FileSystem} from '@atlaspack/types-internal';
 
 export default async function getCertificate(
   fs: FileSystem,
   options: HTTPSOptions,
-): Promise<{|cert: Buffer, key: Buffer|}> {
+): Promise<{
+  cert: Buffer;
+  key: Buffer;
+}> {
   try {
     let cert = await fs.readFile(options.cert);
     let key = await fs.readFile(options.key);
 
     return {key, cert};
-  } catch (err) {
+  } catch (err: any) {
     throw new Error('Certificate and/or key not found');
   }
 }

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

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import fs from 'fs';
 
 /**
@@ -9,7 +7,10 @@ import fs from 'fs';
 export default function getExisting(
   minifiedPath: string,
   sourcePath: string,
-): {|minified: string, source: string|} {
+): {
+  minified: string;
+  source: string;
+} {
   let source = fs.readFileSync(sourcePath, 'utf8').trim();
   return {
     source,

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

@@ -1,4 +1,3 @@
-// @flow strict-local
 import path from 'path';
 
 import {normalizeSeparators} from './path';
@@ -6,7 +5,9 @@ import {normalizeSeparators} from './path';
 /**
  * Returns the package name and the optional subpath
  */
-export default function getModuleParts(_name: string): [string, ?string] {
+export default function getModuleParts(
+  _name: string,
+): [string, string | null | undefined] {
   let name = path.normalize(_name);
   let splitOn = name.indexOf(path.sep);
   if (name.charAt(0) === '@') {

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

@@ -1,6 +1,4 @@
-// @flow strict-local
-
-import type {FilePath} from '@atlaspack/types';
+import type {FilePath} from '@atlaspack/types-internal';
 import {isGlob} from './glob';
 import path from 'path';
 

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

@@ -1,10 +1,7 @@
-// @flow
-
-import type {FilePath, Glob} from '@atlaspack/types';
-import type {FileSystem} from '@atlaspack/fs';
+import type {FilePath, FileSystem, Glob} from '@atlaspack/types-internal';
 
 import _isGlob from 'is-glob';
-import fastGlob, {type FastGlobOptions} from 'fast-glob';
+import fastGlob, {Options as FastGlobOptions} from 'fast-glob';
 import micromatch, {isMatch, makeRe, type Options} from 'micromatch';
 import {normalizeSeparators} from './path';
 
@@ -42,9 +39,8 @@ export function globToRegex(glob: Glob, opts?: Options): RegExp {
 export function globSync(
   p: FilePath,
   fs: FileSystem,
-  options?: FastGlobOptions<FilePath>,
+  options?: FastGlobOptions,
 ): Array<FilePath> {
-  // $FlowFixMe
   options = {
     ...options,
     fs: {
@@ -56,29 +52,29 @@ export function globSync(
         // but this is fine for our purposes since we follow symlinks by default.
         return fs.statSync(p);
       },
+      // @ts-expect-error TS7006
       readdirSync: (p, opts) => {
         return fs.readdirSync(p, opts);
       },
     },
   };
 
-  // $FlowFixMe
   return fastGlob.sync(normalizeSeparators(p), options);
 }
 
 export function glob(
   p: FilePath,
   fs: FileSystem,
-  options: FastGlobOptions<FilePath>,
+  options: FastGlobOptions,
 ): Promise<Array<FilePath>> {
-  // $FlowFixMe
   options = {
     ...options,
     fs: {
       stat: async (p, cb) => {
         try {
           cb(null, await fs.stat(p));
-        } catch (err) {
+        } catch (err: any) {
+          // @ts-expect-error TS2345
           cb(err);
         }
       },
@@ -87,25 +83,28 @@ export function glob(
         // but this is fine for our purposes since we follow symlinks by default.
         try {
           cb(null, await fs.stat(p));
-        } catch (err) {
+        } catch (err: any) {
+          // @ts-expect-error TS2345
           cb(err);
         }
       },
+      // @ts-expect-error TS7006
       readdir: async (p, opts, cb) => {
         if (typeof opts === 'function') {
           cb = opts;
+          // @ts-expect-error TS2322
           opts = null;
         }
 
         try {
           cb(null, await fs.readdir(p, opts));
-        } catch (err) {
+        } catch (err: any) {
+          // @ts-expect-error TS2345
           cb(err);
         }
       },
     },
   };
 
-  // $FlowFixMe Added in Flow 0.121.0 upgrade in #4381
   return fastGlob(normalizeSeparators(p), options);
 }

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

@@ -1,35 +1,40 @@
-// @flow strict-local
-
 import type {Readable} from 'stream';
-import type {FileSystem} from '@atlaspack/fs';
+import type {FileSystem} from '@atlaspack/types-internal';
 
 import {objectSortedEntriesDeep} from './collection';
 import {hashString, Hash} from '@atlaspack/rust';
 
 export function hashStream(stream: Readable): Promise<string> {
   let hash = new Hash();
-  return new Promise((resolve, reject) => {
-    stream.on('error', (err) => {
-      reject(err);
-    });
-    stream
-      .on('data', (chunk) => {
-        hash.writeBuffer(chunk);
-      })
-      .on('end', function () {
-        resolve(hash.finish());
-      })
-      .on('error', (err) => {
+  return new Promise(
+    (
+      resolve: (result: Promise<string> | string) => void,
+      reject: (error?: any) => void,
+    ) => {
+      stream.on('error', (err) => {
         reject(err);
       });
-  });
+      stream
+        .on('data', (chunk) => {
+          hash.writeBuffer(chunk);
+        })
+        .on('end', function () {
+          resolve(hash.finish());
+        })
+        .on('error', (err) => {
+          reject(err);
+        });
+    },
+  );
 }
 
-export function hashObject(obj: {+[string]: mixed, ...}): string {
+export function hashObject(obj: {readonly [key: string]: unknown}): string {
   return hashString(JSON.stringify(objectSortedEntriesDeep(obj)));
 }
 
-let testCache: {|[string]: Promise<string>|} = {
+let testCache: {
+  [key: string]: Promise<string>;
+} = {
   /*:: ...null */
 };
 export function hashFile(fs: FileSystem, filePath: string): Promise<string> {

package/src/{http-server.js → http-server.ts}

@@ -1,47 +1,39 @@
-// @flow strict-local
-
 import type {
   Server as HTTPOnlyServer,
   IncomingMessage as HTTPRequest,
   ServerResponse as HTTPResponse,
 } from 'http';
-import type {
-  Server as HTTPSServer,
-  IncomingMessage as HTTPSRequest,
-  ServerResponse as HTTPSResponse,
-} from 'https';
+import type {Server as HTTPSServer} from 'https';
 import type {Socket} from 'net';
-import type {FilePath, HTTPSOptions} from '@atlaspack/types';
-import type {FileSystem} from '@atlaspack/fs';
+import type {FilePath, HTTPSOptions} from '@atlaspack/types-internal';
+import type {FileSystem} from '@atlaspack/types-internal';
 
 import http from 'http';
 import https from 'https';
 import nullthrows from 'nullthrows';
 import {getCertificate, generateCertificate} from './';
 
-type CreateHTTPServerOpts = {|
-  listener?: (HTTPRequest | HTTPSRequest, HTTPResponse | HTTPSResponse) => void,
-  host?: string,
-  ...
-    | {|
-        https: ?(HTTPSOptions | boolean),
-        inputFS: FileSystem,
-        outputFS: FileSystem,
-        cacheDir: FilePath,
-      |}
-    | {||},
-|};
+type CreateHTTPServerOpts = {
+  listener?: (arg1: HTTPRequest, arg2: HTTPResponse) => void;
+  host?: string;
+} & (
+  | {
+      https: HTTPSOptions | boolean | null | undefined;
+      inputFS: FileSystem;
+      outputFS: FileSystem;
+      cacheDir: FilePath;
+    }
+  | Record<any, any>
+);
 
 export type HTTPServer = HTTPOnlyServer | HTTPSServer;
 
 // Creates either an http or https server with an awaitable dispose
 // that closes any connections
-export async function createHTTPServer(
-  options: CreateHTTPServerOpts,
-): Promise<{|
-  stop: () => Promise<void>,
-  server: HTTPServer,
-|}> {
+export async function createHTTPServer(options: CreateHTTPServerOpts): Promise<{
+  stop: () => Promise<void>;
+  server: HTTPServer;
+}> {
   let server;
   if (!options.https) {
     server = http.createServer(options.listener);
@@ -73,21 +65,23 @@ export async function createHTTPServer(
   return {
     server,
     stop() {
-      return new Promise((resolve, reject) => {
-        for (let socket of nullthrows(sockets)) {
-          socket.destroy();
-        }
-        sockets = new Set();
-
-        server.close((err) => {
-          if (err != null) {
-            reject(err);
-            return;
+      return new Promise(
+        (resolve: () => void, reject: (error?: any) => void) => {
+          for (let socket of nullthrows(sockets)) {
+            socket.destroy();
           }
+          sockets = new Set();
+
+          server.close((err) => {
+            if (err != null) {
+              reject(err);
+              return;
+            }
 
-          resolve();
-        });
-      });
+            resolve();
+          });
+        },
+      );
     },
   };
 }

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

@@ -1,11 +1,10 @@
-// @flow strict-local
-export type * from './config';
-export type * from './Deferred';
-export type * from './generateBuildMetrics';
-export type * from './http-server';
-export type * from './path';
-export type * from './prettyDiagnostic';
-export type * from './schema';
+export * from './config';
+export * from './Deferred';
+export * from './generateBuildMetrics';
+export * from './http-server';
+export * from './path';
+export * from './prettyDiagnostic';
+export * from './schema';
 
 export {default as countLines} from './countLines';
 export {default as generateBuildMetrics} from './generateBuildMetrics';
@@ -39,6 +38,7 @@ export {
   setSymmetricDifference,
   setEqual,
   setIntersect,
+  setIntersectStatic,
   setUnion,
 } from './collection';
 export {
@@ -47,9 +47,13 @@ export {
   loadConfig,
   readConfig,
 } from './config';
+export {debugTools} from './debug-tools';
 export {DefaultMap, DefaultWeakMap} from './DefaultMap';
 export {makeDeferredWithPromise} from './Deferred';
-export {getProgressMessage} from './progress-message';
+export {
+  getProgressMessage,
+  getPackageProgressMessage,
+} from './progress-message';
 export {
   isGlob,
   isGlobMatch,

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

@@ -1,5 +1,4 @@
-// @flow
-
+// @ts-expect-error TS7016
 import _isURL from 'is-url';
 
 // Matches anchor (ie: #raptors)

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

@@ -1,5 +1,4 @@
-// @flow strict-local
-import type {FilePath} from '@atlaspack/types';
+import type {FilePath} from '@atlaspack/types-internal';
 import path from 'path';
 
 export default function isDirectoryInside(

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

@@ -1,9 +1,6 @@
-// @flow strict-local
-
 import crypto from 'crypto';
 
-// $FlowFixMe
-type Hashable = Object;
+type Hashable = any;
 
 export default function objectHash(object: Hashable): string {
   let hash = crypto.createHash('md5');

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

@@ -1,5 +1,3 @@
-// @flow
-
 import open from 'open';
 import {execSync} from 'child_process';
 import logger from '@atlaspack/logger';
@@ -33,7 +31,7 @@ function commandExistsUnixSync(commandName: string) {
         ` && { echo >&1 '${commandName} found'; exit 0; }`,
     );
     return !!stdout;
-  } catch (error) {
+  } catch (error: any) {
     return false;
   }
 }
@@ -54,7 +52,7 @@ export default async function openInBrowser(url: string, browser: string) {
         : undefined;
 
     await open(url, options);
-  } catch (err) {
+  } catch (err: any) {
     logger.error(
       `Unexpected error while opening in browser: ${browser}`,
       '@atlaspack/utils',

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

@@ -1,5 +1,3 @@
-// @flow strict
-
 export default function parseCSSImport(url: string): string {
   if (!/^(~|\.\/|\/)/.test(url)) {
     return './' + url;

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

@@ -1,5 +1,4 @@
-// @flow strict-local
-import type {FilePath} from '@atlaspack/types';
+import type {FilePath} from '@atlaspack/types-internal';
 import path from 'path';
 
 const ABSOLUTE_PATH_REGEX = /^([a-zA-Z]:){0,1}[\\/]+/;
@@ -14,8 +13,7 @@ export function normalizeSeparators(filePath: FilePath): FilePath {
 }
 
 export type PathOptions = {
-  noLeadingDotSlash?: boolean,
-  ...
+  noLeadingDotSlash?: boolean;
 };
 
 export function normalizePath(

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

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 export default function prettifyTime(timeInMs: number): string {
   return timeInMs < 1000 ? `${timeInMs}ms` : `${(timeInMs / 1000).toFixed(2)}s`;
 }

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

@@ -1,34 +1,32 @@
-// @flow strict-local
 import type {Diagnostic} from '@atlaspack/diagnostic';
-import type {PluginOptions} from '@atlaspack/types';
+import type {PluginOptions} from '@atlaspack/types-internal';
 
 import formatCodeFrame from '@atlaspack/codeframe';
+import logger from '@atlaspack/logger';
 import _mdAnsi from '@atlaspack/markdown-ansi';
 import _chalk from 'chalk';
 import path from 'path';
-// $FlowFixMe
 import _terminalLink from 'terminal-link';
 
 /* eslint-disable import/no-extraneous-dependencies */
-// $FlowFixMe
 import snarkdown from 'snarkdown';
 /* eslint-enable import/no-extraneous-dependencies */
 
-export type FormattedCodeFrame = {|
-  location: string,
-  code: string,
-|};
+export type FormattedCodeFrame = {
+  location: string;
+  code: string;
+};
 
-export type AnsiDiagnosticResult = {|
-  message: string,
-  stack: string,
+export type AnsiDiagnosticResult = {
+  message: string;
+  stack: string;
   /** A formatted string containing all code frames, including their file locations. */
-  codeframe: string,
+  codeframe: string;
   /** A list of code frames with highlighted code and file locations separately. */
-  frames: Array<FormattedCodeFrame>,
-  hints: Array<string>,
-  documentation: string,
-|};
+  frames: Array<FormattedCodeFrame>;
+  hints: Array<string>;
+  documentation: string;
+};
 
 export default async function prettyDiagnostic(
   diagnostic: Diagnostic,
@@ -51,18 +49,24 @@ export default async function prettyDiagnostic(
     format === 'ansi'
       ? _terminalLink
       : // eslint-disable-next-line no-unused-vars
-        (text, url, _) => `<a href="${url}">${text}</a>`;
+        (
+          text: string,
+          url: string,
+          _: {
+            fallback: (text: never, url: never) => string;
+          },
+        ) => `<a href="${url}">${text}</a>`;
   const chalk =
     format === 'ansi'
       ? _chalk
       : {
           gray: {
-            underline: (v) =>
+            underline: (v: string) =>
               `<span style="color: grey; text-decoration: underline;">${v}</span>`,
           },
         };
 
-  let result = {
+  let result: AnsiDiagnosticResult = {
     message:
       md(`**${origin ?? 'unknown'}**: `) +
       (skipFormatting ? message : md(message)),
@@ -83,7 +87,16 @@ export default async function prettyDiagnostic(
       let highlights = codeFrame.codeHighlights;
       let code = codeFrame.code;
       if (code == null && options && filePath != null) {
-        code = await options.inputFS.readFile(filePath, 'utf8');
+        try {
+          code = await options.inputFS.readFile(filePath, 'utf8');
+        } catch (e) {
+          // In strange cases this can fail and hide the underlying error.
+          logger.warn({
+            origin: '@atlaspack/utils',
+            message: `Failed to read file for generating codeframe: "${filePath}"`,
+            skipFormatting: true,
+          });
+        }
       }
 
       let formattedCodeFrame = '';
@@ -92,7 +105,6 @@ export default async function prettyDiagnostic(
           useColor: true,
           syntaxHighlighting: true,
           language:
-            // $FlowFixMe sketchy null checks do not matter here...
             codeFrame.language ||
             (filePath != null ? path.extname(filePath).substr(1) : undefined),
           terminalWidth,
@@ -132,7 +144,7 @@ export default async function prettyDiagnostic(
 
   if (documentationURL != null) {
     result.documentation = terminalLink('Learn more', documentationURL, {
-      fallback: (text, url) => `${text}: ${url}`,
+      fallback: (text: string, url: string) => `${text}: ${url}`,
     });
   }