@cordy/electro-generator 1.2.11 → 1.2.13

package/dist/index.mjs

@@ -71,8 +71,9 @@ contextBridge.exposeInMainWorld("electro", ${featureEntries.length > 0 ? `{\n${f
 * Generate bridge type declarations for a specific view.
 * Makes `window.electro` type-safe in the renderer.
 */
-function generateBridgeTypes(viewName, features, policy) {
-	const allowedFeatures = features.filter((f) => policy.canAccess(viewName, f.id));
+function generateBridgeTypes(view, features, policy) {
+	const allowedFeatures = features.filter((f) => policy.canAccess(view.name, f.id));
+	const bridgeModulePath = join(dirname(view.__source), "bridge.gen.ts");
 	const featureTypes = [];
 	for (const feature of allowedFeatures) {
 		const exposedServices = feature.services.filter((s) => s.scope === "exposed");
@@ -81,39 +82,42 @@ function generateBridgeTypes(viewName, features, policy) {
 			continue;
 		}
 		const serviceTypes = [];
-		for (const service of exposedServices) {
-			if (service.methods.length === 0) {
-				serviceTypes.push(`            ${q(service.id)}: Record<string, never>;`);
-				continue;
-			}
-			const methodTypes = service.methods.map((m) => `                ${q(m)}(...args: unknown[]): Promise<unknown>;`).join("\n");
-			serviceTypes.push(`            ${q(service.id)}: {\n${methodTypes}\n            };`);
-		}
+		for (const service of exposedServices) if (service.exported) {
+			const importPath = toImportPathFrom(bridgeModulePath, service.filePath);
+			serviceTypes.push(`            ${q(service.id)}: _SvcApi<typeof import("${importPath}").${service.varName}>;`);
+		} else serviceTypes.push(`            ${q(service.id)}: unknown;`);
 		featureTypes.push(`        ${q(feature.id)}: {\n${serviceTypes.join("\n")}\n        };`);
 	}
-	const eventKeys = [];
-	for (const feature of allowedFeatures) for (const evt of feature.events ?? []) eventKeys.push(`"${feature.id}:${evt.id}"`);
-	if (allowedFeatures.length > 0) {
-		const channelType = eventKeys.length > 0 ? eventKeys.join(" | ") : "string";
-		featureTypes.push(`        events: {\n            on(channel: ${channelType} | (string & {}), handler: (payload: unknown) => void): () => void;\n        };`);
+	const eventTypeEntries = [];
+	for (const feature of allowedFeatures) for (const evt of feature.events ?? []) {
+		const eventKey = `${feature.id}:${evt.id}`;
+		if (evt.exported) {
+			const importPath = toImportPathFrom(bridgeModulePath, evt.filePath);
+			eventTypeEntries.push(`    ${JSON.stringify(eventKey)}: _EventPayload<typeof import("${importPath}").${evt.varName}>;`);
+		} else eventTypeEntries.push(`    ${JSON.stringify(eventKey)}: unknown;`);
 	}
+	const eventMapTypes = eventTypeEntries.length > 0 ? `\ntype ElectroEventMap = {\n${eventTypeEntries.join("\n")}\n};` : "";
+	if (allowedFeatures.length > 0) if (eventTypeEntries.length > 0) featureTypes.push(`        events: {\n            on<K extends keyof ElectroEventMap>(channel: K, handler: (payload: ElectroEventMap[K]) => void): () => void;\n            on(channel: string & {}, handler: (payload: unknown) => void): () => void;\n        };`);
+	else featureTypes.push(`        events: {\n            on(channel: string & {}, handler: (payload: unknown) => void): () => void;\n        };`);
 	const content = `${HEADER}
-export interface ElectroBridge ${featureTypes.length > 0 ? `{\n${featureTypes.join("\n")}\n    }` : "{}"}
+type _SvcApi<T> = T extends { api(): infer R } ? NonNullable<R> : never;
+type _EventPayload<T> = T extends { payload(): infer P } ? P : unknown;${eventMapTypes}
 
-declare global {
-    interface Window {
-        electro: ElectroBridge;
-    }
-}
+export interface ElectroBridge ${featureTypes.length > 0 ? `{\n${featureTypes.join("\n")}\n    }` : "{}"}
 `;
 	return {
-		path: `generated/views/${viewName}.bridge.d.ts`,
+		path: `generated/views/${view.name}.bridge.d.ts`,
 		content
 	};
 }
 /** Calculate the import path from the generated env types file to a source file. */
+function toImportPathFrom(outputFilePath, sourceFilePath) {
+	const importPath = relative(dirname(outputFilePath), sourceFilePath).replace(/\.(?:[cm]?tsx?|[cm]?jsx?)$/, "");
+	return importPath.startsWith(".") ? importPath : `./${importPath}`;
+}
+/** Calculate the import path from the generated env types file to a source file. */
 function toImportPath(envTypesDir, sourceFilePath) {
-	const importPath = relative(dirname(join(envTypesDir, "electro-env.d.ts")), sourceFilePath).replace(/\.ts$/, "");
+	const importPath = relative(dirname(join(envTypesDir, "electro-env.d.ts")), sourceFilePath).replace(/\.(?:[cm]?tsx?|[cm]?jsx?)$/, "");
 	return importPath.startsWith(".") ? importPath : `./${importPath}`;
 }
 const FEATURE_TYPES_HEADER = `// Auto-generated by Electro codegen. Do not edit.
@@ -238,7 +242,7 @@ function generate(input) {
 		const knownIds = new Set(scanResult.features.map((f) => f.id));
 		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));
+		files.push(generateBridgeTypes(view, scanResult.features, policy));
 	}
 	return {
 		files,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cordy/electro-generator",
-    "version": "1.2.11",
+    "version": "1.2.13",
     "description": "Code generator for @cordy/electro — scans features and emits preload scripts and bridge types",
     "license": "MIT",
     "type": "module",