@atlaspack/utils 2.12.1-dev.3443 → 2.12.1-dev.3478

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/utils",
-  "version": "2.12.1-dev.3443+d1170cfc7",
+  "version": "2.12.1-dev.3478+5fd2da535",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -29,11 +29,11 @@
     }
   },
   "dependencies": {
-    "@atlaspack/codeframe": "2.12.1-dev.3443+d1170cfc7",
-    "@atlaspack/diagnostic": "2.12.1-dev.3443+d1170cfc7",
-    "@atlaspack/logger": "2.12.1-dev.3443+d1170cfc7",
-    "@atlaspack/markdown-ansi": "2.12.1-dev.3443+d1170cfc7",
-    "@atlaspack/rust": "2.12.1-dev.3443+d1170cfc7",
+    "@atlaspack/codeframe": "2.12.1-dev.3478+5fd2da535",
+    "@atlaspack/diagnostic": "2.12.1-dev.3478+5fd2da535",
+    "@atlaspack/logger": "2.12.1-dev.3478+5fd2da535",
+    "@atlaspack/markdown-ansi": "2.12.1-dev.3478+5fd2da535",
+    "@atlaspack/rust": "2.12.1-dev.3478+5fd2da535",
     "@parcel/source-map": "^2.1.1",
     "chalk": "^4.1.0",
     "nullthrows": "^1.1.1"
@@ -63,5 +63,5 @@
     "./src/openInBrowser.js": false,
     "@atlaspack/markdown-ansi": false
   },
-  "gitHead": "d1170cfc79beb290b2a066f472f68f71f7d7cb23"
+  "gitHead": "5fd2da535ecbe096d57e03aec15e80bb1d7601f7"
 }

package/src/DefaultMap.js

@@ -1,9 +1,9 @@
 // @flow strict-local
 
 export class DefaultMap<K, V> extends Map<K, V> {
-  _getDefault: K => V;
+  _getDefault: (K) => V;
 
-  constructor(getDefault: K => V, entries?: Iterable<[K, V]>) {
+  constructor(getDefault: (K) => V, entries?: Iterable<[K, V]>) {
     super(entries);
     this._getDefault = getDefault;
   }
@@ -25,9 +25,9 @@ export class DefaultMap<K, V> extends Map<K, V> {
 // Duplicated from DefaultMap implementation for Flow
 // Roughly mirrors https://github.com/facebook/flow/blob/2eb5a78d92c167117ba9caae070afd2b9f598599/lib/core.js#L617
 export class DefaultWeakMap<K: interface {}, V> extends WeakMap<K, V> {
-  _getDefault: K => V;
+  _getDefault: (K) => V;
 
-  constructor(getDefault: K => V, entries?: Iterable<[K, V]>) {
+  constructor(getDefault: (K) => V, entries?: Iterable<[K, V]>) {
     super(entries);
     this._getDefault = getDefault;
   }

package/src/PromiseQueue.js

@@ -32,11 +32,11 @@ export default class PromiseQueue<T> {
       let i = this._count++;
       let wrapped = () =>
         fn().then(
-          result => {
+          (result) => {
             this._results[i] = result;
             resolve(result);
           },
-          err => {
+          (err) => {
             reject(err);
             throw err;
           },

package/src/TapStream.js

@@ -7,8 +7,8 @@ import {Transform} from 'stream';
  * callback. Continues to pass data chunks down the stream.
  */
 export default class TapStream extends Transform {
-  _tap: Buffer => mixed;
-  constructor(tap: Buffer => mixed, options: mixed) {
+  _tap: (Buffer) => mixed;
+  constructor(tap: (Buffer) => mixed, options: mixed) {
     super({...options});
     this._tap = tap;
   }

package/src/alternatives.js

@@ -27,19 +27,21 @@ export async function findAlternativeNodeModules(
         let dirContent = (await fs.readdir(modulesDir)).sort();
 
         // Filter out the modules that interest us
-        let modules = dirContent.filter(i =>
+        let modules = dirContent.filter((i) =>
           isOrganisationModule ? i.startsWith('@') : !i.startsWith('@'),
         );
 
         // If it's an organisation module, loop through all the modules of that organisation
         if (isOrganisationModule) {
           await Promise.all(
-            modules.map(async item => {
+            modules.map(async (item) => {
               let orgDirPath = path.join(modulesDir, item);
               let orgDirContent = (await fs.readdir(orgDirPath)).sort();
 
               // Add all org packages
-              potentialModules.push(...orgDirContent.map(i => `${item}/${i}`));
+              potentialModules.push(
+                ...orgDirContent.map((i) => `${item}/${i}`),
+              );
             }),
           );
         } else {
@@ -78,7 +80,7 @@ async function findAllFilesUp({
 |}): Promise<mixed> {
   let dirContent = (await fs.readdir(dir)).sort();
   return Promise.all(
-    dirContent.map(async item => {
+    dirContent.map(async (item) => {
       let fullPath = path.join(dir, item);
       let relativeFilePath = relativePath(basedir, fullPath, leadingDotSlash);
       if (relativeFilePath.length < maxlength) {
@@ -135,7 +137,7 @@ export async function findAlternativeFiles(
   });
 
   if (path.extname(fileSpecifier) === '' && !includeExtension) {
-    potentialFiles = potentialFiles.map(p => {
+    potentialFiles = potentialFiles.map((p) => {
       let ext = path.extname(p);
       return ext.length > 0 ? p.slice(0, -ext.length) : p;
     });

package/src/config.js

@@ -16,7 +16,7 @@ export type ConfigOutput = {|
 
 export type ConfigOptions = {|
   parse?: boolean,
-  parser?: string => any,
+  parser?: (string) => any,
 |};
 
 const configCache = new LRU<FilePath, ConfigOutput>({max: 500});

package/src/escape-html.js

@@ -13,7 +13,7 @@ const htmlEscapes = {
 
 export function escapeHTML(s: string): string {
   if (reHasUnescapedHtml.test(s)) {
-    return s.replace(reUnescapedHtml, c => htmlEscapes[c]);
+    return s.replace(reUnescapedHtml, (c) => htmlEscapes[c]);
   }
 
   return s;

package/src/generateBuildMetrics.js

@@ -42,7 +42,7 @@ async function getSourcemapSizes(
   let parsedMapData = sourceMap.getMap();
 
   if (parsedMapData.mappings.length > 2) {
-    let sources = parsedMapData.sources.map(s =>
+    let sources = parsedMapData.sources.map((s) =>
       path.normalize(path.join(projectRoot, s)),
     );
     let currLine = 1;
@@ -105,7 +105,7 @@ async function createBundleStats(
   let sourcemapSizes = await getSourcemapSizes(filePath, fs, projectRoot);
 
   let assets: Map<string, AssetStats> = new Map();
-  bundle.traverseAssets(asset => {
+  bundle.traverseAssets((asset) => {
     let filePath = path.normalize(asset.filePath);
     assets.set(filePath, {
       filePath,
@@ -148,11 +148,15 @@ export default async function generateBuildMetrics(
   fs: FileSystem,
   projectRoot: FilePath,
 ): Promise<BuildMetrics> {
-  bundles.sort((a, b) => b.stats.size - a.stats.size).filter(b => !!b.filePath);
+  bundles
+    .sort((a, b) => b.stats.size - a.stats.size)
+    .filter((b) => !!b.filePath);
 
   return {
     bundles: (
-      await Promise.all(bundles.map(b => createBundleStats(b, fs, projectRoot)))
-    ).filter(e => !!e),
+      await Promise.all(
+        bundles.map((b) => createBundleStats(b, fs, projectRoot)),
+      )
+    ).filter((e) => !!e),
   };
 }

package/src/glob.js

@@ -48,10 +48,10 @@ export function globSync(
   options = {
     ...options,
     fs: {
-      statSync: p => {
+      statSync: (p) => {
         return fs.statSync(p);
       },
-      lstatSync: p => {
+      lstatSync: (p) => {
         // Our FileSystem interface doesn't have lstat support at the moment,
         // but this is fine for our purposes since we follow symlinks by default.
         return fs.statSync(p);

package/src/hash.js

@@ -9,17 +9,17 @@ 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 => {
+    stream.on('error', (err) => {
       reject(err);
     });
     stream
-      .on('data', chunk => {
+      .on('data', (chunk) => {
         hash.writeBuffer(chunk);
       })
       .on('end', function () {
         resolve(hash.finish());
       })
-      .on('error', err => {
+      .on('error', (err) => {
         reject(err);
       });
   });

package/src/http-server.js

@@ -79,7 +79,7 @@ export async function createHTTPServer(
         }
         sockets = new Set();
 
-        server.close(err => {
+        server.close((err) => {
           if (err != null) {
             reject(err);
             return;

package/src/index.js

@@ -48,7 +48,7 @@ export {
 } from './config';
 export {DefaultMap, DefaultWeakMap} from './DefaultMap';
 export {makeDeferredWithPromise} from './Deferred';
-export {getProgressMessage} from './progress-message.js';
+export {getProgressMessage} from './progress-message';
 export {
   isGlob,
   isGlobMatch,

package/src/prettyDiagnostic.js

@@ -57,7 +57,7 @@ export default async function prettyDiagnostic(
       ? _chalk
       : {
           gray: {
-            underline: v =>
+            underline: (v) =>
               `<span style="color: grey; text-decoration: underline;">${v}</span>`,
           },
         };
@@ -125,7 +125,7 @@ export default async function prettyDiagnostic(
   }
 
   if (Array.isArray(hints) && hints.length) {
-    result.hints = hints.map(h => {
+    result.hints = hints.map((h) => {
       return md(h);
     });
   }

package/src/replaceBundleReferences.js

@@ -33,7 +33,7 @@ export function replaceURLReferences({
   bundleGraph,
   contents,
   map,
-  getReplacement = s => s,
+  getReplacement = (s) => s,
   relative = true,
 }: {|
   bundle: NamedBundle,
@@ -41,11 +41,11 @@ export function replaceURLReferences({
   contents: string,
   relative?: boolean,
   map?: ?SourceMap,
-  getReplacement?: string => string,
+  getReplacement?: (string) => string,
 |}): {|+contents: string, +map: ?SourceMap|} {
   let replacements = new Map();
   let urlDependencies = [];
-  bundle.traverse(node => {
+  bundle.traverse((node) => {
     if (node.type === 'dependency' && node.value.specifierType === 'url') {
       urlDependencies.push(node.value);
     }
@@ -118,7 +118,7 @@ export async function replaceInlineReferences({
   let replacements = new Map();
 
   let dependencies = [];
-  bundle.traverse(node => {
+  bundle.traverse((node) => {
     if (node.type === 'dependency') {
       dependencies.push(node.value);
     }
@@ -165,7 +165,7 @@ export function getURLReplacement({
   fromBundle: NamedBundle,
   toBundle: NamedBundle,
   relative: boolean,
-  getReplacement?: string => string,
+  getReplacement?: (string) => string,
 |}): {|from: string, to: string|} {
   let to;
 

package/src/schema.js

@@ -203,12 +203,12 @@ function validateSchema(schema: SchemaEntity, data: mixed): Array<SchemaError> {
             if (schemaNode.__forbiddenProperties) {
               // $FlowFixMe type was already checked
               let keys = Object.keys(dataNode);
-              invalidProps = schemaNode.__forbiddenProperties.filter(val =>
+              invalidProps = schemaNode.__forbiddenProperties.filter((val) =>
                 keys.includes(val),
               );
               results.push(
                 ...invalidProps.map(
-                  k =>
+                  (k) =>
                     ({
                       type: 'forbidden-prop',
                       dataPath: dataPath + '/' + encodeJSONKeyComponent(k),
@@ -225,11 +225,11 @@ function validateSchema(schema: SchemaEntity, data: mixed): Array<SchemaError> {
               // $FlowFixMe type was already checked
               let keys = Object.keys(dataNode);
               let missingKeys = schemaNode.required.filter(
-                val => !keys.includes(val),
+                (val) => !keys.includes(val),
               );
               results.push(
                 ...missingKeys.map(
-                  k =>
+                  (k) =>
                     ({
                       type: 'missing-prop',
                       dataPath,
@@ -268,7 +268,7 @@ function validateSchema(schema: SchemaEntity, data: mixed): Array<SchemaError> {
                           schemaNode.properties,
                         ).filter(
                           // $FlowFixMe type was already checked
-                          p => !(p in dataNode),
+                          (p) => !(p in dataNode),
                         ),
                         actualValue: k,
                         ancestors: schemaAncestors,
@@ -368,7 +368,7 @@ export function fuzzySearch(
   actualValue: string,
 ): Array<string> {
   let result = expectedValues
-    .map(exp => [exp, levenshtein.distance(exp, actualValue)])
+    .map((exp) => [exp, levenshtein.distance(exp, actualValue)])
     .filter(
       // Remove if more than half of the string would need to be changed
       ([, d]) => d * 2 < actualValue.length,
@@ -414,7 +414,7 @@ validateSchema.diagnostic = function (
       data.data ?? JSON.parse(data.source);
   let errors = validateSchema(schema, object);
   if (errors.length) {
-    let keys = errors.map(e => {
+    let keys = errors.map((e) => {
       let message;
       if (e.type === 'enum') {
         let {actualValue} = e;
@@ -426,11 +426,11 @@ validateSchema.diagnostic = function (
 
         if (likely.length > 0) {
           message = `Did you mean ${likely
-            .map(v => JSON.stringify(v))
+            .map((v) => JSON.stringify(v))
             .join(', ')}?`;
         } else if (expectedValues.length > 0) {
           message = `Possible values: ${expectedValues
-            .map(v => JSON.stringify(v))
+            .map((v) => JSON.stringify(v))
             .join(', ')}`;
         } else {
           message = 'Unexpected value';
@@ -438,11 +438,11 @@ validateSchema.diagnostic = function (
       } else if (e.type === 'forbidden-prop') {
         let {prop, expectedProps, actualProps} = e;
         let likely = fuzzySearch(expectedProps, prop).filter(
-          v => !actualProps.includes(v),
+          (v) => !actualProps.includes(v),
         );
         if (likely.length > 0) {
           message = `Did you mean ${likely
-            .map(v => JSON.stringify(v))
+            .map((v) => JSON.stringify(v))
             .join(', ')}?`;
         } else {
           message = 'Unexpected property';

package/src/sourcemap.js

@@ -75,7 +75,7 @@ export async function loadSourceMap(
     let sourcemapInstance = new SourceMap(options.projectRoot);
     sourcemapInstance.addVLQMap({
       ...foundMap.map,
-      sources: foundMap.map.sources.map(s => {
+      sources: foundMap.map.sources.map((s) => {
         return path.join(mapSourceRoot, s);
       }),
     });

package/src/stream.js

@@ -6,7 +6,7 @@ import type {Blob} from '@atlaspack/types';
 export function measureStreamLength(stream: Readable): Promise<number> {
   return new Promise((resolve, reject) => {
     let length = 0;
-    stream.on('data', chunk => {
+    stream.on('data', (chunk) => {
       length += chunk;
     });
     stream.on('end', () => resolve(length));
@@ -25,7 +25,7 @@ export function readableFromStringOrBuffer(str: string | Buffer): Readable {
 export function bufferStream(stream: Readable): Promise<Buffer> {
   return new Promise((resolve, reject) => {
     let buf = Buffer.from([]);
-    stream.on('data', data => {
+    stream.on('data', (data) => {
       buf = Buffer.concat([buf, data]);
     });
     stream.on('end', () => {
@@ -45,7 +45,7 @@ export function blobToStream(blob: Blob): Readable {
 
 export function streamFromPromise(promise: Promise<Blob>): Readable {
   const stream = new PassThrough();
-  promise.then(blob => {
+  promise.then((blob) => {
     if (blob instanceof Readable) {
       blob.pipe(stream);
     } else {
@@ -61,7 +61,7 @@ export function fallbackStream(
   fallback: () => Readable,
 ): Readable {
   const res = new PassThrough();
-  stream.on('error', err => {
+  stream.on('error', (err) => {
     if (err.code === 'ENOENT') {
       fallback().pipe(res);
     } else {

package/test/DefaultMap.test.js

@@ -6,7 +6,7 @@ import {DefaultMap} from '../src/DefaultMap';
 describe('DefaultMap', () => {
   it('constructs with entries just like Map', () => {
     let map = new DefaultMap(
-      k => k,
+      (k) => k,
       [
         [1, 3],
         [2, 27],
@@ -20,18 +20,18 @@ describe('DefaultMap', () => {
   });
 
   it("returns a default value based on a key if it doesn't exist", () => {
-    let map = new DefaultMap(k => k);
+    let map = new DefaultMap((k) => k);
     assert.equal(map.get(3), 3);
   });
 
   it("sets a default value based on a key if it doesn't exist", () => {
-    let map = new DefaultMap(k => k);
+    let map = new DefaultMap((k) => k);
     map.get(3);
     assert.deepEqual(Array.from(map.entries()), [[3, 3]]);
   });
 
   it('respects undefined/null if it already existed in the map', () => {
-    let map = new DefaultMap<number, number | void | null>(k => k);
+    let map = new DefaultMap<number, number | void | null>((k) => k);
     map.set(3, undefined);
     assert.equal(map.get(3), undefined);
 

package/test/PromiseQueue.test.js

@@ -53,7 +53,7 @@ describe('PromiseQueue', () => {
     let error = new Error('Oh no!');
     let promise = queue.add(() => Promise.reject(error));
     await queue.run().catch(() => null);
-    await promise.then(null, e => assert.equal(e, error));
+    await promise.then(null, (e) => assert.equal(e, error));
   });
 
   it('constructor() should allow for configuration of max concurrent running functions', async () => {