@atlaspack/core 2.12.1-canary.3522 → 2.12.1-canary.3530

package/lib/requests/AssetGraphRequestRust.js

@@ -27,7 +27,6 @@ function _rust() {
 }
 var _AssetGraph = _interopRequireWildcard(require("../AssetGraph"));
 var _constants = require("../constants");
-var _projectPath = require("../projectPath");
 var _RequestTracker = require("../RequestTracker");
 var _SymbolPropagation = require("../SymbolPropagation");
 function _sourceMap() {
@@ -89,7 +88,8 @@ function createAssetGraphRequestRust(rustAtlaspack) {
 function getAssetGraph(serializedGraph, options) {
   let graph = new _AssetGraph.default({
     _contentKeyToNodeId: new Map(),
-    _nodeIdToContentKey: new Map()
+    _nodeIdToContentKey: new Map(),
+    initialCapacity: serializedGraph.edges.length
   });
   graph.safeToIncrementallyBundle = false;
   function mapSymbols({
@@ -147,33 +147,13 @@ function getAssetGraph(serializedGraph, options) {
     } else if (node.type === 'asset') {
       let asset = node.value;
       let id = asset.id;
+      asset.committed = true;
+      asset.contentKey = id;
+      asset.env.id = getEnvId(asset.env);
       asset.meta.id = id;
-      asset = {
-        ...asset,
-        uniqueKey: asset.uniqueKey ?? undefined,
-        pipeline: asset.pipeline ?? undefined,
-        range: asset.range ?? undefined,
-        resolveFrom: asset.resolveFrom ?? undefined,
-        target: asset.target ?? undefined,
-        plugin: asset.plugin ?? undefined,
-        query: asset.query ?? undefined,
-        configPath: asset.configPath ?? undefined,
-        configKeyPath: asset.configKeyPath ?? undefined,
-        isLargeBlob: asset.isLargeBlob ?? false,
-        isSource: asset.isSource ?? false,
-        sourcePath: asset.sourcePath ?? undefined,
-        env: {
-          ...asset.env,
-          loc: asset.env.loc ?? undefined,
-          id: getEnvId(asset.env),
-          sourceType: asset.env.sourceType
-        },
-        bundleBehavior: asset.bundleBehavior === 255 ? null : asset.bundleBehavior,
-        committed: true,
-        contentKey: id,
-        filePath: (0, _projectPath.toProjectPath)(options.projectRoot, asset.filePath),
-        symbols: asset.symbols != null ? new Map(asset.symbols.map(mapSymbols)) : null
-      };
+      if (asset.symbols != null) {
+        asset.symbols = new Map(asset.symbols.map(mapSymbols));
+      }
       if (asset.map) {
         let mapKey = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}:map:${asset.id}`);
         let sourceMap = new (_sourceMap().default)(options.projectRoot);
@@ -193,35 +173,18 @@ function getAssetGraph(serializedGraph, options) {
         value: asset
       });
     } else if (node.type === 'dependency') {
-      var _dependency$symbols;
       let id = node.value.id;
       let dependency = node.value.dependency;
-      dependency = {
-        ...dependency,
-        id,
-        env: {
-          ...dependency.env,
-          id: getEnvId(dependency.env),
-          sourceType: dependency.env.sourceType,
-          loc: dependency.env.loc ?? undefined
-        },
-        pipeline: dependency.pipeline ?? undefined,
-        range: dependency.range ?? undefined,
-        resolveFrom: dependency.resolveFrom ?? undefined,
-        target: dependency.target ?? undefined,
-        bundleBehavior: dependency.bundleBehavior === 255 ? null : dependency.bundleBehavior,
-        contentKey: id,
-        loc: dependency.loc ? {
-          ...dependency.loc,
-          filePath: (0, _projectPath.toProjectPath)(options.projectRoot, dependency.loc.filePath)
-        } : undefined,
-        sourcePath: dependency.sourcePath ? (0, _projectPath.toProjectPath)(options.projectRoot, dependency.sourcePath) : undefined,
-        symbols:
-        // Dependency.symbols are always set to an empty map when scope hoisting
-        // is enabled. Some tests will fail if this is not the case. We should
-        // make this consistant when we re-visit packaging.
-        dependency.symbols != null || dependency.env.shouldScopeHoist ? new Map((_dependency$symbols = dependency.symbols) === null || _dependency$symbols === void 0 ? void 0 : _dependency$symbols.map(mapSymbols)) : undefined
-      };
+      dependency.id = id;
+      dependency.env.id = getEnvId(dependency.env);
+
+      // Dependency.symbols are always set to an empty map when scope hoisting
+      // is enabled. Some tests will fail if this is not the case. We should
+      // make this consistant when we re-visit packaging.
+      if (dependency.symbols != null || dependency.env.shouldScopeHoist) {
+        var _dependency$symbols;
+        dependency.symbols = new Map((_dependency$symbols = dependency.symbols) === null || _dependency$symbols === void 0 ? void 0 : _dependency$symbols.map(mapSymbols));
+      }
       let usedSymbolsDown = new Set();
       let usedSymbolsUp = new Map();
       if (dependency.isEntry && dependency.isLibrary) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3522+56e3e234a",
+  "version": "2.12.1-canary.3530+52a1243ea",
   "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.3522+56e3e234a",
-    "@atlaspack/cache": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/diagnostic": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/events": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/feature-flags": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/fs": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/graph": "3.2.1-canary.3522+56e3e234a",
-    "@atlaspack/logger": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/package-manager": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/plugin": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/profiler": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/rust": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/types": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/utils": "2.12.1-canary.3522+56e3e234a",
-    "@atlaspack/workers": "2.12.1-canary.3522+56e3e234a",
+    "@atlaspack/build-cache": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/cache": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/diagnostic": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/events": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/feature-flags": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/fs": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/graph": "3.2.1-canary.3530+52a1243ea",
+    "@atlaspack/logger": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/package-manager": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/plugin": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/profiler": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/rust": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/types": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/utils": "2.12.1-canary.3530+52a1243ea",
+    "@atlaspack/workers": "2.12.1-canary.3530+52a1243ea",
     "@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": "56e3e234a88ec4681a542477d38e3a7e1f300844"
+  "gitHead": "52a1243ea1791fd2d7682e32947ffa894ca9668e"
 }

package/src/requests/AssetGraphRequestRust.js

@@ -9,7 +9,6 @@ import type {Async} from '@atlaspack/types';
 import AssetGraph, {nodeFromAssetGroup} from '../AssetGraph';
 import type {AtlaspackV3} from '../atlaspack-v3';
 import {ATLASPACK_VERSION} from '../constants';
-import {toProjectPath} from '../projectPath';
 import {requestTypes, type StaticRunOpts} from '../RequestTracker';
 import {propagateSymbols} from '../SymbolPropagation';
 import type {Environment} from '../types';
@@ -88,6 +87,7 @@ function getAssetGraph(serializedGraph, options) {
   let graph = new AssetGraph({
     _contentKeyToNodeId: new Map(),
     _nodeIdToContentKey: new Map(),
+    initialCapacity: serializedGraph.edges.length,
   });
 
   graph.safeToIncrementallyBundle = false;
@@ -165,36 +165,13 @@ function getAssetGraph(serializedGraph, options) {
       let asset = node.value;
       let id = asset.id;
 
+      asset.committed = true;
+      asset.contentKey = id;
+      asset.env.id = getEnvId(asset.env);
       asset.meta.id = id;
-
-      asset = {
-        ...asset,
-        uniqueKey: asset.uniqueKey ?? undefined,
-        pipeline: asset.pipeline ?? undefined,
-        range: asset.range ?? undefined,
-        resolveFrom: asset.resolveFrom ?? undefined,
-        target: asset.target ?? undefined,
-        plugin: asset.plugin ?? undefined,
-        query: asset.query ?? undefined,
-        configPath: asset.configPath ?? undefined,
-        configKeyPath: asset.configKeyPath ?? undefined,
-        isLargeBlob: asset.isLargeBlob ?? false,
-        isSource: asset.isSource ?? false,
-        sourcePath: asset.sourcePath ?? undefined,
-        env: {
-          ...asset.env,
-          loc: asset.env.loc ?? undefined,
-          id: getEnvId(asset.env),
-          sourceType: asset.env.sourceType,
-        },
-        bundleBehavior:
-          asset.bundleBehavior === 255 ? null : asset.bundleBehavior,
-        committed: true,
-        contentKey: id,
-        filePath: toProjectPath(options.projectRoot, asset.filePath),
-        symbols:
-          asset.symbols != null ? new Map(asset.symbols.map(mapSymbols)) : null,
-      };
+      if (asset.symbols != null) {
+        asset.symbols = new Map(asset.symbols.map(mapSymbols));
+      }
 
       if (asset.map) {
         let mapKey = hashString(`${ATLASPACK_VERSION}:map:${asset.id}`);
@@ -221,42 +198,16 @@ function getAssetGraph(serializedGraph, options) {
       let id = node.value.id;
       let dependency = node.value.dependency;
 
-      dependency = {
-        ...dependency,
-        id,
-        env: {
-          ...dependency.env,
-          id: getEnvId(dependency.env),
-          sourceType: dependency.env.sourceType,
-          loc: dependency.env.loc ?? undefined,
-        },
-        pipeline: dependency.pipeline ?? undefined,
-        range: dependency.range ?? undefined,
-        resolveFrom: dependency.resolveFrom ?? undefined,
-        target: dependency.target ?? undefined,
-        bundleBehavior:
-          dependency.bundleBehavior === 255 ? null : dependency.bundleBehavior,
-        contentKey: id,
-        loc: dependency.loc
-          ? {
-              ...dependency.loc,
-              filePath: toProjectPath(
-                options.projectRoot,
-                dependency.loc.filePath,
-              ),
-            }
-          : undefined,
-        sourcePath: dependency.sourcePath
-          ? toProjectPath(options.projectRoot, dependency.sourcePath)
-          : undefined,
-        symbols:
-          // Dependency.symbols are always set to an empty map when scope hoisting
-          // is enabled. Some tests will fail if this is not the case. We should
-          // make this consistant when we re-visit packaging.
-          dependency.symbols != null || dependency.env.shouldScopeHoist
-            ? new Map(dependency.symbols?.map(mapSymbols))
-            : undefined,
-      };
+      dependency.id = id;
+      dependency.env.id = getEnvId(dependency.env);
+
+      // Dependency.symbols are always set to an empty map when scope hoisting
+      // is enabled. Some tests will fail if this is not the case. We should
+      // make this consistant when we re-visit packaging.
+      if (dependency.symbols != null || dependency.env.shouldScopeHoist) {
+        dependency.symbols = new Map(dependency.symbols?.map(mapSymbols));
+      }
+
       let usedSymbolsDown = new Set();
       let usedSymbolsUp = new Map();
       if (dependency.isEntry && dependency.isLibrary) {