@atlaspack/core 2.16.2-canary.13 → 2.16.2-canary.131

package/lib/SymbolPropagation.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.propagateSymbols = propagateSymbols;
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
   _assert = function () {
@@ -72,6 +79,13 @@ function propagateSymbols({
 
     // Propagate the requested symbols down from the root to the leaves
     propagateSymbolsDown(assetGraph, changedAssets, assetGroupsWithRemovedParents, (assetNode, incomingDeps, outgoingDeps) => {
+      if ((0, _featureFlags().getFeatureFlag)('emptyFileStarRexportFix')) {
+        if (assetNode.value.meta.emptyFileStarReexport && incomingDeps.every(d => d.value.specifierType === _types.SpecifierType.esm)) {
+          var _assetNode$value$symb;
+          (_assetNode$value$symb = assetNode.value.symbols) === null || _assetNode$value$symb === void 0 || _assetNode$value$symb.delete('*');
+        }
+      }
+
       // exportSymbol -> identifier
       let assetSymbols = assetNode.value.symbols;
       // identifier -> exportSymbol

package/lib/Transformation.js

@@ -173,12 +173,12 @@ class Transformation {
     });
 
     // Prefer `isSource` originating from the AssetRequest.
-
+    let isSource = isSourceOverride ?? summarizedIsSource;
     return new _UncommittedAsset.default({
       value: (0, _assetUtils.createAsset)(this.options.projectRoot, {
         code,
         filePath,
-        isSource: isSourceOverride ?? summarizedIsSource,
+        isSource,
         type: _path().default.extname((0, _projectPath.fromProjectPathRelative)(filePath)).slice(1),
         pipeline,
         env,

package/lib/UncommittedAsset.js

@@ -53,6 +53,14 @@ var _assetUtils = require("./assetUtils");
 var _types = require("./types");
 var _utils2 = require("./utils");
 var _projectPath = require("./projectPath");
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
+var _EnvironmentManager = require("./EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class UncommittedAsset {
   constructor({
@@ -133,6 +141,8 @@ class UncommittedAsset {
       hash = (0, _rust().hashBuffer)(content);
       size = content.length;
     }
+
+    // Maybe we should just store this in a file instead of LMDB
     await this.options.cache.setBlob(contentKey, content);
     return {
       size,
@@ -184,6 +194,10 @@ class UncommittedAsset {
     this.content = buffer;
     this.clearAST();
   }
+
+  /**
+   * @deprecated This has been broken on any cache other than FSCache for a long time.
+   */
   setStream(stream) {
     this.content = stream;
     this.clearAST();
@@ -248,6 +262,10 @@ class UncommittedAsset {
     this.value.astGenerator = null;
   }
   getCacheKey(key) {
+    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      const filePath = (0, _projectPath.fromProjectPathRelative)(this.value.filePath);
+      return `Asset/${_constants.ATLASPACK_VERSION}/${filePath}/${this.value.id}/${key}`;
+    }
     return (0, _rust().hashString)(_constants.ATLASPACK_VERSION + key + this.value.id);
   }
   addDependency(opts) {
@@ -261,7 +279,7 @@ class UncommittedAsset {
       ...rest,
       // $FlowFixMe "convert" the $ReadOnlyMaps to the interal mutable one
       symbols,
-      env: (0, _Environment.mergeEnvironments)(this.options.projectRoot, this.value.env, env),
+      env: (0, _Environment.mergeEnvironments)(this.options.projectRoot, (0, _EnvironmentManager.fromEnvironmentId)(this.value.env), env),
       sourceAssetId: this.value.id,
       sourcePath: (0, _projectPath.fromProjectPath)(this.options.projectRoot, this.value.filePath)
     });
@@ -301,7 +319,7 @@ class UncommittedAsset {
         bundleBehavior: result.bundleBehavior ?? (this.value.bundleBehavior == null ? null : _types.BundleBehaviorNames[this.value.bundleBehavior]),
         isBundleSplittable: result.isBundleSplittable ?? this.value.isBundleSplittable,
         isSource: this.value.isSource,
-        env: (0, _Environment.mergeEnvironments)(this.options.projectRoot, this.value.env, result.env),
+        env: (0, _Environment.mergeEnvironments)(this.options.projectRoot, (0, _EnvironmentManager.fromEnvironmentId)(this.value.env), result.env),
         dependencies: this.value.type === result.type ? new Map(this.value.dependencies) : new Map(),
         meta: {
           ...this.value.meta,

package/lib/applyRuntimes.js

@@ -69,6 +69,7 @@ function _utils() {
   };
   return data;
 }
+var _EnvironmentManager = require("./EnvironmentManager");
 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 }; }
@@ -164,7 +165,7 @@ async function applyRuntimes({
             let assetGroup = {
               code,
               filePath: (0, _projectPath.toProjectPath)(options.projectRoot, sourceName),
-              env: (0, _Environment.mergeEnvironments)(options.projectRoot, bundle.env, env),
+              env: (0, _Environment.mergeEnvironments)(options.projectRoot, (0, _EnvironmentManager.fromEnvironmentId)(bundle.env), env),
               // Runtime assets should be considered source, as they should be
               // e.g. compiled to run in the target environment
               isSource: true

package/lib/assetUtils.js

@@ -66,10 +66,11 @@ function _profiler() {
   return data;
 }
 var _IdentifierRegistry = require("./IdentifierRegistry");
+var _EnvironmentManager = require("./EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function createAssetIdFromOptions(options) {
   const data = {
-    environmentId: options.env.id,
+    environmentId: (0, _EnvironmentManager.toEnvironmentId)(options.env),
     filePath: options.filePath,
     code: options.code,
     pipeline: options.pipeline,

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -21,21 +21,28 @@ function _diagnostic() {
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class AtlaspackV3 {
-  constructor(atlaspack_napi) {
+  constructor(atlaspack_napi, napiWorkerPool, isDefaultNapiWorkerPool) {
     this._atlaspack_napi = atlaspack_napi;
+    this._napiWorkerPool = napiWorkerPool;
+    this._isDefaultNapiWorkerPool = isDefaultNapiWorkerPool;
   }
   static async create({
     fs,
     packageManager,
     threads,
     lmdb,
-    napiWorkerPool = new _NapiWorkerPool.NapiWorkerPool(),
+    napiWorkerPool,
     ...options
   }) {
     options.logLevel = options.logLevel || 'error';
     options.defaultTargetOptions = options.defaultTargetOptions || {};
     // $FlowFixMe "engines" are readonly
     options.defaultTargetOptions.engines = options.defaultTargetOptions.engines || {};
+    let isDefaultNapiWorkerPool = false;
+    if (!napiWorkerPool) {
+      napiWorkerPool = new _NapiWorkerPool.NapiWorkerPool();
+      isDefaultNapiWorkerPool = true;
+    }
     const [internal, error] = await (0, _rust().atlaspackNapiCreate)({
       fs,
       packageManager,
@@ -48,7 +55,13 @@ class AtlaspackV3 {
         diagnostic: error
       });
     }
-    return new AtlaspackV3(internal);
+    return new AtlaspackV3(internal, napiWorkerPool, isDefaultNapiWorkerPool);
+  }
+  end() {
+    // If the worker pool was provided to us, don't shut it down, it's up to the provider.
+    if (this._isDefaultNapiWorkerPool) {
+      this._napiWorkerPool.shutdown();
+    }
   }
   async buildAssetGraph() {
     let [graph, error] = await (0, _rust().atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);

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

@@ -44,13 +44,13 @@ class Environment {
 
   // TODO
   // eslint-disable-next-line no-unused-vars
-  matchesEngines() {
+  matchesEngines(minVersions, defaultValue) {
     return true;
   }
 
   // TODO
   // eslint-disable-next-line no-unused-vars
-  supports() {
+  supports(feature, defaultValue) {
     return true;
   }
 }

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

@@ -126,32 +126,32 @@ class MutableAsset {
   }
 
   // eslint-disable-next-line no-unused-vars
-  addDependency() {
+  addDependency(options) {
     throw new Error('MutableAsset.addDependency()');
   }
 
   // eslint-disable-next-line no-unused-vars
-  addURLDependency() {
+  addURLDependency(url, opts) {
     throw new Error('MutableAsset.addURLDependency()');
   }
 
   // eslint-disable-next-line no-unused-vars
-  setEnvironment() {
+  setEnvironment(opts) {
     throw new Error('MutableAsset.setEnvironment()');
   }
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnFileChange() {
+  invalidateOnFileChange(invalidation) {
     // TODO: Forward invalidations to Rust
   }
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnFileCreate() {
+  invalidateOnFileCreate(invalidation) {
     // TODO: Forward invalidations to Rust
   }
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnEnvChange() {
+  invalidateOnEnvChange(invalidation) {
     // TODO: Forward invalidations to Rust
   }
   invalidateOnStartup() {

package/lib/atlaspack-v3/worker/compat/plugin-config.js

@@ -40,21 +40,21 @@ class PluginConfig {
   }
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnFileChange() {}
+  invalidateOnFileChange(filePath) {}
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnFileCreate() {}
+  invalidateOnFileCreate(invalidations) {}
 
   // eslint-disable-next-line no-unused-vars
-  invalidateOnEnvChange() {}
+  invalidateOnEnvChange(invalidation) {}
   invalidateOnStartup() {}
   invalidateOnBuild() {}
 
   // eslint-disable-next-line no-unused-vars
-  addDevDependency() {}
+  addDevDependency(options) {}
 
   // eslint-disable-next-line no-unused-vars
-  setCacheKey() {}
+  setCacheKey(key) {}
   getConfig(
   // eslint-disable-next-line no-unused-vars
   filePaths,

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

@@ -1,3 +1,6 @@
 "use strict";
 
+if (process.env.ATLASPACK_SOURCES === 'true' || process.env.ATLASPACK_BUILD_ENV === 'test' || process.env.ATLASPACK_SELF_BUILD) {
+  require('@atlaspack/babel-register');
+}
 require('./worker');

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

@@ -149,6 +149,14 @@ class AtlaspackWorker {
         }
       };
     }
+    if (result.isExcluded) {
+      return {
+        invalidations: [],
+        resolution: {
+          type: 'excluded'
+        }
+      };
+    }
     return {
       invalidations: [],
       resolution: {

package/lib/dumpGraphToGraphViz.js

@@ -47,7 +47,7 @@ const TYPE_COLORS = {
 };
 async function dumpGraphToGraphViz(graph, name, edgeTypes) {
   var _globalThis$ATLASPACK;
-  if ("production" === 'production' && !process.env.ATLASPACK_BUILD_REPL) {
+  if (process.env.ATLASPACK_BUILD_ENV === 'production' && !process.env.ATLASPACK_BUILD_REPL) {
     return;
   }
   let mode = process.env.ATLASPACK_BUILD_REPL ? // $FlowFixMe

package/lib/index.js

@@ -4,13 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  EnvironmentManager: true,
   Atlaspack: true,
   Parcel: true,
   BuildError: true,
   createWorkerFarm: true,
   INTERNAL_RESOLVE: true,
-  INTERNAL_TRANSFORM: true
+  INTERNAL_TRANSFORM: true,
+  WORKER_PATH: true,
+  ATLASPACK_VERSION: true,
+  resolveOptions: true
 };
+Object.defineProperty(exports, "ATLASPACK_VERSION", {
+  enumerable: true,
+  get: function () {
+    return _constants.ATLASPACK_VERSION;
+  }
+});
 Object.defineProperty(exports, "Atlaspack", {
   enumerable: true,
   get: function () {
@@ -23,6 +33,7 @@ Object.defineProperty(exports, "BuildError", {
     return _Atlaspack.BuildError;
   }
 });
+exports.EnvironmentManager = void 0;
 Object.defineProperty(exports, "INTERNAL_RESOLVE", {
   enumerable: true,
   get: function () {
@@ -41,6 +52,12 @@ Object.defineProperty(exports, "Parcel", {
     return _Atlaspack.default;
   }
 });
+Object.defineProperty(exports, "WORKER_PATH", {
+  enumerable: true,
+  get: function () {
+    return _Atlaspack.WORKER_PATH;
+  }
+});
 Object.defineProperty(exports, "createWorkerFarm", {
   enumerable: true,
   get: function () {
@@ -53,7 +70,17 @@ Object.defineProperty(exports, "default", {
     return _Atlaspack.default;
   }
 });
+Object.defineProperty(exports, "resolveOptions", {
+  enumerable: true,
+  get: function () {
+    return _resolveOptions.default;
+  }
+});
+var EnvironmentManager = _interopRequireWildcard(require("./EnvironmentManager"));
+exports.EnvironmentManager = EnvironmentManager;
 var _Atlaspack = _interopRequireWildcard(require("./Atlaspack"));
+var _constants = require("./constants");
+var _resolveOptions = _interopRequireDefault(require("./resolveOptions"));
 var _atlaspackV = require("./atlaspack-v3");
 Object.keys(_atlaspackV).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -66,5 +93,6 @@ Object.keys(_atlaspackV).forEach(function (key) {
     }
   });
 });
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }

package/lib/public/Asset.js

@@ -23,6 +23,7 @@ var _Environment2 = require("../Environment");
 var _projectPath = require("../projectPath");
 var _types = require("../types");
 var _utils = require("../utils");
+var _EnvironmentManager = require("../EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 const uncommittedAssetValueToAsset = new WeakMap();
@@ -44,8 +45,7 @@ function assetFromValue(value, options) {
 }
 class BaseAsset {
   #asset;
-  #query /*: ?URLSearchParams */;
-
+  #query;
   constructor(asset) {
     this.#asset = asset;
     _assetToAssetValue.set(this, asset.value);
@@ -62,7 +62,7 @@ class BaseAsset {
     return this.#asset.value.type;
   }
   get env() {
-    return new _Environment.default(this.#asset.value.env, this.#asset.options);
+    return new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#asset.value.env), this.#asset.options);
   }
   get fs() {
     return this.#asset.options.inputFS;
@@ -127,9 +127,8 @@ class BaseAsset {
   }
 }
 class Asset extends BaseAsset {
-  #asset /*: CommittedAsset | UncommittedAsset */;
-  #env /*: ?Environment */;
-
+  #asset;
+  #env;
   constructor(asset) {
     let assetValueToAsset = asset.value.committed ? committedAssetValueToAsset : uncommittedAssetValueToAsset;
     let existing = assetValueToAsset.get(asset.value);
@@ -142,7 +141,7 @@ class Asset extends BaseAsset {
     return this;
   }
   get env() {
-    this.#env ??= new _Environment.default(this.#asset.value.env, this.#asset.options);
+    this.#env ??= new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#asset.value.env), this.#asset.options);
     return this.#env;
   }
   get stats() {
@@ -151,8 +150,7 @@ class Asset extends BaseAsset {
 }
 exports.Asset = Asset;
 class MutableAsset extends BaseAsset {
-  #asset /*: UncommittedAsset */;
-
+  #asset;
   constructor(asset) {
     let existing = assetValueToMutableAsset.get(asset.value);
     if (existing != null) {

package/lib/public/Bundle.js

@@ -40,6 +40,7 @@ var _Dependency = require("./Dependency");
 var _Target = _interopRequireDefault(require("./Target"));
 var _types = require("../types");
 var _projectPath = require("../projectPath");
+var _EnvironmentManager = require("../EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 const internalBundleToBundle = new (_utils().DefaultWeakMap)(() => new (_utils().DefaultWeakMap)(() => new WeakMap()));
@@ -61,9 +62,9 @@ function bundleToInternalBundleGraph(bundle) {
 // preventing others from using them. They should use the static `get` method.
 let _private = {};
 class Bundle {
-  #bundle /*: InternalBundle */;
-  #bundleGraph /*: BundleGraph */;
-  #options /*: AtlaspackOptions */;
+  #bundle;
+  #bundleGraph;
+  #options;
 
   // $FlowFixMe
   [inspect]() {
@@ -99,7 +100,7 @@ class Bundle {
     return this.#bundle.type;
   }
   get env() {
-    return new _Environment.default(this.#bundle.env, this.#options);
+    return new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#bundle.env), this.#options);
   }
   get needsStableName() {
     return this.#bundle.needsStableName;
@@ -158,10 +159,9 @@ class Bundle {
 }
 exports.Bundle = Bundle;
 class NamedBundle extends Bundle {
-  #bundle /*: InternalBundle */;
-  #bundleGraph /*: BundleGraph */;
-  #options /*: AtlaspackOptions */;
-
+  #bundle;
+  #bundleGraph;
+  #options;
   constructor(sentinel, bundle, bundleGraph, options) {
     super(sentinel, bundle, bundleGraph, options);
     this.#bundle = bundle; // Repeating for flow
@@ -192,11 +192,10 @@ class NamedBundle extends Bundle {
 }
 exports.NamedBundle = NamedBundle;
 class PackagedBundle extends NamedBundle {
-  #bundle /*: InternalBundle */;
-  #bundleGraph /*: BundleGraph */;
-  #options /*: AtlaspackOptions */;
-  #bundleInfo /*: ?PackagedBundleInfo */;
-
+  #bundle;
+  #bundleGraph;
+  #options;
+  #bundleInfo;
   constructor(sentinel, bundle, bundleGraph, options) {
     super(sentinel, bundle, bundleGraph, options);
     this.#bundle = bundle; // Repeating for flow

package/lib/public/BundleGraph.js

@@ -263,10 +263,11 @@ class BundleGraph {
       }
       for (let bundle of bundles) {
         const conditions = bundleConditions.get(bundle.id) ?? new Map();
+        const currentCondition = conditions.get(cond.key);
         conditions.set(cond.key, {
           bundle,
-          ifTrueBundles,
-          ifFalseBundles
+          ifTrueBundles: [...((currentCondition === null || currentCondition === void 0 ? void 0 : currentCondition.ifTrueBundles) ?? []), ...ifTrueBundles],
+          ifFalseBundles: [...((currentCondition === null || currentCondition === void 0 ? void 0 : currentCondition.ifFalseBundles) ?? []), ...ifFalseBundles]
         });
         bundleConditions.set(bundle.id, conditions);
       }

package/lib/public/BundleGroup.js

@@ -21,9 +21,8 @@ function bundleGroupToInternalBundleGroup(target) {
 }
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 class BundleGroup {
-  #bundleGroup /*: InternalBundleGroup */;
-  #options /*: AtlaspackOptions */;
-
+  #bundleGroup;
+  #options;
   constructor(bundleGroup, options) {
     let existing = internalBundleGroupToBundleGroup.get(bundleGroup);
     if (existing != null) {

package/lib/public/Config.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+exports.makeConfigProxy = makeConfigProxy;
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
   _assert = function () {
@@ -27,14 +28,79 @@ function _utils() {
 }
 var _Environment = _interopRequireDefault(require("./Environment"));
 var _projectPath = require("../projectPath");
+var _EnvironmentManager = require("../EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const internalConfigToConfig = new (_utils().DefaultWeakMap)(() => new WeakMap());
-class PublicConfig {
-  #config /*: Config */;
-  #pkg /*: ?PackageJSON */;
-  #pkgFilePath /*: ?FilePath */;
-  #options /*: AtlaspackOptions */;
 
+/**
+ * Implements read tracking over an object.
+ *
+ * Calling this function with a non-trivial object like a class instance will fail to work.
+ *
+ * We track reads to fields that resolve to:
+ *
+ * - primitive values
+ * - arrays
+ *
+ * That is, reading a nested field `a.b.c` will make a single call to `onRead` with the path
+ * `['a', 'b', 'c']`.
+ *
+ * In case the value is null or an array, we will track the read as well.
+ *
+ * Iterating over `Object.keys(obj.field)` will register a read for the `['field']` path.
+ * Other reads work normally.
+ *
+ * @example
+ *
+ *     const usedPaths = new Set();
+ *     const onRead = (path) => {
+ *        usedPaths.add(path);
+ *     };
+ *
+ *     const config = makeConfigProxy(onRead, {a: {b: {c: 'd'}}})
+ *     console.log(config.a.b.c);
+ *     console.log(Array.from(usedPaths));
+ *     // We get a single read for the path
+ *     // ['a', 'b', 'c']
+ *
+ */
+function makeConfigProxy(onRead, config) {
+  const reportedPaths = new Set();
+  const reportPath = path => {
+    if (reportedPaths.has(path)) {
+      return;
+    }
+    reportedPaths.add(path);
+    onRead(path);
+  };
+  const makeProxy = (target, path) => {
+    return new Proxy(target, {
+      ownKeys(target) {
+        reportPath(path);
+
+        // $FlowFixMe
+        return Object.getOwnPropertyNames(target);
+      },
+      get(target, prop) {
+        // $FlowFixMe
+        const value = target[prop];
+        if (typeof value === 'object' && value != null && !Array.isArray(value)) {
+          return makeProxy(value, [...path, prop]);
+        }
+        reportPath([...path, prop]);
+        return value;
+      }
+    });
+  };
+
+  // $FlowFixMe
+  return makeProxy(config, []);
+}
+class PublicConfig {
+  #config;
+  #pkg;
+  #pkgFilePath;
+  #options;
   constructor(config, options) {
     let existing = internalConfigToConfig.get(options).get(config);
     if (existing != null) {
@@ -46,7 +112,7 @@ class PublicConfig {
     return this;
   }
   get env() {
-    return new _Environment.default(this.#config.env, this.#options);
+    return new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#config.env), this.#options);
   }
   get searchPath() {
     return (0, _projectPath.fromProjectPath)(this.#options.projectRoot, this.#config.searchPath);
@@ -119,13 +185,32 @@ class PublicConfig {
       });
       if (pkg && pkg.contents[packageKey]) {
         // Invalidate only when the package key changes
-        this.invalidateOnConfigKeyChange(pkg.filePath, packageKey);
+        this.invalidateOnConfigKeyChange(pkg.filePath, [packageKey]);
         return {
           contents: pkg.contents[packageKey],
           filePath: pkg.filePath
         };
       }
     }
+    const readTracking = options === null || options === void 0 ? void 0 : options.readTracking;
+    if (readTracking === true) {
+      for (let fileName of fileNames) {
+        const config = await this.getConfigFrom(searchPath, [fileName], {
+          exclude: true
+        });
+        if (config != null) {
+          return Promise.resolve({
+            contents: makeConfigProxy(keyPath => {
+              this.invalidateOnConfigKeyChange(config.filePath, keyPath);
+            }, config.contents),
+            filePath: config.filePath
+          });
+        }
+      }
+
+      // fall through so that file above invalidations are registered
+    }
+
     if (fileNames.length === 0) {
       return null;
     }
@@ -190,7 +275,9 @@ class PublicConfig {
     if (this.#pkg) {
       return this.#pkg;
     }
-    let pkgConfig = await this.getConfig(['package.json']);
+    let pkgConfig = await this.getConfig(['package.json'], {
+      readTracking: true
+    });
     if (!pkgConfig) {
       return null;
     }