@xsai/tool 0.2.0 → 0.2.2

package/dist/index.d.ts

@@ -1,16 +1,14 @@
 import { ToolExecuteOptions, ToolExecuteResult, Tool } from '@xsai/shared-chat';
-import { Schema, InferIn, Infer } from 'xsschema';
+import { Schema, InferIn } from 'xsschema';
 
-interface ToolOptions<T1 extends Schema, T2 extends Schema | undefined = undefined> {
+interface ToolOptions<T extends Schema> {
     description?: string;
-    execute: (input: InferIn<T1>, options: ToolExecuteOptions) => T2 extends Schema ? Infer<T2> extends object ? Infer<T2> | Promise<Infer<T2>> : Promise<ToolExecuteResult> | ToolExecuteResult : Promise<ToolExecuteResult> | ToolExecuteResult;
+    execute: (input: InferIn<T>, options: ToolExecuteOptions) => Promise<ToolExecuteResult> | ToolExecuteResult;
     name: string;
-    parameters: T1;
-    returns?: T2;
-    strict?: boolean;
+    parameters: T;
 }
 interface ToolResult extends Tool {
 }
-declare const tool: <T1 extends Schema, T2 extends Schema | undefined = undefined>(options: ToolOptions<T1, T2>) => Promise<ToolResult>;
+declare const tool: <T extends Schema>(options: ToolOptions<T>) => Promise<ToolResult>;
 
 export { type ToolOptions, type ToolResult, tool };

package/dist/index.js

@@ -1,15 +1,20 @@
 import { toJsonSchema } from 'xsschema';
 
-const tool = async (options) => ({
-  execute: options.execute,
-  function: {
-    description: options.description,
-    name: options.name,
-    parameters: await toJsonSchema(options.parameters),
-    returns: options.returns ? await toJsonSchema(options.returns) : void 0,
-    strict: options.strict
-  },
-  type: "function"
-});
+const tool = async (options) => {
+  const schema = await toJsonSchema(options.parameters);
+  return {
+    execute: options.execute,
+    function: {
+      description: options.description,
+      name: options.name,
+      parameters: {
+        ...schema,
+        additionalProperties: false
+      },
+      strict: true
+    },
+    type: "function"
+  };
+};
 
 export { tool };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai/tool",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "extra-small AI SDK.",
   "author": "Moeru AI",
   "license": "MIT",