bunchee 5.0.0-beta.1 → 5.0.0-beta.2

package/README.md

@@ -44,7 +44,7 @@ mkdir src && touch ./src/index.ts
 
 ```sh
 # Use bunchee to prepare package.json configuration
-npm bunchee --prepare
+npm exec bunchee --prepare
 # "If you're using other package manager such as pnpm"
 # pnpm bunchee --prepare
 

package/dist/bin/cli.js

@@ -189,9 +189,10 @@ function collectExportPath(exportValue, exportKey, currentPath, exportTypes, exp
     // End of searching, export value is file path.
     // <export key>: <export value> (string)
     if (typeof exportValue === 'string') {
-        exportTypes.add(exportKey.startsWith('./') ? 'default' : exportKey);
+        const composedTypes = new Set(exportTypes);
+        composedTypes.add(exportKey.startsWith('.') ? 'default' : exportKey);
         const exportInfo = exportToDist.get(currentPath);
-        const exportCondition = Array.from(exportTypes).join('.');
+        const exportCondition = Array.from(composedTypes).join('.');
         if (!exportInfo) {
             const outputConditionPair = [
                 exportValue,
@@ -254,6 +255,9 @@ function collectExportPath(exportValue, exportKey, currentPath, exportTypes, exp
             const exportTypes = new Set();
             const isExportPath = exportKey.startsWith('.');
             const childPath = isExportPath ? joinRelativePath(currentPath, exportKey) : currentPath;
+            if (!isExportPath) {
+                exportTypes.add(exportKey);
+            }
             collectExportPath(exportValue, exportKey, childPath, exportTypes, exportToDist);
         }
     }
@@ -279,14 +283,15 @@ function collectExportPath(exportValue, exportKey, currentPath, exportTypes, exp
             ]);
         }
     }
-    if (pkg.main || pkg.module) {
+    // Handle package.json global exports fields
+    if (pkg.main || pkg.module || pkg.types) {
         const mainExportPath = pkg.main;
         const moduleExportPath = pkg.module;
         const typesEntryPath = pkg.types;
         const existingExportInfo = exportToDist.get('.');
         exportToDist.set('.', [
             ...existingExportInfo || [],
-            [
+            Boolean(mainExportPath) && [
                 mainExportPath,
                 getMainFieldExportType(pkg)
             ],
@@ -453,7 +458,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "5.0.0-beta.1";
+var version = "5.0.0-beta.2";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
@@ -495,7 +500,7 @@ function getExportTypeFromExportTypes(types) {
     new Set(types).forEach((value)=>{
         if (specialExportConventions.has(value)) {
             exportType = value;
-        } else if (value === 'import' || value === 'require') {
+        } else if (value === 'import' || value === 'require' || value === 'types') {
             exportType = value;
         }
     });

package/dist/index.js

@@ -601,9 +601,10 @@ function collectExportPath(exportValue, exportKey, currentPath, exportTypes, exp
     // End of searching, export value is file path.
     // <export key>: <export value> (string)
     if (typeof exportValue === 'string') {
-        exportTypes.add(exportKey.startsWith('./') ? 'default' : exportKey);
+        const composedTypes = new Set(exportTypes);
+        composedTypes.add(exportKey.startsWith('.') ? 'default' : exportKey);
         const exportInfo = exportToDist.get(currentPath);
-        const exportCondition = Array.from(exportTypes).join('.');
+        const exportCondition = Array.from(composedTypes).join('.');
         if (!exportInfo) {
             const outputConditionPair = [
                 exportValue,
@@ -666,6 +667,9 @@ function collectExportPath(exportValue, exportKey, currentPath, exportTypes, exp
             const exportTypes = new Set();
             const isExportPath = exportKey.startsWith('.');
             const childPath = isExportPath ? joinRelativePath(currentPath, exportKey) : currentPath;
+            if (!isExportPath) {
+                exportTypes.add(exportKey);
+            }
             collectExportPath(exportValue, exportKey, childPath, exportTypes, exportToDist);
         }
     }
@@ -691,14 +695,15 @@ function collectExportPath(exportValue, exportKey, currentPath, exportTypes, exp
             ]);
         }
     }
-    if (pkg.main || pkg.module) {
+    // Handle package.json global exports fields
+    if (pkg.main || pkg.module || pkg.types) {
         const mainExportPath = pkg.main;
         const moduleExportPath = pkg.module;
         const typesEntryPath = pkg.types;
         const existingExportInfo = exportToDist.get('.');
         exportToDist.set('.', [
             ...existingExportInfo || [],
-            [
+            Boolean(mainExportPath) && [
                 mainExportPath,
                 getMainFieldExportType(pkg)
             ],
@@ -729,12 +734,21 @@ function isCjsExportName(pkg, exportCondition, ext) {
     const isNotEsmExportName = !isEsmExportName(exportCondition, ext);
     return !isESModule && isNotEsmExportName && (ext !== 'mjs' || isCjsCondition) || ext === 'cjs';
 }
-function getExportsDistFilesOfCondition(pkg, parsedExportCondition, cwd) {
+function getFileExportType(composedTypes) {
+    return composedTypes.split('.').pop();
+}
+function getExportsDistFilesOfCondition(pkg, parsedExportCondition, cwd, dts) {
     const dist = [];
     const exportConditionNames = Object.keys(parsedExportCondition.export);
     const uniqueFiles = new Set();
     for (const exportCondition of exportConditionNames){
-        if (exportCondition === 'types') {
+        const exportType = getFileExportType(exportCondition);
+        // Filter out non-types field when generating types jobs
+        if (dts && exportType !== 'types') {
+            continue;
+        }
+        // Filter out types field when generating asset jobs
+        if (!dts && exportType === 'types') {
             continue;
         }
         const filePath = parsedExportCondition.export[exportCondition];
@@ -911,7 +925,7 @@ function getExportTypeFromExportTypes(types) {
     new Set(types).forEach((value)=>{
         if (specialExportConventions.has(value)) {
             exportType = value;
-        } else if (value === 'import' || value === 'require') {
+        } else if (value === 'import' || value === 'require' || value === 'types') {
             exportType = value;
         }
     });
@@ -1018,7 +1032,9 @@ async function collectSourceEntries(sourceFolderPath) {
 }
 
 const swcMinifyOptions = {
-    compress: true,
+    compress: {
+        directives: false
+    },
     format: {
         comments: 'some'
     },
@@ -1189,7 +1205,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
             if (dts && code === 'EMPTY_BUNDLE') return;
             if (disabledWarnings.has(code)) return;
             // If the circular dependency warning is from node_modules, ignore it
-            if (code === 'CIRCULAR_DEPENDENCY' && /Circular dependency: node_modules/.test(warning.message)) {
+            if (code === 'CIRCULAR_DEPENDENCY' && /Circular dependency:(\s|\S)*node_modules/.test(warning.message)) {
                 return;
             }
             warn(warning);
@@ -1203,6 +1219,18 @@ function getModuleLater(moduleMeta) {
     const moduleLayer = directives[0];
     return moduleLayer;
 }
+function getCustomModuleLayer(moduleId) {
+    const segments = path__default.default.basename(moduleId).split('.');
+    if (segments.length >= 2) {
+        const [layerSegment, ext] = segments.slice(-2);
+        const match = layerSegment.match(/^(\w+)-runtime$/);
+        const layer = match && match[1];
+        if (availableExtensions.has(ext) && layer && layer.length > 0) {
+            return layer;
+        }
+    }
+    return undefined;
+}
 // dependencyGraphMap: Map<subModuleId, Set<entryParentId>>
 function createSplitChunks(dependencyGraphMap, entryFiles) {
     // If there's existing chunk being splitted, and contains a layer { <id>: <chunkGroup> }
@@ -1235,6 +1263,15 @@ function createSplitChunks(dependencyGraphMap, entryFiles) {
                 }
             }
         }
+        if (!isEntry) {
+            const cachedCustomModuleLayer = splitChunksGroupMap.get(id);
+            if (cachedCustomModuleLayer) return cachedCustomModuleLayer;
+            const customModuleLayer = getCustomModuleLayer(id);
+            if (customModuleLayer) {
+                splitChunksGroupMap.set(id, customModuleLayer);
+                return customModuleLayer;
+            }
+        }
         // If current module has a layer, and it's not an entry
         if (moduleLayer && !isEntry) {
             // If the module is imported by the entry:
@@ -1323,7 +1360,7 @@ async function buildConfig(bundleConfig, exportCondition, pluginContext, dts) {
     const { file } = bundleConfig;
     const { pkg, cwd } = pluginContext;
     const entry = exportCondition.source;
-    const outputExports = getExportsDistFilesOfCondition(pkg, exportCondition, cwd);
+    const outputExports = getExportsDistFilesOfCondition(pkg, exportCondition, cwd, dts);
     // If there's nothing found, give a default output
     if (outputExports.length === 0 && !pkg.bin) {
         const isEsmPkg = isESModulePackage(pkg.type);
@@ -1335,44 +1372,52 @@ async function buildConfig(bundleConfig, exportCondition, pluginContext, dts) {
         });
     }
     let bundleOptions = [];
-    // multi outputs with specified format
-    // CLI output option is always prioritized
     if (file) {
-        const fallbackExport = outputExports[0];
-        bundleOptions = [
-            {
-                file: path.resolve(cwd, file),
-                format: bundleConfig.format || fallbackExport.format,
-                exportCondition: fallbackExport.exportCondition
-            }
-        ];
+        const absoluteFile = path.resolve(cwd, file);
+        const absoluteTypeFile = getExportFileTypePath(absoluteFile);
+        if (dts) {
+            bundleOptions = [
+                {
+                    file: absoluteTypeFile,
+                    format: 'esm',
+                    exportCondition: 'types'
+                }
+            ];
+        } else {
+            const fallbackExport = outputExports[0];
+            bundleOptions = [
+                {
+                    file: absoluteFile,
+                    format: bundleConfig.format || fallbackExport.format,
+                    exportCondition: fallbackExport.exportCondition
+                }
+            ];
+        }
     } else {
-        bundleOptions = outputExports.map((exportDist)=>{
-            return {
-                file: path.resolve(cwd, exportDist.file),
-                format: exportDist.format,
-                exportCondition: exportDist.exportCondition
-            };
-        });
-    }
-    if (dts) {
-        // types could have duplicates, dedupe them
-        // e.g. { types, import, .. } use the same `types` condition with all conditions
-        const uniqTypes = new Set();
-        bundleOptions.forEach((bundleOption)=>{
-            if (exportCondition.export.types) {
-                uniqTypes.add(path.resolve(cwd, exportCondition.export.types));
-            }
-            const typeForExtension = getExportFileTypePath(bundleOption.file);
-            uniqTypes.add(typeForExtension);
-        });
-        bundleOptions = Array.from(uniqTypes).map((typeFile)=>{
-            return {
-                file: typeFile,
-                format: 'esm',
-                exportCondition: 'types'
-            };
-        });
+        // CLI output option is always prioritized
+        if (dts) {
+            // types could have duplicates, dedupe them
+            // e.g. { types, import, .. } use the same `types` condition with all conditions
+            const uniqTypes = new Set();
+            outputExports.forEach((exportDist)=>{
+                uniqTypes.add(path.resolve(cwd, exportDist.file));
+            });
+            bundleOptions = Array.from(uniqTypes).map((typeFile)=>{
+                return {
+                    file: typeFile,
+                    format: 'esm',
+                    exportCondition: 'types'
+                };
+            });
+        } else {
+            bundleOptions = outputExports.map((exportDist)=>{
+                return {
+                    file: path.resolve(cwd, exportDist.file),
+                    format: exportDist.format,
+                    exportCondition: exportDist.exportCondition
+                };
+            });
+        }
     }
     const outputConfigs = bundleOptions.map(async (bundleOption)=>{
         const targetExportCondition = {
@@ -1394,17 +1439,21 @@ async function buildConfig(bundleConfig, exportCondition, pluginContext, dts) {
 const removeScope = (exportPath)=>exportPath.replace(/^@[^/]+\//, '');
 function createOutputState({ entries }) {
     const sizeStats = new Map();
+    const uniqFiles = new Set();
     function addSize({ fileName, size, sourceFileName, exportPath }) {
         if (!sizeStats.has(exportPath)) {
             sizeStats.set(exportPath, []);
         }
         const distFilesStats = sizeStats.get(exportPath);
-        if (distFilesStats) {
-            distFilesStats.push([
-                fileName,
-                sourceFileName,
-                size
-            ]);
+        if (!uniqFiles.has(fileName)) {
+            uniqFiles.add(fileName);
+            if (distFilesStats) {
+                distFilesStats.push([
+                    fileName,
+                    sourceFileName,
+                    size
+                ]);
+            }
         }
     }
     const reversedMapping = new Map();
@@ -1458,9 +1507,6 @@ function normalizeExportName(exportName) {
     }
     return result;
 }
-function getExportNameWithoutExportCondition(exportName) {
-    return exportName.includes('.') ? exportName.split('.')[0] : exportName;
-}
 function logOutputState(sizeCollector) {
     const stats = sizeCollector.getSizeStats();
     if (stats.size === 0) {
@@ -1472,7 +1518,7 @@ function logOutputState(sizeCollector) {
     const statsArray = [
         ...stats.entries()
     ].sort(([a], [b])=>{
-        const comp = getExportNameWithoutExportCondition(a).length - getExportNameWithoutExportCondition(b).length;
+        const comp = normalizeExportPath(a).length - normalizeExportPath(b).length;
         return comp === 0 ? a.localeCompare(b) : comp;
     });
     const maxLengthOfExportName = Math.max(...statsArray.map(([exportName])=>normalizeExportName(exportName).length));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -110,7 +110,7 @@
     "test:update": "TEST_UPDATE_SNAPSHOT=1 pnpm test",
     "test:post": "POST_BUILD=1 pnpm jest test/compile.test.ts test/integration.test.ts",
     "clean": "rm -rf ./dist",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc --noEmit && tsc -p test/tsconfig.json --noEmit",
     "build": "tsx ./src/bin/index.ts --runtime node",
     "format": "prettier --write ."
   }

package/dist/bin/cli.d.ts

@@ -1 +0,0 @@
-#!/usr/bin/env node