@korajs/cli 1.0.0-beta.6 → 1.0.0-beta.9

package/dist/bin.cjs

@@ -1981,11 +1981,11 @@ var spectator_manager_exports = {};
 __export(spectator_manager_exports, {
   SpectatorManager: () => SpectatorManager
 });
-var import_node_fs6, import_node_os, import_node_path28, FORWARDED_EVENTS, MAX_EVENT_BUFFER, SpectatorManager;
+var import_node_fs7, import_node_os, import_node_path28, FORWARDED_EVENTS, MAX_EVENT_BUFFER, SpectatorManager;
 var init_spectator_manager = __esm({
   "src/commands/studio/spectator-manager.ts"() {
     "use strict";
-    import_node_fs6 = require("fs");
+    import_node_fs7 = require("fs");
     import_node_os = require("os");
     import_node_path28 = require("path");
     FORWARDED_EVENTS = [
@@ -2001,7 +2001,7 @@ var init_spectator_manager = __esm({
     SpectatorManager = class {
       constructor(options) {
         this.options = options;
-        this.tmpDir = (0, import_node_fs6.mkdtempSync)((0, import_node_path28.join)((0, import_node_os.tmpdir)(), "kora-studio-spectator-"));
+        this.tmpDir = (0, import_node_fs7.mkdtempSync)((0, import_node_path28.join)((0, import_node_os.tmpdir)(), "kora-studio-spectator-"));
         this.dbPath = (0, import_node_path28.join)(this.tmpDir, "spectator-replica.db");
       }
       options;
@@ -2099,7 +2099,7 @@ var init_spectator_manager = __esm({
           this.runtime = null;
         }
         if (this.tmpDir) {
-          (0, import_node_fs6.rmSync)(this.tmpDir, { recursive: true, force: true });
+          (0, import_node_fs7.rmSync)(this.tmpDir, { recursive: true, force: true });
           this.tmpDir = null;
         }
       }
@@ -2182,11 +2182,11 @@ function summarizeEvent(type, payload) {
       return type.replace("lab:", "");
   }
 }
-var import_node_fs7, import_node_os2, import_node_path29, import_core3, DEFAULT_CHAOS, FORWARDED_EVENTS2, MAX_EVENT_BUFFER2, LabManager;
+var import_node_fs8, import_node_os2, import_node_path29, import_core3, DEFAULT_CHAOS, FORWARDED_EVENTS2, MAX_EVENT_BUFFER2, LabManager;
 var init_lab_manager = __esm({
   "src/commands/studio/lab-manager.ts"() {
     "use strict";
-    import_node_fs7 = require("fs");
+    import_node_fs8 = require("fs");
     import_node_os2 = require("os");
     import_node_path29 = require("path");
     import_core3 = require("@korajs/core");
@@ -2246,7 +2246,7 @@ var init_lab_manager = __esm({
       }
       async start(initialDevices = 2) {
         const harness = await this.loadHarness();
-        this.tmpDir = (0, import_node_fs7.mkdtempSync)((0, import_node_path29.join)((0, import_node_os2.tmpdir)(), "kora-studio-lab-"));
+        this.tmpDir = (0, import_node_fs8.mkdtempSync)((0, import_node_path29.join)((0, import_node_os2.tmpdir)(), "kora-studio-lab-"));
         this.server = new harness.TestServer(this.schema);
         for (let i = 0; i < initialDevices; i++) {
           await this.addDevice();
@@ -2377,7 +2377,7 @@ var init_lab_manager = __esm({
         });
         this.server = null;
         if (this.tmpDir) {
-          (0, import_node_fs7.rmSync)(this.tmpDir, { recursive: true, force: true });
+          (0, import_node_fs8.rmSync)(this.tmpDir, { recursive: true, force: true });
           this.tmpDir = null;
         }
       }
@@ -4279,9 +4279,7 @@ function resolveKoraVersion() {
       if ((0, import_node_fs2.existsSync)(pkgPath)) {
         const pkg = JSON.parse((0, import_node_fs2.readFileSync)(pkgPath, "utf-8"));
         if (pkg.name === "@korajs/cli") {
-          if (pkg.version === "0.0.0") return "latest";
-          const parts = pkg.version.split(".");
-          return `^${parts[0]}.${parts[1]}.0`;
+          return deriveKoraTemplateVersion(pkg.version);
         }
       }
       dir = (0, import_node_path10.dirname)(dir);
@@ -4291,6 +4289,12 @@ function resolveKoraVersion() {
     return "latest";
   }
 }
+function deriveKoraTemplateVersion(version) {
+  if (version === "0.0.0") return "latest";
+  if (version.includes("-")) return version;
+  const parts = version.split(".");
+  return `^${parts[0]}.${parts[1]}.0`;
+}
 
 // src/commands/deploy/deploy-command.ts
 var import_node_fs4 = require("fs");
@@ -6508,6 +6512,7 @@ function hasContextSetter(adapter) {
 }
 
 // src/commands/dev/dev-command.ts
+var import_node_fs6 = require("fs");
 var import_promises15 = require("fs/promises");
 var import_node_path23 = require("path");
 var import_node_path24 = require("path");
@@ -6519,6 +6524,7 @@ var import_node_child_process10 = require("child_process");
 var ProcessManager = class {
   processes = /* @__PURE__ */ new Map();
   spawn(config) {
+    this.processes.get(config.label)?.child.kill("SIGTERM");
     const options = {
       cwd: config.cwd,
       env: { ...process.env, ...config.env },
@@ -6562,6 +6568,20 @@ var ProcessManager = class {
   hasRunning() {
     return this.processes.size > 0;
   }
+  async restart(config) {
+    await this.stop(config.label);
+    this.spawn(config);
+  }
+  async stop(label) {
+    const running = this.processes.get(label);
+    if (!running) return;
+    running.child.kill("SIGTERM");
+    await Promise.race([running.exitPromise, delay(5e3)]);
+    const remaining = this.processes.get(label);
+    if (!remaining) return;
+    remaining.child.kill("SIGKILL");
+    await remaining.exitPromise;
+  }
   async shutdownAll() {
     const running = Array.from(this.processes.values());
     if (running.length === 0) return;
@@ -6606,6 +6626,7 @@ var import_node_child_process11 = require("child_process");
 var import_node_fs5 = require("fs");
 var import_node_path22 = require("path");
 init_fs_helpers();
+init_schema_loader();
 var SchemaWatcher = class {
   constructor(config) {
     this.config = config;
@@ -6615,6 +6636,7 @@ var SchemaWatcher = class {
   debounceMs;
   watcher = null;
   debounceTimer = null;
+  schemaVersion = null;
   start() {
     if (this.watcher) return;
     this.watcher = (0, import_node_fs5.watch)(this.config.schemaPath, () => {
@@ -6623,6 +6645,9 @@ var SchemaWatcher = class {
     this.watcher.on("error", (error) => {
       this.config.onError?.(toError(error));
     });
+    void this.refreshSchemaVersion().catch((error) => {
+      this.config.onError?.(toError(error));
+    });
   }
   stop() {
     if (this.debounceTimer) {
@@ -6646,6 +6671,15 @@ var SchemaWatcher = class {
     const args = hasTsx ? ["--import", "tsx", koraBinJs, "generate", "types", "--schema", this.config.schemaPath] : [koraBinJs, "generate", "types", "--schema", this.config.schemaPath];
     await spawnCommand(command, args, this.config.projectRoot);
     this.config.onRegenerate?.();
+    await this.refreshSchemaVersion();
+  }
+  async refreshSchemaVersion() {
+    const schema = await loadSchemaDefinition(this.config.schemaPath, this.config.projectRoot);
+    const previous = this.schemaVersion;
+    this.schemaVersion = schema.version;
+    if (previous !== null && previous !== schema.version) {
+      this.config.onSchemaVersionChange?.({ previous, next: schema.version });
+    }
   }
   scheduleRegeneration() {
     if (this.debounceTimer) {
@@ -6730,6 +6764,7 @@ var devCommand = (0, import_citty6.defineCommand)({
     if (!projectRoot) {
       throw new InvalidProjectError(process.cwd());
     }
+    loadProjectEnv(projectRoot);
     const config = await loadKoraConfig(projectRoot);
     const vitePort = typeof args.port === "string" ? args.port : String(config?.dev?.port ?? 5173);
     const syncPortFromConfig = typeof config?.dev?.sync === "object" && typeof config.dev.sync.port === "number" ? config.dev.sync.port : 3001;
@@ -6831,7 +6866,9 @@ var devCommand = (0, import_citty6.defineCommand)({
       logger.step("  Schema watcher disabled (schema.ts not found)");
     }
     logger.blank();
-    logger.step("  Kora DevTools overlay: Ctrl+Shift+K (Cmd+Shift+K on macOS) when devtools: true");
+    logger.step(
+      "  Kora DevTools overlay: Ctrl+Shift+K (Cmd+Shift+K on macOS) when devtools is enabled"
+    );
     processManager.spawn({
       label: "vite",
       command: process.execPath,
@@ -6842,33 +6879,31 @@ var devCommand = (0, import_citty6.defineCommand)({
       },
       onExit: onManagedProcessExit
     });
-    if (shouldStartSync && hasTsx && syncServerFile) {
-      processManager.spawn({
-        label: "sync",
-        command: process.execPath,
-        args: ["--import", "tsx", syncServerFile],
-        cwd: projectRoot,
-        env: {
-          PORT: String(syncPort),
-          KORA_SYNC_PORT: String(syncPort)
-        },
-        onExit: onManagedProcessExit
-      });
-    }
-    if (shouldStartSync && syncServerFile === null && managedSyncStore !== null) {
-      processManager.spawn({
-        label: "sync",
-        command: process.execPath,
-        args: ["--input-type=module", "--eval", MANAGED_SYNC_BOOTSTRAP_SCRIPT],
-        cwd: projectRoot,
-        env: {
-          KORA_DEV_SYNC_CONFIG: JSON.stringify({
-            port: Number(syncPort),
-            store: managedSyncStore
-          })
-        },
-        onExit: onManagedProcessExit
-      });
+    const syncProcessConfig = shouldStartSync && hasTsx && syncServerFile ? {
+      label: "sync",
+      command: process.execPath,
+      args: ["--import", "tsx", syncServerFile],
+      cwd: projectRoot,
+      env: {
+        PORT: String(syncPort),
+        KORA_SYNC_PORT: String(syncPort)
+      },
+      onExit: onManagedProcessExit
+    } : shouldStartSync && syncServerFile === null && managedSyncStore !== null ? {
+      label: "sync",
+      command: process.execPath,
+      args: ["--input-type=module", "--eval", MANAGED_SYNC_BOOTSTRAP_SCRIPT],
+      cwd: projectRoot,
+      env: {
+        KORA_DEV_SYNC_CONFIG: JSON.stringify({
+          port: Number(syncPort),
+          store: managedSyncStore
+        })
+      },
+      onExit: onManagedProcessExit
+    } : null;
+    if (syncProcessConfig) {
+      processManager.spawn(syncProcessConfig);
     }
     if (watchEnabled && schemaPath) {
       schemaWatcher = new SchemaWatcher({
@@ -6878,6 +6913,16 @@ var devCommand = (0, import_citty6.defineCommand)({
         onRegenerate: () => {
           logger.success("Regenerated types from schema changes");
         },
+        onSchemaVersionChange: ({ previous, next }) => {
+          if (!syncProcessConfig) {
+            logger.warn(
+              `Schema version changed from ${previous} to ${next}; restart your sync server before clients can sync.`
+            );
+            return;
+          }
+          logger.warn(`Schema version changed from ${previous} to ${next}; restarting sync server.`);
+          void processManager.restart(syncProcessConfig);
+        },
         onError: (error) => {
           logger.error(`Schema watcher error: ${error.message}`);
         }
@@ -6908,6 +6953,43 @@ async function fileExists3(path) {
     return false;
   }
 }
+function loadProjectEnv(projectRoot, mode = "development") {
+  const files = [".env", ".env.local", `.env.${mode}`, `.env.${mode}.local`];
+  const existingKeys = new Set(Object.keys(process.env));
+  for (const file of files) {
+    const path = (0, import_node_path23.join)(projectRoot, file);
+    if (!(0, import_node_fs6.existsSync)(path)) continue;
+    const parsed = parseEnvFile((0, import_node_fs6.readFileSync)(path, "utf8"));
+    for (const [key, value] of Object.entries(parsed)) {
+      if (!existingKeys.has(key)) {
+        process.env[key] = value;
+      }
+    }
+  }
+}
+function parseEnvFile(contents) {
+  const env = {};
+  for (const rawLine of contents.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#")) continue;
+    const normalized = line.startsWith("export ") ? line.slice("export ".length).trim() : line;
+    const equalsIndex = normalized.indexOf("=");
+    if (equalsIndex <= 0) continue;
+    const key = normalized.slice(0, equalsIndex).trim();
+    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) continue;
+    env[key] = parseEnvValue(normalized.slice(equalsIndex + 1).trim());
+  }
+  return env;
+}
+function parseEnvValue(value) {
+  const quote = value[0];
+  if ((quote === '"' || quote === "'") && value[value.length - 1] === quote) {
+    const inner = value.slice(1, -1);
+    return quote === '"' ? inner.replace(/\\n/g, "\n").replace(/\\r/g, "\r") : inner;
+  }
+  const commentIndex = value.search(/\s#/);
+  return (commentIndex >= 0 ? value.slice(0, commentIndex) : value).trim();
+}
 function normalizeManagedSyncStore(config, projectRoot) {
   const sync = config?.dev?.sync;
   if (typeof sync !== "object" || sync === null) return null;
@@ -8765,7 +8847,7 @@ function printStatus(status, url, logger) {
 }
 
 // src/commands/studio/studio-command.ts
-var import_node_fs8 = require("fs");
+var import_node_fs9 = require("fs");
 var import_node_path30 = require("path");
 var import_citty12 = require("citty");
 var studioCommand = (0, import_citty12.defineCommand)({
@@ -8870,7 +8952,7 @@ var studioCommand = (0, import_citty12.defineCommand)({
       );
     }
     const dbPath = (0, import_node_path30.resolve)(process.cwd(), args.db);
-    if (!(0, import_node_fs8.existsSync)(dbPath)) {
+    if (!(0, import_node_fs9.existsSync)(dbPath)) {
       throw new Error(`Database file not found: ${dbPath}`);
     }
     const server = await startStudioServer2({ port, dbPath });