@atlaspack/bundler-default 2.14.5-canary.17 → 2.14.5-canary.170

package/lib/types/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/types/MonolithicBundler.d.ts

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

package/lib/types/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/types/bundlerConfig.d.ts

@@ -0,0 +1,27 @@
+import type { Config, PluginOptions, PluginLogger } from '@atlaspack/types-internal';
+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/types/decorateLegacyGraph.d.ts

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

package/lib/types/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/types/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.14.5-canary.17+a1773d2a6",
+  "version": "2.14.5-canary.170+c940954d2",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -10,19 +10,26 @@
     "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/types/DefaultBundler.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.85+a1773d2a6",
-    "@atlaspack/feature-flags": "2.14.1-canary.85+a1773d2a6",
-    "@atlaspack/graph": "3.4.1-canary.85+a1773d2a6",
-    "@atlaspack/plugin": "2.14.5-canary.17+a1773d2a6",
-    "@atlaspack/rust": "3.2.1-canary.17+a1773d2a6",
-    "@atlaspack/utils": "2.14.5-canary.17+a1773d2a6",
+    "@atlaspack/diagnostic": "2.14.1-canary.238+c940954d2",
+    "@atlaspack/feature-flags": "2.14.1-canary.238+c940954d2",
+    "@atlaspack/graph": "3.4.1-canary.238+c940954d2",
+    "@atlaspack/plugin": "2.14.5-canary.170+c940954d2",
+    "@atlaspack/rust": "3.2.1-canary.170+c940954d2",
+    "@atlaspack/types-internal": "2.14.1-canary.238+c940954d2",
+    "@atlaspack/utils": "2.14.5-canary.170+c940954d2",
+    "many-keys-map": "^1.0.3",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "a1773d2a62d0ef7805ac7524621dcabcc1afe929"
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src",
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
+  },
+  "gitHead": "c940954d27d657c3c93cd328dfb394778da46eab"
 }

package/src/{DefaultBundler.js → DefaultBundler.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import {Bundler} from '@atlaspack/plugin';
 import type {Asset, Dependency, MutableBundleGraph} from '@atlaspack/types';
 import {DefaultMap} from '@atlaspack/utils';
@@ -25,14 +23,15 @@ import {addJSMonolithBundle} from './MonolithicBundler';
  *  will have two or more distDirs, or output folders.) Then calls create IdealGraph and Decorate per target.
  *
  */
-export default (new Bundler({
+export default new Bundler({
   loadConfig({config, options, logger}) {
     return loadBundlerConfig(config, options, logger);
   },
 
   bundle({bundleGraph, config, logger}) {
     let targetMap = getEntryByTarget(bundleGraph); // Organize entries by target output folder/ distDir
-    let graphs = [];
+    // @ts-expect-error TS2304
+    let graphs: Array<IdealGraph> = [];
 
     for (let entries of targetMap.values()) {
       let singleFileEntries = new Map();
@@ -64,7 +63,7 @@ export default (new Bundler({
     }
   },
   optimize() {},
-}): Bundler);
+}) as Bundler<unknown>;
 
 function getEntryByTarget(
   bundleGraph: MutableBundleGraph,
@@ -74,7 +73,23 @@ function getEntryByTarget(
     () => new Map(),
   );
   bundleGraph.traverse({
-    enter(node, context, actions) {
+    enter(
+      // @ts-expect-error TS2304
+      node: BundleGraphTraversable,
+      context:
+        | {
+            readonly type: 'asset';
+            value: Asset;
+          }
+        | null
+        | undefined
+        | {
+            readonly type: 'dependency';
+            value: Dependency;
+          },
+      // @ts-expect-error TS2304
+      actions: TraversalActions,
+    ) {
       if (node.type !== 'asset') {
         return node;
       }

package/src/{MonolithicBundler.js → MonolithicBundler.ts}

@@ -1,5 +1,8 @@
-// @flow strict-local
-import type {Asset, Dependency, MutableBundleGraph} from '@atlaspack/types';
+import type {
+  Asset,
+  Dependency,
+  MutableBundleGraph,
+} from '@atlaspack/types-internal';
 import nullthrows from 'nullthrows';
 
 export function addJSMonolithBundle(
@@ -39,9 +42,12 @@ export function addJSMonolithBundle(
       let assets = bundleGraph.getDependencyAssets(dependency);
 
       for (const asset of assets) {
-        if (asset.bundleBehavior === 'isolated') {
+        if (
+          asset.bundleBehavior === 'isolated' ||
+          asset.bundleBehavior === 'inlineIsolated'
+        ) {
           throw new Error(
-            'Isolated assets are not supported for single file output builds',
+            `${asset.bundleBehavior === 'isolated' ? 'Isolated' : 'Inline isolated'} assets are not supported for single file output builds`,
           );
         }
 

package/src/bundleMerge.ts

@@ -0,0 +1,250 @@
+import invariant from 'assert';
+import nullthrows from 'nullthrows';
+import {ContentGraph} from '@atlaspack/graph';
+import type {NodeId} from '@atlaspack/graph';
+import {setUnion, setIntersectStatic} from '@atlaspack/utils';
+import type {Bundle, IdealBundleGraph} from './idealGraph';
+import {memoize, clearCaches} from './memoize';
+
+function getBundlesForBundleGroup(
+  bundleGraph: IdealBundleGraph,
+  bundleGroupId: NodeId,
+): number {
+  let count = 0;
+  bundleGraph.traverse((nodeId) => {
+    const node = bundleGraph.getNode(nodeId);
+    if (
+      node &&
+      (node === 'root' ||
+        (node.bundleBehavior !== 'inline' &&
+          node.bundleBehavior !== 'inlineIsolated'))
+    ) {
+      count++;
+    }
+  }, bundleGroupId);
+  return count;
+}
+
+let getBundleOverlap = (
+  sourceBundlesA: Set<NodeId>,
+  sourceBundlesB: Set<NodeId>,
+): number => {
+  let allSourceBundles = setUnion(sourceBundlesA, sourceBundlesB);
+  let sharedSourceBundles = setIntersectStatic(sourceBundlesA, sourceBundlesB);
+
+  return sharedSourceBundles.size / allSourceBundles.size;
+};
+
+// Returns a decimal showing the proportion source bundles are common to
+// both bundles versus the total number of source bundles.
+function checkBundleThreshold(
+  bundleA: MergeCandidate,
+  bundleB: MergeCandidate,
+  threshold: number,
+): boolean {
+  return (
+    getBundleOverlap(
+      bundleA.bundle.sourceBundles,
+      bundleB.bundle.sourceBundles,
+    ) >= threshold
+  );
+}
+
+let checkSharedSourceBundles = memoize(
+  (bundle: Bundle, importantAncestorBundles: Array<NodeId>): boolean => {
+    return importantAncestorBundles.every((ancestorId) =>
+      bundle.sourceBundles.has(ancestorId),
+    );
+  },
+);
+
+let hasSuitableBundleGroup = memoize(
+  (
+    bundleGraph: IdealBundleGraph,
+    bundle: Bundle,
+    minBundlesInGroup: number,
+  ): boolean => {
+    for (let sourceBundle of bundle.sourceBundles) {
+      let bundlesInGroup = getBundlesForBundleGroup(bundleGraph, sourceBundle);
+
+      if (bundlesInGroup >= minBundlesInGroup) {
+        return true;
+      }
+    }
+    return false;
+  },
+);
+
+function validMerge(
+  bundleGraph: IdealBundleGraph,
+  config: MergeGroup,
+  bundleA: MergeCandidate,
+  bundleB: MergeCandidate,
+): boolean {
+  if (config.maxBundleSize != null) {
+    if (
+      bundleA.bundle.size > config.maxBundleSize ||
+      bundleB.bundle.size > config.maxBundleSize
+    ) {
+      return false;
+    }
+  }
+
+  if (config.overlapThreshold != null) {
+    if (!checkBundleThreshold(bundleA, bundleB, config.overlapThreshold)) {
+      return false;
+    }
+  }
+
+  if (config.sourceBundles != null) {
+    if (
+      !checkSharedSourceBundles(bundleA.bundle, config.sourceBundles) ||
+      !checkSharedSourceBundles(bundleB.bundle, config.sourceBundles)
+    ) {
+      return false;
+    }
+  }
+
+  if (config.minBundlesInGroup != null) {
+    if (
+      !hasSuitableBundleGroup(
+        bundleGraph,
+        bundleA.bundle,
+        config.minBundlesInGroup,
+      ) ||
+      !hasSuitableBundleGroup(
+        bundleGraph,
+        bundleB.bundle,
+        config.minBundlesInGroup,
+      )
+    ) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+function getMergeClusters(
+  graph: ContentGraph<NodeId, EdgeType>,
+  candidates: Map<NodeId, EdgeType>,
+): Array<Array<NodeId>> {
+  let clusters: Array<Array<NodeId>> = [];
+
+  for (let [candidate, edgeType] of candidates.entries()) {
+    let cluster: Array<NodeId> = [];
+
+    graph.traverse(
+      (nodeId) => {
+        cluster.push(nullthrows(graph.getNode(nodeId)));
+        // Remove node from candidates as it has already been processed
+        candidates.delete(nodeId);
+      },
+      candidate,
+      edgeType,
+    );
+    clusters.push(cluster);
+  }
+
+  return clusters;
+}
+
+type MergeCandidate = {
+  bundle: Bundle;
+  id: NodeId;
+  contentKey: string;
+};
+function getPossibleMergeCandidates(
+  bundleGraph: IdealBundleGraph,
+  bundles: Array<NodeId>,
+): Array<[MergeCandidate, MergeCandidate]> {
+  let mergeCandidates = bundles.map((bundleId) => {
+    let bundle = bundleGraph.getNode(bundleId);
+    invariant(bundle && bundle !== 'root', 'Bundle should exist');
+
+    return {
+      id: bundleId,
+      bundle,
+      contentKey: bundleId.toString(),
+    };
+  });
+
+  const uniquePairs: Array<[MergeCandidate, MergeCandidate]> = [];
+
+  for (let i = 0; i < mergeCandidates.length; i++) {
+    for (let j = i + 1; j < mergeCandidates.length; j++) {
+      let a = mergeCandidates[i];
+      let b = mergeCandidates[j];
+
+      // @ts-expect-error TS18048
+      if (a.bundle.internalizedAssets.equals(b.bundle.internalizedAssets)) {
+        uniquePairs.push([a, b]);
+      }
+    }
+  }
+  return uniquePairs;
+}
+
+export type MergeGroup = {
+  overlapThreshold?: number;
+  maxBundleSize?: number;
+  sourceBundles?: Array<NodeId>;
+  minBundlesInGroup?: number;
+};
+type EdgeType = number;
+
+export function findMergeCandidates(
+  bundleGraph: IdealBundleGraph,
+  bundles: Array<NodeId>,
+  config: Array<MergeGroup>,
+): Array<Array<NodeId>> {
+  let graph = new ContentGraph<NodeId, EdgeType>();
+  let candidates = new Map<NodeId, EdgeType>();
+
+  let allPossibleMergeCandidates = getPossibleMergeCandidates(
+    bundleGraph,
+    bundles,
+  );
+
+  // Build graph of clustered merge candidates
+  for (let i = 0; i < config.length; i++) {
+    // Ensure edge type coresponds to config index
+    let edgeType = i + 1;
+
+    for (let group of allPossibleMergeCandidates) {
+      let candidateA = group[0];
+      let candidateB = group[1];
+
+      if (!validMerge(bundleGraph, config[i], candidateA, candidateB)) {
+        continue;
+      }
+
+      let bundleNode = graph.addNodeByContentKeyIfNeeded(
+        candidateA.contentKey,
+        candidateA.id,
+      );
+      let otherBundleNode = graph.addNodeByContentKeyIfNeeded(
+        candidateB.contentKey,
+        candidateB.id,
+      );
+
+      // Add edge in both directions
+      graph.addEdge(bundleNode, otherBundleNode, edgeType);
+      graph.addEdge(otherBundleNode, bundleNode, edgeType);
+
+      candidates.set(bundleNode, edgeType);
+      candidates.set(otherBundleNode, edgeType);
+    }
+
+    // Remove bundles that have been allocated to a higher priority merge
+    allPossibleMergeCandidates = allPossibleMergeCandidates.filter(
+      (group) =>
+        !graph.hasContentKey(group[0].contentKey) &&
+        !graph.hasContentKey(group[1].contentKey),
+    );
+  }
+
+  clearCaches();
+
+  return getMergeClusters(graph, candidates);
+}

package/src/{bundlerConfig.js → bundlerConfig.ts}

@@ -1,62 +1,67 @@
-// @flow strict-local
-
 import {encodeJSONKeyComponent} from '@atlaspack/diagnostic';
 import type {
   Config,
   PluginOptions,
   BuildMode,
   PluginLogger,
-} from '@atlaspack/types';
+} from '@atlaspack/types-internal';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
-import {type SchemaEntity, validateSchema} from '@atlaspack/utils';
+import {SchemaEntity, validateSchema} from '@atlaspack/utils';
 import invariant from 'assert';
 
 type Glob = string;
 
-type ManualSharedBundles = Array<{|
-  name: string,
-  assets: Array<Glob>,
-  types?: Array<string>,
-  root?: string,
-  split?: number,
-|}>;
+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;
+}>;
 
-type BaseBundlerConfig = {|
-  http?: number,
-  minBundles?: number,
-  minBundleSize?: number,
-  maxParallelRequests?: number,
-  disableSharedBundles?: boolean,
-  manualSharedBundles?: ManualSharedBundles,
-  loadConditionalBundlesInParallel?: boolean,
-  sharedBundleMergeThreshold?: number,
-|};
+type BaseBundlerConfig = {
+  http?: number;
+  minBundles?: number;
+  minBundleSize?: number;
+  maxParallelRequests?: number;
+  disableSharedBundles?: boolean;
+  manualSharedBundles?: ManualSharedBundles;
+  loadConditionalBundlesInParallel?: boolean;
+  sharedBundleMerge?: MergeCandidates;
+};
 
-type BundlerConfig = {|
-  [mode: BuildMode]: BaseBundlerConfig,
-|} & BaseBundlerConfig;
+type BundlerConfig = Partial<Record<BuildMode, BaseBundlerConfig>> &
+  BaseBundlerConfig;
 
-export type ResolvedBundlerConfig = {|
-  minBundles: number,
-  minBundleSize: number,
-  maxParallelRequests: number,
-  projectRoot: string,
-  disableSharedBundles: boolean,
-  manualSharedBundles: ManualSharedBundles,
-  loadConditionalBundlesInParallel?: boolean,
-  sharedBundleMergeThreshold: number,
-|};
+export type ResolvedBundlerConfig = {
+  minBundles: number;
+  minBundleSize: number;
+  maxParallelRequests: number;
+  projectRoot: string;
+  disableSharedBundles: boolean;
+  manualSharedBundles: ManualSharedBundles;
+  loadConditionalBundlesInParallel?: boolean;
+  sharedBundleMerge?: MergeCandidates;
+};
 
 function resolveModeConfig(
   config: BundlerConfig,
   mode: BuildMode,
 ): BaseBundlerConfig {
-  let generalConfig = {};
-  let modeConfig = {};
+  let generalConfig: Record<string, any> = {};
+  let modeConfig: Record<string, any> = {};
 
   for (const key of Object.keys(config)) {
     if (key === 'development' || key === 'production') {
       if (key === mode) {
+        // @ts-expect-error TS2322
         modeConfig = config[key];
       }
     } else {
@@ -64,7 +69,6 @@ function resolveModeConfig(
     }
   }
 
-  // $FlowFixMe Not sure how to convince flow here...
   return {
     ...generalConfig,
     ...modeConfig,
@@ -79,7 +83,7 @@ const HTTP_OPTIONS = {
     minBundleSize: 30000,
     maxParallelRequests: 6,
     disableSharedBundles: false,
-    sharedBundleMergeThreshold: 1,
+    sharedBundleMerge: [],
   },
   '2': {
     minBundles: 1,
@@ -87,9 +91,9 @@ const HTTP_OPTIONS = {
     minBundleSize: 20000,
     maxParallelRequests: 25,
     disableSharedBundles: false,
-    sharedBundleMergeThreshold: 1,
+    sharedBundleMerge: [],
   },
-};
+} as const;
 
 const CONFIG_SCHEMA: SchemaEntity = {
   type: 'object',
@@ -129,6 +133,30 @@ const CONFIG_SCHEMA: SchemaEntity = {
         additionalProperties: false,
       },
     },
+    sharedBundleMerge: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          overlapThreshold: {
+            type: 'number',
+          },
+          maxBundleSize: {
+            type: 'number',
+          },
+          sourceBundles: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+          },
+          minBundlesInGroup: {
+            type: 'number',
+          },
+        },
+        additionalProperties: false,
+      },
+    },
     minBundles: {
       type: 'number',
     },
@@ -172,7 +200,8 @@ export async function loadBundlerConfig(
     const modDefault = {
       ...HTTP_OPTIONS['2'],
       projectRoot: options.projectRoot,
-    };
+    } as const;
+    // @ts-expect-error TS2322
     return modDefault;
   }
 
@@ -235,14 +264,14 @@ export async function loadBundlerConfig(
   );
 
   let http = modeConfig.http ?? 2;
+  // @ts-expect-error TS7053
   let defaults = HTTP_OPTIONS[http];
 
   return {
     minBundles: modeConfig.minBundles ?? defaults.minBundles,
     minBundleSize: modeConfig.minBundleSize ?? defaults.minBundleSize,
-    sharedBundleMergeThreshold:
-      modeConfig.sharedBundleMergeThreshold ??
-      defaults.sharedBundleMergeThreshold,
+    sharedBundleMerge:
+      modeConfig.sharedBundleMerge ?? defaults.sharedBundleMerge,
     maxParallelRequests:
       modeConfig.maxParallelRequests ?? defaults.maxParallelRequests,
     projectRoot: options.projectRoot,