@atlaspack/core 2.12.1-canary.3565 → 2.12.1-canary.3567

package/lib/BundleGraph.js

@@ -1116,9 +1116,16 @@ class BundleGraph {
     if (!this._graph.hasContentKey(dep.id)) {
       return null;
     }
-    let res = this._graph.getNodeIdsConnectedTo(this._graph.getNodeIdByContentKey(dep.id));
-    (0, _assert().default)(res.length <= 1, 'Expected a single asset to be connected to a dependency');
-    let resNode = this._graph.getNode(res[0]);
+    let res = null;
+    let count = 0;
+    this._graph.forEachNodeIdConnectedTo(this._graph.getNodeIdByContentKey(dep.id), node => {
+      res = node;
+      count += 1;
+      if (count > 1) {
+        throw new Error('Expected a single asset to be connected to a dependency');
+      }
+    }, 1);
+    let resNode = res != null ? this._graph.getNode(res) : null;
     if ((resNode === null || resNode === void 0 ? void 0 : resNode.type) === 'asset') {
       return resNode.value;
     }

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/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.3565+2b1e35dc3",
+  "version": "2.12.1-canary.3567+e0effea53",
   "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.3565+2b1e35dc3",
-    "@atlaspack/cache": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/diagnostic": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/events": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/feature-flags": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/fs": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/graph": "3.2.1-canary.3565+2b1e35dc3",
-    "@atlaspack/logger": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/package-manager": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/plugin": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/profiler": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/rust": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/types": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/utils": "2.12.1-canary.3565+2b1e35dc3",
-    "@atlaspack/workers": "2.12.1-canary.3565+2b1e35dc3",
+    "@atlaspack/build-cache": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/cache": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/diagnostic": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/events": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/feature-flags": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/fs": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/graph": "3.2.1-canary.3567+e0effea53",
+    "@atlaspack/logger": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/package-manager": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/plugin": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/profiler": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/rust": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/types": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/utils": "2.12.1-canary.3567+e0effea53",
+    "@atlaspack/workers": "2.12.1-canary.3567+e0effea53",
     "@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": "2b1e35dc3d51843fba13edcb958c01406ff355e4"
+  "gitHead": "e0effea53c21b3c3e3bc9d368468c562e5f80531"
 }

package/src/BundleGraph.js

@@ -1773,14 +1773,23 @@ export default class BundleGraph {
       return null;
     }
 
-    let res = this._graph.getNodeIdsConnectedTo(
+    let res = null;
+    let count = 0;
+    this._graph.forEachNodeIdConnectedTo(
       this._graph.getNodeIdByContentKey(dep.id),
+      (node) => {
+        res = node;
+        count += 1;
+        if (count > 1) {
+          throw new Error(
+            'Expected a single asset to be connected to a dependency',
+          );
+        }
+      },
+      1,
     );
-    invariant(
-      res.length <= 1,
-      'Expected a single asset to be connected to a dependency',
-    );
-    let resNode = this._graph.getNode(res[0]);
+
+    let resNode = res != null ? this._graph.getNode(res) : null;
     if (resNode?.type === 'asset') {
       return resNode.value;
     }

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/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',