@atlaspack/core 2.12.1-canary.3566 → 2.12.1-canary.3568

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -12,6 +12,14 @@ function _rust() {
   return data;
 }
 var _WorkerPool = require("./WorkerPool");
+function _diagnostic() {
+  const data = _interopRequireDefault(require("@atlaspack/diagnostic"));
+  _diagnostic = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class AtlaspackV3 {
   constructor({
     fs,
@@ -35,7 +43,7 @@ class AtlaspackV3 {
   }
   async buildAssetGraph() {
     const workerIds = [];
-    let result = await this._internal.buildAssetGraph({
+    let [graph, error] = await this._internal.buildAssetGraph({
       registerWorker: tx_worker => {
         // $FlowFixMe
         const workerId = _WorkerPool.workerPool.registerWorker(tx_worker);
@@ -43,7 +51,12 @@ class AtlaspackV3 {
       }
     });
     _WorkerPool.workerPool.releaseWorkers(workerIds);
-    return result;
+    if (error !== null) {
+      throw new (_diagnostic().default)({
+        diagnostic: error
+      });
+    }
+    return graph;
   }
 }
 exports.AtlaspackV3 = AtlaspackV3;

package/lib/public/BundleGraph.js

@@ -201,16 +201,18 @@ class BundleGraph {
         const [[trueAsset, ifTrueBundles], [falseAsset, ifFalseBundles]] = [condition.ifTrueDependency, condition.ifFalseDependency].map(dep => {
           const asset = this.#graph.getResolvedAsset(dep, (0, _Bundle.bundleToInternalBundle)(bundle));
           if (asset && this.#graph.bundleHasAsset((0, _Bundle.bundleToInternalBundle)(bundle), asset)) {
-            // Asset is in the same bundle
+            // Asset is in the same bundle, we know it doesn't need to be loaded externally
             return [asset, []];
           }
-          const resolvedAsync = (0, _nullthrows().default)(this.#graph.resolveAsyncDependency(dep, (0, _Bundle.bundleToInternalBundle)(bundle)), `Failed to load depenendency for '${dep.specifier}' specifier from '${String(dep.sourcePath)}'`);
+          const resolvedAsync = this.#graph.resolveAsyncDependency(dep, (0, _Bundle.bundleToInternalBundle)(bundle));
           if ((resolvedAsync === null || resolvedAsync === void 0 ? void 0 : resolvedAsync.type) === 'asset') {
             // Single bundle to load dynamically
             return [resolvedAsync.value, [this.#createBundle((0, _nullthrows().default)(this.#graph.getReferencedBundle(dep, (0, _Bundle.bundleToInternalBundle)(bundle)), `Failed to load referenced bundle for '${dep.specifier}' specifier from '${String(dep.sourcePath)}'`), this.#graph, this.#options)]];
-          } else {
+          } else if (resolvedAsync) {
             // Bundle group means we have multiple bundles to load first
             return [this.#graph.getAssetById(resolvedAsync.value.entryAssetId), this.#graph.getBundlesInBundleGroup(resolvedAsync.value).map(b => this.#createBundle(b, this.#graph, this.#options))];
+          } else {
+            return [(0, _nullthrows().default)(asset, `Failed to load depenendency for '${dep.specifier}' specifier from '${String(dep.sourcePath)}'`), []];
           }
         });
         conditions.add({

package/lib/requests/AssetGraphRequestRust.js

@@ -31,15 +31,8 @@ function createAssetGraphRequestRust(rustAtlaspack) {
     id: input.name,
     run: async input => {
       let options = input.options;
-      let serializedAssetGraph;
-      try {
-        serializedAssetGraph = await rustAtlaspack.buildAssetGraph();
-        serializedAssetGraph.nodes = serializedAssetGraph.nodes.flatMap(node => JSON.parse(node));
-      } catch (err) {
-        throw new (_diagnostic().default)({
-          diagnostic: err
-        });
-      }
+      let serializedAssetGraph = await rustAtlaspack.buildAssetGraph();
+      serializedAssetGraph.nodes = serializedAssetGraph.nodes.flatMap(node => JSON.parse(node));
       let {
         assetGraph,
         changedAssets

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3566+9ccbb847b",
+  "version": "2.12.1-canary.3568+2bb7fb28f",
   "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.3566+9ccbb847b",
-    "@atlaspack/cache": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/diagnostic": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/events": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/feature-flags": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/fs": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/graph": "3.2.1-canary.3566+9ccbb847b",
-    "@atlaspack/logger": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/package-manager": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/plugin": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/profiler": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/rust": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/types": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/utils": "2.12.1-canary.3566+9ccbb847b",
-    "@atlaspack/workers": "2.12.1-canary.3566+9ccbb847b",
+    "@atlaspack/build-cache": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/cache": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/diagnostic": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/events": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/feature-flags": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/fs": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/graph": "3.2.1-canary.3568+2bb7fb28f",
+    "@atlaspack/logger": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/package-manager": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/plugin": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/profiler": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/rust": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/types": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/utils": "2.12.1-canary.3568+2bb7fb28f",
+    "@atlaspack/workers": "2.12.1-canary.3568+2bb7fb28f",
     "@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": "9ccbb847b43d122706b8ac52bb80c017176405da"
+  "gitHead": "2bb7fb28f58d6d8e17c7917c4d0be72df125c328"
 }

package/src/atlaspack-v3/AtlaspackV3.js

@@ -6,6 +6,7 @@ import {
   type AtlaspackNapiOptions,
 } from '@atlaspack/rust';
 import {workerPool} from './WorkerPool';
+import ThrowableDiagnostic from '@atlaspack/diagnostic';
 
 export type AtlaspackV3Options = {|
   fs?: AtlaspackNapiOptions['fs'],
@@ -50,7 +51,8 @@ export class AtlaspackV3 {
 
   async buildAssetGraph(): Promise<any> {
     const workerIds = [];
-    let result = await this._internal.buildAssetGraph({
+
+    let [graph, error] = await this._internal.buildAssetGraph({
       registerWorker: (tx_worker) => {
         // $FlowFixMe
         const workerId = workerPool.registerWorker(tx_worker);
@@ -60,6 +62,12 @@ export class AtlaspackV3 {
 
     workerPool.releaseWorkers(workerIds);
 
-    return result;
+    if (error !== null) {
+      throw new ThrowableDiagnostic({
+        diagnostic: error,
+      });
+    }
+
+    return graph;
   }
 }

package/src/public/BundleGraph.js

@@ -369,18 +369,13 @@ export default class BundleGraph<TBundle: IBundle>
             asset &&
             this.#graph.bundleHasAsset(bundleToInternalBundle(bundle), asset)
           ) {
-            // Asset is in the same bundle
+            // Asset is in the same bundle, we know it doesn't need to be loaded externally
             return [asset, []];
           }
 
-          const resolvedAsync = nullthrows(
-            this.#graph.resolveAsyncDependency(
-              dep,
-              bundleToInternalBundle(bundle),
-            ),
-            `Failed to load depenendency for '${
-              dep.specifier
-            }' specifier from '${String(dep.sourcePath)}'`,
+          const resolvedAsync = this.#graph.resolveAsyncDependency(
+            dep,
+            bundleToInternalBundle(bundle),
           );
           if (resolvedAsync?.type === 'asset') {
             // Single bundle to load dynamically
@@ -402,7 +397,7 @@ export default class BundleGraph<TBundle: IBundle>
                 ),
               ],
             ];
-          } else {
+          } else if (resolvedAsync) {
             // Bundle group means we have multiple bundles to load first
             return [
               this.#graph.getAssetById(resolvedAsync.value.entryAssetId),
@@ -410,6 +405,16 @@ export default class BundleGraph<TBundle: IBundle>
                 .getBundlesInBundleGroup(resolvedAsync.value)
                 .map((b) => this.#createBundle(b, this.#graph, this.#options)),
             ];
+          } else {
+            return [
+              nullthrows(
+                asset,
+                `Failed to load depenendency for '${
+                  dep.specifier
+                }' specifier from '${String(dep.sourcePath)}'`,
+              ),
+              [],
+            ];
           }
         });
 

package/src/requests/AssetGraphRequestRust.js

@@ -37,17 +37,11 @@ export function createAssetGraphRequestRust(
     id: input.name,
     run: async (input) => {
       let options = input.options;
-      let serializedAssetGraph;
-      try {
-        serializedAssetGraph = await rustAtlaspack.buildAssetGraph();
-        serializedAssetGraph.nodes = serializedAssetGraph.nodes.flatMap(
-          (node) => JSON.parse(node),
-        );
-      } catch (err) {
-        throw new ThrowableDiagnostic({
-          diagnostic: err,
-        });
-      }
+      let serializedAssetGraph = await rustAtlaspack.buildAssetGraph();
+
+      serializedAssetGraph.nodes = serializedAssetGraph.nodes.flatMap((node) =>
+        JSON.parse(node),
+      );
 
       let {assetGraph, changedAssets} = instrument(
         'atlaspack_v3_getAssetGraph',