@atlaspack/packager-js 2.14.5-canary.34 → 2.14.5-canary.341

package/lib/dev-prelude.js

@@ -12,12 +12,12 @@
     typeof globalThis !== 'undefined'
       ? globalThis
       : typeof self !== 'undefined'
-      ? self
-      : typeof window !== 'undefined'
-      ? window
-      : typeof global !== 'undefined'
-      ? global
-      : {};
+        ? self
+        : typeof window !== 'undefined'
+          ? window
+          : typeof global !== 'undefined'
+            ? global
+            : {};
   /* eslint-enable no-undef */
 
   // Save the require from previous bundle to this closure if any

package/lib/helpers.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.prelude = exports.helpers = exports.fnExpr = exports.bundleQueuePrelude = void 0;
-const prelude = parcelRequireName => `
+exports.preludeOld = exports.preludeNew = exports.helpers = exports.fnExpr = exports.bundleQueuePrelude = void 0;
+const preludeOld = parcelRequireName => `
 var $parcel$modules = {};
 var $parcel$inits = {};
 
@@ -37,7 +37,42 @@ if (parcelRequire == null) {
 
 var parcelRegister = parcelRequire.register;
 `;
-exports.prelude = prelude;
+exports.preludeOld = preludeOld;
+const preludeNew = parcelRequireName => `
+var $parcel$modules = {};
+var $parcel$inits = {};
+
+var parcelRequire = $parcel$global[${JSON.stringify(parcelRequireName)}];
+
+if (parcelRequire == null) {
+  parcelRequire = function(id) {
+    var mod = $parcel$modules[id];
+    if (mod !== undefined) {
+      return mod.exports;
+    }
+    var init = $parcel$inits[id];
+    if (init !== undefined) {
+      delete $parcel$inits[id];
+      var module = {id: id, exports: {}};
+      $parcel$modules[id] = module;
+      init.call(module.exports, module, module.exports);
+      return module.exports;
+    }
+    var err = new Error("Cannot find module '" + id + "'");
+    err.code = 'MODULE_NOT_FOUND';
+    throw err;
+  };
+
+  parcelRequire.register = function register(id, init) {
+    $parcel$inits[id] = init;
+  };
+
+  $parcel$global[${JSON.stringify(parcelRequireName)}] = parcelRequire;
+}
+
+var parcelRegister = parcelRequire.register;
+`;
+exports.preludeNew = preludeNew;
 const fnExpr = (env, params, body) => {
   let block = `{ ${body.join(' ')} }`;
   if (env.supports('arrow-functions')) {

package/lib/index.js

@@ -48,7 +48,7 @@ const CONFIG_SCHEMA = {
     unstable_asyncBundleRuntime: {
       type: 'boolean'
     },
-    unstable_forceSkipWrapAssets: {
+    unstable_manualStaticBindingExports: {
       type: 'array',
       items: {
         type: 'string'
@@ -70,7 +70,7 @@ var _default = exports.default = new (_plugin().Packager)({
     if (conf !== null && conf !== void 0 && conf.contents) {
       _utils().validateSchema.diagnostic(CONFIG_SCHEMA, {
         data: conf === null || conf === void 0 ? void 0 : conf.contents,
-        source: await options.inputFS.readFile(conf.filePath, 'utf8'),
+        source: () => options.inputFS.readFileSync(conf.filePath, 'utf8'),
         filePath: conf.filePath,
         prependKey: `/${(0, _diagnostic().encodeJSONKeyComponent)(packageKey)}`
       }, packageKey, `Invalid config for ${packageKey}`);
@@ -85,7 +85,7 @@ var _default = exports.default = new (_plugin().Packager)({
     return {
       parcelRequireName: 'parcelRequire' + (0, _rust().hashString)(name).slice(-4),
       unstable_asyncBundleRuntime: Boolean(conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.unstable_asyncBundleRuntime),
-      unstable_forceSkipWrapAssets: (conf === null || conf === void 0 || (_conf$contents2 = conf.contents) === null || _conf$contents2 === void 0 ? void 0 : _conf$contents2.unstable_forceSkipWrapAssets) ?? []
+      unstable_manualStaticBindingExports: (conf === null || conf === void 0 || (_conf$contents2 = conf.contents) === null || _conf$contents2 === void 0 ? void 0 : _conf$contents2.unstable_manualStaticBindingExports) ?? null
     };
   },
   async package({
@@ -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_forceSkipWrapAssets, 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/CJSOutputFormat.d.ts

@@ -0,0 +1,7 @@
+import type { ScopeHoistingPackager, OutputFormat } from './ScopeHoistingPackager';
+export declare class CJSOutputFormat implements OutputFormat {
+    packager: ScopeHoistingPackager;
+    constructor(packager: ScopeHoistingPackager);
+    buildBundlePrelude(): [string, number];
+    buildBundlePostlude(): [string, number];
+}

package/lib/types/DevPackager.d.ts

@@ -0,0 +1,15 @@
+import type { BundleGraph, PluginOptions, NamedBundle } from '@atlaspack/types';
+import SourceMap from '@atlaspack/source-map';
+export declare class DevPackager {
+    options: PluginOptions;
+    bundleGraph: BundleGraph<NamedBundle>;
+    bundle: NamedBundle;
+    parcelRequireName: string;
+    constructor(options: PluginOptions, bundleGraph: BundleGraph<NamedBundle>, bundle: NamedBundle, parcelRequireName: string);
+    package(): Promise<{
+        contents: string;
+        map: SourceMap | null | undefined;
+    }>;
+    getPrefix(): string;
+    isEntry(): boolean;
+}

package/lib/types/ESMOutputFormat.d.ts

@@ -0,0 +1,7 @@
+import type { ScopeHoistingPackager, OutputFormat } from './ScopeHoistingPackager';
+export declare class ESMOutputFormat implements OutputFormat {
+    packager: ScopeHoistingPackager;
+    constructor(packager: ScopeHoistingPackager);
+    buildBundlePrelude(): [string, number];
+    buildBundlePostlude(): [string, number];
+}

package/lib/types/GlobalOutputFormat.d.ts

@@ -0,0 +1,7 @@
+import type { ScopeHoistingPackager, OutputFormat } from './ScopeHoistingPackager';
+export declare class GlobalOutputFormat implements OutputFormat {
+    packager: ScopeHoistingPackager;
+    constructor(packager: ScopeHoistingPackager);
+    buildBundlePrelude(): [string, number];
+    buildBundlePostlude(): [string, number];
+}

package/lib/types/ScopeHoistingPackager.d.ts

@@ -0,0 +1,73 @@
+import type { Asset, BundleGraph, Dependency, PluginOptions, NamedBundle, PluginLogger } from '@atlaspack/types';
+import SourceMap from '@atlaspack/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>;
+    bundle: NamedBundle;
+    parcelRequireName: string;
+    useAsyncBundleRuntime: boolean;
+    outputFormat: OutputFormat;
+    isAsyncBundle: boolean;
+    globalNames: ReadonlySet<string>;
+    manualStaticBindingExports: RegExp[] | null;
+    assetOutputs: Map<Asset, {
+        code: string;
+        map: Buffer | null | undefined;
+    }>;
+    exportedSymbols: Map<string, {
+        asset: Asset;
+        exportSymbol: string;
+        local: string;
+        exportAs: Array<string>;
+    }>;
+    externals: Map<string, Map<string, string>>;
+    topLevelNames: Map<string, number>;
+    seenAssets: Set<Asset>;
+    wrappedAssets: Set<Asset>;
+    constantAssets: Set<Asset>;
+    hoistedRequires: Map<Dependency, Map<Asset, string>>;
+    seenHoistedRequires: Set<string>;
+    needsPrelude: boolean;
+    usedHelpers: Set<string>;
+    externalAssets: Set<Asset>;
+    logger: PluginLogger;
+    useBothScopeHoistingImprovements: boolean;
+    referencedAssetsCache: Map<string, Set<Asset>>;
+    constructor(options: PluginOptions, bundleGraph: BundleGraph<NamedBundle>, bundle: NamedBundle, parcelRequireName: string, useAsyncBundleRuntime: boolean, manualStaticBindingExports: string[] | null, logger: PluginLogger);
+    package(): Promise<PackageResult>;
+    shouldBundleQueue(bundle: NamedBundle): boolean;
+    runWhenReady(bundle: NamedBundle, codeToRun: string): string;
+    isAssetReferencedInBundle(bundle: NamedBundle, asset: Asset): boolean;
+    loadAssets(): Promise<void>;
+    isReExported(asset: Asset): boolean;
+    buildExportedSymbols(): void;
+    getTopLevelName(name: string): string;
+    getPropertyAccess(obj: string, property: string): string;
+    visitAsset(asset: Asset): [string, SourceMap | null | undefined, number];
+    getAssetFilePath(asset: Asset): string;
+    buildAsset(asset: Asset, code: string, map?: Buffer | null): [string, SourceMap | null | undefined, number];
+    buildReplacements(asset: Asset, deps: Array<Dependency>): [Map<string, Array<Dependency>>, Map<string, string>];
+    addExternal(dep: Dependency, replacements?: Map<string, string>, referencedBundle?: NamedBundle): void;
+    isWrapped(resolved: Asset, parentAsset: Asset): boolean;
+    getSymbolResolution(parentAsset: Asset, resolved: Asset, imported: string, dep?: Dependency, replacements?: Map<string, string>): string;
+    getHoistedParcelRequires(parentAsset: Asset, dep: Dependency, resolved: Asset): [string, number];
+    buildAssetPrelude(asset: Asset, deps: Array<Dependency>, replacements: Map<string, string>): [string, number, string];
+    buildBundlePrelude(): [string, number];
+    needsDefaultInterop(asset: Asset): boolean;
+    shouldSkipAsset(asset: Asset): boolean;
+    isScriptEntry(asset: Asset): boolean;
+    buildFunctionExpression(args: Array<string>, expr: string): string;
+    hasConditionalDependency(): boolean;
+}

package/lib/types/helpers.d.ts

@@ -0,0 +1,12 @@
+import type { Environment } from '@atlaspack/types';
+export declare const preludeOld: (parcelRequireName: string) => string;
+export declare const preludeNew: (parcelRequireName: string) => string;
+export declare const fnExpr: (env: Environment, params: Array<string>, body: Array<string>) => string;
+export declare const bundleQueuePrelude: (env: Environment) => string;
+export declare const helpers: {
+    readonly $parcel$export: "\nfunction $parcel$export(e, n, v, s) {\n  Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});\n}\n";
+    readonly $parcel$exportWildcard: "\nfunction $parcel$exportWildcard(dest, source) {\n  Object.keys(source).forEach(function(key) {\n    if (key === 'default' || key === '__esModule' || Object.prototype.hasOwnProperty.call(dest, key)) {\n      return;\n    }\n\n    Object.defineProperty(dest, key, {\n      enumerable: true,\n      get: function get() {\n        return source[key];\n      }\n    });\n  });\n\n  return dest;\n}\n";
+    readonly $parcel$interopDefault: "\nfunction $parcel$interopDefault(a) {\n  return a && a.__esModule ? a.default : a;\n}\n";
+    readonly $parcel$global: (env: Environment) => string;
+    readonly $parcel$defineInteropFlag: "\nfunction $parcel$defineInteropFlag(a) {\n  Object.defineProperty(a, '__esModule', {value: true, configurable: true});\n}\n";
+};

package/lib/types/index.d.ts

@@ -0,0 +1,3 @@
+import { Packager } from '@atlaspack/plugin';
+declare const _default: Packager<unknown, unknown>;
+export default _default;

package/lib/types/utils.d.ts

@@ -0,0 +1,6 @@
+import type { BundleGraph, Dependency, NamedBundle } from '@atlaspack/types';
+import type SourceMap from '@atlaspack/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;
+export declare function makeValidIdentifier(name: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.14.5-canary.34+47310a406",
+  "version": "2.14.5-canary.341+0b6688e00",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,22 +9,27 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/index.js",
-  "source": "src/index.js",
+  "main": "./lib/index.js",
+  "source": "./src/index.ts",
+  "types": "./lib/types/index.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.102+47310a406",
-    "@atlaspack/feature-flags": "2.14.1-canary.102+47310a406",
-    "@atlaspack/plugin": "2.14.5-canary.34+47310a406",
-    "@atlaspack/rust": "3.2.1-canary.34+47310a406",
-    "@atlaspack/types": "2.14.5-canary.34+47310a406",
-    "@atlaspack/utils": "2.14.5-canary.34+47310a406",
-    "@parcel/source-map": "^2.1.1",
+    "@atlaspack/diagnostic": "2.14.1-canary.409+0b6688e00",
+    "@atlaspack/feature-flags": "2.14.1-canary.409+0b6688e00",
+    "@atlaspack/plugin": "2.14.5-canary.341+0b6688e00",
+    "@atlaspack/rust": "3.2.1-canary.341+0b6688e00",
+    "@atlaspack/source-map": "3.2.3-canary.4120+0b6688e00",
+    "@atlaspack/types": "2.14.5-canary.341+0b6688e00",
+    "@atlaspack/utils": "2.14.5-canary.341+0b6688e00",
     "globals": "^13.2.0",
-    "nullthrows": "^1.1.1"
+    "nullthrows": "^1.1.1",
+    "outdent": "^0.8.0"
   },
   "type": "commonjs",
-  "gitHead": "47310a406469632d857a2fc9f10d04c456ae4dfa"
-}
+  "scripts": {
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
+  },
+  "gitHead": "0b6688e00e6c3687a2b1de5525395419512145e6"
+}

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

@@ -1,4 +1,3 @@
-// @flow
 import type {
   ScopeHoistingPackager,
   OutputFormat,

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

@@ -1,4 +1,3 @@
-// @flow strict-local
 import type {BundleGraph, PluginOptions, NamedBundle} from '@atlaspack/types';
 
 import {
@@ -7,7 +6,8 @@ import {
   countLines,
   normalizeSeparators,
 } from '@atlaspack/utils';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import invariant from 'assert';
 import path from 'path';
 import fs from 'fs';
@@ -36,7 +36,10 @@ export class DevPackager {
     this.parcelRequireName = parcelRequireName;
   }
 
-  async package(): Promise<{|contents: string, map: ?SourceMap|}> {
+  async package(): Promise<{
+    contents: string;
+    map: SourceMap | null | undefined;
+  }> {
     // Load assets
     let queue = new PromiseQueue({maxConcurrent: 32});
     this.bundle.traverseAssets((asset) => {
@@ -58,7 +61,13 @@ export class DevPackager {
 
     let prefix = this.getPrefix();
     let lineOffset = countLines(prefix);
-    let script: ?{|code: string, mapBuffer: ?Buffer|} = null;
+    let script:
+      | {
+          code: string;
+          mapBuffer: Buffer | null | undefined;
+        }
+      | null
+      | undefined = null;
 
     this.bundle.traverse((node) => {
       let wrapped = first ? '' : ',';
@@ -93,11 +102,12 @@ export class DevPackager {
           this.bundle.env.sourceType === 'script' &&
           asset === this.bundle.getMainEntry()
         ) {
+          // @ts-expect-error TS2322
           script = results[i++];
           return;
         }
 
-        let deps = {};
+        let deps: Record<string, any> = {};
         let dependencies = this.bundleGraph.getDependencies(asset);
         for (let dep of dependencies) {
           let resolved = this.bundleGraph.getResolvedAsset(dep, this.bundle);
@@ -112,6 +122,19 @@ export class DevPackager {
           }
         }
 
+        if (getFeatureFlag('hmrImprovements')) {
+          // Add dependencies for parcelRequire calls added by runtimes
+          // so that the HMR runtime can correctly traverse parents.
+          let hmrDeps = asset.meta.hmrDeps;
+          if (this.options.hmrOptions && Array.isArray(hmrDeps)) {
+            for (let id of hmrDeps) {
+              invariant(typeof id === 'string');
+              deps[id] = id;
+            }
+          }
+        }
+
+        // @ts-expect-error TS2339
         let {code, mapBuffer} = results[i];
         let output = code || '';
         wrapped +=
@@ -192,6 +215,7 @@ export class DevPackager {
     // runtimes with a parcelRequire call.
     if (this.bundle.env.sourceType === 'script' && script) {
       let entryMap;
+      // @ts-expect-error TS2339
       let mapBuffer = script.mapBuffer;
       if (mapBuffer) {
         entryMap = new SourceMap(this.options.projectRoot, mapBuffer);
@@ -199,6 +223,7 @@ export class DevPackager {
       contents += replaceScriptDependencies(
         this.bundleGraph,
         this.bundle,
+        // @ts-expect-error TS2339
         script.code,
         entryMap,
         this.parcelRequireName,
@@ -215,7 +240,7 @@ export class DevPackager {
   }
 
   getPrefix(): string {
-    let interpreter: ?string;
+    let interpreter: string | null | undefined;
     let mainEntry = this.bundle.getMainEntry();
     if (mainEntry && this.isEntry() && !this.bundle.target.env.isBrowser()) {
       let _interpreter = mainEntry.meta.interpreter;
@@ -224,7 +249,7 @@ export class DevPackager {
     }
 
     let importScripts = '';
-    if (this.bundle.env.isWorker()) {
+    if (this.bundle.env.isWorker() || this.bundle.env.isTesseract()) {
       let bundles = this.bundleGraph.getReferencedBundles(this.bundle);
       for (let b of bundles) {
         importScripts += `importScripts("${relativeBundlePath(
@@ -246,7 +271,8 @@ export class DevPackager {
     return (
       !this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') ||
       this.bundle.env.isIsolated() ||
-      this.bundle.bundleBehavior === 'isolated'
+      this.bundle.bundleBehavior === 'isolated' ||
+      this.bundle.bundleBehavior === 'inlineIsolated'
     );
   }
 }

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

@@ -1,4 +1,3 @@
-// @flow
 import type {
   ScopeHoistingPackager,
   OutputFormat,
@@ -18,7 +17,7 @@ export class ESMOutputFormat implements OutputFormat {
     for (let [source, specifiers] of this.packager.externals) {
       let defaultSpecifier = null;
       let namespaceSpecifier = null;
-      let namedSpecifiers = [];
+      let namedSpecifiers: Array<string> = [];
       for (let [imported, symbol] of specifiers) {
         if (imported === 'default' /* || isCommonJS*/) {
           defaultSpecifier = symbol;
@@ -77,14 +76,14 @@ export class ESMOutputFormat implements OutputFormat {
   buildBundlePostlude(): [string, number] {
     let res = '';
     let lines = 0;
-    let exportSpecifiers = [];
+    let exportSpecifiers: Array<string> = [];
     for (let {
       asset,
       exportSymbol,
       local,
       exportAs,
     } of this.packager.exportedSymbols.values()) {
-      if (this.packager.wrappedAssets.has(asset.id)) {
+      if (this.packager.wrappedAssets.has(asset)) {
         let obj = `parcelRequire("${this.packager.bundleGraph.getAssetPublicId(
           asset,
         )}")`;

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

@@ -1,4 +1,3 @@
-// @flow
 import type {
   ScopeHoistingPackager,
   OutputFormat,