@atlaspack/core 2.19.1 → 2.19.3-typescript-08dcc1c9b.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaspack/core
 
+## 2.19.2
+
+### Patch Changes
+
+- [#707](https://github.com/atlassian-labs/atlaspack/pull/707) [`a0b959f`](https://github.com/atlassian-labs/atlaspack/commit/a0b959fbf61fc3f820ff03c7e8988945fe40a91a) Thanks [@yamadapc](https://github.com/yamadapc)! - Fix content key not found exceptions when bundling is aborted after a unsafe to incrementally bundle asset graph request
+
+- Updated dependencies [[`daaa768`](https://github.com/atlassian-labs/atlaspack/commit/daaa7688786772d7e3713b71c5bba6b89ec704aa), [`1c7865a`](https://github.com/atlassian-labs/atlaspack/commit/1c7865a64451116d94015e248302435839d347c0), [`a0b959f`](https://github.com/atlassian-labs/atlaspack/commit/a0b959fbf61fc3f820ff03c7e8988945fe40a91a)]:
+  - @atlaspack/plugin@2.14.20
+  - @atlaspack/feature-flags@2.19.2
+  - @atlaspack/cache@3.2.15
+  - @atlaspack/fs@2.15.15
+  - @atlaspack/graph@3.5.9
+  - @atlaspack/utils@2.17.2
+  - @atlaspack/package-manager@2.14.20
+  - @atlaspack/profiler@2.14.17
+  - @atlaspack/types@2.15.10
+  - @atlaspack/workers@2.14.20
+
 ## 2.19.1
 
 ### Patch Changes

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (c) 2024 Atlassian US., Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/lib/AssetGraph.js

@@ -71,7 +71,11 @@ function nodeFromDep(dep) {
 }
 function nodeFromAssetGroup(assetGroup) {
   return {
-    id: (0, _rust().hashString)((0, _projectPath.fromProjectPathRelative)(assetGroup.filePath) + (0, _EnvironmentManager.toEnvironmentId)(assetGroup.env) + String(assetGroup.isSource) + String(assetGroup.sideEffects) + (assetGroup.code ?? '') + ':' + (assetGroup.pipeline ?? '') + ':' + (assetGroup.query ?? '')),
+    id: (0, _rust().hashString)(
+    // @ts-expect-error TS2345
+    (0, _projectPath.fromProjectPathRelative)(assetGroup.filePath) +
+    // @ts-expect-error TS2345
+    (0, _EnvironmentManager.toEnvironmentId)(assetGroup.env) + String(assetGroup.isSource) + String(assetGroup.sideEffects) + (assetGroup.code ?? '') + ':' + (assetGroup.pipeline ?? '') + ':' + (assetGroup.query ?? '')),
     type: 'asset_group',
     value: assetGroup,
     usedSymbolsDownDirty: true
@@ -101,16 +105,34 @@ function nodeFromEntryFile(entry) {
     value: entry
   };
 }
+
+// @ts-expect-error TS2417
 class AssetGraph extends _graph().ContentGraph {
+  /**
+   * Incremented when the asset graph is modified such that it requires a bundling pass.
+   */
+  #bundlingVersion = 0;
+  /**
+   * Force incremental bundling to be disabled.
+   */
+  #disableIncrementalBundling = false;
+
+  /**
+   * @deprecated
+   */
   safeToIncrementallyBundle = true;
   constructor(opts) {
     if (opts) {
       let {
         hash,
+        bundlingVersion,
+        disableIncrementalBundling,
         ...rest
       } = opts;
       super(rest);
       this.hash = hash;
+      this.#bundlingVersion = bundlingVersion ?? 0;
+      this.#disableIncrementalBundling = disableIncrementalBundling ?? false;
     } else {
       super();
       this.setRootNodeId(this.addNode({
@@ -122,25 +144,72 @@ class AssetGraph extends _graph().ContentGraph {
     this.undeferredDependencies = new Set();
     this.envCache = new Map();
   }
-
-  // $FlowFixMe[prop-missing]
   static deserialize(opts) {
     return new AssetGraph(opts);
   }
-
-  // $FlowFixMe[prop-missing]
   serialize() {
     return {
       ...super.serialize(),
+      bundlingVersion: this.#bundlingVersion,
+      disableIncrementalBundling: this.#disableIncrementalBundling,
       hash: this.hash
     };
   }
 
+  /**
+   * Force incremental bundling to be disabled.
+   */
+  setDisableIncrementalBundling(disable) {
+    this.#disableIncrementalBundling = disable;
+  }
+  testing_getDisableIncrementalBundling() {
+    return this.#disableIncrementalBundling;
+  }
+
+  /**
+   * Make sure this asset graph is marked as needing a full bundling pass.
+   */
+  setNeedsBundling() {
+    if (!(0, _featureFlags().getFeatureFlag)('incrementalBundlingVersioning')) {
+      // In legacy mode, we rely solely on safeToIncrementallyBundle to
+      // invalidate incremental bundling, so we skip bumping the version.
+      return;
+    }
+    this.#bundlingVersion += 1;
+  }
+
+  /**
+   * Get the current bundling version.
+   *
+   * Each bundle pass should keep this version around. Whenever an asset graph has a new version,
+   * bundling should be re-run.
+   */
+  getBundlingVersion() {
+    if (!(0, _featureFlags().getFeatureFlag)('incrementalBundlingVersioning')) {
+      return 0;
+    }
+    return this.#bundlingVersion;
+  }
+
+  /**
+   * If the `bundlingVersion` has not changed since the last bundling pass,
+   * we can incrementally bundle, which will not require a full bundling pass
+   * but just update assets into the bundle graph output.
+   */
+  canIncrementallyBundle(lastVersion) {
+    if (!(0, _featureFlags().getFeatureFlag)('incrementalBundlingVersioning')) {
+      return this.safeToIncrementallyBundle && !this.#disableIncrementalBundling;
+    }
+    return this.safeToIncrementallyBundle && this.#bundlingVersion === lastVersion && !this.#disableIncrementalBundling;
+  }
+
   // Deduplicates Environments by making them referentially equal
   normalizeEnvironment(input) {
     if ((0, _featureFlags().getFeatureFlag)('environmentDeduplication')) {
       return;
     }
+
+    // @ts-expect-error TS2345
     let {
       id,
       context
@@ -150,6 +219,7 @@ class AssetGraph extends _graph().ContentGraph {
     if (env) {
       input.env = (0, _EnvironmentManager.toEnvironmentRef)(env);
     } else {
+      // @ts-expect-error TS2345
       this.envCache.set(idAndContext, (0, _EnvironmentManager.fromEnvironmentId)(input.env));
     }
   }
@@ -177,8 +247,6 @@ class AssetGraph extends _graph().ContentGraph {
     let existing = this.getNodeByContentKey(node.id);
     if (existing != null) {
       (0, _assert().default)(existing.type === node.type);
-      // $FlowFixMe[incompatible-type] Checked above
-      // $FlowFixMe[prop-missing]
       existing.value = node.value;
       let existingId = this.getNodeIdByContentKey(node.id);
       this.updateNode(existingId, existing);
@@ -210,6 +278,7 @@ class AssetGraph extends _graph().ContentGraph {
         env: target.env,
         isEntry: true,
         needsStableName: true,
+        // @ts-expect-error TS2322
         symbols: (0, _EnvironmentManager.fromEnvironmentId)(target.env).isLibrary ? new Map([['*', {
           local: '*',
           isWeak: true,
@@ -218,7 +287,9 @@ class AssetGraph extends _graph().ContentGraph {
       }));
       if ((0, _EnvironmentManager.fromEnvironmentId)(node.value.env).isLibrary) {
         // in library mode, all of the entry's symbols are "used"
+        // @ts-expect-error TS2345
         node.usedSymbolsDown.add('*');
+        // @ts-expect-error TS2345
         node.usedSymbolsUp.set('*', undefined);
       }
       return node;
@@ -296,7 +367,10 @@ class AssetGraph extends _graph().ContentGraph {
       if (traversedNode.type === 'asset') {
         let hasDeferred = this.getNodeIdsConnectedFrom(traversedNodeId).some(childNodeId => {
           let childNode = (0, _nullthrows().default)(this.getNode(childNodeId));
-          return childNode.hasDeferred == null ? false : childNode.hasDeferred;
+          // @ts-expect-error TS2339
+          return childNode.hasDeferred == null ? false :
+          // @ts-expect-error TS2339
+          childNode.hasDeferred;
         });
         if (!hasDeferred) {
           delete traversedNode.hasDeferred;
@@ -305,13 +379,16 @@ class AssetGraph extends _graph().ContentGraph {
           hasDeferred
         };
       } else if (traversedNode.type === 'asset_group' && nodeId !== traversedNodeId) {
+        // @ts-expect-error TS2339
         if (!(ctx !== null && ctx !== void 0 && ctx.hasDeferred)) {
           this.safeToIncrementallyBundle = false;
+          this.setNeedsBundling();
           delete traversedNode.hasDeferred;
         }
         actions.skipChildren();
       } else if (traversedNode.type === 'dependency') {
         this.safeToIncrementallyBundle = false;
+        this.setNeedsBundling();
         traversedNode.hasDeferred = false;
       } else if (nodeId !== traversedNodeId) {
         actions.skipChildren();
@@ -333,7 +410,9 @@ class AssetGraph extends _graph().ContentGraph {
     }
     let isDeferrable = [...dependencySymbols].every(([, {
       isWeak
-    }]) => isWeak) && sideEffects === false && canDefer && !dependencySymbols.has('*');
+    }]) => isWeak) && sideEffects === false && canDefer &&
+    // @ts-expect-error TS2345
+    !dependencySymbols.has('*');
     if (!isDeferrable) {
       return false;
     }
@@ -359,7 +438,9 @@ class AssetGraph extends _graph().ContentGraph {
       if (this.undeferredDependencies.has(d)) {
         return false;
       }
-      let depIsDeferrable = d.symbols && !((0, _EnvironmentManager.fromEnvironmentId)(d.env).isLibrary && d.isEntry) && !d.symbols.has('*') && ![...d.symbols.keys()].some(symbol => {
+      let depIsDeferrable = d.symbols && !((0, _EnvironmentManager.fromEnvironmentId)(d.env).isLibrary && d.isEntry) &&
+      // @ts-expect-error TS2345
+      !d.symbols.has('*') && ![...d.symbols.keys()].some(symbol => {
         var _resolvedAsset$symbol;
         let assetSymbol = (_resolvedAsset$symbol = resolvedAsset.symbols) === null || _resolvedAsset$symbol === void 0 || (_resolvedAsset$symbol = _resolvedAsset$symbol.get(symbol)) === null || _resolvedAsset$symbol === void 0 ? void 0 : _resolvedAsset$symbol.local;
         return assetSymbol != null && symbols.has(assetSymbol);
@@ -374,6 +455,7 @@ class AssetGraph extends _graph().ContentGraph {
   resolveAssetGroup(assetGroup, assets, correspondingRequest) {
     this.normalizeEnvironment(assetGroup);
     let assetGroupNode = nodeFromAssetGroup(assetGroup);
+    // @ts-expect-error TS2322
     assetGroupNode = this.getNodeByContentKey(assetGroupNode.id);
     if (!assetGroupNode) {
       return;

package/lib/Atlaspack.js

@@ -123,28 +123,43 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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 }; }
 // eslint-disable-next-line no-unused-vars
+
 (0, _registerCoreWithSerializer.registerCoreWithSerializer)();
 const INTERNAL_TRANSFORM = exports.INTERNAL_TRANSFORM = Symbol('internal_transform');
 const INTERNAL_RESOLVE = exports.INTERNAL_RESOLVE = Symbol('internal_resolve');
-const WORKER_PATH = exports.WORKER_PATH = _path().default.join(__dirname, 'worker.js');
+let WORKER_PATH = exports.WORKER_PATH = _path().default.join(__dirname, 'worker.js');
+if (process.env.ATLASPACK_REGISTER_USE_SRC === 'true') {
+  exports.WORKER_PATH = WORKER_PATH = _path().default.join(__dirname, 'worker.ts');
+}
 class Atlaspack {
+  // @ts-expect-error TS2564
   #requestTracker;
+  // @ts-expect-error TS2564
   #config;
+  // @ts-expect-error TS2564
   #farm;
   #initialized = false;
+  // @ts-expect-error TS2564
   #disposable;
   #initialOptions;
+  // @ts-expect-error TS2564
   #reporterRunner;
   #resolvedOptions = null;
+  // @ts-expect-error TS2564
   #optionsRef;
+  // @ts-expect-error TS2564
   #watchAbortController;
   #watchQueue = new (_utils2().PromiseQueue)({
     maxConcurrent: 1
   });
+  // @ts-expect-error TS2564
   #watchEvents;
   #watcherSubscription;
   #watcherCount = 0;
   #requestedAssetIds = new Set();
+
+  // @ts-expect-error TS2564
+
   constructor(options) {
     this.#initialOptions = options;
   }
@@ -194,8 +209,6 @@ class Atlaspack {
         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.put('current_session_version', Buffer.from(version));
       let threads = undefined;
@@ -206,12 +219,12 @@ class Atlaspack {
       }
       rustAtlaspack = await _atlaspackV.AtlaspackV3.create({
         ...options,
+        // @ts-expect-error TS2353
         corePath: _path().default.join(__dirname, '..'),
         threads,
         entries: Array.isArray(entries) ? entries : entries == null ? undefined : [entries],
         env: resolvedOptions.env,
         fs: inputFS && new _atlaspackV.FileSystemV3(inputFS),
-        // $FlowFixMe ProjectPath is a string
         defaultTargetOptions: resolvedOptions.defaultTargetOptions,
         lmdb
       });
@@ -221,6 +234,7 @@ class Atlaspack {
         });
       }
     }
+    // @ts-expect-error TS2454
     this.rustAtlaspack = rustAtlaspack;
     let {
       config
@@ -266,6 +280,7 @@ class Atlaspack {
     this.#requestTracker = await _RequestTracker.default.init({
       farm: this.#farm,
       options: resolvedOptions,
+      // @ts-expect-error TS2454
       rustAtlaspack
     });
     this.#initialized = true;
@@ -332,6 +347,8 @@ class Atlaspack {
     if (!this.#initialized) {
       await this._init();
     }
+
+    // @ts-expect-error TS7034
     let watchEventsDisposable;
     if (cb) {
       watchEventsDisposable = this.#watchEvents.addListener(({
@@ -351,8 +368,11 @@ class Atlaspack {
       this.#watchQueue.run();
     }
     this.#watcherCount++;
+
+    // @ts-expect-error TS7034
     let unsubscribePromise;
     const unsubscribe = async () => {
+      // @ts-expect-error TS7005
       if (watchEventsDisposable) {
         watchEventsDisposable.dispose();
       }
@@ -370,9 +390,12 @@ class Atlaspack {
     };
     return {
       unsubscribe() {
+        // @ts-expect-error TS7005
         if (unsubscribePromise == null) {
           unsubscribePromise = unsubscribe();
         }
+
+        // @ts-expect-error TS7005
         return unsubscribePromise;
       }
     };
@@ -415,13 +438,14 @@ class Atlaspack {
       });
       this.#requestedAssetIds.clear();
       await (0, _dumpGraphToGraphViz.default)(
-      // $FlowFixMe
+      // @ts-expect-error TS2345
       this.#requestTracker.graph, 'RequestGraph', _RequestTracker.requestGraphEdgeTypes);
       let event = {
         type: 'buildSuccess',
         changedAssets: new Map(Array.from(changedAssets).map(([id, asset]) => [id, (0, _Asset.assetFromValue)(asset, options)])),
         bundleGraph: new _BundleGraph.default(bundleGraph, (bundle, bundleGraph, options) => _Bundle.PackagedBundle.getWithInfo(bundle, bundleGraph, options, bundleInfo.get(bundle.id)), options),
         buildTime: Date.now() - startTime,
+        // @ts-expect-error TS7006
         requestBundle: async bundle => {
           let bundleNode = bundleGraph._graph.getNodeByContentKey(bundle.id);
           (0, _assert().default)((bundleNode === null || bundleNode === void 0 ? void 0 : bundleNode.type) === 'bundle', 'Bundle does not exist');
@@ -447,15 +471,21 @@ class Atlaspack {
           }
           let results = await this.#watchQueue.run();
           let result = results.filter(Boolean).pop();
+          // @ts-expect-error TS18049
           if (result.type === 'buildFailure') {
+            // @ts-expect-error TS18049
             throw new BuildError(result.diagnostics);
           }
           return result;
         },
         unstable_requestStats: this.#requestTracker.flushStats()
       };
+
+      // @ts-expect-error TS2345
       await this.#reporterRunner.report(event);
-      await this.#requestTracker.runRequest((0, _ValidationRequest.default)({
+      await this.#requestTracker.runRequest(
+      // @ts-expect-error TS2345
+      (0, _ValidationRequest.default)({
         optionsRef: this.#optionsRef,
         assetRequests
       }), {
@@ -464,6 +494,8 @@ class Atlaspack {
       if (this.#reporterRunner.errors.length) {
         throw this.#reporterRunner.errors;
       }
+
+      // @ts-expect-error TS2322
       return event;
     } catch (e) {
       if (e instanceof _utils.BuildAbortError) {
@@ -475,7 +507,10 @@ class Atlaspack {
         diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic],
         unstable_requestStats: this.#requestTracker.flushStats()
       };
+
+      // @ts-expect-error TS2345
       await this.#reporterRunner.report(event);
+      // @ts-expect-error TS2322
       return event;
     } finally {
       if (this.isProfiling) {
@@ -588,7 +623,11 @@ class Atlaspack {
       requestedAssetIds: this.#requestedAssetIds
     };
     const start = Date.now();
-    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 ?
+    // @ts-expect-error TS2345
+    (0, _AssetGraphRequestRust.createAssetGraphRequestRust)(this.rustAtlaspack)(input) :
+    // @ts-expect-error TS2345
+    (0, _AssetGraphRequest.default)(input), {
       force: true
     });
     const duration = Date.now() - start;
@@ -675,6 +714,7 @@ class Atlaspack {
       return null;
     }
     return {
+      // @ts-expect-error TS2322
       filePath: (0, _projectPath.fromProjectPath)(projectRoot, res.filePath),
       code: res.code,
       query: res.query,