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

package/test/BundleGraph.test.js

@@ -4,11 +4,14 @@ import assert from 'assert';
 import BundleGraph from '../src/BundleGraph';
 import {DEFAULT_ENV, DEFAULT_TARGETS} from './test-utils';
 import AssetGraph, {nodeFromAssetGroup} from '../src/AssetGraph';
-import {createAsset as _createAsset} from '../src/assetUtils';
+import {
+  createAsset as _createAsset,
+  type AssetOptions,
+} from '../src/assetUtils';
 import {createDependency as _createDependency} from '../src/Dependency';
 import {toProjectPath} from '../src/projectPath';
 
-function createAsset(opts) {
+function createAsset(opts: AssetOptions) {
   return _createAsset('/', opts);
 }
 
@@ -79,7 +82,7 @@ function createMockAssetGraph(ids: [string, string]) {
 
   let dep = createDependency({
     specifier: 'path/to/index/src/main.js',
-    specifierType: 'esm',
+    specifierType: 'url',
     env: DEFAULT_ENV,
     target: DEFAULT_TARGETS[0],
   });
@@ -98,6 +101,7 @@ function createMockAssetGraph(ids: [string, string]) {
   let assets = [
     createAsset({
       id: ids[0],
+      code: null,
       filePath,
       type: 'js',
       isSource: true,
@@ -107,6 +111,7 @@ function createMockAssetGraph(ids: [string, string]) {
     }),
     createAsset({
       id: ids[1],
+      code: null,
       filePath,
       type: 'js',
       isSource: true,

package/test/Dependency.test.js

@@ -0,0 +1,21 @@
+import expect from 'expect';
+import {createDependencyId} from '../src/Dependency';
+import {createEnvironment} from '../src/Environment';
+
+describe('Dependency', () => {
+  describe('createDependencyId', () => {
+    it('should create a stable id for a dependency', () => {
+      let id1 = createDependencyId({
+        specifier: 'foo',
+        env: createEnvironment(),
+        specifierType: 'esm',
+      });
+      let id2 = createDependencyId({
+        specifier: 'foo',
+        env: createEnvironment(),
+        specifierType: 'esm',
+      });
+      expect(id1).toEqual(id2);
+    });
+  });
+});

package/test/Environment.test.js

@@ -1,12 +1,15 @@
 // @flow strict-local
 
 import assert from 'assert';
+// $FlowFixMe
+import expect from 'expect';
 import {createEnvironment} from '../src/Environment';
+import {initializeMonitoring} from '../../rust';
 
 describe('Environment', () => {
   it('assigns a default environment with nothing passed', () => {
     assert.deepEqual(createEnvironment(), {
-      id: 'c242f987e3544367',
+      id: 'd821e85f6b50315e',
       context: 'browser',
       engines: {
         browsers: ['> 0.25%'],
@@ -24,7 +27,7 @@ describe('Environment', () => {
 
   it('assigns a node context if a node engine is given', () => {
     assert.deepEqual(createEnvironment({engines: {node: '>= 10.0.0'}}), {
-      id: '69e0ab7220ee8f7a',
+      id: '2320af923a717577',
       context: 'node',
       engines: {
         node: '>= 10.0.0',
@@ -44,7 +47,7 @@ describe('Environment', () => {
     assert.deepEqual(
       createEnvironment({engines: {browsers: ['last 1 version']}}),
       {
-        id: '4b5c9005af8c5b19',
+        id: '75603271034eff15',
         context: 'browser',
         engines: {
           browsers: ['last 1 version'],
@@ -63,7 +66,7 @@ describe('Environment', () => {
 
   it('assigns default engines for node', () => {
     assert.deepEqual(createEnvironment({context: 'node'}), {
-      id: 'f7c9644283a8698f',
+      id: 'e45cc12216f7857d',
       context: 'node',
       engines: {
         node: '>= 8.0.0',
@@ -81,7 +84,7 @@ describe('Environment', () => {
 
   it('assigns default engines for browsers', () => {
     assert.deepEqual(createEnvironment({context: 'browser'}), {
-      id: 'c242f987e3544367',
+      id: 'd821e85f6b50315e',
       context: 'browser',
       engines: {
         browsers: ['> 0.25%'],
@@ -97,3 +100,11 @@ describe('Environment', () => {
     });
   });
 });
+
+describe('createEnvironment', function () {
+  it('returns a stable hash', () => {
+    initializeMonitoring();
+    const environment = createEnvironment({});
+    expect(environment.id).toEqual('d821e85f6b50315e');
+  });
+});

package/test/InternalAsset.test.js

@@ -2,12 +2,15 @@
 
 import assert from 'assert';
 import UncommittedAsset from '../src/UncommittedAsset';
-import {createAsset as _createAsset} from '../src/assetUtils';
+import {
+  createAsset as _createAsset,
+  type AssetOptions,
+} from '../src/assetUtils';
 import {createEnvironment} from '../src/Environment';
 import {DEFAULT_OPTIONS} from './test-utils';
 import {toProjectPath} from '../src/projectPath';
 
-function createAsset(opts) {
+function createAsset(opts: AssetOptions) {
   return _createAsset('/', opts);
 }
 
@@ -18,6 +21,7 @@ describe('InternalAsset', () => {
     let asset = new UncommittedAsset({
       value: createAsset({
         filePath: toProjectPath('/', '/foo/asset.js'),
+        code: null,
         env: createEnvironment(),
         stats,
         type: 'js',
@@ -37,6 +41,7 @@ describe('InternalAsset', () => {
     let asset = new UncommittedAsset({
       value: createAsset({
         filePath: toProjectPath('/', '/foo/asset.js'),
+        code: null,
         env: createEnvironment(),
         stats,
         type: 'js',
@@ -56,6 +61,7 @@ describe('InternalAsset', () => {
     let asset = new UncommittedAsset({
       value: createAsset({
         filePath: toProjectPath('/', '/foo/asset.js'),
+        code: null,
         env: createEnvironment(),
         stats,
         type: 'js',

package/test/PublicAsset.test.js

@@ -3,12 +3,15 @@
 import assert from 'assert';
 import {Asset, MutableAsset} from '../src/public/Asset';
 import UncommittedAsset from '../src/UncommittedAsset';
-import {createAsset as _createAsset} from '../src/assetUtils';
+import {
+  createAsset as _createAsset,
+  type AssetOptions,
+} from '../src/assetUtils';
 import {createEnvironment} from '../src/Environment';
 import {DEFAULT_OPTIONS} from './test-utils';
 import {toProjectPath} from '../src/projectPath';
 
-function createAsset(opts) {
+function createAsset(opts: AssetOptions) {
   return _createAsset('/', opts);
 }
 
@@ -19,6 +22,7 @@ describe('Public Asset', () => {
       options: DEFAULT_OPTIONS,
       value: createAsset({
         filePath: toProjectPath('/', '/does/not/exist'),
+        code: null,
         type: 'js',
         env: createEnvironment({}),
         isSource: true,

package/test/PublicBundle.test.js

@@ -42,6 +42,7 @@ describe('Public Bundle', () => {
       assetPublicIds: new Set(),
       publicIdByAssetId: new Map(),
       bundleContentHashes: new Map(),
+      conditions: new Map(),
     });
   });
 

package/test/PublicMutableBundleGraph.test.js

@@ -8,12 +8,15 @@ import InternalBundleGraph from '../src/BundleGraph';
 import MutableBundleGraph from '../src/public/MutableBundleGraph';
 import {DEFAULT_ENV, DEFAULT_TARGETS, DEFAULT_OPTIONS} from './test-utils';
 import AssetGraph, {nodeFromAssetGroup} from '../src/AssetGraph';
-import {createAsset as _createAsset} from '../src/assetUtils';
+import {
+  createAsset as _createAsset,
+  type AssetOptions,
+} from '../src/assetUtils';
 import {createDependency as _createDependency} from '../src/Dependency';
 import nullthrows from 'nullthrows';
 import {toProjectPath} from '../src/projectPath';
 
-function createAsset(opts) {
+function createAsset(opts: AssetOptions) {
   return _createAsset('/', opts);
 }
 
@@ -139,14 +142,14 @@ function createMockAssetGraph() {
 
   let dep1 = createDependency({
     specifier: 'path/to/index/src/main.js',
-    specifierType: 'esm',
+    specifierType: 'url',
     needsStableName: true,
     env: DEFAULT_ENV,
     target: DEFAULT_TARGETS[0],
   });
   let dep2 = createDependency({
     specifier: 'path/to/index/src/main2.js',
-    specifierType: 'esm',
+    specifierType: 'url',
     needsStableName: true,
     env: DEFAULT_ENV,
     target: DEFAULT_TARGETS[0],
@@ -160,6 +163,7 @@ function createMockAssetGraph() {
     [
       createAsset({
         id: id1,
+        code: null,
         filePath,
         type: 'js',
         isSource: true,
@@ -178,6 +182,7 @@ function createMockAssetGraph() {
     [
       createAsset({
         id: id2,
+        code: null,
         filePath,
         type: 'js',
         isSource: true,

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'],