@parcel/utils 2.6.2 → 2.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.6.2",
+  "version": "2.8.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -33,12 +33,12 @@
     }
   },
   "dependencies": {
-    "@parcel/codeframe": "2.6.2",
-    "@parcel/diagnostic": "2.6.2",
-    "@parcel/hash": "2.6.2",
-    "@parcel/logger": "2.6.2",
-    "@parcel/markdown-ansi": "2.6.2",
-    "@parcel/source-map": "^2.0.0",
+    "@parcel/codeframe": "2.8.0",
+    "@parcel/diagnostic": "2.8.0",
+    "@parcel/hash": "2.8.0",
+    "@parcel/logger": "2.8.0",
+    "@parcel/markdown-ansi": "2.8.0",
+    "@parcel/source-map": "^2.1.1",
     "chalk": "^4.1.0"
   },
   "devDependencies": {
@@ -63,5 +63,5 @@
     "./src/http-server.js": false,
     "./src/openInBrowser.js": false
   },
-  "gitHead": "e10fcfc1e8b71222da90978fb87f1b68e207473e"
+  "gitHead": "c3bbe0a6160186f496ca2f9e9bead9376c0522f1"
 }

package/src/collection.js

@@ -55,3 +55,15 @@ export function setIntersect<T>(a: Set<T>, b: Set<T>): void {
 export function setUnion<T>(a: Iterable<T>, b: Iterable<T>): Set<T> {
   return new Set([...a, ...b]);
 }
+
+export function setEqual<T>(a: Set<T>, b: Set<T>): boolean {
+  if (a.size != b.size) {
+    return false;
+  }
+  for (let entry of a) {
+    if (!b.has(entry)) {
+      return false;
+    }
+  }
+  return true;
+}

package/src/config.js

@@ -71,7 +71,7 @@ export async function loadConfig(
 
     try {
       let extname = path.extname(configFile).slice(1);
-      if (extname === 'js') {
+      if (extname === 'js' || extname === 'cjs') {
         let output = {
           // $FlowFixMe
           config: clone(require(configFile)),

package/src/getModuleParts.js

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

package/src/index.js

@@ -11,6 +11,7 @@ export {default as countLines} from './countLines';
 export {default as generateBuildMetrics} from './generateBuildMetrics';
 export {default as generateCertificate} from './generateCertificate';
 export {default as getCertificate} from './getCertificate';
+export {default as getModuleParts} from './getModuleParts';
 export {default as getRootDir} from './getRootDir';
 export {default as isDirectoryInside} from './isDirectoryInside';
 export {default as isURL} from './is-url';
@@ -35,12 +36,14 @@ export {
   objectSortedEntries,
   objectSortedEntriesDeep,
   setDifference,
+  setEqual,
   setIntersect,
   setUnion,
 } from './collection';
 export {resolveConfig, resolveConfigSync, loadConfig} from './config';
 export {DefaultMap, DefaultWeakMap} from './DefaultMap';
 export {makeDeferredWithPromise} from './Deferred';
+export {getProgressMessage} from './progress-message.js';
 export {isGlob, isGlobMatch, globSync, glob, globToRegex} from './glob';
 export {hashStream, hashObject, hashFile} from './hash';
 export {SharedBuffer} from './shared-buffer';

package/src/prettyDiagnostic.js

@@ -6,7 +6,6 @@ import formatCodeFrame from '@parcel/codeframe';
 import mdAnsi from '@parcel/markdown-ansi';
 import chalk from 'chalk';
 import path from 'path';
-import nullthrows from 'nullthrows';
 // $FlowFixMe
 import terminalLink from 'terminal-link';
 
@@ -60,10 +59,10 @@ export default async function prettyDiagnostic(
       }
 
       let highlights = codeFrame.codeHighlights;
-      let code =
-        codeFrame.code ??
-        (options &&
-          (await options.inputFS.readFile(nullthrows(filePath), 'utf8')));
+      let code = codeFrame.code;
+      if (code == null && options && filePath != null) {
+        code = await options.inputFS.readFile(filePath, 'utf8');
+      }
 
       let formattedCodeFrame = '';
       if (code != null) {

package/src/progress-message.js

@@ -0,0 +1,22 @@
+// @flow strict-local
+import type {BuildProgressEvent} from '@parcel/types';
+
+import path from 'path';
+
+export function getProgressMessage(event: BuildProgressEvent): ?string {
+  switch (event.phase) {
+    case 'transforming':
+      return `Building ${path.basename(event.filePath)}...`;
+
+    case 'bundling':
+      return 'Bundling...';
+
+    case 'packaging':
+      return `Packaging ${event.bundle.displayName}...`;
+
+    case 'optimizing':
+      return `Optimizing ${event.bundle.displayName}...`;
+  }
+
+  return null;
+}

package/test/config.test.js

@@ -47,4 +47,52 @@ describe('loadConfig', () => {
       {},
     );
   });
+
+  it('should load with js', async () => {
+    assert.deepEqual(
+      (
+        await loadConfig(
+          fs,
+          path.join(__dirname, './input/config/config.js'),
+          ['config.js'],
+          path.join(__dirname, './input/config/'),
+        )
+      )?.config,
+      {
+        hoge: 'fuga',
+      },
+    );
+  });
+
+  it('should load with cjs', async () => {
+    assert.deepEqual(
+      (
+        await loadConfig(
+          fs,
+          path.join(__dirname, './input/config/config.cjs'),
+          ['config.cjs'],
+          path.join(__dirname, './input/config/'),
+        )
+      )?.config,
+      {
+        hoge: 'fuga',
+      },
+    );
+  });
+
+  it('should load without an extension as json', async () => {
+    assert.deepEqual(
+      (
+        await loadConfig(
+          fs,
+          path.join(__dirname, './input/config/.testrc'),
+          ['.testrc'],
+          path.join(__dirname, './input/config/'),
+        )
+      )?.config,
+      {
+        hoge: 'fuga',
+      },
+    );
+  });
 });

package/test/input/config/.testrc

@@ -0,0 +1,3 @@
+{
+    "hoge": "fuga"
+}

package/test/input/config/config.cjs

@@ -0,0 +1,3 @@
+module.exports = {
+  hoge: 'fuga',
+};

package/test/input/config/config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  hoge: 'fuga',
+};