@atlaspack/core 2.23.6-dev-export-func-opt-67f87c28a.0 → 2.24.0

package/lib/types/types.d.ts

@@ -1,5 +1,5 @@
 import type { ContentKey } from '@atlaspack/graph';
-import type { ASTGenerator, BuildMode, Engines, EnvironmentContext, EnvMap, FilePath, Glob, LogLevel, Meta, DependencySpecifier, PackageName, ReporterEvent, SemverRange, ServerOptions, SourceType, Stats, TargetSourceMapOptions, ConfigResult, OutputFormat, TargetDescriptor, HMROptions, DetailedReportOptions } from '@atlaspack/types';
+import type { ASTGenerator, BuildMode, Engines, EnvironmentContext, EnvMap, FilePath, Glob, LogLevel, Meta, DependencySpecifier, PackageName, ReporterEvent, SemverRange, ServerOptions, SourceType, Stats, TargetSourceMapOptions, ConfigResult, OutputFormat, TargetDescriptor, HMROptions, DetailedReportOptions, Symbol } from '@atlaspack/types';
 import type { SharedReference } from '@atlaspack/workers';
 import type { FileSystem } from '@atlaspack/fs';
 import type { Cache } from '@atlaspack/cache';
@@ -113,8 +113,8 @@ export type Dependency = {
     sourceAssetType?: string | null | undefined;
     resolveFrom: ProjectPath | null | undefined;
     range: SemverRange | null | undefined;
-    symbols: Map<symbol, {
-        local: symbol;
+    symbols: Map<Symbol, {
+        local: Symbol;
         loc: InternalSourceLocation | null | undefined;
         isWeak: boolean;
         meta?: Meta | null | undefined;
@@ -146,8 +146,8 @@ export type Asset = {
     pipeline: string | null | undefined;
     astKey: string | null | undefined;
     astGenerator: ASTGenerator | null | undefined;
-    symbols: Map<symbol, {
-        local: symbol;
+    symbols: Map<Symbol, {
+        local: Symbol;
         loc: InternalSourceLocation | null | undefined;
         meta?: Meta | null | undefined;
     }> | null | undefined;
@@ -271,7 +271,7 @@ export type AssetNode = {
     id: ContentKey;
     readonly type: 'asset';
     value: Asset;
-    usedSymbols: Set<symbol>;
+    usedSymbols: Set<Symbol>;
     hasDeferred?: boolean;
     usedSymbolsDownDirty: boolean;
     usedSymbolsUpDirty: boolean;
@@ -286,16 +286,16 @@ export type DependencyNode = {
     deferred: boolean;
     /** dependency was deferred (= no used symbols (in immediate parents) & side-effect free) */
     hasDeferred?: boolean;
-    usedSymbolsDown: Set<symbol>;
+    usedSymbolsDown: Set<Symbol>;
     /**
      * a requested symbol -> either
      *  - if ambiguous (e.g. dependency to asset group with both CSS modules and JS asset): undefined
      *  - if external: null
      *  - the asset it resolved to, and the potentially renamed export name
      */
-    usedSymbolsUp: Map<symbol, {
+    usedSymbolsUp: Map<Symbol, {
         asset: ContentKey;
-        symbol: symbol | null | undefined;
+        symbol: Symbol | null | undefined;
     } | undefined | null>;
     usedSymbolsDownDirty: boolean;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.23.6-dev-export-func-opt-67f87c28a.0",
+  "version": "2.24.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -23,22 +23,22 @@
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.6-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/cache": "3.2.25-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/diagnostic": "2.14.4-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/events": "2.14.4-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/feature-flags": "2.24.2-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/fs": "2.15.25-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/graph": "3.5.19-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/logger": "2.14.22-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/package-manager": "2.14.30-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/plugin": "2.14.30-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/profiler": "2.14.27-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/rust": "3.7.1-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/types": "2.15.20-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/utils": "2.19.2-dev-export-func-opt-67f87c28a.0",
-    "@atlaspack/workers": "2.14.30-dev-export-func-opt-67f87c28a.0",
     "@mischnic/json-sourcemap": "^0.1.0",
+    "@atlaspack/build-cache": "2.13.5",
+    "@atlaspack/cache": "3.2.25",
+    "@atlaspack/diagnostic": "2.14.3",
+    "@atlaspack/events": "2.14.3",
+    "@atlaspack/feature-flags": "2.25.0",
+    "@atlaspack/fs": "2.15.25",
+    "@atlaspack/graph": "3.5.19",
+    "@atlaspack/logger": "2.14.22",
+    "@atlaspack/package-manager": "2.14.30",
+    "@atlaspack/plugin": "2.14.30",
+    "@atlaspack/profiler": "2.14.27",
+    "@atlaspack/rust": "3.8.0",
+    "@atlaspack/types": "2.15.20",
+    "@atlaspack/utils": "2.19.2",
+    "@atlaspack/workers": "2.14.30",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",
@@ -51,16 +51,15 @@
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@atlaspack/babel-register": "2.14.4-dev-export-func-opt-67f87c28a.0",
+    "@atlaspack/babel-register": "2.14.3",
     "@types/node": ">= 18",
-    "graphviz": "^0.0.9",
-    "jest-diff": "*",
     "rfdc": "1",
+    "jest-diff": "*",
+    "graphviz": "^0.0.9",
     "tempy": "^0.2.1"
   },
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "type": "commonjs",
-  "gitHead": "67f87c28a23fcf285d88a1c969de4e35956cb500"
+  "type": "commonjs"
 }

package/src/AssetGraph.ts

@@ -327,9 +327,7 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
 
       if (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;
@@ -483,7 +481,6 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
       [...dependencySymbols].every(([, {isWeak}]: [any, any]) => isWeak) &&
       sideEffects === false &&
       canDefer &&
-      // @ts-expect-error TS2345
       !dependencySymbols.has('*');
 
     if (!isDeferrable) {
@@ -521,7 +518,6 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
       let depIsDeferrable =
         d.symbols &&
         !(fromEnvironmentId(d.env).isLibrary && d.isEntry) &&
-        // @ts-expect-error TS2345
         !d.symbols.has('*') &&
         ![...d.symbols.keys()].some((symbol) => {
           let assetSymbol = resolvedAsset.symbols?.get(symbol)?.local;

package/src/BundleGraph.ts

@@ -4,6 +4,7 @@ import type {
   TraversalActions,
   BundleBehavior as IBundleBehavior,
   ConditionMeta,
+  Symbol,
 } from '@atlaspack/types';
 import type {
   ContentKey,
@@ -82,12 +83,12 @@ export type BundleGraphEdgeType =
 type InternalSymbolResolution = {
   asset: Asset;
   exportSymbol: string;
-  symbol: symbol | null | undefined | false;
+  symbol: Symbol | null | undefined | false;
   loc: InternalSourceLocation | null | undefined;
 };
 
 type InternalExportSymbolResolution = InternalSymbolResolution & {
-  readonly exportAs: symbol | string;
+  readonly exportAs: Symbol | string;
 };
 
 type BundleGraphOpts = {
@@ -286,7 +287,7 @@ export default class BundleGraph {
         let nodeValueSymbols = node.value.symbols;
 
         // asset -> symbols that should be imported directly from that asset
-        let targets = new DefaultMap<ContentKey, Map<symbol, symbol>>(
+        let targets = new DefaultMap<ContentKey, Map<Symbol, Symbol>>(
           () => new Map(),
         );
         let externalSymbols = new Set();
@@ -316,7 +317,6 @@ export default class BundleGraph {
           // It doesn't make sense to retarget dependencies where `*` is used, because the
           // retargeting won't enable any benefits in that case (apart from potentially even more
           // code being generated).
-          // @ts-expect-error TS2345
           !node.usedSymbolsUp.has('*') &&
           // TODO We currently can't rename imports in async imports, e.g. from
           //      (parcelRequire("...")).then(({ a }) => a);
@@ -333,11 +333,9 @@ export default class BundleGraph {
             ([, t]: [any, any]) => new Set([...t.values()]).size === t.size,
           )
         ) {
-          // @ts-expect-error TS2367
           let isReexportAll = nodeValueSymbols.get('*')?.local === '*';
           let reexportAllLoc = isReexportAll
-            ? // @ts-expect-error TS2345
-              nullthrows(nodeValueSymbols.get('*')).loc
+            ? nullthrows(nodeValueSymbols.get('*')).loc
             : undefined;
 
           // TODO adjust sourceAssetIdNode.value.dependencies ?
@@ -413,7 +411,6 @@ export default class BundleGraph {
                         invariant(!sourceAssetSymbols.has(as));
                         sourceAssetSymbols.set(as, {
                           loc: reexportAllLoc,
-                          // @ts-expect-error TS2322
                           local: local,
                         });
                       }
@@ -1893,13 +1890,12 @@ export default class BundleGraph {
 
   getSymbolResolution(
     asset: Asset,
-    symbol: symbol,
+    symbol: Symbol,
     boundary?: Bundle | null,
   ): InternalSymbolResolution {
     let assetOutside = boundary && !this.bundleHasAsset(boundary, asset);
 
     let identifier = asset.symbols?.get(symbol)?.local;
-    // @ts-expect-error TS2367
     if (symbol === '*') {
       return {
         asset,
@@ -1931,7 +1927,6 @@ export default class BundleGraph {
           // External module or self-reference
           return {
             asset,
-            // @ts-expect-error TS2322
             exportSymbol: symbol,
             symbol: identifier,
             loc: asset.symbols?.get(symbol)?.loc,
@@ -1974,9 +1969,7 @@ export default class BundleGraph {
       // Wildcard reexports are never listed in the reexporting asset's symbols.
       if (
         identifier == null &&
-        // @ts-expect-error TS2367
         depSymbols.get('*')?.local === '*' &&
-        // @ts-expect-error TS2367
         symbol !== 'default'
       ) {
         let resolved = this.getResolvedAsset(dep, boundary);
@@ -2053,7 +2046,6 @@ export default class BundleGraph {
           result = null;
         } else if (result === undefined) {
           // If not exported explicitly by the asset (= would have to be in * or a reexport-all) ...
-          // @ts-expect-error TS2345
           if (nonStaticDependency || asset.symbols?.has('*')) {
             // ... and if there are non-statically analyzable dependencies or it's a CJS asset,
             // fallback to namespace access.
@@ -2067,7 +2059,6 @@ export default class BundleGraph {
 
       return {
         asset,
-        // @ts-expect-error TS2322
         exportSymbol: symbol,
         symbol: result,
         loc: asset.symbols?.get(symbol)?.loc,
@@ -2116,7 +2107,6 @@ export default class BundleGraph {
       let depSymbols = dep.symbols;
       if (!depSymbols) continue;
 
-      // @ts-expect-error TS2367
       if (depSymbols.get('*')?.local === '*') {
         let resolved = this.getResolvedAsset(dep, boundary);
         if (!resolved) continue;
@@ -2258,7 +2248,7 @@ export default class BundleGraph {
     }
   }
 
-  getUsedSymbolsAsset(asset: Asset): ReadonlySet<symbol> | null | undefined {
+  getUsedSymbolsAsset(asset: Asset): ReadonlySet<Symbol> | null | undefined {
     let node = this._graph.getNodeByContentKey(asset.id);
     invariant(node && node.type === 'asset');
     return node.value.symbols
@@ -2268,7 +2258,7 @@ export default class BundleGraph {
 
   getUsedSymbolsDependency(
     dep: Dependency,
-  ): ReadonlySet<symbol> | null | undefined {
+  ): ReadonlySet<Symbol> | null | undefined {
     let node = this._graph.getNodeByContentKey(dep.id);
     invariant(node && node.type === 'dependency');
     return node.value.symbols

package/src/SymbolPropagation.ts

@@ -68,7 +68,6 @@ export function propagateSymbols({
               (d) => d.value.specifierType === SpecifierType.esm,
             )
           ) {
-            // @ts-expect-error TS2345
             assetNode.value.symbols?.delete('*');
           }
         }
@@ -76,9 +75,9 @@ export function propagateSymbols({
         // exportSymbol -> identifier
         let assetSymbols:
           | ReadonlyMap<
-              symbol,
+              Symbol,
               {
-                local: symbol;
+                local: Symbol;
                 loc: InternalSourceLocation | null | undefined;
                 meta?: Meta | null | undefined;
               }
@@ -88,7 +87,7 @@ export function propagateSymbols({
         // identifier -> exportSymbol
         let assetSymbolsInverse;
         if (assetSymbols) {
-          assetSymbolsInverse = new Map<symbol, Set<symbol>>();
+          assetSymbolsInverse = new Map<Symbol, Set<Symbol>>();
           for (let [s, {local}] of assetSymbols) {
             let set = assetSymbolsInverse.get(local);
 
@@ -100,7 +99,6 @@ export function propagateSymbols({
           }
         }
         let hasNamespaceOutgoingDeps = outgoingDeps.some(
-          // @ts-expect-error TS2367
           (d) => d.value.symbols?.get('*')?.local === '*',
         );
 
@@ -114,13 +112,11 @@ export function propagateSymbols({
         assetNode.usedSymbols = new Set();
 
         // Symbols that have to be namespace reexported by outgoingDeps.
-        let namespaceReexportedSymbols = new Set<symbol>();
+        let namespaceReexportedSymbols = new Set<Symbol>();
 
         if (incomingDeps.length === 0) {
           // Root in the runtimes Graph
-          // @ts-expect-error TS2345
           assetNode.usedSymbols.add('*');
-          // @ts-expect-error TS2345
           namespaceReexportedSymbols.add('*');
         } else {
           for (let incomingDep of incomingDeps) {
@@ -139,17 +135,13 @@ export function propagateSymbols({
             }
 
             for (let exportSymbol of incomingDep.usedSymbolsDown) {
-              // @ts-expect-error TS2367
               if (exportSymbol === '*') {
-                // @ts-expect-error TS2345
                 assetNode.usedSymbols.add('*');
-                // @ts-expect-error TS2345
                 namespaceReexportedSymbols.add('*');
               }
               if (
                 !assetSymbols ||
                 assetSymbols.has(exportSymbol) ||
-                // @ts-expect-error TS2345
                 assetSymbols.has('*')
               ) {
                 // An own symbol or a non-namespace reexport
@@ -159,7 +151,6 @@ export function propagateSymbols({
               // (but only if we actually have namespace-exporting outgoing dependencies,
               // This usually happens with a reexporting asset with many namespace exports which means that
               // we cannot match up the correct asset with the used symbol at this level.)
-              // @ts-expect-error TS2367
               else if (hasNamespaceOutgoingDeps && exportSymbol !== 'default') {
                 namespaceReexportedSymbols.add(exportSymbol);
               }
@@ -173,10 +164,10 @@ export function propagateSymbols({
             (
               _: {
                 loc: InternalSourceLocation | null | undefined;
-                local: symbol;
+                local: Symbol;
                 meta?: Meta | null | undefined;
               },
-              exportSymbol: symbol,
+              exportSymbol: Symbol,
             ) => assetNode.usedSymbols.add(exportSymbol),
           );
         }
@@ -205,7 +196,6 @@ export function propagateSymbols({
             let depSymbols = dep.value.symbols;
             if (!depSymbols) continue;
 
-            // @ts-expect-error TS2367
             if (depSymbols.get('*')?.local === '*') {
               if (addAll) {
                 depUsedSymbolsDown.add('*');
@@ -219,7 +209,6 @@ export function propagateSymbols({
 
             for (let [symbol, {local}] of depSymbols) {
               // Was already handled above
-              // @ts-expect-error TS2367
               if (local === '*') continue;
 
               if (!assetSymbolsInverse || !depSymbols.get(symbol)?.isWeak) {
@@ -230,7 +219,6 @@ export function propagateSymbols({
                 if (reexportedExportSymbols == null) {
                   // not reexported = used in asset itself
                   depUsedSymbolsDown.add(symbol);
-                  // @ts-expect-error TS2345
                 } else if (assetNode.usedSymbols.has('*')) {
                   // we need everything
                   depUsedSymbolsDown.add(symbol);
@@ -271,7 +259,7 @@ export function propagateSymbols({
 
     const logFallbackNamespaceInsertion = (
       assetNode: AssetNode,
-      symbol: symbol,
+      symbol: Symbol,
       depNode1: DependencyNode,
       depNode2: DependencyNode,
     ) => {
@@ -279,7 +267,6 @@ export function propagateSymbols({
         logger.warn({
           message: `${fromProjectPathRelative(
             assetNode.value.filePath,
-            // @ts-expect-error TS2731
           )} reexports "${symbol}", which could be resolved either to the dependency "${
             depNode1.value.specifier
           }" or "${
@@ -300,9 +287,9 @@ export function propagateSymbols({
       (assetNode, incomingDeps, outgoingDeps) => {
         let assetSymbols:
           | ReadonlyMap<
-              symbol,
+              Symbol,
               {
-                local: symbol;
+                local: Symbol;
                 loc: InternalSourceLocation | null | undefined;
                 meta?: Meta | null | undefined;
               }
@@ -312,7 +299,7 @@ export function propagateSymbols({
 
         let assetSymbolsInverse = null;
         if (assetSymbols) {
-          assetSymbolsInverse = new Map<symbol, Set<symbol>>();
+          assetSymbolsInverse = new Map<Symbol, Set<Symbol>>();
           for (let [s, {local}] of assetSymbols) {
             let set = assetSymbolsInverse.get(local);
             if (!set) {
@@ -325,10 +312,10 @@ export function propagateSymbols({
 
         // the symbols that are reexported (not used in `asset`) -> asset they resolved to
         let reexportedSymbols = new Map<
-          symbol,
+          Symbol,
           | {
               asset: ContentKey;
-              symbol: symbol | null | undefined;
+              symbol: Symbol | null | undefined;
             }
           | null
           | undefined
@@ -336,7 +323,7 @@ export function propagateSymbols({
         // the symbols that are reexported (not used in `asset`) -> the corresponding outgoingDep(s)
         // To generate the diagnostic when there are multiple dependencies with non-statically
         // analyzable exports
-        let reexportedSymbolsSource = new Map<symbol, DependencyNode>();
+        let reexportedSymbolsSource = new Map<Symbol, DependencyNode>();
         for (let outgoingDep of outgoingDeps) {
           let outgoingDepSymbols = outgoingDep.value.symbols;
           if (!outgoingDepSymbols) continue;
@@ -352,10 +339,8 @@ export function propagateSymbols({
             );
           }
 
-          // @ts-expect-error TS2367
           if (outgoingDepSymbols.get('*')?.local === '*') {
             outgoingDep.usedSymbolsUp.forEach((sResolved, s) => {
-              // @ts-expect-error TS2367
               if (s === 'default') {
                 return;
               }
@@ -363,7 +348,6 @@ export function propagateSymbols({
               // If the symbol could come from multiple assets at runtime, assetNode's
               // namespace will be needed at runtime to perform the lookup on.
               if (reexportedSymbols.has(s)) {
-                // @ts-expect-error TS2345
                 if (!assetNode.usedSymbols.has('*')) {
                   logFallbackNamespaceInsertion(
                     assetNode,
@@ -372,7 +356,6 @@ export function propagateSymbols({
                     outgoingDep,
                   );
                 }
-                // @ts-expect-error TS2345
                 assetNode.usedSymbols.add('*');
                 reexportedSymbols.set(s, {asset: assetNode.id, symbol: s});
               } else {
@@ -400,7 +383,6 @@ export function propagateSymbols({
               reexported.forEach((s) => {
                 // see same code above
                 if (reexportedSymbols.has(s)) {
-                  // @ts-expect-error TS2345
                   if (!assetNode.usedSymbols.has('*')) {
                     logFallbackNamespaceInsertion(
                       assetNode,
@@ -409,7 +391,6 @@ export function propagateSymbols({
                       outgoingDep,
                     );
                   }
-                  // @ts-expect-error TS2345
                   assetNode.usedSymbols.add('*');
                   reexportedSymbols.set(s, {asset: assetNode.id, symbol: s});
                 } else {
@@ -425,32 +406,32 @@ export function propagateSymbols({
 
         function usedSymbolsUpAmbiguous(
           old: Map<
-            symbol,
+            Symbol,
             | {
                 asset: ContentKey;
-                symbol: symbol | null | undefined;
+                symbol: Symbol | null | undefined;
               }
             | null
             | undefined
           >,
           current: Map<
-            symbol,
+            Symbol,
             | {
                 asset: ContentKey;
-                symbol: symbol | null | undefined;
+                symbol: Symbol | null | undefined;
               }
             | null
             | undefined
           >,
-          s: symbol,
+          s: Symbol,
           value:
             | {
                 asset: ContentKey;
-                symbol: symbol;
+                symbol: Symbol;
               }
             | {
                 asset: ContentKey;
-                symbol: symbol | null | undefined;
+                symbol: Symbol | null | undefined;
               },
         ) {
           if (old.has(s)) {
@@ -476,14 +457,12 @@ export function propagateSymbols({
           let incomingDepSymbols = incomingDep.value.symbols;
           if (!incomingDepSymbols) continue;
 
-          // @ts-expect-error TS2367
           let hasNamespaceReexport = incomingDepSymbols.get('*')?.local === '*';
           for (let s of incomingDep.usedSymbolsDown) {
             if (
               assetSymbols == null || // Assume everything could be provided if symbols are cleared
               assetNode.value.bundleBehavior === BundleBehavior.isolated ||
               assetNode.value.bundleBehavior === BundleBehavior.inline ||
-              // @ts-expect-error TS2367
               s === '*' ||
               assetNode.usedSymbols.has(s)
             ) {
@@ -850,7 +829,7 @@ function equalMap<K>(
     K,
     | {
         asset: ContentKey;
-        symbol: symbol | null | undefined;
+        symbol: Symbol | null | undefined;
       }
     | null
     | undefined
@@ -859,7 +838,7 @@ function equalMap<K>(
     K,
     | {
         asset: ContentKey;
-        symbol: symbol | null | undefined;
+        symbol: Symbol | null | undefined;
       }
     | null
     | undefined