@cordy/electro-generator 1.0.8 → 1.1.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { WindowDefinition } from "@cordy/electro";
+import { ViewDefinition } from "@cordy/electro";
 
 //#region src/types.d.ts
 /**
@@ -27,6 +27,12 @@ interface ScannedEvent {
   filePath: string;
   exported: boolean;
 }
+interface ScannedWindow {
+  id: string;
+  varName: string;
+  filePath: string;
+  exported: boolean;
+}
 interface ScannedFeature {
   id: string;
   filePath: string;
@@ -38,6 +44,7 @@ interface ScannedFeature {
 }
 interface ScanResult {
   features: ScannedFeature[];
+  windows: ScannedWindow[];
 }
 interface GeneratedFile {
   path: string;
@@ -47,7 +54,7 @@ interface GeneratedFile {
 //#region src/generator.d.ts
 interface GeneratorInput {
   scanResult: ScanResult;
-  windows: readonly WindowDefinition[];
+  views: readonly ViewDefinition[];
   /** Root output directory (e.g. `.electro/`). Generated files go into `generated/` subdirectory. */
   outputDir: string;
   /** Source directory where `electro-env.d.ts` will be written (e.g. `src/`). */
@@ -60,7 +67,7 @@ interface GeneratorOutput {
   envTypes: GeneratedFile;
 }
 /**
-* Generate all output files from scan results and window definitions.
+* Generate all output files from scan results and view definitions.
 */
 declare function generate(input: GeneratorInput): GeneratorOutput;
 //#endregion
@@ -73,4 +80,4 @@ declare function generate(input: GeneratorInput): GeneratorOutput;
 */
 declare function scan(basePath: string): Promise<ScanResult>;
 //#endregion
-export { type GeneratedFile, type GeneratorInput, type GeneratorOutput, type ScanResult, type ScannedFeature, type ScannedService, type ScannedTask, generate, scan };
+export { type GeneratedFile, type GeneratorInput, type GeneratorOutput, type ScanResult, type ScannedFeature, type ScannedService, type ScannedTask, type ScannedWindow, generate, scan };

package/dist/index.mjs

@@ -7,8 +7,8 @@ import { Visitor, parseSync } from "oxc-parser";
 /**
 * Code Generator — produces preload scripts, bridge types, and context types.
 *
-* Takes a ScanResult + window definitions and emits generated files.
-* Uses PolicyEngine for deny-by-default per-window filtering.
+* Takes a ScanResult + view definitions and emits generated files.
+* Uses PolicyEngine for deny-by-default per-view filtering.
 */
 const HEADER = "// Auto-generated by Electro codegen. Do not edit.\n";
 /** Quote a property key if it's not a valid JS identifier. */
@@ -23,13 +23,13 @@ function methodStub(featureId, serviceId, method) {
 	return `(...args: unknown[]) => ipcRenderer.invoke("${`${featureId}:${serviceId}:${method}`}", ...args)`;
 }
 /**
-* Generate a preload script for a specific window.
+* Generate a preload script for a specific view.
 *
 * Structure: `window.electro.{featureId}.{serviceId}.{method}()`
 * Only EXPOSED scope services are included.
 */
-function generatePreload(windowName, features, policy, preloadExtension) {
-	const allowedFeatures = features.filter((f) => policy.canAccess(windowName, f.id));
+function generatePreload(viewName, features, policy, preloadExtension) {
+	const allowedFeatures = features.filter((f) => policy.canAccess(viewName, f.id));
 	const featureEntries = [];
 	for (const feature of allowedFeatures) {
 		const exposedServices = feature.services.filter((s) => s.scope === "exposed");
@@ -55,16 +55,16 @@ contextBridge.exposeInMainWorld("electro", ${featureEntries.length > 0 ? `{\n${f
 `;
 	if (preloadExtension) content += `\n// User extension\nimport "${preloadExtension}";\n`;
 	return {
-		path: `generated/preload/${windowName}.gen.ts`,
+		path: `generated/preload/${viewName}.gen.ts`,
 		content
 	};
 }
 /**
-* Generate bridge type declarations for a specific window.
+* Generate bridge type declarations for a specific view.
 * Makes `window.electro` type-safe in the renderer.
 */
-function generateBridgeTypes(windowName, features, policy) {
-	const allowedFeatures = features.filter((f) => policy.canAccess(windowName, f.id));
+function generateBridgeTypes(viewName, features, policy) {
+	const allowedFeatures = features.filter((f) => policy.canAccess(viewName, f.id));
 	const featureTypes = [];
 	for (const feature of allowedFeatures) {
 		const exposedServices = feature.services.filter((s) => s.scope === "exposed");
@@ -84,7 +84,7 @@ function generateBridgeTypes(windowName, features, policy) {
 		featureTypes.push(`        ${q(feature.id)}: {\n${serviceTypes.join("\n")}\n        };`);
 	}
 	const content = `${HEADER}
-export interface ElectroBridge ${featureTypes.length > 0 ? `{\n${featureTypes.join("\n")}\n    }` : "Record<string, never>"}
+export interface ElectroBridge ${featureTypes.length > 0 ? `{\n${featureTypes.join("\n")}\n    }` : "{}"}
 
 declare global {
     interface Window {
@@ -93,7 +93,7 @@ declare global {
 }
 `;
 	return {
-		path: `generated/windows/${windowName}.bridge.d.ts`,
+		path: `generated/views/${viewName}.bridge.d.ts`,
 		content
 	};
 }
@@ -111,22 +111,32 @@ export {};
 type _SvcApi<T> = T extends { api(): infer R } ? NonNullable<R> : never;
 type _TaskPayload<T> = T extends { start(payload?: infer P): any } ? P : void;
 type _EventPayload<T> = T extends { payload(): infer P } ? P : unknown;
+type _WinApi<T> = T extends import("@cordy/electro").CreatedWindow<infer A> ? A : void;
 `;
 /**
-* Generate feature type declarations for the main process.
-* Emits a single FeatureMap interface with per-feature entries for
-* services, tasks, and dependencies. Uses typeof import() for full type inference.
+* Generate ViewMap entries for all defined views.
+* All views use WebContentsView as their type.
 */
-function generateWindowTypes(windows) {
+function generateViewTypes(views) {
+	if (views.length === 0) return "";
+	const entries = [];
+	for (const view of views) entries.push(`        "${view.name}": import("electron").WebContentsView;`);
+	return `\n    interface ViewMap {\n${entries.join("\n")}\n    }\n`;
+}
+/**
+* Generate WindowApiMap entries for all scanned createWindow() calls.
+* Uses _WinApi utility type to extract the typed API from CreatedWindow<TApi>.
+*/
+function generateWindowApiTypes(windows, srcDir) {
 	if (windows.length === 0) return "";
 	const entries = [];
-	for (const win of windows) {
-		const electronType = (win.type ?? "base-window") === "browser-window" ? "import(\"electron\").BrowserWindow" : "import(\"electron\").BaseWindow";
-		entries.push(`        "${win.name}": ${electronType};`);
-	}
-	return `\n    interface WindowMap {\n${entries.join("\n")}\n    }\n`;
+	for (const win of windows) if (win.exported) {
+		const importPath = toImportPath(srcDir, win.filePath);
+		entries.push(`        "${win.id}": _WinApi<typeof import("${importPath}").${win.varName}>;`);
+	} else entries.push(`        "${win.id}": unknown;`);
+	return `\n    interface WindowApiMap {\n${entries.join("\n")}\n    }\n`;
 }
-function generateFeatureTypes(features, srcDir, windows) {
+function generateFeatureTypes(features, srcDir, views, windows) {
 	const seenFeatures = /* @__PURE__ */ new Set();
 	const featureBlocks = [];
 	const svcOwnerEntries = [];
@@ -199,26 +209,26 @@ declare module "@cordy/electro" {
     interface ServiceOwnerMap ${svcOwnerEntries.length > 0 ? `{\n${svcOwnerEntries.join("\n")}\n    }` : "{}"}
 
     interface TaskOwnerMap ${taskOwnerEntries.length > 0 ? `{\n${taskOwnerEntries.join("\n")}\n    }` : "{}"}
-${generateWindowTypes(windows)}}
+${generateViewTypes(views)}${generateWindowApiTypes(windows, srcDir)}}
 `
 	};
 }
 /**
-* Generate all output files from scan results and window definitions.
+* Generate all output files from scan results and view definitions.
 */
 function generate(input) {
-	const { scanResult, windows, outputDir, srcDir } = input;
-	const policy = new PolicyEngine(windows);
+	const { scanResult, views, srcDir } = input;
+	const policy = new PolicyEngine(views);
 	const files = [];
-	for (const win of windows) {
+	for (const view of views) {
 		const knownIds = new Set(scanResult.features.map((f) => f.id));
-		for (const fId of win.features ?? []) if (!knownIds.has(fId)) console.warn(`[generator] Window "${win.name}" references unknown feature "${fId}"`);
-		files.push(generatePreload(win.name, scanResult.features, policy, win.preload));
-		files.push(generateBridgeTypes(win.name, scanResult.features, policy));
+		for (const fId of view.features ?? []) if (!knownIds.has(fId)) console.warn(`[generator] View "${view.name}" references unknown feature "${fId}"`);
+		files.push(generatePreload(view.name, scanResult.features, policy, view.preload));
+		files.push(generateBridgeTypes(view.name, scanResult.features, policy));
 	}
 	return {
 		files,
-		envTypes: generateFeatureTypes(scanResult.features, srcDir, windows)
+		envTypes: generateFeatureTypes(scanResult.features, srcDir, views, scanResult.windows ?? [])
 	};
 }
 
@@ -484,6 +494,39 @@ function extractEvents(program, filePath, exportedNames) {
 	} }).visit(program);
 	return events;
 }
+/**
+* Extract createWindow() calls from a file.
+* Uses VariableDeclarator to capture `const x = createWindow({...})` patterns.
+*/
+function extractWindows(program, filePath, exportedNames) {
+	const windows = [];
+	new Visitor({ VariableDeclarator(node) {
+		const init = node.init;
+		if (!init || init.type !== "CallExpression") return;
+		const callee = init.callee;
+		if (callee.type !== "Identifier" || callee.name !== "createWindow") return;
+		const args = init.arguments;
+		if (args.length < 1 || args[0].type !== "ObjectExpression") return;
+		const config = args[0];
+		const id = getStringLiteral(getObjectProperty(config, "id"));
+		if (!id) {
+			console.warn(`[scanner] Skipping createWindow() with non-literal id in ${filePath}`);
+			return;
+		}
+		const idNode = node.id;
+		const varName = idNode.type === "Identifier" && typeof idNode.name === "string" ? idNode.name : id;
+		windows.push({
+			varName,
+			window: {
+				id,
+				varName,
+				filePath,
+				exported: exportedNames.has(varName)
+			}
+		});
+	} }).visit(program);
+	return windows;
+}
 /** Extract createFeature() calls from a file. */
 function extractFeatures(program, filePath) {
 	const features = [];
@@ -549,6 +592,7 @@ async function scan(basePath) {
 	const allServices = [];
 	const allTasks = [];
 	const allEvents = [];
+	const allWindows = [];
 	const allFeatures = [];
 	for (const filePath of files) {
 		const result = parseSync(filePath, readFileSync(filePath, "utf-8"), { sourceType: "module" });
@@ -558,10 +602,12 @@ async function scan(basePath) {
 		const services = extractServices(program, filePath, exportedNames);
 		const tasks = extractTasks(program, filePath, exportedNames);
 		const events = extractEvents(program, filePath, exportedNames);
+		const windows = extractWindows(program, filePath, exportedNames);
 		const features = extractFeatures(program, filePath);
 		allServices.push(...services);
 		allTasks.push(...tasks);
 		allEvents.push(...events);
+		allWindows.push(...windows);
 		allFeatures.push(...features);
 	}
 	const serviceByVarName = /* @__PURE__ */ new Map();
@@ -570,35 +616,38 @@ async function scan(basePath) {
 	for (const { varName, task } of allTasks) taskByVarName.set(varName, task);
 	const eventByVarName = /* @__PURE__ */ new Map();
 	for (const { varName, event } of allEvents) eventByVarName.set(varName, event);
-	return { features: allFeatures.map((raw) => {
-		const services = [];
-		for (const varName of raw.serviceVarNames) {
-			const svc = serviceByVarName.get(varName);
-			if (svc) services.push(svc);
-			else console.warn(`[scanner] Feature "${raw.id}" references unknown service variable "${varName}" in ${raw.filePath}`);
-		}
-		const tasks = [];
-		for (const varName of raw.taskVarNames) {
-			const task = taskByVarName.get(varName);
-			if (task) tasks.push(task);
-			else console.warn(`[scanner] Feature "${raw.id}" references unknown task variable "${varName}" in ${raw.filePath}`);
-		}
-		const resolvedEvents = [];
-		for (const varName of raw.eventVarNames) {
-			const evt = eventByVarName.get(varName);
-			if (evt) resolvedEvents.push(evt);
-			else console.warn(`[scanner] Feature "${raw.id}" references unknown event variable "${varName}" in ${raw.filePath}`);
-		}
-		return {
-			id: raw.id,
-			filePath: raw.filePath,
-			dependencies: raw.dependencies,
-			services,
-			tasks,
-			events: resolvedEvents,
-			publishedEvents: raw.publishedEvents
-		};
-	}) };
+	return {
+		features: allFeatures.map((raw) => {
+			const services = [];
+			for (const varName of raw.serviceVarNames) {
+				const svc = serviceByVarName.get(varName);
+				if (svc) services.push(svc);
+				else console.warn(`[scanner] Feature "${raw.id}" references unknown service variable "${varName}" in ${raw.filePath}`);
+			}
+			const tasks = [];
+			for (const varName of raw.taskVarNames) {
+				const task = taskByVarName.get(varName);
+				if (task) tasks.push(task);
+				else console.warn(`[scanner] Feature "${raw.id}" references unknown task variable "${varName}" in ${raw.filePath}`);
+			}
+			const resolvedEvents = [];
+			for (const varName of raw.eventVarNames) {
+				const evt = eventByVarName.get(varName);
+				if (evt) resolvedEvents.push(evt);
+				else console.warn(`[scanner] Feature "${raw.id}" references unknown event variable "${varName}" in ${raw.filePath}`);
+			}
+			return {
+				id: raw.id,
+				filePath: raw.filePath,
+				dependencies: raw.dependencies,
+				services,
+				tasks,
+				events: resolvedEvents,
+				publishedEvents: raw.publishedEvents
+			};
+		}),
+		windows: allWindows.map((pw) => pw.window)
+	};
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cordy/electro-generator",
-    "version": "1.0.8",
+    "version": "1.1.0",
     "description": "Code generator for @cordy/electro — scans features and emits preload scripts and bridge types",
     "license": "MIT",
     "type": "module",
@@ -44,14 +44,14 @@
         "prepublishOnly": "bun run build"
     },
     "peerDependencies": {
-        "@cordy/electro": "1.0.8"
+        "@cordy/electro": "1.1.0"
     },
     "dependencies": {
         "oxc-parser": "^0.114.0",
         "tinyglobby": "^0.2.15"
     },
     "devDependencies": {
-        "@cordy/electro": "1.0.0",
+        "@cordy/electro": "1.1.0",
         "tsdown": "^0.20.3",
         "vitest": "v4.1.0-beta.3"
     }