@cordy/electro-cli 1.2.8 → 1.2.11

package/dist/index.mjs

@@ -491,7 +491,7 @@ const cac = (name = "") => new CAC(name);
 
 //#endregion
 //#region package.json
-var version$1 = "1.2.8";
+var version$1 = "1.2.11";
 
 //#endregion
 //#region src/dev/logger.ts
@@ -815,16 +815,48 @@ async function resolveExternals(root) {
 	deps.delete("@cordy/electro");
 	const builtins = builtinModules.flatMap((m) => [m, `node:${m}`]);
 	const depsArray = [...deps];
+	const cjsInteropDeps = (await Promise.all(depsArray.map(async (dep) => ({
+		dep,
+		isCommonJs: await isLikelyCommonJsDependency(root, dep)
+	})))).filter((entry) => entry.isCommonJs).map((entry) => entry.dep);
 	const deepPattern = depsArray.length > 0 ? new RegExp(`^(${depsArray.map(escapeRegExp).join("|")})/.+`) : null;
-	return deepPattern ? [
-		...depsArray,
-		...builtins,
-		deepPattern
-	] : [...depsArray, ...builtins];
+	return {
+		externals: deepPattern ? [
+			...depsArray,
+			...builtins,
+			deepPattern
+		] : [...depsArray, ...builtins],
+		cjsInteropDeps
+	};
 }
 function escapeRegExp(str) {
 	return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+async function isLikelyCommonJsDependency(root, dep) {
+	if (dep === "electron" || dep.startsWith("node:")) return false;
+	const depPkgPath = resolve(root, "node_modules", dep, "package.json");
+	try {
+		return !isLikelyEsmPackage(JSON.parse(await readFile(depPkgPath, "utf-8")));
+	} catch {
+		return false;
+	}
+}
+function isLikelyEsmPackage(pkg) {
+	if (pkg.type === "module") return true;
+	if (typeof pkg.module === "string") return true;
+	if (typeof pkg.main === "string" && pkg.main.endsWith(".mjs")) return true;
+	if (typeof pkg.exports === "string" && pkg.exports.endsWith(".mjs")) return true;
+	if (hasImportCondition(pkg.exports)) return true;
+	return false;
+}
+function hasImportCondition(value) {
+	if (!value || typeof value !== "object") return false;
+	if (Array.isArray(value)) return value.some(hasImportCondition);
+	const record = value;
+	if ("import" in record) return true;
+	for (const nested of Object.values(record)) if (hasImportCondition(nested)) return true;
+	return false;
+}
 
 //#endregion
 //#region src/dev/node-format.ts
@@ -1878,6 +1910,96 @@ var MagicString = class MagicString {
 	}
 };
 
+//#endregion
+//#region src/plugins/cjs-external-interop.ts
+const STATIC_IMPORT_RE = /(?<=\s|^|;)import\s*([\s"']*(?<imports>[\p{L}\p{M}\w\t\n\r $*,/{}@.]+)from\s*)?["']\s*(?<specifier>(?<="\s*)[^"]*[^\s"](?=\s*")|(?<='\s*)[^']*[^\s'](?=\s*'))\s*["'][\s;]*/gmu;
+const IDENT_RE = /^[A-Za-z_$][\w$]*$/;
+/**
+* Rewrites named imports from external CommonJS deps to runtime-safe accessors.
+*
+* Example:
+*   import { autoUpdater } from "electron-updater"
+* becomes
+*   import * as __cjs_ext_0__ from "electron-updater"
+*   const autoUpdater = __cjs_ext_0__.autoUpdater ?? __cjs_ext_0__.default?.autoUpdater
+*/
+function cjsExternalInteropPlugin(cjsDeps) {
+	if (cjsDeps.length === 0) return {
+		name: "electro:cjs-external-interop",
+		apply: "build"
+	};
+	const cjsDepSet = new Set(cjsDeps);
+	return {
+		name: "electro:cjs-external-interop",
+		apply: "build",
+		enforce: "post",
+		renderChunk(code, _chunk, { format, sourcemap }) {
+			if (format !== "es") return null;
+			let s = null;
+			let counter = 0;
+			for (const match of code.matchAll(STATIC_IMPORT_RE)) {
+				const statement = match[0];
+				const start = match.index ?? 0;
+				const specifier = match.groups?.specifier?.trim();
+				const importsClause = match.groups?.imports?.trim();
+				if (!specifier || !importsClause) continue;
+				if (!isCjsExternalSpecifier(specifier, cjsDepSet)) continue;
+				const parsed = parseImportClause(importsClause);
+				if (!parsed) continue;
+				const ns = `__cjs_ext_${counter++}__`;
+				const lines = [`import * as ${ns} from ${JSON.stringify(specifier)};`];
+				if (parsed.defaultImport) lines.push(`const ${parsed.defaultImport} = ${ns}.default ?? ${ns};`);
+				for (const { imported, local } of parsed.named) lines.push(`const ${local} = ${ns}.${imported} ?? ${ns}.default?.${imported};`);
+				s ??= new MagicString(code);
+				s.overwrite(start, start + statement.length, lines.join("\n"));
+			}
+			if (!s) return null;
+			return {
+				code: s.toString(),
+				map: sourcemap ? s.generateMap({ hires: "boundary" }) : null
+			};
+		}
+	};
+}
+function isCjsExternalSpecifier(specifier, cjsDepSet) {
+	if (specifier.startsWith(".") || specifier.startsWith("/") || specifier.startsWith("\0") || specifier.startsWith("node:")) return false;
+	if (cjsDepSet.has(specifier)) return true;
+	for (const dep of cjsDepSet) if (specifier.startsWith(`${dep}/`)) return true;
+	return false;
+}
+function parseImportClause(clause) {
+	const braceStart = clause.indexOf("{");
+	const braceEnd = clause.lastIndexOf("}");
+	if (braceStart < 0 || braceEnd < braceStart) return null;
+	const defaultPart = clause.slice(0, braceStart).trim().replace(/,$/, "").trim();
+	if (defaultPart.startsWith("*")) return null;
+	let defaultImport;
+	if (defaultPart.length > 0) {
+		const normalized = defaultPart.replace(/^type\s+/, "").trim();
+		if (!IDENT_RE.test(normalized)) return null;
+		defaultImport = normalized;
+	}
+	const namedPart = clause.slice(braceStart + 1, braceEnd).trim();
+	if (namedPart.length === 0) return null;
+	const named = [];
+	for (const raw of namedPart.split(",")) {
+		const token = raw.trim();
+		if (token.length === 0) continue;
+		const normalized = token.replace(/^type\s+/, "").trim();
+		const match = /^([A-Za-z_$][\w$]*)(?:\s+as\s+([A-Za-z_$][\w$]*))?$/.exec(normalized);
+		if (!match) return null;
+		named.push({
+			imported: match[1],
+			local: match[2] ?? match[1]
+		});
+	}
+	if (named.length === 0) return null;
+	return {
+		defaultImport,
+		named
+	};
+}
+
 //#endregion
 //#region src/plugins/esm-shim.ts
 const CJSYNTAX_RE = /__filename|__dirname|require\(|require\.resolve\(/;
@@ -1964,6 +2086,7 @@ function createNodeConfig(opts) {
 		plugins: [
 			importMetaPlugin(),
 			...opts.plugins ?? [],
+			cjsExternalInteropPlugin(opts.cjsInteropDeps ?? []),
 			esmShimPlugin()
 		],
 		customLogger: opts.customLogger,
@@ -2078,6 +2201,30 @@ function deduplicatePlugins(plugins) {
 	return result;
 }
 
+//#endregion
+//#region src/dev/bridge-types.ts
+const GENERATED_BRIDGE_DIRS = ["views", "windows"];
+/**
+* Resolve generated bridge declaration file for a view.
+* Supports both historical `generated/windows/*` and current `generated/views/*`.
+*/
+function findBridgeTypesForView(files, viewName) {
+	const byPath = files.find((f) => f.path === `generated/views/${viewName}.bridge.d.ts`) ?? files.find((f) => f.path === `generated/windows/${viewName}.bridge.d.ts`);
+	if (byPath) return byPath;
+	return files.find((f) => f.path.endsWith(`/${viewName}.bridge.d.ts`)) ?? null;
+}
+/** Target location for per-view bridge types next to the config file. */
+function resolveViewBridgePath(view) {
+	if (!view.__source) return null;
+	return resolve(dirname(view.__source), "bridge.d.ts");
+}
+function isGeneratedBridgeTypesPath(path) {
+	return GENERATED_BRIDGE_DIRS.some((dir) => path.startsWith(`generated/${dir}/`) && path.endsWith(".bridge.d.ts"));
+}
+function generatedBridgeTypesPaths(viewName) {
+	return GENERATED_BRIDGE_DIRS.map((dir) => `generated/${dir}/${viewName}.bridge.d.ts`);
+}
+
 //#endregion
 //#region src/plugins/utils.ts
 /** Strip query and hash from a URL/path. */
@@ -2788,19 +2935,36 @@ async function build$1(options) {
 		});
 		await mkdir(codegenDir, { recursive: true });
 		for (const file of files) {
+			if (isGeneratedBridgeTypesPath(file.path)) continue;
 			const filePath = resolve(codegenDir, file.path);
 			await mkdir(dirname(filePath), { recursive: true });
 			await writeFile(filePath, file.content);
 		}
+		for (const view of views) {
+			const bridge = findBridgeTypesForView(files, view.name);
+			const bridgePath = resolveViewBridgePath(view);
+			if (bridge && bridgePath) {
+				await mkdir(dirname(bridgePath), { recursive: true });
+				await writeFileIfChanged$2(bridgePath, bridge.content);
+			}
+			for (const relPath of generatedBridgeTypesPaths(view.name)) {
+				const legacyPath = resolve(codegenDir, relPath);
+				try {
+					await unlink(legacyPath);
+				} catch {}
+			}
+		}
 		const envTypesPath = resolve(srcDir, envTypes.path);
 		await mkdir(dirname(envTypesPath), { recursive: true });
-		await writeFile(envTypesPath, envTypes.content);
+		await writeFileIfChanged$2(envTypesPath, envTypes.content);
 		step("codegen", codegenTimer());
 	} catch (err) {
 		stepFail("codegen", err instanceof Error ? err.message : String(err));
 		process.exit(1);
 	}
-	const externals = await resolveExternals(root);
+	const resolvedExternals = await resolveExternals(root);
+	const externals = resolvedExternals.externals;
+	const cjsInteropDeps = resolvedExternals.cjsInteropDeps;
 	const logger = createBuildLogger();
 	try {
 		buildScope("main");
@@ -2812,7 +2976,8 @@ async function build$1(options) {
 			sourcemap: options.sourcemap,
 			logger,
 			bytecode: options.bytecode,
-			format: nodeFormat
+			format: nodeFormat,
+			cjsInteropDeps
 		});
 	} catch (err) {
 		stepFail("main", err instanceof Error ? err.message : String(err));
@@ -2829,7 +2994,8 @@ async function build$1(options) {
 			sourcemap: options.sourcemap,
 			logger,
 			bytecode: options.bytecode,
-			format: nodeFormat
+			format: nodeFormat,
+			cjsInteropDeps
 		});
 	} catch (err) {
 		stepFail("preload", err instanceof Error ? err.message : String(err));
@@ -2855,6 +3021,12 @@ async function build$1(options) {
 	}
 	footer(`Built in ${totalTimer()}`, outDir);
 }
+async function writeFileIfChanged$2(filePath, content) {
+	try {
+		if (await readFile(filePath, "utf-8") === content) return;
+	} catch {}
+	await writeFile(filePath, content);
+}
 async function buildMain(args) {
 	const runtimeEntry = args.config.runtime.entry;
 	const entry = resolve(dirname(args.config.runtime.__source), runtimeEntry);
@@ -2882,6 +3054,7 @@ async function buildMain(args) {
 		customLogger: args.logger,
 		logLevel: "info",
 		format: args.format,
+		cjsInteropDeps: args.cjsInteropDeps,
 		define: { __ELECTRO_VIEW_REGISTRY__: JSON.stringify(viewRegistry) }
 	}));
 }
@@ -2908,7 +3081,8 @@ async function buildPreload(args) {
 		sourcemap: args.sourcemap,
 		customLogger: args.logger,
 		logLevel: "info",
-		format: args.format
+		format: args.format,
+		cjsInteropDeps: args.cjsInteropDeps
 	});
 	if (Object.keys(input).length > 1) {
 		const subBuildConfig = createNodeConfig({
@@ -2926,7 +3100,8 @@ async function buildPreload(args) {
 			sourcemap: args.sourcemap,
 			customLogger: args.logger,
 			logLevel: "info",
-			format: args.format
+			format: args.format,
+			cjsInteropDeps: args.cjsInteropDeps
 		});
 		baseConfig.plugins.push(isolateEntriesPlugin(subBuildConfig));
 	}
@@ -3062,11 +3237,13 @@ var DevServer = class {
 			this.attachConfigWatcher();
 			return;
 		}
-		const externals = await resolveExternals(this.root);
+		const resolvedExternals = await resolveExternals(this.root);
+		const externals = resolvedExternals.externals;
+		const cjsInteropDeps = resolvedExternals.cjsInteropDeps;
 		if (views.length > 0) {
 			const preloadTimer = startTimer();
 			try {
-				await this.buildPreload(externals);
+				await this.buildPreload(externals, cjsInteropDeps);
 				step("preload", preloadTimer());
 			} catch (err) {
 				stepFail("preload", err instanceof Error ? err.message : String(err));
@@ -3075,7 +3252,7 @@ var DevServer = class {
 		}
 		const mainBuildTimer = startTimer();
 		try {
-			await this.buildMain(externals);
+			await this.buildMain(externals, cjsInteropDeps);
 			step("main", mainBuildTimer());
 		} catch (err) {
 			stepFail("main", err instanceof Error ? err.message : String(err));
@@ -3139,13 +3316,28 @@ var DevServer = class {
 		});
 		await mkdir(outputDir, { recursive: true });
 		for (const file of files) {
+			if (isGeneratedBridgeTypesPath(file.path)) continue;
 			const filePath = resolve(outputDir, file.path);
 			await mkdir(dirname(filePath), { recursive: true });
 			await writeFile(filePath, file.content);
 		}
+		for (const view of this.config.views ?? []) {
+			const bridge = findBridgeTypesForView(files, view.name);
+			const bridgePath = resolveViewBridgePath(view);
+			if (bridge && bridgePath) {
+				await mkdir(dirname(bridgePath), { recursive: true });
+				await writeFileIfChanged$1(bridgePath, bridge.content);
+			}
+			for (const relPath of generatedBridgeTypesPaths(view.name)) {
+				const legacyPath = resolve(outputDir, relPath);
+				try {
+					await unlink(legacyPath);
+				} catch {}
+			}
+		}
 		const envTypesPath = resolve(srcDir, envTypes.path);
 		await mkdir(dirname(envTypesPath), { recursive: true });
-		await writeFile(envTypesPath, envTypes.content);
+		await writeFileIfChanged$1(envTypesPath, envTypes.content);
 	}
 	async startRenderer() {
 		const views = (this.config.views ?? []).filter((v) => v.entry);
@@ -3162,7 +3354,7 @@ var DevServer = class {
 		const addr = this.rendererServer.httpServer?.address();
 		this.rendererUrl = `http://localhost:${typeof addr === "object" && addr ? addr.port : 5173}`;
 	}
-	async buildPreload(externals) {
+	async buildPreload(externals, cjsInteropDeps) {
 		const views = (this.config.views ?? []).filter((v) => v.entry);
 		const preloadOutDir = resolve(this.outputDir, "preload");
 		const input = {};
@@ -3183,7 +3375,8 @@ var DevServer = class {
 			logLevel: this.logLevel,
 			clearScreen: this.clearScreen,
 			sourcemap: this.sourcemap,
-			format: this.nodeFormat
+			format: this.nodeFormat,
+			cjsInteropDeps
 		});
 		if (Object.keys(input).length > 1) {
 			const subBuildConfig = createNodeConfig({
@@ -3201,7 +3394,8 @@ var DevServer = class {
 				logLevel: this.logLevel,
 				clearScreen: this.clearScreen,
 				sourcemap: this.sourcemap,
-				format: this.nodeFormat
+				format: this.nodeFormat,
+				cjsInteropDeps
 			});
 			baseConfig.plugins.push(isolateEntriesPlugin(subBuildConfig));
 		}
@@ -3227,7 +3421,7 @@ var DevServer = class {
 		});
 		this.preloadWatch = await build(baseConfig);
 	}
-	async buildMain(externals) {
+	async buildMain(externals, cjsInteropDeps) {
 		const runtimeEntry = this.config.runtime.entry;
 		const entry = resolve(dirname(this.config.runtime.__source), runtimeEntry);
 		this.mainInitialBuildPromise = new Promise((resolve) => {
@@ -3259,6 +3453,7 @@ var DevServer = class {
 			userViteConfig: this.config.runtime.vite,
 			sourcemap: this.sourcemap,
 			format: this.nodeFormat,
+			cjsInteropDeps,
 			define: { __ELECTRO_VIEW_REGISTRY__: JSON.stringify(viewRegistry) }
 		});
 		const self = this;
@@ -3422,6 +3617,12 @@ var DevServer = class {
 		});
 	}
 };
+async function writeFileIfChanged$1(filePath, content) {
+	try {
+		if (await readFile(filePath, "utf-8") === content) return;
+	} catch {}
+	await writeFile(filePath, content);
+}
 
 //#endregion
 //#region src/commands/dev.ts
@@ -3482,17 +3683,39 @@ async function generate$1(options) {
 	});
 	console.log(`Generating ${files.length + 1} file(s)...`);
 	for (const file of files) {
+		if (isGeneratedBridgeTypesPath(file.path)) continue;
 		const fullPath = resolve(outputDir, file.path);
 		await mkdir(dirname(fullPath), { recursive: true });
 		await writeFile(fullPath, file.content);
 		console.log(`  .electro/${file.path}`);
 	}
+	for (const view of views) {
+		const bridge = findBridgeTypesForView(files, view.name);
+		const bridgePath = resolveViewBridgePath(view);
+		if (bridge && bridgePath) {
+			await mkdir(dirname(bridgePath), { recursive: true });
+			await writeFileIfChanged(bridgePath, bridge.content);
+			console.log(`  ${relative(process.cwd(), bridgePath)}`);
+		}
+		for (const relPath of generatedBridgeTypesPaths(view.name)) {
+			const legacyPath = resolve(outputDir, relPath);
+			try {
+				await unlink(legacyPath);
+			} catch {}
+		}
+	}
 	const envTypesPath = resolve(srcDir, envTypes.path);
 	await mkdir(dirname(envTypesPath), { recursive: true });
 	await writeFile(envTypesPath, envTypes.content);
 	console.log(`  src/${envTypes.path}`);
 	console.log("Done.");
 }
+async function writeFileIfChanged(filePath, content) {
+	try {
+		if (await readFile(filePath, "utf-8") === content) return;
+	} catch {}
+	await writeFile(filePath, content);
+}
 
 //#endregion
 //#region src/commands/preview.ts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cordy/electro-cli",
-    "version": "1.2.8",
+    "version": "1.2.11",
     "description": "CLI for @cordy/electro — dev server, build, and code generation commands",
     "license": "MIT",
     "type": "module",
@@ -55,7 +55,7 @@
         "@cordy/electro-generator": "1.2.8"
     },
     "devDependencies": {
-        "@cordy/electro": "1.2.6",
+        "@cordy/electro": "1.2.9",
         "@types/node": "^25.2.3",
         "cac": "^6.7.14",
         "electron": "^40.4.1",