@savvy-web/rslib-builder 0.13.1 → 0.14.1

package/README.md

@@ -19,11 +19,7 @@ Build modern ESM Node.js libraries with minimal configuration. Handles TypeScrip
 ## Installation
 
 ```bash
-npm install --save-dev \
-  @savvy-web/rslib-builder \
-  @rslib/core \
-  @microsoft/api-extractor \
-  @typescript/native-preview
+npm install --save-dev @savvy-web/rslib-builder @rslib/core @microsoft/api-extractor @typescript/native-preview
 ```
 
 ## Quick Start

package/index.d.ts

@@ -1179,6 +1179,7 @@ export declare class NodeLibraryBuilder {
         externals: never[];
         apiModel: true;
         bundle: true;
+        cjsInterop: false;
     };
     /**
      * Merges user-provided options with default options.
@@ -1543,6 +1544,15 @@ export declare interface NodeLibraryBuilderOptions {
      * @defaultValue true
      */
     bundle?: boolean;
+    /**
+     * Enable CJS default export interop for CommonJS output files.
+     * When true, CJS files are patched so `require('module')` returns
+     * the default export directly instead of `{ default: value }`.
+     * Named exports are preserved as properties on the default value.
+     * Only affects CJS format output; ESM is unchanged.
+     * @defaultValue false
+     */
+    cjsInterop?: boolean;
 }
 
 /**

package/index.js

@@ -2224,6 +2224,10 @@ async function buildPackageJson(packageJson, isProduction = false, processTSExpo
         result = applyRslibTransformations(pnpmTransformed, packageJson, processTSExports, entrypoints, exportToOutputMap, bundle);
     } else result = applyRslibTransformations(packageJson, packageJson, processTSExports, entrypoints, exportToOutputMap, bundle);
     if (formatConditions && result.exports) result.exports = applyFormatConditions(result.exports, formatConditions);
+    if (formatConditions?.dualFormat && result.bin) {
+        const prefixedBin = applyFormatPrefixToBin(result.bin, formatConditions.format ?? "esm");
+        if (prefixedBin) result.bin = prefixedBin;
+    }
     if (transform) result = transform(result);
     return result;
 }
@@ -2239,6 +2243,15 @@ function addFormatDirPrefix(path, format) {
     if (path.startsWith("./")) return `./${format}/${path.slice(2)}`;
     return `./${format}/${path}`;
 }
+function applyFormatPrefixToBin(bin, format) {
+    if ("string" == typeof bin) return bin.endsWith(".js") ? addFormatDirPrefix(bin, format) : bin;
+    if (bin && "object" == typeof bin) {
+        const result = {};
+        for (const [command, path] of Object.entries(bin))if (void 0 !== path) result[command] = path.endsWith(".js") ? addFormatDirPrefix(path, format) : path;
+        return result;
+    }
+    return bin;
+}
 function applyFormatConditions(exports, options) {
     if (!exports || "object" != typeof exports || Array.isArray(exports)) return exports;
     const { format = "esm", entryFormats, dualFormat } = options;
@@ -2688,6 +2701,20 @@ const VirtualEntryPlugin = (options)=>{
         }
     };
 };
+const CJS_INTEROP_FOOTER = `
+if (module.exports && module.exports.__esModule && 'default' in module.exports) {
+  var _def = module.exports.default;
+  if (_def !== null && _def !== undefined && (typeof _def === 'object' || typeof _def === 'function')) {
+    var _keys = Object.keys(module.exports);
+    for (var _i = 0; _i < _keys.length; _i++) {
+      var _key = _keys[_i];
+      if (_key !== 'default' && _key !== '__esModule' && !(_key in _def)) {
+        _def[_key] = module.exports[_key];
+      }
+    }
+  }
+  module.exports = _def;
+}`;
 /* v8 ignore next -- @preserve */ class NodeLibraryBuilder {
     static VALID_TARGETS = [
         "dev",
@@ -2704,7 +2731,8 @@ const VirtualEntryPlugin = (options)=>{
         ],
         externals: [],
         apiModel: true,
-        bundle: true
+        bundle: true,
+        cjsInterop: false
     };
     static mergeOptions(options = {}) {
         const copyPatterns = [
@@ -2725,6 +2753,7 @@ const VirtualEntryPlugin = (options)=>{
             externals: options.externals ?? NodeLibraryBuilder.DEFAULT_OPTIONS.externals,
             apiModel: options.apiModel ?? NodeLibraryBuilder.DEFAULT_OPTIONS.apiModel,
             bundle: options.bundle ?? NodeLibraryBuilder.DEFAULT_OPTIONS.bundle,
+            cjsInterop: options.cjsInterop ?? NodeLibraryBuilder.DEFAULT_OPTIONS.cjsInterop,
             ...void 0 !== options.entry && {
                 entry: options.entry
             },
@@ -2910,6 +2939,11 @@ const VirtualEntryPlugin = (options)=>{
                     entry
                 },
                 define: sourceDefine
+            },
+            ...options.cjsInterop && "cjs" === primaryFormat && {
+                footer: {
+                    js: CJS_INTEROP_FOOTER
+                }
             }
         };
         const hasRegularEntries = void 0 !== options.entry || NodeLibraryBuilder.packageHasExports();
@@ -2931,6 +2965,21 @@ const VirtualEntryPlugin = (options)=>{
                             });
                         }
                     },
+                    {
+                        name: "strip-bin-entries",
+                        setup (api) {
+                            api.modifyRsbuildConfig((config)=>{
+                                const envKey = `${target}-${secondaryFormat}`;
+                                const envConfig = config.environments?.[envKey];
+                                if (envConfig?.source?.entry) {
+                                    const filtered = {};
+                                    for (const [name, value] of Object.entries(envConfig.source.entry))if (!name.startsWith("bin/")) filtered[name] = value;
+                                    envConfig.source.entry = filtered;
+                                }
+                                return config;
+                            });
+                        }
+                    },
                     DtsPlugin({
                         ...options.tsconfigPath && {
                             tsconfigPath: options.tsconfigPath
@@ -2945,6 +2994,7 @@ const VirtualEntryPlugin = (options)=>{
                         dtsPathPrefix: secondaryFormat
                     })
                 ];
+                const secondaryEntry = entry ? Object.fromEntries(Object.entries(entry).filter(([name])=>!name.startsWith("bin/"))) : void 0;
                 const secondaryLib = {
                     id: `${target}-${secondaryFormat}`,
                     outBase: bundle ? baseOutputDir : "src",
@@ -2969,10 +3019,15 @@ const VirtualEntryPlugin = (options)=>{
                         ...options.tsconfigPath && {
                             tsconfigPath: options.tsconfigPath
                         },
-                        ...entry && {
-                            entry
+                        ...secondaryEntry && {
+                            entry: secondaryEntry
                         },
                         define: sourceDefine
+                    },
+                    ...options.cjsInterop && "cjs" === secondaryFormat && {
+                        footer: {
+                            js: CJS_INTEROP_FOOTER
+                        }
                     }
                 };
                 libConfigs.push(secondaryLib);
@@ -3038,6 +3093,11 @@ const VirtualEntryPlugin = (options)=>{
                                 tsconfigPath: options.tsconfigPath
                             },
                             define: sourceDefine
+                        },
+                        ...options.cjsInterop && "cjs" === overrideFormat && {
+                            footer: {
+                                js: CJS_INTEROP_FOOTER
+                            }
                         }
                     };
                     libConfigs.push(overrideLib);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/rslib-builder",
-	"version": "0.13.1",
+	"version": "0.14.1",
 	"private": false,
 	"description": "RSlib-based build system for Node.js libraries with automatic package.json transformation, TypeScript declaration bundling, and multi-target support",
 	"keywords": [