bunchee 4.2.0 → 4.2.1

package/dist/bin/cli.js

@@ -2,6 +2,7 @@
 var path = require('path');
 var arg = require('arg');
 var fs = require('fs/promises');
+var bunchee = require('bunchee');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -54,7 +55,7 @@ async function fileExists(filePath) {
     }
 }
 
-var version = "4.2.0";
+var version = "4.2.1";
 
 const helpMessage = `
 Usage: bunchee [options]
@@ -165,11 +166,10 @@ async function run(args) {
         return help();
     }
     const entry = source ? path__default.default.resolve(cwd, source) : '';
-    const bundle = require('../index').bundle;
     let timeStart = Date.now();
     let timeEnd;
     try {
-        await bundle(entry, bundleConfig);
+        await bunchee.bundle(entry, bundleConfig);
         timeEnd = Date.now();
     } catch (err) {
         if (err.name === 'NOT_EXISTED') {

package/dist/index.js

@@ -591,6 +591,12 @@ function getBuildEnv(envs) {
 }
 async function buildInputConfig(entry, entries, pkg, options, cwd, { tsConfigPath, tsCompilerOptions }, pluginContext, dts) {
     const entriesAlias = getEntriesAlias(entries);
+    const reversedAlias = {};
+    for (const [key, value] of Object.entries(entriesAlias)){
+        if (value !== entry) {
+            reversedAlias[value] = key;
+        }
+    }
     const hasNoExternal = options.external === null;
     var _options_external;
     const externals = hasNoExternal ? [] : [
@@ -631,12 +637,6 @@ async function buildInputConfig(entry, entries, pkg, options, cwd, { tsConfigPat
         isModule: true
     };
     const sizePlugin = pluginContext.sizeCollector.plugin(cwd);
-    const reversedAlias = {};
-    for (const [key, value] of Object.entries(entriesAlias)){
-        if (value !== entry) {
-            reversedAlias[value] = key;
-        }
-    }
     // common plugins for both dts and ts assets that need to be processed
     const commonPlugins = [
         sizePlugin,
@@ -732,7 +732,8 @@ async function buildInputConfig(entry, entries, pkg, options, cwd, { tsConfigPat
                 'MIXED_EXPORTS',
                 'PREFER_NAMED_EXPORTS',
                 'UNRESOLVED_IMPORT',
-                'THIS_IS_UNDEFINED'
+                'THIS_IS_UNDEFINED',
+                'INVALID_ANNOTATION'
             ].includes(code)) return;
             // If the circular dependency warning is from node_modules, ignore it
             if (code === 'CIRCULAR_DEPENDENCY' && /Circular dependency: node_modules/.test(warning.message)) {
@@ -754,26 +755,58 @@ function hasEsmExport(exportPaths, tsCompilerOptions) {
     }
     return Boolean(hasEsm || (tsCompilerOptions == null ? void 0 : tsCompilerOptions.esModuleInterop));
 }
-const splitChunks = (id, ctx)=>{
-    const moduleInfo = ctx.getModuleInfo(id);
-    if (!moduleInfo) {
-        return;
-    }
-    const moduleMeta = moduleInfo.meta;
-    if (!moduleMeta) {
-        return;
-    }
+function getModuleLater(moduleMeta) {
     const directives = (moduleMeta.preserveDirectives || {
         directives: []
     }).directives.map((d)=>d.replace(/^use /, '')).filter((d)=>d !== 'strict');
     const moduleLayer = directives[0];
-    if (moduleLayer && !moduleMeta.isEntry) {
-        const chunkName = path__default.default.basename(id, path__default.default.extname(id));
-        return `${chunkName}-${moduleLayer}`;
-    }
-    return;
-};
-function buildOutputConfigs(pkg, exportPaths, options, exportCondition, cwd, { tsCompilerOptions }, dts) {
+    return moduleLayer;
+}
+// dependencyGraphMap: Map<subModuleId, Set<entryParentId>>
+function createSplitChunks(dependencyGraphMap) {
+    return function splitChunks(id, ctx) {
+        const moduleInfo = ctx.getModuleInfo(id);
+        if (!moduleInfo) {
+            return;
+        }
+        const { isEntry } = moduleInfo;
+        const moduleMeta = moduleInfo.meta;
+        const moduleLayer = getModuleLater(moduleMeta);
+        // Collect the sub modules of the entry, if they're having layer, and the same layer with the entry, push them to the dependencyGraphMap.
+        if (isEntry) {
+            const subModuleIds = ctx.getModuleIds();
+            for (const subId of subModuleIds){
+                const subModuleInfo = ctx.getModuleInfo(subId);
+                if (!subModuleInfo) {
+                    continue;
+                }
+                const subModuleLayer = getModuleLater(moduleMeta);
+                if (subModuleLayer === moduleLayer) {
+                    if (!dependencyGraphMap.has(subId)) {
+                        dependencyGraphMap.set(subId, new Set());
+                    }
+                    dependencyGraphMap.get(subId).add(id);
+                }
+            }
+        }
+        // If current module has a layer, and it's not an entry
+        if (moduleLayer && !isEntry) {
+            // If the module is imported by the entry:
+            // 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)) {
+                    return;
+                }
+                const chunkName = path__default.default.basename(id, path__default.default.extname(id));
+                return `${chunkName}-${moduleLayer}`;
+            }
+        }
+        return;
+    };
+}
+function buildOutputConfigs(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);
@@ -799,7 +832,7 @@ function buildOutputConfigs(pkg, exportPaths, options, exportCondition, cwd, { t
         freeze: false,
         strict: false,
         sourcemap: options.sourcemap,
-        manualChunks: splitChunks,
+        manualChunks: createSplitChunks(pluginContext.moduleDirectiveLayerMap),
         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
@@ -911,18 +944,19 @@ async function buildConfig(entries, pkg, exportPaths, bundleConfig, exportCondit
         ...bundleConfig,
         useTypescript
     };
-    const inputOptions = await buildInputConfig(exportCondition.source, entries, pkg, options, cwd, tsOptions, pluginContext, dts);
+    const entry = exportCondition.source;
+    const inputOptions = await buildInputConfig(entry, entries, pkg, options, cwd, tsOptions, pluginContext, dts);
     const outputExports = getExportConditionDist(pkg, exportCondition, cwd);
     let outputConfigs = [];
     // Generate dts job - single config
     if (dts) {
         const typeOutputExports = getExportTypeDist(exportCondition, cwd);
-        outputConfigs = typeOutputExports.map((v)=>buildOutputConfigs(pkg, exportPaths, {
+        outputConfigs = typeOutputExports.map((typeFile)=>buildOutputConfigs(pkg, exportPaths, {
                 ...bundleConfig,
                 format: 'es',
                 useTypescript,
-                file: v
-            }, exportCondition, cwd, tsOptions, dts));
+                file: typeFile
+            }, exportCondition, cwd, tsOptions, pluginContext, dts));
     } else {
         // multi outputs with specified format
         outputConfigs = outputExports.map((exportDist)=>{
@@ -931,7 +965,7 @@ async function buildConfig(entries, pkg, exportPaths, bundleConfig, exportCondit
                 file: exportDist.file,
                 format: exportDist.format,
                 useTypescript
-            }, exportCondition, cwd, tsOptions, dts);
+            }, exportCondition, cwd, tsOptions, pluginContext, dts);
         });
         // CLI output option is always prioritized
         if (file) {
@@ -943,7 +977,7 @@ async function buildConfig(entries, pkg, exportPaths, bundleConfig, exportCondit
                     file,
                     format: bundleConfig.format || fallbackFormat,
                     useTypescript
-                }, exportCondition, cwd, tsOptions, dts)
+                }, exportCondition, cwd, tsOptions, pluginContext, dts)
             ];
         }
     }
@@ -1189,7 +1223,8 @@ async function bundle(entryPath, { cwd: _cwd, ...options } = {}) {
         entries
     });
     const pluginContext = {
-        sizeCollector
+        sizeCollector,
+        moduleDirectiveLayerMap: new Map()
     };
     const buildConfigs = await buildEntryConfig(entries, pkg, exportPaths, options, cwd, defaultTsOptions, pluginContext, false);
     const assetsJobs = buildConfigs.map((rollupConfig)=>bundleOrWatch(rollupConfig));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -86,7 +86,8 @@
     "prettier": "^3.0.0",
     "react": "^18.2.0",
     "tsx": "^4.6.2",
-    "typescript": "^5.3.2"
+    "typescript": "^5.3.2",
+    "bunchee": "link:./"
   },
   "lint-staged": {
     "*.{ts,tsx,js,jsx,md,json,yml}": "prettier --write"