@atlaspack/bundler-default 3.2.0 → 3.2.1-typescript-17c3d1dec.0

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/DefaultBundler.d.ts

@@ -0,0 +1,18 @@
+import { Bundler } from '@atlaspack/plugin';
+/**
+ *
+ * The Bundler works by creating an IdealGraph, which contains a BundleGraph that models bundles
+ * connected to other bundles by what references them, and thus models BundleGroups.
+ *
+ * First, we enter `bundle({bundleGraph, config})`. Here, "bundleGraph" is actually just the
+ * assetGraph turned into a type `MutableBundleGraph`, which will then be mutated in decorate,
+ * and turned into what we expect the bundleGraph to be as per the old (default) bundler structure
+ *  & what the rest of Atlaspack expects a BundleGraph to be.
+ *
+ * `bundle({bundleGraph, config})` First gets a Mapping of target to entries, In most cases there is
+ *  only one target, and one or more entries. (Targets are pertinent in monorepos or projects where you
+ *  will have two or more distDirs, or output folders.) Then calls create IdealGraph and Decorate per target.
+ *
+ */
+declare const _default: Bundler<unknown>;
+export default _default;

package/lib/DefaultBundler.js

@@ -59,6 +59,7 @@ var _default = exports.default = new (_plugin().Bundler)({
     logger
   }) {
     let targetMap = getEntryByTarget(bundleGraph); // Organize entries by target output folder/ distDir
+    // @ts-expect-error TS2304
     let graphs = [];
     for (let entries of targetMap.values()) {
       let singleFileEntries = new Map();
@@ -75,9 +76,7 @@ var _default = exports.default = new (_plugin().Bundler)({
       }
 
       // Create separate bundleGraphs per distDir
-      graphs.push(
-      // $FlowFixMe
-      (0, _idealGraph.createIdealGraph)(bundleGraph, config, idealGraphEntries, logger));
+      graphs.push((0, _idealGraph.createIdealGraph)(bundleGraph, config, idealGraphEntries, logger));
 
       // Do this after the ideal graph so that the mutation of the bundleGraph doesn't
       // interfere with the main bundling algorithm
@@ -96,7 +95,11 @@ function getEntryByTarget(bundleGraph) {
   // Find entries from assetGraph per target
   let targets = new (_utils().DefaultMap)(() => new Map());
   bundleGraph.traverse({
-    enter(node, context, actions) {
+    enter(
+    // @ts-expect-error TS2304
+    node, context,
+    // @ts-expect-error TS2304
+    actions) {
       if (node.type !== 'asset') {
         return node;
       }

package/lib/MonolithicBundler.d.ts

@@ -0,0 +1,2 @@
+import type { Asset, Dependency, MutableBundleGraph } from '@atlaspack/types';
+export declare function addJSMonolithBundle(bundleGraph: MutableBundleGraph, entryAsset: Asset, entryDep: Dependency): void;

package/lib/bundleMerge.d.ts

@@ -0,0 +1,9 @@
+import type { NodeId } from '@atlaspack/graph';
+import type { IdealBundleGraph } from './idealGraph';
+export type MergeGroup = {
+    overlapThreshold?: number;
+    maxBundleSize?: number;
+    sourceBundles?: Array<NodeId>;
+    minBundlesInGroup?: number;
+};
+export declare function findMergeCandidates(bundleGraph: IdealBundleGraph, bundles: Array<NodeId>, config: Array<MergeGroup>): Array<Array<NodeId>>;

package/lib/bundleMerge.js

@@ -38,6 +38,7 @@ function getBundlesForBundleGroup(bundleGraph, bundleGroupId) {
   let count = 0;
   bundleGraph.traverse(nodeId => {
     var _bundleGraph$getNode;
+    // @ts-expect-error TS2339
     if (((_bundleGraph$getNode = bundleGraph.getNode(nodeId)) === null || _bundleGraph$getNode === void 0 ? void 0 : _bundleGraph$getNode.bundleBehavior) !== 'inline') {
       count++;
     }
@@ -118,9 +119,9 @@ function getPossibleMergeCandidates(bundleGraph, bundles) {
     for (let j = i + 1; j < mergeCandidates.length; j++) {
       let a = mergeCandidates[i];
       let b = mergeCandidates[j];
-      if (
-      // $FlowFixMe both bundles will always have internalizedAssets
-      a.bundle.internalizedAssets.equals(b.bundle.internalizedAssets)) {
+
+      // @ts-expect-error TS18048
+      if (a.bundle.internalizedAssets.equals(b.bundle.internalizedAssets)) {
         uniquePairs.push([a, b]);
       }
     }

package/lib/bundlerConfig.d.ts

@@ -0,0 +1,27 @@
+import type { Config, PluginOptions, PluginLogger } from '@atlaspack/types';
+type Glob = string;
+type ManualSharedBundles = Array<{
+    name: string;
+    assets: Array<Glob>;
+    types?: Array<string>;
+    root?: string;
+    split?: number;
+}>;
+export type MergeCandidates = Array<{
+    overlapThreshold?: number;
+    maxBundleSize?: number;
+    sourceBundles?: Array<string>;
+    minBundlesInGroup?: number;
+}>;
+export type ResolvedBundlerConfig = {
+    minBundles: number;
+    minBundleSize: number;
+    maxParallelRequests: number;
+    projectRoot: string;
+    disableSharedBundles: boolean;
+    manualSharedBundles: ManualSharedBundles;
+    loadConditionalBundlesInParallel?: boolean;
+    sharedBundleMerge?: MergeCandidates;
+};
+export declare function loadBundlerConfig(config: Config, options: PluginOptions, logger: PluginLogger): Promise<ResolvedBundlerConfig>;
+export {};

package/lib/bundlerConfig.js

@@ -39,14 +39,13 @@ function resolveModeConfig(config, mode) {
   for (const key of Object.keys(config)) {
     if (key === 'development' || key === 'production') {
       if (key === mode) {
+        // @ts-expect-error TS2322
         modeConfig = config[key];
       }
     } else {
       generalConfig[key] = config[key];
     }
   }
-
-  // $FlowFixMe Not sure how to convince flow here...
   return {
     ...generalConfig,
     ...modeConfig
@@ -172,6 +171,7 @@ async function loadBundlerConfig(config, options, logger) {
       ...HTTP_OPTIONS['2'],
       projectRoot: options.projectRoot
     };
+    // @ts-expect-error TS2322
     return modDefault;
   }
   (0, _assert().default)(((_conf = conf) === null || _conf === void 0 ? void 0 : _conf.contents) != null);
@@ -212,6 +212,7 @@ async function loadBundlerConfig(config, options, logger) {
     prependKey: `/${(0, _diagnostic().encodeJSONKeyComponent)('@atlaspack/bundler-default')}`
   }, '@atlaspack/bundler-default', 'Invalid config for @atlaspack/bundler-default');
   let http = modeConfig.http ?? 2;
+  // @ts-expect-error TS7053
   let defaults = HTTP_OPTIONS[http];
   return {
     minBundles: modeConfig.minBundles ?? defaults.minBundles,

package/lib/decorateLegacyGraph.d.ts

@@ -0,0 +1,3 @@
+import type { MutableBundleGraph } from '@atlaspack/types';
+import type { IdealGraph } from './idealGraph';
+export declare function decorateLegacyGraph(idealGraph: IdealGraph, bundleGraph: MutableBundleGraph): void;

package/lib/decorateLegacyGraph.js

@@ -179,6 +179,8 @@ function decorateLegacyGraph(idealGraph, bundleGraph) {
       bundleGraph.createAssetReference(dependency, asset, legacyBundle);
     }
   }
+
+  // @ts-expect-error TS2488
   for (let {
     type,
     from,
@@ -188,12 +190,14 @@ function decorateLegacyGraph(idealGraph, bundleGraph) {
     if (sourceBundle === 'root') {
       continue;
     }
+    // @ts-expect-error TS2367
     (0, _assert().default)(sourceBundle !== 'root');
     let legacySourceBundle = (0, _nullthrows().default)(idealBundleToLegacyBundle.get(sourceBundle));
     let targetBundle = (0, _nullthrows().default)(idealBundleGraph.getNode(to));
     if (targetBundle === 'root') {
       continue;
     }
+    // @ts-expect-error TS2367
     (0, _assert().default)(targetBundle !== 'root');
     let legacyTargetBundle = (0, _nullthrows().default)(idealBundleToLegacyBundle.get(targetBundle));
     if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && type === _idealGraph.idealBundleGraphEdges.conditional) {

package/lib/idealGraph.d.ts

@@ -0,0 +1,40 @@
+import { BitSet, ContentGraph, Graph, NodeId } from '@atlaspack/graph';
+import type { Asset, BundleBehavior, Dependency, Environment, MutableBundleGraph, Target, PluginLogger } from '@atlaspack/types';
+import { DefaultMap } from '@atlaspack/utils';
+import type { ResolvedBundlerConfig } from './bundlerConfig';
+export type Bundle = {
+    uniqueKey: string | null | undefined;
+    assets: Set<Asset>;
+    internalizedAssets?: BitSet;
+    bundleBehavior?: BundleBehavior | null | undefined;
+    needsStableName: boolean;
+    mainEntryAsset: Asset | null | undefined;
+    bundleRoots: Set<Asset>;
+    size: number;
+    sourceBundles: Set<NodeId>;
+    target: Target;
+    env: Environment;
+    type: string;
+    manualSharedBundle: string | null | undefined;
+};
+export type DependencyBundleGraph = ContentGraph<{
+    value: Bundle;
+    type: 'bundle';
+} | {
+    value: Dependency;
+    type: 'dependency';
+}, number>;
+export declare const idealBundleGraphEdges: Readonly<{
+    default: 1;
+    conditional: 2;
+}>;
+export type IdealBundleGraph = Graph<Bundle | 'root', (typeof idealBundleGraphEdges)[keyof typeof idealBundleGraphEdges]>;
+export type IdealGraph = {
+    assetReference: DefaultMap<Asset, Array<[Dependency, Bundle]>>;
+    assets: Array<Asset>;
+    bundleGraph: IdealBundleGraph;
+    bundleGroupBundleIds: Set<NodeId>;
+    dependencyBundleGraph: DependencyBundleGraph;
+    manualAssetToBundle: Map<Asset, NodeId>;
+};
+export declare function createIdealGraph(assetGraph: MutableBundleGraph, config: ResolvedBundlerConfig, entries: Map<Asset, Dependency>, logger: PluginLogger): IdealGraph;

package/lib/idealGraph.js

@@ -50,6 +50,7 @@ function _nullthrows() {
 var _bundleMerge = require("./bundleMerge");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* BundleRoot - An asset that is the main entry of a Bundle. */
+
 const dependencyPriorityEdges = {
   sync: 1,
   parallel: 2,
@@ -126,6 +127,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
     let parentsToConfig = new (_utils().DefaultMap)(() => []);
     for (let c of config.manualSharedBundles) {
       if (c.root != null) {
+        // @ts-expect-error TS2345
         parentsToConfig.get(_path().default.join(config.projectRoot, c.root)).push(c);
       }
     }
@@ -162,6 +164,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
           // We track all matching MSB's for constant modules as they are never duplicated
           // and need to be assigned to all matching bundles
           if (node.value.meta.isConstantModule === true) {
+            // @ts-expect-error TS2345
             constantModuleToMSB.get(node.value).push(c);
           }
           if (assetRegexes.some(regex => regex.test(projectRelativePath))) {
@@ -202,7 +205,9 @@ function createIdealGraph(assetGraph, config, entries, logger) {
    * adding only that asset to each bundle, not its entire subgraph.
    */
   assetGraph.traverse({
-    enter(node, context, actions) {
+    enter(node, context,
+    // @ts-expect-error TS2304
+    actions) {
       if (node.type === 'asset') {
         if ((context === null || context === void 0 ? void 0 : context.type) === 'dependency' && context !== null && context !== void 0 && context.value.isEntry && !entries.has(node.value)) {
           // Skip whole subtrees of other targets by skipping those entries
@@ -287,7 +292,9 @@ function createIdealGraph(assetGraph, config, entries, logger) {
             }), dependencyBundleGraph.addNodeByContentKeyIfNeeded(String(bundleId), {
               value: bundle,
               type: 'bundle'
-            }), dependencyPriorityEdges[dependency.priority]);
+            }),
+            // @ts-expect-error TS7053
+            dependencyPriorityEdges[dependency.priority]);
             if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && dependency.priority === 'conditional') {
               let [referencingBundleRoot, bundleGroupNodeId] = (0, _nullthrows().default)(stack[stack.length - 1]);
               let referencingBundleId = (0, _nullthrows().default)(bundleRoots.get(referencingBundleRoot))[0];
@@ -347,13 +354,16 @@ function createIdealGraph(assetGraph, config, entries, logger) {
             }
             assetReference.get(childAsset).push([dependency, bundle]);
           } else {
+            // @ts-expect-error TS2322
             bundleId = null;
           }
           if (manualSharedObject && bundleId != null) {
             // MSB Step 5:  At this point we've either created or found an existing MSB bundle
             // add the asset if it doesn't already have it and set key
 
-            (0, _assert().default)(bundle !== 'root' && bundle != null && bundleId != null);
+            (0, _assert().default)(
+            // @ts-expect-error TS2367
+            bundle !== 'root' && bundle != null && bundleId != null);
             manualAssetToBundle.set(childAsset, bundleId);
             if (!bundle.assets.has(childAsset)) {
               // Add asset to bundle
@@ -374,6 +384,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       }
       return node;
     },
+    // @ts-expect-error TS2322
     exit(node) {
       var _stack;
       if (((_stack = stack[stack.length - 1]) === null || _stack === void 0 ? void 0 : _stack[0]) === node.value) {
@@ -602,8 +613,11 @@ function createIdealGraph(assetGraph, config, entries, logger) {
   }
   function assignInlineConstants(parentAsset, bundle) {
     for (let inlineConstant of inlineConstantDeps.get(parentAsset)) {
+      // @ts-expect-error TS2345
       if (!bundle.assets.has(inlineConstant)) {
+        // @ts-expect-error TS2345
         bundle.assets.add(inlineConstant);
+        // @ts-expect-error TS18046
         bundle.size += inlineConstant.stats.size;
       }
     }
@@ -819,8 +833,9 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       if (modNum != null) {
         for (let a of [...manualBundle.assets]) {
           let numRep = getBigIntFromContentKey(a.id);
-          // $FlowFixMe Flow doesn't know about BigInt
           let r = Number(numRep % BigInt(modNum));
+
+          // @ts-expect-error TS2345
           remainderMap.get(r).push(a);
         }
         for (let i = 1; i < [...remainderMap.keys()].length; i++) {
@@ -842,8 +857,10 @@ function createIdealGraph(assetGraph, config, entries, logger) {
           }
           for (let sp of remainderMap.get(i)) {
             bundle.assets.add(sp);
+            // @ts-expect-error TS2339
             bundle.size += sp.stats.size;
             manualBundle.assets.delete(sp);
+            // @ts-expect-error TS2339
             manualBundle.size -= sp.stats.size;
           }
         }
@@ -856,12 +873,17 @@ function createIdealGraph(assetGraph, config, entries, logger) {
   // match multiple MSB's
   for (let [asset, msbs] of constantModuleToMSB.entries()) {
     for (let manualSharedObject of msbs) {
+      // @ts-expect-error TS2339
       let bundleId = manualSharedMap.get(manualSharedObject.name + ',js');
       if (bundleId == null) continue;
       let bundle = (0, _nullthrows().default)(bundleGraph.getNode(bundleId));
       (0, _assert().default)(bundle != null && bundle !== 'root', 'We tried to use the root incorrectly');
+
+      // @ts-expect-error TS2345
       if (!bundle.assets.has(asset)) {
+        // @ts-expect-error TS2345
         bundle.assets.add(asset);
+        // @ts-expect-error TS18046
         bundle.size += asset.stats.size;
       }
     }
@@ -912,6 +934,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       // Merge all bundles with the same chunk name into the first one.
       let [firstBundleId, ...rest] = Array.from(bundleIds);
       for (let bundleId of rest) {
+        // @ts-expect-error TS2345
         mergeBundles(firstBundleId, bundleId);
       }
     }
@@ -947,6 +970,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       let numBundlesContributingToPRL = bundleIdsInGroup.reduce((count, b) => {
         let bundle = (0, _nullthrows().default)(bundleGraph.getNode(b));
         (0, _assert().default)(bundle !== 'root');
+        // @ts-expect-error TS2365
         return count + (bundle.bundleBehavior !== 'inline');
       }, 0);
       if (numBundlesContributingToPRL > config.maxParallelRequests) {
@@ -976,7 +1000,9 @@ function createIdealGraph(assetGraph, config, entries, logger) {
         // Remove bundles until the bundle group is within the parallel request limit.
         while (sharedBundlesInGroup.length > 0 && numBundlesContributingToPRL > config.maxParallelRequests) {
           let bundleTuple = sharedBundlesInGroup.pop();
+          // @ts-expect-error TS18048
           let bundleToRemove = bundleTuple.bundle;
+          // @ts-expect-error TS18048
           let bundleIdToRemove = bundleTuple.id;
           //TODO add integration test where bundles in bunlde group > max parallel request limit & only remove a couple shared bundles
           // but total # bundles still exceeds limit due to non shared bundles
@@ -1027,6 +1053,8 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       bundleToKeep.assets.add(asset);
       bundleToKeep.size += asset.stats.size;
       let newAssetReference = assetReference.get(asset).map(([dep, bundle]) => bundle === bundleToRemove ? [dep, bundleToKeep] : [dep, bundle]);
+
+      // @ts-expect-error TS2345
       assetReference.set(asset, newAssetReference);
     }
 
@@ -1161,7 +1189,6 @@ function createIdealGraph(assetGraph, config, entries, logger) {
   function getBigIntFromContentKey(contentKey) {
     let b = Buffer.alloc(64);
     b.write(contentKey);
-    // $FlowFixMe Flow doesn't have BigInt types in this version
     return b.readBigInt64BE();
   }
   // Fix asset order in source bundles as they are likely now incorrect after shared bundle deletion

package/lib/memoize.d.ts

@@ -0,0 +1,2 @@
+export declare function clearCaches(): void;
+export declare function memoize<Args extends Array<unknown>, Return>(fn: (...args: Args) => Return): (...args: Args) => Return;

package/lib/memoize.js

@@ -13,7 +13,6 @@ function _manyKeysMap() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// $FlowFixMe
 let caches = [];
 function clearCaches() {
   for (let cache of caches) {
@@ -32,8 +31,8 @@ function memoize(fn) {
     }
 
     // Calculate the result and cache it
+    // @ts-expect-error TS2683
     const result = fn.apply(this, args);
-    // $FlowFixMe
     cache.set(args, result);
     return result;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "3.2.0",
+  "version": "3.2.1-typescript-17c3d1dec.0",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -10,19 +10,24 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/DefaultBundler.js",
-  "source": "src/DefaultBundler.js",
+  "main": "./lib/DefaultBundler.js",
+  "source": "./src/DefaultBundler.ts",
+  "types": "./lib/DefaultBundler.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1",
-    "@atlaspack/feature-flags": "2.20.0",
-    "@atlaspack/graph": "3.5.10",
-    "@atlaspack/plugin": "2.14.21",
-    "@atlaspack/rust": "3.4.1",
-    "@atlaspack/utils": "2.17.3",
-    "nullthrows": "^1.1.1",
-    "many-keys-map": "^1.0.3"
-  }
-}
+    "@atlaspack/diagnostic": "2.14.2-typescript-17c3d1dec.0",
+    "@atlaspack/feature-flags": "2.20.1-typescript-17c3d1dec.0",
+    "@atlaspack/graph": "3.5.11-typescript-17c3d1dec.0",
+    "@atlaspack/plugin": "2.14.22-typescript-17c3d1dec.0",
+    "@atlaspack/rust": "3.4.2-typescript-17c3d1dec.0",
+    "@atlaspack/utils": "2.17.4-typescript-17c3d1dec.0",
+    "many-keys-map": "^1.0.3",
+    "nullthrows": "^1.1.1"
+  },
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "17c3d1decf641e688fcfe3ca985e80e9897b7573"
+}