thinkwell 0.5.2 → 0.5.4

package/dist-pkg/cli-build.cjs

@@ -532,16 +532,16 @@ var require_typescript = __commonJS({
       var tsp;
       (function(tsp2) {
         const activeProgramTransformers = /* @__PURE__ */ new Set();
-        const { dirname: dirname3 } = require("path");
+        const { dirname: dirname5 } = require("path");
         function getProjectDir(compilerOptions) {
-          return compilerOptions.configFilePath && dirname3(compilerOptions.configFilePath);
+          return compilerOptions.configFilePath && dirname5(compilerOptions.configFilePath);
         }
         __name(getProjectDir, "getProjectDir");
         function getProjectConfig(compilerOptions, rootFileNames) {
           let configFilePath = compilerOptions.configFilePath;
           let projectDir = getProjectDir(compilerOptions);
           if (configFilePath === void 0) {
-            const baseDir = rootFileNames.length > 0 ? dirname3(rootFileNames[0]) : projectDir ?? process.cwd();
+            const baseDir = rootFileNames.length > 0 ? dirname5(rootFileNames[0]) : projectDir ?? process.cwd();
             configFilePath = tsp2.tsShim.findConfigFile(baseDir, tsp2.tsShim.sys.fileExists);
             if (configFilePath) {
               const config = readConfig(configFilePath);
@@ -553,7 +553,7 @@ var require_typescript = __commonJS({
         }
         __name(getProjectConfig, "getProjectConfig");
         function readConfig(configFileNamePath) {
-          const projectDir = dirname3(configFileNamePath);
+          const projectDir = dirname5(configFileNamePath);
           const result = tsp2.tsShim.readConfigFile(configFileNamePath, tsp2.tsShim.sys.readFile);
           if (result.error)
             throw new tsp2.TsPatchError("Error in tsconfig.json: " + result.error.messageText);
@@ -223419,7 +223419,7 @@ var require_safe_stable_stringify = __commonJS({
               return circularValue;
             }
             let res = "";
-            let join6 = ",";
+            let join8 = ",";
             const originalIndentation = indentation;
             if (Array.isArray(value)) {
               if (value.length === 0) {
@@ -223433,7 +223433,7 @@ var require_safe_stable_stringify = __commonJS({
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join6 = `,
+                join8 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -223441,13 +223441,13 @@ ${indentation}`;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join6;
+                res += join8;
               }
               const tmp = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join6}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join8}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -223468,7 +223468,7 @@ ${originalIndentation}`;
             let separator = "";
             if (spacer !== "") {
               indentation += spacer;
-              join6 = `,
+              join8 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -223482,13 +223482,13 @@ ${indentation}`;
               const tmp = stringifyFnReplacer(key3, value, stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key3)}:${whitespace}${tmp}`;
-                separator = join6;
+                separator = join8;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...":${whitespace}"${getItemCount(removedKeys)} not stringified"`;
-              separator = join6;
+              separator = join8;
             }
             if (spacer !== "" && separator.length > 1) {
               res = `
@@ -223530,7 +223530,7 @@ ${originalIndentation}`;
             }
             const originalIndentation = indentation;
             let res = "";
-            let join6 = ",";
+            let join8 = ",";
             if (Array.isArray(value)) {
               if (value.length === 0) {
                 return "[]";
@@ -223543,7 +223543,7 @@ ${originalIndentation}`;
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join6 = `,
+                join8 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -223551,13 +223551,13 @@ ${indentation}`;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join6;
+                res += join8;
               }
               const tmp = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join6}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join8}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -223570,7 +223570,7 @@ ${originalIndentation}`;
             let whitespace = "";
             if (spacer !== "") {
               indentation += spacer;
-              join6 = `,
+              join8 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -223579,7 +223579,7 @@ ${indentation}`;
               const tmp = stringifyArrayReplacer(key3, value[key3], stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key3)}:${whitespace}${tmp}`;
-                separator = join6;
+                separator = join8;
               }
             }
             if (spacer !== "" && separator.length > 1) {
@@ -223638,20 +223638,20 @@ ${originalIndentation}`;
               indentation += spacer;
               let res2 = `
 ${indentation}`;
-              const join7 = `,
+              const join9 = `,
 ${indentation}`;
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
               let i = 0;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyIndent(String(i), value[i], stack, spacer, indentation);
                 res2 += tmp2 !== void 0 ? tmp2 : "null";
-                res2 += join7;
+                res2 += join9;
               }
               const tmp = stringifyIndent(String(i), value[i], stack, spacer, indentation);
               res2 += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res2 += `${join7}"... ${getItemCount(removedKeys)} not stringified"`;
+                res2 += `${join9}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               res2 += `
 ${originalIndentation}`;
@@ -223667,16 +223667,16 @@ ${originalIndentation}`;
               return '"[Object]"';
             }
             indentation += spacer;
-            const join6 = `,
+            const join8 = `,
 ${indentation}`;
             let res = "";
             let separator = "";
             let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
             if (isTypedArrayWithEntries(value)) {
-              res += stringifyTypedArray(value, join6, maximumBreadth);
+              res += stringifyTypedArray(value, join8, maximumBreadth);
               keys = keys.slice(value.length);
               maximumPropertiesToStringify -= value.length;
-              separator = join6;
+              separator = join8;
             }
             if (deterministic) {
               keys = sort(keys, comparator);
@@ -223687,13 +223687,13 @@ ${indentation}`;
               const tmp = stringifyIndent(key3, value[key3], stack, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key3)}: ${tmp}`;
-                separator = join6;
+                separator = join8;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...": "${getItemCount(removedKeys)} not stringified"`;
-              separator = join6;
+              separator = join8;
             }
             if (separator !== "") {
               res = `
@@ -238603,20 +238603,95 @@ __export(build_exports, {
 });
 module.exports = __toCommonJS(build_exports);
 var import_typescript3 = __toESM(require_typescript(), 1);
-var import_node_fs5 = require("node:fs");
-var import_node_path5 = require("node:path");
+var import_node_fs6 = require("node:fs");
+var import_node_path7 = require("node:path");
 var import_node_util3 = require("node:util");
 
 // dist/cli/compiler-host.js
 var import_typescript2 = __toESM(require_typescript(), 1);
-var import_node_path2 = require("node:path");
+var import_node_path3 = require("node:path");
 var import_node_fs2 = require("node:fs");
 
 // dist/cli/schema.js
 var import_typescript = __toESM(require_typescript(), 1);
+var import_node_path2 = require("node:path");
+var import_node_module = require("node:module");
+
+// dist/build.js
 var import_node_path = require("node:path");
 var import_node_fs = require("node:fs");
 var import_ts_json_schema_generator = __toESM(require_dist(), 1);
+function findTsConfig(startDir) {
+  let dir = startDir;
+  while (true) {
+    const configPath = (0, import_node_path.join)(dir, "tsconfig.json");
+    if ((0, import_node_fs.existsSync)(configPath)) {
+      return configPath;
+    }
+    const parent = (0, import_node_path.dirname)(dir);
+    if (parent === dir) {
+      return void 0;
+    }
+    dir = parent;
+  }
+}
+__name(findTsConfig, "findTsConfig");
+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 (typeof record["$ref"] === "string") {
+    const ref = record["$ref"];
+    const match = ref.match(/^#\/definitions\/(.+)$/);
+    if (match && definitions[match[1]]) {
+      return inlineRefs(definitions[match[1]], definitions);
+    }
+  }
+  const result = {};
+  for (const [key2, value] of Object.entries(record)) {
+    result[key2] = inlineRefs(value, definitions);
+  }
+  return result;
+}
+__name(inlineRefs, "inlineRefs");
+function cleanSchema(typeName, schema) {
+  const definitions = schema.definitions || {};
+  let result = definitions[typeName] || schema;
+  result = inlineRefs(result, definitions);
+  if (typeof result === "object" && result !== null) {
+    const cleaned = { ...result };
+    delete cleaned["$schema"];
+    delete cleaned["definitions"];
+    return cleaned;
+  }
+  return result;
+}
+__name(cleanSchema, "cleanSchema");
+function generateSchemas(filePath, typeNames) {
+  const schemas = /* @__PURE__ */ new Map();
+  if (typeNames.length === 0) {
+    return schemas;
+  }
+  const configPath = findTsConfig((0, import_node_path.dirname)(filePath));
+  const generator = (0, import_ts_json_schema_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));
+  }
+  return schemas;
+}
+__name(generateSchemas, "generateSchemas");
+
+// dist/cli/schema.js
 var JSONSCHEMA_TAG = "JSONSchema";
 function hasJsDocTag(node, tagName) {
   const jsDocNodes = import_typescript.default.getJSDocTags(node);
@@ -238665,74 +238740,31 @@ function findMarkedTypes(path, source) {
   return results;
 }
 __name(findMarkedTypes, "findMarkedTypes");
-function findTsConfig(startDir) {
-  let dir = startDir;
-  while (true) {
-    const configPath = (0, import_node_path.join)(dir, "tsconfig.json");
-    if ((0, import_node_fs.existsSync)(configPath)) {
-      return configPath;
-    }
-    const parent = (0, import_node_path.dirname)(dir);
-    if (parent === dir) {
-      return void 0;
-    }
-    dir = parent;
-  }
-}
-__name(findTsConfig, "findTsConfig");
-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 (typeof record["$ref"] === "string") {
-    const ref = record["$ref"];
-    const match = ref.match(/^#\/definitions\/(.+)$/);
-    if (match && definitions[match[1]]) {
-      return inlineRefs(definitions[match[1]], definitions);
+function resolveGenerateSchemas(projectDir) {
+  if (projectDir) {
+    const projectRequire = (0, import_node_module.createRequire)((0, import_node_path2.join)(projectDir, "package.json"));
+    const buildMod = projectRequire("thinkwell/build");
+    if (typeof buildMod.generateSchemas === "function") {
+      return buildMod.generateSchemas;
     }
+    throw new Error(`thinkwell/build resolved from ${projectDir} but does not export generateSchemas. This may indicate a version mismatch \u2014 try updating the thinkwell dependency.`);
   }
-  const result = {};
-  for (const [key2, value] of Object.entries(record)) {
-    result[key2] = inlineRefs(value, definitions);
-  }
-  return result;
+  return generateSchemas;
 }
-__name(inlineRefs, "inlineRefs");
-function createSchemaGenerator(filePath) {
-  const configPath = findTsConfig((0, import_node_path.dirname)(filePath));
-  const config = {
-    path: filePath,
-    ...configPath && { tsconfig: configPath },
-    skipTypeCheck: true,
-    encodeRefs: false
-  };
-  return (0, import_ts_json_schema_generator.createGenerator)(config);
-}
-__name(createSchemaGenerator, "createSchemaGenerator");
-function generateSchemas(path, types, sourceCode) {
+__name(resolveGenerateSchemas, "resolveGenerateSchemas");
+function generateSchemas2(path, types, sourceCode, projectDir) {
   const schemas = /* @__PURE__ */ new Map();
   if (types.length === 0) {
     return schemas;
   }
-  const generator = createSchemaGenerator(path);
+  const buildGenerateSchemas = resolveGenerateSchemas(projectDir);
   for (const typeInfo of types) {
-    const { name, line, column, declarationLength } = typeInfo;
+    const { name, line, column } = typeInfo;
     try {
-      const schema = generator.createSchema(name);
-      const definitions = schema.definitions || {};
-      let result = definitions[name] || schema;
-      result = inlineRefs(result, definitions);
-      if (typeof result === "object" && result !== null) {
-        const cleaned = { ...result };
-        delete cleaned["$schema"];
-        delete cleaned["definitions"];
-        schemas.set(name, cleaned);
-      } else {
-        schemas.set(name, result);
+      const result = buildGenerateSchemas(path, [name]);
+      const schema = result.get(name);
+      if (schema) {
+        schemas.set(name, schema);
       }
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -238743,7 +238775,7 @@ function generateSchemas(path, types, sourceCode) {
   }
   return schemas;
 }
-__name(generateSchemas, "generateSchemas");
+__name(generateSchemas2, "generateSchemas");
 var ACP_NAMESPACE = "$$__thinkwell__acp__$$";
 function generateNamespace(name, schema, isExported) {
   const schemaJson = JSON.stringify(schema, null, 2).split("\n").map((line, i) => i === 0 ? line : "      " + line).join("\n");
@@ -238788,7 +238820,7 @@ function hasJsonSchemaMarkers(source) {
   return source.includes("@JSONSchema");
 }
 __name(hasJsonSchemaMarkers, "hasJsonSchemaMarkers");
-function transformJsonSchemas(path, source) {
+function transformJsonSchemas(path, source, projectDir) {
   if (!hasJsonSchemaMarkers(source)) {
     return source;
   }
@@ -238796,7 +238828,7 @@ function transformJsonSchemas(path, source) {
   if (markedTypes.length === 0) {
     return source;
   }
-  const schemas = generateSchemas(path, markedTypes, source);
+  const schemas = generateSchemas2(path, markedTypes, source, projectDir);
   const insertions = generateInsertions(markedTypes, schemas);
   let modifiedSource = applyInsertions(source, insertions);
   modifiedSource = generateSchemaImport() + "\n" + modifiedSource;
@@ -238812,7 +238844,7 @@ function getTypeScriptLibDir() {
       return snapshotLibDir;
     }
   }
-  return (0, import_node_path2.dirname)(import_typescript2.default.getDefaultLibFilePath({}));
+  return (0, import_node_path3.dirname)(import_typescript2.default.getDefaultLibFilePath({}));
 }
 __name(getTypeScriptLibDir, "getTypeScriptLibDir");
 function parseTsConfig(configPath) {
@@ -238824,7 +238856,7 @@ function parseTsConfig(configPath) {
       errors: [configFile.error]
     };
   }
-  const configDir = (0, import_node_path2.dirname)(configPath);
+  const configDir = (0, import_node_path3.dirname)(configPath);
   const parsed = import_typescript2.default.parseJsonConfigFileContent(
     configFile.config,
     import_typescript2.default.sys,
@@ -238855,12 +238887,15 @@ __name(isThinkwellHostOptions, "isThinkwellHostOptions");
 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 = void 0;
+    projectDir = void 0;
   }
   const defaultHost = import_typescript2.default.createCompilerHost(compilerOptions);
   const tsLibDir = getTypeScriptLibDir();
@@ -238873,7 +238908,7 @@ function createThinkwellHost(options) {
       return tsLibDir;
     },
     getDefaultLibFileName(options2) {
-      return (0, import_node_path2.join)(tsLibDir, import_typescript2.default.getDefaultLibFileName(options2));
+      return (0, import_node_path3.join)(tsLibDir, import_typescript2.default.getDefaultLibFileName(options2));
     },
     getSourceFile(fileName, languageVersionOrOptions) {
       const source = import_typescript2.default.sys.readFile(fileName);
@@ -238882,7 +238917,7 @@ function createThinkwellHost(options) {
       }
       if (shouldTransform(fileName) && hasJsonSchemaMarkers(source)) {
         if (!fileFilter || fileFilter(fileName)) {
-          const transformed = transformJsonSchemas(fileName, source);
+          const transformed = transformJsonSchemas(fileName, source, projectDir);
           return import_typescript2.default.createSourceFile(fileName, transformed, languageVersionOrOptions);
         }
       }
@@ -238894,10 +238929,11 @@ __name(createThinkwellHost, "createThinkwellHost");
 function createThinkwellProgram(configPathOrOptions) {
   const configPath = typeof configPathOrOptions === "string" ? configPathOrOptions : configPathOrOptions.configPath;
   const fileFilter = typeof configPathOrOptions === "object" ? configPathOrOptions.fileFilter : void 0;
-  const resolvedConfigPath = (0, import_node_path2.resolve)(configPath);
+  const projectDir = typeof configPathOrOptions === "object" ? configPathOrOptions.projectDir : void 0;
+  const resolvedConfigPath = (0, import_node_path3.resolve)(configPath);
   const { options, fileNames, errors } = parseTsConfig(resolvedConfigPath);
   function makeHost() {
-    return fileFilter ? createThinkwellHost({ compilerOptions: options, fileFilter }) : createThinkwellHost(options);
+    return fileFilter || projectDir ? createThinkwellHost({ compilerOptions: options, fileFilter, projectDir }) : createThinkwellHost(options);
   }
   __name(makeHost, "makeHost");
   if (errors.length > 0) {
@@ -238913,11 +238949,11 @@ function createThinkwellProgram(configPathOrOptions) {
   return { program, configErrors: errors };
 }
 __name(createThinkwellProgram, "createThinkwellProgram");
-function patchHost(host, fileFilter) {
+function patchHost(host, fileFilter, projectDir) {
   const originalGetSourceFile = host.getSourceFile.bind(host);
   const tsLibDir = getTypeScriptLibDir();
   host.getDefaultLibLocation = () => tsLibDir;
-  host.getDefaultLibFileName = (options) => (0, import_node_path2.join)(tsLibDir, import_typescript2.default.getDefaultLibFileName(options));
+  host.getDefaultLibFileName = (options) => (0, import_node_path3.join)(tsLibDir, import_typescript2.default.getDefaultLibFileName(options));
   host.getSourceFile = (fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile) => {
     const source = import_typescript2.default.sys.readFile(fileName);
     if (source === void 0) {
@@ -238925,7 +238961,7 @@ function patchHost(host, fileFilter) {
     }
     if (shouldTransform(fileName) && hasJsonSchemaMarkers(source)) {
       if (!fileFilter || fileFilter(fileName)) {
-        const transformed = transformJsonSchemas(fileName, source);
+        const transformed = transformJsonSchemas(fileName, source, projectDir);
         return import_typescript2.default.createSourceFile(fileName, transformed, languageVersionOrOptions);
       }
     }
@@ -238934,15 +238970,15 @@ function patchHost(host, fileFilter) {
 }
 __name(patchHost, "patchHost");
 function createThinkwellWatchHost(options) {
-  const { configPath, fileFilter, reportDiagnostic, reportWatchStatus } = options;
+  const { configPath, fileFilter, projectDir, reportDiagnostic, reportWatchStatus } = options;
   const createProgram = /* @__PURE__ */ __name((rootNames, compilerOptions, host, oldProgram, configFileParsingDiagnostics, projectReferences) => {
     if (host) {
-      patchHost(host, fileFilter);
+      patchHost(host, fileFilter, projectDir);
     }
     return import_typescript2.default.createEmitAndSemanticDiagnosticsBuilderProgram(rootNames, compilerOptions, host, oldProgram, configFileParsingDiagnostics, projectReferences);
   }, "createProgram");
   return import_typescript2.default.createWatchCompilerHost(
-    (0, import_node_path2.resolve)(configPath),
+    (0, import_node_path3.resolve)(configPath),
     /* optionsToExtend */
     void 0,
     import_typescript2.default.sys,
@@ -238962,6 +238998,9 @@ var whiteBold = /* @__PURE__ */ __name((t) => (0, import_node_util.styleText)(["
 var dim = /* @__PURE__ */ __name((t) => (0, import_node_util.styleText)("dim", t), "dim");
 
 // dist/cli/commands.js
+var import_node_fs3 = require("node:fs");
+var import_node_path4 = require("node:path");
+var import_node_os = require("node:os");
 var import_node_util2 = require("node:util");
 var redBold = /* @__PURE__ */ __name((t) => (0, import_node_util2.styleText)(["red", "bold"], t), "redBold");
 function fmtError(message) {
@@ -238970,13 +239009,13 @@ function fmtError(message) {
 __name(fmtError, "fmtError");
 
 // dist/cli/dependency-check.js
-var import_node_fs4 = require("node:fs");
-var import_node_path4 = require("node:path");
+var import_node_fs5 = require("node:fs");
+var import_node_path6 = require("node:path");
 var import_node_child_process = require("node:child_process");
 
 // dist/cli/package-manager.js
-var import_node_fs3 = require("node:fs");
-var import_node_path3 = require("node:path");
+var import_node_fs4 = require("node:fs");
+var import_node_path5 = require("node:path");
 var LOCKFILES = [
   { file: "pnpm-lock.yaml", pm: "pnpm" },
   { file: "yarn.lock", pm: "yarn" },
@@ -238984,8 +239023,8 @@ var LOCKFILES = [
 ];
 function detectByLockfile(projectDir) {
   for (const { file, pm } of LOCKFILES) {
-    const lockfilePath = (0, import_node_path3.join)(projectDir, file);
-    if ((0, import_node_fs3.existsSync)(lockfilePath)) {
+    const lockfilePath = (0, import_node_path5.join)(projectDir, file);
+    if ((0, import_node_fs4.existsSync)(lockfilePath)) {
       return { pm, lockfile: file };
     }
   }
@@ -239005,12 +239044,12 @@ function parsePackageManagerField(value) {
 }
 __name(parsePackageManagerField, "parsePackageManagerField");
 function detectByPackageJson(projectDir) {
-  const pkgPath = (0, import_node_path3.join)(projectDir, "package.json");
-  if (!(0, import_node_fs3.existsSync)(pkgPath)) {
+  const pkgPath = (0, import_node_path5.join)(projectDir, "package.json");
+  if (!(0, import_node_fs4.existsSync)(pkgPath)) {
     return null;
   }
   try {
-    const content = (0, import_node_fs3.readFileSync)(pkgPath, "utf-8");
+    const content = (0, import_node_fs4.readFileSync)(pkgPath, "utf-8");
     const pkg = JSON.parse(content);
     return parsePackageManagerField(pkg.packageManager);
   } catch {
@@ -239060,12 +239099,12 @@ __name(detectPackageManager, "detectPackageManager");
 
 // dist/cli/dependency-check.js
 function readPackageJson(dir) {
-  const pkgPath = (0, import_node_path4.join)(dir, "package.json");
-  if (!(0, import_node_fs4.existsSync)(pkgPath)) {
+  const pkgPath = (0, import_node_path6.join)(dir, "package.json");
+  if (!(0, import_node_fs5.existsSync)(pkgPath)) {
     return null;
   }
   try {
-    const content = (0, import_node_fs4.readFileSync)(pkgPath, "utf-8");
+    const content = (0, import_node_fs5.readFileSync)(pkgPath, "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
@@ -239231,7 +239270,7 @@ async function checkDependencies(projectDir) {
 }
 __name(checkDependencies, "checkDependencies");
 function hasPackageJson(projectDir) {
-  return (0, import_node_fs4.existsSync)((0, import_node_path4.join)(projectDir, "package.json"));
+  return (0, import_node_fs5.existsSync)((0, import_node_path6.join)(projectDir, "package.json"));
 }
 __name(hasPackageJson, "hasPackageJson");
 
@@ -239274,12 +239313,12 @@ __name(hasMissingDependencies, "hasMissingDependencies");
 
 // dist/cli/build.js
 function readPackageJsonConfig(dir) {
-  const pkgPath = (0, import_node_path5.join)(dir, "package.json");
-  if (!(0, import_node_fs5.existsSync)(pkgPath)) {
+  const pkgPath = (0, import_node_path7.join)(dir, "package.json");
+  if (!(0, import_node_fs6.existsSync)(pkgPath)) {
     return void 0;
   }
   try {
-    const content = (0, import_node_fs5.readFileSync)(pkgPath, "utf-8");
+    const content = (0, import_node_fs6.readFileSync)(pkgPath, "utf-8");
     const pkg = JSON.parse(content);
     const config = pkg?.thinkwell?.build;
     if (!config || typeof config !== "object") {
@@ -239309,13 +239348,13 @@ function createFileFilter(config) {
   return (fileName) => {
     if (hasExclude) {
       for (const pattern of exclude) {
-        if ((0, import_node_path5.matchesGlob)(fileName, pattern))
+        if ((0, import_node_path7.matchesGlob)(fileName, pattern))
           return false;
       }
     }
     if (hasInclude) {
       for (const pattern of include) {
-        if ((0, import_node_path5.matchesGlob)(fileName, pattern))
+        if ((0, import_node_path7.matchesGlob)(fileName, pattern))
           return true;
       }
       return false;
@@ -239344,8 +239383,8 @@ async function runBuild(options) {
       process.exit(2);
     }
   }
-  const configPath = options.project ? (0, import_node_path5.resolve)(cwd, options.project) : (0, import_node_path5.resolve)(cwd, "tsconfig.json");
-  if (!(0, import_node_fs5.existsSync)(configPath)) {
+  const configPath = options.project ? (0, import_node_path7.resolve)(cwd, options.project) : (0, import_node_path7.resolve)(cwd, "tsconfig.json");
+  if (!(0, import_node_fs6.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,");
@@ -239362,10 +239401,11 @@ async function runBuild(options) {
       console.error(`  @JSONSchema exclude: ${pkgConfig.exclude.join(", ")}`);
     }
   }
+  const projectDir = hasPackageJson(cwd) ? cwd : void 0;
   if (options.watch) {
-    return runWatch(configPath, fileFilter);
+    return runWatch(configPath, fileFilter, projectDir);
   }
-  const { program, configErrors } = fileFilter ? createThinkwellProgram({ configPath, fileFilter }) : createThinkwellProgram(configPath);
+  const { program, configErrors } = fileFilter || projectDir ? createThinkwellProgram({ configPath, fileFilter, projectDir }) : createThinkwellProgram(configPath);
   if (configErrors.length > 0) {
     console.error(formatDiagnostics(configErrors));
     const hasFatal = configErrors.some((d) => d.category === import_typescript3.default.DiagnosticCategory.Error);
@@ -239394,7 +239434,7 @@ async function runBuild(options) {
   }
 }
 __name(runBuild, "runBuild");
-function runWatch(configPath, fileFilter) {
+function runWatch(configPath, fileFilter, projectDir) {
   const reportDiagnostic = /* @__PURE__ */ __name((diagnostic) => {
     console.error(import_typescript3.default.formatDiagnosticsWithColorAndContext([diagnostic], diagnosticsHost));
   }, "reportDiagnostic");
@@ -239404,6 +239444,7 @@ function runWatch(configPath, fileFilter) {
   const watchHost = createThinkwellWatchHost({
     configPath,
     fileFilter,
+    projectDir,
     reportDiagnostic,
     reportWatchStatus
   });