@parcel/utils 2.0.0 → 2.2.0

package/lib/blob.js

@@ -6,6 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.blobToBuffer = blobToBuffer;
 exports.blobToString = blobToString;
 
+function _buffer() {
+  const data = require("buffer");
+
+  _buffer = function () {
+    return data;
+  };
+
+  return data;
+}
+
 var _ = require("./");
 
 function _stream() {
@@ -21,17 +31,17 @@ function _stream() {
 function blobToBuffer(blob) {
   if (blob instanceof _stream().Readable) {
     return (0, _.bufferStream)(blob);
-  } else if (blob instanceof Buffer) {
-    return Promise.resolve(Buffer.from(blob));
+  } else if (blob instanceof _buffer().Buffer) {
+    return Promise.resolve(_buffer().Buffer.from(blob));
   } else {
-    return Promise.resolve(Buffer.from(blob, 'utf8'));
+    return Promise.resolve(_buffer().Buffer.from(blob, 'utf8'));
   }
 }
 
 async function blobToString(blob) {
   if (blob instanceof _stream().Readable) {
     return (await (0, _.bufferStream)(blob)).toString();
-  } else if (blob instanceof Buffer) {
+  } else if (blob instanceof _buffer().Buffer) {
     return blob.toString();
   } else {
     return blob;

package/lib/collection.js

@@ -7,6 +7,8 @@ exports.unique = unique;
 exports.objectSortedEntries = objectSortedEntries;
 exports.objectSortedEntriesDeep = objectSortedEntriesDeep;
 exports.setDifference = setDifference;
+exports.setIntersect = setIntersect;
+exports.setUnion = setUnion;
 
 function unique(array) {
   return [...new Set(array)];
@@ -48,4 +50,16 @@ function setDifference(a, b) {
   }
 
   return difference;
+}
+
+function setIntersect(a, b) {
+  for (let entry of a) {
+    if (!b.has(entry)) {
+      a.delete(entry);
+    }
+  }
+}
+
+function setUnion(a, b) {
+  return new Set([...a, ...b]);
 }

package/lib/config.js

@@ -7,6 +7,16 @@ exports.resolveConfig = resolveConfig;
 exports.resolveConfigSync = resolveConfigSync;
 exports.loadConfig = loadConfig;
 
+function _diagnostic() {
+  const data = _interopRequireDefault(require("@parcel/diagnostic"));
+
+  _diagnostic = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _path() {
   const data = _interopRequireDefault(require("path"));
 
@@ -112,7 +122,6 @@ async function loadConfig(fs, filepath, filenames, projectRoot, opts) {
       }
 
       let configContent = await fs.readFile(configFile, 'utf8');
-      if (!configContent) return null;
       let config;
 
       if (parse === false) {
@@ -121,7 +130,35 @@ async function loadConfig(fs, filepath, filenames, projectRoot, opts) {
         var _opts$parser;
 
         let parse = (_opts$parser = opts === null || opts === void 0 ? void 0 : opts.parser) !== null && _opts$parser !== void 0 ? _opts$parser : getParser(extname);
-        config = parse(configContent);
+
+        try {
+          config = parse(configContent);
+        } catch (e) {
+          if (extname !== '' && extname !== 'json') {
+            throw e;
+          }
+
+          let pos = {
+            line: e.lineNumber,
+            column: e.columnNumber
+          };
+          throw new (_diagnostic().default)({
+            diagnostic: {
+              message: `Failed to parse ${_path().default.basename(configFile)}`,
+              origin: '@parcel/utils',
+              codeFrames: [{
+                language: 'json5',
+                filePath: configFile,
+                code: configContent,
+                codeHighlights: [{
+                  start: pos,
+                  end: pos,
+                  message: e.message
+                }]
+              }]
+            }
+          });
+        }
       }
 
       let output = {

package/lib/index.js

@@ -171,6 +171,18 @@ Object.defineProperty(exports, "setDifference", {
     return _collection.setDifference;
   }
 });
+Object.defineProperty(exports, "setIntersect", {
+  enumerable: true,
+  get: function () {
+    return _collection.setIntersect;
+  }
+});
+Object.defineProperty(exports, "setUnion", {
+  enumerable: true,
+  get: function () {
+    return _collection.setUnion;
+  }
+});
 Object.defineProperty(exports, "resolveConfig", {
   enumerable: true,
   get: function () {
@@ -249,6 +261,12 @@ Object.defineProperty(exports, "hashFile", {
     return _hash.hashFile;
   }
 });
+Object.defineProperty(exports, "SharedBuffer", {
+  enumerable: true,
+  get: function () {
+    return _sharedBuffer.SharedBuffer;
+  }
+});
 Object.defineProperty(exports, "createHTTPServer", {
   enumerable: true,
   get: function () {
@@ -430,6 +448,8 @@ var _glob = require("./glob");
 
 var _hash = require("./hash");
 
+var _sharedBuffer = require("./shared-buffer");
+
 var _httpServer = require("./http-server");
 
 var _path = require("./path");

package/lib/replaceBundleReferences.js

@@ -92,7 +92,7 @@ function replaceURLReferences({
       continue;
     }
 
-    if (!resolved || resolved.bundleBehavior === 'inline') {
+    if (resolved.bundleBehavior === 'inline') {
       // If a bundle is inline, it should be replaced with inline contents,
       // not a URL.
       continue;
@@ -142,7 +142,11 @@ async function replaceInlineReferences({
     let inlineType = (0, _nullthrows().default)(entryBundle.getMainEntry()).meta.inlineType;
 
     if (inlineType == null || inlineType === 'string') {
-      replacements.set(dependency.id, getInlineReplacement(dependency, inlineType, packagedContents));
+      var _dependency$meta$plac2, _dependency$meta2;
+
+      let placeholder = (_dependency$meta$plac2 = (_dependency$meta2 = dependency.meta) === null || _dependency$meta2 === void 0 ? void 0 : _dependency$meta2.placeholder) !== null && _dependency$meta$plac2 !== void 0 ? _dependency$meta$plac2 : dependency.id;
+      (0, _assert().default)(typeof placeholder === 'string');
+      replacements.set(placeholder, getInlineReplacement(dependency, inlineType, packagedContents));
     }
   }
 
@@ -155,7 +159,7 @@ function getURLReplacement({
   toBundle,
   relative
 }) {
-  var _dependency$meta$plac2, _dependency$meta2;
+  var _dependency$meta$plac3, _dependency$meta3;
 
   let to;
 
@@ -180,7 +184,7 @@ function getURLReplacement({
     }));
   }
 
-  let placeholder = (_dependency$meta$plac2 = (_dependency$meta2 = dependency.meta) === null || _dependency$meta2 === void 0 ? void 0 : _dependency$meta2.placeholder) !== null && _dependency$meta$plac2 !== void 0 ? _dependency$meta$plac2 : dependency.id;
+  let placeholder = (_dependency$meta$plac3 = (_dependency$meta3 = dependency.meta) === null || _dependency$meta3 === void 0 ? void 0 : _dependency$meta3.placeholder) !== null && _dependency$meta$plac3 !== void 0 ? _dependency$meta$plac3 : dependency.id;
   (0, _assert().default)(typeof placeholder === 'string');
   return {
     from: placeholder,

package/lib/shared-buffer.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SharedBuffer = void 0;
+
+/* global MessageChannel:readonly */
+let SharedBuffer; // $FlowFixMe[prop-missing]
+
+exports.SharedBuffer = SharedBuffer;
+
+if (process.browser) {
+  exports.SharedBuffer = SharedBuffer = ArrayBuffer; // Safari has removed the constructor
+
+  if (typeof SharedArrayBuffer !== 'undefined') {
+    let channel = new MessageChannel();
+
+    try {
+      // Firefox might throw when sending the Buffer over a MessagePort
+      channel.port1.postMessage(new SharedArrayBuffer(0));
+      exports.SharedBuffer = SharedBuffer = SharedArrayBuffer;
+    } catch (_) {// NOOP
+    }
+
+    channel.port1.close();
+    channel.port2.close();
+  }
+} else {
+  exports.SharedBuffer = SharedBuffer = SharedArrayBuffer;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -21,11 +21,11 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.0",
-    "@parcel/codeframe": "^2.0.0",
-    "@parcel/diagnostic": "^2.0.0",
-    "@parcel/hash": "^2.0.0",
-    "@parcel/logger": "^2.0.0",
-    "@parcel/markdown-ansi": "^2.0.0",
+    "@parcel/codeframe": "^2.2.0",
+    "@parcel/diagnostic": "^2.2.0",
+    "@parcel/hash": "^2.2.0",
+    "@parcel/logger": "^2.2.0",
+    "@parcel/markdown-ansi": "^2.2.0",
     "@parcel/source-map": "^2.0.0",
     "ansi-html-community": "0.0.8",
     "chalk": "^4.1.0",
@@ -37,7 +37,7 @@
     "json5": "^1.0.1",
     "lru-cache": "^6.0.0",
     "micromatch": "^4.0.4",
-    "node-forge": "^0.10.0",
+    "node-forge": "^1.2.1",
     "nullthrows": "^1.1.1",
     "open": "^7.0.3",
     "terminal-link": "^2.1.1"
@@ -46,5 +46,10 @@
     "@babel/plugin-transform-flow-strip-types": "^7.2.0",
     "random-int": "^1.0.0"
   },
-  "gitHead": "84da50ae6943bff9741e2fc76d2f4968074cbbd6"
+  "browser": {
+    "./src/generateCertificate.js": false,
+    "./src/http-server.js": false,
+    "./src/openInBrowser.js": false
+  },
+  "gitHead": "4745cd3023f8d5a5adcf9e565d5b82d1418dc262"
 }

package/src/blob.js

@@ -2,6 +2,7 @@
 
 import type {Blob} from '@parcel/types';
 
+import {Buffer} from 'buffer';
 import {bufferStream} from './';
 import {Readable} from 'stream';
 

package/src/collection.js

@@ -6,14 +6,14 @@ export function unique<T>(array: Array<T>): Array<T> {
 
 export function objectSortedEntries(obj: {
   +[string]: mixed,
-  ...,
+  ...
 }): Array<[string, mixed]> {
   return Object.entries(obj).sort(([keyA], [keyB]) => keyA.localeCompare(keyB));
 }
 
 export function objectSortedEntriesDeep(object: {
   +[string]: mixed,
-  ...,
+  ...
 }): Array<[string, mixed]> {
   let sortedEntries = objectSortedEntries(object);
   for (let i = 0; i < sortedEntries.length; i++) {
@@ -43,3 +43,15 @@ export function setDifference<T>(a: Set<T>, b: Set<T>): Set<T> {
   }
   return difference;
 }
+
+export function setIntersect<T>(a: Set<T>, b: Set<T>): void {
+  for (let entry of a) {
+    if (!b.has(entry)) {
+      a.delete(entry);
+    }
+  }
+}
+
+export function setUnion<T>(a: Iterable<T>, b: Iterable<T>): Set<T> {
+  return new Set([...a, ...b]);
+}

package/src/config.js

@@ -2,6 +2,7 @@
 
 import type {ConfigResult, File, FilePath} from '@parcel/types';
 import type {FileSystem} from '@parcel/fs';
+import ThrowableDiagnostic from '@parcel/diagnostic';
 import path from 'path';
 import clone from 'clone';
 import {parse as json5} from 'json5';
@@ -82,14 +83,45 @@ export async function loadConfig(
       }
 
       let configContent = await fs.readFile(configFile, 'utf8');
-      if (!configContent) return null;
 
       let config;
       if (parse === false) {
         config = configContent;
       } else {
         let parse = opts?.parser ?? getParser(extname);
-        config = parse(configContent);
+        try {
+          config = parse(configContent);
+        } catch (e) {
+          if (extname !== '' && extname !== 'json') {
+            throw e;
+          }
+
+          let pos = {
+            line: e.lineNumber,
+            column: e.columnNumber,
+          };
+
+          throw new ThrowableDiagnostic({
+            diagnostic: {
+              message: `Failed to parse ${path.basename(configFile)}`,
+              origin: '@parcel/utils',
+              codeFrames: [
+                {
+                  language: 'json5',
+                  filePath: configFile,
+                  code: configContent,
+                  codeHighlights: [
+                    {
+                      start: pos,
+                      end: pos,
+                      message: e.message,
+                    },
+                  ],
+                },
+              ],
+            },
+          });
+        }
       }
 
       let output = {

package/src/debounce.js

@@ -6,7 +6,7 @@ export default function debounce<TArgs: Array<mixed>>(
 ): (...args: TArgs) => void {
   let timeout;
 
-  return function(...args: TArgs) {
+  return function (...args: TArgs) {
     if (timeout) {
       clearTimeout(timeout);
     }

package/src/getExisting.js

@@ -14,10 +14,7 @@ export default function getExisting(
   return {
     source,
     minified: fs.existsSync(minifiedPath)
-      ? fs
-          .readFileSync(minifiedPath, 'utf8')
-          .trim()
-          .replace(/;$/, '')
+      ? fs.readFileSync(minifiedPath, 'utf8').trim().replace(/;$/, '')
       : source,
   };
 }

package/src/hash.js

@@ -16,7 +16,7 @@ export function hashStream(stream: Readable): Promise<string> {
       .on('data', chunk => {
         hash.writeBuffer(chunk);
       })
-      .on('end', function() {
+      .on('end', function () {
         resolve(hash.finish());
       })
       .on('error', err => {

package/src/index.js

@@ -35,12 +35,15 @@ export {
   objectSortedEntries,
   objectSortedEntriesDeep,
   setDifference,
+  setIntersect,
+  setUnion,
 } from './collection';
 export {resolveConfig, resolveConfigSync, loadConfig} from './config';
 export {DefaultMap, DefaultWeakMap} from './DefaultMap';
 export {makeDeferredWithPromise} from './Deferred';
 export {isGlob, isGlobMatch, globSync, glob} from './glob';
 export {hashStream, hashObject, hashFile} from './hash';
+export {SharedBuffer} from './shared-buffer';
 export {fuzzySearch} from './schema';
 export {createHTTPServer} from './http-server';
 export {normalizePath, normalizeSeparators, relativePath} from './path';

package/src/replaceBundleReferences.js

@@ -66,7 +66,7 @@ export function replaceURLReferences({
       continue;
     }
 
-    if (!resolved || resolved.bundleBehavior === 'inline') {
+    if (resolved.bundleBehavior === 'inline') {
       // If a bundle is inline, it should be replaced with inline contents,
       // not a URL.
       continue;
@@ -131,15 +131,18 @@ export async function replaceInlineReferences({
       entryBundle,
       bundleGraph,
     );
-    let packagedContents = (packagedBundle.contents instanceof Readable
-      ? await bufferStream(packagedBundle.contents)
-      : packagedBundle.contents
+    let packagedContents = (
+      packagedBundle.contents instanceof Readable
+        ? await bufferStream(packagedBundle.contents)
+        : packagedBundle.contents
     ).toString();
 
     let inlineType = nullthrows(entryBundle.getMainEntry()).meta.inlineType;
     if (inlineType == null || inlineType === 'string') {
+      let placeholder = dependency.meta?.placeholder ?? dependency.id;
+      invariant(typeof placeholder === 'string');
       replacements.set(
-        dependency.id,
+        placeholder,
         getInlineReplacement(dependency, inlineType, packagedContents),
       );
     }

package/src/schema.js

@@ -378,7 +378,7 @@ export function fuzzySearch(
   return result.map(([v]) => v);
 }
 
-validateSchema.diagnostic = function(
+validateSchema.diagnostic = function (
   schema: SchemaEntity,
   data: {|
     ...

package/src/shared-buffer.js

@@ -0,0 +1,24 @@
+// @flow
+/* global MessageChannel:readonly */
+
+export let SharedBuffer: Class<ArrayBuffer> | Class<SharedArrayBuffer>;
+
+// $FlowFixMe[prop-missing]
+if (process.browser) {
+  SharedBuffer = ArrayBuffer;
+  // Safari has removed the constructor
+  if (typeof SharedArrayBuffer !== 'undefined') {
+    let channel = new MessageChannel();
+    try {
+      // Firefox might throw when sending the Buffer over a MessagePort
+      channel.port1.postMessage(new SharedArrayBuffer(0));
+      SharedBuffer = SharedArrayBuffer;
+    } catch (_) {
+      // NOOP
+    }
+    channel.port1.close();
+    channel.port2.close();
+  }
+} else {
+  SharedBuffer = SharedArrayBuffer;
+}

package/src/sourcemap.js

@@ -5,7 +5,8 @@ import SourceMap from '@parcel/source-map';
 import path from 'path';
 import {normalizeSeparators, isAbsolute} from './path';
 
-export const SOURCEMAP_RE: RegExp = /(?:\/\*|\/\/)\s*[@#]\s*sourceMappingURL\s*=\s*([^\s*]+)(?:\s*\*\/)?\s*$/;
+export const SOURCEMAP_RE: RegExp =
+  /(?:\/\*|\/\/)\s*[@#]\s*sourceMappingURL\s*=\s*([^\s*]+)(?:\s*\*\/)?\s*$/;
 const DATA_URL_RE = /^data:[^;]+(?:;charset=[^;]+)?;base64,(.*)/;
 export const SOURCEMAP_EXTENSIONS: Set<string> = new Set<string>([
   'css',

package/test/DefaultMap.test.js

@@ -5,10 +5,13 @@ import {DefaultMap} from '../src/DefaultMap';
 
 describe('DefaultMap', () => {
   it('constructs with entries just like Map', () => {
-    let map = new DefaultMap(k => k, [
-      [1, 3],
-      [2, 27],
-    ]);
+    let map = new DefaultMap(
+      k => k,
+      [
+        [1, 3],
+        [2, 27],
+      ],
+    );
     assert.equal(map.get(1), 3);
     assert.deepEqual(Array.from(map.entries()), [
       [1, 3],

package/test/config.test.js

@@ -0,0 +1,50 @@
+// @flow strict-local
+
+import assert from 'assert';
+import {loadConfig} from '../src/config';
+import {inputFS as fs} from '@parcel/test-utils';
+import path from 'path';
+
+describe('loadConfig', () => {
+  it('load config with json', async () => {
+    assert.deepEqual(
+      (
+        await loadConfig(
+          fs,
+          path.join(__dirname, './input/config/config.json'),
+          ['config.json'],
+          path.join(__dirname, './input/config/'),
+        )
+      )?.config,
+      {
+        hoge: 'fuga',
+      },
+    );
+  });
+
+  it('should throw error with empty string json', async () => {
+    // $FlowFixMe[prop-missing]
+    await assert.rejects(async () => {
+      await loadConfig(
+        fs,
+        path.join(__dirname, './input/config/empty.json'),
+        ['empty.json'],
+        path.join(__dirname, './input/config/'),
+      );
+    });
+  });
+
+  it('should load with empty string config toml', async () => {
+    assert.deepEqual(
+      (
+        await loadConfig(
+          fs,
+          path.join(__dirname, './input/config/empty.toml'),
+          ['empty.toml'],
+          path.join(__dirname, './input/config/'),
+        )
+      )?.config,
+      {},
+    );
+  });
+});

package/test/input/config/config.json

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

package/test/throttle.test.js

@@ -34,7 +34,7 @@ describe('throttle', () => {
 
   it('preserves the `this` when throttled functions are invoked', () => {
     let result;
-    let throttled = throttle(function() {
+    let throttled = throttle(function () {
       result = this.bar;
     }, 100);
 

package/src/.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": ["@parcel/babel-preset"]
-}