@lunora/vite 1.0.0-alpha.5 → 1.0.0-alpha.50

package/dist/packem_shared/{codegenPlugin-CHzvXqK6.mjs → codegenPlugin-3AqQzOq0.mjs}

@@ -1,9 +1,44 @@
 import { existsSync } from 'node:fs';
-import { resolve, sep, join } from 'node:path';
+import { join, resolve, sep, basename } from 'node:path';
 import { createCodegenProject, refreshCodegenProject, runCodegen, CodegenDiagnosticError } from '@lunora/codegen';
-import { inferLunoraBindings, reconcileWranglerBindings } from '@lunora/config';
+import { findWranglerFile, LUNORA_CONFIG_FILE, readWranglerJsonc, WRANGLER_FILES, collectWranglerSecretVariables, inferLunoraBindings, reconcileWranglerBindings } from '@lunora/config';
+import { isRunnableDevEnvironment } from 'vite';
 import { reconcileWranglerCrons } from './reconcileWranglerCrons-PxGwfCp_.mjs';
-import { L as LUNORA_TAG } from './log-Bgkv6QhO.mjs';
+import LUNORA_API_UPDATED_EVENT from './LUNORA_API_UPDATED_EVENT-BrkWk3rr.mjs';
+import { L as LUNORA_TAG, a as advisoryLine } from './log-BjO9EWah.mjs';
+
+const fingerprintJsonc = (filePath, normalize) => {
+  try {
+    const { parsed, text } = readWranglerJsonc(filePath);
+    if (parsed === void 0) {
+      return `raw:${text}`;
+    }
+    return JSON.stringify(normalize ? normalize(parsed) : parsed);
+  } catch {
+    return "unreadable";
+  }
+};
+const stripCodegenOwnedCrons = (parsed) => {
+  const clone = { ...parsed };
+  const { triggers } = clone;
+  if (triggers !== null && typeof triggers === "object") {
+    const restTriggers = { ...triggers };
+    delete restTriggers.crons;
+    if (Object.keys(restTriggers).length > 0) {
+      clone.triggers = restTriggers;
+    } else {
+      delete clone.triggers;
+    }
+  }
+  return clone;
+};
+const computeConfigFingerprint = (projectRoot) => {
+  const wranglerFile = findWranglerFile(projectRoot);
+  const wranglerPart = wranglerFile === void 0 ? "absent" : fingerprintJsonc(wranglerFile, stripCodegenOwnedCrons);
+  const lunoraConfigPath = join(projectRoot, LUNORA_CONFIG_FILE);
+  const lunoraPart = existsSync(lunoraConfigPath) ? fingerprintJsonc(lunoraConfigPath) : "absent";
+  return `${wranglerPart}\0${lunoraPart}`;
+};
 
 const DEBOUNCE_MS = 100;
 const TSCONFIG_VARIANT_RE = /[/\\]tsconfig\..+\.json$/u;
@@ -43,7 +78,13 @@ const runCodegenSafely = (options, logger, overlay, project) => {
     return void 0;
   }
   try {
-    const result = runCodegen({ apiSpec: options.apiSpec, lunoraDirectory: options.schemaDir, project, projectRoot: options.projectRoot });
+    const result = runCodegen({
+      apiSpec: options.apiSpec,
+      lunoraDirectory: options.schemaDir,
+      project,
+      projectRoot: options.projectRoot,
+      wranglerVariables: collectWranglerSecretVariables(options.projectRoot)
+    });
     try {
       const reconciled = reconcileWranglerCrons(options.projectRoot, result.cronTriggers);
       if (reconciled.changed) {
@@ -56,7 +97,12 @@ const runCodegenSafely = (options, logger, overlay, project) => {
       logger.warn(`${LUNORA_TAG} cron trigger sync skipped: ${message}`);
     }
     for (const advisory of result.advisories) {
-      logger.warn(`${LUNORA_TAG} schema advisory [${advisory.level}] ${advisory.name}: ${advisory.detail} — ${advisory.remediation}`);
+      const line = advisoryLine(advisory.level, advisory.name, advisory.detail, advisory.remediation);
+      if (advisory.level === "ERROR") {
+        logger.error(line);
+      } else {
+        logger.warn(line);
+      }
     }
     return resolve(result.outputDirectory);
   } catch (error) {
@@ -66,11 +112,36 @@ const runCodegenSafely = (options, logger, overlay, project) => {
     return void 0;
   }
 };
+const notifyEnvironmentsAfterCodegen = (server, changedFile, clearErrorOverlay) => {
+  let clientEnvironment;
+  for (const [name, environment] of Object.entries(server.environments)) {
+    if (name === "client") {
+      clientEnvironment = environment;
+      continue;
+    }
+    if (isRunnableDevEnvironment(environment)) {
+      continue;
+    }
+    environment.hot.send({ path: "*", triggeredBy: changedFile, type: "full-reload" });
+  }
+  if (clientEnvironment === void 0) {
+    server.hot.send({ type: "full-reload" });
+    return;
+  }
+  if (clearErrorOverlay) {
+    clientEnvironment.hot.send({ type: "full-reload" });
+    return;
+  }
+  clientEnvironment.hot.send({ event: LUNORA_API_UPDATED_EVENT, type: "custom" });
+};
 const codegenPlugin = (options) => {
   const absoluteSchemaDirectory = resolve(options.projectRoot, options.schemaDir);
   let absoluteGeneratedDirectory = resolve(options.projectRoot, options.generatedDir);
   let debounceTimer;
   let devServer;
+  let configFingerprint;
+  let configBaselineSettled = false;
+  let restartInFlight = false;
   return {
     async buildStart() {
       const logger = {
@@ -94,10 +165,16 @@ const codegenPlugin = (options) => {
           type: "error"
         });
       });
+      if (devServer !== void 0) {
+        configFingerprint = computeConfigFingerprint(options.projectRoot);
+        configBaselineSettled = true;
+      }
     },
     configureServer(server) {
       devServer = server;
       server.watcher.add(absoluteSchemaDirectory);
+      configFingerprint = computeConfigFingerprint(options.projectRoot);
+      configBaselineSettled = false;
       const serverLogger = {
         error: (message) => {
           server.config.logger.error(message);
@@ -109,8 +186,10 @@ const codegenPlugin = (options) => {
           server.config.logger.warn(message);
         }
       };
+      let hadErrorOverlay = false;
       const overlay = {
         onError(error, message) {
+          hadErrorOverlay = true;
           const loc = error instanceof CodegenDiagnosticError ? { column: error.column, file: error.file, line: error.line } : void 0;
           const overlayMessage = loc === void 0 ? `[lunora] codegen failed: ${message}
 (see terminal for full stack trace and file location)` : `[lunora] codegen failed: ${message}`;
@@ -128,19 +207,8 @@ const codegenPlugin = (options) => {
       let closed = false;
       let cachedProject;
       const invalidateGenerated = () => {
-        const environments = server.environments;
-        const graphs = [];
-        if (environments !== void 0) {
-          for (const environment of Object.values(environments)) {
-            if (environment.moduleGraph !== void 0) {
-              graphs.push(environment.moduleGraph);
-            }
-          }
-        }
-        if (graphs.length === 0) {
-          graphs.push(server.moduleGraph);
-        }
-        for (const graph of graphs) {
+        for (const environment of Object.values(server.environments)) {
+          const graph = environment.moduleGraph;
           for (const moduleEntry of graph.idToModuleMap.values()) {
             if (moduleEntry.id && isInside(moduleEntry.id, absoluteGeneratedDirectory)) {
               graph.invalidateModule(moduleEntry);
@@ -186,12 +254,55 @@ const codegenPlugin = (options) => {
           }
           absoluteGeneratedDirectory = outputDirectory;
           invalidateGenerated();
-          server.hot.send({ type: "full-reload" });
+          notifyEnvironmentsAfterCodegen(server, normalized, hadErrorOverlay);
+          hadErrorOverlay = false;
         }, DEBOUNCE_MS);
       };
       server.watcher.on("add", onChange);
       server.watcher.on("change", onChange);
       server.watcher.on("unlink", onChange);
+      const configWatchPaths = /* @__PURE__ */ new Set([
+        ...WRANGLER_FILES.map((name) => resolve(options.projectRoot, name)),
+        resolve(options.projectRoot, LUNORA_CONFIG_FILE)
+      ]);
+      for (const configPath of configWatchPaths) {
+        server.watcher.add(configPath);
+      }
+      const onConfigChange = (file) => {
+        if (!configWatchPaths.has(resolve(file))) {
+          return;
+        }
+        if (restartInFlight) {
+          return;
+        }
+        const nextFingerprint = computeConfigFingerprint(options.projectRoot);
+        if (!configBaselineSettled) {
+          configFingerprint = nextFingerprint;
+          return;
+        }
+        if (configFingerprint === void 0) {
+          configFingerprint = nextFingerprint;
+          return;
+        }
+        if (nextFingerprint === configFingerprint) {
+          return;
+        }
+        configFingerprint = nextFingerprint;
+        restartInFlight = true;
+        server.config.logger.info(`${LUNORA_TAG} ${basename(resolve(file))} changed — restarting dev server`);
+        Promise.resolve(server.restart()).finally(() => {
+          restartInFlight = false;
+        }).catch((error) => {
+          const message = error instanceof Error ? error.message : String(error);
+          server.config.logger.error(
+            `${LUNORA_TAG} dev server restart failed: ${message} — keeping the running server; re-save your config to retry.`
+          );
+          server.hot.send({ err: { loc: void 0, message: `[lunora] dev server restart failed: ${message}`, stack: "" }, type: "error" });
+        });
+      };
+      server.watcher.on("add", onConfigChange);
+      server.watcher.on("change", onConfigChange);
+      server.watcher.on("unlink", onConfigChange);
       return () => {
         server.httpServer?.once("close", () => {
           closed = true;
@@ -203,6 +314,9 @@ const codegenPlugin = (options) => {
           server.watcher.off("add", onChange);
           server.watcher.off("change", onChange);
           server.watcher.off("unlink", onChange);
+          server.watcher.off("add", onConfigChange);
+          server.watcher.off("change", onConfigChange);
+          server.watcher.off("unlink", onConfigChange);
         });
       };
     },

package/dist/packem_shared/containerLogsPlugin-DMssU3wb.mjs

@@ -0,0 +1,50 @@
+import { discoverContainerInfo, streamContainerLogs } from '@lunora/config';
+import { l as lunoraLine } from './log-BjO9EWah.mjs';
+
+const containerLogsPlugin = (options) => {
+  let handle;
+  const closeHandle = () => {
+    handle?.close();
+    handle = void 0;
+  };
+  return {
+    apply: "serve",
+    // Fires on `server.close()` for both the normal and middleware-mode dev
+    // servers, so the Docker poll loop is torn down even when there is no
+    // `httpServer` to listen on (middleware mode).
+    buildEnd() {
+      closeHandle();
+    },
+    configureServer(server) {
+      if (handle || process.env.LUNORA_CONTAINER_LOGS === "0") {
+        return;
+      }
+      const discovery = discoverContainerInfo(options.projectRoot, options.schemaDir);
+      const containers = discovery.containers.map((container) => {
+        return { className: container.className, exportName: container.exportName };
+      });
+      if (containers.length === 0) {
+        return;
+      }
+      const { logger } = server.config;
+      handle = streamContainerLogs({
+        containers,
+        onLine: (line) => {
+          const text = lunoraLine(`container:${line.name} ${line.text}`);
+          if (line.level === "error") {
+            logger.warn(text);
+          } else {
+            logger.info(text);
+          }
+        },
+        onUnavailable: (message) => {
+          logger.warn(lunoraLine(`container: Docker engine unreachable — container logs unavailable (${message})`));
+        }
+      });
+      server.httpServer?.once("close", closeHandle);
+    },
+    name: "lunora:container-logs"
+  };
+};
+
+export { containerLogsPlugin as default };

package/dist/packem_shared/devStatePlugin-D7Qc2gKr.mjs

@@ -0,0 +1,78 @@
+import { claimDevServerState, DEV_LOG_FILE_ENV, DEV_DAEMON_ENV, DEV_HANDOFF_ENV, clearDevServerState } from '@lunora/config';
+import { l as lunoraLine } from './log-BjO9EWah.mjs';
+
+const TRAILING_SLASH = /\/$/;
+const resolveLocalUrl = (server) => {
+  const resolved = server.resolvedUrls?.local[0];
+  if (resolved !== void 0) {
+    return resolved.replace(TRAILING_SLASH, "");
+  }
+  const address = server.httpServer?.address();
+  if (address !== null && typeof address === "object") {
+    return `http://localhost:${String(address.port)}`;
+  }
+  return void 0;
+};
+const devStatePlugin = (options) => {
+  let recorded = false;
+  return {
+    apply: "serve",
+    configureServer(server) {
+      const root = options.projectRoot;
+      const record = () => {
+        if (recorded) {
+          return;
+        }
+        const url = resolveLocalUrl(server);
+        if (url === void 0) {
+          return;
+        }
+        const handoffPid = Number(process.env[DEV_HANDOFF_ENV]);
+        const claim = claimDevServerState(
+          root,
+          {
+            background: process.env[DEV_DAEMON_ENV] === "1",
+            logFile: process.env[DEV_LOG_FILE_ENV],
+            mode: "vite",
+            pid: process.pid,
+            startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            url
+          },
+          Number.isInteger(handoffPid) && handoffPid > 0 ? { supersedePid: handoffPid } : void 0
+        );
+        if (!claim.ok) {
+          if (claim.existing !== void 0) {
+            server.config.logger.warn(
+              lunoraLine(
+                `another dev server is already recorded at ${claim.existing.url} (pid ${String(claim.existing.pid)}) — leaving .lunora/dev.json untouched`
+              )
+            );
+          }
+          return;
+        }
+        recorded = true;
+      };
+      server.httpServer?.once("close", () => {
+        if (recorded) {
+          clearDevServerState(root, process.pid);
+          recorded = false;
+        }
+      });
+      return () => {
+        if (typeof server.printUrls === "function") {
+          const printUrls = server.printUrls.bind(server);
+          server.printUrls = () => {
+            printUrls();
+            record();
+          };
+        }
+        server.httpServer?.once("listening", () => {
+          setTimeout(record, 0);
+        });
+      };
+    },
+    name: "lunora:dev-state"
+  };
+};
+
+export { devStatePlugin as default };

package/dist/packem_shared/devVariablesPlugin-CDNSnvOP.mjs

@@ -0,0 +1,19 @@
+import { ensureDevVariables, createConfirm, fillDevSecrets } from '@lunora/config';
+import { l as lunoraLine } from './log-BjO9EWah.mjs';
+
+const devVariablesPlugin = (options) => {
+  return {
+    apply: "serve",
+    async configResolved() {
+      const info = (message) => {
+        console.info(lunoraLine(message));
+      };
+      await ensureDevVariables({ confirm: createConfirm("[lunora] "), cwd: options.projectRoot, info });
+      fillDevSecrets({ cwd: options.projectRoot, info });
+    },
+    enforce: "pre",
+    name: "lunora:dev-vars"
+  };
+};
+
+export { devVariablesPlugin as default };

package/dist/packem_shared/log-BjO9EWah.mjs

@@ -0,0 +1,8 @@
+import { paintBadge, BADGES } from '@lunora/config';
+
+const LUNORA_TAG = paintBadge(BADGES.lunora);
+const lunoraLine = (message) => `${LUNORA_TAG} ${message}`;
+const ADVISORY_BADGE = { ERROR: BADGES.error, INFO: BADGES.info, WARN: BADGES.warn };
+const advisoryLine = (level, name, detail, remediation) => `${paintBadge(ADVISORY_BADGE[level])} ${name}: ${detail} — ${remediation}`;
+
+export { LUNORA_TAG as L, advisoryLine as a, lunoraLine as l };

package/dist/packem_shared/{logStreamPlugin-CqvZ17kd.mjs → logStreamPlugin-CVrcDAZ1.mjs}

@@ -1,4 +1,4 @@
-import { LUNORA_EVENT_SOURCE, formatLunoraEvent } from '@lunora/config';
+import { detectAiAgent, LUNORA_EVENT_SOURCE, formatLunoraEvent } from '@lunora/config';
 
 const LUNORA_MARKER = `"source":"${LUNORA_EVENT_SOURCE}"`;
 const ANSI = {
@@ -35,6 +35,16 @@ const patchStream = (stream) => {
     stream.write = original;
   };
 };
+const wantRawJsonLogs = () => {
+  const flag = process.env.LUNORA_LOG_JSON;
+  if (flag === "1" || flag === "true") {
+    return true;
+  }
+  if (flag === "0" || flag === "false") {
+    return false;
+  }
+  return detectAiAgent() !== void 0;
+};
 const logStreamPlugin = () => {
   let restore;
   return {
@@ -43,6 +53,9 @@ const logStreamPlugin = () => {
       if (restore) {
         return;
       }
+      if (wantRawJsonLogs()) {
+        return;
+      }
       const restoreStdout = patchStream(process.stdout);
       const restoreStderr = patchStream(process.stderr);
       restore = () => {

package/dist/packem_shared/lunoraSolutionFinder-BKEAiUJP.mjs

@@ -0,0 +1,17 @@
+import { findLunoraSolution } from '@lunora/codegen';
+
+const lunoraSolutionFinder = {
+  // Synchronous body wrapped in `Promise.resolve` rather than `async`: the
+  // overlay's `handle` contract is promise-returning, but `require-await` is on
+  // for src and there's nothing to await here.
+  handle: (error) => {
+    const message = typeof error.message === "string" ? error.message : "";
+    const solution = findLunoraSolution(message);
+    return Promise.resolve(solution ? { body: solution.body, header: solution.header } : void 0);
+  },
+  name: "lunora",
+  priority: 100
+};
+const lunoraSolutionFinders = [lunoraSolutionFinder];
+
+export { lunoraSolutionFinder, lunoraSolutionFinders };

package/dist/packem_shared/{wranglerValidatorPlugin-DggqUjxL.mjs → wranglerValidatorPlugin-C5VWOD7N.mjs}

@@ -1,6 +1,7 @@
 import { spawnSync } from 'node:child_process';
 import { validateWranglerProject, readWranglerJsonc } from '@lunora/config';
-import { l as lunoraLine } from './log-Bgkv6QhO.mjs';
+import { LunoraError } from '@lunora/errors';
+import { l as lunoraLine } from './log-BjO9EWah.mjs';
 
 const isLocalImagePath = (image) => image.startsWith("./") || image.startsWith("../") || image.startsWith("/") || image.includes("Dockerfile");
 const probeDocker = () => {
@@ -41,7 +42,8 @@ const wranglerValidatorPlugin = (options) => {
         schemaDir: options.schemaDir
       });
       if (!result.wranglerPath) {
-        throw new Error(
+        throw new LunoraError(
+          "INTERNAL",
           [
             "[lunora] wrangler.jsonc not found.",
             `  searched in: ${options.projectRoot}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunora/vite",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.50",
   "description": "The Lunora Vite plugin: codegen, type sync, wrangler validation, and an error overlay over @cloudflare/vite-plugin",
   "keywords": [
     "cloudflare",
@@ -25,7 +25,7 @@
     "directory": "packages/vite"
   },
   "files": [
-    "dist",
+    "./dist",
     "__assets__",
     "README.md",
     "LICENSE.md"
@@ -45,16 +45,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@cloudflare/vite-plugin": "1.42.0",
-    "@lunora/codegen": "1.0.0-alpha.3",
-    "@lunora/config": "1.0.0-alpha.5",
+    "@cloudflare/vite-plugin": "1.42.3",
+    "@lunora/codegen": "1.0.0-alpha.32",
+    "@lunora/config": "1.0.0-alpha.50",
+    "@lunora/errors": "1.0.0-alpha.1",
     "@visulima/vite-overlay": "2.0.0-alpha.35",
     "jsonc-parser": "^3.3.1",
     "ts-morph": "^28.0.0"
   },
   "peerDependencies": {
-    "@lunora/studio": "1.0.0-alpha.3",
-    "vite": "^8.0.16"
+    "@lunora/studio": "1.0.0-alpha.35",
+    "vite": "^8.1.0"
   },
   "peerDependenciesMeta": {
     "@lunora/studio": {

package/dist/packem_shared/devVariablesPlugin-DbDf7tmi.mjs

@@ -1,21 +0,0 @@
-import { ensureDevVariables, createConfirm } from '@lunora/config';
-import { l as lunoraLine } from './log-Bgkv6QhO.mjs';
-
-const devVariablesPlugin = (options) => {
-  return {
-    apply: "serve",
-    async configResolved() {
-      await ensureDevVariables({
-        confirm: createConfirm("[lunora] "),
-        cwd: options.projectRoot,
-        info: (message) => {
-          console.info(lunoraLine(message));
-        }
-      });
-    },
-    enforce: "pre",
-    name: "lunora:dev-vars"
-  };
-};
-
-export { devVariablesPlugin as default };

package/dist/packem_shared/log-Bgkv6QhO.mjs

@@ -1,6 +0,0 @@
-import { paintBadge, BADGES } from '@lunora/config';
-
-const LUNORA_TAG = paintBadge(BADGES.lunora);
-const lunoraLine = (message) => `${LUNORA_TAG} ${message}`;
-
-export { LUNORA_TAG as L, lunoraLine as l };