@takeshape/schema 10.52.5 → 11.0.1

package/es/schemas/project-schema.json

@@ -165,6 +165,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.45.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.46.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/es/types/utils.js

@@ -49,9 +49,22 @@ export function isAwsLambdaResolver(resolver) {
 export function isUtilResolver(resolver) {
   return isBasicResolver(resolver) && utilResolver.properties.name.enum.includes(resolver.name);
 }
+export const aiResolverNames = ['ai:generateText', 'ai:chat'];
+export function isAIResolverName(name) {
+  return name ? aiResolverNames.includes(name) : false;
+}
+export function isAIGenerateTextResolver(resolver) {
+  return isBasicResolver(resolver) && isAIResolverName(resolver.name);
+}
 export function isProjectSchemaWithServices(schema) {
   return !isUndefined(schema.services);
 }
+export function containsResolver(resolver, predicate) {
+  if (isBasicResolver(resolver)) {
+    return predicate(resolver);
+  }
+  return Boolean(resolver.compose.find(resolver => containsResolver(resolver, predicate)));
+}
 
 /** Directive Mapping Utils **/
 

package/es/validate.js

@@ -22,7 +22,7 @@ import authSchemas from './schemas/auth-schemas.json';
 import { getAllRefs, getShape } from './schema-util';
 import { builtInShapes } from './builtin-schema';
 import { isValidTemplate } from './template-shapes';
-import { isBasicResolver, isComposeResolver, isExtendsSchema, isObjectSchema } from './types/utils';
+import { isAIGenerateTextResolver, isBasicResolver, isComposeResolver, isExtendsSchema, isObjectSchema } from './types/utils';
 import { refItemToNamespacedShapeName, getRefShapeName, parsePropertyRef, propertyRefItemToResolverPath, createGetNamespace, propertyRefItemToPath, atRefToRefItem, refItemToShape, refItemToAtRef } from './refs';
 import { scalars } from './scalars';
 import { isUnionSchema } from './unions';
@@ -225,6 +225,36 @@ function validateResolver(projectSchema, basePath, baseResolver) {
         pushErrors(errors, validateAITGuardrail(resolver.guardrails[i], path.concat(['guardrails', i])));
       }
     }
+    const {
+      toolChoice
+    } = resolver.options ?? {};
+    if (toolChoice === 'required') {
+      if (!resolver.tools?.length) {
+        errors.push({
+          type: 'notFound',
+          path: path.concat(['options', 'toolChoice']),
+          message: `Must have at least one tool configured to specify "required"`
+        });
+      }
+    } else if (toolChoice && toolChoice !== 'auto' && toolChoice !== 'none') {
+      const parsed = parsePropertyRef(toolChoice);
+      if (parsed) {
+        const matchingTool = resolver.tools?.find(tool => isEqual(parsed, parsePropertyRef(getToolRef(tool))));
+        if (!matchingTool) {
+          errors.push({
+            type: 'notFound',
+            path: path.concat(['options', 'toolChoice']),
+            message: `Missing tool "${toolChoice}" must be specified in "tools" array`
+          });
+        }
+      } else {
+        errors.push({
+          type: 'conflict',
+          path: path.concat(['options', 'toolChoice']),
+          message: `Unable to parse property ref "${toolChoice}"`
+        });
+      }
+    }
   };
   const getNamespace = createGetNamespace(projectSchema);
   for (const [resolver, path] of enumerateBasicResolvers(baseResolver, basePath)) {
@@ -250,7 +280,7 @@ function validateResolver(projectSchema, basePath, baseResolver) {
       }
       if (resolver.name === 'delegate') {
         pushErrors(errors, validateDeletgateResolver(resolver, path));
-      } else if (resolver.name === 'ai:generateText') {
+      } else if (isAIGenerateTextResolver(resolver)) {
         validateAIGenerateTextResolver(resolver, path);
       }
     } else {
@@ -322,7 +352,7 @@ async function validateResolverReferences(context, projectSchema, basePath, base
           message: `Missing resolver config at property ref "${resolver.to}"`
         });
       }
-    } else if (resolver.name === 'ai:generateText') {
+    } else if (isAIGenerateTextResolver(resolver)) {
       if (resolver.tools) {
         await pMap(resolver.tools, async (tool, i) => {
           const toolRef = getToolRef(tool);

package/examples/latest/all-fields-shapes-inline.json

@@ -494,6 +494,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2"
 }

package/examples/latest/all-fields-shapes.json

@@ -915,6 +915,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2"
 }

package/examples/latest/betzino.json

@@ -52781,6 +52781,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/blog-schema.json

@@ -399,6 +399,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/brewery-schema.json

@@ -387,6 +387,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/clear-cache-schema.json

@@ -40,7 +40,7 @@
   "shapes": {},
   "workflows": {},
   "forms": {},
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2",
   "services": {
     "graphql": {

package/examples/latest/complex-project-schema.json

@@ -4350,6 +4350,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/complex-schema.json

@@ -15,7 +15,7 @@
   "apiVersion": "1",
   "queries": {},
   "mutations": {},
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "shapes": {
     "DocumentUploadForm": {
       "id": "HJPFlRKkr",

package/examples/latest/edit-schema.json

@@ -97,6 +97,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2"
 }

package/examples/latest/fabric-ecommerce.json

@@ -10474,5 +10474,5 @@
       }
     }
   },
-  "schemaVersion": "3.45.0"
+  "schemaVersion": "3.46.0"
 }

package/examples/latest/frank-and-fred-schema.json

@@ -23446,6 +23446,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/klirr-schema.json

@@ -35163,6 +35163,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/massive-schema.json

@@ -8053,6 +8053,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/mill-components-schema.json

@@ -1884,6 +1884,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/nested-shape-arrays.json

@@ -234,6 +234,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2"
 }

package/examples/latest/one-earth.json

@@ -14766,6 +14766,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/pet-oneof-array.json

@@ -388,6 +388,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/post-schema.json

@@ -226,6 +226,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/pruned-shopify-product-schema.json

@@ -9756,5 +9756,5 @@
       }
     }
   },
-  "schemaVersion": "3.45.0"
+  "schemaVersion": "3.46.0"
 }

package/examples/latest/rag-example.json

@@ -179,7 +179,7 @@
             }
           },
           {
-            "name": "ai:generateText",
+            "name": "ai:chat",
             "service": "openai",
             "model": "gpt-3.5-turbo",
             "systemPrompt": "You are a helpful assistant.",
@@ -314,6 +314,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2"
 }

package/examples/latest/real-world-schema.json

@@ -806,6 +806,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/recursive-repeater-schema.json

@@ -142,6 +142,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/recursive-schema.json

@@ -149,6 +149,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/rick-and-morty-ast.json

@@ -2633,5 +2633,5 @@
       }
     }
   },
-  "schemaVersion": "3.45.0"
+  "schemaVersion": "3.46.0"
 }

package/examples/latest/rick-and-morty-graphql.json

@@ -2105,5 +2105,5 @@
       }
     }
   },
-  "schemaVersion": "3.45.0"
+  "schemaVersion": "3.46.0"
 }

package/examples/latest/rick-and-morty-rest.json

@@ -91,5 +91,5 @@
       }
     }
   },
-  "schemaVersion": "3.45.0"
+  "schemaVersion": "3.46.0"
 }

package/examples/latest/rick-and-morty-with-indexing.json

@@ -198,7 +198,7 @@
   },
   "workflows": {},
   "forms": {},
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2",
   "services": {
     "rick-and-morty": {

package/examples/latest/schema-where-filter.json

@@ -428,7 +428,7 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2",
   "services": {
     "rick-and-morty": {

package/examples/latest/schema-with-repeater-draftjs.json

@@ -397,6 +397,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/schema-with-rick-and-morty.json

@@ -42,7 +42,7 @@
   },
   "workflows": {},
   "forms": {},
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2",
   "services": {
     "rick-and-morty": {

package/examples/latest/shape-books-v3_2_0.json

@@ -1129,6 +1129,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/shape-books.json

@@ -1129,6 +1129,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/shape-editor-schema-edited.json

@@ -1004,6 +1004,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2"
 }

package/examples/latest/shape-editor-schema-initial.json

@@ -406,6 +406,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2"
 }

package/examples/latest/shapedb-crud-every-prop-type.json

@@ -271,6 +271,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2"
 }

package/examples/latest/shopify-lookbook.json

@@ -1147,5 +1147,5 @@
       }
     }
   },
-  "schemaVersion": "3.45.0"
+  "schemaVersion": "3.46.0"
 }

package/examples/latest/shopify-product-2022-07.json

@@ -5,7 +5,7 @@
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",

package/examples/latest/shopify-product-2023-04.json

@@ -49144,7 +49144,7 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2",
   "services": {
     "shopify": {

package/examples/latest/shopify-store-with-widget.json

@@ -12297,5 +12297,5 @@
       }
     }
   },
-  "schemaVersion": "3.45.0"
+  "schemaVersion": "3.46.0"
 }

package/examples/latest/stripe-product-runtime-schema.json

@@ -5,7 +5,7 @@
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",

package/examples/latest/stripe-starter-resolved.json

@@ -28916,5 +28916,5 @@
       }
     }
   },
-  "schemaVersion": "3.45.0"
+  "schemaVersion": "3.46.0"
 }

package/examples/latest/user-schema-no-required.json

@@ -165,6 +165,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/user-schema-with-defaults.json

@@ -190,6 +190,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "services": {}
 }

package/examples/latest/valvoline-ai-demo.json

@@ -930,7 +930,7 @@
       "shape": "ChatResponse",
       "args": "ChatArgs",
       "resolver": {
-        "name": "ai:generateText",
+        "name": "ai:chat",
         "service": "openai",
         "model": "gpt-4o",
         "systemPrompt": "You are a very helpful assistant. \n\nFirst you must verify the user's car's \"fitment data\" which is defined as the year, make, model and engine. The year must be between 1918 and 2025. The make must be validated by the getMakes tool. The model must be validated with the getModels tool. The engine must be validated with the getEngines tool. Do not assume any fitment data always present the options available from the appropriate tool call.  \n\nAfter verifying the \"fitment data\" you should suggest up to five compatible products using the listProducts tool. Please include product IDs from Shopify only, where appropriate, on their own line, with 2 line breaks before and after, with no markdown or styling, in the format: `gid://shopify/Product/8133116887317`",
@@ -1630,6 +1630,6 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2"
 }

package/examples/latest/vector-search-schema.json

@@ -434,7 +434,7 @@
       }
     }
   },
-  "schemaVersion": "3.45.0",
+  "schemaVersion": "3.46.0",
   "apiVersion": "2",
   "services": {
     "openai": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "10.52.5",
+  "version": "11.0.1",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -28,9 +28,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "10.52.5",
-    "@takeshape/json-schema": "10.52.5",
-    "@takeshape/util": "10.52.5"
+    "@takeshape/errors": "11.0.1",
+    "@takeshape/json-schema": "11.0.1",
+    "@takeshape/util": "11.0.1"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",
@@ -46,10 +46,10 @@
     "meow": "^9.0.0",
     "p-map": "^5.0.0",
     "shortid": "^2.2.15",
-    "@takeshape/infra": "10.52.5"
+    "@takeshape/infra": "11.0.1"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "scripts": {
     "build": "pnpm build:js && pnpm build:es && pnpm build:types && pnpm build:json && pnpm build:copy",