bunchee 5.0.1 → 5.1.1

package/README.md

@@ -14,7 +14,7 @@
   </a>
 </p>
 
-**bunchee** is a zero configuration bundler makes bundling JS/tS library effortless. It's built on top of Rollup and SWC ⚡️, allowing you to focus on writing code and generating multiple bundles (CommonJS or ESModule) at the same time.
+**bunchee** is a zero configuration bundler makes bundling JS/TS library effortless. It's built on top of Rollup and SWC ⚡️, allowing you to focus on writing code and generating multiple bundles (CommonJS or ESModule) at the same time.
 It uses the standard exports configuration in `package.json` as the only source of truth, and uses entry file conventions to match your exports and build them into bundles.
 
 ## Quick Start

package/dist/bin/cli.js

@@ -474,7 +474,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "5.0.1";
+var version = "5.1.1";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
@@ -555,7 +555,7 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
             });
             for (const binDirent of binDirentList){
                 if (binDirent.isFile()) {
-                    const binFileAbsolutePath = path__default.default.join(binDirent.path, binDirent.name);
+                    const binFileAbsolutePath = path__default.default.join(absoluteDirPath, binDirent.name);
                     if (fs__default.default.existsSync(binFileAbsolutePath)) {
                         bins.set(normalizeExportPath(originalSubpath), binFileAbsolutePath);
                     }
@@ -610,7 +610,7 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
             if (isTestFile(dirent.name)) {
                 continue;
             }
-            const sourceFileAbsolutePath = path__default.default.join(dirent.path, dirent.name);
+            const sourceFileAbsolutePath = path__default.default.join(dirPath, dirent.name);
             if (isBinaryPath) {
                 bins.set(originalSubpath, sourceFileAbsolutePath);
             } else {
@@ -656,7 +656,7 @@ async function collectSourceEntries(sourceFolderPath) {
     const binDirent = entryFileDirentList.find((dirent)=>getFileBasename(dirent.name) === 'bin');
     if (binDirent) {
         if (binDirent.isDirectory()) {
-            const binDirentList = await fsp__default.default.readdir(path__default.default.join(binDirent.path, binDirent.name), {
+            const binDirentList = await fsp__default.default.readdir(path__default.default.join(sourceFolderPath, binDirent.name), {
                 withFileTypes: true
             });
             for (const binDirent of binDirentList){

package/dist/index.js

@@ -535,27 +535,25 @@ function relativify(path) {
 // e.g.
 // For a resolved file, if it's one of the entries,
 // aliases it as export path, such as <absolute file> -> <pkg>/<export path>
-function aliasEntries({ entry, entries, entriesAlias, format, dts }) {
-    let currentDistPath = '';
+function aliasEntries({ entry, entries, entriesAlias, format, dts, cwd }) {
     const entryAliasWithoutSelf = {
         ...entriesAlias,
         [entry]: null
     };
     const pathToRelativeDistMap = new Map();
     for (const [, exportCondition] of Object.entries(entries)){
-        var _Object_entries_find;
-        const { import: importCond, require: requireCond, default: defaultCond } = exportCondition.export;
-        const firstCond = (_Object_entries_find = Object.entries(exportCondition.export).find(([key, cond])=>key !== 'types' && cond != null)) == null ? void 0 : _Object_entries_find[1];
+        const exportDistMaps = exportCondition.export;
         if (dts) {
-            const fallbackCond = defaultCond || firstCond;
-            // For cjs, use require() instead of import
-            const firstDistPath = (format === 'cjs' ? requireCond : importCond) || fallbackCond;
-            if (firstDistPath) {
-                if (entry !== exportCondition.source) {
-                    pathToRelativeDistMap.set(exportCondition.source, firstDistPath);
-                } else {
-                    currentDistPath = firstDistPath;
-                }
+            var _Object_entries_find;
+            // Search types + [format] condition from entries map
+            // e.g. import.types, require.types
+            const typeCond = (_Object_entries_find = Object.entries(exportDistMaps).find(([composedKey, cond])=>{
+                const typesSet = new Set(composedKey.split('.'));
+                const formatCond = format === 'cjs' ? 'require' : 'import';
+                return typesSet.has('types') && typesSet.has(formatCond) && cond != null;
+            })) == null ? void 0 : _Object_entries_find[1];
+            if (typeCond) {
+                pathToRelativeDistMap.set(exportCondition.source, typeCond);
             }
         }
     }
@@ -563,23 +561,25 @@ function aliasEntries({ entry, entries, entriesAlias, format, dts }) {
         name: 'alias',
         resolveId: {
             async handler (source, importer, options) {
-                const resolvedId = await this.resolve(source, importer, options);
-                if (resolvedId != null) {
+                const resolved = await this.resolve(source, importer, options);
+                if (resolved != null) {
                     if (dts) {
                         // For types, generate relative path to the other type files,
                         // this will be compatible for the node10 ts module resolution.
-                        const aliasedId = pathToRelativeDistMap.get(resolvedId.id);
-                        if (aliasedId != null && aliasedId !== currentDistPath) {
-                            const ext = path__default.default.extname(aliasedId);
-                            const filePathBase = filePathWithoutExtension(path__default.default.relative(path__default.default.dirname(currentDistPath), aliasedId));
-                            const relativePath = relativify(filePathBase + ext);
+                        const resolvedDist = pathToRelativeDistMap.get(resolved.id);
+                        const entryDist = pathToRelativeDistMap.get(entry);
+                        if (resolved.id !== entry && entryDist && resolvedDist) {
+                            const absoluteEntryDist = path__default.default.resolve(cwd, entryDist);
+                            const absoluteResolvedDist = path__default.default.resolve(cwd, resolvedDist);
+                            const filePathBase = path__default.default.relative(path__default.default.dirname(absoluteEntryDist), absoluteResolvedDist);
+                            const relativePath = relativify(filePathBase);
                             return {
                                 id: relativePath,
                                 external: true
                             };
                         }
                     } else {
-                        const aliasedId = entryAliasWithoutSelf[resolvedId.id];
+                        const aliasedId = entryAliasWithoutSelf[resolved.id];
                         if (aliasedId != null) {
                             return {
                                 id: aliasedId
@@ -615,6 +615,23 @@ function prependDirectives() {
     };
 }
 
+const prependShebang = (entry)=>({
+        name: 'prependShebang',
+        transform: (code, id)=>{
+            if (id !== entry) return;
+            const shebang = '#!/usr/bin/env node\n';
+            if (code.startsWith(shebang)) return;
+            const magicString = new MagicString__default.default(code);
+            magicString.prepend(shebang);
+            return {
+                code: magicString.toString(),
+                map: magicString.generateMap({
+                    hires: true
+                })
+            };
+        }
+    });
+
 function collectExportPath(exportValue, exportKey, currentPath, exportTypes, exportToDist) {
     // End of searching, export value is file path.
     // <export key>: <export value> (string)
@@ -1004,7 +1021,7 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
             });
             for (const binDirent of binDirentList){
                 if (binDirent.isFile()) {
-                    const binFileAbsolutePath = path__default.default.join(binDirent.path, binDirent.name);
+                    const binFileAbsolutePath = path__default.default.join(absoluteDirPath, binDirent.name);
                     if (fs__default.default.existsSync(binFileAbsolutePath)) {
                         bins.set(normalizeExportPath(originalSubpath), binFileAbsolutePath);
                     }
@@ -1059,7 +1076,7 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
             if (isTestFile(dirent.name)) {
                 continue;
             }
-            const sourceFileAbsolutePath = path__default.default.join(dirent.path, dirent.name);
+            const sourceFileAbsolutePath = path__default.default.join(dirPath, dirent.name);
             if (isBinaryPath) {
                 bins.set(originalSubpath, sourceFileAbsolutePath);
             } else {
@@ -1202,6 +1219,7 @@ const memoizeDtsPluginByKey = memoizeByKey(createDtsPlugin);
 async function buildInputConfig(entry, bundleConfig, exportCondition, buildContext, dts) {
     var _bundleConfig_file, _bundleConfig_file1;
     const { entries, pkg, cwd, tsOptions: { tsConfigPath, tsCompilerOptions }, pluginContext } = buildContext;
+    const isBinEntry = isBinExportPath(exportCondition.name);
     const hasNoExternal = bundleConfig.external === null;
     var _bundleConfig_external;
     const externals = hasNoExternal ? [] : [
@@ -1253,13 +1271,15 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         entries,
         entriesAlias: pluginContext.entriesAlias,
         format: aliasFormat,
-        dts
+        dts,
+        cwd
     });
     const commonPlugins = [
         json__default.default(),
         sizePlugin
     ];
     const typesPlugins = [
+        aliasPlugin,
         ...commonPlugins,
         inlineCss({
             skip: true
@@ -1273,10 +1293,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         const dtsPlugin = await memoizeDtsPluginByKey(uniqueProcessId)(tsCompilerOptions, tsConfigPath, cwd);
         typesPlugins.push(dtsPlugin);
     }
-    const plugins = (dts ? [
-        ...typesPlugins,
-        aliasPlugin
-    ] : [
+    const plugins = (dts ? typesPlugins : [
         ...commonPlugins,
         preserveDirectives__default.default(),
         aliasPlugin,
@@ -1286,6 +1303,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         rawContent({
             exclude: /node_modules/
         }),
+        isBinEntry && prependShebang(entry),
         replace__default.default({
             values: inlineDefinedValues,
             preventAssignment: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "5.0.1",
+  "version": "5.1.1",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",