@atlaspack/core 2.16.2-canary.293 → 2.16.2-canary.295

package/dist/atlaspack-v3/AtlaspackV3.js

@@ -48,15 +48,8 @@ class AtlaspackV3 {
             this._napiWorkerPool.shutdown();
         }
     }
-    async buildAssetGraph() {
-        // @ts-expect-error TS2488
-        let [graph, error] = await (0, rust_1.atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);
-        if (error !== null) {
-            throw new diagnostic_1.default({
-                diagnostic: error,
-            });
-        }
-        return graph;
+    buildAssetGraph() {
+        return (0, rust_1.atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);
     }
     async respondToFsEvents(events) {
         // @ts-expect-error TS2488

package/dist/requests/AssetGraphRequestRust.js

@@ -22,11 +22,13 @@ function createAssetGraphRequestRust(rustAtlaspack) {
         id: input.name,
         run: async (input) => {
             let options = input.options;
-            let serializedAssetGraph = (await rustAtlaspack.buildAssetGraph());
-            // Newly created nodes
-            serializedAssetGraph.nodes = serializedAssetGraph.nodes.map((node) => JSON.parse(node));
-            // Updated existing nodes
-            serializedAssetGraph.updates = serializedAssetGraph.updates.map((node) => JSON.parse(node));
+            let { assetGraphPromise, commitPromise } = await rustAtlaspack.buildAssetGraph();
+            let [serializedAssetGraph, assetGraphError] = (await assetGraphPromise);
+            if (assetGraphError) {
+                throw new diagnostic_1.default({
+                    diagnostic: assetGraphError,
+                });
+            }
             // Don't reuse a previous asset graph result if Rust didn't have one too
             let prevResult = null;
             if (serializedAssetGraph.hadPreviousGraph) {
@@ -58,6 +60,14 @@ function createAssetGraphRequestRust(rustAtlaspack) {
                 changedAssetsPropagation,
                 previousSymbolPropagationErrors: undefined,
             };
+            let [_commitResult, commitError] = await commitPromise;
+            if (commitError) {
+                throw new diagnostic_1.default({
+                    diagnostic: {
+                        message: 'Error committing asset graph in Rust: ' + commitError.message,
+                    },
+                });
+            }
             await input.api.storeResult(result);
             input.api.invalidateOnBuild();
             return result;
@@ -168,6 +178,7 @@ function getAssetGraph(serializedGraph, prevAssetGraph) {
         let node = isUpdateNode
             ? serializedGraph.updates[index - nodeTypeSwitchoverIndex]
             : serializedGraph.nodes[index];
+        node = JSON.parse(node);
         if (node.type === 'entry') {
             let id = 'entry:' + ++entry;
             graph.addNodeByContentKey(id, {

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -69,15 +69,8 @@ class AtlaspackV3 {
       this._napiWorkerPool.shutdown();
     }
   }
-  async buildAssetGraph() {
-    // @ts-expect-error TS2488
-    let [graph, error] = await (0, _rust().atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);
-    if (error !== null) {
-      throw new (_diagnostic().default)({
-        diagnostic: error
-      });
-    }
-    return graph;
+  buildAssetGraph() {
+    return (0, _rust().atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);
   }
   async respondToFsEvents(events) {
     // @ts-expect-error TS2488

package/lib/requests/AssetGraphRequestRust.js

@@ -46,13 +46,16 @@ function createAssetGraphRequestRust(rustAtlaspack) {
     id: input.name,
     run: async input => {
       let options = input.options;
-      let serializedAssetGraph = await rustAtlaspack.buildAssetGraph();
-
-      // Newly created nodes
-      serializedAssetGraph.nodes = serializedAssetGraph.nodes.map(node => JSON.parse(node));
-
-      // Updated existing nodes
-      serializedAssetGraph.updates = serializedAssetGraph.updates.map(node => JSON.parse(node));
+      let {
+        assetGraphPromise,
+        commitPromise
+      } = await rustAtlaspack.buildAssetGraph();
+      let [serializedAssetGraph, assetGraphError] = await assetGraphPromise;
+      if (assetGraphError) {
+        throw new (_diagnostic().default)({
+          diagnostic: assetGraphError
+        });
+      }
 
       // Don't reuse a previous asset graph result if Rust didn't have one too
       let prevResult = null;
@@ -91,6 +94,14 @@ function createAssetGraphRequestRust(rustAtlaspack) {
         changedAssetsPropagation,
         previousSymbolPropagationErrors: undefined
       };
+      let [_commitResult, commitError] = await commitPromise;
+      if (commitError) {
+        throw new (_diagnostic().default)({
+          diagnostic: {
+            message: 'Error committing asset graph in Rust: ' + commitError.message
+          }
+        });
+      }
       await input.api.storeResult(result);
       input.api.invalidateOnBuild();
       return result;
@@ -188,6 +199,7 @@ function getAssetGraph(serializedGraph, prevAssetGraph) {
   for (let index = 0; index < nodesCount; index++) {
     let isUpdateNode = index >= nodeTypeSwitchoverIndex;
     let node = isUpdateNode ? serializedGraph.updates[index - nodeTypeSwitchoverIndex] : serializedGraph.nodes[index];
+    node = JSON.parse(node);
     if (node.type === 'entry') {
       let id = 'entry:' + ++entry;
       graph.addNodeByContentKey(id, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-canary.293+57105322b",
+  "version": "2.16.2-canary.295+28f5424f7",
   "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.361+57105322b",
-    "@atlaspack/cache": "3.1.1-canary.293+57105322b",
-    "@atlaspack/diagnostic": "2.14.1-canary.361+57105322b",
-    "@atlaspack/events": "2.14.1-canary.361+57105322b",
-    "@atlaspack/feature-flags": "2.14.1-canary.361+57105322b",
-    "@atlaspack/fs": "2.14.5-canary.293+57105322b",
-    "@atlaspack/graph": "3.4.1-canary.361+57105322b",
-    "@atlaspack/logger": "2.14.5-canary.293+57105322b",
-    "@atlaspack/package-manager": "2.14.5-canary.293+57105322b",
-    "@atlaspack/plugin": "2.14.5-canary.293+57105322b",
-    "@atlaspack/profiler": "2.14.1-canary.361+57105322b",
-    "@atlaspack/rust": "3.2.1-canary.293+57105322b",
-    "@atlaspack/source-map": "3.1.1-canary.4072+57105322b",
-    "@atlaspack/types": "2.14.5-canary.293+57105322b",
-    "@atlaspack/utils": "2.14.5-canary.293+57105322b",
-    "@atlaspack/workers": "2.14.5-canary.293+57105322b",
+    "@atlaspack/build-cache": "2.13.3-canary.363+28f5424f7",
+    "@atlaspack/cache": "3.1.1-canary.295+28f5424f7",
+    "@atlaspack/diagnostic": "2.14.1-canary.363+28f5424f7",
+    "@atlaspack/events": "2.14.1-canary.363+28f5424f7",
+    "@atlaspack/feature-flags": "2.14.1-canary.363+28f5424f7",
+    "@atlaspack/fs": "2.14.5-canary.295+28f5424f7",
+    "@atlaspack/graph": "3.4.1-canary.363+28f5424f7",
+    "@atlaspack/logger": "2.14.5-canary.295+28f5424f7",
+    "@atlaspack/package-manager": "2.14.5-canary.295+28f5424f7",
+    "@atlaspack/plugin": "2.14.5-canary.295+28f5424f7",
+    "@atlaspack/profiler": "2.14.1-canary.363+28f5424f7",
+    "@atlaspack/rust": "3.2.1-canary.295+28f5424f7",
+    "@atlaspack/source-map": "3.1.1-canary.4074+28f5424f7",
+    "@atlaspack/types": "2.14.5-canary.295+28f5424f7",
+    "@atlaspack/utils": "2.14.5-canary.295+28f5424f7",
+    "@atlaspack/workers": "2.14.5-canary.295+28f5424f7",
     "@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": "57105322b26ce42af2cbfcc0506cff929e50b630"
+  "gitHead": "28f5424f7e2080dd4fbbeb1bc5314a530197a23e"
 }

package/src/atlaspack-v3/AtlaspackV3.ts

@@ -91,19 +91,8 @@ export class AtlaspackV3 {
     }
   }
 
-  async buildAssetGraph(): Promise<any> {
-    // @ts-expect-error TS2488
-    let [graph, error] = await atlaspackNapiBuildAssetGraph(
-      this._atlaspack_napi,
-    );
-
-    if (error !== null) {
-      throw new ThrowableDiagnostic({
-        diagnostic: error,
-      });
-    }
-
-    return graph;
+  buildAssetGraph(): Promise<any> {
+    return atlaspackNapiBuildAssetGraph(this._atlaspack_napi) as Promise<any>;
   }
 
   async respondToFsEvents(events: Array<Event>): Promise<boolean> {

package/src/requests/AssetGraphRequestRust.ts

@@ -53,18 +53,17 @@ export function createAssetGraphRequestRust(
     id: input.name,
     run: async (input) => {
       let options = input.options;
-      let serializedAssetGraph =
-        (await rustAtlaspack.buildAssetGraph()) as SerializedAssetGraphDelta;
+      let {assetGraphPromise, commitPromise} =
+        await rustAtlaspack.buildAssetGraph();
 
-      // Newly created nodes
-      serializedAssetGraph.nodes = serializedAssetGraph.nodes.map((node) =>
-        JSON.parse(node),
-      );
+      let [serializedAssetGraph, assetGraphError] =
+        (await assetGraphPromise) as [SerializedAssetGraphDelta, Error | null];
 
-      // Updated existing nodes
-      serializedAssetGraph.updates = serializedAssetGraph.updates.map((node) =>
-        JSON.parse(node),
-      );
+      if (assetGraphError) {
+        throw new ThrowableDiagnostic({
+          diagnostic: assetGraphError,
+        });
+      }
 
       // Don't reuse a previous asset graph result if Rust didn't have one too
       let prevResult = null;
@@ -106,6 +105,17 @@ export function createAssetGraphRequestRust(
         previousSymbolPropagationErrors: undefined,
       };
 
+      let [_commitResult, commitError] = await commitPromise;
+
+      if (commitError) {
+        throw new ThrowableDiagnostic({
+          diagnostic: {
+            message:
+              'Error committing asset graph in Rust: ' + commitError.message,
+          },
+        });
+      }
+
       await input.api.storeResult(result);
       input.api.invalidateOnBuild();
 
@@ -242,6 +252,8 @@ export function getAssetGraph(
       ? serializedGraph.updates[index - nodeTypeSwitchoverIndex]
       : serializedGraph.nodes[index];
 
+    node = JSON.parse(node);
+
     if (node.type === 'entry') {
       let id = 'entry:' + ++entry;