@atlaspack/core 2.16.2-canary.37 → 2.16.2-canary.371

package/lib/EnvironmentManager.js

@@ -0,0 +1,143 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fromEnvironmentId = fromEnvironmentId;
+exports.loadEnvironmentsFromCache = loadEnvironmentsFromCache;
+exports.toEnvironmentId = toEnvironmentId;
+exports.toEnvironmentRef = toEnvironmentRef;
+exports.writeEnvironmentsToCache = writeEnvironmentsToCache;
+function _rust() {
+  const data = require("@atlaspack/rust");
+  _rust = function () {
+    return data;
+  };
+  return data;
+}
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
+function _logger() {
+  const data = require("@atlaspack/logger");
+  _logger = function () {
+    return data;
+  };
+  return data;
+}
+var _constants = require("./constants");
+/*!
+ * At the moment we're doing this change for `CoreEnvironment`,
+ * but the same change must be made for `TypesEnvironment` in @atlaspack/types.
+ */
+
+const localEnvironmentCache = new Map();
+
+/**
+ * When deduplication is cleaned-up this will always be a string.
+ */
+
+/**
+ * Convert environment to a ref.
+ * This is what we should be using to store environments.
+ */
+function toEnvironmentRef(env) {
+  if (!(0, _featureFlags().getFeatureFlag)('environmentDeduplication')) {
+    return env;
+  }
+  const id = toEnvironmentId(env);
+  return id;
+}
+
+/**
+ * Convert environment to a string ID
+ */
+function toEnvironmentId(
+/**
+ * Redundant type during roll-out
+ */
+env) {
+  if (!(0, _featureFlags().getFeatureFlag)('environmentDeduplication')) {
+    return typeof env === 'string' ? env : env.id;
+  }
+  if (typeof env === 'string') {
+    return env;
+  }
+  (0, _rust().addEnvironment)(env);
+  return env.id;
+}
+function fromEnvironmentId(id) {
+  if (!(0, _featureFlags().getFeatureFlag)('environmentDeduplication')) {
+    if (typeof id === 'string') {
+      throw new Error('This should never happen when environmentDeduplication feature-flag is off');
+    } else {
+      return id;
+    }
+  }
+  if (typeof id !== 'string') {
+    return id;
+  }
+  const localEnv = localEnvironmentCache.get(id);
+  if (localEnv) {
+    return localEnv;
+  }
+  const env = Object.freeze((0, _rust().getEnvironment)(id));
+  // @ts-expect-error TS2345
+  localEnvironmentCache.set(id, env);
+  // @ts-expect-error TS2322
+  return env;
+}
+
+/**
+ * Writes all environments and their IDs to the cache
+ * @param {Cache} cache
+ * @returns {Promise<void>}
+ */
+async function writeEnvironmentsToCache(cache) {
+  const environments = (0, _rust().getAllEnvironments)();
+  const environmentIds = new Set();
+
+  // Store each environment individually
+  for (const env of environments) {
+    // @ts-expect-error TS18046
+    environmentIds.add(env.id);
+    // @ts-expect-error TS18046
+    const envKey = `Environment/${_constants.ATLASPACK_VERSION}/${env.id}`;
+    await (0, _logger().instrument)(`RequestTracker::writeToCache::cache.put(${envKey})`, async () => {
+      await cache.set(envKey, env);
+    });
+  }
+
+  // Store the list of environment IDs
+  await (0, _logger().instrument)(`RequestTracker::writeToCache::cache.put(${`EnvironmentManager/${_constants.ATLASPACK_VERSION}`})`, async () => {
+    await cache.set(`EnvironmentManager/${_constants.ATLASPACK_VERSION}`, Array.from(environmentIds));
+  });
+}
+
+/**
+ * Loads all environments and their IDs from the cache
+ * @param {Cache} cache
+ * @returns {Promise<void>}
+ */
+async function loadEnvironmentsFromCache(cache) {
+  const cachedEnvIds = await cache.get(`EnvironmentManager/${_constants.ATLASPACK_VERSION}`);
+  if (cachedEnvIds == null) {
+    return;
+  }
+  const environments = [];
+  // @ts-expect-error TS2488
+  for (const envId of cachedEnvIds) {
+    const envKey = `Environment/${_constants.ATLASPACK_VERSION}/${envId}`;
+    const cachedEnv = await cache.get(envKey);
+    if (cachedEnv != null) {
+      environments.push(cachedEnv);
+    }
+  }
+  if (environments.length > 0) {
+    (0, _rust().setAllEnvironments)(environments);
+  }
+}

package/lib/IdentifierRegistry.js

@@ -26,9 +26,7 @@ class IdentifierRegistry {
         });
         this.#createdDirectory = true;
       }
-      _fs().default.appendFile('./.atlaspack/atlaspack-identifiers.txt',
-      // $FlowFixMe
-      `${type} ${identifier} ${JSON.stringify(data)}\n`, () => {});
+      _fs().default.appendFile('./.atlaspack/atlaspack-identifiers.txt', `${type} ${identifier} ${JSON.stringify(data)}\n`, () => {});
     }
   }
 }

package/lib/InternalConfig.js

@@ -14,6 +14,7 @@ function _rust() {
   return data;
 }
 var _IdentifierRegistry = require("./IdentifierRegistry");
+var _EnvironmentManager = require("./EnvironmentManager");
 function createConfig({
   plugin,
   isSource,
@@ -30,11 +31,11 @@ function createConfig({
   invalidateOnBuild
 }) {
   let environment = env ?? (0, _Environment.createEnvironment)();
-  const configId = (0, _rust().hashString)(plugin + (0, _projectPath.fromProjectPathRelative)(searchPath) + environment.id + String(isSource));
+  const configId = (0, _rust().hashString)(plugin + (0, _projectPath.fromProjectPathRelative)(searchPath) + (0, _EnvironmentManager.toEnvironmentId)(environment) + String(isSource));
   _IdentifierRegistry.identifierRegistry.addIdentifier('config_request', configId, {
     plugin,
     searchPath,
-    environmentId: environment.id,
+    environmentId: (0, _EnvironmentManager.toEnvironmentId)(environment),
     isSource
   });
   return {

package/lib/PackagerRunner.js

@@ -92,6 +92,14 @@ function _profiler() {
   };
   return data;
 }
+var _EnvironmentManager = require("./EnvironmentManager");
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 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 }; }
@@ -101,6 +109,10 @@ const BOUNDARY_LENGTH = _constants.HASH_REF_PREFIX.length + 32 - 1;
 // load them once per build.
 const pluginConfigs = (0, _buildCache().createBuildCache)();
 class PackagerRunner {
+  // @ts-expect-error TS2564
+
+  // @ts-expect-error TS2564
+
   constructor({
     config,
     options,
@@ -165,6 +177,7 @@ class PackagerRunner {
       // Only load config for a plugin once per build.
       let existing = pluginConfigs.get(plugin.name);
       if (existing != null) {
+        // @ts-expect-error TS2345
         configs.set(plugin.name, existing);
       } else {
         if (plugin.plugin.loadConfig != null) {
@@ -217,7 +230,8 @@ class PackagerRunner {
     let {
       type,
       contents,
-      map
+      map,
+      scopeHoistingStats
     } = await this.getBundleResult(bundle, bundleGraph, configs, bundleConfigs);
 
     // Recompute cache keys as they may have changed due to dev dependencies.
@@ -227,7 +241,14 @@ class PackagerRunner {
       map: PackagerRunner.getMapKey(cacheKey),
       info: PackagerRunner.getInfoKey(cacheKey)
     };
-    return this.writeToCache(cacheKeys, type, contents, map);
+    let cachedResult = await this.writeToCache(cacheKeys, type, contents, map);
+    if (_utils().debugTools['scope-hoisting-stats']) {
+      return {
+        ...cachedResult,
+        scopeHoistingStats
+      };
+    }
+    return cachedResult;
   }
   async getBundleResult(bundle, bundleGraph, configs, bundleConfigs) {
     let packaged = await this.package(bundle, bundleGraph, configs, bundleConfigs);
@@ -237,11 +258,12 @@ class PackagerRunner {
     return {
       type: res.type ?? type,
       contents: res.contents,
-      map
+      map,
+      scopeHoistingStats: packaged.scopeHoistingStats
     };
   }
   getSourceMapReference(bundle, map) {
-    if (map && bundle.env.sourceMap && bundle.bundleBehavior !== 'inline') {
+    if (map && bundle.env.sourceMap && bundle.bundleBehavior !== 'inline' && bundle.bundleBehavior !== 'inlineIsolated') {
       if (bundle.env.sourceMap && bundle.env.sourceMap.inline) {
         return this.generateSourceMap((0, _Bundle.bundleToInternalBundle)(bundle), map);
       } else {
@@ -287,14 +309,14 @@ class PackagerRunner {
           category: 'package'
         }),
         getInlineBundleContents: async (bundle, bundleGraph) => {
-          if (bundle.bundleBehavior !== 'inline') {
+          if (bundle.bundleBehavior !== 'inline' && bundle.bundleBehavior !== 'inlineIsolated') {
             throw new Error('Bundle is not inline and unable to retrieve contents');
           }
-          let res = await this.getBundleResult((0, _Bundle.bundleToInternalBundle)(bundle),
-          // $FlowFixMe
-          (0, _BundleGraph.bundleGraphToInternalBundleGraph)(bundleGraph), configs, bundleConfigs);
+          let {
+            contents
+          } = await this.getBundleResult((0, _Bundle.bundleToInternalBundle)(bundle), (0, _BundleGraph.bundleGraphToInternalBundleGraph)(bundleGraph), configs, bundleConfigs);
           return {
-            contents: res.contents
+            contents
           };
         }
       });
@@ -390,23 +412,34 @@ class PackagerRunner {
     let fullPath = (0, _projectPath.fromProjectPath)(this.options.projectRoot, filePath);
     let sourceRoot = _path().default.relative(_path().default.dirname(fullPath), this.options.projectRoot);
     let inlineSources = false;
+    const bundleEnv = (0, _EnvironmentManager.fromEnvironmentId)(bundle.env);
     if (bundle.target) {
-      if (bundle.env.sourceMap && bundle.env.sourceMap.sourceRoot !== undefined) {
-        sourceRoot = bundle.env.sourceMap.sourceRoot;
-      } else if (this.options.serveOptions && bundle.target.env.context === 'browser') {
+      const bundleTargetEnv = (0, _EnvironmentManager.fromEnvironmentId)(bundle.target.env);
+      if (bundleEnv.sourceMap && bundleEnv.sourceMap.sourceRoot !== undefined) {
+        sourceRoot = bundleEnv.sourceMap.sourceRoot;
+      } else if (this.options.serveOptions && bundleTargetEnv.context === 'browser') {
         sourceRoot = '/__parcel_source_root';
       }
-      if (bundle.env.sourceMap && bundle.env.sourceMap.inlineSources !== undefined) {
-        inlineSources = bundle.env.sourceMap.inlineSources;
-      } else if (bundle.target.env.context !== 'node') {
+      if (bundleEnv.sourceMap && bundleEnv.sourceMap.inlineSources !== undefined) {
+        inlineSources = bundleEnv.sourceMap.inlineSources;
+      } else if (bundleTargetEnv.context !== 'node') {
         // inlining should only happen in production for browser targets by default
         inlineSources = this.options.mode === 'production';
       }
     }
-    let isInlineMap = bundle.env.sourceMap && bundle.env.sourceMap.inline;
+    let mapFilename = fullPath + '.map';
+    let isInlineMap = bundleEnv.sourceMap && bundleEnv.sourceMap.inline;
+    if ((0, _featureFlags().getFeatureFlag)('omitSourcesContentInMemory') && !isInlineMap) {
+      if (!(bundleEnv.sourceMap && bundleEnv.sourceMap.inlineSources === false)) {
+        /*
+          We're omitting sourcesContent during transformation to allow GC to run.
+          Ensure sources are still inlined into the final source maps written to disk. UNLESS the user explicitly disabled inlineSources.
+        */
+        inlineSources = true;
+      }
+    }
     let stringified = await map.stringify({
-      file: _path().default.basename(fullPath + '.map'),
-      // $FlowFixMe
+      file: _path().default.basename(mapFilename),
       fs: this.options.inputFS,
       rootDir: this.options.projectRoot,
       sourceRoot: !inlineSources ? _url().default.format(_url().default.parse(sourceRoot + '/')) : undefined,
@@ -434,6 +467,10 @@ class PackagerRunner {
       devDepHashes += await this.getDevDepHashes(inlineBundle);
     }
     let invalidationHash = await (0, _assetUtils.getInvalidationHash)(invalidations, this.options);
+    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      const hash = (0, _rust().hashString)(_constants.ATLASPACK_VERSION + devDepHashes + invalidationHash + bundle.target.publicUrl + bundleGraph.getHash(bundle) + JSON.stringify(configResults) + JSON.stringify(globalInfoResults) + this.options.mode + (this.options.shouldBuildLazily ? 'lazy' : 'eager'));
+      return _path().default.join(bundle.displayName ?? bundle.name ?? bundle.id, hash);
+    }
     return (0, _rust().hashString)(_constants.ATLASPACK_VERSION + devDepHashes + invalidationHash + bundle.target.publicUrl + bundleGraph.getHash(bundle) + JSON.stringify(configResults) + JSON.stringify(globalInfoResults) + this.options.mode + (this.options.shouldBuildLazily ? 'lazy' : 'eager'));
   }
   async getDevDepHashes(bundle) {
@@ -457,28 +494,33 @@ class PackagerRunner {
     let contentKey = PackagerRunner.getContentKey(cacheKey);
     let mapKey = PackagerRunner.getMapKey(cacheKey);
     let isLargeBlob = await this.options.cache.hasLargeBlob(contentKey);
-    let contentExists = isLargeBlob || (await this.options.cache.has(contentKey));
+    let contentExists = (0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements') ? isLargeBlob : isLargeBlob || (await this.options.cache.has(contentKey));
     if (!contentExists) {
       return null;
     }
-    let mapExists = await this.options.cache.has(mapKey);
+    let mapExists = (0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements') ? await this.options.cache.hasLargeBlob(mapKey) : await this.options.cache.has(mapKey);
     return {
       contents: isLargeBlob ? this.options.cache.getStream(contentKey) : (0, _utils().blobToStream)(await this.options.cache.getBlob(contentKey)),
-      map: mapExists ? (0, _utils().blobToStream)(await this.options.cache.getBlob(mapKey)) : null
+      map: mapExists ? (0, _utils().blobToStream)((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements') ? await this.options.cache.getLargeBlob(mapKey) : await this.options.cache.getBlob(mapKey)) : null
     };
   }
   async writeToCache(cacheKeys, type, contents, map) {
     let size = 0;
     let hash;
+    // @ts-expect-error TS2702
     let hashReferences = [];
-    let isLargeBlob = false;
+    let isLargeBlob = (0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements');
 
     // TODO: don't replace hash references in binary files??
     if (contents instanceof _stream().Readable) {
-      isLargeBlob = true;
+      if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+        isLargeBlob = true;
+      }
       let boundaryStr = '';
       let h = new (_rust().Hash)();
-      await this.options.cache.setStream(cacheKeys.content, (0, _utils().blobToStream)(contents).pipe(new (_utils().TapStream)(buf => {
+      await this.options.cache.setStream(cacheKeys.content, (0, _utils().blobToStream)(contents).pipe(
+      // @ts-expect-error TS2554
+      new (_utils().TapStream)(buf => {
         let str = boundaryStr + buf.toString();
         hashReferences = hashReferences.concat(str.match(_constants.HASH_REF_REGEX) ?? []);
         size += buf.length;
@@ -491,15 +533,27 @@ class PackagerRunner {
       size = buffer.byteLength;
       hash = (0, _rust().hashBuffer)(buffer);
       hashReferences = contents.match(_constants.HASH_REF_REGEX) ?? [];
-      await this.options.cache.setBlob(cacheKeys.content, buffer);
+      if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+        await this.options.cache.setLargeBlob(cacheKeys.content, buffer);
+      } else {
+        await this.options.cache.setBlob(cacheKeys.content, buffer);
+      }
     } else {
       size = contents.length;
       hash = (0, _rust().hashBuffer)(contents);
       hashReferences = contents.toString().match(_constants.HASH_REF_REGEX) ?? [];
-      await this.options.cache.setBlob(cacheKeys.content, contents);
+      if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+        await this.options.cache.setLargeBlob(cacheKeys.content, contents);
+      } else {
+        await this.options.cache.setBlob(cacheKeys.content, contents);
+      }
     }
     if (map != null) {
-      await this.options.cache.setBlob(cacheKeys.map, map);
+      if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+        await this.options.cache.setLargeBlob(cacheKeys.map, map);
+      } else {
+        await this.options.cache.setBlob(cacheKeys.map, map);
+      }
     }
     let info = {
       type,
@@ -513,12 +567,21 @@ class PackagerRunner {
     return info;
   }
   static getContentKey(cacheKey) {
+    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      return `PackagerRunner/${_constants.ATLASPACK_VERSION}/${cacheKey}/content`;
+    }
     return (0, _rust().hashString)(`${cacheKey}:content`);
   }
   static getMapKey(cacheKey) {
+    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      return `PackagerRunner/${_constants.ATLASPACK_VERSION}/${cacheKey}/map`;
+    }
     return (0, _rust().hashString)(`${cacheKey}:map`);
   }
   static getInfoKey(cacheKey) {
+    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      return `PackagerRunner/${_constants.ATLASPACK_VERSION}/${cacheKey}/info`;
+    }
     return (0, _rust().hashString)(`${cacheKey}:info`);
   }
 }

package/lib/ReporterRunner.js

@@ -15,7 +15,7 @@ function _assert() {
 }
 var _Bundle = require("./public/Bundle");
 function _workers() {
-  const data = _interopRequireWildcard(require("@atlaspack/workers"));
+  const data = require("@atlaspack/workers");
   _workers = function () {
     return data;
   };
@@ -67,17 +67,14 @@ class ReporterRunner {
   }
   eventHandler = event => {
     if (event.type === 'buildProgress' && (event.phase === 'optimizing' || event.phase === 'packaging') && !(event.bundle instanceof _Bundle.NamedBundle)) {
-      // $FlowFixMe[prop-missing]
+      // @ts-expect-error TS2339
       let bundleGraphRef = event.bundleGraphRef;
-      // $FlowFixMe[incompatible-exact]
+      // @ts-expect-error TS2739
       let bundle = event.bundle;
       // Convert any internal bundles back to their public equivalents as reporting
       // is public api
-      let bundleGraph = this.workerFarm.workerApi.getSharedReference(
-      // $FlowFixMe
-      bundleGraphRef);
+      let bundleGraph = this.workerFarm.workerApi.getSharedReference(bundleGraphRef);
       (0, _assert().default)(bundleGraph instanceof _BundleGraph.default);
-      // $FlowFixMe[incompatible-call]
       this.report({
         ...event,
         bundle: _Bundle.NamedBundle.get(bundle, bundleGraph, this.options)
@@ -88,11 +85,12 @@ class ReporterRunner {
   };
   async report(unsanitisedEvent) {
     let event = unsanitisedEvent;
+    // @ts-expect-error TS2339
     if (event.diagnostics) {
       // Sanitise input before passing to reporters
-      // $FlowFixMe too complex to narrow down by type
       event = {
         ...event,
+        // @ts-expect-error TS2322
         diagnostics: (0, _diagnostic().anyToDiagnostic)(event.diagnostics)
       };
     }
@@ -105,7 +103,6 @@ class ReporterRunner {
           measurement = _profiler().tracer.createMeasurement(reporter.name, 'reporter');
         }
         await reporter.plugin.report({
-          // $FlowFixMe
           event,
           options: this.pluginOptions,
           logger: new (_logger().PluginLogger)({