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

package/test/RequestTracker.test.js

@@ -2,11 +2,17 @@
 
 import assert from 'assert';
 import nullthrows from 'nullthrows';
-import RequestTracker, {type RunAPI} from '../src/RequestTracker';
+import RequestTracker, {
+  type RunAPI,
+  cleanUpOrphans,
+} from '../src/RequestTracker';
+import {Graph} from '@atlaspack/graph';
 import WorkerFarm from '@atlaspack/workers';
 import {DEFAULT_OPTIONS} from './test-utils';
-import {INITIAL_BUILD} from '../src/constants';
+import {FILE_CREATE, FILE_UPDATE, INITIAL_BUILD} from '../src/constants';
 import {makeDeferredWithPromise} from '@atlaspack/utils';
+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')});
@@ -445,4 +451,135 @@ describe('RequestTracker', () => {
 
     assert.equal(tracker.graph.getNode(nodeId)?.invalidateReason, 1);
   });
+
+  describe('respondToFSEvents', () => {
+    [true, false].forEach(value => {
+      beforeEach(() => {
+        setFeatureFlags({
+          ...DEFAULT_FEATURE_FLAGS,
+          fixQuadraticCacheInvalidation: value === true ? 'NEW' : 'OLD',
+        });
+      });
+
+      afterEach(() => {
+        setFeatureFlags({
+          ...DEFAULT_FEATURE_FLAGS,
+        });
+      });
+
+      describe(`optimizations feature-flag ${String(value)}`, () => {
+        it('should invalidate file requests on file changes', async () => {
+          let tracker = new RequestTracker({farm, options});
+          await tracker.runRequest({
+            id: 'abc',
+            type: 7,
+            // $FlowFixMe string isn't a valid result
+            run: async ({api}: {api: RunAPI<string | void>, ...}) => {
+              api.invalidateOnFileUpdate(toProjectPath('', 'my-file'));
+              let result = await Promise.resolve('hello');
+              api.storeResult(result);
+            },
+            input: null,
+          });
+          const requestId = tracker.graph.getNodeIdByContentKey('abc');
+          const invalidated = await tracker.respondToFSEvents(
+            [
+              {
+                type: 'update',
+                path: 'my-file',
+              },
+            ],
+            Number.MAX_VALUE,
+          );
+          assert.equal(invalidated, true);
+          assert.equal(
+            tracker.graph.getNode(requestId)?.invalidateReason,
+            FILE_UPDATE,
+          );
+          assert.deepEqual(Array.from(tracker.graph.invalidNodeIds), [
+            requestId,
+          ]);
+        });
+
+        it('should invalidate file name requests with invalidate above invalidations', async () => {
+          let tracker = new RequestTracker({farm, options});
+          await tracker.runRequest({
+            id: 'abc',
+            type: 7,
+            // $FlowFixMe string isn't a valid result
+            run: async ({api}: {api: RunAPI<string | void>, ...}) => {
+              api.invalidateOnFileCreate({
+                fileName: 'package.json',
+                aboveFilePath: toProjectPath(
+                  '',
+                  './node_modules/something/package.json',
+                ),
+              });
+              let result = await Promise.resolve('hello');
+              api.storeResult(result);
+            },
+            input: null,
+          });
+          const requestId = tracker.graph.getNodeIdByContentKey('abc');
+          const invalidated = await tracker.respondToFSEvents(
+            [
+              {
+                type: 'create',
+                path: './package.json',
+              },
+            ],
+            Number.MAX_VALUE,
+          );
+          assert.equal(invalidated, true);
+          assert.equal(
+            tracker.graph.getNode(requestId)?.invalidateReason,
+            FILE_CREATE,
+          );
+          assert.deepEqual(Array.from(tracker.graph.invalidNodeIds), [
+            requestId,
+          ]);
+        });
+      });
+    });
+  });
+});
+
+describe('cleanUpOrphans', () => {
+  it('cleans-up unreachable nodes', () => {
+    const graph: Graph<string, number> = new Graph();
+    const root = graph.addNode('root');
+    graph.setRootNodeId(root);
+    const node1 = graph.addNode('node1');
+    const node2 = graph.addNode('node2');
+    const node3 = graph.addNode('node3');
+    const orphan1 = graph.addNode('orphan1');
+    const orphan2 = graph.addNode('orphan2');
+
+    /*
+
+root --- node1 --- node2 ----------- orphan1 --- orphan2
+     \---- node3          (^ remove)
+
+     */
+
+    const getNonNullNodes = graph => graph.nodes.filter(node => node != null);
+
+    graph.addEdge(root, node1);
+    graph.addEdge(node1, node2);
+    graph.addEdge(node2, orphan1);
+    graph.addEdge(orphan1, orphan2);
+    graph.addEdge(root, node3);
+
+    assert.deepEqual(cleanUpOrphans(graph), []);
+    assert.equal(getNonNullNodes(graph).length, 6);
+    assert.equal(Array.from(graph.getAllEdges()).length, 5);
+
+    graph.removeEdge(node2, orphan1, 1, false);
+    assert.equal(getNonNullNodes(graph).length, 6);
+    assert.equal(Array.from(graph.getAllEdges()).length, 4);
+
+    assert.deepEqual(cleanUpOrphans(graph), [orphan1, orphan2]);
+    assert.equal(getNonNullNodes(graph).length, 4);
+    assert.equal(Array.from(graph.getAllEdges()).length, 3);
+  });
 });

package/test/SymbolPropagation.test.js

@@ -128,6 +128,7 @@ function createAssetGraph(
     let asset = nodeFromAsset(
       createAsset({
         id: String(assetId),
+        code: null,
         filePath: toProjectPath(filePath),
         type: 'js',
         isSource: true,

package/test/TargetRequest.test.js

@@ -125,7 +125,7 @@ describe('TargetResolver', () => {
           publicUrl: '/',
           distDir: normalizeSeparators(path.resolve('customA')),
           env: {
-            id: '1d40417b63734b32',
+            id: 'd821e85f6b50315e',
             context: 'browser',
             includeNodeModules: true,
             engines: {
@@ -146,7 +146,7 @@ describe('TargetResolver', () => {
           distEntry: 'b.js',
           distDir: normalizeSeparators(path.resolve('customB')),
           env: {
-            id: '928f0d1c941b2e57',
+            id: 'e45cc12216f7857d',
             context: 'node',
             includeNodeModules: false,
             engines: {
@@ -177,7 +177,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: 'b552bd32da37fa8b',
+            id: 'f628a18b9d37974c',
             context: 'node',
             engines: {
               node: '>= 8.0.0',
@@ -211,7 +211,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: '8804e4eb97e2703e',
+            id: 'f9afb61b20ba7ecf',
             context: 'browser',
             engines: {
               browsers: ['last 1 version'],
@@ -247,7 +247,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/assets',
           env: {
-            id: 'a7ed3e73c53f1923',
+            id: '7c0fe07c8a3a38da',
             context: 'browser',
             engines: {
               browsers: ['last 1 version'],
@@ -293,7 +293,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: 'f7c9644283a8698f',
+            id: 'e45cc12216f7857d',
             context: 'node',
             engines: {
               node: '>= 8.0.0',
@@ -336,7 +336,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: 'b552bd32da37fa8b',
+            id: 'f628a18b9d37974c',
             context: 'node',
             engines: {
               node: '>= 8.0.0',
@@ -370,7 +370,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: '1f28e9ceaf633d83',
+            id: '75603271034eff15',
             context: 'browser',
             engines: {
               browsers: ['last 1 version'],
@@ -404,7 +404,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: '767bf6e6b675c4f3',
+            id: 'a8f05066473f62d0',
             context: 'browser',
             engines: {
               browsers: ['ie11'],
@@ -455,7 +455,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: 'b552bd32da37fa8b',
+            id: 'f628a18b9d37974c',
             context: 'node',
             engines: {
               node: '>= 8.0.0',
@@ -489,7 +489,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: 'ed7c0e65adee71c9',
+            id: '8a530881a691863e',
             context: 'browser',
             engines: {
               browsers: ['last 1 version'],
@@ -523,7 +523,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: 'f7692543e59e4c0a',
+            id: '4dcd5bfb2f44e1a0',
             context: 'browser',
             engines: {
               browsers: ['ie11'],
@@ -566,7 +566,7 @@ describe('TargetResolver', () => {
           distEntry: undefined,
           publicUrl: 'www',
           env: {
-            id: 'ddb6ac7c9a3a9178',
+            id: '073545c36b2ddaab',
             context: 'browser',
             engines: {
               browsers: '> 0.25%',
@@ -621,7 +621,7 @@ describe('TargetResolver', () => {
           distDir: normalizeSeparators(path.resolve('customB')),
           publicUrl: '/',
           env: {
-            id: '1d40417b63734b32',
+            id: 'd821e85f6b50315e',
             context: 'browser',
             engines: {
               browsers: ['> 0.25%'],
@@ -663,7 +663,7 @@ describe('TargetResolver', () => {
           distDir: normalizeSeparators(path.resolve('customA')),
           publicUrl: '/',
           env: {
-            id: '1d40417b63734b32',
+            id: 'd821e85f6b50315e',
             context: 'browser',
             engines: {
               browsers: ['> 0.25%'],
@@ -692,7 +692,7 @@ describe('TargetResolver', () => {
         distEntry: 'index.js',
         publicUrl: '/',
         env: {
-          id: '6aafdb9eaa4a3812',
+          id: '4d60aebb4fbb9f8b',
           context: 'node',
           engines: {
             browsers: [
@@ -1070,7 +1070,7 @@ describe('TargetResolver', () => {
         distEntry: 'index.mjs',
         publicUrl: '/',
         env: {
-          id: '439701173a9199ea',
+          id: 'fb14362a83d338f6',
           context: 'browser',
           engines: {
             browsers: [
@@ -1115,7 +1115,7 @@ describe('TargetResolver', () => {
         distEntry: 'index.js',
         publicUrl: '/',
         env: {
-          id: '439701173a9199ea',
+          id: 'fb14362a83d338f6',
           context: 'browser',
           engines: {
             browsers: [
@@ -1164,7 +1164,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/',
           env: {
-            id: 'b552bd32da37fa8b',
+            id: 'f628a18b9d37974c',
             context: 'node',
             engines: {
               node: '>= 8.0.0',
@@ -1198,7 +1198,7 @@ describe('TargetResolver', () => {
           distEntry: 'index.js',
           publicUrl: '/assets',
           env: {
-            id: 'a7ed3e73c53f1923',
+            id: '7c0fe07c8a3a38da',
             context: 'browser',
             engines: {
               browsers: ['last 1 version'],
@@ -1246,7 +1246,7 @@ describe('TargetResolver', () => {
           distDir: serveDistDir,
           publicUrl: '/',
           env: {
-            id: 'd6ea1d42532a7575',
+            id: '858b9b5a5dca37d4',
             context: 'browser',
             engines: {
               browsers: [
@@ -1283,7 +1283,7 @@ describe('TargetResolver', () => {
           ),
           publicUrl: '/',
           env: {
-            id: 'a9c07d094d038c73',
+            id: '8f31176c88184c4f',
             context: 'browser',
             engines: {
               browsers: ['Chrome 80'],
@@ -1316,7 +1316,7 @@ describe('TargetResolver', () => {
           distEntry: undefined,
           publicUrl: '/',
           env: {
-            id: 'a9c07d094d038c73',
+            id: '8f31176c88184c4f',
             context: 'browser',
             engines: {
               browsers: ['Chrome 80'],
@@ -1366,7 +1366,7 @@ describe('TargetResolver', () => {
           distEntry: undefined,
           publicUrl: '/',
           env: {
-            id: '1f28e9ceaf633d83',
+            id: '75603271034eff15',
             context: 'browser',
             engines: {
               browsers: ['last 1 version'],
@@ -1406,7 +1406,7 @@ describe('TargetResolver', () => {
           distEntry: undefined,
           publicUrl: '/',
           env: {
-            id: '824e113c03cab3c8',
+            id: 'd5ff950a2c05db56',
             context: 'browser',
             engines: {
               browsers: ['IE 11'],

package/test/requests/WriteBundleRequest.test.js

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

package/lib/atlaspack-v3/plugins/Resolver.js

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ResolverNapi = void 0;
-class ResolverNapi {
-  constructor() {}
-  loadConfig() {}
-  resolve() {}
-}
-exports.ResolverNapi = ResolverNapi;

package/lib/atlaspack-v3/plugins/index.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _Resolver = require("./Resolver");
-Object.keys(_Resolver).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _Resolver[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _Resolver[key];
-    }
-  });
-});

package/src/atlaspack-v3/plugins/Resolver.js

@@ -1,9 +0,0 @@
-// @flow
-
-export class ResolverNapi {
-  constructor() {}
-
-  loadConfig() {}
-
-  resolve() {}
-}

package/src/atlaspack-v3/plugins/index.js

@@ -1,3 +0,0 @@
-// @flow
-
-export * from './Resolver';