@yao-pkg/pkg 6.12.0 → 6.13.1

package/lib-es5/walker.js

@@ -38,6 +38,7 @@ const colors_1 = require("./colors");
 const follow_1 = require("./follow");
 const log_1 = require("./log");
 const detector = __importStar(require("./detector"));
+const esm_transformer_1 = require("./esm-transformer");
 const options_1 = __importDefault(require("./options"));
 // Note: as a developer, you can set the PKG_STRICT_VER variable.
 //       this will turn on some assertion in the walker code below
@@ -63,9 +64,6 @@ function isBuiltin(moduleName) {
         : moduleName;
     return module_1.builtinModules.includes(moduleNameWithoutPrefix);
 }
-function unlikelyJavascript(file) {
-    return ['.css', '.html', '.json', '.vue'].includes(path_1.default.extname(file));
-}
 function isPublic(config) {
     if (config.private) {
         return false;
@@ -232,7 +230,7 @@ function stepDetect(record, marker, derivatives) {
                 return false;
             }
             return true; // can i go inside?
-        });
+        }, record.file);
     }
     catch (error) {
         log_1.log.error(error.message, record.file);
@@ -265,6 +263,12 @@ async function findCommonJunctionPoint(file, realFile) {
     }
 }
 class Walker {
+    params;
+    symLinks;
+    patches;
+    tasks;
+    records;
+    dictionary;
     constructor() {
         this.tasks = [];
         this.records = {};
@@ -348,7 +352,7 @@ class Walker {
             this.append(task);
             return;
         }
-        this.append(Object.assign(Object.assign({}, task), { file: realFile }));
+        this.append({ ...task, file: realFile });
         this.appendStat({
             file: task.file,
             store: common_1.STORE_STAT,
@@ -380,7 +384,7 @@ class Walker {
             this.append(task);
             return;
         }
-        this.append(Object.assign(Object.assign({}, task), { file: realFile }));
+        this.append({ ...task, file: realFile });
         await this.appendSymlink(task.file, realFile);
         this.appendStat({
             file: task.file,
@@ -389,7 +393,7 @@ class Walker {
     }
     async appendFilesFromConfig(marker) {
         const { config, configPath, base } = marker;
-        const pkgConfig = config === null || config === void 0 ? void 0 : config.pkg;
+        const pkgConfig = config?.pkg;
         if (pkgConfig) {
             let { scripts } = pkgConfig;
             if (scripts) {
@@ -606,7 +610,6 @@ class Walker {
         }
     }
     async stepDerivatives_ALIAS_AS_RESOLVABLE(record, marker, derivative) {
-        var _a, _b;
         const newPackages = [];
         const catchReadFile = (file) => {
             (0, assert_1.default)((0, common_1.isPackageJson)(file), `walker: ${file} must be package.json`);
@@ -640,7 +643,7 @@ class Walker {
         }
         if (failure) {
             const { toplevel } = marker;
-            const mainNotFound = newPackages.length > 0 && !((_b = (_a = newPackages[0].marker) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.main);
+            const mainNotFound = newPackages.length > 0 && !newPackages[0].marker?.config?.main;
             const debug = !toplevel ||
                 derivative.mayExclude ||
                 (mainNotFound && derivative.fromDependencies);
@@ -678,17 +681,33 @@ class Walker {
                 break;
             }
         }
+        // Add all discovered package.json files, not just the one determined by the double-resolution logic
+        // This is necessary because ESM resolution may bypass the standard packageFilter mechanism
+        // However, only include package.json files that are either:
+        // 1. Inside node_modules (dependencies)
+        // 2. Inside the base directory of the current marker (application being packaged)
+        // This prevents including pkg's own package.json when used from source
+        for (const newPackage of newPackages) {
+            if (newPackage.marker) {
+                const file = newPackage.packageJson;
+                const isInNodeModules = file.includes(`${path_1.default.sep}node_modules${path_1.default.sep}`);
+                const isInMarkerBase = marker.base && file.startsWith(marker.base);
+                if (isInNodeModules || isInMarkerBase) {
+                    await this.appendBlobOrContent({
+                        file,
+                        marker: newPackage.marker,
+                        store: common_1.STORE_CONTENT,
+                        reason: record.file,
+                    });
+                }
+            }
+        }
+        // Keep the original logic for determining the marker for the resolved file
         if (newPackageForNewRecords) {
             if (strictVerify) {
                 (0, assert_1.default)(newPackageForNewRecords.packageJson ===
                     (0, common_1.normalizePath)(newPackageForNewRecords.packageJson));
             }
-            await this.appendBlobOrContent({
-                file: newPackageForNewRecords.packageJson,
-                marker: newPackageForNewRecords.marker,
-                store: common_1.STORE_CONTENT,
-                reason: record.file,
-            });
         }
         await this.appendBlobOrContent({
             file: newFile,
@@ -729,7 +748,7 @@ class Walker {
         await this.stepActivate(marker, derivatives1);
         await this.stepDerivatives(record, marker, derivatives1);
         if (store === common_1.STORE_BLOB) {
-            if (unlikelyJavascript(record.file) || (0, common_1.isDotNODE)(record.file)) {
+            if ((0, common_1.unlikelyJavascript)(record.file) || (0, common_1.isDotNODE)(record.file)) {
                 await this.appendBlobOrContent({
                     file: record.file,
                     marker,
@@ -745,7 +764,9 @@ class Walker {
                 });
             }
         }
-        if (store === common_1.STORE_BLOB || this.hasPatch(record)) {
+        if (store === common_1.STORE_BLOB ||
+            (store === common_1.STORE_CONTENT && (0, common_1.isPackageJson)(record.file)) ||
+            this.hasPatch(record)) {
             if (!record.body) {
                 await stepRead(record);
                 this.stepPatch(record);
@@ -753,6 +774,96 @@ class Walker {
                     stepStrip(record);
                 }
             }
+            // Patch package.json files to add synthetic main field if needed
+            if (store === common_1.STORE_CONTENT &&
+                (0, common_1.isPackageJson)(record.file) &&
+                record.body) {
+                try {
+                    const pkgContent = JSON.parse(record.body.toString('utf8'));
+                    let modified = false;
+                    // If package has exports but no main, add a synthetic main field
+                    if (pkgContent.exports && !pkgContent.main) {
+                        // Try to get main from marker.config first (set by catchPackageFilter in follow.ts)
+                        if (marker.config?.main) {
+                            pkgContent.main = marker.config.main;
+                            modified = true;
+                        }
+                        else {
+                            // Fallback: try to infer main from exports field
+                            const { exports } = pkgContent;
+                            if (typeof exports === 'string') {
+                                pkgContent.main = exports;
+                                modified = true;
+                            }
+                            else if (exports && typeof exports === 'object') {
+                                // Handle conditional exports
+                                if (exports['.']) {
+                                    if (typeof exports['.'] === 'string') {
+                                        pkgContent.main = exports['.'];
+                                        modified = true;
+                                    }
+                                    else if (typeof exports['.'] === 'object') {
+                                        // Try to get the best entry point for CJS
+                                        // Prefer: require > node > default
+                                        let mainEntry;
+                                        if (typeof exports['.'].require === 'string' &&
+                                            exports['.'].require) {
+                                            mainEntry = exports['.'].require;
+                                        }
+                                        else if (typeof exports['.'].node === 'string' &&
+                                            exports['.'].node) {
+                                            mainEntry = exports['.'].node;
+                                        }
+                                        else if (typeof exports['.'].default === 'string' &&
+                                            exports['.'].default) {
+                                            mainEntry = exports['.'].default;
+                                        }
+                                        if (mainEntry) {
+                                            pkgContent.main = mainEntry;
+                                            modified = true;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    // If package has "type": "module", we need to change it to "commonjs"
+                    // because we transform all ESM files to CJS before bytecode compilation
+                    if (pkgContent.type === 'module') {
+                        pkgContent.type = 'commonjs';
+                        modified = true;
+                    }
+                    // Only rewrite if we made changes
+                    if (modified) {
+                        record.body = Buffer.from(JSON.stringify(pkgContent, null, 2), 'utf8');
+                    }
+                }
+                catch (error) {
+                    // Ignore JSON parsing errors
+                }
+            }
+            // Transform ESM to CJS before bytecode compilation
+            // Check all JS-like files (.js, .mjs, .cjs) but only transform ESM ones
+            if (store === common_1.STORE_BLOB &&
+                record.body &&
+                ((0, common_1.isDotJS)(record.file) || record.file.endsWith('.mjs'))) {
+                if ((0, common_1.isESMFile)(record.file)) {
+                    try {
+                        const result = (0, esm_transformer_1.transformESMtoCJS)(record.body.toString('utf8'), record.file);
+                        if (result.isTransformed) {
+                            record.body = Buffer.from(result.code, 'utf8');
+                            // Mark .mjs files as transformed so packer can rename them to .js
+                            if (record.file.endsWith('.mjs')) {
+                                record.wasTransformed = true;
+                            }
+                        }
+                    }
+                    catch (error) {
+                        const message = error instanceof Error ? error.message : String(error);
+                        throw new Error(`Failed to transform ESM module to CJS for file "${record.file}": ${message}`);
+                    }
+                }
+            }
             if (store === common_1.STORE_BLOB) {
                 const derivatives2 = [];
                 stepDetect(record, marker, derivatives2);
@@ -834,8 +945,7 @@ class Walker {
         }
     }
     async readDictionary(marker) {
-        var _a, _b, _c;
-        if (((_a = this.params.noDictionary) === null || _a === void 0 ? void 0 : _a[0]) === '*') {
+        if (this.params.noDictionary?.[0] === '*') {
             return;
         }
         const dd = path_1.default.join(__dirname, '../dictionary');
@@ -843,7 +953,7 @@ class Walker {
         for (const file of files) {
             if (/\.js$/.test(file)) {
                 const name = file.slice(0, -3);
-                if ((_b = this.params.noDictionary) === null || _b === void 0 ? void 0 : _b.includes(file)) {
+                if (this.params.noDictionary?.includes(file)) {
                     continue;
                 }
                 // eslint-disable-next-line import/no-dynamic-require, global-require, @typescript-eslint/no-var-requires
@@ -851,7 +961,7 @@ class Walker {
                 this.dictionary[name] = config;
             }
         }
-        const pkgConfig = (_c = marker.config) === null || _c === void 0 ? void 0 : _c.pkg;
+        const pkgConfig = marker.config?.pkg;
         if (pkgConfig) {
             const { dictionary } = pkgConfig;
             if (dictionary) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yao-pkg/pkg",
-  "version": "6.12.0",
+  "version": "6.13.1",
   "description": "Package your Node.js project into an executable",
   "main": "lib-es5/index.js",
   "license": "MIT",
@@ -24,7 +24,9 @@
   "dependencies": {
     "@babel/generator": "^7.23.0",
     "@babel/parser": "^7.23.0",
+    "@babel/traverse": "^7.23.0",
     "@babel/types": "^7.23.0",
+    "esbuild": "^0.24.0",
     "@yao-pkg/pkg-fetch": "3.5.32",
     "into-stream": "^6.0.0",
     "minimist": "^1.2.6",
@@ -33,15 +35,16 @@
     "picomatch": "^4.0.2",
     "prebuild-install": "^7.1.1",
     "resolve": "^1.22.10",
+    "resolve.exports": "^2.0.3",
     "stream-meter": "^1.0.4",
-    "tar": "^7.4.3",
+    "tar": "^7.5.6",
     "tinyglobby": "^0.2.11",
     "unzipper": "^0.12.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.0",
     "@release-it/conventional-changelog": "^7.0.2",
     "@types/babel__generator": "^7.6.5",
+    "@types/babel__traverse": "^7.20.3",
     "@types/minimist": "^1.2.2",
     "@types/multistream": "^4.1.0",
     "@types/node": "^16.18.113",
@@ -52,7 +55,6 @@
     "@types/unzipper": "^0.10.10",
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^6.7.4",
-    "esbuild": "^0.24.0",
     "esbuild-register": "^3.6.0",
     "eslint": "^8.50.0",
     "eslint-config-airbnb-base": "^15.0.0",