@atlaspack/core 2.16.2-canary.435 → 2.16.2-canary.438

package/dist/Atlaspack.js

@@ -158,6 +158,7 @@ class Atlaspack {
         __classPrivateFieldSet(this, _Atlaspack_resolvedOptions, resolvedOptions, "f");
         let rustAtlaspack;
         if (resolvedOptions.featureFlags.atlaspackV3 ||
+            resolvedOptions.featureFlags.fullNative ||
             resolvedOptions.featureFlags.nativePackager) {
             // eslint-disable-next-line no-unused-vars
             let { entries, inputFS, outputFS, ...options } = __classPrivateFieldGet(this, _Atlaspack_initialOptions, "f");
@@ -374,12 +375,35 @@ class Atlaspack {
                 type: 'buildStart',
             });
             __classPrivateFieldGet(this, _Atlaspack_requestTracker, "f").graph.invalidateOnBuildNodes();
-            let request = (0, AtlaspackBuildRequest_1.default)({
-                optionsRef: __classPrivateFieldGet(this, _Atlaspack_optionsRef, "f"),
-                requestedAssetIds: __classPrivateFieldGet(this, _Atlaspack_requestedAssetIds, "f"),
-                signal,
-            });
-            let { bundleGraph, bundleInfo, changedAssets, assetRequests, scopeHoistingStats, } = await __classPrivateFieldGet(this, _Atlaspack_requestTracker, "f").runRequest(request, { force: true });
+            let bundleGraph;
+            let bundleInfo;
+            let changedAssets;
+            let assetRequests;
+            let scopeHoistingStats;
+            if ((0, feature_flags_1.getFeatureFlag)('fullNative') && this.rustAtlaspack) {
+                let [result, error] = await this.rustAtlaspack.build();
+                if (error) {
+                    throw new diagnostic_1.default({ diagnostic: error });
+                }
+                bundleGraph = result.bundleGraph;
+                bundleInfo = new Map();
+                changedAssets = result.changedAssets ?? new Map();
+                assetRequests = result.assetRequests ?? [];
+            }
+            else {
+                let request = (0, AtlaspackBuildRequest_1.default)({
+                    optionsRef: __classPrivateFieldGet(this, _Atlaspack_optionsRef, "f"),
+                    requestedAssetIds: __classPrivateFieldGet(this, _Atlaspack_requestedAssetIds, "f"),
+                    signal,
+                });
+                ({
+                    bundleGraph,
+                    bundleInfo,
+                    changedAssets,
+                    assetRequests,
+                    scopeHoistingStats,
+                } = await __classPrivateFieldGet(this, _Atlaspack_requestTracker, "f").runRequest(request, { force: true }));
+            }
             __classPrivateFieldGet(this, _Atlaspack_requestedAssetIds, "f").clear();
             await (0, dumpGraphToGraphViz_1.default)(
             // @ts-expect-error TS2345

package/dist/atlaspack-v3/AtlaspackV3.js

@@ -54,6 +54,9 @@ class AtlaspackV3 {
     buildBundleGraph() {
         return (0, rust_1.atlaspackNapiBuildBundleGraph)(this._atlaspack_napi);
     }
+    build() {
+        return (0, rust_1.atlaspackNapiBuild)(this._atlaspack_napi);
+    }
     loadBundleGraph(bundleGraph) {
         const { nodesJson, edges, publicIdByAssetId, environmentsJson } = bundleGraph.serializeForNative();
         return (0, rust_1.atlaspackNapiLoadBundleGraph)(this._atlaspack_napi, nodesJson, edges, publicIdByAssetId, environmentsJson);

package/dist/atlaspack-v3/fs.js

@@ -45,6 +45,7 @@ class FileSystemV3 {
                 return __classPrivateFieldGet(this, _FileSystemV3_fs, "f").readFileSync(path, encoding);
             }
         });
+        this.writeFile = (0, jsCallable_1.jsCallable)((path, contents) => __classPrivateFieldGet(this, _FileSystemV3_fs, "f").writeFile(path, Buffer.from(contents)));
         __classPrivateFieldSet(this, _FileSystemV3_fs, fs, "f");
     }
 }

package/dist/requests/AtlaspackBuildRequest.js

@@ -18,6 +18,7 @@ const profiler_1 = require("@atlaspack/profiler");
 const RequestTracker_1 = require("../RequestTracker");
 const feature_flags_1 = require("@atlaspack/feature-flags");
 const EnvironmentManager_1 = require("../EnvironmentManager");
+const logger_1 = require("@atlaspack/logger");
 function createAtlaspackBuildRequest(input) {
     return {
         type: RequestTracker_1.requestTypes.atlaspack_build_request,
@@ -78,12 +79,14 @@ async function run({ input, api, options, rustAtlaspack, }) {
         ])),
     });
     let packagingMeasurement = profiler_1.tracer.createMeasurement('packaging');
+    const span = logger_1.tracer.enter('writeBundles');
     let writeBundlesRequest = (0, WriteBundlesRequest_1.default)({
         bundleGraph,
         optionsRef,
     });
     let { bundleInfo, scopeHoistingStats } = await api.runRequest(writeBundlesRequest);
     packagingMeasurement && packagingMeasurement.end();
+    logger_1.tracer.exit(span);
     (0, utils_1.assertSignalNotAborted)(signal);
     return {
         bundleGraph,

package/lib/Atlaspack.js

@@ -197,7 +197,7 @@ class Atlaspack {
     });
     this.#resolvedOptions = resolvedOptions;
     let rustAtlaspack;
-    if (resolvedOptions.featureFlags.atlaspackV3 || resolvedOptions.featureFlags.nativePackager) {
+    if (resolvedOptions.featureFlags.atlaspackV3 || resolvedOptions.featureFlags.fullNative || resolvedOptions.featureFlags.nativePackager) {
       // eslint-disable-next-line no-unused-vars
       let {
         entries,
@@ -428,20 +428,38 @@ class Atlaspack {
         type: 'buildStart'
       });
       this.#requestTracker.graph.invalidateOnBuildNodes();
-      let request = (0, _AtlaspackBuildRequest.default)({
-        optionsRef: this.#optionsRef,
-        requestedAssetIds: this.#requestedAssetIds,
-        signal
-      });
-      let {
-        bundleGraph,
-        bundleInfo,
-        changedAssets,
-        assetRequests,
-        scopeHoistingStats
-      } = await this.#requestTracker.runRequest(request, {
-        force: true
-      });
+      let bundleGraph;
+      let bundleInfo;
+      let changedAssets;
+      let assetRequests;
+      let scopeHoistingStats;
+      if ((0, _featureFlags().getFeatureFlag)('fullNative') && this.rustAtlaspack) {
+        let [result, error] = await this.rustAtlaspack.build();
+        if (error) {
+          throw new (_diagnostic().default)({
+            diagnostic: error
+          });
+        }
+        bundleGraph = result.bundleGraph;
+        bundleInfo = new Map();
+        changedAssets = result.changedAssets ?? new Map();
+        assetRequests = result.assetRequests ?? [];
+      } else {
+        let request = (0, _AtlaspackBuildRequest.default)({
+          optionsRef: this.#optionsRef,
+          requestedAssetIds: this.#requestedAssetIds,
+          signal
+        });
+        ({
+          bundleGraph,
+          bundleInfo,
+          changedAssets,
+          assetRequests,
+          scopeHoistingStats
+        } = await this.#requestTracker.runRequest(request, {
+          force: true
+        }));
+      }
       this.#requestedAssetIds.clear();
       await (0, _dumpGraphToGraphViz.default)(
       // @ts-expect-error TS2345

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -75,6 +75,9 @@ class AtlaspackV3 {
   buildBundleGraph() {
     return (0, _rust().atlaspackNapiBuildBundleGraph)(this._atlaspack_napi);
   }
+  build() {
+    return (0, _rust().atlaspackNapiBuild)(this._atlaspack_napi);
+  }
   loadBundleGraph(bundleGraph) {
     const {
       nodesJson,

package/lib/atlaspack-v3/fs.js

@@ -37,5 +37,6 @@ class FileSystemV3 {
       return this.#fs.readFileSync(path, encoding);
     }
   });
+  writeFile = (0, _jsCallable.jsCallable)((path, contents) => this.#fs.writeFile(path, Buffer.from(contents)));
 }
 exports.FileSystemV3 = FileSystemV3;

package/lib/requests/AtlaspackBuildRequest.js

@@ -30,6 +30,13 @@ function _featureFlags() {
   return data;
 }
 var _EnvironmentManager = require("../EnvironmentManager");
+function _logger() {
+  const data = require("@atlaspack/logger");
+  _logger = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function createAtlaspackBuildRequest(input) {
   return {
@@ -96,6 +103,7 @@ async function run({
     changedAssets: new Map(Array.from(changedAssets).map(([id, asset]) => [id, (0, _Asset.assetFromValue)(asset, options)]))
   });
   let packagingMeasurement = _profiler().tracer.createMeasurement('packaging');
+  const span = _logger().tracer.enter('writeBundles');
   let writeBundlesRequest = (0, _WriteBundlesRequest.default)({
     bundleGraph,
     optionsRef
@@ -105,6 +113,7 @@ async function run({
     scopeHoistingStats
   } = await api.runRequest(writeBundlesRequest);
   packagingMeasurement && packagingMeasurement.end();
+  _logger().tracer.exit(span);
   (0, _utils.assertSignalNotAborted)(signal);
   return {
     bundleGraph,

package/lib/types/atlaspack-v3/AtlaspackV3.d.ts

@@ -26,6 +26,7 @@ export declare class AtlaspackV3 {
     end(): void;
     buildAssetGraph(): Promise<any>;
     buildBundleGraph(): Promise<any>;
+    build(): Promise<any>;
     loadBundleGraph(bundleGraph: BundleGraph): Promise<void>;
     updateBundleGraph(bundleGraph: BundleGraph, changedAssetIds: string[]): Promise<void>;
     package(bundleId: string, options?: PackageOptions): Promise<[RunPackagerRunnerResult, Diagnostic | null]>;

package/lib/types/atlaspack-v3/fs.d.ts

@@ -9,4 +9,5 @@ export declare class FileSystemV3 implements FileSystem {
     isFile: JsCallable<[FilePath], boolean>;
     isDir: JsCallable<[FilePath], boolean>;
     readFile: JsCallable<[FilePath, Encoding], string>;
+    writeFile: JsCallable<[FilePath, number[]], Promise<void>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-canary.435+b7b60dbe9",
+  "version": "2.16.2-canary.438+cba96b1a1",
   "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.503+b7b60dbe9",
-    "@atlaspack/cache": "3.1.1-canary.435+b7b60dbe9",
-    "@atlaspack/diagnostic": "2.14.1-canary.503+b7b60dbe9",
-    "@atlaspack/events": "2.14.1-canary.503+b7b60dbe9",
-    "@atlaspack/feature-flags": "2.14.1-canary.503+b7b60dbe9",
-    "@atlaspack/fs": "2.14.5-canary.435+b7b60dbe9",
-    "@atlaspack/graph": "3.4.1-canary.503+b7b60dbe9",
-    "@atlaspack/logger": "2.14.5-canary.435+b7b60dbe9",
-    "@atlaspack/package-manager": "2.14.5-canary.435+b7b60dbe9",
-    "@atlaspack/plugin": "2.14.5-canary.435+b7b60dbe9",
-    "@atlaspack/profiler": "2.14.1-canary.503+b7b60dbe9",
-    "@atlaspack/rust": "3.2.1-canary.435+b7b60dbe9",
-    "@atlaspack/source-map": "3.3.1-canary.4214+b7b60dbe9",
-    "@atlaspack/types": "2.14.5-canary.435+b7b60dbe9",
-    "@atlaspack/utils": "2.14.5-canary.435+b7b60dbe9",
-    "@atlaspack/workers": "2.14.5-canary.435+b7b60dbe9",
+    "@atlaspack/build-cache": "2.13.3-canary.506+cba96b1a1",
+    "@atlaspack/cache": "3.1.1-canary.438+cba96b1a1",
+    "@atlaspack/diagnostic": "2.14.1-canary.506+cba96b1a1",
+    "@atlaspack/events": "2.14.1-canary.506+cba96b1a1",
+    "@atlaspack/feature-flags": "2.14.1-canary.506+cba96b1a1",
+    "@atlaspack/fs": "2.14.5-canary.438+cba96b1a1",
+    "@atlaspack/graph": "3.4.1-canary.506+cba96b1a1",
+    "@atlaspack/logger": "2.14.5-canary.438+cba96b1a1",
+    "@atlaspack/package-manager": "2.14.5-canary.438+cba96b1a1",
+    "@atlaspack/plugin": "2.14.5-canary.438+cba96b1a1",
+    "@atlaspack/profiler": "2.14.1-canary.506+cba96b1a1",
+    "@atlaspack/rust": "3.2.1-canary.438+cba96b1a1",
+    "@atlaspack/source-map": "3.3.1-canary.4217+cba96b1a1",
+    "@atlaspack/types": "2.14.5-canary.438+cba96b1a1",
+    "@atlaspack/utils": "2.14.5-canary.438+cba96b1a1",
+    "@atlaspack/workers": "2.14.5-canary.438+cba96b1a1",
     "@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": "b7b60dbe90b275adfc24de429cdb86bf9d64936e"
+  "gitHead": "cba96b1a15c07703ee104bf2a2888cc715575cbd"
 }

package/src/Atlaspack.ts

@@ -171,6 +171,7 @@ export default class Atlaspack {
     let rustAtlaspack: AtlaspackV3;
     if (
       resolvedOptions.featureFlags.atlaspackV3 ||
+      resolvedOptions.featureFlags.fullNative ||
       resolvedOptions.featureFlags.nativePackager
     ) {
       // eslint-disable-next-line no-unused-vars
@@ -433,19 +434,38 @@ export default class Atlaspack {
 
       this.#requestTracker.graph.invalidateOnBuildNodes();
 
-      let request = createAtlaspackBuildRequest({
-        optionsRef: this.#optionsRef,
-        requestedAssetIds: this.#requestedAssetIds,
-        signal,
-      });
+      let bundleGraph: any;
+      let bundleInfo: Map<any, any>;
+      let changedAssets: Map<any, any>;
+      let assetRequests: Array<any>;
+      let scopeHoistingStats: any;
 
-      let {
-        bundleGraph,
-        bundleInfo,
-        changedAssets,
-        assetRequests,
-        scopeHoistingStats,
-      } = await this.#requestTracker.runRequest(request, {force: true});
+      if (getFeatureFlag('fullNative') && this.rustAtlaspack) {
+        let [result, error] = await this.rustAtlaspack.build();
+
+        if (error) {
+          throw new ThrowableDiagnostic({diagnostic: error});
+        }
+
+        bundleGraph = result.bundleGraph;
+        bundleInfo = new Map();
+        changedAssets = result.changedAssets ?? new Map();
+        assetRequests = result.assetRequests ?? [];
+      } else {
+        let request = createAtlaspackBuildRequest({
+          optionsRef: this.#optionsRef,
+          requestedAssetIds: this.#requestedAssetIds,
+          signal,
+        });
+
+        ({
+          bundleGraph,
+          bundleInfo,
+          changedAssets,
+          assetRequests,
+          scopeHoistingStats,
+        } = await this.#requestTracker.runRequest(request, {force: true}));
+      }
 
       this.#requestedAssetIds.clear();
 

package/src/atlaspack-v3/AtlaspackV3.ts

@@ -1,5 +1,6 @@
 import {
   atlaspackNapiCreate,
+  atlaspackNapiBuild,
   atlaspackNapiBuildAssetGraph,
   atlaspackNapiBuildBundleGraph,
   atlaspackNapiRespondToFsEvents,
@@ -108,6 +109,10 @@ export class AtlaspackV3 {
     return atlaspackNapiBuildBundleGraph(this._atlaspack_napi) as Promise<any>;
   }
 
+  build(): Promise<any> {
+    return atlaspackNapiBuild(this._atlaspack_napi) as Promise<any>;
+  }
+
   loadBundleGraph(bundleGraph: BundleGraph): Promise<void> {
     const {nodesJson, edges, publicIdByAssetId, environmentsJson} =
       bundleGraph.serializeForNative();

package/src/atlaspack-v3/fs.ts

@@ -51,4 +51,9 @@ export class FileSystemV3 implements FileSystem {
       }
     },
   );
+
+  writeFile: JsCallable<[FilePath, number[]], Promise<void>> = jsCallable(
+    (path: FilePath, contents: number[]) =>
+      this.#fs.writeFile(path, Buffer.from(contents)),
+  );
 }

package/src/requests/AtlaspackBuildRequest.ts

@@ -23,6 +23,7 @@ import {tracer} from '@atlaspack/profiler';
 import {requestTypes} from '../RequestTracker';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {fromEnvironmentId} from '../EnvironmentManager';
+import {tracer as atlaspackTracer} from '@atlaspack/logger';
 
 type AtlaspackBuildRequestInput = {
   optionsRef: SharedReference;
@@ -144,6 +145,8 @@ async function run({
   });
 
   let packagingMeasurement = tracer.createMeasurement('packaging');
+  const span = atlaspackTracer.enter('writeBundles');
+
   let writeBundlesRequest = createWriteBundlesRequest({
     bundleGraph,
     optionsRef,
@@ -152,6 +155,7 @@ async function run({
   let {bundleInfo, scopeHoistingStats} =
     await api.runRequest(writeBundlesRequest);
   packagingMeasurement && packagingMeasurement.end();
+  atlaspackTracer.exit(span);
   assertSignalNotAborted(signal);
 
   return {