@takeshape/schema 11.70.2 → 11.71.2

package/dist/schemas/project-schema.json

@@ -189,6 +189,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.53.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.54.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/dist/util/has-arg.d.ts

@@ -1,4 +1,5 @@
-import type { Args, ProjectSchemaJSON } from '../project-schema/index.ts';
-import type { SchemaWithArgs } from '../types/index.ts';
+import type { Args, ObjectSchema, ProjectSchemaJSON } from '../project-schema/index.ts';
+import { type SchemaWithArgs } from '../types/index.ts';
 export declare function getArgs(prop: SchemaWithArgs): Args | undefined;
+export declare function getArgsSchema(projectSchema: ProjectSchemaJSON, args: Args): ObjectSchema | undefined;
 export declare function hasArg(projectSchema: ProjectSchemaJSON, prop: SchemaWithArgs, argPath: string | string[]): boolean;

package/dist/util/has-arg.js

@@ -1,13 +1,25 @@
+import { refExpressionToRefItem, refItemToShape } from "../refs.js";
+import { isObjectSchema } from "../types/index.js";
 import { findSchemaAtPath } from "./find-shape-at-path.js";
 export function getArgs(prop) {
     return '@args' in prop ? prop['@args'] : 'args' in prop ? prop.args : undefined;
 }
+export function getArgsSchema(projectSchema, args) {
+    if (typeof args === 'object') {
+        return args;
+    }
+    const ref = refExpressionToRefItem(projectSchema, args);
+    const shapeSchema = refItemToShape(projectSchema, ref)?.schema;
+    if (shapeSchema && isObjectSchema(shapeSchema)) {
+        return shapeSchema;
+    }
+}
 export function hasArg(projectSchema, prop, argPath) {
     const args = getArgs(prop);
     if (!args) {
         return false;
     }
-    const schema = typeof args === 'string' ? projectSchema.shapes[args]?.schema : args;
+    const schema = getArgsSchema(projectSchema, args);
     const pathArray = Array.isArray(argPath) ? argPath : argPath.split('.');
-    return Boolean(findSchemaAtPath(projectSchema, schema, pathArray));
+    return Boolean(schema && findSchemaAtPath(projectSchema, schema, pathArray));
 }

package/examples/latest/agent-schema.json

@@ -148,7 +148,7 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2",
   "services": {
     "openai": {

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

@@ -494,6 +494,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2"
 }

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

@@ -915,6 +915,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2"
 }

package/examples/latest/betzino.json

@@ -52781,6 +52781,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

package/examples/latest/blog-schema.json

@@ -399,6 +399,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

package/examples/latest/brewery-schema.json

@@ -387,6 +387,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

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

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

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

@@ -4350,6 +4350,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

package/examples/latest/complex-schema.json

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

package/examples/latest/edit-schema.json

@@ -97,6 +97,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2"
 }

package/examples/latest/fabric-ecommerce.json

@@ -10474,5 +10474,5 @@
       }
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

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

@@ -23446,6 +23446,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

package/examples/latest/klirr-schema.json

@@ -35163,6 +35163,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

package/examples/latest/layers/rick-and-morty-layer.json

@@ -572,5 +572,5 @@
     }
   },
   "mutations": {},
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

package/examples/latest/layers/shopify-layer-2023-01.json

@@ -86168,5 +86168,5 @@
       "shape": "Shopify_WebhookSubscriptionUpdatePayload"
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

package/examples/latest/layers/shopify-storefront-2023-04.json

@@ -15937,5 +15937,5 @@
       "shape": "ShopifyStorefront_CustomerUpdatePayload"
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

package/examples/latest/layers/wordpress-2024-01.json

@@ -26892,5 +26892,5 @@
       "shape": "WP_UpdateUserPayload"
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

package/examples/latest/massive-schema.json

@@ -8053,6 +8053,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

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

@@ -1884,6 +1884,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

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

@@ -234,6 +234,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2"
 }

package/examples/latest/one-earth.json

@@ -14766,6 +14766,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

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

@@ -388,6 +388,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

package/examples/latest/post-schema.json

@@ -226,6 +226,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

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

@@ -9756,5 +9756,5 @@
       }
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

package/examples/latest/rag-example.json

@@ -8,43 +8,8 @@
     "getRelatedProductList": {
       "shape": "PaginatedList<shopify:Product>",
       "resolver": {
-        "compose": [
-          {
-            "name": "ai:createEmbedding",
-            "id": "createEmbedding",
-            "service": "openai",
-            "model": "text-embedding-3-small",
-            "args": {
-              "ops": [
-                {
-                  "path": "input",
-                  "mapping": "$args.text"
-                }
-              ]
-            }
-          },
-          {
-            "shapeName": "Shopify_Product",
-            "name": "takeshape:vectorSearch",
-            "service": "takeshape",
-            "args": {
-              "ops": [
-                {
-                  "path": "vector.name",
-                  "value": "vector"
-                },
-                {
-                  "path": "vector.value",
-                  "mapping": "$resolvers.createEmbedding"
-                },
-                {
-                  "path": "size",
-                  "mapping": "$args.size"
-                }
-              ]
-            }
-          }
-        ]
+        "name": "ai:embeddingSearch",
+        "vectorProperty": "shopify:Product.vector"
       },
       "args": {
         "type": "object",
@@ -179,7 +144,7 @@
             }
           },
           {
-            "name": "ai:chat",
+            "name": "ai:generateText",
             "service": "openai",
             "model": "gpt-3.5-turbo",
             "systemPrompt": "You are a helpful assistant.",
@@ -314,6 +279,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2"
 }

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

@@ -806,6 +806,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

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

@@ -142,6 +142,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

package/examples/latest/recursive-schema.json

@@ -149,6 +149,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

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

@@ -2633,5 +2633,5 @@
       }
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

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

@@ -2105,5 +2105,5 @@
       }
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

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

@@ -91,5 +91,5 @@
       }
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

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

@@ -1,7 +1,9 @@
 {
   "projectId": "a8b9ea5b-2522-442d-9b68-be0bef4a1a74",
   "defaultLocale": "en-us",
-  "locales": ["en-us"],
+  "locales": [
+    "en-us"
+  ],
   "queries": {
     "Rick_characters": {
       "resolver": {
@@ -12,8 +14,12 @@
       "args": {
         "type": "object",
         "properties": {
-          "page": { "type": "integer" },
-          "filter": { "@ref": "rick:FilterCharacter" }
+          "page": {
+            "type": "integer"
+          },
+          "filter": {
+            "@ref": "rick:FilterCharacter"
+          }
         }
       },
       "shape": "Rick_Characters"
@@ -24,7 +30,9 @@
         "shapeName": "Rick_Character",
         "name": "takeshape:queryApiIndex",
         "service": "takeshape",
-        "options": { "indexedShape": "Rick_Character" }
+        "options": {
+          "indexedShape": "Rick_Character"
+        }
       },
       "description": "Fetch Rick_Character data from the API Index.",
       "args": "TSListArgs<Rick_Character>"
@@ -37,8 +45,15 @@
       },
       "args": {
         "type": "object",
-        "properties": { "id": { "type": "string", "@tag": "id" } },
-        "required": ["id"]
+        "properties": {
+          "id": {
+            "type": "string",
+            "@tag": "id"
+          }
+        },
+        "required": [
+          "id"
+        ]
       },
       "shape": "Rick_Character"
     }
@@ -51,16 +66,30 @@
       "title": "Rick Character",
       "cache": {
         "enabled": true,
-        "triggers": [{ "type": "schedule", "loader": "list", "interval": 1440 }],
-        "fragment": { "maxDepth": 2 }
+        "triggers": [
+          {
+            "type": "schedule",
+            "loader": "list",
+            "interval": 1440
+          }
+        ],
+        "fragment": {
+          "maxDepth": 2
+        }
       },
       "loaders": {
-        "list": { "query": "rick:Query.characters" },
-        "get": { "query": "rick:Query.character" }
+        "list": {
+          "query": "rick:Query.characters"
+        },
+        "get": {
+          "query": "rick:Query.character"
+        }
       },
       "schema": {
         "extends": [
-          { "@ref": "rick:Character" },
+          {
+            "@ref": "rick:Character"
+          },
           {
             "type": "object",
             "properties": {
@@ -79,12 +108,18 @@
   "forms": {
     "Rick_Character": {
       "default": {
-        "properties": { "custom": { "widget": "singleLineText" } },
-        "order": ["custom"]
+        "properties": {
+          "custom": {
+            "widget": "singleLineText"
+          }
+        },
+        "order": [
+          "custom"
+        ]
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2",
   "services": {
     "rick": {
@@ -98,7 +133,9 @@
         "endpoint": "https://rickandmortyapi.com/graphql",
         "introspectedAt": "2025-04-23T18:13:21.722Z"
       },
-      "healthCheck": { "checkName": "graphqlIntrospection" }
+      "healthCheck": {
+        "checkName": "graphqlIntrospection"
+      }
     }
   }
-}
+}

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

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

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

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

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

@@ -397,6 +397,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

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

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

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

@@ -1129,6 +1129,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

package/examples/latest/shape-books.json

@@ -1129,6 +1129,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "services": {}
 }

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

@@ -1004,6 +1004,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2"
 }

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

@@ -406,6 +406,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2"
 }

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

@@ -271,6 +271,6 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2"
 }

package/examples/latest/shopify-lookbook.json

@@ -1147,5 +1147,5 @@
       }
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

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

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

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

@@ -49144,7 +49144,7 @@
       }
     }
   },
-  "schemaVersion": "3.53.0",
+  "schemaVersion": "3.54.0",
   "apiVersion": "2",
   "services": {
     "shopify": {

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

@@ -12297,5 +12297,5 @@
       }
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }

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

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

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

@@ -28916,5 +28916,5 @@
       }
     }
   },
-  "schemaVersion": "3.53.0"
+  "schemaVersion": "3.54.0"
 }