rolldown-plugin-require-cjs 0.1.1 → 0.1.3

package/dist/index.js

@@ -10862,13 +10862,15 @@ function parseAst(sourceText, options, filename) {
 //#endregion
 //#region src/options.ts
 function resolveOptions(options) {
-	let { shouldTransform } = options;
-	if (Array.isArray(shouldTransform)) shouldTransform = (id) => shouldTransform.includes(id);
+	if (Array.isArray(options.shouldTransform)) {
+		const { shouldTransform } = options;
+		options.shouldTransform = (id) => shouldTransform.includes(id);
+	}
 	return {
 		include: options.include || [/\.[cm]?[jt]sx?$/],
 		exclude: options.exclude || [/node_modules/, /\.d\.[cm]?ts$/],
 		order: "order" in options ? options.order : "pre",
-		shouldTransform
+		shouldTransform: options.shouldTransform
 	};
 }
 
@@ -10898,6 +10900,7 @@ function RequireCJS(userOptions = {}) {
 				const { body } = parseAst(code, { lang: void 0 }, id);
 				const s = new MagicStringAST(code);
 				for (const stmt of body) if (stmt.type === "ImportDeclaration") {
+					if (stmt.importKind === "type") continue;
 					const source = stmt.source.value;
 					const resolution = await this.resolve(source, id);
 					if (resolution && resolution.external === false) continue;
@@ -10906,12 +10909,16 @@ function RequireCJS(userOptions = {}) {
 					else {
 						const mapping = {};
 						let namespaceId;
+						let defaultId;
 						for (const specifier of stmt.specifiers) if (specifier.type === "ImportNamespaceSpecifier") namespaceId = s.sliceNode(specifier.local);
-						else mapping[specifier.type === "ImportSpecifier" ? s.sliceNode(specifier.imported) : "default"] = s.sliceNode(specifier.local);
+						else if (specifier.type === "ImportSpecifier") mapping[s.sliceNode(specifier.imported)] = s.sliceNode(specifier.local);
+						else defaultId = s.sliceNode(specifier.local);
 						const requireCode = `require(${s.sliceNode(stmt.source)})`;
 						let str = "";
-						if (namespaceId) str += `const ${namespaceId} = ${requireCode};`;
-						if (Object.keys(mapping).length > 0) str += `const { ${Object.entries(mapping).map(([k, v]) => `${k}: ${v}`).join(", ")} } = ${namespaceId || requireCode};`;
+						if (namespaceId) defaultId ||= `_cjs_${namespaceId}_default`;
+						if (defaultId) str += `const ${defaultId} = ${requireCode};`;
+						if (namespaceId) str += `const ${namespaceId} = { ...${defaultId}, default: ${defaultId} };`;
+						if (Object.keys(mapping).length > 0) str += `const { ${Object.entries(mapping).map(([k, v]) => `${k}: ${v}`).join(", ")} } = ${defaultId || requireCode};`;
 						s.overwriteNode(stmt, str);
 					}
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-require-cjs",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Transform ESM imports to CJS requires when the imported module is pure CJS.",
   "type": "module",
   "license": "MIT",