@takeshape/schema 11.52.0 → 11.55.0

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

@@ -3,13 +3,23 @@
   "apiVersion": "1",
   "author": "<userId>",
   "projectId": "project-id",
-  "locales": ["en-us"],
+  "locales": [
+    "en-us"
+  ],
   "defaultLocale": "en-us",
   "workflows": {},
   "forms": {
     "User": {
       "default": {
-        "order": ["firstName", "lastName", "username", "email", "password", "roles", "locations"]
+        "order": [
+          "firstName",
+          "lastName",
+          "username",
+          "email",
+          "password",
+          "roles",
+          "locations"
+        ]
       }
     }
   },
@@ -157,4 +167,4 @@
   },
   "schemaVersion": "3.51.0",
   "services": {}
-}
+}

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

@@ -3,13 +3,24 @@
   "apiVersion": "1",
   "author": "<userId>",
   "projectId": "project-id",
-  "locales": ["en-us"],
+  "locales": [
+    "en-us"
+  ],
   "defaultLocale": "en-us",
   "workflows": {},
   "forms": {
     "User": {
       "default": {
-        "order": ["firstName", "lastName", "age", "username", "email", "password", "roles", "locations"]
+        "order": [
+          "firstName",
+          "lastName",
+          "age",
+          "username",
+          "email",
+          "password",
+          "roles",
+          "locations"
+        ]
       }
     }
   },
@@ -141,7 +152,15 @@
             "@mapping": "shapedb:User.locationsId"
           }
         },
-        "required": ["firstName", "lastName", "username", "email", "password", "roles", "locations"]
+        "required": [
+          "firstName",
+          "lastName",
+          "username",
+          "email",
+          "password",
+          "roles",
+          "locations"
+        ]
       }
     },
     "UserLocations": {
@@ -164,10 +183,13 @@
             "@mapping": "shapedb:UserLocations.lonId"
           }
         },
-        "required": ["lat", "lon"]
+        "required": [
+          "lat",
+          "lon"
+        ]
       }
     }
   },
   "schemaVersion": "3.51.0",
   "services": {}
-}
+}

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

@@ -1,7 +1,9 @@
 {
   "projectId": "add3306a-dd46-470b-b9d3-b5356553a01f",
   "defaultLocale": "en-us",
-  "locales": ["en-us"],
+  "locales": [
+    "en-us"
+  ],
   "queries": {
     "getIndexedProductList": {
       "shape": "PaginatedList<Salsify_Product>",
@@ -113,7 +115,13 @@
             "description": "A short description of the part you are looking for to be used for semantic search."
           }
         },
-        "required": ["make", "model", "year", "engine", "description"]
+        "required": [
+          "make",
+          "model",
+          "year",
+          "engine",
+          "description"
+        ]
       }
     },
     "getPart": {
@@ -299,7 +307,9 @@
             "description": "A four digit year string"
           }
         },
-        "required": ["year"]
+        "required": [
+          "year"
+        ]
       },
       "resolver": {
         "service": "parts",
@@ -418,7 +428,10 @@
             "description": "The make id as numerical string"
           }
         },
-        "required": ["year", "make"]
+        "required": [
+          "year",
+          "make"
+        ]
       },
       "resolver": {
         "service": "parts",
@@ -501,7 +514,11 @@
             "description": "The model id a numerical string"
           }
         },
-        "required": ["year", "make", "model"]
+        "required": [
+          "year",
+          "make",
+          "model"
+        ]
       },
       "resolver": {
         "service": "parts",
@@ -606,7 +623,12 @@
             "type": "string"
           }
         },
-        "required": ["engine", "year", "make", "model"]
+        "required": [
+          "engine",
+          "year",
+          "make",
+          "model"
+        ]
       },
       "resolver": {
         "service": "parts",
@@ -753,7 +775,9 @@
             "description": "The ID of the Collection to return."
           }
         },
-        "required": ["id"]
+        "required": [
+          "id"
+        ]
       },
       "shape": "Shopify_Collection"
     },
@@ -771,7 +795,9 @@
             "description": "The handle of the collection."
           }
         },
-        "required": ["handle"]
+        "required": [
+          "handle"
+        ]
       },
       "shape": "Shopify_Collection"
     },
@@ -838,7 +864,9 @@
             "description": "The ID of the Product to return."
           }
         },
-        "required": ["id"]
+        "required": [
+          "id"
+        ]
       },
       "shape": "Shopify_Product"
     },
@@ -1020,7 +1048,9 @@
             "type": "string"
           }
         },
-        "required": ["input"]
+        "required": [
+          "input"
+        ]
       }
     },
     "ChatResponse": {
@@ -1331,7 +1361,9 @@
                           [
                             "get",
                             {
-                              "path": ["$source.mpn"]
+                              "path": [
+                                "$source.mpn"
+                              ]
                             }
                           ],
                           [
@@ -1429,7 +1461,9 @@
             }
           }
         },
-        "required": ["prompt"]
+        "required": [
+          "prompt"
+        ]
       }
     }
   },
@@ -1448,7 +1482,11 @@
             "widget": "singleLineText"
           }
         },
-        "order": ["id", "data", "normalizedId"]
+        "order": [
+          "id",
+          "data",
+          "normalizedId"
+        ]
       }
     },
     "App": {
@@ -1479,7 +1517,16 @@
             "widget": "number"
           }
         },
-        "order": ["engine", "make", "model", "year", "startYear", "endYear", "apptype", "qty"]
+        "order": [
+          "engine",
+          "make",
+          "model",
+          "year",
+          "startYear",
+          "endYear",
+          "apptype",
+          "qty"
+        ]
       }
     },
     "MockRelatedProduct": {
@@ -1489,7 +1536,9 @@
             "widget": "singleLineText"
           }
         },
-        "order": ["name"]
+        "order": [
+          "name"
+        ]
       }
     },
     "DangerousPrompt": {
@@ -1500,7 +1549,10 @@
           },
           "promptVector": {}
         },
-        "order": ["prompt", "promptVector"]
+        "order": [
+          "prompt",
+          "promptVector"
+        ]
       }
     }
   },
@@ -1580,4 +1632,4 @@
   },
   "schemaVersion": "3.51.0",
   "apiVersion": "2"
-}
+}

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

@@ -1,7 +1,9 @@
 {
   "projectId": "projectId",
   "defaultLocale": "en-us",
-  "locales": ["en-us"],
+  "locales": [
+    "en-us"
+  ],
   "queries": {
     "getIndexedBooksBookList": {
       "shape": "books:BookPaginatedList",
@@ -78,7 +80,9 @@
             "type": "integer"
           }
         },
-        "required": ["text"]
+        "required": [
+          "text"
+        ]
       }
     },
     "chat": {
@@ -178,7 +182,9 @@
             "type": "string"
           }
         },
-        "required": ["text"]
+        "required": [
+          "text"
+        ]
       }
     },
     "Books_getBookList": {
@@ -270,7 +276,9 @@
             "@ref": "openai:CreateEmbeddingInput"
           }
         },
-        "required": ["input"]
+        "required": [
+          "input"
+        ]
       }
     },
     "OpenAI_createChatCompletion": {
@@ -309,7 +317,9 @@
             "@ref": "openai:CreateChatCompletionInput"
           }
         },
-        "required": ["input"]
+        "required": [
+          "input"
+        ]
       }
     }
   },
@@ -373,7 +383,10 @@
                           [
                             "get",
                             {
-                              "path": ["$source.title", "$source.bodyHtml"]
+                              "path": [
+                                "$source.title",
+                                "$source.bodyHtml"
+                              ]
                             }
                           ],
                           [
@@ -414,7 +427,10 @@
             "widget": "singleLineText"
           }
         },
-        "order": ["content", "vector"]
+        "order": [
+          "content",
+          "vector"
+        ]
       }
     }
   },
@@ -451,4 +467,4 @@
       }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "11.52.0",
+  "version": "11.55.0",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -9,18 +9,17 @@
   },
   "license": "UNLICENSED",
   "author": "asprouse",
+  "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/types/src/index.d.ts",
-      "import": "./dist/esm/src/index.js",
-      "require": "./dist/cjs/src/index.js",
-      "default": "./dist/cjs/src/index.js"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
     },
     "./schemas": {
-      "types": "./dist/types/src/schemas/index.d.ts",
-      "import": "./dist/esm/src/schemas/index.js",
-      "require": "./dist/cjs/src/schemas/index.js",
-      "default": "./dist/cjs/src/schemas/index.js"
+      "types": "./dist/schemas/index.d.ts",
+      "import": "./dist/schemas/index.js",
+      "default": "./dist/schemas/index.js"
     },
     "./schemas/*.json": {
       "default": "./src/schemas/*.json"
@@ -38,16 +37,16 @@
       "default": "./examples/latest/layers/*.json"
     }
   },
-  "main": "dist/cjs/src/index.js",
-  "module": "dist/esm/src/index.js",
-  "types": "dist/types/src/index.d.ts",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "files": [
     "dist",
     "examples"
   ],
   "dependencies": {
-    "ajv": "^8.12.0",
-    "ajv-formats": "^2.1.1",
+    "ajv": "8.13.0",
+    "ajv-formats": "3.0.1",
     "blueimp-md5": "^2.10.0",
     "jsonpath-plus": "^10.0.1",
     "lodash": "^4.17.21",
@@ -56,9 +55,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "11.52.0",
-    "@takeshape/json-schema": "11.52.0",
-    "@takeshape/util": "11.52.0"
+    "@takeshape/errors": "11.55.0",
+    "@takeshape/json-schema": "11.55.0",
+    "@takeshape/util": "11.55.0"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",
@@ -73,17 +72,17 @@
     "glob": "^7.1.6",
     "meow": "^9.0.0",
     "shortid": "^2.2.15",
-    "@takeshape/infra": "11.52.0"
+    "@takeshape/infra": "11.55.0"
   },
   "engines": {
     "node": ">=20"
   },
   "scripts": {
-    "build": "tsc --build tsconfig.cjs.json tsconfig.esm.json tsconfig.types.json",
-    "postbuild": "ts-add-js-extension --dir dist/esm && echo '{\"type\": \"module\"}' > ./dist/esm/package.json && echo '{\"type\": \"commonjs\"}' > ./dist/cjs/package.json && find ./src/schemas -name '*.json' -exec rsync --quiet -R '{}' dist/esm \\; && find ./src/schemas -name '*.json' -exec rsync --quiet -R '{}' dist/cjs \\;",
+    "build": "tsc --build tsconfig.build.json",
+    "postbuild": "find './src/schemas/project-schema/' -maxdepth 1 -name '*.json' -exec rsync --quiet '{}' dist/schemas/project-schema/ \\; && find './src/schemas/' -maxdepth 1 -name '*.json' -exec rsync --quiet '{}' dist/schemas/ \\;",
     "prebuild:ci": "pnpm clean",
-    "build:ci": "pnpm build",
-    "clean": "del-cli build dist es *.tsbuildinfo",
+    "build:ci": "pnpm build --noCheck",
+    "clean": "del-cli dist *.tsbuildinfo",
     "clean:test": "del-cli .esdata-test && del-cli .dynamo-test",
     "deploy": "node ./scripts/publish-json-schema.mjs",
     "deploy:ci": "pnpm run deploy",
@@ -91,7 +90,7 @@
     "lint": "pnpm lint:biome && pnpm lint:eslint",
     "lint:biome": "biome check",
     "lint:eslint": "eslint src -c ../../eslint.config.mjs",
-    "lint:ci": "pnpm lint:ci:biome && pnpm lint:ci:eslint",
+    "lint:ci": "pnpm lint:ci:biome; pnpm lint:ci:eslint",
     "lint:ci:biome": "mkdir -p \"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}\" && biome check --diagnostic-level error --reporter=junit > \"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}/biome-results.xml\"",
     "lint:ci:eslint": "pnpm lint:eslint --quiet --format json -o \"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}/eslint-results.json\"",
     "test": "TZ=UTC vitest run",
@@ -100,6 +99,6 @@
     "test:migrate-examples": "vitest run src/__tests__/_examples.test.ts --update",
     "todo": "leasot 'src/**/*.{js,jsx,ts,tsx}'",
     "typecheck": "tsc --noEmit",
-    "typecheck:ci": "mkdir -p  \"${GITHUB_WORKSPACE}/typecheck-results/${npm_package_name#*\\/}\" && tsc --emitDeclarationOnly --project tsconfig.build.json --pretty false | typescript-jest-junit-reporter | tee \"${GITHUB_WORKSPACE}/typecheck-results/${npm_package_name#*\\/}/typescript-results.xml\""
+    "typecheck:ci": "mkdir -p  \"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}\" && tsc --noEmit --project tsconfig.build.json --pretty false | typescript-jest-junit-reporter | tee \"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}/typescript-results.xml\""
   }
 }

package/dist/cjs/package.json

@@ -1 +0,0 @@
-{"type": "commonjs"}

package/dist/cjs/src/agents.js

@@ -1,147 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createArgs = exports.removeBuiltInArgs = exports.getInspectAgentSessionQueryName = exports.getAgentEndStates = exports.getAgentEndTransitions = exports.BUILT_IN_CHAT_ARG_NAMES = exports.BUILT_IN_CHAT_ARGS = exports.END_AGENT_EXECUTION = void 0;
-exports.addAiQueries = addAiQueries;
-const uniq_js_1 = __importDefault(require("lodash/uniq.js"));
-const uniqBy_js_1 = __importDefault(require("lodash/uniqBy.js"));
-const upperFirst_js_1 = __importDefault(require("lodash/upperFirst.js"));
-exports.END_AGENT_EXECUTION = 'endAgentExecution';
-exports.BUILT_IN_CHAT_ARGS = [
-    {
-        argName: 'input',
-        argDescription: 'Input text for the agent',
-        argType: 'string',
-        required: true
-    },
-    {
-        argName: 'sessionId',
-        argDescription: 'Session ID to continue existing session with this agent',
-        argType: 'sessionId'
-    }
-];
-exports.BUILT_IN_CHAT_ARG_NAMES = exports.BUILT_IN_CHAT_ARGS.map((arg) => arg.argName);
-const transitionCanEnd = (transition, includeSuspend = false) => {
-    if (!transition || transition.length === 0) {
-        return true;
-    }
-    for (const step of transition) {
-        if (includeSuspend && step.suspend) {
-            return true;
-        }
-        if (step.destination === exports.END_AGENT_EXECUTION) {
-            return true;
-        }
-        if (step.condition.type === 'none') {
-            return false;
-        }
-    }
-    return true;
-};
-const getAgentEndTransitions = (agent, includeSuspend = false) => {
-    return Object.entries(agent.states).reduce((acc, [stateId, state]) => {
-        const endConditions = [];
-        if (transitionCanEnd(state.transition, includeSuspend)) {
-            endConditions.push({ type: 'done', originStateId: stateId });
-        }
-        return [...acc, ...endConditions];
-    }, []);
-};
-exports.getAgentEndTransitions = getAgentEndTransitions;
-const getAgentEndStates = (agent, includeSuspend = false) => {
-    return (0, exports.getAgentEndTransitions)(agent, includeSuspend).reduce((acc, { originStateId }) => {
-        acc.add(originStateId);
-        return acc;
-    }, new Set());
-};
-exports.getAgentEndStates = getAgentEndStates;
-const getInspectAgentSessionQueryName = (agentName) => {
-    return `inspect${(0, upperFirst_js_1.default)(agentName)}`;
-};
-exports.getInspectAgentSessionQueryName = getInspectAgentSessionQueryName;
-const removeBuiltInArgs = (args) => {
-    return args.filter((arg) => !exports.BUILT_IN_CHAT_ARG_NAMES.includes(arg.argName));
-};
-exports.removeBuiltInArgs = removeBuiltInArgs;
-const createArgs = (agent) => {
-    let apiArguments = (0, uniqBy_js_1.default)(agent.api.arguments ?? [], (arg) => arg.argName);
-    if (agent.api.type === 'chat') {
-        apiArguments = (0, exports.removeBuiltInArgs)(apiArguments).concat(exports.BUILT_IN_CHAT_ARGS);
-    }
-    return apiArguments.length > 0
-        ? {
-            type: 'object',
-            properties: apiArguments.reduce((acc, argument) => {
-                acc[argument.argName] = {
-                    type: argument.argType === 'sessionId' ? 'string' : argument.argType,
-                    description: argument.argDescription
-                };
-                return acc;
-            }, {}),
-            required: apiArguments.filter((arg) => arg.required).map((arg) => arg.argName)
-        }
-        : undefined;
-};
-exports.createArgs = createArgs;
-function addAiQueries(projectSchema) {
-    const agents = projectSchema['ai-experimental']?.agents;
-    if (!agents) {
-        return projectSchema;
-    }
-    const newSchema = {
-        ...projectSchema,
-        queries: { ...projectSchema.queries },
-        mutations: { ...projectSchema.mutations }
-    };
-    for (const [agentName, agent] of Object.entries(agents)) {
-        // Get valid return types based on states that could possibly be the end state
-        // TODO In the future the agent will have a return type defined and we will instead validate
-        // that all the return states will return the correct shape.
-        const returnStates = [...(0, exports.getAgentEndStates)(agent, true)];
-        const returnTypes = (0, uniq_js_1.default)(returnStates.map((stateId) => {
-            const { execution } = agent.states[stateId];
-            if (execution.type === 'chat') {
-                return 'TSChatResponse';
-            }
-            if (execution.type === 'generate') {
-                return execution.outputShape ? execution.outputShape : 'string';
-            }
-            return 'JSON';
-        }));
-        const shape = returnTypes.length === 0 ? 'string' : returnTypes.length === 1 ? returnTypes[0] : 'JSON';
-        if (newSchema.mutations[agentName] !== undefined) {
-            throw new Error(`Schema already has a mutation with the name ${agentName}`);
-        }
-        newSchema.mutations[agentName] = {
-            description: agent.description,
-            args: (0, exports.createArgs)(agent),
-            shape,
-            resolver: {
-                name: 'ai:runAgent',
-                agentName
-            }
-        };
-        if (shape === 'TSChatResponse') {
-            newSchema.queries[(0, exports.getInspectAgentSessionQueryName)(agentName)] ||= {
-                description: `Inspect a session for the ${agentName} agent`,
-                args: {
-                    type: 'object',
-                    properties: {
-                        sessionId: {
-                            type: 'string'
-                        }
-                    },
-                    required: ['sessionId']
-                },
-                shape: 'TSAgentSession',
-                resolver: {
-                    name: 'ai:inspectAgentSession',
-                    agentName
-                }
-            };
-        }
-    }
-    return newSchema;
-}

package/dist/cjs/src/api-version.js

@@ -1,24 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.whereClauseEnabled = exports.workflowsEnabled = exports.createVersionPredicate = void 0;
-const coerce_js_1 = __importDefault(require("semver/functions/coerce.js"));
-const gte_js_1 = __importDefault(require("semver/functions/gte.js"));
-const createVersionPredicate = (featureVersion, comparison) => {
-    const coercedFeatureVersion = (0, coerce_js_1.default)(featureVersion);
-    if (!coercedFeatureVersion) {
-        throw new Error(`Could not create predicate version "${featureVersion}" is not valid`);
-    }
-    return (apiVersion) => {
-        const coercedApiVersion = (0, coerce_js_1.default)(apiVersion);
-        if (!coercedApiVersion) {
-            throw new Error(`Version "${apiVersion}" is not valid and could not be coerced`);
-        }
-        return comparison(coercedApiVersion, coercedFeatureVersion);
-    };
-};
-exports.createVersionPredicate = createVersionPredicate;
-exports.workflowsEnabled = (0, exports.createVersionPredicate)('2.0.0', gte_js_1.default);
-exports.whereClauseEnabled = (0, exports.createVersionPredicate)('2.0.0', gte_js_1.default);

package/dist/cjs/src/auth-schemas.js

@@ -1,8 +0,0 @@
-"use strict";
-/* tslint:disable */
-/**
- * This file was automatically generated by json-schema-to-typescript.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and run json-schema-to-typescript to regenerate this file.
- */
-Object.defineProperty(exports, "__esModule", { value: true });