@atlaspack/core 2.16.2-canary.48 → 2.16.2-canary.481

package/lib/public/Symbols.js

@@ -12,7 +12,7 @@ function _nullthrows() {
   return data;
 }
 var _utils = require("../utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const EMPTY_ITERABLE = {
   [Symbol.iterator]() {
     return EMPTY_ITERATOR;
@@ -31,7 +31,9 @@ class AssetSymbols {
   /*::
   @@iterator(): Iterator<[ISymbol, {|local: ISymbol, loc: ?SourceLocation, meta?: ?Meta|}]> { return ({}: any); }
   */
+  // @ts-expect-error TS2564
   #value;
+  // @ts-expect-error TS2564
   #options;
   constructor(options, asset) {
     let existing = valueToSymbols.get(asset);
@@ -67,12 +69,10 @@ class AssetSymbols {
     var _this$value$symbols3;
     return ((_this$value$symbols3 = this.#value.symbols) === null || _this$value$symbols3 === void 0 ? void 0 : _this$value$symbols3.keys()) ?? [];
   }
-  // $FlowFixMe
+  // @ts-expect-error TS2416
   [Symbol.iterator]() {
     return this.#value.symbols ? this.#value.symbols[Symbol.iterator]() : EMPTY_ITERATOR;
   }
-
-  // $FlowFixMe
   [inspect]() {
     return `AssetSymbols(${this.#value.symbols ? [...this.#value.symbols].map(([s, {
       local
@@ -85,7 +85,9 @@ class MutableAssetSymbols {
   /*::
   @@iterator(): Iterator<[ISymbol, {|local: ISymbol, loc: ?SourceLocation, meta?: ?Meta|}]> { return ({}: any); }
   */
+  // @ts-expect-error TS2564
   #value;
+  // @ts-expect-error TS2564
   #options;
   constructor(options, asset) {
     let existing = valueToMutableAssetSymbols.get(asset);
@@ -120,15 +122,13 @@ class MutableAssetSymbols {
     return this.#value.symbols == null;
   }
   exportSymbols() {
-    // $FlowFixMe
+    // @ts-expect-error TS2322
     return this.#value.symbols.keys();
   }
-  // $FlowFixMe
+  // @ts-expect-error TS2416
   [Symbol.iterator]() {
     return this.#value.symbols ? this.#value.symbols[Symbol.iterator]() : EMPTY_ITERATOR;
   }
-
-  // $FlowFixMe
   [inspect]() {
     return `MutableAssetSymbols(${this.#value.symbols ? [...this.#value.symbols].map(([s, {
       local
@@ -159,7 +159,9 @@ class MutableDependencySymbols {
   /*::
   @@iterator(): Iterator<[ISymbol, {|local: ISymbol, loc: ?SourceLocation, isWeak: boolean, meta?: ?Meta|}]> { return ({}: any); }
   */
+  // @ts-expect-error TS2564
   #value;
+  // @ts-expect-error TS2564
   #options;
   constructor(options, dep) {
     let existing = valueToMutableDependencySymbols.get(dep);
@@ -192,16 +194,14 @@ class MutableDependencySymbols {
     return this.#value.symbols == null;
   }
   exportSymbols() {
-    // $FlowFixMe
+    // @ts-expect-error TS2322
     return this.#value.symbols ? this.#value.symbols.keys() : EMPTY_ITERABLE;
   }
 
-  // $FlowFixMe
+  // @ts-expect-error TS2416
   [Symbol.iterator]() {
     return this.#value.symbols ? this.#value.symbols[Symbol.iterator]() : EMPTY_ITERATOR;
   }
-
-  // $FlowFixMe
   [inspect]() {
     return `MutableDependencySymbols(${this.#value.symbols ? [...this.#value.symbols].map(([s, {
       local,

package/lib/public/Target.js

@@ -15,7 +15,8 @@ function _nullthrows() {
 var _Environment = _interopRequireDefault(require("./Environment"));
 var _projectPath = require("../projectPath");
 var _utils = require("../utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _EnvironmentManager = require("../EnvironmentManager");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 const internalTargetToTarget = new WeakMap();
 const _targetToInternalTarget = new WeakMap();
@@ -23,9 +24,10 @@ function targetToInternalTarget(target) {
   return (0, _nullthrows().default)(_targetToInternalTarget.get(target));
 }
 class Target {
-  #target /*: TargetValue */;
-  #options /*: AtlaspackOptions */;
-
+  // @ts-expect-error TS2564
+  #target;
+  // @ts-expect-error TS2564
+  #options;
   constructor(target, options) {
     let existing = internalTargetToTarget.get(target);
     if (existing != null) {
@@ -44,7 +46,7 @@ class Target {
     return (0, _projectPath.fromProjectPath)(this.#options.projectRoot, this.#target.distDir);
   }
   get env() {
-    return new _Environment.default(this.#target.env, this.#options);
+    return new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#target.env), this.#options);
   }
   get name() {
     return this.#target.name;
@@ -55,9 +57,8 @@ class Target {
   get loc() {
     return (0, _utils.fromInternalSourceLocation)(this.#options.projectRoot, this.#target.loc);
   }
-
-  // $FlowFixMe[unsupported-syntax]
   [inspect]() {
+    // @ts-expect-error TS7053
     return `Target(${this.name} - ${this.env[inspect]()})`;
   }
 }

package/lib/registerCoreWithSerializer.js

@@ -24,9 +24,15 @@ var _AssetGraph = _interopRequireDefault(require("./AssetGraph"));
 var _BundleGraph = _interopRequireDefault(require("./BundleGraph"));
 var _Config = _interopRequireDefault(require("./public/Config"));
 var _RequestTracker = require("./RequestTracker");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// flow-to-ts helpers
+
+// /flow-to-ts helpers
+
+// @ts-expect-error TS7034
 let coreRegistered;
 function registerCoreWithSerializer() {
+  // @ts-expect-error TS7005
   if (coreRegistered) {
     return;
   }
@@ -34,8 +40,6 @@ function registerCoreWithSerializer() {
   if (typeof packageVersion !== 'string') {
     throw new Error('Expected package version to be a string');
   }
-
-  // $FlowFixMe[incompatible-cast]
   for (let [name, ctor] of Object.entries({
     AssetGraph: _AssetGraph.default,
     Config: _Config.default,
@@ -43,7 +47,6 @@ function registerCoreWithSerializer() {
     Graph: _graph().Graph,
     AtlaspackConfig: _AtlaspackConfig.AtlaspackConfig,
     RequestGraph: _RequestTracker.RequestGraph
-    // $FlowFixMe[unclear-type]
   })) {
     (0, _buildCache().registerSerializableClass)(packageVersion + ':' + name, ctor);
   }

package/lib/requests/AssetGraphRequest.js

@@ -26,13 +26,6 @@ function _nullthrows() {
   };
   return data;
 }
-function _featureFlags() {
-  const data = require("@atlaspack/feature-flags");
-  _featureFlags = function () {
-    return data;
-  };
-  return data;
-}
 function _utils() {
   const data = require("@atlaspack/utils");
   _utils = function () {
@@ -65,7 +58,7 @@ var _projectPath = require("../projectPath");
 var _dumpGraphToGraphViz = _interopRequireDefault(require("../dumpGraphToGraphViz"));
 var _SymbolPropagation = require("../SymbolPropagation");
 var _RequestTracker = require("../RequestTracker");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function createAssetGraphRequest(requestInput) {
   return {
     type: _RequestTracker.requestTypes.asset_graph_request,
@@ -73,12 +66,15 @@ function createAssetGraphRequest(requestInput) {
     run: async input => {
       let prevResult = await input.api.getPreviousResult();
       let builder = new AssetGraphBuilder(input, prevResult);
-      let assetGraphRequest = await await builder.build();
+      let assetGraphRequest = await builder.build();
 
       // early break for incremental bundling if production or flag is off;
       if (!input.options.shouldBundleIncrementally || input.options.mode === 'production') {
         assetGraphRequest.assetGraph.safeToIncrementallyBundle = false;
       }
+      if (!input.options.shouldBundleIncrementally || input.options.mode === 'production') {
+        assetGraphRequest.assetGraph.safeToIncrementallyBundle = false;
+      }
       return assetGraphRequest;
     },
     input: requestInput
@@ -123,13 +119,11 @@ class AssetGraphBuilder {
     this.shouldBuildLazily = shouldBuildLazily ?? false;
     this.lazyIncludes = lazyIncludes ?? [];
     this.lazyExcludes = lazyExcludes ?? [];
-    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      const key = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}${name}${JSON.stringify(entries) ?? ''}${options.mode}${options.shouldBuildLazily ? 'lazy' : 'eager'}`);
-      this.cacheKey = `AssetGraph/${_constants.ATLASPACK_VERSION}/${options.mode}/${key}`;
-    } else {
-      this.cacheKey = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}${name}${JSON.stringify(entries) ?? ''}${options.mode}${options.shouldBuildLazily ? 'lazy' : 'eager'}`) + '-AssetGraph';
-    }
-    this.isSingleChangeRebuild = api.getInvalidSubRequests().filter(req => req.requestType === 'asset_request').length === 1;
+    this.skipSymbolProp = input.skipSymbolProp ?? false;
+    this.cacheKey = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}${name}${JSON.stringify(entries) ?? ''}${options.mode}${options.shouldBuildLazily ? 'lazy' : 'eager'}`) + '-AssetGraph';
+    this.isSingleChangeRebuild = api.getInvalidSubRequests()
+    // @ts-expect-error TS2367
+    .filter(req => req.requestType === 'asset_request').length === 1;
     this.queue = new (_utils().PromiseQueue)();
     assetGraph.onNodeRemoved = nodeId => {
       this.assetGroupsWithRemovedParents.delete(nodeId);
@@ -168,7 +162,9 @@ class AssetGraphBuilder {
     const visitChildren = nodeId => {
       for (let childNodeId of this.assetGraph.getNodeIdsConnectedFrom(nodeId)) {
         let child = (0, _nullthrows().default)(this.assetGraph.getNode(childNodeId));
-        if ((!visited.has(childNodeId) || child.hasDeferred) && this.shouldVisitChild(nodeId, childNodeId)) {
+        if (
+        // @ts-expect-error TS2339
+        (!visited.has(childNodeId) || child.hasDeferred) && this.shouldVisitChild(nodeId, childNodeId)) {
           if (child.type === 'asset_group') {
             visitedAssetGroups.add(childNodeId);
           }
@@ -211,34 +207,43 @@ class AssetGraphBuilder {
     }
     if (this.assetGraph.nodes.length > 1) {
       await (0, _dumpGraphToGraphViz.default)(this.assetGraph, 'AssetGraph_' + this.name + '_before_prop');
-      try {
-        let errors = (0, _SymbolPropagation.propagateSymbols)({
-          options: this.options,
-          assetGraph: this.assetGraph,
-          changedAssetsPropagation: this.changedAssetsPropagation,
-          assetGroupsWithRemovedParents: this.assetGroupsWithRemovedParents,
-          previousErrors: this.previousSymbolPropagationErrors
+
+      // Skip symbol propagation for runtime assets - they have pre-computed symbol data
+      if (this.skipSymbolProp) {
+        _logger().default.verbose({
+          origin: '@atlaspack/core',
+          message: 'Skipping symbol propagation for runtime asset graph'
         });
-        this.changedAssetsPropagation.clear();
-        if (errors.size > 0) {
-          this.api.storeResult({
+      } else {
+        try {
+          let errors = (0, _SymbolPropagation.propagateSymbols)({
+            options: this.options,
             assetGraph: this.assetGraph,
-            changedAssets: this.changedAssets,
             changedAssetsPropagation: this.changedAssetsPropagation,
             assetGroupsWithRemovedParents: this.assetGroupsWithRemovedParents,
-            previousSymbolPropagationErrors: errors,
-            assetRequests: []
-          }, this.cacheKey);
-
-          // 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]
+            previousErrors: this.previousSymbolPropagationErrors
           });
+          this.changedAssetsPropagation.clear();
+          if (errors.size > 0) {
+            this.api.storeResult({
+              assetGraph: this.assetGraph,
+              changedAssets: this.changedAssets,
+              changedAssetsPropagation: this.changedAssetsPropagation,
+              assetGroupsWithRemovedParents: this.assetGroupsWithRemovedParents,
+              previousSymbolPropagationErrors: errors,
+              assetRequests: []
+            }, this.cacheKey);
+
+            // 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]
+            });
+          }
+        } catch (e) {
+          await (0, _dumpGraphToGraphViz.default)(this.assetGraph, 'AssetGraph_' + this.name + '_failed');
+          throw e;
         }
-      } catch (e) {
-        await (0, _dumpGraphToGraphViz.default)(this.assetGraph, 'AssetGraph_' + this.name + '_failed');
-        throw e;
       }
     }
     await (0, _dumpGraphToGraphViz.default)(this.assetGraph, 'AssetGraph_' + this.name);
@@ -329,7 +334,14 @@ class AssetGraphBuilder {
   }
   shouldSkipRequest(nodeId) {
     let node = (0, _nullthrows().default)(this.assetGraph.getNode(nodeId));
-    return node.complete === true || !typesWithRequests.has(node.type) || node.correspondingRequest != null && this.api.canSkipSubrequest(node.correspondingRequest);
+    return (
+      // @ts-expect-error TS2339
+      node.complete === true || !typesWithRequests.has(node.type) ||
+      // @ts-expect-error TS2339
+      node.correspondingRequest != null &&
+      // @ts-expect-error TS2339
+      this.api.canSkipSubrequest(node.correspondingRequest)
+    );
   }
   queueCorrespondingRequest(nodeId, errors) {
     let promise;
@@ -390,6 +402,7 @@ class AssetGraphBuilder {
   }
   async runAssetRequest(input) {
     this.assetRequests.push(input);
+    // @ts-expect-error TS2345
     let request = (0, _AssetRequest.default)({
       ...input,
       name: this.name,
@@ -401,6 +414,14 @@ class AssetGraphBuilder {
     });
     if (assets != null) {
       for (let asset of assets) {
+        // Pass the runtimeAssetRequiringExecutionOnLoad flag from the asset
+        // group down to the asset itself, for reading in the packager.
+        if (input.runtimeAssetRequiringExecutionOnLoad) {
+          asset.meta = {
+            ...(asset.meta ?? {}),
+            runtimeAssetRequiringExecutionOnLoad: input.runtimeAssetRequiringExecutionOnLoad
+          };
+        }
         if (this.assetGraph.safeToIncrementallyBundle) {
           let otherAsset = this.assetGraph.getNodeByContentKey(asset.id);
           if (otherAsset != null) {