bunchee 4.2.2 → 4.2.4

package/dist/bin/cli.js

@@ -2,6 +2,7 @@
 var path = require('path');
 var arg = require('arg');
 var fs = require('fs/promises');
+var require$$0 = require('tty');
 var bunchee = require('bunchee');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -9,6 +10,59 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var path__default = /*#__PURE__*/_interopDefault(path);
 var arg__default = /*#__PURE__*/_interopDefault(arg);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
+var require$$0__default = /*#__PURE__*/_interopDefault(require$$0);
+
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+
+var picocolors = {exports: {}};
+
+let tty = require$$0__default.default;
+let isColorSupported = !("NO_COLOR" in process.env || process.argv.includes("--no-color")) && ("FORCE_COLOR" in process.env || process.argv.includes("--color") || process.platform === "win32" || tty.isatty(1) && process.env.TERM !== "dumb" || "CI" in process.env);
+let formatter = (open, close, replace = open)=>(input)=>{
+        let string = "" + input;
+        let index = string.indexOf(close, open.length);
+        return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close;
+    };
+let replaceClose = (string, close, replace, index)=>{
+    let start = string.substring(0, index) + replace;
+    let end = string.substring(index + close.length);
+    let nextIndex = end.indexOf(close);
+    return ~nextIndex ? start + replaceClose(end, close, replace, nextIndex) : start + end;
+};
+let createColors = (enabled = isColorSupported)=>({
+        isColorSupported: enabled,
+        reset: enabled ? (s)=>`\x1b[0m${s}\x1b[0m` : String,
+        bold: enabled ? formatter("\x1b[1m", "\x1b[22m", "\x1b[22m\x1b[1m") : String,
+        dim: enabled ? formatter("\x1b[2m", "\x1b[22m", "\x1b[22m\x1b[2m") : String,
+        italic: enabled ? formatter("\x1b[3m", "\x1b[23m") : String,
+        underline: enabled ? formatter("\x1b[4m", "\x1b[24m") : String,
+        inverse: enabled ? formatter("\x1b[7m", "\x1b[27m") : String,
+        hidden: enabled ? formatter("\x1b[8m", "\x1b[28m") : String,
+        strikethrough: enabled ? formatter("\x1b[9m", "\x1b[29m") : String,
+        black: enabled ? formatter("\x1b[30m", "\x1b[39m") : String,
+        red: enabled ? formatter("\x1b[31m", "\x1b[39m") : String,
+        green: enabled ? formatter("\x1b[32m", "\x1b[39m") : String,
+        yellow: enabled ? formatter("\x1b[33m", "\x1b[39m") : String,
+        blue: enabled ? formatter("\x1b[34m", "\x1b[39m") : String,
+        magenta: enabled ? formatter("\x1b[35m", "\x1b[39m") : String,
+        cyan: enabled ? formatter("\x1b[36m", "\x1b[39m") : String,
+        white: enabled ? formatter("\x1b[37m", "\x1b[39m") : String,
+        gray: enabled ? formatter("\x1b[90m", "\x1b[39m") : String,
+        bgBlack: enabled ? formatter("\x1b[40m", "\x1b[49m") : String,
+        bgRed: enabled ? formatter("\x1b[41m", "\x1b[49m") : String,
+        bgGreen: enabled ? formatter("\x1b[42m", "\x1b[49m") : String,
+        bgYellow: enabled ? formatter("\x1b[43m", "\x1b[49m") : String,
+        bgBlue: enabled ? formatter("\x1b[44m", "\x1b[49m") : String,
+        bgMagenta: enabled ? formatter("\x1b[45m", "\x1b[49m") : String,
+        bgCyan: enabled ? formatter("\x1b[46m", "\x1b[49m") : String,
+        bgWhite: enabled ? formatter("\x1b[47m", "\x1b[49m") : String
+    });
+picocolors.exports = createColors();
+picocolors.exports.createColors = createColors;
+var picocolorsExports = picocolors.exports;
+var pc = /*@__PURE__*/ getDefaultExportFromCjs(picocolorsExports);
 
 const logger = {
     log (...arg) {
@@ -24,12 +78,18 @@ const logger = {
         console.log(' ✓', ...arg);
     }
 };
+function paint(prefix, prefixColor, ...arg) {
+    if (pc.isColorSupported) {
+        console.log(' ' + pc[prefixColor](prefix), ...arg);
+    } else {
+        console.log(' ' + prefix, ...arg);
+    }
+}
 
 function exit(err) {
     logger.error(err);
     process.exit(1);
 }
-const formatDuration = (duration)=>duration >= 1000 ? `${duration / 1000}s` : `${duration}ms`;
 async function hasPackageJson(cwd) {
     return await fileExists(path__default.default.resolve(cwd, 'package.json'));
 }
@@ -55,7 +115,7 @@ async function fileExists(filePath) {
     }
 }
 
-var version = "4.2.2";
+var version = "4.2.4";
 
 const helpMessage = `
 Usage: bunchee [options]
@@ -166,11 +226,8 @@ async function run(args) {
         return help();
     }
     const entry = source ? path__default.default.resolve(cwd, source) : '';
-    let timeStart = Date.now();
-    let timeEnd;
     try {
         await bunchee.bundle(entry, bundleConfig);
-        timeEnd = Date.now();
     } catch (err) {
         if (err.name === 'NOT_EXISTED') {
             help();
@@ -178,14 +235,14 @@ async function run(args) {
         }
         throw err;
     }
-    const duration = timeEnd - timeStart;
     // watching mode
     if (watch) {
         logger.log(`Watching assets in ${cwd}...`);
         return;
     }
     // build mode
-    logger.info(`Finished in ${formatDuration(duration)}`);
+    console.log();
+    paint('✓', 'green', `bunchee ${version} build completed`);
     await lintPackage(cwd);
 }
 async function main() {

package/dist/index.js

@@ -12,6 +12,7 @@ var replace = require('@rollup/plugin-replace');
 var esmShim = require('@rollup/plugin-esm-shim');
 var preserveDirectives = require('rollup-preserve-directives');
 var pluginutils = require('@rollup/pluginutils');
+var require$$0 = require('tty');
 var prettyBytes = require('pretty-bytes');
 var module$1 = require('module');
 
@@ -24,6 +25,7 @@ var json__default = /*#__PURE__*/_interopDefault(json);
 var replace__default = /*#__PURE__*/_interopDefault(replace);
 var esmShim__default = /*#__PURE__*/_interopDefault(esmShim);
 var preserveDirectives__default = /*#__PURE__*/_interopDefault(preserveDirectives);
+var require$$0__default = /*#__PURE__*/_interopDefault(require$$0);
 var prettyBytes__default = /*#__PURE__*/_interopDefault(prettyBytes);
 
 function minifyCSS(content) {
@@ -200,6 +202,58 @@ const dtsExtensions = {
     mjs: '.d.mts'
 };
 
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+
+var picocolors = {exports: {}};
+
+let tty = require$$0__default.default;
+let isColorSupported = !("NO_COLOR" in process.env || process.argv.includes("--no-color")) && ("FORCE_COLOR" in process.env || process.argv.includes("--color") || process.platform === "win32" || tty.isatty(1) && process.env.TERM !== "dumb" || "CI" in process.env);
+let formatter = (open, close, replace = open)=>(input)=>{
+        let string = "" + input;
+        let index = string.indexOf(close, open.length);
+        return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close;
+    };
+let replaceClose = (string, close, replace, index)=>{
+    let start = string.substring(0, index) + replace;
+    let end = string.substring(index + close.length);
+    let nextIndex = end.indexOf(close);
+    return ~nextIndex ? start + replaceClose(end, close, replace, nextIndex) : start + end;
+};
+let createColors = (enabled = isColorSupported)=>({
+        isColorSupported: enabled,
+        reset: enabled ? (s)=>`\x1b[0m${s}\x1b[0m` : String,
+        bold: enabled ? formatter("\x1b[1m", "\x1b[22m", "\x1b[22m\x1b[1m") : String,
+        dim: enabled ? formatter("\x1b[2m", "\x1b[22m", "\x1b[22m\x1b[2m") : String,
+        italic: enabled ? formatter("\x1b[3m", "\x1b[23m") : String,
+        underline: enabled ? formatter("\x1b[4m", "\x1b[24m") : String,
+        inverse: enabled ? formatter("\x1b[7m", "\x1b[27m") : String,
+        hidden: enabled ? formatter("\x1b[8m", "\x1b[28m") : String,
+        strikethrough: enabled ? formatter("\x1b[9m", "\x1b[29m") : String,
+        black: enabled ? formatter("\x1b[30m", "\x1b[39m") : String,
+        red: enabled ? formatter("\x1b[31m", "\x1b[39m") : String,
+        green: enabled ? formatter("\x1b[32m", "\x1b[39m") : String,
+        yellow: enabled ? formatter("\x1b[33m", "\x1b[39m") : String,
+        blue: enabled ? formatter("\x1b[34m", "\x1b[39m") : String,
+        magenta: enabled ? formatter("\x1b[35m", "\x1b[39m") : String,
+        cyan: enabled ? formatter("\x1b[36m", "\x1b[39m") : String,
+        white: enabled ? formatter("\x1b[37m", "\x1b[39m") : String,
+        gray: enabled ? formatter("\x1b[90m", "\x1b[39m") : String,
+        bgBlack: enabled ? formatter("\x1b[40m", "\x1b[49m") : String,
+        bgRed: enabled ? formatter("\x1b[41m", "\x1b[49m") : String,
+        bgGreen: enabled ? formatter("\x1b[42m", "\x1b[49m") : String,
+        bgYellow: enabled ? formatter("\x1b[43m", "\x1b[49m") : String,
+        bgBlue: enabled ? formatter("\x1b[44m", "\x1b[49m") : String,
+        bgMagenta: enabled ? formatter("\x1b[45m", "\x1b[49m") : String,
+        bgCyan: enabled ? formatter("\x1b[46m", "\x1b[49m") : String,
+        bgWhite: enabled ? formatter("\x1b[47m", "\x1b[49m") : String
+    });
+picocolors.exports = createColors();
+picocolors.exports.createColors = createColors;
+var picocolorsExports = picocolors.exports;
+var pc = /*@__PURE__*/ getDefaultExportFromCjs(picocolorsExports);
+
 const logger = {
     log (...arg) {
         console.log('  ', ...arg);
@@ -214,6 +268,13 @@ const logger = {
         console.log(' ✓', ...arg);
     }
 };
+function paint(prefix, prefixColor, ...arg) {
+    if (pc.isColorSupported) {
+        console.log(' ' + pc[prefixColor](prefix), ...arg);
+    } else {
+        console.log(' ' + prefix, ...arg);
+    }
+}
 
 function exit(err) {
     logger.error(err);
@@ -309,13 +370,13 @@ function constructFullExportCondition(exportCondition, packageType) {
             [isEsmPkg ? 'import' : 'require']: exportCondition
         };
     } else {
-        const keys = Object.keys(exportCondition);
+        const exportTypes = Object.keys(exportCondition);
         fullExportCond = {};
-        keys.forEach((key)=>{
-            const condition = exportCondition[key];
+        exportTypes.forEach((exportType)=>{
+            const condition = exportCondition[exportType];
             // Filter out nullable value
-            if (key in exportCondition && condition) {
-                fullExportCond[key] = condition;
+            if (condition) {
+                fullExportCond[exportType] = condition;
             }
         });
     }
@@ -323,22 +384,36 @@ function constructFullExportCondition(exportCondition, packageType) {
 }
 function joinRelativePath(...segments) {
     let result = path.join(...segments);
-    // If the first segment starts with './', ensure the result does too.
-    if (segments[0] === '.' && !result.startsWith('./')) {
+    // If the first segment starts with '.', ensure the result does too.
+    if (segments[0] === '.' && !result.startsWith('.')) {
         result = './' + result;
     }
     return result;
 }
-function findExport(name, exportCondition, paths, packageType) {
-    // TODO: handle export condition based on package.type
+function findExport(exportPath, exportCondition, paths, packageType) {
     if (isExportLike(exportCondition)) {
-        paths[name] = constructFullExportCondition(exportCondition, packageType);
+        const fullExportCondition = constructFullExportCondition(exportCondition, packageType);
+        paths[exportPath] = {
+            ...paths[exportPath],
+            ...fullExportCondition
+        };
         return;
     }
     Object.keys(exportCondition).forEach((subpath)=>{
-        const nextName = joinRelativePath(name, subpath);
-        const nestedExportCondition = exportCondition[subpath];
-        findExport(nextName, nestedExportCondition, paths, packageType);
+        if (subpath.startsWith('.')) {
+            // subpath is actual export path, ./a, ./b, ...
+            const nestedExportPath = joinRelativePath(exportPath, subpath);
+            const nestedExportCondition = exportCondition[subpath];
+            findExport(nestedExportPath, nestedExportCondition, paths, packageType);
+        } else {
+            // subpath is exportType, import, require, ...
+            const exportType = subpath;
+            const defaultPath = exportCondition[subpath].default;
+            const nestedExportCondition = {
+                [exportType]: defaultPath
+            };
+            findExport(exportPath, nestedExportCondition, paths, packageType);
+        }
     });
 }
 /**
@@ -348,11 +423,10 @@ function findExport(name, exportCondition, paths, packageType) {
  *
  * Input:
  * {
- *   ".": {
- *     "sub": {
- *       "import": "./sub.js",
- *       "require": "./sub.cjs",
- *       "types": "./sub.d.ts
+ *   "./sub": {
+ *     "import": {
+ *       "types": "./sub.js",
+ *       "default": "./sub.cjs",
  *     }
  *   }
  * }
@@ -362,7 +436,7 @@ function findExport(name, exportCondition, paths, packageType) {
  *   "./sub": {
  *     "import": "./sub.js",
  *     "require": "./sub.cjs",
- *     "types": "./sub.d.ts,
+ *     "types": "./sub.d.ts",
  *   }
  * }
  *
@@ -510,8 +584,7 @@ function isCjsExportName(pkg, name, ext) {
     return !isESModule && [
         'require',
         'main',
-        'node',
-        'default'
+        'node'
     ].includes(name) && ext !== 'mjs' || ext === 'cjs';
 }
 function getExportConditionDist(pkg, parsedExportCondition, cwd) {
@@ -542,7 +615,6 @@ function getExportConditionDist(pkg, parsedExportCondition, cwd) {
         });
     }
     if (dist.length === 0 && !pkg.bin) {
-        console.error(`Doesn't fin any exports in ${pkg.name}, using default dist path dist/index.js`);
         const defaultFormat = isESModulePackage(pkg.type) ? 'esm' : 'cjs';
         dist.push({
             format: defaultFormat,
@@ -763,7 +835,9 @@ function getModuleLater(moduleMeta) {
     return moduleLayer;
 }
 // dependencyGraphMap: Map<subModuleId, Set<entryParentId>>
-function createSplitChunks(dependencyGraphMap) {
+function createSplitChunks(dependencyGraphMap, entryFiles) {
+    // If there's existing chunk being splitted, and contains a layer { <id>: <chunkGroup> }
+    const splitChunksGroupMap = new Map();
     return function splitChunks(id, ctx) {
         const moduleInfo = ctx.getModuleInfo(id);
         if (!moduleInfo) {
@@ -785,7 +859,10 @@ function createSplitChunks(dependencyGraphMap) {
                     if (!dependencyGraphMap.has(subId)) {
                         dependencyGraphMap.set(subId, new Set());
                     }
-                    dependencyGraphMap.get(subId).add(id);
+                    dependencyGraphMap.get(subId).add([
+                        id,
+                        moduleLayer
+                    ]);
                 }
             }
         }
@@ -795,18 +872,34 @@ function createSplitChunks(dependencyGraphMap) {
             // when the module layer is same as entry layer, keep it as part of entry and don't split it;
             // when the module layer is different from entry layer, split the module into a separate chunk as a separate boundary.
             if (dependencyGraphMap.has(id)) {
-                const parentModuleLayers = Array.from(dependencyGraphMap.get(id));
-                if (parentModuleLayers.every((layer)=>layer === moduleLayer)) {
+                const parentModuleIds = Array.from(dependencyGraphMap.get(id));
+                const isImportFromOtherEntry = parentModuleIds.some(([id])=>{
+                    // If other entry is dependency of this entry
+                    if (entryFiles.has(id)) {
+                        const entryModuleInfo = ctx.getModuleInfo(id);
+                        const entryModuleLayer = getModuleLater(entryModuleInfo ? entryModuleInfo.meta : {});
+                        return entryModuleLayer === moduleLayer;
+                    }
+                    return false;
+                });
+                if (isImportFromOtherEntry) return;
+                const isPartOfCurrentEntry = parentModuleIds.every(([, layer])=>layer === moduleLayer);
+                if (isPartOfCurrentEntry) {
+                    if (splitChunksGroupMap.has(id)) {
+                        return splitChunksGroupMap.get(id);
+                    }
                     return;
                 }
                 const chunkName = path__default.default.basename(id, path__default.default.extname(id));
-                return `${chunkName}-${moduleLayer}`;
+                const chunkGroup = `${chunkName}-${moduleLayer}`;
+                splitChunksGroupMap.set(id, chunkGroup);
+                return chunkGroup;
             }
         }
         return;
     };
 }
-function buildOutputConfigs(pkg, exportPaths, options, exportCondition, cwd, { tsCompilerOptions }, pluginContext, dts) {
+function buildOutputConfigs(entries, pkg, exportPaths, options, exportCondition, cwd, { tsCompilerOptions }, pluginContext, dts) {
     const { format } = options;
     // Add esm mark and interop helper if esm export is detected
     const useEsModuleMark = hasEsmExport(exportPaths, tsCompilerOptions);
@@ -820,6 +913,7 @@ function buildOutputConfigs(pkg, exportPaths, options, exportCondition, cwd, { t
         dir: dtsFile ? path.dirname(dtsFile) : dtsDir
     };
     const outputFile = dtsFile || file;
+    const entryFiles = new Set(Object.values(entries).map((entry)=>entry.source));
     return {
         name: pkg.name || name,
         ...dts ? dtsPathConfig : {
@@ -832,7 +926,7 @@ function buildOutputConfigs(pkg, exportPaths, options, exportCondition, cwd, { t
         freeze: false,
         strict: false,
         sourcemap: options.sourcemap,
-        manualChunks: createSplitChunks(pluginContext.moduleDirectiveLayerMap),
+        manualChunks: createSplitChunks(pluginContext.moduleDirectiveLayerMap, entryFiles),
         chunkFileNames: '[name]-[hash].js',
         // By default in rollup, when creating multiple chunks, transitive imports of entry chunks
         // will be added as empty imports to the entry chunks. Disable to avoid imports hoist outside of boundaries
@@ -951,7 +1045,7 @@ async function buildConfig(entries, pkg, exportPaths, bundleConfig, exportCondit
     // Generate dts job - single config
     if (dts) {
         const typeOutputExports = getExportTypeDist(exportCondition, cwd);
-        outputConfigs = typeOutputExports.map((typeFile)=>buildOutputConfigs(pkg, exportPaths, {
+        outputConfigs = typeOutputExports.map((typeFile)=>buildOutputConfigs(entries, pkg, exportPaths, {
                 ...bundleConfig,
                 format: 'es',
                 useTypescript,
@@ -960,7 +1054,7 @@ async function buildConfig(entries, pkg, exportPaths, bundleConfig, exportCondit
     } else {
         // multi outputs with specified format
         outputConfigs = outputExports.map((exportDist)=>{
-            return buildOutputConfigs(pkg, exportPaths, {
+            return buildOutputConfigs(entries, pkg, exportPaths, {
                 ...bundleConfig,
                 file: exportDist.file,
                 format: exportDist.format,
@@ -972,7 +1066,7 @@ async function buildConfig(entries, pkg, exportPaths, bundleConfig, exportCondit
             var _outputExports_;
             const fallbackFormat = (_outputExports_ = outputExports[0]) == null ? void 0 : _outputExports_.format;
             outputConfigs = [
-                buildOutputConfigs(pkg, exportPaths, {
+                buildOutputConfigs(entries, pkg, exportPaths, {
                     ...bundleConfig,
                     file,
                     format: bundleConfig.format || fallbackFormat,
@@ -1022,7 +1116,7 @@ function createChunkSizeCollector({ entries }) {
                         const sourceFileName = chunk.facadeModuleId || '';
                         const exportPath = reversedMapping.get(sourceFileName) || '.';
                         addSize({
-                            fileName: filePath.startsWith(cwd) ? path__default.default.relative(cwd, filePath) : filePath,
+                            fileName: path__default.default.isAbsolute(cwd) ? path__default.default.relative(cwd, filePath) : filePath,
                             size,
                             sourceFileName,
                             exportPath
@@ -1046,9 +1140,10 @@ function logSizeStats(sizeCollector) {
         filesList.forEach((item)=>{
             const [filename, , size] = item;
             const padding = ' '.repeat(maxLength - filename.length);
-            const action = dtsExtensionRegex.test(filename) ? 'Typed' : 'Built';
+            const isTypeFile = dtsExtensionRegex.test(filename);
+            const action = isTypeFile ? '[types]' : '[chunk]';
             const prettiedSize = prettyBytes__default.default(size);
-            logger.info(`${action} ${filename}${padding} - ${prettiedSize}`);
+            paint('  ' + action, isTypeFile ? 'blue' : 'white', `${filename}${padding}  - ${prettiedSize}`);
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -82,14 +82,15 @@
     "@swc/types": "^0.1.5",
     "@types/jest": "29.0.0",
     "@types/node": "^20.4.1",
+    "bunchee": "link:./",
     "husky": "^8.0.3",
     "jest": "29.0.1",
     "lint-staged": "^13.2.3",
+    "picocolors": "^1.0.0",
     "prettier": "^3.0.0",
     "react": "^18.2.0",
     "tsx": "^4.6.2",
-    "typescript": "^5.3.2",
-    "bunchee": "link:./"
+    "typescript": "^5.3.2"
   },
   "lint-staged": {
     "*.{ts,tsx,js,jsx,md,json,yml}": "prettier --write"