@korajs/cli 0.1.6 → 0.1.8

package/dist/bin.js

@@ -4,9 +4,10 @@ import {
   createLogger,
   findProjectRoot,
   findSchemaFile,
+  hasTsxInstalled,
   promptConfirm,
-  resolveProjectBinary
-} from "./chunk-TZPACPP6.js";
+  resolveProjectBinaryEntryPoint
+} from "./chunk-AUDUNRYA.js";
 import {
   generateTypes
 } from "./chunk-N36PFOSA.js";
@@ -21,7 +22,7 @@ import { defineCommand as defineCommand4, runMain } from "citty";
 
 // src/commands/dev/dev-command.ts
 import { access as access2 } from "fs/promises";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 import { resolve } from "path";
 import { defineCommand } from "citty";
 
@@ -61,14 +62,17 @@ async function findKoraConfigFile(projectRoot) {
   return null;
 }
 async function loadTypeScriptConfig(configPath, projectRoot) {
-  const tsxBinary = await resolveProjectBinary(projectRoot, "tsx");
-  if (!tsxBinary) {
+  if (!await hasTsxInstalled(projectRoot)) {
     throw new Error(
       `Found TypeScript config at ${configPath}, but "tsx" is not installed in this project. Install tsx or use kora.config.js.`
     );
   }
   const script = "const configPath = process.argv[process.argv.length - 1];import('node:url').then(u => import(u.pathToFileURL(configPath).href)).then(mod => { const v = mod.default ?? mod; process.stdout.write(JSON.stringify(v)) }).catch(e => { process.stderr.write(String(e)); process.exit(1) })";
-  const output = await runCommand(tsxBinary, ["--eval", script, configPath], projectRoot);
+  const output = await runCommand(
+    process.execPath,
+    ["--import", "tsx", "--eval", script, configPath],
+    projectRoot
+  );
   try {
     return JSON.parse(output);
   } catch {
@@ -80,8 +84,7 @@ async function runCommand(command, args, cwd) {
     const child = spawn(command, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
-      env: process.env,
-      shell: process.platform === "win32"
+      env: process.env
     });
     let stdout = "";
     let stderr = "";
@@ -122,9 +125,7 @@ var ProcessManager = class {
     const options = {
       cwd: config.cwd,
       env: { ...process.env, ...config.env },
-      stdio: ["ignore", "pipe", "pipe"],
-      // On Windows, .cmd shims require shell to execute
-      shell: process.platform === "win32"
+      stdio: ["ignore", "pipe", "pipe"]
     };
     const child = spawnChild(config.command, config.args, options);
     let resolveExit;
@@ -206,6 +207,7 @@ function delay(ms) {
 // src/commands/dev/schema-watcher.ts
 import { spawn as spawn2 } from "child_process";
 import { watch } from "fs";
+import { join as join2 } from "path";
 var SchemaWatcher = class {
   constructor(config) {
     this.config = config;
@@ -233,16 +235,10 @@ var SchemaWatcher = class {
     this.watcher = null;
   }
   async regenerate() {
-    const koraBinary = await resolveProjectBinary(this.config.projectRoot, "kora");
-    if (!koraBinary) {
-      throw new Error('Could not find project binary "kora" in node_modules/.bin.');
-    }
-    const tsxBinary = await resolveProjectBinary(this.config.projectRoot, "tsx");
-    if (!tsxBinary) {
-      process.stderr.write('[kora] Could not find "tsx" binary. Falling back to node.\n');
-    }
-    const command = tsxBinary ?? process.execPath;
-    const args = [koraBinary, "generate", "types", "--schema", this.config.schemaPath];
+    const koraBinJs = join2(this.config.projectRoot, "node_modules", "@korajs", "cli", "dist", "bin.js");
+    const hasTsx = await hasTsxInstalled(this.config.projectRoot);
+    const command = process.execPath;
+    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?.();
   }
@@ -263,8 +259,7 @@ async function spawnCommand(command, args, cwd) {
     const child = spawn2(command, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
-      env: process.env,
-      shell: process.platform === "win32"
+      env: process.env
     });
     child.stdout?.on("data", (chunk) => {
       writePrefixedLines(chunk, false);
@@ -337,25 +332,25 @@ var devCommand = defineCommand({
     const configSyncEnabled = config?.dev?.sync === void 0 || config.dev.sync === true || typeof config.dev.sync === "object" && config.dev.sync.enabled !== false;
     const configWatchEnabled = config?.dev?.watch === void 0 || config.dev.watch === true || typeof config.dev.watch === "object" && config.dev.watch.enabled !== false;
     const watchDebounceMs = typeof config?.dev?.watch === "object" && typeof config.dev.watch.debounceMs === "number" ? config.dev.watch.debounceMs : 300;
-    const viteBinary = await resolveProjectBinary(projectRoot, "vite");
-    if (!viteBinary) {
-      throw new DevServerError("vite", join2(projectRoot, "node_modules", ".bin", "vite"));
+    const viteEntryPoint = await resolveProjectBinaryEntryPoint(projectRoot, "vite", "vite");
+    if (!viteEntryPoint) {
+      throw new DevServerError("vite", join3(projectRoot, "node_modules", ".bin", "vite"));
     }
     const syncServerFile = await findSyncServerFile(projectRoot);
     let managedSyncStore = normalizeManagedSyncStore(config, projectRoot);
     const postgresEnvRequested = isPostgresEnvRequested(config);
     const syncAllowed = args["no-sync"] !== true && configSyncEnabled;
     let shouldStartSync = syncAllowed && (syncServerFile !== null || managedSyncStore !== null);
-    let syncBinary = null;
+    let hasTsx = false;
     if (shouldStartSync && syncServerFile !== null) {
-      syncBinary = await resolveProjectBinary(projectRoot, "tsx");
-      if (!syncBinary) {
-        logger.warn('Sync server detected, but local "tsx" binary was not found. Skipping sync.');
+      hasTsx = await hasTsxInstalled(projectRoot);
+      if (!hasTsx) {
+        logger.warn('Sync server detected, but "tsx" is not installed. Skipping sync.');
       }
     }
     if (shouldStartSync && syncServerFile === null && managedSyncStore) {
       const hasServerPackage = await fileExists(
-        join2(projectRoot, "node_modules", "@korajs", "server", "package.json")
+        join3(projectRoot, "node_modules", "@korajs", "server", "package.json")
       );
       if (!hasServerPackage) {
         logger.warn(
@@ -412,7 +407,7 @@ var devCommand = defineCommand({
     logger.info("Starting development environment:");
     logger.blank();
     logger.step(`  Vite dev server on port ${vitePort}`);
-    if (shouldStartSync && syncBinary && syncServerFile) {
+    if (shouldStartSync && hasTsx && syncServerFile) {
       logger.step(`  Sync server on port ${syncPort}`);
     } else if (shouldStartSync && syncServerFile === null && managedSyncStore !== null) {
       logger.step(`  Managed sync server on port ${syncPort} (${managedSyncStore.type})`);
@@ -431,16 +426,16 @@ var devCommand = defineCommand({
     logger.blank();
     processManager.spawn({
       label: "vite",
-      command: viteBinary,
-      args: ["--port", String(vitePort)],
+      command: process.execPath,
+      args: [viteEntryPoint, "--port", String(vitePort)],
       cwd: projectRoot,
       onExit: onManagedProcessExit
     });
-    if (shouldStartSync && syncBinary && syncServerFile) {
+    if (shouldStartSync && hasTsx && syncServerFile) {
       processManager.spawn({
         label: "sync",
-        command: syncBinary,
-        args: [syncServerFile],
+        command: process.execPath,
+        args: ["--import", "tsx", syncServerFile],
         cwd: projectRoot,
         env: {
           PORT: String(syncPort),
@@ -484,7 +479,7 @@ var devCommand = defineCommand({
   }
 });
 async function findSyncServerFile(projectRoot) {
-  const candidates = [join2(projectRoot, "server.ts"), join2(projectRoot, "server.js")];
+  const candidates = [join3(projectRoot, "server.ts"), join3(projectRoot, "server.js")];
   for (const candidate of candidates) {
     try {
       await access2(candidate);
@@ -508,7 +503,7 @@ function normalizeManagedSyncStore(config, projectRoot) {
   const store = sync.store;
   if (store === void 0) return { type: "memory" };
   if (store === "memory") return { type: "memory" };
-  if (store === "sqlite") return { type: "sqlite", filename: join2(projectRoot, "kora-sync.db") };
+  if (store === "sqlite") return { type: "sqlite", filename: join3(projectRoot, "kora-sync.db") };
   if (store === "postgres") {
     const connectionString = process.env.DATABASE_URL;
     if (!connectionString) return null;
@@ -517,7 +512,7 @@ function normalizeManagedSyncStore(config, projectRoot) {
   if (typeof store === "object" && store !== null) {
     if (store.type === "memory") return { type: "memory" };
     if (store.type === "sqlite") {
-      const filename = typeof store.filename === "string" && store.filename.length > 0 ? resolve(projectRoot, store.filename) : join2(projectRoot, "kora-sync.db");
+      const filename = typeof store.filename === "string" && store.filename.length > 0 ? resolve(projectRoot, store.filename) : join3(projectRoot, "kora-sync.db");
       return { type: "sqlite", filename };
     }
     if (store.type === "postgres" && typeof store.connectionString === "string") {
@@ -659,7 +654,7 @@ function isSchemaDefinition(value) {
 
 // src/commands/migrate/migrate-command.ts
 import { mkdir as mkdir2, readFile, readdir, writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname2, join as join3, resolve as resolve3 } from "path";
+import { dirname as dirname2, join as join4, resolve as resolve3 } from "path";
 import { defineCommand as defineCommand3 } from "citty";
 
 // src/commands/migrate/migration-generator.ts
@@ -1252,14 +1247,17 @@ function isSchemaDefinition2(value) {
   return typeof object.version === "number" && typeof object.collections === "object" && object.collections !== null && typeof object.relations === "object" && object.relations !== null;
 }
 async function loadTypeScriptModule(schemaPath, projectRoot) {
-  const tsxBinary = await resolveProjectBinary(projectRoot, "tsx");
-  if (!tsxBinary) {
+  if (!await hasTsxInstalled(projectRoot)) {
     throw new Error(
       `Schema file is TypeScript (${schemaPath}) but local "tsx" was not found. Install tsx in the project.`
     );
   }
   const script = "const modulePath = process.argv[process.argv.length - 1];import('node:url').then(u => import(u.pathToFileURL(modulePath).href)).then(mod => { const v = mod.default ?? mod; process.stdout.write(JSON.stringify(v)) }).catch(e => { process.stderr.write(String(e)); process.exit(1) })";
-  const output = await runCommand2(tsxBinary, ["--eval", script, schemaPath], projectRoot);
+  const output = await runCommand2(
+    process.execPath,
+    ["--import", "tsx", "--eval", script, schemaPath],
+    projectRoot
+  );
   try {
     return JSON.parse(output);
   } catch {
@@ -1271,8 +1269,7 @@ async function runCommand2(command, args, cwd) {
     const child = spawn3(command, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
-      env: process.env,
-      shell: process.platform === "win32"
+      env: process.env
     });
     let stdout = "";
     let stderr = "";
@@ -1347,7 +1344,7 @@ var migrateCommand = defineCommand3({
       throw new SchemaNotFoundError(["src/schema.ts", "schema.ts", "src/schema.js", "schema.js"]);
     }
     const currentSchema = await loadSchemaDefinition(resolvedSchemaPath, projectRoot);
-    const snapshotFile = join3(projectRoot, SNAPSHOT_PATH);
+    const snapshotFile = join4(projectRoot, SNAPSHOT_PATH);
     const previousSchema = await readSchemaSnapshot(snapshotFile);
     if (!previousSchema) {
       if (args["dry-run"] === true) {
@@ -1472,7 +1469,7 @@ async function writeMigrationFile(outputDir, fromVersion, toVersion, generated)
   const existing = await readdir(outputDir).catch(() => []);
   const sequence = existing.filter((file) => /^\d{3}-/.test(file)).length + 1;
   const filename = `${String(sequence).padStart(3, "0")}-v${fromVersion}-to-v${toVersion}.ts`;
-  const path = join3(outputDir, filename);
+  const path = join4(outputDir, filename);
   const migrationId = filename.replace(/\.ts$/, "");
   const fileContent = [
     `export const up = ${JSON.stringify(generated.up, null, 2)} as const`,
@@ -1485,7 +1482,7 @@ async function writeMigrationFile(outputDir, fromVersion, toVersion, generated)
     ""
   ].join("\n");
   await writeFile2(path, fileContent, "utf-8");
-  await writeMigrationManifest(join3(outputDir, `${migrationId}.json`), {
+  await writeMigrationManifest(join4(outputDir, `${migrationId}.json`), {
     id: migrationId,
     fromVersion,
     toVersion,
@@ -1506,13 +1503,13 @@ async function listMigrationManifests(outputDir) {
   const manifests = [];
   for (const file of migrationFiles) {
     const id = file.replace(/\.ts$/, "");
-    const manifestPath = join3(outputDir, `${id}.json`);
+    const manifestPath = join4(outputDir, `${id}.json`);
     const jsonManifest = await readMigrationManifest(manifestPath);
     if (jsonManifest) {
       manifests.push({ ...jsonManifest, id });
       continue;
     }
-    const migrationPath = join3(outputDir, file);
+    const migrationPath = join4(outputDir, file);
     const sourceManifest = await readMigrationManifestFromSource(migrationPath, id);
     manifests.push(sourceManifest);
   }
@@ -1593,13 +1590,13 @@ function resolveSqliteApplyPath(dbArg, projectRoot, config) {
   const sync = config?.dev?.sync;
   if (typeof sync === "object" && sync !== null) {
     if (sync.store === "sqlite") {
-      return join3(projectRoot, "kora-sync.db");
+      return join4(projectRoot, "kora-sync.db");
     }
     if (typeof sync.store === "object" && sync.store !== null && sync.store.type === "sqlite") {
       if (typeof sync.store.filename === "string" && sync.store.filename.length > 0) {
         return resolve3(projectRoot, sync.store.filename);
       }
-      return join3(projectRoot, "kora-sync.db");
+      return join4(projectRoot, "kora-sync.db");
     }
   }
   return void 0;