thinkwell 0.5.5 → 0.5.7

package/dist-pkg/cli-loader.cjs

@@ -238623,61 +238623,49 @@ 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) {
+  for (; ; ) {
     const configPath = (0, import_node_path.join)(dir, "tsconfig.json");
-    if ((0, import_node_fs.existsSync)(configPath)) {
+    if ((0, import_node_fs.existsSync)(configPath))
       return configPath;
-    }
     const parent = (0, import_node_path.dirname)(dir);
-    if (parent === dir) {
-      return void 0;
-    }
+    if (parent === dir)
+      return;
     dir = parent;
   }
 }
 __name(findTsConfig, "findTsConfig");
 function inlineRefs(obj, definitions) {
-  if (obj === null || typeof obj !== "object") {
+  if (obj === null || typeof obj != "object")
     return obj;
-  }
-  if (Array.isArray(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]]) {
+  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 [key2, value] of Object.entries(record)) {
+  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) {
+  if (result = inlineRefs(result, definitions), typeof result == "object" && result !== null) {
     const cleaned = { ...result };
-    delete cleaned["$schema"];
-    delete cleaned["definitions"];
-    return cleaned;
+    return delete cleaned.$schema, delete cleaned.definitions, cleaned;
   }
   return result;
 }
 __name(cleanSchema, "cleanSchema");
 function generateSchemas(filePath, typeNames) {
   const schemas = /* @__PURE__ */ new Map();
-  if (typeNames.length === 0) {
+  if (typeNames.length === 0)
     return schemas;
-  }
-  const configPath = findTsConfig((0, import_node_path.dirname)(filePath));
-  const generator = (0, import_ts_json_schema_generator.createGenerator)({
+  const configPath = findTsConfig((0, import_node_path.dirname)(filePath)), generator = (0, import_ts_json_schema_generator.createGenerator)({
     path: filePath,
     ...configPath && { tsconfig: configPath },
     skipTypeCheck: true,
@@ -238694,8 +238682,7 @@ __name(generateSchemas, "generateSchemas");
 // dist/cli/schema.js
 var JSONSCHEMA_TAG = "JSONSchema";
 function hasJsDocTag(node, tagName) {
-  const jsDocNodes = import_typescript.default.getJSDocTags(node);
-  return jsDocNodes.some((tag) => tag.tagName.text === tagName);
+  return import_typescript.default.getJSDocTags(node).some((tag) => tag.tagName.text === tagName);
 }
 __name(hasJsDocTag, "hasJsDocTag");
 function findMarkedTypes(path, source) {
@@ -238705,48 +238692,36 @@ function findMarkedTypes(path, source) {
     import_typescript.default.ScriptTarget.Latest,
     true
     // setParentNodes - needed for JSDoc traversal
-  );
-  const results = [];
-  import_typescript.default.forEachChild(sourceFile, /* @__PURE__ */ __name(function visit(node) {
-    if (import_typescript.default.isInterfaceDeclaration(node) || import_typescript.default.isTypeAliasDeclaration(node) || import_typescript.default.isEnumDeclaration(node) || import_typescript.default.isClassDeclaration(node)) {
-      if (hasJsDocTag(node, JSONSCHEMA_TAG)) {
-        const name = node.name?.text;
-        if (name) {
-          const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
-          let keyword = "interface";
-          if (import_typescript.default.isTypeAliasDeclaration(node))
-            keyword = "type";
-          else if (import_typescript.default.isEnumDeclaration(node))
-            keyword = "enum";
-          else if (import_typescript.default.isClassDeclaration(node))
-            keyword = "class";
-          const declarationLength = keyword.length + 1 + name.length;
-          const isExported = node.modifiers?.some((m) => m.kind === import_typescript.default.SyntaxKind.ExportKeyword) ?? false;
-          results.push({
-            name,
-            node,
-            startPosition: node.getStart(),
-            endPosition: node.getEnd(),
-            line: line + 1,
-            column: character + 1,
-            declarationLength,
-            isExported
-          });
-        }
+  ), results = [];
+  return import_typescript.default.forEachChild(sourceFile, /* @__PURE__ */ __name(function visit(node) {
+    if ((import_typescript.default.isInterfaceDeclaration(node) || import_typescript.default.isTypeAliasDeclaration(node) || import_typescript.default.isEnumDeclaration(node) || import_typescript.default.isClassDeclaration(node)) && hasJsDocTag(node, JSONSCHEMA_TAG)) {
+      const name = node.name?.text;
+      if (name) {
+        const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+        let keyword = "interface";
+        import_typescript.default.isTypeAliasDeclaration(node) ? keyword = "type" : import_typescript.default.isEnumDeclaration(node) ? keyword = "enum" : import_typescript.default.isClassDeclaration(node) && (keyword = "class");
+        const declarationLength = keyword.length + 1 + name.length, isExported = node.modifiers?.some((m) => m.kind === import_typescript.default.SyntaxKind.ExportKeyword) ?? false;
+        results.push({
+          name,
+          node,
+          startPosition: node.getStart(),
+          endPosition: node.getEnd(),
+          line: line + 1,
+          column: character + 1,
+          declarationLength,
+          isExported
+        });
       }
     }
     import_typescript.default.forEachChild(node, visit);
-  }, "visit"));
-  return results;
+  }, "visit")), results;
 }
 __name(findMarkedTypes, "findMarkedTypes");
 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") {
+    const buildMod = (0, import_node_module.createRequire)((0, import_node_path2.join)(projectDir, "package.json"))("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.`);
   }
   return generateSchemas;
@@ -238754,18 +238729,14 @@ function resolveGenerateSchemas(projectDir) {
 __name(resolveGenerateSchemas, "resolveGenerateSchemas");
 function generateSchemas2(path, types, sourceCode, projectDir) {
   const schemas = /* @__PURE__ */ new Map();
-  if (types.length === 0) {
+  if (types.length === 0)
     return schemas;
-  }
   const buildGenerateSchemas = resolveGenerateSchemas(projectDir);
   for (const typeInfo of types) {
     const { name, line, column } = typeInfo;
     try {
-      const result = buildGenerateSchemas(path, [name]);
-      const schema = result.get(name);
-      if (schema) {
-        schemas.set(name, schema);
-      }
+      const schema = buildGenerateSchemas(path, [name]).get(name);
+      schema && schemas.set(name, schema);
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       throw new Error(`Failed to generate schema for type '${name}' at ${path}:${line}:${column}
@@ -238778,27 +238749,27 @@ function generateSchemas2(path, types, sourceCode, projectDir) {
 __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");
-  const exportPrefix = isExported ? "export " : "";
+  const schemaJson = JSON.stringify(schema, null, 2).split(`
+`).map((line, i) => i === 0 ? line : "      " + line).join(`
+`);
   return [
-    `${exportPrefix}namespace ${name} {`,
+    `${isExported ? "export " : ""}namespace ${name} {`,
     `  export const Schema: ${ACP_NAMESPACE}.SchemaProvider<${name}> = {`,
     `    toJsonSchema: () => (${schemaJson}) as ${ACP_NAMESPACE}.JsonSchema,`,
-    `  };`,
-    `}`
-  ].join("\n");
+    "  };",
+    "}"
+  ].join(`
+`);
 }
 __name(generateNamespace, "generateNamespace");
 function generateInsertions(types, schemas) {
   const insertions = [];
   for (const { name, endPosition, isExported } of types) {
     const schema = schemas.get(name);
-    if (!schema) {
-      continue;
-    }
-    insertions.push({
+    schema && insertions.push({
       position: endPosition,
-      code: "\n" + generateNamespace(name, schema, isExported)
+      code: `
+` + generateNamespace(name, schema, isExported)
     });
   }
   return insertions.sort((a, b) => b.position - a.position);
@@ -238810,9 +238781,8 @@ function generateSchemaImport() {
 __name(generateSchemaImport, "generateSchemaImport");
 function applyInsertions(source, insertions) {
   let result = source;
-  for (const { position, code } of insertions) {
+  for (const { position, code } of insertions)
     result = result.slice(0, position) + code + result.slice(position);
-  }
   return result;
 }
 __name(applyInsertions, "applyInsertions");
@@ -238821,18 +238791,16 @@ function hasJsonSchemaMarkers(source) {
 }
 __name(hasJsonSchemaMarkers, "hasJsonSchemaMarkers");
 function transformJsonSchemas(path, source, projectDir) {
-  if (!hasJsonSchemaMarkers(source)) {
+  if (!hasJsonSchemaMarkers(source))
     return source;
-  }
   const markedTypes = findMarkedTypes(path, source);
-  if (markedTypes.length === 0) {
+  if (markedTypes.length === 0)
     return source;
-  }
-  const schemas = generateSchemas2(path, markedTypes, source, projectDir);
-  const insertions = generateInsertions(markedTypes, schemas);
+  const schemas = generateSchemas2(path, markedTypes, source, projectDir), insertions = generateInsertions(markedTypes, schemas);
   let modifiedSource = applyInsertions(source, insertions);
-  modifiedSource = generateSchemaImport() + "\n" + modifiedSource;
-  return modifiedSource;
+  const [shebang, rest] = extractShebang(modifiedSource);
+  return modifiedSource = shebang + generateSchemaImport() + `
+` + rest, modifiedSource;
 }
 __name(transformJsonSchemas, "transformJsonSchemas");
 
@@ -238842,7 +238810,7 @@ function initializeBundledRegistry(modules) {
   global.__bundled__ = modules;
 }
 __name(initializeBundledRegistry, "initializeBundledRegistry");
-var __projectDir = void 0;
+var __projectDir;
 function setExplicitConfig(projectDir) {
   __projectDir = projectDir;
 }
@@ -238853,44 +238821,31 @@ function isBundledPackage(moduleName) {
 __name(isBundledPackage, "isBundledPackage");
 function extractShebang(source) {
   if (source.startsWith("#!")) {
-    const newlineIndex = source.indexOf("\n");
-    if (newlineIndex !== -1) {
-      return [source.slice(0, newlineIndex + 1), source.slice(newlineIndex + 1)];
-    }
-    return [source, ""];
+    const newlineIndex = source.indexOf(`
+`);
+    return newlineIndex !== -1 ? [source.slice(0, newlineIndex + 1), source.slice(newlineIndex + 1)] : [source, ""];
   }
   return ["", source];
 }
 __name(extractShebang, "extractShebang");
 function transformVirtualImports(source) {
   const importPattern = /import\s+\{([^}]+)\}\s+from\s+['"](@thinkwell\/(?:acp|protocol)|thinkwell)['"]/g;
-  source = source.replace(importPattern, (_2, imports, packageName) => {
-    const cleanImports = imports.trim();
-    return `const {${cleanImports}} = global.__bundled__["${packageName}"]`;
-  });
+  source = source.replace(importPattern, (_2, imports, packageName) => `const {${imports.trim()}} = global.__bundled__["${packageName}"]`);
   const defaultImportPattern = /import\s+(\w+)\s+from\s+['"](@thinkwell\/(?:acp|protocol)|thinkwell)['"]/g;
-  source = source.replace(defaultImportPattern, (_2, importName, packageName) => {
-    return `const ${importName} = global.__bundled__["${packageName}"].default || global.__bundled__["${packageName}"]`;
-  });
+  source = source.replace(defaultImportPattern, (_2, importName, packageName) => `const ${importName} = global.__bundled__["${packageName}"].default || global.__bundled__["${packageName}"]`);
   const namespaceImportPattern = /import\s+\*\s+as\s+(\w+)\s+from\s+['"](@thinkwell\/(?:acp|protocol)|thinkwell)['"]/g;
-  source = source.replace(namespaceImportPattern, (_2, importName, packageName) => {
-    return `const ${importName} = global.__bundled__["${packageName}"]`;
-  });
+  source = source.replace(namespaceImportPattern, (_2, importName, packageName) => `const ${importName} = global.__bundled__["${packageName}"]`);
   const typeImportPattern = /import\s+type\s+\{[^}]+\}\s+from\s+['"](@thinkwell\/(?:acp|protocol)|thinkwell)['"]\s*;?/g;
-  source = source.replace(typeImportPattern, "");
-  return source;
+  return source = source.replace(typeImportPattern, ""), source;
 }
 __name(transformVirtualImports, "transformVirtualImports");
 function createCustomRequire(scriptPath) {
-  const scriptDir = (0, import_node_path3.dirname)(scriptPath);
-  const nodeModulesPath = (0, import_node_path3.join)(scriptDir, "node_modules");
-  const baseRequire = (0, import_node_module2.createRequire)(scriptPath);
+  const scriptDir = (0, import_node_path3.dirname)(scriptPath), nodeModulesPath = (0, import_node_path3.join)(scriptDir, "node_modules"), baseRequire = (0, import_node_module2.createRequire)(scriptPath);
   function customRequire(moduleName) {
     if (!__projectDir && global.__bundled__ && isBundledPackage(moduleName)) {
       const bundled = global.__bundled__[moduleName];
-      if (bundled) {
+      if (bundled)
         return bundled;
-      }
     }
     try {
       const resolved = baseRequire.resolve(moduleName, {
@@ -238902,32 +238857,20 @@ function createCustomRequire(scriptPath) {
     }
   }
   __name(customRequire, "customRequire");
-  customRequire.resolve = ((id, options) => {
-    if (!__projectDir && global.__bundled__ && isBundledPackage(id)) {
+  return customRequire.resolve = ((id, options) => {
+    if (!__projectDir && global.__bundled__ && isBundledPackage(id))
       return `/__bundled__/${id}`;
-    }
     const paths = options?.paths ?? [scriptDir, nodeModulesPath];
     try {
       return baseRequire.resolve(id, { paths });
     } catch {
       return baseRequire.resolve(id, options);
     }
-  });
-  customRequire.resolve.paths = baseRequire.resolve.paths;
-  customRequire.cache = baseRequire.cache;
-  customRequire.extensions = baseRequire.extensions;
-  customRequire.main = baseRequire.main;
-  return customRequire;
+  }), customRequire.resolve.paths = baseRequire.resolve.paths, customRequire.cache = baseRequire.cache, customRequire.extensions = baseRequire.extensions, customRequire.main = baseRequire.main, customRequire;
 }
 __name(createCustomRequire, "createCustomRequire");
 function needsTransformation(source) {
-  if (hasJsonSchemaMarkers(source)) {
-    return true;
-  }
-  if (!__projectDir && /from\s+['"](?:thinkwell|@thinkwell\/(?:acp|protocol))['"]/.test(source)) {
-    return true;
-  }
-  return false;
+  return !!(hasJsonSchemaMarkers(source) || !__projectDir && /from\s+['"](?:thinkwell|@thinkwell\/(?:acp|protocol))['"]/.test(source));
 }
 __name(needsTransformation, "needsTransformation");
 function randomId() {
@@ -238936,58 +238879,35 @@ function randomId() {
 __name(randomId, "randomId");
 function rewriteJsToTsExtensions(originalPath, source) {
   const scriptDir = (0, import_node_path3.dirname)(originalPath);
-  source = source.replace(/(from\s+['"])(\.\.?\/[^'"]*?)\.js(['"])/g, (match, prefix, specifierBase, suffix) => {
+  return source = source.replace(/(from\s+['"])(\.\.?\/[^'"]*?)\.js(['"])/g, (match, prefix, specifierBase, suffix) => {
     const tsPath = (0, import_node_path3.resolve)(scriptDir, `${specifierBase}.ts`);
-    if ((0, import_node_fs2.existsSync)(tsPath)) {
-      return `${prefix}${specifierBase}.ts${suffix}`;
-    }
-    return match;
-  });
-  source = source.replace(/(import\s*\(\s*['"])(\.\.?\/[^'"]*?)\.js(['"]\s*\))/g, (match, prefix, specifierBase, suffix) => {
+    return (0, import_node_fs2.existsSync)(tsPath) ? `${prefix}${specifierBase}.ts${suffix}` : match;
+  }), source = source.replace(/(import\s*\(\s*['"])(\.\.?\/[^'"]*?)\.js(['"]\s*\))/g, (match, prefix, specifierBase, suffix) => {
     const tsPath = (0, import_node_path3.resolve)(scriptDir, `${specifierBase}.ts`);
-    if ((0, import_node_fs2.existsSync)(tsPath)) {
-      return `${prefix}${specifierBase}.ts${suffix}`;
-    }
-    return match;
-  });
-  return source;
+    return (0, import_node_fs2.existsSync)(tsPath) ? `${prefix}${specifierBase}.ts${suffix}` : match;
+  }), source;
 }
 __name(rewriteJsToTsExtensions, "rewriteJsToTsExtensions");
 function generateImportMetaPatch(originalPath) {
-  const fileUrl = `file://${originalPath}`;
-  const originalDir = (0, import_node_path3.dirname)(originalPath);
-  const originalFilename = originalPath;
-  const escape = /* @__PURE__ */ __name((s) => s.replace(/\\/g, "\\\\").replace(/'/g, "\\'"), "escape");
+  const fileUrl = `file://${originalPath}`, originalDir = (0, import_node_path3.dirname)(originalPath), originalFilename = originalPath, escape = /* @__PURE__ */ __name((s) => s.replace(/\\/g, "\\\\").replace(/'/g, "\\'"), "escape");
   return [
     `Object.defineProperty(import.meta, 'url', { value: '${escape(fileUrl)}', writable: false, configurable: true });`,
     `Object.defineProperty(import.meta, 'dirname', { value: '${escape(originalDir)}', writable: false, configurable: true });`,
     `Object.defineProperty(import.meta, 'filename', { value: '${escape(originalFilename)}', writable: false, configurable: true });`,
     ""
-  ].join("\n");
+  ].join(`
+`);
 }
 __name(generateImportMetaPatch, "generateImportMetaPatch");
 function loadScript(scriptPath) {
-  const absolutePath = (0, import_node_path3.isAbsolute)(scriptPath) ? scriptPath : (0, import_node_path3.resolve)(process.cwd(), scriptPath);
-  const rawSource = (0, import_node_fs2.readFileSync)(absolutePath, "utf-8");
-  const [, sourceWithoutShebang] = extractShebang(rawSource);
-  if (!needsTransformation(sourceWithoutShebang)) {
-    const baseRequire = (0, import_node_module2.createRequire)(absolutePath);
-    return baseRequire(absolutePath);
-  }
+  const absolutePath = (0, import_node_path3.isAbsolute)(scriptPath) ? scriptPath : (0, import_node_path3.resolve)(process.cwd(), scriptPath), rawSource = (0, import_node_fs2.readFileSync)(absolutePath, "utf-8"), [, sourceWithoutShebang] = extractShebang(rawSource);
+  if (!needsTransformation(sourceWithoutShebang))
+    return (0, import_node_module2.createRequire)(absolutePath)(absolutePath);
   let source = transformJsonSchemas(absolutePath, sourceWithoutShebang, __projectDir);
-  if (!__projectDir) {
-    source = transformVirtualImports(source);
-  }
-  source = rewriteJsToTsExtensions(absolutePath, source);
-  source = generateImportMetaPatch(absolutePath) + source;
-  const ext = absolutePath.endsWith(".ts") ? ".ts" : ".js";
-  const scriptDir = (0, import_node_path3.dirname)(absolutePath);
-  const tempFile = (0, import_node_path3.join)(scriptDir, `.thinkwell-${(0, import_node_path3.basename)(absolutePath, ext)}-${randomId()}${ext}`);
+  __projectDir || (source = transformVirtualImports(source)), source = rewriteJsToTsExtensions(absolutePath, source), source = generateImportMetaPatch(absolutePath) + source;
+  const ext = absolutePath.endsWith(".ts") ? ".ts" : ".js", scriptDir = (0, import_node_path3.dirname)(absolutePath), tempFile = (0, import_node_path3.join)(scriptDir, `.thinkwell-${(0, import_node_path3.basename)(absolutePath, ext)}-${randomId()}${ext}`);
   try {
-    (0, import_node_fs2.writeFileSync)(tempFile, source, "utf-8");
-    const baseRequire = (0, import_node_module2.createRequire)(absolutePath);
-    const result = baseRequire(tempFile);
-    return result;
+    return (0, import_node_fs2.writeFileSync)(tempFile, source, "utf-8"), (0, import_node_module2.createRequire)(absolutePath)(tempFile);
   } finally {
     try {
       (0, import_node_fs2.rmSync)(tempFile);
@@ -239001,24 +238921,22 @@ async function runScript(scriptPath, args = []) {
   process.argv = [process.execPath, scriptPath, ...args];
   try {
     const exports2 = loadScript(scriptPath);
-    if (exports2 && typeof exports2 === "object") {
+    if (exports2 && typeof exports2 == "object") {
       const mod = exports2;
-      if (typeof mod.default === "function") {
+      if (typeof mod.default == "function") {
         await mod.default();
         return;
       }
-      if (typeof mod.main === "function") {
+      if (typeof mod.main == "function") {
         await mod.main();
         return;
       }
-      if (typeof mod.run === "function") {
+      if (typeof mod.run == "function") {
         await mod.run();
         return;
       }
     }
-    if (typeof exports2 === "function") {
-      await exports2();
-    }
+    typeof exports2 == "function" && await exports2();
   } finally {
     process.argv = originalArgv;
   }

package/dist-pkg/protocol.cjs

@@ -77,18 +77,12 @@ var JsonRpcErrorCodes = {
 };
 function createRequest(id, method, params) {
   const request = { jsonrpc: "2.0", id, method };
-  if (params !== void 0) {
-    request.params = params;
-  }
-  return request;
+  return params !== void 0 && (request.params = params), request;
 }
 __name(createRequest, "createRequest");
 function createNotification(method, params) {
   const notification = { jsonrpc: "2.0", method };
-  if (params !== void 0) {
-    notification.params = params;
-  }
-  return notification;
+  return params !== void 0 && (notification.params = params), notification;
 }
 __name(createNotification, "createNotification");
 function createSuccessResponse(id, result) {