@atlaspack/core 2.12.1-canary.3490 → 2.12.1-canary.3492

package/lib/Atlaspack.js

@@ -94,6 +94,13 @@ function _rust() {
   return data;
 }
 var _projectPath = require("./projectPath");
+function _cache() {
+  const data = require("@atlaspack/cache");
+  _cache = function () {
+    return data;
+  };
+  return data;
+}
 function _profiler() {
   const data = require("@atlaspack/profiler");
   _profiler = function () {
@@ -109,6 +116,8 @@ function _featureFlags() {
   return data;
 }
 var _atlaspackV = require("./atlaspack-v3");
+var _AssetGraphRequest = _interopRequireDefault(require("./requests/AssetGraphRequest"));
+var _AssetGraphRequestRust = require("./requests/AssetGraphRequestRust");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -123,7 +132,6 @@ class Atlaspack {
   #initialized /*: boolean*/ = false;
   #disposable /*: Disposable */;
   #initialOptions /*: InitialAtlaspackOptions */;
-  #atlaspackV3;
   #reporterRunner /*: ReporterRunner*/;
   #resolvedOptions /*: ?AtlaspackOptions*/ = null;
   #optionsRef /*: SharedReference */;
@@ -181,6 +189,11 @@ class Atlaspack {
         outputFS,
         ...options
       } = this.#initialOptions;
+      const lmdb = resolvedOptions.cache instanceof _cache().LMDBLiteCache ? resolvedOptions.cache.getNativeRef() : null;
+
+      // $FlowFixMe
+      const version = require('../package.json').version;
+      await (lmdb === null || lmdb === void 0 ? void 0 : lmdb.put('current_session_version', Buffer.from(version)));
       rustAtlaspack = new _atlaspackV.AtlaspackV3({
         ...options,
         corePath: _path().default.join(__dirname, '..'),
@@ -197,9 +210,11 @@ class Atlaspack {
           sourceMaps: resolvedOptions.defaultTargetOptions.sourceMaps,
           shouldOptimize: resolvedOptions.defaultTargetOptions.shouldOptimize,
           shouldScopeHoist: resolvedOptions.defaultTargetOptions.shouldScopeHoist
-        }
+        },
+        lmdb: lmdb ?? null
       });
     }
+    this.rustAtlaspack = rustAtlaspack;
     let {
       config
     } = await (0, _AtlaspackConfigRequest.loadAtlaspackConfig)(resolvedOptions);
@@ -530,6 +545,30 @@ class Atlaspack {
   async unstable_invalidate() {
     await this._init();
   }
+
+  /**
+   * Build the asset graph
+   */
+  async unstable_buildAssetGraph() {
+    await this._init();
+    const input = {
+      optionsRef: this.#optionsRef,
+      name: 'Main',
+      entries: this.#config.options.entries,
+      shouldBuildLazily: false,
+      lazyIncludes: [],
+      lazyExcludes: [],
+      requestedAssetIds: this.#requestedAssetIds
+    };
+    await this.#requestTracker.runRequest(this.rustAtlaspack != null ? (0, _AssetGraphRequestRust.createAssetGraphRequestRust)(this.rustAtlaspack)(input) : (0, _AssetGraphRequest.default)(input));
+    // eslint-disable-next-line no-console
+    console.log('Done building asset graph!');
+    // eslint-disable-next-line no-console
+    console.log('Write request tracker to cache');
+    await this.writeRequestTrackerToCache();
+    // eslint-disable-next-line no-console
+    console.log('Done writing request tracker to cache');
+  }
   async unstable_transform(options) {
     var _options$env;
     if (!this.#initialized) {

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AtlaspackV3 = void 0;
-var _WorkerPool = require("./WorkerPool");
 function _rust() {
   const data = require("@atlaspack/rust");
   _rust = function () {
@@ -12,12 +11,14 @@ function _rust() {
   };
   return data;
 }
+var _WorkerPool = require("./WorkerPool");
 class AtlaspackV3 {
   constructor({
     fs,
     nodeWorkers,
     packageManager,
     threads,
+    lmdb,
     ...options
   }) {
     options.logLevel = options.logLevel || 'error';
@@ -26,13 +27,13 @@ class AtlaspackV3 {
     options.defaultTargetOptions.engines = options.defaultTargetOptions.engines || {
       browsers: []
     };
-    this._internal = new (_rust().AtlaspackNapi)({
+    this._internal = _rust().AtlaspackNapi.create({
       fs,
       nodeWorkers,
       packageManager,
       threads,
       options
-    });
+    }, lmdb);
   }
   async buildAssetGraph() {
     const workerIds = [];

package/lib/requests/AssetRequest.js

@@ -42,11 +42,6 @@ function createAssetRequest(input) {
 }
 const type = 'asset_request';
 function getId(input) {
-  // eslint-disable-next-line no-unused-vars
-  let {
-    optionsRef,
-    ...hashInput
-  } = input;
   return (0, _rust().hashString)(type + (0, _projectPath.fromProjectPathRelative)(input.filePath) + input.env.id + String(input.isSource) + String(input.sideEffects) + (input.code ?? '') + ':' + (input.pipeline ?? '') + ':' + (input.query ?? ''));
 }
 async function run({

package/lib/resolveOptions.js

@@ -111,12 +111,13 @@ async function resolveOptions(initialOptions) {
   // where symlinked dependencies outside the project root need to trigger HMR
   // updates. Default to the project root if not provided.
   let watchDir = initialOptions.watchDir != null ? _path().default.resolve(initialOptions.watchDir) : projectRoot;
-  let cache = initialOptions.cache ?? (outputFS instanceof _fs().NodeFS ? (() => {
-    if ((0, _featureFlags().getFeatureFlag)('useLmdbJsLite')) {
+  const needsRustLmdbCache = (0, _featureFlags().getFeatureFlag)('useLmdbJsLite') || (0, _featureFlags().getFeatureFlag)('atlaspackV3');
+  let cache = outputFS instanceof _fs().NodeFS ? (() => {
+    if (needsRustLmdbCache) {
       return new (_cache().LMDBLiteCache)(cacheDir);
     }
     return new (_cache().LMDBCache)(cacheDir);
-  })() : new (_cache().FSCache)(outputFS, cacheDir));
+  })() : new (_cache().FSCache)(outputFS, cacheDir);
   let mode = initialOptions.mode ?? 'development';
   let shouldOptimize = (initialOptions === null || initialOptions === void 0 || (_initialOptions$defau = initialOptions.defaultTargetOptions) === null || _initialOptions$defau === void 0 ? void 0 : _initialOptions$defau.shouldOptimize) ?? mode === 'production';
   let publicUrl = (initialOptions === null || initialOptions === void 0 || (_initialOptions$defau2 = initialOptions.defaultTargetOptions) === null || _initialOptions$defau2 === void 0 ? void 0 : _initialOptions$defau2.publicUrl) ?? '/';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3490+e250bc9ff",
+  "version": "2.12.1-canary.3492+4df4fe4cb",
   "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.3490+e250bc9ff",
-    "@atlaspack/cache": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/diagnostic": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/events": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/feature-flags": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/fs": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/graph": "3.2.1-canary.3490+e250bc9ff",
-    "@atlaspack/logger": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/package-manager": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/plugin": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/profiler": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/rust": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/types": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/utils": "2.12.1-canary.3490+e250bc9ff",
-    "@atlaspack/workers": "2.12.1-canary.3490+e250bc9ff",
+    "@atlaspack/build-cache": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/cache": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/diagnostic": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/events": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/feature-flags": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/fs": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/graph": "3.2.1-canary.3492+4df4fe4cb",
+    "@atlaspack/logger": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/package-manager": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/plugin": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/profiler": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/rust": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/types": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/utils": "2.12.1-canary.3492+4df4fe4cb",
+    "@atlaspack/workers": "2.12.1-canary.3492+4df4fe4cb",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -65,5 +65,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "e250bc9ffea331f02e6e3ba9ccdd52f8bf9f396c"
+  "gitHead": "4df4fe4cb9dd65932316b439ba69c76ca50bd56e"
 }

package/src/Atlaspack.js

@@ -55,9 +55,12 @@ import {
   toProjectPath,
   fromProjectPathRelative,
 } from './projectPath';
+import {LMDBLiteCache} from '@atlaspack/cache';
 import {tracer} from '@atlaspack/profiler';
 import {setFeatureFlags, DEFAULT_FEATURE_FLAGS} from '@atlaspack/feature-flags';
 import {AtlaspackV3, FileSystemV3} from './atlaspack-v3';
+import createAssetGraphRequestJS from './requests/AssetGraphRequest';
+import {createAssetGraphRequestRust} from './requests/AssetGraphRequestRust';
 
 registerCoreWithSerializer();
 
@@ -71,7 +74,6 @@ export default class Atlaspack {
   #initialized /*: boolean*/ = false;
   #disposable /*: Disposable */;
   #initialOptions /*: InitialAtlaspackOptions */;
-  #atlaspackV3: AtlaspackV3;
   #reporterRunner /*: ReporterRunner*/;
   #resolvedOptions /*: ?AtlaspackOptions*/ = null;
   #optionsRef /*: SharedReference */;
@@ -93,6 +95,8 @@ export default class Atlaspack {
   #watcherCount /*: number*/ = 0;
   #requestedAssetIds /*: Set<string>*/ = new Set();
 
+  rustAtlaspack: AtlaspackV3 | null | void;
+
   isProfiling /*: boolean */;
 
   constructor(options: InitialAtlaspackOptions) {
@@ -133,6 +137,15 @@ export default class Atlaspack {
       // eslint-disable-next-line no-unused-vars
       let {entries, inputFS, outputFS, ...options} = this.#initialOptions;
 
+      const lmdb =
+        resolvedOptions.cache instanceof LMDBLiteCache
+          ? resolvedOptions.cache.getNativeRef()
+          : null;
+
+      // $FlowFixMe
+      const version = require('../package.json').version;
+      await lmdb?.put('current_session_version', Buffer.from(version));
+
       rustAtlaspack = new AtlaspackV3({
         ...options,
         corePath: path.join(__dirname, '..'),
@@ -155,8 +168,10 @@ export default class Atlaspack {
           shouldScopeHoist:
             resolvedOptions.defaultTargetOptions.shouldScopeHoist,
         },
+        lmdb: lmdb ?? null,
       });
     }
+    this.rustAtlaspack = rustAtlaspack;
 
     let {config} = await loadAtlaspackConfig(resolvedOptions);
     this.#config = new AtlaspackConfig(config, resolvedOptions);
@@ -552,6 +567,34 @@ export default class Atlaspack {
     await this._init();
   }
 
+  /**
+   * Build the asset graph
+   */
+  async unstable_buildAssetGraph(): Promise<void> {
+    await this._init();
+    const input = {
+      optionsRef: this.#optionsRef,
+      name: 'Main',
+      entries: this.#config.options.entries,
+      shouldBuildLazily: false,
+      lazyIncludes: [],
+      lazyExcludes: [],
+      requestedAssetIds: this.#requestedAssetIds,
+    };
+    await this.#requestTracker.runRequest(
+      this.rustAtlaspack != null
+        ? createAssetGraphRequestRust(this.rustAtlaspack)(input)
+        : createAssetGraphRequestJS(input),
+    );
+    // eslint-disable-next-line no-console
+    console.log('Done building asset graph!');
+    // eslint-disable-next-line no-console
+    console.log('Write request tracker to cache');
+    await this.writeRequestTrackerToCache();
+    // eslint-disable-next-line no-console
+    console.log('Done writing request tracker to cache');
+  }
+
   async unstable_transform(
     options: AtlaspackTransformOptions,
   ): Promise<Array<Asset>> {

package/src/atlaspack-v3/AtlaspackV3.js

@@ -1,13 +1,21 @@
 // @flow
 
+import {
+  AtlaspackNapi,
+  type Lmdb,
+  type AtlaspackNapiOptions,
+} from '@atlaspack/rust';
 import {workerPool} from './WorkerPool';
-import {AtlaspackNapi, type AtlaspackNapiOptions} from '@atlaspack/rust';
 
 export type AtlaspackV3Options = {|
   fs?: AtlaspackNapiOptions['fs'],
   nodeWorkers?: number,
   packageManager?: AtlaspackNapiOptions['packageManager'],
   threads?: number,
+  /**
+   * A reference to LMDB lite's rust object
+   */
+  lmdb: Lmdb | null,
   ...AtlaspackNapiOptions['options'],
 |};
 
@@ -19,6 +27,7 @@ export class AtlaspackV3 {
     nodeWorkers,
     packageManager,
     threads,
+    lmdb,
     ...options
   }: AtlaspackV3Options) {
     options.logLevel = options.logLevel || 'error';
@@ -29,13 +38,16 @@ export class AtlaspackV3 {
       browsers: [],
     };
 
-    this._internal = new AtlaspackNapi({
-      fs,
-      nodeWorkers,
-      packageManager,
-      threads,
-      options,
-    });
+    this._internal = AtlaspackNapi.create(
+      {
+        fs,
+        nodeWorkers,
+        packageManager,
+        threads,
+        options,
+      },
+      lmdb,
+    );
   }
 
   async buildAssetGraph(): Promise<any> {

package/src/requests/AssetRequest.js

@@ -48,8 +48,6 @@ export default function createAssetRequest(
 const type = 'asset_request';
 
 function getId(input: AssetRequestInput) {
-  // eslint-disable-next-line no-unused-vars
-  let {optionsRef, ...hashInput} = input;
   return hashString(
     type +
       fromProjectPathRelative(input.filePath) +

package/src/resolveOptions.js

@@ -109,18 +109,19 @@ export default async function resolveOptions(
       ? path.resolve(initialOptions.watchDir)
       : projectRoot;
 
+  const needsRustLmdbCache =
+    getFeatureFlag('useLmdbJsLite') || getFeatureFlag('atlaspackV3');
   const makeLMDBCache = () => {
-    if (getFeatureFlag('useLmdbJsLite')) {
+    if (needsRustLmdbCache) {
       return new LMDBLiteCache(cacheDir);
     }
     return new LMDBCache(cacheDir);
   };
 
   let cache =
-    initialOptions.cache ??
-    (outputFS instanceof NodeFS
+    outputFS instanceof NodeFS
       ? makeLMDBCache()
-      : new FSCache(outputFS, cacheDir));
+      : new FSCache(outputFS, cacheDir);
 
   let mode = initialOptions.mode ?? 'development';
   let shouldOptimize =