@atlaspack/core 2.12.1-dev.3443 → 2.12.1-dev.3460

package/src/resolveOptions.js

@@ -42,7 +42,7 @@ function generateInstanceId(entries: Array<FilePath>): string {
 
 // Compiles an array of globs to regex - used for lazy include/excludes
 function compileGlobs(globs: string[]): RegExp[] {
-  return globs.map(glob => globToRegex(glob));
+  return globs.map((glob) => globToRegex(glob));
 }
 
 export default async function resolveOptions(
@@ -58,7 +58,7 @@ export default async function resolveOptions(
   if (initialOptions.entries == null || initialOptions.entries === '') {
     entries = [];
   } else if (Array.isArray(initialOptions.entries)) {
-    entries = initialOptions.entries.map(entry =>
+    entries = initialOptions.entries.map((entry) =>
       path.resolve(inputCwd, entry),
     );
   } else {
@@ -202,7 +202,7 @@ export default async function resolveOptions(
     watchDir,
     watchBackend: initialOptions.watchBackend,
     watchIgnore: initialOptions.watchIgnore,
-    entries: entries.map(e => toProjectPath(projectRoot, e)),
+    entries: entries.map((e) => toProjectPath(projectRoot, e)),
     targets: initialOptions.targets,
     logLevel: initialOptions.logLevel ?? 'info',
     projectRoot,

package/src/serializer.js

@@ -166,7 +166,7 @@ export function prepareForSerialization(object: any): any {
 
   return mapObject(
     object,
-    value => {
+    (value) => {
       // Add a $$type property with the name of this class, if any is registered.
       if (
         value &&
@@ -201,7 +201,7 @@ export function prepareForSerialization(object: any): any {
 }
 
 export function restoreDeserializedObject(object: any): any {
-  return mapObject(object, value => {
+  return mapObject(object, (value) => {
     // If the value has a $$type property, use it to restore the object type
     if (value && value.$$type) {
       let ctor = nameToCtor.get(value.$$type);

package/src/serializerCore.browser.js

@@ -4,5 +4,6 @@ import * as msgpackr from 'msgpackr';
 
 let encoder = new msgpackr.Encoder({structuredClone: true});
 
-export let serializeRaw: any => Buffer = v => Buffer.from(encoder.encode(v));
-export let deserializeRaw: Buffer => any = v => encoder.decode(v);
+export let serializeRaw: (any) => Buffer = (v) =>
+  Buffer.from(encoder.encode(v));
+export let deserializeRaw: (Buffer) => any = (v) => encoder.decode(v);

package/src/serializerCore.js

@@ -1,5 +1,5 @@
 // @flow
 import v8 from 'v8';
 
-export let serializeRaw: any => Buffer = v8.serialize;
-export let deserializeRaw: Buffer => any = v8.deserialize;
+export let serializeRaw: (any) => Buffer = v8.serialize;
+export let deserializeRaw: (Buffer) => any = v8.deserialize;

package/src/utils.js

@@ -40,7 +40,7 @@ export class BuildAbortError extends Error {
 
 export function getPublicId(
   id: string,
-  alreadyExists: string => boolean,
+  alreadyExists: (string) => boolean,
 ): string {
   let encoded = base62.encode(Buffer.from(id, 'hex'));
   for (let end = 5; end <= encoded.length; end++) {
@@ -74,7 +74,7 @@ const ignoreOptions = new Set([
 
 export function optionsProxy(
   options: AtlaspackOptions,
-  invalidateOnOptionChange: string => void,
+  invalidateOnOptionChange: (string) => void,
   addDevDependency?: (devDep: InternalDevDepOptions) => void,
 ): AtlaspackOptions {
   let packageManager = addDevDependency

package/test/AtlaspackConfigRequest.test.js

@@ -133,7 +133,7 @@ describe('AtlaspackConfigRequest', () => {
             '.parcelrc',
           );
         },
-        e => {
+        (e) => {
           assert.strictEqual(
             e.diagnostics[0].codeFrames[0].codeHighlights[0].message,
             `Possible values: "$schema", "bundler", "resolvers", "transformers", "validators", "namers", "packagers", "optimizers", "compressors", "reporters", "runtimes", "filePath", "resolveFrom"`,

package/test/BundleGraph.test.js

@@ -29,7 +29,7 @@ describe('BundleGraph', () => {
       false,
     );
     assert.deepEqual(
-      getAssets(bundleGraph).map(a => bundleGraph.getAssetPublicId(a)),
+      getAssets(bundleGraph).map((a) => bundleGraph.getAssetPublicId(a)),
       ['296TI', '4DGUq'],
     );
   });
@@ -40,7 +40,7 @@ describe('BundleGraph', () => {
       false,
     );
     assert.deepEqual(
-      getAssets(bundleGraph).map(a => bundleGraph.getAssetPublicId(a)),
+      getAssets(bundleGraph).map((a) => bundleGraph.getAssetPublicId(a)),
       ['296TI', '296TII'],
     );
   });
@@ -48,7 +48,7 @@ describe('BundleGraph', () => {
 
 function getAssets(bundleGraph) {
   let assets = [];
-  bundleGraph.traverse(node => {
+  bundleGraph.traverse((node) => {
     if (node.type === 'asset') {
       assets.push(node.value);
     }

package/test/Dependency.test.js

@@ -17,5 +17,33 @@ describe('Dependency', () => {
       });
       expect(id1).toEqual(id2);
     });
+
+    it('dependencies with different targets should have different IDs', () => {
+      let id1 = createDependencyId({
+        specifier: 'foo',
+        env: createEnvironment(),
+        specifierType: 'esm',
+        target: {
+          name: 'test-1234',
+          distDir: 'dist-dir',
+          env: createEnvironment(),
+          publicUrl: 'public-url',
+          source: '1234',
+        },
+      });
+      let id2 = createDependencyId({
+        specifier: 'foo',
+        env: createEnvironment(),
+        specifierType: 'esm',
+        target: {
+          name: 'test-1234',
+          distDir: 'dist-dir',
+          env: createEnvironment(),
+          publicUrl: 'public-url',
+          source: '5678', // <- this is different
+        },
+      });
+      expect(id1).not.toEqual(id2);
+    });
   });
 });

package/test/PublicMutableBundleGraph.test.js

@@ -38,7 +38,7 @@ describe('PublicMutableBundleGraph', () => {
       DEFAULT_OPTIONS,
     );
 
-    mutableBundleGraph.traverse(node => {
+    mutableBundleGraph.traverse((node) => {
       if (
         node.type === 'dependency' &&
         mutableBundleGraph.getResolvedAsset(node.value)
@@ -59,7 +59,7 @@ describe('PublicMutableBundleGraph', () => {
     });
 
     assert.deepEqual(
-      internalBundleGraph.getBundles().map(b => b.publicId),
+      internalBundleGraph.getBundles().map((b) => b.publicId),
       ['8LVYC', 'd7Pd5'],
     );
   });

package/test/RequestTracker.test.js

@@ -15,7 +15,7 @@ import {toProjectPath} from '../src/projectPath';
 import {DEFAULT_FEATURE_FLAGS, setFeatureFlags} from '../../feature-flags/src';
 
 const options = DEFAULT_OPTIONS;
-const farm = new WorkerFarm({workerPath: require.resolve('../src/worker.js')});
+const farm = new WorkerFarm({workerPath: require.resolve('../src/worker')});
 
 describe('RequestTracker', () => {
   it('should not run requests that have not been invalidated', async () => {
@@ -84,7 +84,7 @@ describe('RequestTracker', () => {
     assert(
       tracker
         .getInvalidRequests()
-        .map(req => req.id)
+        .map((req) => req.id)
         .includes('abc'),
     );
   });
@@ -107,7 +107,7 @@ describe('RequestTracker', () => {
     assert(
       tracker
         .getInvalidRequests()
-        .map(req => req.id)
+        .map((req) => req.id)
         .includes('abc'),
     );
   });
@@ -186,7 +186,7 @@ describe('RequestTracker', () => {
     assert(
       tracker
         .getInvalidRequests()
-        .map(req => req.id)
+        .map((req) => req.id)
         .includes('abc'),
     );
   });
@@ -453,7 +453,7 @@ describe('RequestTracker', () => {
   });
 
   describe('respondToFSEvents', () => {
-    [true, false].forEach(value => {
+    [true, false].forEach((value) => {
       beforeEach(() => {
         setFeatureFlags({
           ...DEFAULT_FEATURE_FLAGS,
@@ -562,7 +562,8 @@ root --- node1 --- node2 ----------- orphan1 --- orphan2
 
      */
 
-    const getNonNullNodes = graph => graph.nodes.filter(node => node != null);
+    const getNonNullNodes = (graph) =>
+      graph.nodes.filter((node) => node != null);
 
     graph.addEdge(root, node1);
     graph.addEdge(node1, node2);

package/test/SymbolPropagation.test.js

@@ -191,14 +191,14 @@ function assertUsedSymbols(
     _expectedDependency.map(([from, to, sym]) => [
       from + ':' + to,
       // $FlowFixMe[invalid-tuple-index]
-      sym ? sym.map(v => [v[0], v[1] ?? [to, v[0]]]) : sym,
+      sym ? sym.map((v) => [v[0], v[1] ?? [to, v[0]]]) : sym,
     ]),
   );
 
   if (isLibrary) {
     let entryDep = nullthrows(
       [...graph.nodes.values()].find(
-        n => n?.type === 'dependency' && n.value.sourceAssetId == null,
+        (n) => n?.type === 'dependency' && n.value.sourceAssetId == null,
       ),
     );
     invariant(entryDep.type === 'dependency');
@@ -374,13 +374,13 @@ function changeDependency(
 ): Iterable<[ContentKey, Asset]> {
   let sourceAssetNode = nullthrowsAssetNode(
     [...graph.nodes.values()].find(
-      n => n?.type === 'asset' && n.value.filePath === from,
+      (n) => n?.type === 'asset' && n.value.filePath === from,
     ),
   );
   sourceAssetNode.usedSymbolsDownDirty = true;
   let depNode = nullthrowsDependencyNode(
     [...graph.nodes.values()].find(
-      n =>
+      (n) =>
         n?.type === 'dependency' &&
         n.value.sourcePath === from &&
         n.value.specifier === to,
@@ -397,7 +397,7 @@ function changeAsset(
 ): Iterable<[ContentKey, Asset]> {
   let node = nullthrowsAssetNode(
     [...graph.nodes.values()].find(
-      n => n?.type === 'asset' && n.value.filePath === asset,
+      (n) => n?.type === 'asset' && n.value.filePath === asset,
     ),
   );
   node.usedSymbolsUpDirty = true;
@@ -440,7 +440,7 @@ describe('SymbolPropagation', () => {
     );
 
     let changedAssets = [
-      ...changeDependency(graph, 'index.js', '/lib.js', symbols => {
+      ...changeDependency(graph, 'index.js', '/lib.js', (symbols) => {
         symbols.set('b', {
           local: 'b',
           isWeak: false,
@@ -480,7 +480,7 @@ describe('SymbolPropagation', () => {
     );
 
     let changedAssets = [
-      ...changeDependency(graph, 'index.js', '/lib.js', symbols => {
+      ...changeDependency(graph, 'index.js', '/lib.js', (symbols) => {
         symbols.delete('f');
         symbols.set('f2', {
           local: 'f2',
@@ -523,7 +523,7 @@ describe('SymbolPropagation', () => {
     );
 
     let changedAssets = [
-      ...changeAsset(graph, 'lib.js', symbols => {
+      ...changeAsset(graph, 'lib.js', (symbols) => {
         symbols.delete('f');
         symbols.set('f2', {
           local: 'f2',
@@ -570,7 +570,7 @@ describe('SymbolPropagation', () => {
     );
 
     let changedAssets = [
-      ...changeDependency(graph, 'index.js', '/lib.js', symbols => {
+      ...changeDependency(graph, 'index.js', '/lib.js', (symbols) => {
         symbols.set('b', {
           local: 'b',
           isWeak: false,

package/test/requests/ConfigRequest.test.js

@@ -21,7 +21,7 @@ const mockCast = (f: any): any => f;
 describe('ConfigRequest tests', () => {
   const projectRoot = 'project_root';
   const farm = new WorkerFarm({
-    workerPath: require.resolve('../../src/worker.js'),
+    workerPath: require.resolve('../../src/worker'),
     maxConcurrentWorkers: 1,
   });
   let fs = new MemoryFS(farm);
@@ -48,7 +48,7 @@ describe('ConfigRequest tests', () => {
       invalidateOnFileUpdate: sinon.spy(),
       invalidateOnOptionChange: sinon.spy(),
       invalidateOnStartup: sinon.spy(),
-      runRequest: sinon.spy(request => {
+      runRequest: sinon.spy((request) => {
         return request.run({
           api: mockRunApi,
           options,
@@ -229,10 +229,7 @@ describe('ConfigRequest tests', () => {
       invalidateOnConfigKeyChange: [
         {
           configKey: 'key1',
-          filePath: toProjectPath(
-            projectRoot,
-            path.join('project_root', 'config.json'),
-          ),
+          filePath: toProjectPath(projectRoot, 'config.json'),
         },
       ],
     });

package/test/utils.test.js

@@ -28,7 +28,7 @@ describe('getPublicId', () => {
 
   it('uses more characters if there is a collision', () => {
     assert.equal(
-      getPublicId(id, publicId =>
+      getPublicId(id, (publicId) =>
         [fullPublicId.slice(0, 5), fullPublicId.slice(0, 6)].includes(publicId),
       ),
       fullPublicId.slice(0, 7),

package/lib/atlaspack-v3/worker/compat.js

@@ -1,57 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.AssetCompat = void 0;
-var _Environment = _interopRequireDefault(require("../../public/Environment"));
-var _types = require("../../types");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-class AssetCompat {
-  // TODO: Type properly
-
-  constructor(_inner, options) {
-    this._inner = _inner;
-    // $FlowFixMe This isn't correct to flow but is enough to satisfy the runtime checks
-    this.env = new _Environment.default(_inner.env, options);
-    this._dependencies = [];
-  }
-  get id() {
-    return this._inner.id;
-  }
-  get filePath() {
-    return this._inner.filePath;
-  }
-  get type() {
-    return this._inner.type;
-  }
-  set type(value) {
-    this._inner.type = value;
-  }
-  get bundleBehavior() {
-    let bundleBehavior = this._inner.bundleBehavior;
-    return bundleBehavior == null ? null : _types.BundleBehaviorNames[bundleBehavior];
-  }
-  set bundleBehavior(bundleBehavior) {
-    this._inner.bundleBehavior = bundleBehavior ? _types.BundleBehavior[bundleBehavior] : null;
-  }
-  getCode() {
-    return Buffer.from(this._inner.code).toString();
-  }
-  setCode(code) {
-    this._inner.code = Array.from(new TextEncoder().encode(code));
-  }
-  getAST() {
-    return this._ast;
-  }
-  setAST(ast) {
-    this._ast = ast;
-  }
-  addDependency() {
-    throw new Error('[V3] Unimplemented: Asset.addDependency not yet implemented');
-  }
-  addURLDependency() {
-    throw new Error('[V3] Unimplemented: Asset.addURLDependency not yet implemented');
-  }
-}
-exports.AssetCompat = AssetCompat;

package/src/atlaspack-v3/worker/compat.js

@@ -1,82 +0,0 @@
-// @flow
-import type {PluginOptions, BundleBehavior, AST} from '@atlaspack/types';
-
-import Environment from '../../public/Environment';
-import {
-  BundleBehaviorNames,
-  BundleBehavior as BundleBehaviorMap,
-} from '../../types';
-
-export type InnerAsset = {|
-  id: string,
-  filePath: string,
-  code: Array<number>,
-  type: string,
-  bundleBehavior: number | null,
-  env: any,
-|};
-
-export class AssetCompat {
-  _inner: InnerAsset;
-  _ast: ?AST;
-  // TODO: Type properly
-  _dependencies: Array<any>;
-
-  constructor(_inner: InnerAsset, options: PluginOptions) {
-    this._inner = _inner;
-    // $FlowFixMe This isn't correct to flow but is enough to satisfy the runtime checks
-    this.env = new Environment(_inner.env, options);
-    this._dependencies = [];
-  }
-
-  get id(): string {
-    return this._inner.id;
-  }
-
-  get filePath(): string {
-    return this._inner.filePath;
-  }
-
-  get type(): string {
-    return this._inner.type;
-  }
-  set type(value: string) {
-    this._inner.type = value;
-  }
-
-  get bundleBehavior(): ?BundleBehavior {
-    let bundleBehavior = this._inner.bundleBehavior;
-    return bundleBehavior == null ? null : BundleBehaviorNames[bundleBehavior];
-  }
-  set bundleBehavior(bundleBehavior: ?BundleBehavior): void {
-    this._inner.bundleBehavior = bundleBehavior
-      ? BundleBehaviorMap[bundleBehavior]
-      : null;
-  }
-
-  getCode(): string {
-    return Buffer.from(this._inner.code).toString();
-  }
-  setCode(code: string) {
-    this._inner.code = Array.from(new TextEncoder().encode(code));
-  }
-
-  getAST(): ?AST {
-    return this._ast;
-  }
-  setAST(ast: AST) {
-    this._ast = ast;
-  }
-
-  addDependency(): string {
-    throw new Error(
-      '[V3] Unimplemented: Asset.addDependency not yet implemented',
-    );
-  }
-
-  addURLDependency(): string {
-    throw new Error(
-      '[V3] Unimplemented: Asset.addURLDependency not yet implemented',
-    );
-  }
-}

package/test/requests/WriteBundleRequest.test.js

@@ -1,132 +0,0 @@
-// @flow strict-local
-
-import {replaceStream} from '../../src/requests/WriteBundleRequest';
-import {Writable, pipeline} from 'stream';
-import {replaceHashReferences} from '@atlaspack/rust';
-import assert from 'assert';
-import {blobToStream} from '@atlaspack/utils';
-
-class BufferWritable extends Writable {
-  buffers: Buffer[];
-
-  constructor() {
-    super();
-    this.buffers = [];
-  }
-
-  getBuffer(): Buffer {
-    return Buffer.concat(this.buffers);
-  }
-
-  _write(chunk: string | Buffer, encoding: string, callback) {
-    let buffer =
-      typeof chunk === 'string'
-        ? // $FlowFixMe
-          Buffer.from(chunk, encoding)
-        : chunk;
-    this.buffers.push(buffer);
-    callback();
-  }
-}
-
-function generateSampleInput(
-  hashReferences: Map<string, string>,
-  inputSize: number,
-): Buffe {
-  let output = '';
-
-  while (output.length < inputSize) {
-    if (Math.random() < 0.1) {
-      output += 'HASH_REF_1234567890123456';
-    } else {
-      for (let i = 0; i < 16; i++) {
-        output += String.fromCharCode(97 + Math.floor(Math.random() * 26));
-      }
-    }
-  }
-
-  return Buffer.from(output);
-}
-
-async function javascriptReplaceHashReferences(
-  buffer: Buffer,
-  hashReferences: Map<string, string>,
-): Promise<Buffer> {
-  const writable = new BufferWritable();
-  const transform = replaceStream(hashReferences);
-
-  await new Promise((resolve, reject) => {
-    pipeline(blobToStream(buffer), transform, writable, err => {
-      if (err) reject(err);
-      else resolve(null);
-    });
-  });
-
-  const output = writable.getBuffer();
-  return output;
-}
-
-describe.only('replaceStream', () => {
-  const hashReferences = new Map([
-    ['HASH_REF_1234567890123456', 'HASH_REF_replacedwithstri'],
-  ]);
-  const buffer = Buffer.from(
-    'Hello HASH_REF_1234567890123456 more stuff here HASH_REF_1234567890123456',
-  );
-  const expectedOutput =
-    'Hello HASH_REF_replacedwithstri more stuff here HASH_REF_replacedwithstri';
-
-  it('javascript - replaces hash references in buffers', async () => {
-    const output = await javascriptReplaceHashReferences(
-      buffer,
-      hashReferences,
-    );
-    const outputString = output.toString();
-    assert.equal(outputString, expectedOutput);
-  });
-
-  it('rust - replaces hash references in buffers', () => {
-    const output = replaceHashReferences(
-      buffer,
-      Object.fromEntries(hashReferences.entries()),
-    );
-
-    const outputString = output.toString();
-    assert.equal(outputString, expectedOutput);
-  });
-
-  let currentInputSize = 1024 * 1024; // Start at 1MB and grow to 40MB
-  const inputSizes = [];
-  while (currentInputSize < 40 * 1024 * 1024) {
-    inputSizes.push(currentInputSize);
-    currentInputSize *= 2;
-  }
-
-  inputSizes.forEach(inputSize => {
-    describe('input size ' + inputSize / 1024 / 1024 + 'MB', () => {
-      const buffer = generateSampleInput(hashReferences, inputSize);
-      const expectedOutput = buffer
-        .toString()
-        .replace(/HASH_REF_1234567890123456/g, 'HASH_REF_replacedwithstri');
-
-      it('javascript - works on huge buffer', async () => {
-        const output = await javascriptReplaceHashReferences(
-          buffer,
-          hashReferences,
-        );
-        const outputString = output.toString();
-        assert.equal(outputString, expectedOutput);
-      });
-
-      it('rust - works on huge buffer', () => {
-        const output = replaceHashReferences(
-          buffer,
-          Object.fromEntries(hashReferences.entries()),
-        );
-
-        const outputString = output.toString();
-        assert.equal(outputString, expectedOutput);
-      });
-    });
-  });
-});