@atlaspack/core 2.12.1-canary.3573 → 2.12.1-canary.3575

package/lib/RequestTracker.js

@@ -924,11 +924,17 @@ class RequestTracker {
     if (this.options.shouldDisableCache) {
       return;
     }
+    let total = 0;
+    (0, _ReporterRunner.report)({
+      type: 'cache',
+      phase: 'start',
+      total,
+      size: this.graph.nodes.length
+    });
     let serialisedGraph = this.graph.serialize();
 
     // Delete an existing request graph cache, to prevent invalid states
     await this.options.cache.deleteLargeBlob(requestGraphKey);
-    let total = 0;
     const serialiseAndSet = async (key, contents) => {
       if (signal !== null && signal !== void 0 && signal.aborted) {
         throw new Error('Serialization was aborted');
@@ -947,12 +953,6 @@ class RequestTracker {
     let queue = new (_utils().PromiseQueue)({
       maxConcurrent: 32
     });
-    (0, _ReporterRunner.report)({
-      type: 'cache',
-      phase: 'start',
-      total,
-      size: this.graph.nodes.length
-    });
 
     // Preallocating a sparse array is faster than pushing when N is high enough
     let cacheableNodes = new Array(serialisedGraph.nodes.length);

package/lib/requests/AssetGraphRequestRust.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createAssetGraphRequestRust = createAssetGraphRequestRust;
+exports.getAssetGraph = getAssetGraph;
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
   _assert = function () {
@@ -65,6 +66,8 @@ function createAssetGraphRequestRust(rustAtlaspack) {
     input
   });
 }
+
+// $FlowFixMe
 function getAssetGraph(serializedGraph) {
   let graph = new _AssetGraph.default({
     _contentKeyToNodeId: new Map(),
@@ -96,7 +99,6 @@ function getAssetGraph(serializedGraph) {
   }
 
   // See crates/atlaspack_core/src/types/environment.rs
-  let cachedAssets = new Map();
   let changedAssets = new Map();
   let entry = 0;
   let envs = new Map();
@@ -109,7 +111,6 @@ function getAssetGraph(serializedGraph) {
     }
     return envId;
   };
-  const dependencyMap = new Map();
   for (let node of serializedGraph.nodes) {
     if (node.type === 'root') {
       let index = graph.addNodeByContentKey('@@root', {
@@ -128,24 +129,20 @@ function getAssetGraph(serializedGraph) {
     } else if (node.type === 'asset') {
       let asset = node.value;
       let id = asset.id;
-      let deps = dependencyMap.get(id);
-      if (!deps) {
-        deps = new Map();
-        dependencyMap.set(id, deps);
-      }
       asset.committed = true;
       asset.contentKey = id;
-      asset.dependencies = deps;
       asset.env.id = getEnvId(asset.env);
       asset.mapKey = `map:${asset.id}`;
 
+      // This is populated later when we map the edges between assets and dependencies
+      asset.dependencies = new Map();
+
       // We need to add this property for source map handling, as some assets like runtimes
       // are processed after the Rust transformation and take the v2 code path
       asset.meta.isV3 = true;
       if (asset.symbols != null) {
         asset.symbols = new Map(asset.symbols.map(mapSymbols));
       }
-      cachedAssets.set(id, asset.code);
       changedAssets.set(id, asset);
       graph.addNodeByContentKey(id, {
         id,
@@ -158,12 +155,6 @@ function getAssetGraph(serializedGraph) {
     } else if (node.type === 'dependency') {
       let id = node.value.id;
       let dependency = node.value.dependency;
-      let deps = dependencyMap.get(dependency.sourceAssetId);
-      if (!deps) {
-        deps = new Map();
-        dependencyMap.set(dependency.sourceAssetId, deps);
-      }
-      deps.set(id, dependency);
       dependency.id = id;
       dependency.env.id = getEnvId(dependency.env);
       if (dependency.symbols != null) {
@@ -195,8 +186,8 @@ function getAssetGraph(serializedGraph) {
     let from = serializedGraph.edges[i];
     let to = serializedGraph.edges[i + 1];
     let fromNode = graph.getNode(from);
+    let toNode = graph.getNode(to);
     if ((fromNode === null || fromNode === void 0 ? void 0 : fromNode.type) === 'dependency') {
-      let toNode = graph.getNode(to);
       (0, _assert().default)((toNode === null || toNode === void 0 ? void 0 : toNode.type) === 'asset');
 
       // For backwards compatibility, create asset group node if needed.
@@ -209,13 +200,15 @@ function getAssetGraph(serializedGraph) {
       let index = graph.addNodeByContentKeyIfNeeded(assetGroupNode.id, assetGroupNode);
       graph.addEdge(from, index);
       graph.addEdge(index, to);
+    } else if ((fromNode === null || fromNode === void 0 ? void 0 : fromNode.type) === 'asset' && (toNode === null || toNode === void 0 ? void 0 : toNode.type) === 'dependency') {
+      fromNode.value.dependencies.set(toNode.value.id, toNode.value);
+      graph.addEdge(from, to);
     } else {
       graph.addEdge(from, to);
     }
   }
   return {
     assetGraph: graph,
-    cachedAssets,
     changedAssets
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3573+4e1e11e5e",
+  "version": "2.12.1-canary.3575+019613744",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,21 +20,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/cache": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/diagnostic": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/events": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/feature-flags": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/fs": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/graph": "3.2.1-canary.3573+4e1e11e5e",
-    "@atlaspack/logger": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/package-manager": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/plugin": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/profiler": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/rust": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/types": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/utils": "2.12.1-canary.3573+4e1e11e5e",
-    "@atlaspack/workers": "2.12.1-canary.3573+4e1e11e5e",
+    "@atlaspack/build-cache": "2.12.1-canary.3575+019613744",
+    "@atlaspack/cache": "2.12.1-canary.3575+019613744",
+    "@atlaspack/diagnostic": "2.12.1-canary.3575+019613744",
+    "@atlaspack/events": "2.12.1-canary.3575+019613744",
+    "@atlaspack/feature-flags": "2.12.1-canary.3575+019613744",
+    "@atlaspack/fs": "2.12.1-canary.3575+019613744",
+    "@atlaspack/graph": "3.2.1-canary.3575+019613744",
+    "@atlaspack/logger": "2.12.1-canary.3575+019613744",
+    "@atlaspack/package-manager": "2.12.1-canary.3575+019613744",
+    "@atlaspack/plugin": "2.12.1-canary.3575+019613744",
+    "@atlaspack/profiler": "2.12.1-canary.3575+019613744",
+    "@atlaspack/rust": "2.12.1-canary.3575+019613744",
+    "@atlaspack/types": "2.12.1-canary.3575+019613744",
+    "@atlaspack/utils": "2.12.1-canary.3575+019613744",
+    "@atlaspack/workers": "2.12.1-canary.3575+019613744",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -66,5 +66,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "4e1e11e5ea800f076e130249ff1f05ff7327c823"
+  "gitHead": "019613744ac9f1cf3b3298542f90573b74dc32f9"
 }

package/src/RequestTracker.js

@@ -1457,12 +1457,19 @@ export default class RequestTracker {
       return;
     }
 
+    let total = 0;
+    report({
+      type: 'cache',
+      phase: 'start',
+      total,
+      size: this.graph.nodes.length,
+    });
+
     let serialisedGraph = this.graph.serialize();
 
     // Delete an existing request graph cache, to prevent invalid states
     await this.options.cache.deleteLargeBlob(requestGraphKey);
 
-    let total = 0;
     const serialiseAndSet = async (
       key: string,
       // $FlowFixMe serialise input is any type
@@ -1496,13 +1503,6 @@ export default class RequestTracker {
       maxConcurrent: 32,
     });
 
-    report({
-      type: 'cache',
-      phase: 'start',
-      total,
-      size: this.graph.nodes.length,
-    });
-
     // Preallocating a sparse array is faster than pushing when N is high enough
     let cacheableNodes = new Array(serialisedGraph.nodes.length);
     for (let i = 0; i < serialisedGraph.nodes.length; i += 1) {

package/src/requests/AssetGraphRequestRust.js

@@ -9,7 +9,7 @@ import AssetGraph, {nodeFromAssetGroup} from '../AssetGraph';
 import type {AtlaspackV3} from '../atlaspack-v3';
 import {requestTypes, type StaticRunOpts} from '../RequestTracker';
 import {propagateSymbols} from '../SymbolPropagation';
-import type {Environment} from '../types';
+import type {Environment, Asset} from '../types';
 
 import type {
   AssetGraphRequestInput,
@@ -78,7 +78,11 @@ export function createAssetGraphRequestRust(
   });
 }
 
-function getAssetGraph(serializedGraph) {
+// $FlowFixMe
+export function getAssetGraph(serializedGraph: any): {
+  assetGraph: AssetGraph,
+  changedAssets: Map<string, Asset>,
+} {
   let graph = new AssetGraph({
     _contentKeyToNodeId: new Map(),
     _nodeIdToContentKey: new Map(),
@@ -111,7 +115,6 @@ function getAssetGraph(serializedGraph) {
   }
 
   // See crates/atlaspack_core/src/types/environment.rs
-  let cachedAssets = new Map();
   let changedAssets = new Map();
   let entry = 0;
 
@@ -140,8 +143,6 @@ function getAssetGraph(serializedGraph) {
     return envId;
   };
 
-  const dependencyMap = new Map();
-
   for (let node of serializedGraph.nodes) {
     if (node.type === 'root') {
       let index = graph.addNodeByContentKey('@@root', {
@@ -163,18 +164,14 @@ function getAssetGraph(serializedGraph) {
       let asset = node.value;
       let id = asset.id;
 
-      let deps = dependencyMap.get(id);
-      if (!deps) {
-        deps = new Map();
-        dependencyMap.set(id, deps);
-      }
-
       asset.committed = true;
       asset.contentKey = id;
-      asset.dependencies = deps;
       asset.env.id = getEnvId(asset.env);
       asset.mapKey = `map:${asset.id}`;
 
+      // This is populated later when we map the edges between assets and dependencies
+      asset.dependencies = new Map();
+
       // We need to add this property for source map handling, as some assets like runtimes
       // are processed after the Rust transformation and take the v2 code path
       asset.meta.isV3 = true;
@@ -183,7 +180,6 @@ function getAssetGraph(serializedGraph) {
         asset.symbols = new Map(asset.symbols.map(mapSymbols));
       }
 
-      cachedAssets.set(id, asset.code);
       changedAssets.set(id, asset);
 
       graph.addNodeByContentKey(id, {
@@ -198,13 +194,6 @@ function getAssetGraph(serializedGraph) {
       let id = node.value.id;
       let dependency = node.value.dependency;
 
-      let deps = dependencyMap.get(dependency.sourceAssetId);
-      if (!deps) {
-        deps = new Map();
-        dependencyMap.set(dependency.sourceAssetId, deps);
-      }
-      deps.set(id, dependency);
-
       dependency.id = id;
       dependency.env.id = getEnvId(dependency.env);
 
@@ -239,8 +228,9 @@ function getAssetGraph(serializedGraph) {
     let from = serializedGraph.edges[i];
     let to = serializedGraph.edges[i + 1];
     let fromNode = graph.getNode(from);
+    let toNode = graph.getNode(to);
+
     if (fromNode?.type === 'dependency') {
-      let toNode = graph.getNode(to);
       invariant(toNode?.type === 'asset');
 
       // For backwards compatibility, create asset group node if needed.
@@ -258,6 +248,9 @@ function getAssetGraph(serializedGraph) {
 
       graph.addEdge(from, index);
       graph.addEdge(index, to);
+    } else if (fromNode?.type === 'asset' && toNode?.type === 'dependency') {
+      fromNode.value.dependencies.set(toNode.value.id, toNode.value);
+      graph.addEdge(from, to);
     } else {
       graph.addEdge(from, to);
     }
@@ -265,7 +258,6 @@ function getAssetGraph(serializedGraph) {
 
   return {
     assetGraph: graph,
-    cachedAssets,
     changedAssets,
   };
 }

package/test/requests/AssetGraphRequestRust.test.js

@@ -0,0 +1,410 @@
+import assert from 'assert';
+import {getAssetGraph} from '../../src/requests/AssetGraphRequestRust';
+
+describe('AssetGraphRequestRust -> getAssetGraph', function () {
+  it('should create a valid AssetGraph', () => {
+    const {assetGraph} = getAssetGraph(getSerializedGraph());
+
+    const indexAsset = assetGraph.getNodeByContentKey('79c128d4f549c408');
+    const libraryDep = assetGraph.getNodeByContentKey('cfe74f65a41af1a7');
+
+    assert(indexAsset?.type === 'asset');
+    assert(libraryDep?.type === 'dependency');
+
+    assert.equal(indexAsset.value.filePath, '/index.ts');
+    assert.equal(libraryDep.value.specifier, './library');
+    assert.deepEqual(
+      indexAsset.value.dependencies.get('cfe74f65a41af1a7')?.specifier,
+      './library',
+    );
+
+    const indexAssetNodeId =
+      assetGraph.getNodeIdByContentKey('79c128d4f549c408');
+    const libraryDepNodeId =
+      assetGraph.getNodeIdByContentKey('cfe74f65a41af1a7');
+    assert.deepEqual(assetGraph.getNodeIdsConnectedFrom(indexAssetNodeId), [
+      libraryDepNodeId,
+    ]);
+  });
+});
+
+function getSerializedGraph() {
+  return {
+    edges: [0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6],
+    nodes: [
+      {
+        type: 'root',
+      },
+      {
+        type: 'dependency',
+        value: {
+          id: 'b01a088f112fa82f',
+          dependency: {
+            bundleBehavior: null,
+            env: {
+              context: 'browser',
+              engines: {
+                browsers: [
+                  'last 1 Chrome version',
+                  'last 1 Safari version',
+                  'last 1 Firefox version',
+                  'last 1 Edge version',
+                ],
+              },
+              includeNodeModules: true,
+              isLibrary: false,
+              loc: null,
+              outputFormat: 'global',
+              shouldScopeHoist: true,
+              shouldOptimize: false,
+              sourceMap: {},
+              sourceType: 'module',
+            },
+            loc: null,
+            meta: {},
+            pipeline: null,
+            priority: 0,
+            range: null,
+            resolveFrom: null,
+            sourceAssetId: null,
+            sourcePath: null,
+            specifier: '/index.html',
+            specifierType: 2,
+            symbols: null,
+            target: {
+              distDir: '/dist',
+              distEntry: null,
+              env: {
+                context: 'browser',
+                engines: {
+                  browsers: [
+                    'last 1 Chrome version',
+                    'last 1 Safari version',
+                    'last 1 Firefox version',
+                    'last 1 Edge version',
+                  ],
+                },
+                includeNodeModules: true,
+                isLibrary: false,
+                loc: null,
+                outputFormat: 'global',
+                shouldScopeHoist: true,
+                shouldOptimize: false,
+                sourceMap: {},
+                sourceType: 'module',
+              },
+              loc: null,
+              name: 'default',
+              publicUrl: '/',
+            },
+            isEntry: true,
+            isOptional: false,
+            needsStableName: true,
+            shouldWrap: false,
+            isEsm: false,
+            placeholder: null,
+          },
+        },
+        has_deferred: false,
+      },
+      {
+        type: 'asset',
+        value: {
+          id: 'e2056518260d7dc7',
+          bundleBehavior: 1,
+          env: {
+            context: 'browser',
+            engines: {
+              browsers: [
+                'last 1 Chrome version',
+                'last 1 Safari version',
+                'last 1 Firefox version',
+                'last 1 Edge version',
+              ],
+            },
+            includeNodeModules: true,
+            isLibrary: false,
+            loc: null,
+            outputFormat: 'global',
+            shouldScopeHoist: true,
+            shouldOptimize: false,
+            sourceMap: {},
+            sourceType: 'module',
+          },
+          filePath: '/index.html',
+          type: 'html',
+          meta: {},
+          pipeline: null,
+          query: null,
+          stats: {
+            size: 93,
+            time: 2,
+          },
+          symbols: null,
+          sideEffects: true,
+          isBundleSplittable: true,
+          isSource: true,
+          hasCjsExports: false,
+          staticExports: false,
+          shouldWrap: false,
+          hasNodeReplacements: false,
+          isConstantModule: false,
+          conditions: [],
+          configPath: null,
+          configKeyPath: null,
+        },
+      },
+      {
+        type: 'dependency',
+        value: {
+          id: 'aece0f57a78d1ef8',
+          dependency: {
+            bundleBehavior: null,
+            env: {
+              context: 'browser',
+              engines: {
+                browsers: [
+                  'last 1 Chrome version',
+                  'last 1 Safari version',
+                  'last 1 Firefox version',
+                  'last 1 Edge version',
+                ],
+              },
+              includeNodeModules: true,
+              isLibrary: false,
+              loc: null,
+              outputFormat: 'esmodule',
+              shouldScopeHoist: true,
+              shouldOptimize: false,
+              sourceMap: {},
+              sourceType: 'module',
+            },
+            loc: null,
+            meta: {},
+            pipeline: null,
+            priority: 1,
+            range: null,
+            resolveFrom: null,
+            sourceAssetId: 'e2056518260d7dc7',
+            sourcePath: '/index.html',
+            specifier: './index.ts',
+            specifierType: 2,
+            sourceAssetType: 'html',
+            symbols: null,
+            target: null,
+            isEntry: false,
+            isOptional: false,
+            needsStableName: false,
+            shouldWrap: false,
+            isEsm: true,
+            placeholder: null,
+          },
+        },
+        has_deferred: false,
+      },
+      {
+        type: 'asset',
+        value: {
+          id: '79c128d4f549c408',
+          bundleBehavior: null,
+          env: {
+            context: 'browser',
+            engines: {
+              browsers: [
+                'last 1 Chrome version',
+                'last 1 Safari version',
+                'last 1 Firefox version',
+                'last 1 Edge version',
+              ],
+            },
+            includeNodeModules: true,
+            isLibrary: false,
+            loc: null,
+            outputFormat: 'esmodule',
+            shouldScopeHoist: true,
+            shouldOptimize: false,
+            sourceMap: {},
+            sourceType: 'module',
+          },
+          filePath: '/index.ts',
+          type: 'js',
+          meta: {
+            hasCJSExports: false,
+            staticExports: true,
+            shouldWrap: false,
+            id: 'cc346b5b74d3d478',
+          },
+          pipeline: null,
+          query: null,
+          stats: {
+            size: 121,
+            time: 39,
+          },
+          symbols: [],
+          sideEffects: true,
+          isBundleSplittable: true,
+          isSource: true,
+          hasCjsExports: false,
+          staticExports: true,
+          shouldWrap: false,
+          hasNodeReplacements: false,
+          isConstantModule: false,
+          conditions: [],
+          configPath: null,
+          configKeyPath: null,
+        },
+      },
+      {
+        type: 'dependency',
+        value: {
+          id: 'cfe74f65a41af1a7',
+          dependency: {
+            bundleBehavior: null,
+            env: {
+              context: 'browser',
+              engines: {
+                browsers: [
+                  'last 1 Chrome version',
+                  'last 1 Safari version',
+                  'last 1 Firefox version',
+                  'last 1 Edge version',
+                ],
+              },
+              includeNodeModules: true,
+              isLibrary: false,
+              loc: null,
+              outputFormat: 'esmodule',
+              shouldScopeHoist: true,
+              shouldOptimize: false,
+              sourceMap: {},
+              sourceType: 'module',
+            },
+            loc: {
+              filePath: '/index.ts',
+              start: {
+                line: 1,
+                column: 21,
+              },
+              end: {
+                line: 1,
+                column: 32,
+              },
+            },
+            meta: {
+              kind: 'Import',
+            },
+            pipeline: null,
+            priority: 0,
+            range: null,
+            resolveFrom: null,
+            sourceAssetId: 'cc346b5b74d3d478',
+            sourcePath: '/index.ts',
+            specifier: './library',
+            specifierType: 0,
+            sourceAssetType: 'ts',
+            symbols: [
+              {
+                local:
+                  '$cc346b5b74d3d478$import$b83d1a328c413a1a$2e2bcd8739ae039',
+                exported: 'default',
+                loc: {
+                  filePath: '/index.ts',
+                  start: {
+                    line: 1,
+                    column: 8,
+                  },
+                  end: {
+                    line: 1,
+                    column: 15,
+                  },
+                },
+                isWeak: false,
+                isEsmExport: false,
+                selfReferenced: false,
+              },
+            ],
+            target: null,
+            isEntry: false,
+            isOptional: false,
+            needsStableName: false,
+            shouldWrap: false,
+            isEsm: true,
+            placeholder: null,
+          },
+        },
+        has_deferred: false,
+      },
+      {
+        type: 'asset',
+        value: {
+          id: '13fc7969eb974fe3',
+          bundleBehavior: null,
+          env: {
+            context: 'browser',
+            engines: {
+              browsers: [
+                'last 1 Chrome version',
+                'last 1 Safari version',
+                'last 1 Firefox version',
+                'last 1 Edge version',
+              ],
+            },
+            includeNodeModules: true,
+            isLibrary: false,
+            loc: null,
+            outputFormat: 'esmodule',
+            shouldScopeHoist: true,
+            shouldOptimize: false,
+            sourceMap: {},
+            sourceType: 'module',
+          },
+          filePath: '/library.ts',
+          type: 'js',
+          meta: {
+            hasCJSExports: false,
+            staticExports: true,
+            shouldWrap: false,
+            id: '579fff58dabc69a5',
+          },
+          pipeline: null,
+          query: null,
+          stats: {
+            size: 58,
+            time: 1,
+          },
+          symbols: [
+            {
+              local: '$579fff58dabc69a5$export$2e2bcd8739ae039',
+              exported: 'default',
+              loc: {
+                filePath: '/library.ts',
+                start: {
+                  line: 1,
+                  column: 1,
+                },
+                end: {
+                  line: 1,
+                  column: 26,
+                },
+              },
+              isWeak: false,
+              isEsmExport: true,
+              selfReferenced: false,
+            },
+          ],
+          sideEffects: true,
+          isBundleSplittable: true,
+          isSource: true,
+          hasCjsExports: false,
+          staticExports: true,
+          shouldWrap: false,
+          hasNodeReplacements: false,
+          isConstantModule: false,
+          conditions: [],
+          configPath: null,
+          configKeyPath: null,
+        },
+      },
+    ],
+  };
+}