@atlaspack/packager-js 2.23.5-dev-5779cd2e2.0 → 2.23.5-dev-swc-4fc8a99f4.0

package/dist/DevPackager.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DevPackager = void 0;
 const utils_1 = require("@atlaspack/utils");
-const source_map_1 = __importDefault(require("@atlaspack/source-map"));
+const source_map_1 = __importDefault(require("@parcel/source-map"));
 const feature_flags_1 = require("@atlaspack/feature-flags");
 const assert_1 = __importDefault(require("assert"));
 const path_1 = __importDefault(require("path"));
@@ -162,6 +162,7 @@ class DevPackager {
             // @ts-expect-error TS2339
             script.code, entryMap, this.parcelRequireName);
             if (this.bundle.env.sourceMap && entryMap) {
+                // @ts-expect-error TS2551
                 map.addSourceMap(entryMap, lineOffset);
             }
         }

package/dist/ScopeHoistingPackager.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScopeHoistingPackager = void 0;
 const utils_1 = require("@atlaspack/utils");
-const source_map_1 = __importDefault(require("@atlaspack/source-map"));
+const source_map_1 = __importDefault(require("@parcel/source-map"));
 const nullthrows_1 = __importDefault(require("nullthrows"));
 const assert_1 = __importStar(require("assert"));
 const diagnostic_1 = __importStar(require("@atlaspack/diagnostic"));
@@ -135,6 +135,7 @@ class ScopeHoistingPackager {
             this.seenHoistedRequires.clear();
             let [content, map, lines] = this.visitAsset(asset);
             if (sourceMap && map) {
+                // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                 sourceMap.addSourceMap(map, lineCount);
             }
             else if (this.bundle.env.sourceMap) {
@@ -235,10 +236,14 @@ class ScopeHoistingPackager {
                 sourceMap.addSourceMap(map, lineCount);
             }
         }
-        return {
-            contents: res,
-            map: sourceMap,
-        };
+        const result = { contents: res, map: sourceMap };
+        if (utils_1.debugTools['scope-hoisting-stats']) {
+            result.scopeHoistingStats = {
+                totalAssets: this.assetOutputs.size,
+                wrappedAssets: this.wrappedAssets.size,
+            };
+        }
+        return result;
     }
     shouldBundleQueue(bundle) {
         let referencingBundles = this.bundleGraph.getReferencingBundles(bundle);
@@ -519,6 +524,7 @@ class ScopeHoistingPackager {
                         let [code, map, lines] = this.visitAsset(resolved);
                         depCode += code + '\n';
                         if (sourceMap && map) {
+                            // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                             sourceMap.addSourceMap(map, lineCount);
                         }
                         lineCount += lines + 1;
@@ -641,6 +647,7 @@ class ScopeHoistingPackager {
                                     sourceMap.offsetLines(lineCount + 1, lines);
                                 }
                                 if (map) {
+                                    // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                                     sourceMap.addSourceMap(map, lineCount);
                                 }
                             }
@@ -684,6 +691,7 @@ ${code}
                     continue;
                 code += depCode + '\n';
                 if (sourceMap && map) {
+                    // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                     sourceMap.addSourceMap(map, lineCount);
                 }
                 lineCount += lines + 1;

package/dist/index.js

@@ -55,6 +55,7 @@ exports.default = new plugin_1.Packager({
         // If this is a non-module script, and there is only one asset with no dependencies,
         // then we don't need to package at all and can pass through the original code un-wrapped.
         let contents, map;
+        let scopeHoistingStats;
         if (bundle.env.sourceType === 'script') {
             let entries = bundle.getEntryAssets();
             if (entries.length === 1 &&
@@ -64,10 +65,17 @@ exports.default = new plugin_1.Packager({
             }
         }
         if (contents == null) {
-            let packager = bundle.env.shouldScopeHoist
-                ? new ScopeHoistingPackager_1.ScopeHoistingPackager(options, bundleGraph, bundle, (0, nullthrows_1.default)(config).parcelRequireName, (0, nullthrows_1.default)(config).unstable_asyncBundleRuntime, (0, nullthrows_1.default)(config).unstable_manualStaticBindingExports, logger)
-                : new DevPackager_1.DevPackager(options, bundleGraph, bundle, (0, nullthrows_1.default)(config).parcelRequireName);
-            ({ contents, map } = await packager.package());
+            if (bundle.env.shouldScopeHoist) {
+                let packager = new ScopeHoistingPackager_1.ScopeHoistingPackager(options, bundleGraph, bundle, (0, nullthrows_1.default)(config).parcelRequireName, (0, nullthrows_1.default)(config).unstable_asyncBundleRuntime, (0, nullthrows_1.default)(config).unstable_manualStaticBindingExports, logger);
+                let packageResult = await packager.package();
+                ({ contents, map } = packageResult);
+                scopeHoistingStats = packageResult.scopeHoistingStats;
+            }
+            else {
+                let packager = new DevPackager_1.DevPackager(options, bundleGraph, bundle, (0, nullthrows_1.default)(config).parcelRequireName);
+                let packageResult = await packager.package();
+                ({ contents, map } = packageResult);
+            }
         }
         contents += '\n' + (await getSourceMapSuffix(getSourceMapReference, map));
         // For library builds, we need to replace URL references with their final resolved paths.
@@ -81,7 +89,7 @@ exports.default = new plugin_1.Packager({
                 getReplacement: (s) => JSON.stringify(s).slice(1, -1),
             }));
         }
-        return (0, utils_1.replaceInlineReferences)({
+        let result = await (0, utils_1.replaceInlineReferences)({
             bundle,
             bundleGraph,
             contents,
@@ -92,6 +100,10 @@ exports.default = new plugin_1.Packager({
             getInlineBundleContents,
             map,
         });
+        if (utils_1.debugTools['scope-hoisting-stats']) {
+            return { ...result, scopeHoistingStats };
+        }
+        return result;
     },
 });
 async function getSourceMapSuffix(getSourceMapReference, map) {

package/lib/DevPackager.js

@@ -12,7 +12,7 @@ function _utils() {
   return data;
 }
 function _sourceMap() {
-  const data = _interopRequireDefault(require("@atlaspack/source-map"));
+  const data = _interopRequireDefault(require("@parcel/source-map"));
   _sourceMap = function () {
     return data;
   };
@@ -182,6 +182,7 @@ class DevPackager {
       // @ts-expect-error TS2339
       script.code, entryMap, this.parcelRequireName);
       if (this.bundle.env.sourceMap && entryMap) {
+        // @ts-expect-error TS2551
         map.addSourceMap(entryMap, lineOffset);
       }
     }

package/lib/ScopeHoistingPackager.js

@@ -12,7 +12,7 @@ function _utils() {
   return data;
 }
 function _sourceMap2() {
-  const data = _interopRequireDefault(require("@atlaspack/source-map"));
+  const data = _interopRequireDefault(require("@parcel/source-map"));
   _sourceMap2 = function () {
     return data;
   };
@@ -147,6 +147,7 @@ class ScopeHoistingPackager {
       this.seenHoistedRequires.clear();
       let [content, map, lines] = this.visitAsset(asset);
       if (sourceMap && map) {
+        // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
         sourceMap = map;
@@ -253,10 +254,17 @@ class ScopeHoistingPackager {
         sourceMap.addSourceMap(map, lineCount);
       }
     }
-    return {
+    const result = {
       contents: res,
       map: sourceMap
     };
+    if (_utils().debugTools['scope-hoisting-stats']) {
+      result.scopeHoistingStats = {
+        totalAssets: this.assetOutputs.size,
+        wrappedAssets: this.wrappedAssets.size
+      };
+    }
+    return result;
   }
   shouldBundleQueue(bundle) {
     let referencingBundles = this.bundleGraph.getReferencingBundles(bundle);
@@ -506,6 +514,7 @@ class ScopeHoistingPackager {
             let [code, map, lines] = this.visitAsset(resolved);
             depCode += code + '\n';
             if (sourceMap && map) {
+              // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
               sourceMap.addSourceMap(map, lineCount);
             }
             lineCount += lines + 1;
@@ -624,6 +633,7 @@ class ScopeHoistingPackager {
                   sourceMap.offsetLines(lineCount + 1, lines);
                 }
                 if (map) {
+                  // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                   sourceMap.addSourceMap(map, lineCount);
                 }
               }
@@ -668,6 +678,7 @@ ${code}
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
+          // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;

package/lib/index.js

@@ -100,6 +100,7 @@ var _default = exports.default = new (_plugin().Packager)({
     // If this is a non-module script, and there is only one asset with no dependencies,
     // then we don't need to package at all and can pass through the original code un-wrapped.
     let contents, map;
+    let scopeHoistingStats;
     if (bundle.env.sourceType === 'script') {
       let entries = bundle.getEntryAssets();
       if (entries.length === 1 && bundleGraph.getDependencies(entries[0]).length === 0) {
@@ -108,11 +109,22 @@ var _default = exports.default = new (_plugin().Packager)({
       }
     }
     if (contents == null) {
-      let packager = bundle.env.shouldScopeHoist ? new _ScopeHoistingPackager.ScopeHoistingPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName, (0, _nullthrows().default)(config).unstable_asyncBundleRuntime, (0, _nullthrows().default)(config).unstable_manualStaticBindingExports, logger) : new _DevPackager.DevPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName);
-      ({
-        contents,
-        map
-      } = await packager.package());
+      if (bundle.env.shouldScopeHoist) {
+        let packager = new _ScopeHoistingPackager.ScopeHoistingPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName, (0, _nullthrows().default)(config).unstable_asyncBundleRuntime, (0, _nullthrows().default)(config).unstable_manualStaticBindingExports, logger);
+        let packageResult = await packager.package();
+        ({
+          contents,
+          map
+        } = packageResult);
+        scopeHoistingStats = packageResult.scopeHoistingStats;
+      } else {
+        let packager = new _DevPackager.DevPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName);
+        let packageResult = await packager.package();
+        ({
+          contents,
+          map
+        } = packageResult);
+      }
     }
     contents += '\n' + (await getSourceMapSuffix(getSourceMapReference, map));
 
@@ -130,7 +142,7 @@ var _default = exports.default = new (_plugin().Packager)({
         getReplacement: s => JSON.stringify(s).slice(1, -1)
       }));
     }
-    return (0, _utils().replaceInlineReferences)({
+    let result = await (0, _utils().replaceInlineReferences)({
       bundle,
       bundleGraph,
       contents,
@@ -141,6 +153,13 @@ var _default = exports.default = new (_plugin().Packager)({
       getInlineBundleContents,
       map
     });
+    if (_utils().debugTools['scope-hoisting-stats']) {
+      return {
+        ...result,
+        scopeHoistingStats
+      };
+    }
+    return result;
   }
 });
 async function getSourceMapSuffix(getSourceMapReference, map) {

package/lib/types/DevPackager.d.ts

@@ -1,5 +1,5 @@
 import type { BundleGraph, PluginOptions, NamedBundle } from '@atlaspack/types';
-import SourceMap from '@atlaspack/source-map';
+import SourceMap from '@parcel/source-map';
 export declare class DevPackager {
     options: PluginOptions;
     bundleGraph: BundleGraph<NamedBundle>;

package/lib/types/ScopeHoistingPackager.d.ts

@@ -1,9 +1,17 @@
 import type { Asset, BundleGraph, Dependency, PluginOptions, NamedBundle, PluginLogger } from '@atlaspack/types';
-import SourceMap from '@atlaspack/source-map';
+import SourceMap from '@parcel/source-map';
 export interface OutputFormat {
     buildBundlePrelude(): [string, number];
     buildBundlePostlude(): [string, number];
 }
+export type PackageResult = {
+    contents: string;
+    map: SourceMap | null | undefined;
+    scopeHoistingStats?: {
+        totalAssets: number;
+        wrappedAssets: number;
+    };
+};
 export declare class ScopeHoistingPackager {
     options: PluginOptions;
     bundleGraph: BundleGraph<NamedBundle>;
@@ -37,10 +45,7 @@ export declare class ScopeHoistingPackager {
     logger: PluginLogger;
     useBothScopeHoistingImprovements: boolean;
     constructor(options: PluginOptions, bundleGraph: BundleGraph<NamedBundle>, bundle: NamedBundle, parcelRequireName: string, useAsyncBundleRuntime: boolean, manualStaticBindingExports: string[] | null, logger: PluginLogger);
-    package(): Promise<{
-        contents: string;
-        map: SourceMap | null | undefined;
-    }>;
+    package(): Promise<PackageResult>;
     shouldBundleQueue(bundle: NamedBundle): boolean;
     runWhenReady(bundle: NamedBundle, codeToRun: string): string;
     loadAssets(): Promise<void>;

package/lib/types/utils.d.ts

@@ -1,5 +1,5 @@
 import type { BundleGraph, Dependency, NamedBundle } from '@atlaspack/types';
-import type SourceMap from '@atlaspack/source-map';
+import type SourceMap from '@parcel/source-map';
 export declare function replaceScriptDependencies(bundleGraph: BundleGraph<NamedBundle>, bundle: NamedBundle, code: string, map: SourceMap | null | undefined, parcelRequireName: string): string;
 export declare function getSpecifier(dep: Dependency): string;
 export declare function isValidIdentifier(id: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.23.5-dev-5779cd2e2.0",
+  "version": "2.23.5-dev-swc-4fc8a99f4.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,13 +16,13 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.5-dev-5779cd2e2.0",
-    "@atlaspack/feature-flags": "2.25.5-dev-5779cd2e2.0",
-    "@atlaspack/plugin": "2.14.35-dev-5779cd2e2.0",
-    "@atlaspack/rust": "3.8.3-dev-5779cd2e2.0",
-    "@atlaspack/source-map": "3.0.1-dev-5779cd2e2.0",
-    "@atlaspack/types": "2.15.25-dev-5779cd2e2.0",
-    "@atlaspack/utils": "3.0.3-dev-5779cd2e2.0",
+    "@atlaspack/diagnostic": "2.14.5-dev-swc-4fc8a99f4.0",
+    "@atlaspack/feature-flags": "2.25.5-dev-swc-4fc8a99f4.0",
+    "@atlaspack/plugin": "2.14.35-dev-swc-4fc8a99f4.0",
+    "@atlaspack/rust": "3.8.3-dev-swc-4fc8a99f4.0",
+    "@atlaspack/types": "2.15.25-dev-swc-4fc8a99f4.0",
+    "@atlaspack/utils": "3.0.3-dev-swc-4fc8a99f4.0",
+    "@parcel/source-map": "^2.1.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1",
     "outdent": "^0.8.0"
@@ -31,5 +31,5 @@
   "scripts": {
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
-  "gitHead": "5779cd2e2d554546c84fe2b7e4c57611975a15b2"
+  "gitHead": "4fc8a99f4944cddf9c65ed0cb547cba40a83488c"
 }

package/src/DevPackager.ts

@@ -6,7 +6,7 @@ import {
   countLines,
   normalizeSeparators,
 } from '@atlaspack/utils';
-import SourceMap from '@atlaspack/source-map';
+import SourceMap from '@parcel/source-map';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 import invariant from 'assert';
 import path from 'path';
@@ -229,6 +229,7 @@ export class DevPackager {
         this.parcelRequireName,
       );
       if (this.bundle.env.sourceMap && entryMap) {
+        // @ts-expect-error TS2551
         map.addSourceMap(entryMap, lineOffset);
       }
     }

package/src/ScopeHoistingPackager.ts

@@ -16,7 +16,7 @@ import {
   debugTools,
   globToRegex,
 } from '@atlaspack/utils';
-import SourceMap from '@atlaspack/source-map';
+import SourceMap from '@parcel/source-map';
 import nullthrows from 'nullthrows';
 import invariant, {AssertionError} from 'assert';
 import ThrowableDiagnostic, {
@@ -82,6 +82,15 @@ export interface OutputFormat {
   buildBundlePostlude(): [string, number];
 }
 
+export type PackageResult = {
+  contents: string;
+  map: SourceMap | null | undefined;
+  scopeHoistingStats?: {
+    totalAssets: number;
+    wrappedAssets: number;
+  };
+};
+
 export class ScopeHoistingPackager {
   options: PluginOptions;
   bundleGraph: BundleGraph<NamedBundle>;
@@ -153,10 +162,7 @@ export class ScopeHoistingPackager {
     this.globalNames = GLOBALS_BY_CONTEXT[bundle.env.context];
   }
 
-  async package(): Promise<{
-    contents: string;
-    map: SourceMap | null | undefined;
-  }> {
+  async package(): Promise<PackageResult> {
     await this.loadAssets();
     this.buildExportedSymbols();
 
@@ -184,6 +190,7 @@ export class ScopeHoistingPackager {
       let [content, map, lines] = this.visitAsset(asset);
 
       if (sourceMap && map) {
+        // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
         sourceMap = map;
@@ -319,10 +326,16 @@ export class ScopeHoistingPackager {
       }
     }
 
-    return {
-      contents: res,
-      map: sourceMap,
-    };
+    const result: PackageResult = {contents: res, map: sourceMap};
+
+    if (debugTools['scope-hoisting-stats']) {
+      result.scopeHoistingStats = {
+        totalAssets: this.assetOutputs.size,
+        wrappedAssets: this.wrappedAssets.size,
+      };
+    }
+
+    return result;
   }
 
   shouldBundleQueue(bundle: NamedBundle): boolean {
@@ -687,6 +700,7 @@ export class ScopeHoistingPackager {
             let [code, map, lines] = this.visitAsset(resolved);
             depCode += code + '\n';
             if (sourceMap && map) {
+              // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
               sourceMap.addSourceMap(map, lineCount);
             }
             lineCount += lines + 1;
@@ -842,6 +856,7 @@ export class ScopeHoistingPackager {
                   }
 
                   if (map) {
+                    // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                     sourceMap.addSourceMap(map, lineCount);
                   }
                 }
@@ -898,6 +913,7 @@ ${code}
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
+          // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;

package/src/index.ts

@@ -1,17 +1,21 @@
-import type {Async} from '@atlaspack/types';
-import type SourceMap from '@atlaspack/source-map';
+import type {Async, BundleResult} from '@atlaspack/types';
+import type SourceMap from '@parcel/source-map';
 import {Packager} from '@atlaspack/plugin';
 import {
   replaceInlineReferences,
   replaceURLReferences,
   validateSchema,
   SchemaEntity,
+  debugTools,
 } from '@atlaspack/utils';
 import {encodeJSONKeyComponent} from '@atlaspack/diagnostic';
 import {hashString} from '@atlaspack/rust';
 import nullthrows from 'nullthrows';
 import {DevPackager} from './DevPackager';
-import {ScopeHoistingPackager} from './ScopeHoistingPackager';
+import {
+  type PackageResult as ScopeHoistingPackageResult,
+  ScopeHoistingPackager,
+} from './ScopeHoistingPackager';
 
 type JSPackagerConfig = {
   parcelRequireName: string;
@@ -91,6 +95,8 @@ export default new Packager({
     // If this is a non-module script, and there is only one asset with no dependencies,
     // then we don't need to package at all and can pass through the original code un-wrapped.
     let contents, map;
+    let scopeHoistingStats: ScopeHoistingPackageResult['scopeHoistingStats'];
+
     if (bundle.env.sourceType === 'script') {
       let entries = bundle.getEntryAssets();
       if (
@@ -103,24 +109,31 @@ export default new Packager({
     }
 
     if (contents == null) {
-      let packager = bundle.env.shouldScopeHoist
-        ? new ScopeHoistingPackager(
-            options,
-            bundleGraph,
-            bundle,
-            nullthrows(config).parcelRequireName,
-            nullthrows(config).unstable_asyncBundleRuntime,
-            nullthrows(config).unstable_manualStaticBindingExports,
-            logger,
-          )
-        : new DevPackager(
-            options,
-            bundleGraph,
-            bundle,
-            nullthrows(config).parcelRequireName,
-          );
-
-      ({contents, map} = await packager.package());
+      if (bundle.env.shouldScopeHoist) {
+        let packager = new ScopeHoistingPackager(
+          options,
+          bundleGraph,
+          bundle,
+          nullthrows(config).parcelRequireName,
+          nullthrows(config).unstable_asyncBundleRuntime,
+          nullthrows(config).unstable_manualStaticBindingExports,
+          logger,
+        );
+
+        let packageResult = await packager.package();
+        ({contents, map} = packageResult);
+        scopeHoistingStats = packageResult.scopeHoistingStats;
+      } else {
+        let packager = new DevPackager(
+          options,
+          bundleGraph,
+          bundle,
+          nullthrows(config).parcelRequireName,
+        );
+
+        let packageResult = await packager.package();
+        ({contents, map} = packageResult);
+      }
     }
 
     contents += '\n' + (await getSourceMapSuffix(getSourceMapReference, map));
@@ -137,7 +150,7 @@ export default new Packager({
       }));
     }
 
-    return replaceInlineReferences({
+    let result = await replaceInlineReferences({
       bundle,
       bundleGraph,
       contents,
@@ -148,6 +161,12 @@ export default new Packager({
       getInlineBundleContents,
       map,
     });
+
+    if (debugTools['scope-hoisting-stats']) {
+      return {...result, scopeHoistingStats};
+    }
+
+    return result;
   },
 }) as Packager<unknown, unknown>;
 

package/src/utils.ts

@@ -1,5 +1,5 @@
 import type {BundleGraph, Dependency, NamedBundle} from '@atlaspack/types';
-import type SourceMap from '@atlaspack/source-map';
+import type SourceMap from '@parcel/source-map';
 import nullthrows from 'nullthrows';
 
 // This replaces __parcel__require__ references left by the transformer with

package/tsconfig.json

@@ -22,9 +22,6 @@
     },
     {
       "path": "../../core/utils/tsconfig.json"
-    },
-    {
-      "path": "../../core/source-map/tsconfig.json"
     }
   ]
 }