@parcel/utils 2.0.0-beta.1 → 2.0.0-nightly.1002

package/test/replaceBundleReferences.test.js

@@ -0,0 +1,268 @@
+// @flow strict-local
+
+import type {NamedBundle, Dependency} from '@parcel/types';
+
+import assert from 'assert';
+import {getURLReplacement} from '../src/replaceBundleReferences';
+
+describe('replace bundle references', () => {
+  it('Query params and named pipeline, 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/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      name: 'image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist',
+        publicUrl: '/',
+      },
+    };
+
+    // $FlowFixMe
+    let dependency: Dependency = {
+      id: '074b36596e3147e900a8ad17ceb5c90b',
+      specifier: 'url:./image.jpg?as=webp',
+      specifierType: 'esm',
+    };
+
+    let result = getURLReplacement({
+      dependency,
+      fromBundle,
+      toBundle,
+      relative: true,
+    });
+
+    assert.equal(
+      result.to,
+      'image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+    );
+    assert.equal(result.from, '074b36596e3147e900a8ad17ceb5c90b');
+  });
+
+  it('Query params and named pipeline, 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/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      name: 'image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist',
+        publicUrl: '/',
+      },
+    };
+
+    // $FlowFixMe
+    let dependency: Dependency = {
+      id: '074b36596e3147e900a8ad17ceb5c90b',
+      specifier: 'url:./image.jpg?as=webp',
+      specifierType: 'esm',
+    };
+
+    let result = getURLReplacement({
+      dependency,
+      fromBundle,
+      toBundle,
+      relative: false,
+    });
+
+    assert.equal(
+      result.to,
+      '/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+    );
+    assert.equal(result.from, '074b36596e3147e900a8ad17ceb5c90b');
+  });
+
+  it('Custom Public URL', () => {
+    // $FlowFixMe
+    let fromBundle: NamedBundle = {
+      filePath: '/user/dist/reformat.html',
+      name: 'reformat.html',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist',
+        publicUrl: 'https://test.com/static',
+      },
+    };
+
+    // $FlowFixMe
+    let toBundle: NamedBundle = {
+      filePath:
+        '/user/dist/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      name: 'image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist',
+        publicUrl: 'https://test.com/static',
+      },
+    };
+
+    // $FlowFixMe
+    let dependency: Dependency = {
+      id: '074b36596e314797845a8ad17ceb5c9b',
+      specifier: './image.jpg',
+      specifierType: 'esm',
+    };
+
+    let result = getURLReplacement({
+      dependency,
+      fromBundle,
+      toBundle,
+      relative: false,
+    });
+
+    assert.equal(
+      result.to,
+      'https://test.com/static/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+    );
+    assert.equal(result.from, '074b36596e314797845a8ad17ceb5c9b');
+  });
+
+  it('Relative with folders in between', () => {
+    // $FlowFixMe
+    let fromBundle: NamedBundle = {
+      filePath: '/user/dist/reformat.html',
+      name: 'reformat.html',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist',
+        publicUrl: 'https://test.com/static',
+      },
+    };
+
+    // $FlowFixMe
+    let toBundle: NamedBundle = {
+      filePath:
+        '/user/dist/assets/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      name: 'image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      // $FlowFixMe
+      target: {
+        distDir: '/user/dist/assets',
+        publicUrl: 'https://test.com/static',
+      },
+    };
+
+    // $FlowFixMe
+    let dependency: Dependency = {
+      id: '074b36596e3147e900a8ad17ceb5c90b',
+      specifier: 'url:./image.jpg?as=webp',
+      specifierType: 'esm',
+    };
+
+    let result = getURLReplacement({
+      dependency,
+      fromBundle,
+      toBundle,
+      relative: true,
+    });
+
+    assert.equal(
+      result.to,
+      'assets/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+    );
+    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/sourcemap.test.js

@@ -46,10 +46,10 @@ describe('loadSourceMap', () => {
     let contents = fs.readFileSync(filename, 'utf-8');
 
     let foundMap = await loadSourceMapUrl(fs, filename, contents);
-    assert.equal(foundMap.url, 'referenced-min.js.map');
+    assert.equal(foundMap.url, 'file://referenced-min.js.map');
     assert.equal(
       foundMap.filename,
-      path.join(path.dirname(filename), foundMap.url),
+      path.join(__dirname, 'input/sourcemap/referenced-min.js.map'),
     );
     assert.deepEqual(foundMap.map, {
       version: 3,
@@ -91,9 +91,7 @@ describe('loadSourceMap', () => {
     assert(!!map);
 
     let parsedMap = map.getMap();
-    assert.deepEqual(parsedMap.sources, [
-      path.normalize('input/sourcemap/referenced.js'),
-    ]);
+    assert.deepEqual(parsedMap.sources, ['input/sourcemap/referenced.js']);
     assert.deepEqual(parsedMap.names, ['hello', 'l', 'o', 'console', 'log']);
     assert.deepEqual(parsedMap.mappings, [
       {
@@ -189,9 +187,7 @@ describe('loadSourceMap', () => {
     assert(!!map);
 
     let parsedMap = map.getMap();
-    assert.deepEqual(parsedMap.sources, [
-      path.normalize('input/sourcemap/referenced.js'),
-    ]);
+    assert.deepEqual(parsedMap.sources, ['input/sourcemap/referenced.js']);
   });
 
   it('Should remap sources when using sourceRoot', async () => {
@@ -206,6 +202,6 @@ describe('loadSourceMap', () => {
     assert(!!map);
 
     let parsedMap = map.getMap();
-    assert.deepEqual(parsedMap.sources, [path.normalize('input/source.js')]);
+    assert.deepEqual(parsedMap.sources, ['input/source.js']);
   });
 });

package/test/throttle.test.js

@@ -1,7 +1,6 @@
 // @flow strict-local
 
 import assert from 'assert';
-// $FlowFixMe
 import sinon from 'sinon';
 import throttle from '../src/throttle';
 
@@ -35,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

@@ -0,0 +1,37 @@
+// @flow strict-local
+
+import assert from 'assert';
+import urlJoin from '../src/urlJoin';
+
+describe('urlJoin', () => {
+  it('Should join two paths', () => {
+    let joinedUrl = urlJoin('/', './image.jpeg?test=test');
+    assert.equal(joinedUrl, '/image.jpeg?test=test');
+  });
+
+  it('Should join two paths with longer publicUrl', () => {
+    let joinedUrl = urlJoin('/static', './image.jpeg?test=test');
+    assert.equal(joinedUrl, '/static/image.jpeg?test=test');
+  });
+
+  it('Should join two paths with longer publicUrl', () => {
+    let joinedUrl = urlJoin('/static', 'image.jpeg?test=test');
+    assert.equal(joinedUrl, '/static/image.jpeg?test=test');
+  });
+
+  it('Should turn windows path into posix', () => {
+    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,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.makeDeferredWithPromise = makeDeferredWithPromise;
-
-var _assert = _interopRequireDefault(require("assert"));
-
-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,133 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _Deferred = require("./Deferred");
-
-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, "_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._resolve();
-    }
-  }
-
-  async _runFn(fn) {
-    this._numRunning++;
-
-    try {
-      await fn();
-      this._numRunning--;
-    } catch (e) {
-      this._reject(e); // rejecting resets state so numRunning is reset to 0 here
-
-    }
-  }
-
-  _resetState() {
-    this._queue = [];
-    this._count = 0;
-    this._results = [];
-    this._runPromise = null;
-    this._numRunning = 0;
-    this._deferred = null;
-  }
-
-  _reject(err) {
-    if (this._deferred != null) {
-      this._deferred.reject(err);
-    }
-
-    this._resetState();
-  }
-
-  _resolve() {
-    if (this._deferred != null) {
-      this._deferred.resolve(this._results);
-    }
-
-    this._resetState();
-  }
-
-}
-
-exports.default = PromiseQueue;

package/lib/TapStream.js

@@ -1,38 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _stream = require("stream");
-
-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;

package/lib/ansi-html.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ansiHtml = ansiHtml;
-
-var _ansiHtml = _interopRequireDefault(require("ansi-html"));
-
-var _escapeHtml = require("./escape-html");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function ansiHtml(ansi) {
-  return (0, _ansiHtml.default)((0, _escapeHtml.escapeHTML)(ansi));
-}

package/lib/blob.js

@@ -1,31 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.blobToBuffer = blobToBuffer;
-exports.blobToString = blobToString;
-
-var _ = require("../");
-
-var _stream = require("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 {
-    return Promise.resolve(Buffer.from(blob, 'utf8'));
-  }
-}
-
-async function blobToString(blob) {
-  if (blob instanceof _stream.Readable) {
-    return (await (0, _.bufferStream)(blob)).toString();
-  } else if (blob instanceof Buffer) {
-    return blob.toString();
-  } else {
-    return blob;
-  }
-}