@cordy/electro-generator 1.2.20 → 1.3.0

package/dist/index.d.mts

@@ -2,11 +2,11 @@ import { ViewDefinition } from "@cordy/electro";
 
 //#region src/types.d.ts
 /**
-* Codegen scan result types.
-*
-* These are the shapes the AST scanner produces and the generator consumes.
-* First iteration uses method names only — full type extraction is future work.
-*/
+ * Codegen scan result types.
+ *
+ * These are the shapes the AST scanner produces and the generator consumes.
+ * First iteration uses method names only — full type extraction is future work.
+ */
 interface ScannedService {
   id: string;
   scope: string;
@@ -67,17 +67,17 @@ interface GeneratorOutput {
   envTypes: GeneratedFile;
 }
 /**
-* Generate all output files from scan results and view definitions.
-*/
+ * Generate all output files from scan results and view definitions.
+ */
 declare function generate(input: GeneratorInput): GeneratorOutput;
 //#endregion
 //#region src/scanner.d.ts
 /**
-* Scan TypeScript source files and extract feature/service metadata.
-*
-* @param basePath - Root directory to scan (e.g., `./src`)
-* @returns Aggregated scan result with all discovered features and services.
-*/
+ * Scan TypeScript source files and extract feature/service metadata.
+ *
+ * @param basePath - Root directory to scan (e.g., `./src`)
+ * @returns Aggregated scan result with all discovered features and services.
+ */
 declare function scan(basePath: string): Promise<ScanResult>;
 //#endregion
 export { type GeneratedFile, type GeneratorInput, type GeneratorOutput, type ScanResult, type ScannedFeature, type ScannedService, type ScannedTask, type ScannedWindow, generate, scan };

package/dist/index.mjs

@@ -2,7 +2,6 @@ import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { PolicyEngine } from "@cordy/electro";
 import { readFileSync } from "node:fs";
 import { Visitor, parseSync } from "oxc-parser";
-
 //#region src/generator.ts
 /**
 * Code Generator — produces preload scripts, bridge types, and context types.
@@ -15,6 +14,9 @@ const HEADER = "// Auto-generated by Electro codegen. Do not edit.\n";
 function q(name) {
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name) ? name : `"${name}"`;
 }
+function isFeatureScopedService(featureId, serviceId) {
+	return featureId === serviceId;
+}
 /**
 * Build the IPC stub expression for a single method.
 * Format: `(...args: unknown[]) => ipcRenderer.invoke("feature:service:method", ...args)`
@@ -37,8 +39,14 @@ function generatePreload(viewName, features, policy, preloadExtensions = []) {
 			featureEntries.push(`    ${q(feature.id)}: {},`);
 			continue;
 		}
+		const featureMethodEntries = [];
 		const serviceEntries = [];
 		for (const service of exposedServices) {
+			if (isFeatureScopedService(feature.id, service.id)) {
+				const methodEntries = service.methods.map((m) => `        ${q(m)}: ${methodStub(feature.id, service.id, m)},`).join("\n");
+				if (methodEntries.length > 0) featureMethodEntries.push(methodEntries);
+				continue;
+			}
 			if (service.methods.length === 0) {
 				serviceEntries.push(`        ${q(service.id)}: {},`);
 				continue;
@@ -46,7 +54,8 @@ function generatePreload(viewName, features, policy, preloadExtensions = []) {
 			const methodEntries = service.methods.map((m) => `            ${q(m)}: ${methodStub(feature.id, service.id, m)},`).join("\n");
 			serviceEntries.push(`        ${q(service.id)}: {\n${methodEntries}\n        },`);
 		}
-		featureEntries.push(`    ${q(feature.id)}: {\n${serviceEntries.join("\n")}\n    },`);
+		const featureBody = [...featureMethodEntries, ...serviceEntries].join("\n");
+		featureEntries.push(`    ${q(feature.id)}: {\n${featureBody}\n    },`);
 	}
 	if (allowedFeatures.length > 0) featureEntries.push(`    events: {
         on: (channel: string, handler: (...args: unknown[]) => void) => {
@@ -94,12 +103,21 @@ function generateBridgeTypes(view, features, policy) {
 			featureTypes.push(`        ${q(feature.id)}: Record<string, never>;`);
 			continue;
 		}
+		let featureScopedType = null;
 		const serviceTypes = [];
-		for (const service of exposedServices) if (service.exported) {
+		for (const service of exposedServices) {
 			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 serviceType = service.exported ? `_SvcApi<typeof import("${importPath}").${service.varName}>` : "unknown";
+			if (isFeatureScopedService(feature.id, service.id)) {
+				featureScopedType = serviceType;
+				continue;
+			}
+			if (service.exported) serviceTypes.push(`            ${q(service.id)}: ${serviceType};`);
+			else serviceTypes.push(`            ${q(service.id)}: unknown;`);
+		}
+		if (featureScopedType && serviceTypes.length > 0) featureTypes.push(`        ${q(feature.id)}: ${featureScopedType} & {\n${serviceTypes.join("\n")}\n        };`);
+		else if (featureScopedType) featureTypes.push(`        ${q(feature.id)}: ${featureScopedType};`);
+		else featureTypes.push(`        ${q(feature.id)}: {\n${serviceTypes.join("\n")}\n        };`);
 	}
 	const eventTypeEntries = [];
 	for (const feature of allowedFeatures) for (const evt of feature.events ?? []) {
@@ -270,7 +288,6 @@ function generate(input) {
 		envTypes: generateFeatureTypes(scanResult.features, srcDir, views, scanResult.windows ?? [])
 	};
 }
-
 //#endregion
 //#region src/scanner.ts
 /**
@@ -688,6 +705,5 @@ async function scan(basePath) {
 		windows: allWindows.map((pw) => pw.window)
 	};
 }
-
 //#endregion
-export { generate, scan };
+export { generate, scan };

package/package.json

@@ -1,10 +1,9 @@
 {
     "name": "@cordy/electro-generator",
-    "version": "1.2.20",
+    "version": "1.3.0",
     "description": "Code generator for @cordy/electro — scans features and emits preload scripts and bridge types",
     "license": "MIT",
     "type": "module",
-    "sideEffects": false,
     "keywords": [
         "electron",
         "codegen",
@@ -24,9 +23,6 @@
     "publishConfig": {
         "access": "public"
     },
-    "engines": {
-        "bun": ">=1.0.0"
-    },
     "main": "./dist/index.mjs",
     "types": "./dist/index.d.mts",
     "files": [
@@ -44,15 +40,19 @@
         "prepublishOnly": "bun run build"
     },
     "peerDependencies": {
-        "@cordy/electro": "1.2.19"
+        "@cordy/electro": ">=1",
+        "electron": ">=41",
+        "vite": ">=8"
     },
     "dependencies": {
-        "oxc-parser": "^0.115.0",
+        "oxc-parser": "^0.120.0",
         "tinyglobby": "^0.2.15"
     },
     "devDependencies": {
-        "@cordy/electro": "1.2.20",
-        "tsdown": "^0.20.3",
-        "vitest": "v4.1.0-beta.3"
+        "@cordy/electro": "1.3.0",
+        "electron": "^41.0.3",
+        "tsdown": "^0.21.4",
+        "vite": "^8.0.0",
+        "vitest": "4.1.0"
     }
 }