cloesce 0.0.4-unstable.9 → 0.0.5-unstable.1

package/dist/cli.js

@@ -3,310 +3,406 @@ import { WASI } from "node:wasi";
 import fs from "node:fs";
 import { readFile } from "fs/promises";
 import path from "node:path";
-import { command, run, subcommands, flag, string, positional, option, optional, } from "cmd-ts";
+import {
+  command,
+  run,
+  subcommands,
+  flag,
+  string,
+  positional,
+  option,
+  optional,
+} from "cmd-ts";
 import { Project } from "ts-morph";
 import { CidlExtractor } from "./extractor/extract.js";
-import { ExtractorError, ExtractorErrorCode, getErrorInfo } from "./common.js";
+import {
+  ExtractorError,
+  ExtractorErrorCode,
+  getErrorInfo,
+} from "./extractor/err.js";
+let debugPhase = "npm cloesce";
+function debug(...args) {
+  console.log(`[${debugPhase}]: `, ...args);
+}
 const cmds = subcommands({
-    name: "cloesce",
-    cmds: {
-        compile: command({
-            name: "compile",
-            description: "Run through the full compilation process.",
-            args: {
-                debug: flag({
-                    long: "debug",
-                    short: "d",
-                    description: "Show debug output",
-                }),
-            },
-            handler: async (args) => {
-                const config = loadCloesceConfig(process.cwd(), args.debug);
-                if (!config.workersUrl) {
-                    console.error("Error: `workersUrl`` must be defined in cloesce.config.json");
-                    process.exit(1);
-                }
-                // Creates a `cidl.json` file. Exits the process on failure.
-                await extract({ debug: args.debug });
-                const outputDir = config.outputDir ?? ".generated";
-                const generateConfig = {
-                    name: "generate",
-                    wasmFile: "generator.wasm",
-                    args: [
-                        "generate",
-                        path.join(outputDir, "cidl.pre.json"),
-                        path.join(outputDir, "cidl.json"),
-                        "wrangler.toml",
-                        path.join(outputDir, "workers.ts"),
-                        path.join(outputDir, "client.ts"),
-                        config.workersUrl,
-                    ],
-                };
-                // Runs a generator command. Exits the process on failure.
-                await generate(generateConfig);
-            },
+  name: "cloesce",
+  cmds: {
+    compile: command({
+      name: "compile",
+      description: "Run through the full compilation process.",
+      args: {},
+      handler: async () => {
+        const config = loadCloesceConfig(process.cwd());
+        if (!config) {
+          process.exit(1);
+        }
+        await extract(config);
+        debugPhase = "npm cloesce";
+        const outputDir = config.outPath ?? ".generated";
+        const generateConfig = {
+          name: "generate",
+          wasmFile: "generator.wasm",
+          args: [
+            "generate",
+            path.join(outputDir, "cidl.pre.json"),
+            path.join(outputDir, "cidl.json"),
+            "wrangler.toml",
+            path.join(outputDir, "workers.ts"),
+            path.join(outputDir, "client.ts"),
+            config.workersUrl,
+          ],
+        };
+        await generate(generateConfig);
+      },
+    }),
+    extract: command({
+      name: "extract",
+      description: "Extract models and write cidl.pre.json",
+      args: {
+        projectName: option({
+          long: "project-name",
+          type: optional(string),
+          description: "Project name",
         }),
-        extract: command({
-            name: "extract",
-            description: "Extract models and write cidl.pre.json",
-            args: {
-                projectName: option({
-                    long: "project-name",
-                    type: optional(string),
-                    description: "Project name",
-                }),
-                out: option({
-                    long: "out",
-                    short: "o",
-                    type: optional(string),
-                }),
-                inp: option({
-                    long: "in",
-                    short: "i",
-                    type: optional(string),
-                    description: "Input file or directory",
-                }),
-                location: option({
-                    long: "location",
-                    short: "l",
-                    type: optional(string),
-                    description: "Project directory (default: cwd)",
-                }),
-                truncateSourcePaths: flag({
-                    long: "truncateSourcePaths",
-                    description: "Sets all source paths to just their file name",
-                }),
-                debug: flag({
-                    long: "debug",
-                    short: "d",
-                    description: "Show debug output",
-                }),
-                skipTsCheck: flag({
-                    long: "skipTsCheck",
-                    description: "Skip TypeScript compilation checks",
-                }),
-            },
-            handler: async (args) => {
-                await extract({ ...args });
-            },
+        out: option({
+          long: "out",
+          short: "o",
+          type: optional(string),
         }),
-        migrate: command({
-            name: "migrate",
-            description: "Creates a database migration.",
-            args: {
-                name: positional({ type: string, displayName: "name" }),
-                debug: flag({
-                    long: "debug",
-                    short: "d",
-                    description: "Show debug output",
-                }),
-            },
-            handler: async (args) => {
-                const config = loadCloesceConfig(process.cwd(), args.debug);
-                const cidlPath = path.join(config.outputDir ?? ".generated", "cidl.json");
-                if (!fs.existsSync(cidlPath)) {
-                    console.error("Err: No cloesce file found, have you ran `cloesce compile`?");
-                    process.exit(1);
-                }
-                const migrationsPath = "./migrations";
-                if (!fs.existsSync(migrationsPath)) {
-                    fs.mkdirSync(migrationsPath);
-                }
-                const migrationPrefix = path.join(migrationsPath, `${timestamp()}_${args.name}`);
-                let wasmArgs = [
-                    "migrations",
-                    cidlPath,
-                    `${migrationPrefix}.json`,
-                    `${migrationPrefix}.sql`,
-                ];
-                // Add last migration if exists
-                {
-                    const files = fs.readdirSync(migrationsPath);
-                    const jsonFiles = files.filter((f) => f.endsWith(".json"));
-                    // Sort descending by filename
-                    jsonFiles.sort((a, b) => b.localeCompare(a, undefined, { numeric: true }));
-                    if (jsonFiles.length > 0) {
-                        wasmArgs.push(path.join(migrationsPath, jsonFiles[0]));
-                    }
-                }
-                const migrateConfig = {
-                    name: "migrations",
-                    wasmFile: "generator.wasm",
-                    args: wasmArgs,
-                };
-                // Runs a generator command. Exits the process on failure.
-                await generate(migrateConfig);
-            },
+        inp: option({
+          long: "in",
+          short: "i",
+          type: optional(string),
+          description: "Input file or directory",
         }),
-    },
-});
-async function extract(args) {
-    const root = process.cwd();
-    const projectRoot = process.cwd();
-    const config = loadCloesceConfig(projectRoot, args.debug);
-    const searchPaths = args.inp ? [args.inp] : (config.paths ?? [root]);
-    const outputDir = config.outputDir ?? ".generated";
-    const outPath = args.out ?? path.join(outputDir, "cidl.pre.json");
-    const truncate = args.truncateSourcePaths ?? config.truncateSourcePaths ?? false;
-    const cloesceProjectName = args.projectName ??
-        config.projectName ??
-        readPackageJsonProjectName(projectRoot);
-    const project = new Project({
-        compilerOptions: {
-            strictNullChecks: true,
-            experimentalDecorators: true,
-            emitDecoratorMetadata: true,
-        },
-    });
-    findCloesceProject(root, searchPaths, project);
-    const fileCount = project.getSourceFiles().length;
-    if (fileCount === 0) {
-        new ExtractorError(ExtractorErrorCode.MissingFile);
-    }
-    if (args.debug)
-        console.log(`Found ${fileCount} .cloesce.ts files`);
-    // Run typescript compiler checks to before extraction
-    if (!args.skipTsCheck) {
-        const diagnostics = project.getPreEmitDiagnostics();
-        if (diagnostics.length > 0) {
-            console.error("TypeScript errors detected in provided files:");
-            console.error(project.formatDiagnosticsWithColorAndContext(diagnostics));
-            process.exit(1);
+        truncateSourcePaths: flag({
+          long: "truncateSourcePaths",
+          description: "Sets all source paths to just their file name",
+        }),
+        skipTsCheck: flag({
+          long: "skipTsCheck",
+          description: "Skip TypeScript compilation checks",
+        }),
+      },
+      handler: async (args) => {
+        const config = {
+          projectName: args.projectName,
+          outPath: args.out,
+          paths: [args.inp],
+          truncateSourcePaths: false,
+          workersUrl: "",
+          migrationsPath: "",
+        };
+        await extract(config, {
+          truncateSourcePaths: args.truncateSourcePaths,
+          skipTsCheck: args.skipTsCheck,
+        });
+      },
+    }),
+    migrate: command({
+      name: "migrate",
+      description: "Creates a database migration.",
+      args: {
+        name: positional({ type: string, displayName: "name" }),
+        debug: flag({
+          long: "debug",
+          short: "d",
+          description: "Show debug output",
+        }),
+      },
+      handler: async (args) => {
+        const config = loadCloesceConfig(process.cwd());
+        if (!config) {
+          process.exit(1);
         }
-    }
-    try {
-        const extractor = new CidlExtractor(cloesceProjectName, "v0.0.4");
-        const result = extractor.extract(project);
-        if (result.isLeft()) {
-            console.error(formatErr(result.value));
-            process.exit(1);
+        const cidlPath = path.join(config.outPath, "cidl.json");
+        if (!fs.existsSync(cidlPath)) {
+          console.error(
+            "Err: No cloesce file found, have you ran `cloesce compile`?",
+          );
+          process.exit(1);
+        }
+        if (!fs.existsSync(config.migrationsPath)) {
+          fs.mkdirSync(config.migrationsPath);
         }
-        let ast = result.unwrap();
-        if (truncate) {
-            ast.wrangler_env.source_path =
-                "./" + path.basename(ast.wrangler_env.source_path);
-            if (ast.app_source) {
-                ast.app_source = "./" + path.basename(ast.app_source);
-            }
-            for (const model of Object.values(ast.models)) {
-                model.source_path =
-                    "./" + path.basename(model.source_path);
-            }
-            if (ast.poos) {
-                for (const poo of Object.values(ast.poos)) {
-                    poo.source_path =
-                        "./" + path.basename(poo.source_path);
-                }
-            }
+        const migrationPrefix = path.join(
+          config.migrationsPath,
+          `${timestamp()}_${args.name}`,
+        );
+        let wasmArgs = [
+          "migrations",
+          cidlPath,
+          `${migrationPrefix}.json`,
+          `${migrationPrefix}.sql`,
+        ];
+        // Add last migration if exists
+        {
+          const files = fs.readdirSync(config.migrationsPath);
+          const jsonFiles = files.filter((f) => f.endsWith(".json"));
+          // Sort descending by filename
+          jsonFiles.sort((a, b) =>
+            b.localeCompare(a, undefined, { numeric: true }),
+          );
+          if (jsonFiles.length > 0) {
+            wasmArgs.push(path.join(config.migrationsPath, jsonFiles[0]));
+          }
         }
-        const json = JSON.stringify(ast, null, 4);
-        fs.mkdirSync(path.dirname(outPath), { recursive: true });
-        fs.writeFileSync(outPath, json);
-        console.log(`CIDL extracted to ${outPath}`);
-        return { outPath, projectName: cloesceProjectName };
+        const migrateConfig = {
+          name: "migrations",
+          wasmFile: "generator.wasm",
+          args: wasmArgs,
+        };
+        // Runs a generator command. Exits the process on failure.
+        await generate(migrateConfig);
+      },
+    }),
+  },
+});
+async function extract(config, args = {}) {
+  const startTime = Date.now();
+  debugPhase = "extractor";
+  debug("Preparing extraction...");
+  const root = process.cwd();
+  const projectRoot = process.cwd();
+  const searchPaths = config.paths ?? [root];
+  const outPath = (() => {
+    // If the out path is a directory, join it with "cidl.pre.json"
+    if (
+      fs.existsSync(config.outPath) &&
+      fs.statSync(config.outPath).isDirectory()
+    ) {
+      return path.join(config.outPath, "cidl.pre.json");
+    }
+    // If the out path is a file, use it directly
+    if (config.outPath && config.outPath.endsWith(".json")) {
+      return config.outPath;
     }
-    catch (err) {
-        console.error("Critical uncaught error in generator. \nSubmit a ticket to https://github.com/bens-schreiber/cloesce\n\n", err?.message ?? "No error message.", "\n", err?.stack ?? "No error stack.");
-        process.exit(1);
+    // Default to .generated/cidl.pre.json
+    return path.join(config.outPath ?? ".generated", "cidl.pre.json");
+  })();
+  const truncate =
+    args.truncateSourcePaths ?? config.truncateSourcePaths ?? false;
+  const cloesceProjectName =
+    config.projectName ?? readPackageJsonProjectName(projectRoot);
+  const project = new Project({
+    skipAddingFilesFromTsConfig: true,
+    compilerOptions: {
+      skipLibCheck: true,
+      strictNullChecks: true,
+      experimentalDecorators: true,
+      emitDecoratorMetadata: true,
+    },
+  });
+  findCloesceProject(root, searchPaths, project);
+  const fileCount = project.getSourceFiles().length;
+  if (fileCount === 0) {
+    new ExtractorError(ExtractorErrorCode.MissingFile);
+  }
+  debug(`Found ${fileCount} .cloesce.ts files`);
+  // Run typescript compiler checks to before extraction
+  if (!args.skipTsCheck) {
+    const tscStart = Date.now();
+    debug("Running TypeScript compiler checks...");
+    const diagnostics = project.getPreEmitDiagnostics();
+    if (diagnostics.length > 0) {
+      console.error("TypeScript errors detected in provided files:");
+      console.error(project.formatDiagnosticsWithColorAndContext(diagnostics));
+      process.exit(1);
+    }
+    debug(`TypeScript checks completed in ${Date.now() - tscStart}ms`);
+  }
+  try {
+    const extractorStart = Date.now();
+    debug("Extracting CIDL...");
+    const extractor = new CidlExtractor(cloesceProjectName, "v0.0.4");
+    const result = extractor.extract(project);
+    if (result.isLeft()) {
+      console.error(formatErr(result.value));
+      process.exit(1);
     }
+    let ast = result.unwrap();
+    if (truncate) {
+      if (ast.wrangler_env) {
+        ast.wrangler_env.source_path =
+          "./" + path.basename(ast.wrangler_env.source_path);
+      }
+      if (ast.app_source) {
+        ast.app_source = "./" + path.basename(ast.app_source);
+      }
+      for (const model of Object.values(ast.models)) {
+        model.source_path = "./" + path.basename(model.source_path);
+      }
+      for (const poo of Object.values(ast.poos)) {
+        poo.source_path = "./" + path.basename(poo.source_path);
+      }
+      for (const service of Object.values(ast.services)) {
+        service.source_path = "./" + path.basename(service.source_path);
+      }
+    }
+    const json = JSON.stringify(ast, null, 4);
+    fs.mkdirSync(path.dirname(outPath), { recursive: true });
+    fs.writeFileSync(outPath, json);
+    debug(
+      `Successfully extracted cidl.pre.json ${outPath} in ${Date.now() - extractorStart}ms`,
+    );
+    return { outPath, projectName: cloesceProjectName };
+  } catch (err) {
+    console.error(
+      "Critical uncaught error in extractor. \nSubmit a ticket to https://github.com/bens-schreiber/cloesce\n\n",
+      err?.message ?? "No error message.",
+      "\n",
+      err?.stack ?? "No error stack.",
+    );
+    process.exit(1);
+  } finally {
+    debug(`Extraction process completed in ${Date.now() - startTime}ms`);
+  }
 }
 async function generate(config) {
-    const root = process.cwd();
-    // Look for wrangler.toml in the root directory
-    const wranglerPath = path.join(root, "wrangler.toml");
-    if (!fs.existsSync(wranglerPath)) {
-        fs.writeFileSync(wranglerPath, "");
+  const debugStart = Date.now();
+  debug(`Starting generator`);
+  const root = process.cwd();
+  // Look for wrangler.toml in the root directory
+  const wranglerPath = path.join(root, "wrangler.toml");
+  if (!fs.existsSync(wranglerPath)) {
+    debug("No wrangler.toml found, creating empty file.");
+    fs.writeFileSync(wranglerPath, "");
+  }
+  debug(`Using wrangler.toml at ${wranglerPath}`);
+  const wasi = new WASI({
+    version: "preview1",
+    args: ["generate", ...config.args],
+    env: { ...process.env, ...config.env },
+    preopens: { ".": root },
+  });
+  const readWasmStart = Date.now();
+  debug(`Reading generator binary...`);
+  const wasm = await readFile(new URL("./generator.wasm", import.meta.url));
+  const mod = await WebAssembly.compile(new Uint8Array(wasm));
+  let instance = await WebAssembly.instantiate(mod, {
+    wasi_snapshot_preview1: wasi.wasiImport,
+  });
+  debug(
+    `Read and compiled generator wasm binary in ${Date.now() - readWasmStart}ms`,
+  );
+  try {
+    wasi.start(instance);
+  } catch (err) {
+    console.error(`WASM execution failed for ${config.name}:`, err);
+    throw err;
+  } finally {
+    debug(`Generator ${config.name} completed in ${Date.now() - debugStart}ms`);
+  }
+}
+function loadCloesceConfig(root) {
+  const configPath = path.join(root, "cloesce.config.json");
+  if (!fs.existsSync(configPath)) {
+    debug("No cloesce.config.json found");
+    return undefined;
+  }
+  try {
+    const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+    debug(`Loaded config from ${configPath}`);
+    if (!config.paths || !Array.isArray(config.paths)) {
+      debug("No paths specified in cloesce.config.json, defaulting to root");
+      config.paths = [root];
     }
-    const wasi = new WASI({
-        version: "preview1",
-        args: ["generate", ...config.args],
-        env: { ...process.env, ...config.env },
-        preopens: { ".": root },
-    });
-    const wasm = await readFile(new URL("./generator.wasm", import.meta.url));
-    const mod = await WebAssembly.compile(new Uint8Array(wasm));
-    let instance = await WebAssembly.instantiate(mod, {
-        wasi_snapshot_preview1: wasi.wasiImport,
-    });
-    try {
-        wasi.start(instance);
+    if (!config.projectName) {
+      debug(
+        "No projectName specified in cloesce.config.json, reading from package.json",
+      );
+      config.projectName = readPackageJsonProjectName(root);
     }
-    catch (err) {
-        console.error(`WASM execution failed for ${config.name}:`, err);
+    if (!config.outPath) {
+      debug(
+        "No outPath specified in cloesce.config.json, defaulting to .generated",
+      );
+      config.outPath = ".generated";
     }
-}
-function loadCloesceConfig(root, debug = false) {
-    const configPath = path.join(root, "cloesce.config.json");
-    if (fs.existsSync(configPath)) {
-        try {
-            const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
-            if (debug)
-                console.log(`Loaded config from ${configPath}`);
-            return config;
-        }
-        catch (err) {
-            console.warn(`Failed to parse cloesce.config.json: ${err}`);
-        }
+    if (!config.workersUrl) {
+      debug(
+        "No workersUrl specified in cloesce.config.json, localhost:8787 will be used",
+      );
+      config.workersUrl = "http://localhost:8787";
     }
-    return {};
+    if (!config.migrationsPath) {
+      debug(
+        "No migrationsPath specified in cloesce.config.json, defaulting to ./migrations",
+      );
+      config.migrationsPath = "./migrations";
+    }
+    if (typeof config.truncateSourcePaths !== "boolean") {
+      config.truncateSourcePaths = false;
+    }
+    debug(
+      `Cloesce Config: ${JSON.stringify({ ...config, truncateSourcePaths: undefined }, null, 4)}`,
+    );
+    return config;
+  } catch (err) {
+    console.warn(`Failed to parse cloesce.config.json: ${err}`);
+    throw err;
+  }
 }
 function timestamp() {
-    const d = new Date();
-    return (d.getFullYear().toString() +
-        String(d.getMonth() + 1).padStart(2, "0") +
-        String(d.getDate()).padStart(2, "0") +
-        "T" +
-        String(d.getHours()).padStart(2, "0") +
-        String(d.getMinutes()).padStart(2, "0") +
-        String(d.getSeconds()).padStart(2, "0"));
+  const d = new Date();
+  return (
+    d.getFullYear().toString() +
+    String(d.getMonth() + 1).padStart(2, "0") +
+    String(d.getDate()).padStart(2, "0") +
+    "T" +
+    String(d.getHours()).padStart(2, "0") +
+    String(d.getMinutes()).padStart(2, "0") +
+    String(d.getSeconds()).padStart(2, "0")
+  );
 }
 function readPackageJsonProjectName(cwd) {
-    const pkgPath = path.join(cwd, "package.json");
-    let projectName = path.basename(cwd);
-    if (fs.existsSync(pkgPath)) {
-        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-        projectName = pkg.name ?? projectName;
-    }
-    return projectName;
+  const pkgPath = path.join(cwd, "package.json");
+  let projectName = path.basename(cwd);
+  if (fs.existsSync(pkgPath)) {
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+    projectName = pkg.name ?? projectName;
+  }
+  return projectName;
 }
 function findCloesceProject(root, searchPaths, project) {
-    for (const searchPath of searchPaths) {
-        let fullPath;
-        if (path.isAbsolute(searchPath) || searchPath.startsWith(root)) {
-            fullPath = path.normalize(searchPath);
-        }
-        else {
-            fullPath = path.resolve(root, searchPath);
-        }
-        if (!fs.existsSync(fullPath)) {
-            console.warn(`Warning: Path "${searchPath}" does not exist`);
-            continue;
-        }
-        const stats = fs.statSync(fullPath);
-        if (stats.isFile() && /\.cloesce\.ts$/i.test(fullPath)) {
-            project.addSourceFileAtPath(fullPath);
-        }
-        else if (stats.isDirectory()) {
-            walkDirectory(fullPath, project);
-        }
+  for (const searchPath of searchPaths) {
+    let fullPath;
+    if (path.isAbsolute(searchPath) || searchPath.startsWith(root)) {
+      fullPath = path.normalize(searchPath);
+    } else {
+      fullPath = path.resolve(root, searchPath);
     }
-    function walkDirectory(dir, project) {
-        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-            const fullPath = path.join(dir, entry.name);
-            if (entry.isDirectory() && !entry.name.startsWith(".")) {
-                walkDirectory(fullPath, project);
-            }
-            else if (entry.isFile() && /\.cloesce\.ts$/i.test(entry.name)) {
-                project.addSourceFileAtPath(fullPath);
-            }
-        }
+    if (!fs.existsSync(fullPath)) {
+      console.warn(`Warning: Path "${searchPath}" does not exist`);
+      continue;
+    }
+    const stats = fs.statSync(fullPath);
+    if (stats.isFile() && /\.cloesce\.ts$/i.test(fullPath)) {
+      debug(`Found file: ${fullPath}`);
+      project.addSourceFileAtPath(fullPath);
+    } else if (stats.isDirectory()) {
+      debug(`Searching directory: ${fullPath}`);
+      walkDirectory(fullPath);
     }
+  }
+  function walkDirectory(dir) {
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      const fullPath = path.join(dir, entry.name);
+      if (entry.isDirectory() && !entry.name.startsWith(".")) {
+        debug(`Entering directory: ${fullPath}`);
+        walkDirectory(fullPath);
+      } else if (entry.isFile() && /\.cloesce\.ts$/i.test(entry.name)) {
+        debug(`Found file: ${fullPath}`);
+        project.addSourceFileAtPath(fullPath);
+      }
+    }
+  }
 }
 function formatErr(e) {
-    const { description, suggestion } = getErrorInfo(e.code);
-    const contextLine = e.context ? `Context: ${e.context}\n` : "";
-    const snippetLine = e.snippet ? `${e.snippet}\n\n` : "";
-    return `
+  const { description, suggestion } = getErrorInfo(e.code);
+  const contextLine = e.context ? `Context: ${e.context}\n` : "";
+  const snippetLine = e.snippet ? `${e.snippet}\n\n` : "";
+  return `
 ==== CLOESCE ERROR ====
 Error [${ExtractorErrorCode[e.code]}]: ${description}
 Phase: TypeScript IDL Extraction
@@ -315,6 +411,6 @@ ${contextLine}${snippetLine}Suggested fix: ${suggestion}
 `;
 }
 run(cmds, process.argv.slice(2)).catch((err) => {
-    console.error(err);
-    process.exit(1);
+  console.error(err);
+  process.exit(1);
 });