@atlaspack/core 2.16.2-canary.27 → 2.16.2-canary.270

package/lib/atlaspack-v3/fs.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FileSystemV3 = void 0;
 var _jsCallable = require("./jsCallable");
+// @ts-expect-error TS2305
+
+// @ts-expect-error TS2420
 class FileSystemV3 {
   #fs;
   constructor(fs) {
@@ -29,7 +32,6 @@ class FileSystemV3 {
   };
   readFile = (0, _jsCallable.jsCallable)((path, encoding) => {
     if (!encoding) {
-      // $FlowFixMe
       return [...this.#fs.readFileSync(path)];
     } else {
       return this.#fs.readFileSync(path, encoding);

package/lib/atlaspack-v3/index.js

@@ -3,6 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  FileSystemV3: true,
+  AtlaspackV3: true,
+  NapiWorkerPool: true
+};
 Object.defineProperty(exports, "AtlaspackV3", {
   enumerable: true,
   get: function () {
@@ -23,4 +28,26 @@ Object.defineProperty(exports, "NapiWorkerPool", {
 });
 var _fs = require("./fs");
 var _AtlaspackV = require("./AtlaspackV3");
-var _NapiWorkerPool = require("./NapiWorkerPool");
+Object.keys(_AtlaspackV).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _AtlaspackV[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _AtlaspackV[key];
+    }
+  });
+});
+var _NapiWorkerPool = require("./NapiWorkerPool");
+Object.keys(_NapiWorkerPool).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _NapiWorkerPool[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _NapiWorkerPool[key];
+    }
+  });
+});

package/lib/atlaspack-v3/jsCallable.js

@@ -7,10 +7,8 @@ exports.jsCallable = jsCallable;
 function jsCallable(fn) {
   return async (...args) => {
     try {
-      // $FlowFixMe "await" is needed to log the error from
       // Promises and is safe to use on non-promises
       return await fn(...args);
-      // $FlowFixMe
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error(error);

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

@@ -54,7 +54,7 @@ class MutableDependencySymbols {
   }
 
   /*::  @@iterator(): Iterator<[Symbol, DependencyAssetSymbol]> { return ({}: any); } */
-  // $FlowFixMe Flow can't do computed properties
+  // @ts-expect-error TS2416
   [Symbol.iterator]() {
     return this.#symbols.values();
   }
@@ -102,7 +102,7 @@ class AssetSymbols {
   }
 
   /*::  @@iterator(): Iterator<[Symbol, AssetSymbol]> { return ({}: any); } */
-  // $FlowFixMe Flow can't do computed properties
+  // @ts-expect-error TS2416
   [Symbol.iterator]() {
     return this.#symbols.values();
   }
@@ -122,10 +122,12 @@ class MutableAssetSymbols {
       loc,
       local,
       isEsmExport,
-      selfReferenced
+      selfReferenced,
+      isStaticBindingSafe
     } of inner || []) {
       this.set(exported, local, loc, {
         isEsm: isEsmExport,
+        isStaticBindingSafe,
         selfReferenced
       });
     }
@@ -152,6 +154,7 @@ class MutableAssetSymbols {
           }
         } : undefined,
         isEsmExport: Boolean(meta === null || meta === void 0 ? void 0 : meta.isEsm),
+        isStaticBindingSafe: Boolean(meta === null || meta === void 0 ? void 0 : meta.isStaticBindingSafe),
         isWeak: false,
         selfReferenced: Boolean(meta === null || meta === void 0 ? void 0 : meta.selfReferenced)
       });
@@ -189,7 +192,7 @@ class MutableAssetSymbols {
   }
 
   /*::  @@iterator(): Iterator<[Symbol, AssetSymbol]> { return ({}: any); } */
-  // $FlowFixMe Flow can't do computed properties
+  // @ts-expect-error TS2416
   [Symbol.iterator]() {
     return this.#symbols.values();
   }

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

@@ -6,18 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.specifierTypeMap = exports.packageConditionsMap = exports.dependencyPriorityMap = exports.bundleBehaviorMap = exports.BitFlags = void 0;
 /// BitFlags is used to map number/string types from napi types
 class BitFlags {
+  // @ts-expect-error TS2344
   #kv;
+  // @ts-expect-error TS2344
   #vk;
+
+  // @ts-expect-error TS2344
   constructor(source) {
     this.#kv = source;
-    this.#vk = Object.fromEntries(
-    // $FlowFixMe
-    Object.entries(source).map(a => a.reverse()));
+    this.#vk = Object.fromEntries(Object.entries(source).map(a => a.reverse()));
   }
   into(key) {
     const found = this.#kv[key];
     if (found === undefined) {
-      // $FlowFixMe
       throw new Error(`Invalid BundleBehavior(${key})`);
     }
     return found;
@@ -34,7 +35,6 @@ class BitFlags {
   from(key) {
     const found = this.#vk[key];
     if (found === undefined) {
-      // $FlowFixMe
       throw new Error(`Invalid BundleBehavior(${key})`);
     }
     return found;
@@ -52,7 +52,8 @@ class BitFlags {
 exports.BitFlags = BitFlags;
 const bundleBehaviorMap = exports.bundleBehaviorMap = new BitFlags({
   inline: 0,
-  isolated: 1
+  isolated: 1,
+  inlineIsolated: 2
 });
 const dependencyPriorityMap = exports.dependencyPriorityMap = new BitFlags({
   sync: 0,

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

@@ -7,6 +7,8 @@ exports.Dependency = void 0;
 var _target = require("./target");
 var _assetSymbols = require("./asset-symbols");
 var _bitflags = require("./bitflags");
+// @ts-expect-error TS2305
+
 class Dependency {
   get id() {
     throw new Error('Dependency.id');
@@ -24,6 +26,7 @@ class Dependency {
       this.bundleBehavior = _bitflags.bundleBehaviorMap.from(inner.bundleBehavior);
     }
     this.bundleBehavior = undefined;
+    // @ts-expect-error TS2322
     this.symbols = new _assetSymbols.MutableDependencySymbols(inner.symbols || []);
     this.specifier = inner.specifier;
     this.specifierType = _bitflags.specifierTypeMap.from(inner.specifierType);

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

@@ -4,17 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Environment = void 0;
+// @ts-expect-error TS2724
+
 class Environment {
   constructor(inner) {
     // TODO
     this.id = '';
     this.includeNodeModules = inner.includeNodeModules;
-    // $FlowFixMe
     this.context = inner.context;
     this.engines = inner.engines;
-    // $FlowFixMe
     this.outputFormat = inner.outputFormat;
-    // $FlowFixMe
     this.sourceType = inner.sourceType;
     this.isLibrary = inner.isLibrary;
     this.shouldOptimize = inner.shouldOptimize;
@@ -22,9 +21,10 @@ class Environment {
     this.sourceMap = inner.sourceMap;
     this.loc = inner.loc;
     this.unstableSingleFileOutput = false;
+    this.customEnv = inner.customEnv;
   }
   isBrowser() {
-    return this.context === 'browser' || this.isWorker() || this.isWorklet() || this.context === 'electron-renderer';
+    return this.context === 'browser' || this.isWorker() || this.isTesseract() || this.isWorklet() || this.context === 'electron-renderer';
   }
   isNode() {
     return this.context === 'node' || this.isElectron();
@@ -38,19 +38,22 @@ class Environment {
   isWorklet() {
     return this.context === 'worklet';
   }
+  isTesseract() {
+    return this.context === 'tesseract';
+  }
   isIsolated() {
-    return this.isWorker() || this.isWorklet();
+    return this.isWorker() || this.isTesseract() || this.isWorklet();
   }
 
   // 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

@@ -20,10 +20,14 @@ function _stream() {
 }
 var _bitflags = require("./bitflags");
 var _assetSymbols = require("./asset-symbols");
-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 }; }
+// @ts-expect-error TS2694
+
 class MutableAsset {
+  // @ts-expect-error TS2564
+
+  // @ts-expect-error TS2416
+
   #astDirty;
   #ast;
   #contents;
@@ -34,6 +38,8 @@ class MutableAsset {
   get astGenerator() {
     throw new Error('get MutableAsset.astGenerator');
   }
+
+  // @ts-expect-error TS1051
   set astGenerator(value) {
     throw new Error('set MutableAsset.astGenerator');
   }
@@ -106,7 +112,6 @@ class MutableAsset {
     // Only create the source map if it is requested
     if (!this.#sourceMap && this.#map && typeof this.#map === 'string') {
       let sourceMap = new (_sourceMap().default)(this.#projectRoot);
-      // $FlowFixMe Flow is dumb
       sourceMap.addVLQMap(JSON.parse(this.#map));
       this.#sourceMap = sourceMap;
     }
@@ -126,32 +131,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

@@ -7,6 +7,7 @@ exports.PluginConfig = void 0;
 var _Config = _interopRequireDefault(require("../../../public/Config"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class PluginConfig {
+  // @ts-expect-error TS2564
   #projectRoot;
   #inner;
   constructor({
@@ -21,17 +22,14 @@ class PluginConfig {
     this.isSource = isSource;
     this.searchPath = searchPath;
     this.#inner = new _Config.default(
-    // $FlowFixMe
+    // @ts-expect-error TS2345
     {
       invalidateOnConfigKeyChange: [],
       invalidateOnFileCreate: [],
       invalidateOnFileChange: new Set(),
       devDeps: [],
-      // $FlowFixMe
       searchPath: searchPath.replace(projectRoot + '/', '')
-    },
-    // $FlowFixMe
-    {
+    }, {
       projectRoot,
       inputFS: fs,
       outputFS: fs,
@@ -40,21 +38,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/compat/plugin-options.js

@@ -107,6 +107,7 @@ class PluginOptions {
     return this.#options.featureFlags;
   }
   constructor(options) {
+    // @ts-expect-error TS2322
     this.#options = options;
   }
 }

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

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PluginTracer = void 0;
 class PluginTracer {
+  // @ts-expect-error TS2564
+
+  // @ts-expect-error TS2416
   createMeasurement() {
     throw new Error('PluginTracer.createMeasurement');
   }

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

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Target = void 0;
+// @ts-expect-error TS2305
+
 class Target {
   constructor(inner, env) {
     this.distDir = inner.distDir;

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

@@ -51,6 +51,8 @@ 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 }; }
+// @ts-expect-error TS2305
+
 const CONFIG = Symbol.for('parcel-plugin-config');
 class AtlaspackWorker {
   #resolvers;
@@ -64,11 +66,11 @@ class AtlaspackWorker {
   loadPlugin = (0, _jsCallable.jsCallable)(async ({
     kind,
     specifier,
-    resolveFrom
+    resolveFrom,
+    featureFlags
   }) => {
     let customRequire = _module().createRequire(resolveFrom);
     let resolvedPath = customRequire.resolve(specifier);
-    // $FlowFixMe
     let resolvedModule = await import(resolvedPath);
     let instance = undefined;
     if (resolvedModule.default && resolvedModule.default[CONFIG]) {
@@ -78,6 +80,13 @@ class AtlaspackWorker {
     } else {
       throw new Error(`Plugin could not be resolved\n\t${kind}\n\t${resolveFrom}\n\t${specifier}`);
     }
+    // Set feature flags in the worker process
+    if (featureFlags) {
+      const {
+        setFeatureFlags
+      } = await import('@atlaspack/feature-flags');
+      setFeatureFlags(featureFlags);
+    }
     switch (kind) {
       case 'resolver':
         this.#resolvers.set(specifier, {
@@ -122,6 +131,7 @@ class AtlaspackWorker {
     };
     if (!('config' in state)) {
       var _state$resolver$loadC, _state$resolver;
+      // @ts-expect-error TS2345
       state.config = await ((_state$resolver$loadC = (_state$resolver = state.resolver).loadConfig) === null || _state$resolver$loadC === void 0 ? void 0 : _state$resolver$loadC.call(_state$resolver, {
         config: new _compat.PluginConfig({
           env,
@@ -134,6 +144,8 @@ class AtlaspackWorker {
         ...defaultOptions
       }));
     }
+
+    // @ts-expect-error TS2345
     const result = await state.resolver.resolve({
       specifier,
       dependency,
@@ -149,6 +161,14 @@ class AtlaspackWorker {
         }
       };
     }
+    if (result.isExcluded) {
+      return {
+        invalidations: [],
+        resolution: {
+          type: 'excluded'
+        }
+      };
+    }
     return {
       invalidations: [],
       resolution: {
@@ -187,7 +207,9 @@ class AtlaspackWorker {
       return Promise.resolve(resolvedPath);
     };
     const env = new _compat.Environment(napiEnv);
-    const mutableAsset = new _compat.MutableAsset(innerAsset, contents, env, this.#fs, map, options.projectRoot);
+    const mutableAsset = new _compat.MutableAsset(innerAsset,
+    // @ts-expect-error TS2345
+    contents, env, this.#fs, map, options.projectRoot);
     const defaultOptions = {
       logger: new _compat.PluginLogger(),
       tracer: new _compat.PluginTracer(),
@@ -199,6 +221,8 @@ class AtlaspackWorker {
         outputFS: this.#fs
       })
     };
+
+    // @ts-expect-error TS2345
     const config = await ((_transformer$loadConf = transformer.loadConfig) === null || _transformer$loadConf === void 0 ? void 0 : _transformer$loadConf.call(transformer, {
       config: new _compat.PluginConfig({
         env,
@@ -212,6 +236,7 @@ class AtlaspackWorker {
     }));
     if (transformer.parse) {
       const ast = await transformer.parse({
+        // @ts-expect-error TS2322
         asset: mutableAsset,
         config,
         resolve: resolveFunc,
@@ -222,6 +247,7 @@ class AtlaspackWorker {
       }
     }
     const result = await state.transformer.transform({
+      // @ts-expect-error TS2322
       asset: mutableAsset,
       config,
       resolve: resolveFunc,
@@ -230,8 +256,8 @@ class AtlaspackWorker {
     if (transformer.generate) {
       const ast = await mutableAsset.getAST();
       if (ast) {
-        // $FlowFixMe "Cannot call `transformer.generate` because  undefined [1] is not a function." 🤷‍♀️
         const output = await transformer.generate({
+          // @ts-expect-error TS2322
           asset: mutableAsset,
           ast,
           ...defaultOptions
@@ -241,6 +267,7 @@ class AtlaspackWorker {
         } else if (output.content instanceof Buffer) {
           mutableAsset.setBuffer(output.content);
         } else {
+          // @ts-expect-error TS2345
           mutableAsset.setStream(output.content);
         }
         if (output.map) {
@@ -250,6 +277,13 @@ class AtlaspackWorker {
     }
     (0, _assert().default)(result.length === 1, '[V3] Unimplemented: Multiple asset return from Node transformer');
     (0, _assert().default)(result[0] === mutableAsset, '[V3] Unimplemented: New asset returned from Node transformer');
+    let assetBuffer = await mutableAsset.getBuffer();
+
+    // If the asset has no code, we set the buffer to null, which we can
+    // detect in Rust, to avoid passing back an empty buffer, which we can't.
+    if (assetBuffer.length === 0) {
+      assetBuffer = null;
+    }
     return [{
       id: mutableAsset.id,
       bundleBehavior: _compat.bundleBehaviorMap.intoNullable(mutableAsset.bundleBehavior),
@@ -265,10 +299,10 @@ class AtlaspackWorker {
       symbols: mutableAsset.symbols.intoNapi(),
       type: mutableAsset.type,
       uniqueKey: mutableAsset.uniqueKey
-    }, await mutableAsset.getBuffer(),
+    }, assetBuffer,
     // Only send back the map if it has changed
     mutableAsset.isMapDirty ?
-    // $FlowFixMe A dirty map means this will be valid
+    // @ts-expect-error TS2533
     JSON.stringify((await mutableAsset.getMap()).toVLQ()) : ''];
   });
 }
@@ -277,4 +311,6 @@ class AtlaspackWorker {
 exports.AtlaspackWorker = AtlaspackWorker;
 const worker = new AtlaspackWorker();
 const napiWorker = napi().newNodejsWorker(worker);
-_worker_threads().parentPort === null || _worker_threads().parentPort === void 0 || _worker_threads().parentPort.postMessage(napiWorker);
+_worker_threads().parentPort === null || _worker_threads().parentPort === void 0 || _worker_threads().parentPort.postMessage(napiWorker);
+
+// @ts-expect-error TS2694

package/lib/constants.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.VALID = exports.STARTUP = exports.OPTION_CHANGE = exports.INITIAL_BUILD = exports.HASH_REF_REGEX = exports.HASH_REF_PREFIX = exports.HASH_REF_HASH_LEN = exports.FILE_UPDATE = exports.FILE_DELETE = exports.FILE_CREATE = exports.ERROR = exports.ENV_CHANGE = exports.ATLASPACK_VERSION = void 0;
 var _package = require("../package.json");
-// $FlowFixMe
 const ATLASPACK_VERSION = exports.ATLASPACK_VERSION = _package.version;
 const HASH_REF_PREFIX = exports.HASH_REF_PREFIX = 'HASH_REF_';
 const HASH_REF_HASH_LEN = exports.HASH_REF_HASH_LEN = 16;