thinkwell 0.5.4 → 0.5.6

package/dist/cli/compiler-host.js

@@ -1,213 +1,104 @@
-/**
- * Custom TypeScript CompilerHost for thinkwell build and check commands.
- *
- * This module provides the shared infrastructure that intercepts TypeScript's
- * file reads and applies @JSONSchema namespace injection in memory. Files
- * without @JSONSchema markers pass through unchanged. Files from node_modules
- * and TypeScript lib files are always passed through unchanged.
- *
- * Used by `thinkwell build` (single-pass and watch mode) and `thinkwell check` (noEmit).
- */
 import ts from "typescript";
 import { resolve, dirname, join } from "node:path";
 import { existsSync } from "node:fs";
 import { transformJsonSchemas, hasJsonSchemaMarkers } from "./schema.js";
-/**
- * Get the TypeScript lib directory path.
- *
- * When running from the compiled binary (pkg snapshot), TypeScript's lib files
- * are bundled at dist-pkg/typescript-lib/. When running normally, use the
- * default TypeScript lib path.
- */
 function getTypeScriptLibDir() {
-    // Check if we're running from a compiled binary (pkg sets process.pkg)
-    if (typeof process.pkg !== "undefined") {
-        // In the snapshot, the lib files are at /snapshot/.../dist-pkg/typescript-lib/
-        const snapshotLibDir = "/snapshot/thinkwell/packages/thinkwell/dist-pkg/typescript-lib";
-        if (existsSync(snapshotLibDir)) {
-            return snapshotLibDir;
-        }
-    }
-    // Default: use TypeScript's own lib directory
-    return dirname(ts.getDefaultLibFilePath({}));
+  if (typeof process.pkg < "u") {
+    const snapshotLibDir = "/snapshot/thinkwell/packages/thinkwell/dist-pkg/typescript-lib";
+    if (existsSync(snapshotLibDir))
+      return snapshotLibDir;
+  }
+  return dirname(ts.getDefaultLibFilePath({}));
 }
-/**
- * Read and parse a tsconfig.json file using the TypeScript compiler API.
- *
- * @param configPath - Absolute path to tsconfig.json
- * @returns Parsed configuration, or an error diagnostic if the file can't be read
- */
 export function parseTsConfig(configPath) {
-    const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
-    if (configFile.error) {
-        return {
-            options: {},
-            fileNames: [],
-            errors: [configFile.error],
-        };
-    }
-    const configDir = dirname(configPath);
-    const parsed = ts.parseJsonConfigFileContent(configFile.config, ts.sys, configDir, 
-    /* existingOptions */ undefined, configPath);
+  const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
+  if (configFile.error)
     return {
-        options: parsed.options,
-        fileNames: parsed.fileNames,
-        errors: parsed.errors,
+      options: {},
+      fileNames: [],
+      errors: [configFile.error]
     };
+  const configDir = dirname(configPath), parsed = ts.parseJsonConfigFileContent(
+    configFile.config,
+    ts.sys,
+    configDir,
+    /* existingOptions */
+    void 0,
+    configPath
+  );
+  return {
+    options: parsed.options,
+    fileNames: parsed.fileNames,
+    errors: parsed.errors
+  };
 }
-/**
- * Determine whether a file path should receive @JSONSchema transformation.
- *
- * Only project source files are transformed. Files in node_modules and
- * TypeScript's own lib files are always passed through unchanged.
- */
 function shouldTransform(fileName) {
-    if (fileName.includes("node_modules"))
-        return false;
-    if (fileName.includes("/lib/lib."))
-        return false;
-    return true;
+  return !(fileName.includes("node_modules") || fileName.includes("/lib/lib."));
 }
 function isThinkwellHostOptions(options) {
-    return typeof options.compilerOptions === "object"
-        && options.compilerOptions !== null
-        && !Array.isArray(options.compilerOptions);
+  return typeof options.compilerOptions == "object" && options.compilerOptions !== null && !Array.isArray(options.compilerOptions);
 }
 export function createThinkwellHost(options) {
-    let compilerOptions;
-    let fileFilter;
-    let projectDir;
-    if (isThinkwellHostOptions(options)) {
-        compilerOptions = options.compilerOptions;
-        fileFilter = options.fileFilter;
-        projectDir = options.projectDir;
-    }
-    else {
-        compilerOptions = options;
-        fileFilter = undefined;
-        projectDir = undefined;
+  let compilerOptions, fileFilter, projectDir;
+  isThinkwellHostOptions(options) ? (compilerOptions = options.compilerOptions, fileFilter = options.fileFilter, projectDir = options.projectDir) : (compilerOptions = options, fileFilter = void 0, projectDir = void 0);
+  const defaultHost = ts.createCompilerHost(compilerOptions), tsLibDir = getTypeScriptLibDir();
+  return {
+    ...defaultHost,
+    // Override getDefaultLibLocation to point to our bundled TypeScript lib files
+    // when running from the compiled binary. This is necessary because bundled
+    // TypeScript code can't find its .d.ts files in the pkg snapshot.
+    getDefaultLibLocation() {
+      return tsLibDir;
+    },
+    getDefaultLibFileName(options2) {
+      return join(tsLibDir, ts.getDefaultLibFileName(options2));
+    },
+    getSourceFile(fileName, languageVersionOrOptions) {
+      const source = ts.sys.readFile(fileName);
+      if (source !== void 0) {
+        if (shouldTransform(fileName) && hasJsonSchemaMarkers(source) && (!fileFilter || fileFilter(fileName))) {
+          const transformed = transformJsonSchemas(fileName, source, projectDir);
+          return ts.createSourceFile(fileName, transformed, languageVersionOrOptions);
+        }
+        return ts.createSourceFile(fileName, source, languageVersionOrOptions);
+      }
     }
-    const defaultHost = ts.createCompilerHost(compilerOptions);
-    const tsLibDir = getTypeScriptLibDir();
-    return {
-        ...defaultHost,
-        // Override getDefaultLibLocation to point to our bundled TypeScript lib files
-        // when running from the compiled binary. This is necessary because bundled
-        // TypeScript code can't find its .d.ts files in the pkg snapshot.
-        getDefaultLibLocation() {
-            return tsLibDir;
-        },
-        getDefaultLibFileName(options) {
-            return join(tsLibDir, ts.getDefaultLibFileName(options));
-        },
-        getSourceFile(fileName, languageVersionOrOptions) {
-            const source = ts.sys.readFile(fileName);
-            if (source === undefined) {
-                return undefined;
-            }
-            // Only transform project source files that contain @JSONSchema markers.
-            // If a fileFilter is provided, also check that the file passes the filter.
-            if (shouldTransform(fileName) && hasJsonSchemaMarkers(source)) {
-                if (!fileFilter || fileFilter(fileName)) {
-                    const transformed = transformJsonSchemas(fileName, source, projectDir);
-                    return ts.createSourceFile(fileName, transformed, languageVersionOrOptions);
-                }
-            }
-            // Pass through unchanged
-            return ts.createSourceFile(fileName, source, languageVersionOrOptions);
-        },
-    };
+  };
 }
-/**
- * Create a TypeScript Program wired to the custom CompilerHost.
- *
- * This is the main entry point for both `thinkwell build` and `thinkwell check`.
- * The returned program can be used with `ts.getPreEmitDiagnostics()` for type
- * checking or `program.emit()` for producing output files.
- *
- * @param configPathOrOptions - Absolute path to tsconfig.json, or a CreateProgramOptions object
- * @returns The ts.Program and any config-level diagnostics, or null with errors
- */
 export function createThinkwellProgram(configPathOrOptions) {
-    const configPath = typeof configPathOrOptions === "string"
-        ? configPathOrOptions
-        : configPathOrOptions.configPath;
-    const fileFilter = typeof configPathOrOptions === "object"
-        ? configPathOrOptions.fileFilter
-        : undefined;
-    const projectDir = typeof configPathOrOptions === "object"
-        ? configPathOrOptions.projectDir
-        : undefined;
-    const resolvedConfigPath = resolve(configPath);
-    const { options, fileNames, errors } = parseTsConfig(resolvedConfigPath);
-    function makeHost() {
-        return (fileFilter || projectDir)
-            ? createThinkwellHost({ compilerOptions: options, fileFilter, projectDir })
-            : createThinkwellHost(options);
-    }
-    // If there are fatal config errors, still return them so callers can report
-    if (errors.length > 0) {
-        // Check if any errors are fatal (not just warnings)
-        const fatalErrors = errors.filter((d) => d.category === ts.DiagnosticCategory.Error);
-        if (fatalErrors.length > 0) {
-            // Create a minimal program so callers have a consistent interface
-            const host = makeHost();
-            const program = ts.createProgram([], options, host);
-            return { program, configErrors: errors };
-        }
-    }
-    const host = makeHost();
-    const program = ts.createProgram(fileNames, options, host);
-    return { program, configErrors: errors };
+  const configPath = typeof configPathOrOptions == "string" ? configPathOrOptions : configPathOrOptions.configPath, fileFilter = typeof configPathOrOptions == "object" ? configPathOrOptions.fileFilter : void 0, projectDir = typeof configPathOrOptions == "object" ? configPathOrOptions.projectDir : void 0, resolvedConfigPath = resolve(configPath), { options, fileNames, errors } = parseTsConfig(resolvedConfigPath);
+  function makeHost() {
+    return createThinkwellHost(fileFilter || projectDir ? { compilerOptions: options, fileFilter, projectDir } : options);
+  }
+  if (errors.length > 0 && errors.filter((d) => d.category === ts.DiagnosticCategory.Error).length > 0) {
+    const host2 = makeHost();
+    return { program: ts.createProgram([], options, host2), configErrors: errors };
+  }
+  const host = makeHost();
+  return { program: ts.createProgram(fileNames, options, host), configErrors: errors };
 }
-/**
- * Patch a CompilerHost to apply @JSONSchema transformation and use bundled lib files.
- *
- * This is used by watch mode to wrap the host that TypeScript's watch system
- * provides, preserving its internal state while intercepting file reads.
- */
 function patchHost(host, fileFilter, projectDir) {
-    const originalGetSourceFile = host.getSourceFile.bind(host);
-    const tsLibDir = getTypeScriptLibDir();
-    // Override lib location for compiled binary
-    host.getDefaultLibLocation = () => tsLibDir;
-    host.getDefaultLibFileName = (options) => join(tsLibDir, ts.getDefaultLibFileName(options));
-    host.getSourceFile = (fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile) => {
-        const source = ts.sys.readFile(fileName);
-        if (source === undefined) {
-            return originalGetSourceFile(fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile);
-        }
-        if (shouldTransform(fileName) && hasJsonSchemaMarkers(source)) {
-            if (!fileFilter || fileFilter(fileName)) {
-                const transformed = transformJsonSchemas(fileName, source, projectDir);
-                return ts.createSourceFile(fileName, transformed, languageVersionOrOptions);
-            }
-        }
-        return ts.createSourceFile(fileName, source, languageVersionOrOptions);
-    };
+  const originalGetSourceFile = host.getSourceFile.bind(host), tsLibDir = getTypeScriptLibDir();
+  host.getDefaultLibLocation = () => tsLibDir, host.getDefaultLibFileName = (options) => join(tsLibDir, ts.getDefaultLibFileName(options)), host.getSourceFile = (fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile) => {
+    const source = ts.sys.readFile(fileName);
+    if (source === void 0)
+      return originalGetSourceFile(fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile);
+    if (shouldTransform(fileName) && hasJsonSchemaMarkers(source) && (!fileFilter || fileFilter(fileName))) {
+      const transformed = transformJsonSchemas(fileName, source, projectDir);
+      return ts.createSourceFile(fileName, transformed, languageVersionOrOptions);
+    }
+    return ts.createSourceFile(fileName, source, languageVersionOrOptions);
+  };
 }
-/**
- * Create a watch-mode compiler host with @JSONSchema transformation.
- *
- * Uses TypeScript's `ts.createWatchCompilerHost` (config-file mode) with a
- * custom `createProgram` callback that patches the host's `getSourceFile()`
- * to apply `@JSONSchema` namespace injection. TypeScript handles file watching,
- * debouncing, and incremental re-compilation automatically.
- *
- * @param options - Watch host configuration
- * @returns A watch compiler host ready to pass to `ts.createWatchProgram()`
- */
 export function createThinkwellWatchHost(options) {
-    const { configPath, fileFilter, projectDir, reportDiagnostic, reportWatchStatus } = options;
-    const createProgram = (rootNames, compilerOptions, host, oldProgram, configFileParsingDiagnostics, projectReferences) => {
-        // Patch the host that TypeScript's watch system created, rather than
-        // replacing it entirely. This preserves watch-specific internal state.
-        if (host) {
-            patchHost(host, fileFilter, projectDir);
-        }
-        return ts.createEmitAndSemanticDiagnosticsBuilderProgram(rootNames, compilerOptions, host, oldProgram, configFileParsingDiagnostics, projectReferences);
-    };
-    return ts.createWatchCompilerHost(resolve(configPath), 
-    /* optionsToExtend */ undefined, ts.sys, createProgram, reportDiagnostic, reportWatchStatus);
+  const { configPath, fileFilter, projectDir, reportDiagnostic, reportWatchStatus } = options, createProgram = (rootNames, compilerOptions, host, oldProgram, configFileParsingDiagnostics, projectReferences) => (host && patchHost(host, fileFilter, projectDir), ts.createEmitAndSemanticDiagnosticsBuilderProgram(rootNames, compilerOptions, host, oldProgram, configFileParsingDiagnostics, projectReferences));
+  return ts.createWatchCompilerHost(
+    resolve(configPath),
+    /* optionsToExtend */
+    void 0,
+    ts.sys,
+    createProgram,
+    reportDiagnostic,
+    reportWatchStatus
+  );
 }
-//# sourceMappingURL=compiler-host.js.map