@cordy/electro-generator 1.2.15 → 1.2.17

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { dirname, join, relative } from "node:path";
+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";
@@ -28,7 +28,7 @@ function methodStub(featureId, serviceId, method) {
 * Structure: `window.electro.{featureId}.{serviceId}.{method}()`
 * Only EXPOSED scope services are included.
 */
-function generatePreload(viewName, features, policy, preloadExtension) {
+function generatePreload(viewName, features, policy, preloadExtensions = []) {
 	const allowedFeatures = features.filter((f) => policy.canAccess(viewName, f.id));
 	const featureEntries = [];
 	for (const feature of allowedFeatures) {
@@ -61,12 +61,25 @@ import { contextBridge, ipcRenderer } from "electron";
 
 contextBridge.exposeInMainWorld("electro", ${featureEntries.length > 0 ? `{\n${featureEntries.join("\n")}\n}` : "{}"});
 `;
-	if (preloadExtension) content += `\n// User extension\nimport "${preloadExtension}";\n`;
+	if (preloadExtensions.length > 0) {
+		content += `\n// User extensions\n`;
+		for (const extension of preloadExtensions) content += `import "${extension}";\n`;
+	}
 	return {
 		path: `generated/preload/${viewName}.gen.ts`,
 		content
 	};
 }
+function toRuntimeImportPathFrom(outputFilePath, sourceFilePath) {
+	const rel = relative(dirname(outputFilePath), sourceFilePath).replaceAll("\\", "/");
+	return rel.startsWith(".") ? rel : `./${rel}`;
+}
+function resolvePreloadExtensionImport(view, generatedPreloadPath, specifier) {
+	const trimmed = specifier.trim();
+	if (trimmed.length === 0) return trimmed;
+	if (!(trimmed.startsWith(".") || isAbsolute(trimmed))) return trimmed;
+	return toRuntimeImportPathFrom(generatedPreloadPath, isAbsolute(trimmed) ? trimmed : resolve(dirname(view.__source), trimmed));
+}
 /**
 * Generate bridge type declarations for a specific view.
 * Makes `window.electro` type-safe in the renderer.
@@ -235,13 +248,18 @@ ${generateViewTypes(views)}${generateWindowApiTypes(windows, srcDir)}}
 * Generate all output files from scan results and view definitions.
 */
 function generate(input) {
-	const { scanResult, views, srcDir } = input;
+	const { scanResult, views, srcDir, outputDir } = input;
 	const policy = new PolicyEngine(views);
 	const files = [];
 	for (const view of views) {
 		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));
+		const generatedPreloadPath = join(outputDir, "generated", "preload", `${view.name}.gen.ts`);
+		const preloadExtensions = /* @__PURE__ */ new Set();
+		if (typeof view.preload === "string" && view.preload.length > 0) preloadExtensions.add(resolvePreloadExtensionImport(view, generatedPreloadPath, view.preload));
+		const webPreferencesPreload = view.webPreferences?.preload;
+		if (typeof webPreferencesPreload === "string" && webPreferencesPreload.length > 0) preloadExtensions.add(resolvePreloadExtensionImport(view, generatedPreloadPath, webPreferencesPreload));
+		files.push(generatePreload(view.name, scanResult.features, policy, [...preloadExtensions]));
 		files.push(generateBridgeTypes(view, scanResult.features, policy));
 	}
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cordy/electro-generator",
-    "version": "1.2.15",
+    "version": "1.2.17",
     "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.2.15"
+        "@cordy/electro": "1.2.17"
     },
     "dependencies": {
         "oxc-parser": "^0.114.0",
         "tinyglobby": "^0.2.15"
     },
     "devDependencies": {
-        "@cordy/electro": "1.2.15",
+        "@cordy/electro": "1.2.17",
         "tsdown": "^0.20.3",
         "vitest": "v4.1.0-beta.3"
     }