@parcel/utils 2.0.0-beta.3 → 2.0.0-dev.1510

package/test/collection.test.js

@@ -1,7 +1,11 @@
 // @flow
 
 import assert from 'assert';
-import {objectSortedEntries, objectSortedEntriesDeep} from '../src/collection';
+import {
+  objectSortedEntries,
+  objectSortedEntriesDeep,
+  setDifference,
+} from '../src/collection';
 
 describe('objectSortedEntries', () => {
   it('returns a sorted list of key/value tuples', () => {
@@ -38,3 +42,11 @@ describe('objectSortedEntriesDeep', () => {
     );
   });
 });
+describe('setDifference', () => {
+  it('returns a setDifference of two sets of T type', () => {
+    assert.deepEqual(
+      setDifference(new Set([1, 2, 3]), new Set([3, 4, 5])),
+      new Set([1, 2, 4, 5]),
+    );
+  });
+});

package/test/config.test.js

@@ -0,0 +1,98 @@
+// @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,
+      {},
+    );
+  });
+
+  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',
+};

package/test/input/config/config.json

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

package/test/replaceBundleReferences.test.js

@@ -33,7 +33,8 @@ describe('replace bundle references', () => {
     // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e3147e900a8ad17ceb5c90b',
-      moduleSpecifier: 'url:./image.jpg?as=webp',
+      specifier: 'url:./image.jpg?as=webp',
+      specifierType: 'esm',
     };
 
     let result = getURLReplacement({
@@ -77,7 +78,8 @@ describe('replace bundle references', () => {
     // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e3147e900a8ad17ceb5c90b',
-      moduleSpecifier: 'url:./image.jpg?as=webp',
+      specifier: 'url:./image.jpg?as=webp',
+      specifierType: 'esm',
     };
 
     let result = getURLReplacement({
@@ -121,7 +123,8 @@ describe('replace bundle references', () => {
     // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e314797845a8ad17ceb5c9b',
-      moduleSpecifier: './image.jpg',
+      specifier: './image.jpg',
+      specifierType: 'esm',
     };
 
     let result = getURLReplacement({
@@ -165,7 +168,8 @@ describe('replace bundle references', () => {
     // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e3147e900a8ad17ceb5c90b',
-      moduleSpecifier: 'url:./image.jpg?as=webp',
+      specifier: 'url:./image.jpg?as=webp',
+      specifierType: 'esm',
     };
 
     let result = getURLReplacement({
@@ -181,4 +185,84 @@ describe('replace bundle references', () => {
     );
     assert.equal(result.from, '074b36596e3147e900a8ad17ceb5c90b');
   });
+
+  it('should work with bundle names with colons, relative', () => {
+    // $FlowFixMe
+    let fromBundle: NamedBundle = {
+      filePath: '/user/dist/reformat.html',
+      name: 'reformat.html',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist',
+        publicUrl: '/',
+      },
+    };
+
+    // $FlowFixMe
+    let toBundle: NamedBundle = {
+      filePath: '/user/dist/a:b:c.html',
+      name: 'a:b:c.html',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist',
+        publicUrl: '/',
+      },
+    };
+
+    // $FlowFixMe
+    let dependency: Dependency = {
+      id: '074b36596e3147e900a8ad17ceb5c90b',
+      specifier: './a:b:c.html',
+      specifierType: 'esm',
+    };
+
+    let result = getURLReplacement({
+      dependency,
+      fromBundle,
+      toBundle,
+      relative: true,
+    });
+
+    assert.equal(result.to, './a:b:c.html');
+  });
+
+  it('should work with bundle names with colons, absolute', () => {
+    // $FlowFixMe
+    let fromBundle: NamedBundle = {
+      filePath: '/user/dist/reformat.html',
+      name: 'reformat.html',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist',
+        publicUrl: '/',
+      },
+    };
+
+    // $FlowFixMe
+    let toBundle: NamedBundle = {
+      filePath: '/user/dist/a:b:c.html',
+      name: 'a:b:c.html',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist',
+        publicUrl: '/',
+      },
+    };
+
+    // $FlowFixMe
+    let dependency: Dependency = {
+      id: '074b36596e3147e900a8ad17ceb5c90b',
+      specifier: './a:b:c.html',
+      specifierType: 'esm',
+    };
+
+    let result = getURLReplacement({
+      dependency,
+      fromBundle,
+      toBundle,
+      relative: false,
+    });
+
+    assert.equal(result.to, '/a:b:c.html');
+  });
 });

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/test/urlJoin.test.js

@@ -23,4 +23,15 @@ describe('urlJoin', () => {
     let joinedUrl = urlJoin('/static', '.\\image.jpeg?test=test');
     assert.equal(joinedUrl, '/static/image.jpeg?test=test');
   });
+
+  it('should support paths with colons', () => {
+    let joinedUrl = urlJoin('/static', 'a:b:c.html');
+    assert.equal(joinedUrl, '/static/a:b:c.html');
+
+    joinedUrl = urlJoin('/static', '/a:b:c.html');
+    assert.equal(joinedUrl, '/static/a:b:c.html');
+
+    joinedUrl = urlJoin('/static', './a:b:c.html');
+    assert.equal(joinedUrl, '/static/a:b:c.html');
+  });
 });

package/lib/DefaultMap.js

@@ -1,64 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.DefaultWeakMap = exports.DefaultMap = void 0;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-class DefaultMap extends Map {
-  constructor(getDefault, entries) {
-    super(entries);
-
-    _defineProperty(this, "_getDefault", void 0);
-
-    this._getDefault = getDefault;
-  }
-
-  get(key) {
-    let ret;
-
-    if (this.has(key)) {
-      ret = super.get(key);
-    } else {
-      ret = this._getDefault(key);
-      this.set(key, ret);
-    } // $FlowFixMe
-
-
-    return ret;
-  }
-
-} // Duplicated from DefaultMap implementation for Flow
-// Roughly mirrors https://github.com/facebook/flow/blob/2eb5a78d92c167117ba9caae070afd2b9f598599/lib/core.js#L617
-
-
-exports.DefaultMap = DefaultMap;
-
-class DefaultWeakMap extends WeakMap {
-  constructor(getDefault, entries) {
-    super(entries);
-
-    _defineProperty(this, "_getDefault", void 0);
-
-    this._getDefault = getDefault;
-  }
-
-  get(key) {
-    let ret;
-
-    if (this.has(key)) {
-      ret = super.get(key);
-    } else {
-      ret = this._getDefault(key);
-      this.set(key, ret);
-    } // $FlowFixMe
-
-
-    return ret;
-  }
-
-}
-
-exports.DefaultWeakMap = DefaultWeakMap;

package/lib/Deferred.js

@@ -1,34 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.makeDeferredWithPromise = makeDeferredWithPromise;
-
-function _assert() {
-  const data = _interopRequireDefault(require("assert"));
-
-  _assert = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function makeDeferredWithPromise() {
-  let deferred;
-  let promise = new Promise((resolve, reject) => {
-    deferred = {
-      resolve,
-      reject
-    };
-  }); // Promise constructor callback executes synchronously, so this is defined
-
-  (0, _assert().default)(deferred != null);
-  return {
-    deferred,
-    promise
-  };
-}

package/lib/PromiseQueue.js

@@ -1,144 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-function _Deferred() {
-  const data = require("./Deferred");
-
-  _Deferred = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-class PromiseQueue {
-  constructor(opts = {
-    maxConcurrent: Infinity
-  }) {
-    _defineProperty(this, "_deferred", void 0);
-
-    _defineProperty(this, "_maxConcurrent", void 0);
-
-    _defineProperty(this, "_numRunning", 0);
-
-    _defineProperty(this, "_queue", []);
-
-    _defineProperty(this, "_runPromise", null);
-
-    _defineProperty(this, "_error", void 0);
-
-    _defineProperty(this, "_count", 0);
-
-    _defineProperty(this, "_results", []);
-
-    if (opts.maxConcurrent <= 0) {
-      throw new TypeError('maxConcurrent must be a positive, non-zero value');
-    }
-
-    this._maxConcurrent = opts.maxConcurrent;
-  }
-
-  getNumWaiting() {
-    return this._queue.length;
-  }
-
-  add(fn) {
-    return new Promise((resolve, reject) => {
-      let i = this._count++;
-
-      this._queue.push(() => fn().then(result => {
-        this._results[i] = result;
-        resolve(result);
-      }, err => {
-        reject(err);
-        throw err;
-      }));
-
-      if (this._numRunning > 0 && this._numRunning < this._maxConcurrent) {
-        this._next();
-      }
-    });
-  }
-
-  run() {
-    if (this._runPromise != null) {
-      return this._runPromise;
-    }
-
-    if (this._queue.length === 0) {
-      return Promise.resolve([]);
-    }
-
-    let {
-      deferred,
-      promise
-    } = (0, _Deferred().makeDeferredWithPromise)();
-    this._deferred = deferred;
-    this._runPromise = promise;
-
-    while (this._queue.length && this._numRunning < this._maxConcurrent) {
-      this._next();
-    }
-
-    return promise;
-  }
-
-  async _next() {
-    let fn = this._queue.shift();
-
-    await this._runFn(fn);
-
-    if (this._queue.length) {
-      this._next();
-    } else if (this._numRunning === 0) {
-      this._done();
-    }
-  }
-
-  async _runFn(fn) {
-    this._numRunning++;
-
-    try {
-      await fn();
-    } catch (e) {
-      // Only store the first error that occurs.
-      // We don't reject immediately so that any other concurrent
-      // requests have time to complete.
-      if (this._error == null) {
-        this._error = e;
-      }
-    } finally {
-      this._numRunning--;
-    }
-  }
-
-  _resetState() {
-    this._queue = [];
-    this._count = 0;
-    this._results = [];
-    this._runPromise = null;
-    this._numRunning = 0;
-    this._deferred = null;
-  }
-
-  _done() {
-    if (this._deferred != null) {
-      if (this._error != null) {
-        this._deferred.reject(this._error);
-      } else {
-        this._deferred.resolve(this._results);
-      }
-    }
-
-    this._resetState();
-  }
-
-}
-
-exports.default = PromiseQueue;

package/lib/TapStream.js

@@ -1,46 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-function _stream() {
-  const data = require("stream");
-
-  _stream = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-/*
- * "Taps" into the contents of a flowing stream, yielding chunks to the passed
- * callback. Continues to pass data chunks down the stream.
- */
-class TapStream extends _stream().Transform {
-  constructor(tap, options) {
-    super({ ...options
-    });
-
-    _defineProperty(this, "_tap", void 0);
-
-    this._tap = tap;
-  }
-
-  _transform(chunk, encoding, callback) {
-    try {
-      this._tap(Buffer.from(chunk));
-
-      callback(null, chunk);
-    } catch (err) {
-      callback(err);
-    }
-  }
-
-}
-
-exports.default = TapStream;