@atlaspack/core 2.12.1-canary.3511 → 2.12.1-canary.3512

package/lib/Atlaspack.js

@@ -86,21 +86,21 @@ function _sourceMap() {
   };
   return data;
 }
-function _rust() {
-  const data = require("@atlaspack/rust");
-  _rust = function () {
+function _cache() {
+  const data = require("@atlaspack/cache");
+  _cache = function () {
     return data;
   };
   return data;
 }
-var _projectPath = require("./projectPath");
-function _cache() {
-  const data = require("@atlaspack/cache");
-  _cache = function () {
+function _rust() {
+  const data = require("@atlaspack/rust");
+  _rust = function () {
     return data;
   };
   return data;
 }
+var _projectPath = require("./projectPath");
 function _profiler() {
   const data = require("@atlaspack/profiler");
   _profiler = function () {
@@ -189,11 +189,14 @@ class Atlaspack {
         outputFS,
         ...options
       } = this.#initialOptions;
-      const lmdb = resolvedOptions.cache instanceof _cache().LMDBLiteCache ? resolvedOptions.cache.getNativeRef() : null;
+      if (!(resolvedOptions.cache instanceof _cache().LMDBLiteCache)) {
+        throw new Error('Atlaspack v3 must be run with lmdb lite cache');
+      }
+      const lmdb = resolvedOptions.cache.getNativeRef();
 
       // $FlowFixMe
       const version = require('../package.json').version;
-      await (lmdb === null || lmdb === void 0 ? void 0 : lmdb.put('current_session_version', Buffer.from(version)));
+      await lmdb.put('current_session_version', Buffer.from(version));
       rustAtlaspack = new _atlaspackV.AtlaspackV3({
         ...options,
         corePath: _path().default.join(__dirname, '..'),
@@ -211,7 +214,7 @@ class Atlaspack {
           shouldOptimize: resolvedOptions.defaultTargetOptions.shouldOptimize,
           shouldScopeHoist: resolvedOptions.defaultTargetOptions.shouldScopeHoist
         },
-        lmdb: lmdb ?? null
+        lmdb
       });
     }
     this.rustAtlaspack = rustAtlaspack;
@@ -569,7 +572,9 @@ class Atlaspack {
       lazyExcludes: [],
       requestedAssetIds: this.#requestedAssetIds
     };
-    const result = await this.#requestTracker.runRequest(this.rustAtlaspack != null ? (0, _AssetGraphRequestRust.createAssetGraphRequestRust)(this.rustAtlaspack)(input) : (0, _AssetGraphRequest.default)(input));
+    const result = await this.#requestTracker.runRequest(this.rustAtlaspack != null ? (0, _AssetGraphRequestRust.createAssetGraphRequestRust)(this.rustAtlaspack)(input) : (0, _AssetGraphRequest.default)(input), {
+      force: true
+    });
     _logger().default.info({
       message: 'Done building asset graph!'
     });

package/lib/atlaspack-v3/worker/compat/mutable-asset.js

@@ -26,7 +26,7 @@ class MutableAsset {
   set astGenerator(value) {
     throw new Error('set MutableAsset.astGenerator');
   }
-  constructor(asset, fs, env, contents) {
+  constructor(asset, contents, env, fs) {
     this.#inner = asset;
     this.stats = asset.stats;
     this.id = asset.id;

package/lib/atlaspack-v3/worker/worker.js

@@ -46,8 +46,8 @@ function _module() {
   };
   return data;
 }
-var _compat = require("./compat");
 var _jsCallable = require("../jsCallable");
+var _compat = require("./compat");
 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 }; }
@@ -187,7 +187,7 @@ class AtlaspackWorker {
       return Promise.resolve(resolvedPath);
     };
     const env = new _compat.Environment(napiEnv);
-    const mutableAsset = new _compat.MutableAsset(innerAsset, this.#fs, env, contents);
+    const mutableAsset = new _compat.MutableAsset(innerAsset, contents, env, this.#fs);
     const defaultOptions = {
       logger: new _compat.PluginLogger(),
       tracer: new _compat.PluginTracer(),

package/lib/requests/AssetGraphRequestRust.js

@@ -49,12 +49,8 @@ function createAssetGraphRequestRust(rustAtlaspack) {
       }
       let {
         assetGraph,
-        cachedAssets,
         changedAssets
       } = getAssetGraph(serializedAssetGraph, options);
-
-      // TODO: Make it a bulk transaction
-      await Promise.all(Array.from(cachedAssets.entries(), ([id, code]) => options.cache.setBlob(id, Buffer.from(code))));
       let changedAssetsPropagation = new Set(changedAssets.keys());
       let errors = (0, _SymbolPropagation.propagateSymbols)({
         options,

package/lib/resolveOptions.js

@@ -112,12 +112,7 @@ async function resolveOptions(initialOptions) {
   // updates. Default to the project root if not provided.
   let watchDir = initialOptions.watchDir != null ? _path().default.resolve(initialOptions.watchDir) : projectRoot;
   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);
+  let cache = needsRustLmdbCache ? new (_cache().LMDBLiteCache)(cacheDir) : outputFS instanceof _fs().NodeFS ? new (_cache().LMDBCache)(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.3511+a4b301fb6",
+  "version": "2.12.1-canary.3512+999f4449c",
   "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.3511+a4b301fb6",
-    "@atlaspack/cache": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/diagnostic": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/events": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/feature-flags": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/fs": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/graph": "3.2.1-canary.3511+a4b301fb6",
-    "@atlaspack/logger": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/package-manager": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/plugin": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/profiler": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/rust": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/types": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/utils": "2.12.1-canary.3511+a4b301fb6",
-    "@atlaspack/workers": "2.12.1-canary.3511+a4b301fb6",
+    "@atlaspack/build-cache": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/cache": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/diagnostic": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/events": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/feature-flags": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/fs": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/graph": "3.2.1-canary.3512+999f4449c",
+    "@atlaspack/logger": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/package-manager": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/plugin": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/profiler": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/rust": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/types": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/utils": "2.12.1-canary.3512+999f4449c",
+    "@atlaspack/workers": "2.12.1-canary.3512+999f4449c",
     "@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": "a4b301fb6221959eb1a8f0e90fc46cda1501156e"
+  "gitHead": "999f4449ca9ab025e6a1ce268d50a21d3d90d478"
 }

package/src/Atlaspack.js

@@ -45,17 +45,18 @@ import {createEnvironment} from './Environment';
 import {createDependency} from './Dependency';
 import {Disposable} from '@atlaspack/events';
 import {init as initSourcemaps} from '@parcel/source-map';
+import {LMDBLiteCache} from '@atlaspack/cache';
 import {
   init as initRust,
   initializeMonitoring,
   closeMonitoring,
+  type Lmdb,
 } from '@atlaspack/rust';
 import {
   fromProjectPath,
   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';
@@ -138,14 +139,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;
+      if (!(resolvedOptions.cache instanceof LMDBLiteCache)) {
+        throw new Error('Atlaspack v3 must be run with lmdb lite cache');
+      }
+
+      const lmdb: Lmdb = resolvedOptions.cache.getNativeRef();
 
       // $FlowFixMe
       const version = require('../package.json').version;
-      await lmdb?.put('current_session_version', Buffer.from(version));
+      await lmdb.put('current_session_version', Buffer.from(version));
 
       rustAtlaspack = new AtlaspackV3({
         ...options,
@@ -169,7 +171,7 @@ export default class Atlaspack {
           shouldScopeHoist:
             resolvedOptions.defaultTargetOptions.shouldScopeHoist,
         },
-        lmdb: lmdb ?? null,
+        lmdb,
       });
     }
     this.rustAtlaspack = rustAtlaspack;
@@ -596,7 +598,9 @@ export default class Atlaspack {
       this.rustAtlaspack != null
         ? createAssetGraphRequestRust(this.rustAtlaspack)(input)
         : createAssetGraphRequestJS(input),
+      {force: true},
     );
+
     logger.info({message: 'Done building asset graph!'});
 
     if (writeToCache) {

package/src/atlaspack-v3/AtlaspackV3.js

@@ -15,7 +15,7 @@ export type AtlaspackV3Options = {|
   /**
    * A reference to LMDB lite's rust object
    */
-  lmdb: Lmdb | null,
+  lmdb: Lmdb,
   ...AtlaspackNapiOptions['options'],
 |};
 

package/src/atlaspack-v3/worker/compat/mutable-asset.js

@@ -55,9 +55,9 @@ export class MutableAsset implements IMutableAsset {
 
   constructor(
     asset: InnerAsset,
-    fs: FileSystem,
-    env: Environment,
     contents: Buffer,
+    env: Environment,
+    fs: FileSystem,
   ) {
     this.#inner = asset;
     this.stats = asset.stats;

package/src/atlaspack-v3/worker/worker.js

@@ -13,6 +13,7 @@ import type {
 import {parentPort} from 'worker_threads';
 import * as module from 'module';
 
+import {jsCallable} from '../jsCallable';
 import {
   Environment,
   Dependency,
@@ -24,7 +25,6 @@ import {
   bundleBehaviorMap,
   dependencyPriorityMap,
 } from './compat';
-import {jsCallable} from '../jsCallable';
 
 const CONFIG = Symbol.for('parcel-plugin-config');
 
@@ -181,13 +181,15 @@ export class AtlaspackWorker {
 
         return Promise.resolve(resolvedPath);
       };
+
       const env = new Environment(napiEnv);
       const mutableAsset = new MutableAsset(
         innerAsset,
-        this.#fs,
-        env,
         contents,
+        env,
+        this.#fs,
       );
+
       const defaultOptions = {
         logger: new PluginLogger(),
         tracer: new PluginTracer(),

package/src/requests/AssetGraphRequestRust.js

@@ -48,18 +48,11 @@ export function createAssetGraphRequestRust(
         });
       }
 
-      let {assetGraph, cachedAssets, changedAssets} = getAssetGraph(
+      let {assetGraph, changedAssets} = getAssetGraph(
         serializedAssetGraph,
         options,
       );
 
-      // TODO: Make it a bulk transaction
-      await Promise.all(
-        Array.from(cachedAssets.entries(), ([id, code]) =>
-          options.cache.setBlob(id, Buffer.from(code)),
-        ),
-      );
-
       let changedAssetsPropagation = new Set(changedAssets.keys());
       let errors = propagateSymbols({
         options,

package/src/resolveOptions.js

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