@parcel/utils 2.0.0-nightly.137 → 2.0.0-nightly.1373

package/src/urlJoin.js

@@ -9,7 +9,9 @@ import path from 'path';
  */
 export default function urlJoin(publicURL: string, assetPath: string): string {
   const url = URL.parse(publicURL, false, true);
-  const assetUrl = URL.parse(assetPath);
+  // Leading / ensures that paths with colons are not parsed as a protocol.
+  let p = assetPath.startsWith('/') ? assetPath : '/' + assetPath;
+  const assetUrl = URL.parse(p);
   url.pathname = path.posix.join(url.pathname, assetUrl.pathname);
   url.search = assetUrl.search;
   url.hash = assetUrl.hash;

package/test/BitSet.test.js

@@ -0,0 +1,119 @@
+// @flow strict-local
+
+import assert from 'assert';
+import {BitSet} from '../src/BitSet';
+
+function assertValues<Item>(set: BitSet<Item>, values: Array<Item>) {
+  let setValues = set.values();
+
+  for (let value of values) {
+    assert(set.has(value), 'Set.has returned false');
+    assert(
+      setValues.some(v => v === value),
+      'Set values is missing value',
+    );
+  }
+
+  assert(
+    setValues.length === values.length,
+    `Expected ${values.length} values but got ${setValues.length}`,
+  );
+}
+
+describe('BitSet', () => {
+  it('cloneEmpty should return an empty set', () => {
+    let set1 = BitSet.from([1, 2, 3, 4, 5]);
+    set1.add(1);
+    set1.add(3);
+
+    let set2 = set1.cloneEmpty();
+
+    assertValues(set2, []);
+  });
+
+  it('clone should return a set with the same values', () => {
+    let set1 = BitSet.from([1, 2, 3, 4, 5]);
+    set1.add(1);
+    set1.add(3);
+
+    let set2 = set1.clone();
+
+    assertValues(set2, [1, 3]);
+  });
+
+  it('clear should remove all values from the set', () => {
+    let set1 = BitSet.from([1, 2, 3, 4, 5]);
+    set1.add(1);
+    set1.add(3);
+
+    set1.clear();
+
+    assertValues(set1, []);
+  });
+
+  it('delete should remove values from the set', () => {
+    let set1 = BitSet.from([1, 2, 3, 4, 5]);
+    set1.add(1);
+    set1.add(3);
+    set1.add(5);
+
+    set1.delete(3);
+
+    assertValues(set1, [1, 5]);
+  });
+
+  it('should intersect with another BitSet', () => {
+    let set1 = BitSet.from([1, 2, 3, 4, 5]);
+    set1.add(1);
+    set1.add(3);
+
+    let set2 = set1.cloneEmpty();
+    set2.add(3);
+    set2.add(5);
+
+    set1.intersect(set2);
+    assertValues(set1, [3]);
+  });
+
+  it('should union with another BitSet', () => {
+    let set1 = BitSet.from([1, 2, 3, 4, 5]);
+    set1.add(1);
+    set1.add(3);
+
+    let set2 = set1.cloneEmpty();
+    set2.add(3);
+    set2.add(5);
+
+    set1.union(set2);
+    assertValues(set1, [1, 3, 5]);
+  });
+
+  it('BitSet.union should create a new BitSet with the union', () => {
+    let set1 = BitSet.from([1, 2, 3, 4, 5]);
+    set1.add(1);
+    set1.add(3);
+
+    let set2 = set1.cloneEmpty();
+    set2.add(3);
+    set2.add(5);
+
+    let set3 = BitSet.union(set1, set2);
+    assertValues(set1, [1, 3]);
+    assertValues(set2, [3, 5]);
+    assertValues(set3, [1, 3, 5]);
+  });
+
+  it('returns an array of all values', () => {
+    let set = BitSet.from([1, 2, 3, 4]);
+    set.add(1);
+    set.add(3);
+
+    assertValues(set, [3, 1]);
+  });
+
+  it('should return an error if a new item is added', () => {
+    let set = BitSet.from([1, 2, 3, 4]);
+
+    assert.throws(() => set.add(5), /Item is missing from BitSet/);
+  });
+});

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/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/input/sourcemap/referenced-min.js

@@ -0,0 +1,2 @@
+function hello(){var l="Hello",o="world";console.log(l+" "+o+"!")}hello();
+//# sourceMappingURL=file://referenced-min.js.map

package/test/input/sourcemap/referenced-min.js.map

@@ -0,0 +1,6 @@
+{
+  "version":3,
+  "sources":["./referenced.js"],
+  "names":["hello","l","o","console","log"],
+  "mappings":"AAAA,SAASA,QACP,IAAIC,EAAI,QACNC,EAAI,QACNC,QAAQC,IAAIH,EAAI,IAAMC,EAAI,KAE5BF"
+}

package/test/input/sourcemap/source-root.js

@@ -0,0 +1,2 @@
+function hello(){var l="Hello",o="world";console.log(l+" "+o+"!")}hello();
+//# sourceMappingURL=source-root.js.map

package/test/input/sourcemap/source-root.js.map

@@ -0,0 +1,7 @@
+{
+  "version":3,
+  "sourceRoot": "../",
+  "sources":["./source.js"],
+  "names":["hello","l","o","console","log"],
+  "mappings":"AAAA,SAASA,QACP,IAAIC,EAAI,QACNC,EAAI,QACNC,QAAQC,IAAIH,EAAI,IAAMC,EAAI,KAE5BF"
+}

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');
+  });
+});