bunchee 6.0.4 → 6.1.0

package/dist/bin/cli.js

@@ -74,6 +74,7 @@ const DEFAULT_TS_CONFIG = {
     }
 };
 const BINARY_TAG = '$binary';
+const PRIVATE_GLOB_PATTERN = '**/_*/**';
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -158,6 +159,36 @@ function posixRelativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
 }
 
+// Example: ./src/util/foo.development.ts -> foo.development
+// Example: ./src/util/foo.react-server.ts -> foo.react-server
+const baseNameWithoutExtension = (filePath)=>{
+    return path__default.default.basename(filePath, path__default.default.extname(filePath));
+};
+function validateEntryFiles(entryFiles) {
+    const fileBasePaths = new Set();
+    const duplicatePaths = new Set();
+    for (const filePath of entryFiles){
+        // Check if there are multiple files with the same base name
+        const filePathWithoutExt = filePath.slice(0, -path__default.default.extname(filePath).length).replace(/\\/g, '/');
+        const segments = filePathWithoutExt.split('/');
+        const lastSegment = segments.pop() || '';
+        if (lastSegment !== 'index' && lastSegment !== '') {
+            segments.push(lastSegment);
+        }
+        const fileBasePath = segments.join('/');
+        if (fileBasePaths.has(fileBasePath)) {
+            duplicatePaths.add(// Add a dot if the base name is empty, 'foo' -> './foo', '' -> '.'
+            './' + filePath.replace(/\\/g, '/'));
+        }
+        fileBasePaths.add(fileBasePath);
+    }
+    if (duplicatePaths.size > 0) {
+        throw new Error(`Conflicted entry files found for entries: ${[
+            ...duplicatePaths
+        ].join(', ')}`);
+    }
+}
+
 function exit(err) {
     logger.error(err);
     process.exit(1);
@@ -188,8 +219,6 @@ const getMainFieldExportType = (pkg)=>{
     const mainExportType = isEsmPkg && pkg.main ? hasCjsExtension(pkg.main) ? 'require' : 'import' : 'require';
     return mainExportType;
 };
-// TODO: add unit test
-const baseNameWithoutExtension = (filename)=>path__default.default.basename(filename, path__default.default.extname(filename));
 const isTestFile = (filename)=>/\.(test|spec)$/.test(baseNameWithoutExtension(filename));
 function joinRelativePath(...segments) {
     let result = path__default.default.join(...segments);
@@ -612,7 +641,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "6.0.4";
+var version = "6.1.0";
 
 async function writeDefaultTsconfig(tsConfigPath) {
     await fs.promises.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
@@ -678,7 +707,7 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
     ;
     const dirPath = path__default.default.join(sourceFolderPath, dirName);
     // Match <name>{,/index}.{<ext>,<runtime>.<ext>}
-    const globalPatterns = [
+    const entryFilesPatterns = [
         `${baseName}.{${[
             ...availableExtensions
         ].join(',')}}`,
@@ -696,12 +725,13 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
             ...availableExtensions
         ].join(',')}}`
     ];
-    const files = await glob.glob(globalPatterns, {
+    const entryFiles = await glob.glob(entryFilesPatterns, {
         cwd: dirPath,
         nodir: true,
-        ignore: '**/_*'
+        ignore: PRIVATE_GLOB_PATTERN
     });
-    for (const file of files){
+    validateEntryFiles(entryFiles);
+    for (const file of entryFiles){
         const ext = path__default.default.extname(file).slice(1);
         if (!availableExtensions.has(ext) || isTestFile(file)) continue;
         const sourceFileAbsolutePath = path__default.default.join(dirPath, file);
@@ -746,12 +776,12 @@ async function collectSourceEntries(sourceFolderPath) {
     const binMatches = await glob.glob(binPattern, {
         cwd: sourceFolderPath,
         nodir: true,
-        ignore: '**/_*'
+        ignore: PRIVATE_GLOB_PATTERN
     });
     const srcMatches = await glob.glob(srcPattern, {
         cwd: sourceFolderPath,
         nodir: true,
-        ignore: '**/_*'
+        ignore: PRIVATE_GLOB_PATTERN
     });
     for (const file of binMatches){
         // convert relative path to export path

package/dist/index.js

@@ -241,11 +241,42 @@ const DEFAULT_TS_CONFIG = {
     }
 };
 const BINARY_TAG = '$binary';
+const PRIVATE_GLOB_PATTERN = '**/_*/**';
 
 function posixRelativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
 }
 
+// Example: ./src/util/foo.development.ts -> foo.development
+// Example: ./src/util/foo.react-server.ts -> foo.react-server
+const baseNameWithoutExtension = (filePath)=>{
+    return path__default.default.basename(filePath, path__default.default.extname(filePath));
+};
+function validateEntryFiles(entryFiles) {
+    const fileBasePaths = new Set();
+    const duplicatePaths = new Set();
+    for (const filePath of entryFiles){
+        // Check if there are multiple files with the same base name
+        const filePathWithoutExt = filePath.slice(0, -path__default.default.extname(filePath).length).replace(/\\/g, '/');
+        const segments = filePathWithoutExt.split('/');
+        const lastSegment = segments.pop() || '';
+        if (lastSegment !== 'index' && lastSegment !== '') {
+            segments.push(lastSegment);
+        }
+        const fileBasePath = segments.join('/');
+        if (fileBasePaths.has(fileBasePath)) {
+            duplicatePaths.add(// Add a dot if the base name is empty, 'foo' -> './foo', '' -> '.'
+            './' + filePath.replace(/\\/g, '/'));
+        }
+        fileBasePaths.add(fileBasePath);
+    }
+    if (duplicatePaths.size > 0) {
+        throw new Error(`Conflicted entry files found for entries: ${[
+            ...duplicatePaths
+        ].join(', ')}`);
+    }
+}
+
 function exit(err) {
     logger.error(err);
     process.exit(1);
@@ -325,8 +356,6 @@ const getMainFieldExportType = (pkg)=>{
     const mainExportType = isEsmPkg && pkg.main ? hasCjsExtension(pkg.main) ? 'require' : 'import' : 'require';
     return mainExportType;
 };
-// TODO: add unit test
-const baseNameWithoutExtension = (filename)=>path__default.default.basename(filename, path__default.default.extname(filename));
 const isTestFile = (filename)=>/\.(test|spec)$/.test(baseNameWithoutExtension(filename));
 function joinRelativePath(...segments) {
     let result = path__default.default.join(...segments);
@@ -752,7 +781,7 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
     ;
     const dirPath = path__default.default.join(sourceFolderPath, dirName);
     // Match <name>{,/index}.{<ext>,<runtime>.<ext>}
-    const globalPatterns = [
+    const entryFilesPatterns = [
         `${baseName}.{${[
             ...availableExtensions
         ].join(',')}}`,
@@ -770,12 +799,13 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
             ...availableExtensions
         ].join(',')}}`
     ];
-    const files = await glob.glob(globalPatterns, {
+    const entryFiles = await glob.glob(entryFilesPatterns, {
         cwd: dirPath,
         nodir: true,
-        ignore: '**/_*'
+        ignore: PRIVATE_GLOB_PATTERN
     });
-    for (const file of files){
+    validateEntryFiles(entryFiles);
+    for (const file of entryFiles){
         const ext = path__default.default.extname(file).slice(1);
         if (!availableExtensions.has(ext) || isTestFile(file)) continue;
         const sourceFileAbsolutePath = path__default.default.join(dirPath, file);
@@ -826,18 +856,16 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
         }
     }
     // Search private shared module files which are not in the parsedExportsInfo, but start with _.
-    // e.g. _utils.ts, _utils/index.ts
-    // e.g. _utils.development.ts, _utils/index.development.js
-    const privatePattern = [
-        `**/_*{,/index}.{${[
-            ...availableExtensions
-        ].join(',')}}`,
-        `**/_*{,/index}.{${[
-            ...runtimeExportConventions
-        ].join(',')}}.{${[
-            ...availableExtensions
-        ].join(',')}}`
-    ];
+    // Leading underscore: e.g. _utils.ts, _utils/index.ts
+    // Segment contains leading underscore: e.g. a/_b/_c.ts, a/b/_c/index.ts
+    // Contains special suffix: e.g. _utils.development.ts, _utils/index.development.js
+    const suffixPattern = [
+        ...runtimeExportConventions
+    ].join(',');
+    const extPattern = [
+        ...availableExtensions
+    ].join(',');
+    const privatePattern = `**/_*{,/*}{,{.${suffixPattern}}}.{${extPattern}}`;
     const privateFiles = await glob.glob(privatePattern, {
         cwd: sourceFolderPath,
         nodir: true
@@ -855,6 +883,7 @@ async function collectSourceEntriesByExportPath(sourceFolderPath, originalSubpat
         const condPart = isSpecialExport ? specialExportType + '.' : '';
         // Map private shared files to the dist directory
         // e.g. ./_utils.ts -> ./dist/_utils.js
+        // TODO: improve the logic to only generate the required files, not all possible files
         const privateExportInfo = [
             [
                 posixRelativify(path.posix.join('./dist', exportPath + (isEsmPkg ? '.js' : '.mjs'))),

package/package.json

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