thinkwell 0.5.5 → 0.5.7

package/dist/build.js

@@ -1,110 +1,56 @@
-/**
- * Public build API for thinkwell.
- *
- * This module exposes schema generation functionality for use by the CLI
- * when running in explicit-config mode. By resolving `thinkwell/build` from
- * a project's `node_modules`, the CLI uses the project-local version of
- * `ts-json-schema-generator` (a transitive dependency of `thinkwell`)
- * without leaking it into the user's dependency contract.
- *
- * The API is intentionally narrow: a single `generateSchemas()` function that
- * takes a file path and type names and returns self-contained JSON schema
- * objects. All details of `ts-json-schema-generator` are encapsulated here.
- *
- * @module thinkwell/build
- */
 import { dirname, join } from "node:path";
 import { existsSync } from "node:fs";
 import { createGenerator } from "ts-json-schema-generator";
-/**
- * Find tsconfig.json by walking up from the given directory.
- */
 function findTsConfig(startDir) {
-    let dir = startDir;
-    while (true) {
-        const configPath = join(dir, "tsconfig.json");
-        if (existsSync(configPath)) {
-            return configPath;
-        }
-        const parent = dirname(dir);
-        if (parent === dir) {
-            return undefined;
-        }
-        dir = parent;
-    }
+  let dir = startDir;
+  for (; ; ) {
+    const configPath = join(dir, "tsconfig.json");
+    if (existsSync(configPath))
+      return configPath;
+    const parent = dirname(dir);
+    if (parent === dir)
+      return;
+    dir = parent;
+  }
 }
-/**
- * Recursively inline $ref references to make schemas self-contained.
- */
 function inlineRefs(obj, definitions) {
-    if (obj === null || typeof obj !== "object") {
-        return obj;
-    }
-    if (Array.isArray(obj)) {
-        return obj.map((item) => inlineRefs(item, definitions));
-    }
-    const record = obj;
-    // If this object has a $ref, replace it with the referenced definition
-    if (typeof record["$ref"] === "string") {
-        const ref = record["$ref"];
-        const match = ref.match(/^#\/definitions\/(.+)$/);
-        if (match && definitions[match[1]]) {
-            return inlineRefs(definitions[match[1]], definitions);
-        }
-    }
-    // Otherwise, recursively process all properties
-    const result = {};
-    for (const [key, value] of Object.entries(record)) {
-        result[key] = inlineRefs(value, definitions);
-    }
-    return result;
+  if (obj === null || typeof obj != "object")
+    return obj;
+  if (Array.isArray(obj))
+    return obj.map((item) => inlineRefs(item, definitions));
+  const record = obj;
+  if (typeof record.$ref == "string") {
+    const match = record.$ref.match(/^#\/definitions\/(.+)$/);
+    if (match && definitions[match[1]])
+      return inlineRefs(definitions[match[1]], definitions);
+  }
+  const result = {};
+  for (const [key, value] of Object.entries(record))
+    result[key] = inlineRefs(value, definitions);
+  return result;
 }
-/**
- * Clean a raw schema by inlining `$ref` references and removing root-level
- * `$schema` and `definitions` properties.
- */
 function cleanSchema(typeName, schema) {
-    const definitions = (schema.definitions || {});
-    // Get the schema for this specific type
-    let result = definitions[typeName] || schema;
-    // Inline all $ref references
-    result = inlineRefs(result, definitions);
-    // Clean up root-level properties
-    if (typeof result === "object" && result !== null) {
-        const cleaned = { ...result };
-        delete cleaned["$schema"];
-        delete cleaned["definitions"];
-        return cleaned;
-    }
-    return result;
+  const definitions = schema.definitions || {};
+  let result = definitions[typeName] || schema;
+  if (result = inlineRefs(result, definitions), typeof result == "object" && result !== null) {
+    const cleaned = { ...result };
+    return delete cleaned.$schema, delete cleaned.definitions, cleaned;
+  }
+  return result;
 }
-/**
- * Generate self-contained JSON schemas for named types in a TypeScript file.
- *
- * Creates a single schema generator for the file and produces a clean,
- * self-contained schema for each requested type (no `$ref`, `$schema`,
- * or `definitions` in the output).
- *
- * @param filePath - Absolute path to the TypeScript file containing the types
- * @param typeNames - The names of the types to generate schemas for
- * @returns Map from type name to self-contained JSON schema object
- */
 export function generateSchemas(filePath, typeNames) {
-    const schemas = new Map();
-    if (typeNames.length === 0) {
-        return schemas;
-    }
-    const configPath = findTsConfig(dirname(filePath));
-    const generator = createGenerator({
-        path: filePath,
-        ...(configPath && { tsconfig: configPath }),
-        skipTypeCheck: true,
-        encodeRefs: false,
-    });
-    for (const typeName of typeNames) {
-        const schema = generator.createSchema(typeName);
-        schemas.set(typeName, cleanSchema(typeName, schema));
-    }
+  const schemas = /* @__PURE__ */ new Map();
+  if (typeNames.length === 0)
     return schemas;
+  const configPath = findTsConfig(dirname(filePath)), generator = createGenerator({
+    path: filePath,
+    ...configPath && { tsconfig: configPath },
+    skipTypeCheck: !0,
+    encodeRefs: !1
+  });
+  for (const typeName of typeNames) {
+    const schema = generator.createSchema(typeName);
+    schemas.set(typeName, cleanSchema(typeName, schema));
+  }
+  return schemas;
 }
-//# sourceMappingURL=build.js.map

package/dist/cli/build.js

@@ -1,13 +1,3 @@
-/**
- * Build command for tsc-based compilation with @JSONSchema transformation.
- *
- * This module provides the `thinkwell build` command that compiles a TypeScript
- * project using the standard TypeScript compiler API with a custom CompilerHost.
- * The CompilerHost intercepts file reads and applies @JSONSchema namespace
- * injection in memory, so user source files are never modified on disk.
- *
- * Output (.js, .d.ts, source maps) is written to the project's configured outDir.
- */
 import ts from "typescript";
 import { existsSync, readFileSync } from "node:fs";
 import { resolve, join, matchesGlob } from "node:path";
@@ -17,239 +7,114 @@ import { cyan, cyanBold, greenBold, whiteBold, dim } from "./fmt.js";
 import { fmtError } from "./commands.js";
 import { checkDependencies, hasPackageJson } from "./dependency-check.js";
 import { formatMissingDependencyError, hasMissingDependencies } from "./dependency-errors.js";
-// ============================================================================
-// Package.json Configuration
-// ============================================================================
-/**
- * Read build configuration from package.json in the given directory.
- * Returns undefined if no configuration is found.
- */
 function readPackageJsonConfig(dir) {
-    const pkgPath = join(dir, "package.json");
-    if (!existsSync(pkgPath)) {
-        return undefined;
-    }
+  const pkgPath = join(dir, "package.json");
+  if (existsSync(pkgPath))
     try {
-        const content = readFileSync(pkgPath, "utf-8");
-        const pkg = JSON.parse(content);
-        const config = pkg?.thinkwell?.build;
-        if (!config || typeof config !== "object") {
-            return undefined;
-        }
-        const result = {};
-        if (Array.isArray(config.include)) {
-            result.include = config.include.filter((i) => typeof i === "string");
-        }
-        if (Array.isArray(config.exclude)) {
-            result.exclude = config.exclude.filter((e) => typeof e === "string");
-        }
-        return result;
-    }
-    catch {
-        return undefined;
+      const content = readFileSync(pkgPath, "utf-8"), config = JSON.parse(content)?.thinkwell?.build;
+      if (!config || typeof config != "object")
+        return;
+      const result = {};
+      return Array.isArray(config.include) && (result.include = config.include.filter((i) => typeof i == "string")), Array.isArray(config.exclude) && (result.exclude = config.exclude.filter((e) => typeof e == "string")), result;
+    } catch {
+      return;
     }
 }
-/**
- * Create a file filter function from include/exclude glob patterns.
- *
- * - If include is specified, only files matching at least one include pattern
- *   are eligible for transformation.
- * - If exclude is specified, files matching any exclude pattern are skipped.
- * - Exclude takes precedence over include.
- *
- * Returns undefined if no filtering is needed (no include/exclude configured).
- */
 function createFileFilter(config) {
-    if (!config)
-        return undefined;
-    const { include, exclude } = config;
-    const hasInclude = include && include.length > 0;
-    const hasExclude = exclude && exclude.length > 0;
-    if (!hasInclude && !hasExclude)
-        return undefined;
+  if (!config)
+    return;
+  const { include, exclude } = config, hasInclude = include && include.length > 0, hasExclude = exclude && exclude.length > 0;
+  if (!(!hasInclude && !hasExclude))
     return (fileName) => {
-        // Exclude takes precedence
-        if (hasExclude) {
-            for (const pattern of exclude) {
-                if (matchesGlob(fileName, pattern))
-                    return false;
-            }
-        }
-        // If include is specified, file must match at least one pattern
-        if (hasInclude) {
-            for (const pattern of include) {
-                if (matchesGlob(fileName, pattern))
-                    return true;
-            }
-            return false;
-        }
-        return true;
+      if (hasExclude) {
+        for (const pattern of exclude)
+          if (matchesGlob(fileName, pattern))
+            return !1;
+      }
+      if (hasInclude) {
+        for (const pattern of include)
+          if (matchesGlob(fileName, pattern))
+            return !0;
+        return !1;
+      }
+      return !0;
     };
 }
-// ============================================================================
-// Diagnostics Formatting
-// ============================================================================
 const diagnosticsHost = {
-    getCanonicalFileName: (fileName) => fileName,
-    getCurrentDirectory: ts.sys.getCurrentDirectory,
-    getNewLine: () => ts.sys.newLine,
+  getCanonicalFileName: (fileName) => fileName,
+  getCurrentDirectory: ts.sys.getCurrentDirectory,
+  getNewLine: () => ts.sys.newLine
 };
 function formatDiagnostics(diagnostics) {
-    if (diagnostics.length === 0)
-        return "";
-    return ts.formatDiagnosticsWithColorAndContext(diagnostics, diagnosticsHost);
+  return diagnostics.length === 0 ? "" : ts.formatDiagnosticsWithColorAndContext(diagnostics, diagnosticsHost);
 }
-// ============================================================================
-// Build Command
-// ============================================================================
 export async function runBuild(options) {
-    const cwd = process.cwd();
-    // Check for required dependencies when a package.json exists
-    if (hasPackageJson(cwd)) {
-        const depCheck = await checkDependencies(cwd);
-        if (hasMissingDependencies(depCheck)) {
-            console.error(formatMissingDependencyError(depCheck));
-            process.exit(2);
-        }
-    }
-    const configPath = options.project
-        ? resolve(cwd, options.project)
-        : resolve(cwd, "tsconfig.json");
-    if (!existsSync(configPath)) {
-        console.error(fmtError(`Cannot find ${options.project ?? "tsconfig.json"}`));
-        console.error("");
-        console.error("  Run this command from a directory with a tsconfig.json,");
-        console.error("  or use --project to specify the path.");
-        process.exit(1);
-    }
-    // Read include/exclude globs from package.json
-    const pkgConfig = readPackageJsonConfig(cwd);
-    const fileFilter = createFileFilter(pkgConfig);
-    if (options.verbose && pkgConfig) {
-        if (pkgConfig.include) {
-            console.error(`  @JSONSchema include: ${pkgConfig.include.join(", ")}`);
-        }
-        if (pkgConfig.exclude) {
-            console.error(`  @JSONSchema exclude: ${pkgConfig.exclude.join(", ")}`);
-        }
-    }
-    // Resolve project directory for project-local @JSONSchema processing
-    const projectDir = hasPackageJson(cwd) ? cwd : undefined;
-    // Watch mode: use TypeScript's watch API for continuous compilation
-    if (options.watch) {
-        return runWatch(configPath, fileFilter, projectDir);
-    }
-    // Single-pass build
-    const { program, configErrors } = (fileFilter || projectDir)
-        ? createThinkwellProgram({ configPath, fileFilter, projectDir })
-        : createThinkwellProgram(configPath);
-    // Report config-level diagnostics
-    if (configErrors.length > 0) {
-        console.error(formatDiagnostics(configErrors));
-        const hasFatal = configErrors.some((d) => d.category === ts.DiagnosticCategory.Error);
-        if (hasFatal) {
-            process.exit(1);
-        }
-    }
-    // Get pre-emit diagnostics (type errors, etc.)
-    const diagnostics = ts.getPreEmitDiagnostics(program);
-    if (diagnostics.length > 0) {
-        console.error(formatDiagnostics(diagnostics));
-    }
-    // Emit output files
-    const emitResult = program.emit();
-    // Report emit diagnostics
-    if (emitResult.diagnostics.length > 0) {
-        console.error(formatDiagnostics(emitResult.diagnostics));
-    }
-    // Count all errors
-    const allDiagnostics = [...diagnostics, ...emitResult.diagnostics];
-    const errorCount = allDiagnostics.filter((d) => d.category === ts.DiagnosticCategory.Error).length;
-    if (errorCount > 0) {
-        console.error("");
-        console.error(`Found ${errorCount} error${errorCount === 1 ? "" : "s"}.`);
-        process.exit(1);
-    }
-    if (!options.quiet) {
-        const fileCount = program.getSourceFiles().filter((sf) => !sf.fileName.includes("node_modules") && !sf.fileName.includes("/lib/lib.")).length;
-        console.error(styleText("green", "✔") +
-            ` Build complete (${fileCount} file${fileCount === 1 ? "" : "s"})`);
-    }
+  const cwd = process.cwd();
+  if (hasPackageJson(cwd)) {
+    const depCheck = await checkDependencies(cwd);
+    hasMissingDependencies(depCheck) && (console.error(formatMissingDependencyError(depCheck)), process.exit(2));
+  }
+  const configPath = options.project ? resolve(cwd, options.project) : resolve(cwd, "tsconfig.json");
+  existsSync(configPath) || (console.error(fmtError(`Cannot find ${options.project ?? "tsconfig.json"}`)), console.error(""), console.error("  Run this command from a directory with a tsconfig.json,"), console.error("  or use --project to specify the path."), process.exit(1));
+  const pkgConfig = readPackageJsonConfig(cwd), fileFilter = createFileFilter(pkgConfig);
+  options.verbose && pkgConfig && (pkgConfig.include && console.error(`  @JSONSchema include: ${pkgConfig.include.join(", ")}`), pkgConfig.exclude && console.error(`  @JSONSchema exclude: ${pkgConfig.exclude.join(", ")}`));
+  const projectDir = hasPackageJson(cwd) ? cwd : void 0;
+  if (options.watch)
+    return runWatch(configPath, fileFilter, projectDir);
+  const { program, configErrors } = fileFilter || projectDir ? createThinkwellProgram({ configPath, fileFilter, projectDir }) : createThinkwellProgram(configPath);
+  configErrors.length > 0 && (console.error(formatDiagnostics(configErrors)), configErrors.some((d) => d.category === ts.DiagnosticCategory.Error) && process.exit(1));
+  const diagnostics = ts.getPreEmitDiagnostics(program);
+  diagnostics.length > 0 && console.error(formatDiagnostics(diagnostics));
+  const emitResult = program.emit();
+  emitResult.diagnostics.length > 0 && console.error(formatDiagnostics(emitResult.diagnostics));
+  const errorCount = [...diagnostics, ...emitResult.diagnostics].filter((d) => d.category === ts.DiagnosticCategory.Error).length;
+  if (errorCount > 0 && (console.error(""), console.error(`Found ${errorCount} error${errorCount === 1 ? "" : "s"}.`), process.exit(1)), !options.quiet) {
+    const fileCount = program.getSourceFiles().filter((sf) => !sf.fileName.includes("node_modules") && !sf.fileName.includes("/lib/lib.")).length;
+    console.error(styleText("green", "\u2714") + ` Build complete (${fileCount} file${fileCount === 1 ? "" : "s"})`);
+  }
 }
-// ============================================================================
-// Watch Mode
-// ============================================================================
-/**
- * Run the build in watch mode using TypeScript's watch API.
- *
- * TypeScript handles file watching, debouncing, and incremental re-compilation
- * automatically. The custom CompilerHost's @JSONSchema transformation is applied
- * on each rebuild via the createProgram callback.
- *
- * This function never returns — it runs until the process is killed (Ctrl+C).
- */
 function runWatch(configPath, fileFilter, projectDir) {
-    const reportDiagnostic = (diagnostic) => {
-        console.error(ts.formatDiagnosticsWithColorAndContext([diagnostic], diagnosticsHost));
-    };
-    const reportWatchStatus = (diagnostic) => {
-        console.error(ts.formatDiagnostic(diagnostic, diagnosticsHost).trimEnd());
-    };
-    const watchHost = createThinkwellWatchHost({
-        configPath,
-        fileFilter,
-        projectDir,
-        reportDiagnostic,
-        reportWatchStatus,
-    });
-    ts.createWatchProgram(watchHost);
-    // Keep the process alive. TypeScript's watch system registers file watchers
-    // that keep the event loop active, so this promise never resolves.
-    // The process exits when the user presses Ctrl+C.
-    return new Promise(() => { });
+  const watchHost = createThinkwellWatchHost({
+    configPath,
+    fileFilter,
+    projectDir,
+    reportDiagnostic: (diagnostic) => {
+      console.error(ts.formatDiagnosticsWithColorAndContext([diagnostic], diagnosticsHost));
+    },
+    reportWatchStatus: (diagnostic) => {
+      console.error(ts.formatDiagnostic(diagnostic, diagnosticsHost).trimEnd());
+    }
+  });
+  return ts.createWatchProgram(watchHost), new Promise(() => {
+  });
 }
-// ============================================================================
-// Argument Parsing
-// ============================================================================
 export function parseBuildArgs(args) {
-    const options = {};
-    let i = 0;
-    while (i < args.length) {
-        const arg = args[i];
-        if (arg === "-p" || arg === "--project") {
-            i++;
-            if (i >= args.length) {
-                throw new Error("Missing value for --project");
-            }
-            options.project = args[i];
-        }
-        else if (arg === "--watch" || arg === "-w") {
-            options.watch = true;
-        }
-        else if (arg === "--verbose") {
-            options.verbose = true;
-        }
-        else if (arg === "--quiet" || arg === "-q") {
-            options.quiet = true;
-        }
-        else if (arg.startsWith("-")) {
-            throw new Error(`Unknown option: ${arg}`);
-        }
-        else {
-            throw new Error(`Unexpected argument: ${arg}\n\n` +
-                `  "thinkwell build" compiles the project using tsconfig.json.\n` +
-                `  It does not take an entry file argument.\n\n` +
-                `  Did you mean "thinkwell bundle ${arg}"?`);
-        }
-        i++;
-    }
-    return options;
+  const options = {};
+  let i = 0;
+  for (; i < args.length; ) {
+    const arg = args[i];
+    if (arg === "-p" || arg === "--project") {
+      if (i++, i >= args.length)
+        throw new Error("Missing value for --project");
+      options.project = args[i];
+    } else if (arg === "--watch" || arg === "-w")
+      options.watch = !0;
+    else if (arg === "--verbose")
+      options.verbose = !0;
+    else if (arg === "--quiet" || arg === "-q")
+      options.quiet = !0;
+    else throw arg.startsWith("-") ? new Error(`Unknown option: ${arg}`) : new Error(`Unexpected argument: ${arg}
+
+  "thinkwell build" compiles the project using tsconfig.json.
+  It does not take an entry file argument.
+
+  Did you mean "thinkwell bundle ${arg}"?`);
+    i++;
+  }
+  return options;
 }
-// ============================================================================
-// Help
-// ============================================================================
 export function showBuildHelp() {
-    console.log(`
+  console.log(`
 ${cyanBold("thinkwell build")} - ${whiteBold("Compile TypeScript with @JSONSchema transformation")}
 
 ${greenBold("Usage:")}
@@ -289,7 +154,7 @@ ${greenBold("Configuration via package.json:")}
     }
 
 ${dim("Note: Files not matched by include (or matched by exclude) are still")}
-${dim("      compiled by TypeScript — they just skip @JSONSchema transformation.")}
-`.trim() + "\n");
+${dim("      compiled by TypeScript \u2014 they just skip @JSONSchema transformation.")}
+`.trim() + `
+`);
 }
-//# sourceMappingURL=build.js.map