@atlaspack/core 2.16.2-canary.414 → 2.16.2-canary.415

package/dist/applyRuntimes.js

@@ -376,7 +376,8 @@ function reconcileNewRuntimes(api, connections, optionsRef) {
         name: 'Runtimes',
         assetGroups,
         optionsRef,
-        skipSymbolProp: (0, feature_flags_1.getFeatureFlag)('skipRuntimeSymbolProp'),
+        skipSymbolProp: (0, feature_flags_1.getFeatureFlag)('skipRuntimeSymbolProp') ||
+            (0, feature_flags_1.getFeatureFlag)('rustSymbolTracker'),
     });
     // rebuild the graph
     return api.runRequest(request, { force: true });

package/dist/requests/AssetGraphRequestRust.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,7 +40,7 @@ exports.createAssetGraphRequestRust = createAssetGraphRequestRust;
 exports.getAssetGraph = getAssetGraph;
 const assert_1 = __importDefault(require("assert"));
 const diagnostic_1 = __importDefault(require("@atlaspack/diagnostic"));
-const logger_1 = require("@atlaspack/logger");
+const logger_1 = __importStar(require("@atlaspack/logger"));
 const feature_flags_1 = require("@atlaspack/feature-flags");
 const AssetGraph_1 = __importDefault(require("../AssetGraph"));
 const RequestTracker_1 = require("../RequestTracker");
@@ -20,8 +53,8 @@ function createAssetGraphRequestRust(rustAtlaspack) {
     return (input) => ({
         type: RequestTracker_1.requestTypes.asset_graph_request,
         id: input.name,
-        run: async (input) => {
-            let options = input.options;
+        run: async (runInput) => {
+            let options = runInput.options;
             let { assetGraphPromise, commitPromise } = await rustAtlaspack.buildAssetGraph();
             let [serializedAssetGraph, assetGraphError] = (await assetGraphPromise);
             if (assetGraphError) {
@@ -33,24 +66,33 @@ function createAssetGraphRequestRust(rustAtlaspack) {
             let prevResult = null;
             if (serializedAssetGraph.hadPreviousGraph) {
                 prevResult =
-                    await input.api.getPreviousResult();
+                    await runInput.api.getPreviousResult();
             }
             let { assetGraph, changedAssets } = (0, logger_1.instrument)('atlaspack_v3_getAssetGraph', () => getAssetGraph(serializedAssetGraph, prevResult?.assetGraph));
             let changedAssetsPropagation = new Set(changedAssets.keys());
-            let errors = (0, SymbolPropagation_1.propagateSymbols)({
-                options,
-                assetGraph,
-                changedAssetsPropagation,
-                assetGroupsWithRemovedParents: new Set(),
-                previousErrors: new Map(), //this.previousSymbolPropagationErrors,
-            });
-            if (errors.size > 0) {
-                // Just throw the first error. Since errors can bubble (e.g. reexporting a reexported symbol also fails),
-                // determining which failing export is the root cause is nontrivial (because of circular dependencies).
-                throw new diagnostic_1.default({
-                    diagnostic: [...errors.values()][0],
+            // Skip symbol propagation for runtime assets - they have pre-computed symbol data
+            if (input.skipSymbolProp) {
+                logger_1.default.verbose({
+                    origin: '@atlaspack/core',
+                    message: 'Skipping symbol propagation for runtime asset graph',
                 });
             }
+            else {
+                let errors = (0, SymbolPropagation_1.propagateSymbols)({
+                    options,
+                    assetGraph,
+                    changedAssetsPropagation,
+                    assetGroupsWithRemovedParents: new Set(),
+                    previousErrors: new Map(), //this.previousSymbolPropagationErrors,
+                });
+                if (errors.size > 0) {
+                    // Just throw the first error. Since errors can bubble (e.g. reexporting a reexported symbol also fails),
+                    // determining which failing export is the root cause is nontrivial (because of circular dependencies).
+                    throw new diagnostic_1.default({
+                        diagnostic: [...errors.values()][0],
+                    });
+                }
+            }
             await (0, dumpGraphToGraphViz_1.default)(assetGraph, 'AssetGraphV3');
             let result = {
                 assetGraph,
@@ -68,8 +110,8 @@ function createAssetGraphRequestRust(rustAtlaspack) {
                     },
                 });
             }
-            await input.api.storeResult(result);
-            input.api.invalidateOnBuild();
+            await runInput.api.storeResult(result);
+            runInput.api.invalidateOnBuild();
             return result;
         },
         input,
@@ -230,6 +272,17 @@ function getAssetGraph(serializedGraph, prevAssetGraph) {
             }
             let usedSymbolsDown = new Set();
             let usedSymbolsUp = new Map();
+            if (node.used_symbols_up) {
+                for (let usedSymbol of node.used_symbols_up) {
+                    // Transform Rust UsedSymbol { symbol: Symbol, asset: string }
+                    // to JS format { symbol: string, asset: string } where symbol is the exported name
+                    const exportedName = usedSymbol.symbol.exported;
+                    usedSymbolsUp.set(exportedName, {
+                        asset: usedSymbol.asset,
+                        symbol: exportedName,
+                    });
+                }
+            }
             if (dependency.isEntry && dependency.isLibrary) {
                 usedSymbolsDown.add('*');
                 usedSymbolsUp.set('*', undefined);

package/dist/requests/BundleGraphRequest.js

@@ -110,6 +110,7 @@ function createBundleGraphRequest(input) {
                 lazyIncludes: options.lazyIncludes,
                 lazyExcludes: options.lazyExcludes,
                 requestedAssetIds,
+                skipSymbolProp: (0, feature_flags_1.getFeatureFlag)('rustSymbolTracker'),
             });
             let { assetGraph, changedAssets, assetRequests } = await (0, logger_1.instrumentAsync)('asset-graph-request', () => {
                 return api.runRequest(request, {

package/lib/applyRuntimes.js

@@ -437,7 +437,7 @@ function reconcileNewRuntimes(api, connections, optionsRef) {
     name: 'Runtimes',
     assetGroups,
     optionsRef,
-    skipSymbolProp: (0, _featureFlags().getFeatureFlag)('skipRuntimeSymbolProp')
+    skipSymbolProp: (0, _featureFlags().getFeatureFlag)('skipRuntimeSymbolProp') || (0, _featureFlags().getFeatureFlag)('rustSymbolTracker')
   });
 
   // rebuild the graph

package/lib/requests/AssetGraphRequestRust.js

@@ -20,7 +20,7 @@ function _diagnostic() {
   return data;
 }
 function _logger() {
-  const data = require("@atlaspack/logger");
+  const data = _interopRequireWildcard(require("@atlaspack/logger"));
   _logger = function () {
     return data;
   };
@@ -39,13 +39,15 @@ var _SymbolPropagation = require("../SymbolPropagation");
 var _EnvironmentManager = require("../EnvironmentManager");
 var _Environment = require("../Environment");
 var _dumpGraphToGraphViz = _interopRequireDefault(require("../dumpGraphToGraphViz"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function createAssetGraphRequestRust(rustAtlaspack) {
   return input => ({
     type: _RequestTracker.requestTypes.asset_graph_request,
     id: input.name,
-    run: async input => {
-      let options = input.options;
+    run: async runInput => {
+      let options = runInput.options;
       let {
         assetGraphPromise,
         commitPromise
@@ -60,7 +62,7 @@ function createAssetGraphRequestRust(rustAtlaspack) {
       // Don't reuse a previous asset graph result if Rust didn't have one too
       let prevResult = null;
       if (serializedAssetGraph.hadPreviousGraph) {
-        prevResult = await input.api.getPreviousResult();
+        prevResult = await runInput.api.getPreviousResult();
       }
       let {
         assetGraph,
@@ -70,20 +72,28 @@ function createAssetGraphRequestRust(rustAtlaspack) {
         return getAssetGraph(serializedAssetGraph, (_prevResult = prevResult) === null || _prevResult === void 0 ? void 0 : _prevResult.assetGraph);
       });
       let changedAssetsPropagation = new Set(changedAssets.keys());
-      let errors = (0, _SymbolPropagation.propagateSymbols)({
-        options,
-        assetGraph,
-        changedAssetsPropagation,
-        assetGroupsWithRemovedParents: new Set(),
-        previousErrors: new Map() //this.previousSymbolPropagationErrors,
-      });
-
-      if (errors.size > 0) {
-        // Just throw the first error. Since errors can bubble (e.g. reexporting a reexported symbol also fails),
-        // determining which failing export is the root cause is nontrivial (because of circular dependencies).
-        throw new (_diagnostic().default)({
-          diagnostic: [...errors.values()][0]
+      // Skip symbol propagation for runtime assets - they have pre-computed symbol data
+      if (input.skipSymbolProp) {
+        _logger().default.verbose({
+          origin: '@atlaspack/core',
+          message: 'Skipping symbol propagation for runtime asset graph'
+        });
+      } else {
+        let errors = (0, _SymbolPropagation.propagateSymbols)({
+          options,
+          assetGraph,
+          changedAssetsPropagation,
+          assetGroupsWithRemovedParents: new Set(),
+          previousErrors: new Map() //this.previousSymbolPropagationErrors,
         });
+
+        if (errors.size > 0) {
+          // Just throw the first error. Since errors can bubble (e.g. reexporting a reexported symbol also fails),
+          // determining which failing export is the root cause is nontrivial (because of circular dependencies).
+          throw new (_diagnostic().default)({
+            diagnostic: [...errors.values()][0]
+          });
+        }
       }
       await (0, _dumpGraphToGraphViz.default)(assetGraph, 'AssetGraphV3');
       let result = {
@@ -102,8 +112,8 @@ function createAssetGraphRequestRust(rustAtlaspack) {
           }
         });
       }
-      await input.api.storeResult(result);
-      input.api.invalidateOnBuild();
+      await runInput.api.storeResult(result);
+      runInput.api.invalidateOnBuild();
       return result;
     },
     input
@@ -253,6 +263,17 @@ function getAssetGraph(serializedGraph, prevAssetGraph) {
       }
       let usedSymbolsDown = new Set();
       let usedSymbolsUp = new Map();
+      if (node.used_symbols_up) {
+        for (let usedSymbol of node.used_symbols_up) {
+          // Transform Rust UsedSymbol { symbol: Symbol, asset: string }
+          // to JS format { symbol: string, asset: string } where symbol is the exported name
+          const exportedName = usedSymbol.symbol.exported;
+          usedSymbolsUp.set(exportedName, {
+            asset: usedSymbol.asset,
+            symbol: exportedName
+          });
+        }
+      }
       if (dependency.isEntry && dependency.isLibrary) {
         usedSymbolsDown.add('*');
         usedSymbolsUp.set('*', undefined);

package/lib/requests/BundleGraphRequest.js

@@ -136,7 +136,8 @@ function createBundleGraphRequest(input) {
         shouldBuildLazily: options.shouldBuildLazily,
         lazyIncludes: options.lazyIncludes,
         lazyExcludes: options.lazyExcludes,
-        requestedAssetIds
+        requestedAssetIds,
+        skipSymbolProp: (0, _featureFlags().getFeatureFlag)('rustSymbolTracker')
       });
       let {
         assetGraph,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-canary.414+c4082ba3f",
+  "version": "2.16.2-canary.415+45a0dc530",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -22,22 +22,22 @@
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-canary.482+c4082ba3f",
-    "@atlaspack/cache": "3.1.1-canary.414+c4082ba3f",
-    "@atlaspack/diagnostic": "2.14.1-canary.482+c4082ba3f",
-    "@atlaspack/events": "2.14.1-canary.482+c4082ba3f",
-    "@atlaspack/feature-flags": "2.14.1-canary.482+c4082ba3f",
-    "@atlaspack/fs": "2.14.5-canary.414+c4082ba3f",
-    "@atlaspack/graph": "3.4.1-canary.482+c4082ba3f",
-    "@atlaspack/logger": "2.14.5-canary.414+c4082ba3f",
-    "@atlaspack/package-manager": "2.14.5-canary.414+c4082ba3f",
-    "@atlaspack/plugin": "2.14.5-canary.414+c4082ba3f",
-    "@atlaspack/profiler": "2.14.1-canary.482+c4082ba3f",
-    "@atlaspack/rust": "3.2.1-canary.414+c4082ba3f",
-    "@atlaspack/source-map": "3.2.9-canary.4193+c4082ba3f",
-    "@atlaspack/types": "2.14.5-canary.414+c4082ba3f",
-    "@atlaspack/utils": "2.14.5-canary.414+c4082ba3f",
-    "@atlaspack/workers": "2.14.5-canary.414+c4082ba3f",
+    "@atlaspack/build-cache": "2.13.3-canary.483+45a0dc530",
+    "@atlaspack/cache": "3.1.1-canary.415+45a0dc530",
+    "@atlaspack/diagnostic": "2.14.1-canary.483+45a0dc530",
+    "@atlaspack/events": "2.14.1-canary.483+45a0dc530",
+    "@atlaspack/feature-flags": "2.14.1-canary.483+45a0dc530",
+    "@atlaspack/fs": "2.14.5-canary.415+45a0dc530",
+    "@atlaspack/graph": "3.4.1-canary.483+45a0dc530",
+    "@atlaspack/logger": "2.14.5-canary.415+45a0dc530",
+    "@atlaspack/package-manager": "2.14.5-canary.415+45a0dc530",
+    "@atlaspack/plugin": "2.14.5-canary.415+45a0dc530",
+    "@atlaspack/profiler": "2.14.1-canary.483+45a0dc530",
+    "@atlaspack/rust": "3.2.1-canary.415+45a0dc530",
+    "@atlaspack/source-map": "3.2.9-canary.4194+45a0dc530",
+    "@atlaspack/types": "2.14.5-canary.415+45a0dc530",
+    "@atlaspack/utils": "2.14.5-canary.415+45a0dc530",
+    "@atlaspack/workers": "2.14.5-canary.415+45a0dc530",
     "@mischnic/json-sourcemap": "^0.1.0",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",
@@ -61,5 +61,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "c4082ba3fc1a9328a2e5f23195d5972fbc5d10c8"
+  "gitHead": "45a0dc530fd9472dbfdebcbb05f1aad812ab3b23"
 }

package/src/applyRuntimes.ts

@@ -505,7 +505,9 @@ function reconcileNewRuntimes<TResult extends RequestResult>(
     name: 'Runtimes',
     assetGroups,
     optionsRef,
-    skipSymbolProp: getFeatureFlag('skipRuntimeSymbolProp'),
+    skipSymbolProp:
+      getFeatureFlag('skipRuntimeSymbolProp') ||
+      getFeatureFlag('rustSymbolTracker'),
   });
 
   // rebuild the graph

package/src/requests/AssetGraphRequestRust.ts

@@ -2,7 +2,7 @@ import invariant from 'assert';
 
 import ThrowableDiagnostic from '@atlaspack/diagnostic';
 import type {Async} from '@atlaspack/types';
-import {instrument} from '@atlaspack/logger';
+import logger, {instrument} from '@atlaspack/logger';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 import AssetGraph from '../AssetGraph';
@@ -51,8 +51,8 @@ export function createAssetGraphRequestRust(
   return (input: AssetGraphRequestInput) => ({
     type: requestTypes.asset_graph_request,
     id: input.name,
-    run: async (input) => {
-      let options = input.options;
+    run: async (runInput) => {
+      let options = runInput.options;
       let {assetGraphPromise, commitPromise} =
         await rustAtlaspack.buildAssetGraph();
 
@@ -69,7 +69,7 @@ export function createAssetGraphRequestRust(
       let prevResult = null;
       if (serializedAssetGraph.hadPreviousGraph) {
         prevResult =
-          await input.api.getPreviousResult<AssetGraphRequestResult>();
+          await runInput.api.getPreviousResult<AssetGraphRequestResult>();
       }
 
       let {assetGraph, changedAssets} = instrument(
@@ -78,20 +78,28 @@ export function createAssetGraphRequestRust(
       );
 
       let changedAssetsPropagation = new Set(changedAssets.keys());
-      let errors = propagateSymbols({
-        options,
-        assetGraph,
-        changedAssetsPropagation,
-        assetGroupsWithRemovedParents: new Set(),
-        previousErrors: new Map(), //this.previousSymbolPropagationErrors,
-      });
-
-      if (errors.size > 0) {
-        // Just throw the first error. Since errors can bubble (e.g. reexporting a reexported symbol also fails),
-        // determining which failing export is the root cause is nontrivial (because of circular dependencies).
-        throw new ThrowableDiagnostic({
-          diagnostic: [...errors.values()][0],
+      // Skip symbol propagation for runtime assets - they have pre-computed symbol data
+      if (input.skipSymbolProp) {
+        logger.verbose({
+          origin: '@atlaspack/core',
+          message: 'Skipping symbol propagation for runtime asset graph',
         });
+      } else {
+        let errors = propagateSymbols({
+          options,
+          assetGraph,
+          changedAssetsPropagation,
+          assetGroupsWithRemovedParents: new Set(),
+          previousErrors: new Map(), //this.previousSymbolPropagationErrors,
+        });
+
+        if (errors.size > 0) {
+          // Just throw the first error. Since errors can bubble (e.g. reexporting a reexported symbol also fails),
+          // determining which failing export is the root cause is nontrivial (because of circular dependencies).
+          throw new ThrowableDiagnostic({
+            diagnostic: [...errors.values()][0],
+          });
+        }
       }
 
       await dumpGraphToGraphViz(assetGraph, 'AssetGraphV3');
@@ -116,8 +124,8 @@ export function createAssetGraphRequestRust(
         });
       }
 
-      await input.api.storeResult(result);
-      input.api.invalidateOnBuild();
+      await runInput.api.storeResult(result);
+      runInput.api.invalidateOnBuild();
 
       return result;
     },
@@ -314,6 +322,19 @@ export function getAssetGraph(
 
       let usedSymbolsDown = new Set();
       let usedSymbolsUp = new Map();
+
+      if (node.used_symbols_up) {
+        for (let usedSymbol of node.used_symbols_up) {
+          // Transform Rust UsedSymbol { symbol: Symbol, asset: string }
+          // to JS format { symbol: string, asset: string } where symbol is the exported name
+          const exportedName = usedSymbol.symbol.exported;
+          usedSymbolsUp.set(exportedName, {
+            asset: usedSymbol.asset,
+            symbol: exportedName,
+          });
+        }
+      }
+
       if (dependency.isEntry && dependency.isLibrary) {
         usedSymbolsDown.add('*');
         usedSymbolsUp.set('*', undefined);

package/src/requests/BundleGraphRequest.ts

@@ -151,6 +151,7 @@ export default function createBundleGraphRequest(
         lazyIncludes: options.lazyIncludes,
         lazyExcludes: options.lazyExcludes,
         requestedAssetIds,
+        skipSymbolProp: getFeatureFlag('rustSymbolTracker'),
       });
 
       let {assetGraph, changedAssets, assetRequests} = await instrumentAsync(