toolcraft 0.0.231 → 0.0.233

package/node_modules/toolcraft-schema/dist/validate.js

@@ -1,7 +1,11 @@
+import { cloneDefaultValue } from "./clone-default.js";
+import { isJsonValue } from "./json.js";
+import { deepEqual, unicodeLength } from "./json-schema/utils.js";
 import { getRequiredKeyFingerprint } from "./union.js";
+import { nativeJsonSchema } from "./native-json-schema.js";
 const missingValue = Symbol("missingValue");
-export function validate(schema, value) {
-    const state = { issues: [] };
+export function validate(schema, value, options = {}) {
+    const state = { issues: [], defaults: options.defaults ?? "optional" };
     const result = walkSchema(schema, value, [], state);
     if (state.issues.length > 0) {
         return { ok: false, issues: state.issues };
@@ -12,10 +16,25 @@ function walkSchema(schema, value, path, state) {
     if (schema.kind === "optional") {
         return walkOptional(schema, value, path, state);
     }
+    if (value === missingValue && state.defaults === "all" && schema.default !== undefined) {
+        value = cloneDefaultValue(schema.default);
+    }
     if (value === missingValue) {
         addIssue(state, path, expectedFor(schema), "missing", `Expected ${expectedFor(schema)} at ${formatPath(path)}`);
         return { present: false };
     }
+    const native = schema[nativeJsonSchema];
+    if (native !== undefined) {
+        if (!isJsonValue(value)) {
+            addExpectedIssue(state, path, "JSON value", value);
+        }
+        else {
+            const result = native.validator.validate(value);
+            if (!result.ok)
+                state.issues.push(...result.issues.map((issue) => ({ ...issue, path: [...path, ...issue.path] })));
+        }
+        return { present: true, value };
+    }
     if (value === null && schema.nullable === true) {
         return { present: true, value };
     }
@@ -39,14 +58,26 @@ function walkSchema(schema, value, path, state) {
         case "record":
             return walkRecord(schema, value, path, state);
         case "json":
-            return walkJson(value, path, state);
+            return walkJson(schema, value, path, state);
     }
 }
 function walkOptional(schema, value, path, state) {
     if (value === missingValue || value === undefined) {
+        if (state.defaults === "none") {
+            return { present: false };
+        }
         const defaultValue = getDefault(schema.inner);
         if (defaultValue.present) {
-            return walkSchema(schema.inner, cloneDefault(defaultValue.value), path, state);
+            let clonedDefault;
+            try {
+                clonedDefault = structuredClone(defaultValue.value);
+            }
+            catch (error) {
+                if (!(error instanceof Error) || error.name !== "DataCloneError")
+                    throw error;
+                clonedDefault = cloneDefaultValue(defaultValue.value);
+            }
+            return walkSchema(schema.inner, clonedDefault, path, state);
         }
         return { present: false };
     }
@@ -57,13 +88,14 @@ function walkString(schema, value, path, state) {
         addExpectedIssue(state, path, "string", value);
         return { present: true, value };
     }
-    if (schema.minLength !== undefined && value.length < schema.minLength) {
+    const length = unicodeLength(value);
+    if (schema.minLength !== undefined && length < schema.minLength) {
         const expected = `string with length at least ${schema.minLength}`;
-        addIssue(state, path, expected, `string with length ${value.length}`, `Expected ${expected} at ${formatPath(path)}`);
+        addIssue(state, path, expected, `string with length ${length}`, `Expected ${expected} at ${formatPath(path)}`);
     }
-    if (schema.maxLength !== undefined && value.length > schema.maxLength) {
+    if (schema.maxLength !== undefined && length > schema.maxLength) {
         const expected = `string with length at most ${schema.maxLength}`;
-        addIssue(state, path, expected, `string with length ${value.length}`, `Expected ${expected} at ${formatPath(path)}`);
+        addIssue(state, path, expected, `string with length ${length}`, `Expected ${expected} at ${formatPath(path)}`);
     }
     if (schema.pattern !== undefined) {
         const pattern = compilePattern(schema.pattern);
@@ -118,7 +150,8 @@ function walkArray(schema, value, path, state) {
         const expected = `array with at most ${schema.maxItems} items`;
         addIssue(state, path, expected, `array with ${value.length} items`, `Expected ${expected} at ${formatPath(path)}`);
     }
-    const nextValue = value.map((item, index) => {
+    const nextValue = Array.from({ length: value.length }, (_item, index) => {
+        const item = value[index];
         const result = walkSchema(schema.item, item, [...path, String(index)], state);
         return result.present ? result.value : item;
     });
@@ -182,15 +215,17 @@ function walkOneOf(schema, value, path, state) {
     });
 }
 function walkUnion(schema, value, path, state) {
-    if (isPlainRecord(value)) {
-        const candidateBranches = schema.branches.filter((branch) => hasRequiredKeys(branch, value));
-        if (candidateBranches.length === 1) {
-            return walkObject(candidateBranches[0], value, path, state);
-        }
+    if (!isPlainRecord(value)) {
+        addExpectedIssue(state, path, "object", value);
+        return { present: true, value };
+    }
+    const candidateBranches = schema.branches.filter((branch) => hasRequiredKeys(branch, value));
+    if (candidateBranches.length === 1 && state.defaults !== "all") {
+        return walkObject(candidateBranches[0], value, path, state);
     }
     const matches = [];
     for (const branch of schema.branches) {
-        const branchState = { issues: [] };
+        const branchState = { ...state, issues: [] };
         const result = walkObject(branch, value, path, branchState);
         if (branchState.issues.length === 0 && result.present) {
             matches.push({ fingerprint: getRequiredKeyFingerprint(branch), value: result.value });
@@ -229,8 +264,14 @@ function walkRecord(schema, value, path, state) {
     }
     return { present: true, value: nextValue };
 }
-function walkJson(value, path, state) {
+function walkJson(schema, value, path, state) {
     if (isJsonValue(value)) {
+        if (schema.const !== undefined && !deepEqual(value, schema.const)) {
+            addExpectedIssue(state, path, "declared JSON constant", value);
+        }
+        if (schema.enum !== undefined && !schema.enum.some((candidate) => deepEqual(value, candidate))) {
+            addExpectedIssue(state, path, "declared JSON enum value", value);
+        }
         return { present: true, value };
     }
     addExpectedIssue(state, path, "JSON value", value);
@@ -245,43 +286,13 @@ function getDefault(schema) {
     }
     return { present: false };
 }
-function isPlainRecord(value) {
+export function isPlainRecord(value) {
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
         return false;
     }
     const prototype = Object.getPrototypeOf(value);
     return prototype === Object.prototype || prototype === null;
 }
-function isJsonValue(value, ancestors = new Set()) {
-    if (value === null ||
-        typeof value === "string" ||
-        typeof value === "number" ||
-        typeof value === "boolean") {
-        return typeof value !== "number" || Number.isFinite(value);
-    }
-    if (Array.isArray(value)) {
-        if (ancestors.has(value)) {
-            return false;
-        }
-        ancestors.add(value);
-        const result = value.every((item) => isJsonValue(item, ancestors));
-        ancestors.delete(value);
-        return result;
-    }
-    if (isPlainRecord(value)) {
-        if (ancestors.has(value)) {
-            return false;
-        }
-        ancestors.add(value);
-        const result = Object.values(value).every((item) => isJsonValue(item, ancestors));
-        ancestors.delete(value);
-        return result;
-    }
-    return false;
-}
-function cloneDefault(value) {
-    return structuredClone(value);
-}
 function setOwnValue(target, key, value) {
     Object.defineProperty(target, key, {
         configurable: true,
@@ -357,6 +368,9 @@ function receivedType(value) {
     if (Array.isArray(value)) {
         return "array";
     }
+    if (typeof value === "object" && !isPlainRecord(value)) {
+        return "non-plain object";
+    }
     if (typeof value === "number" && Number.isInteger(value)) {
         return "integer";
     }

package/node_modules/toolcraft-schema/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-schema",
-  "version": "0.0.231",
+  "version": "0.0.233",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.231",
+  "version": "0.0.233",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -104,7 +104,7 @@
     "test": "cd ../.. && vitest run packages/toolcraft/src",
     "test:unit": "cd ../.. && vitest run packages/toolcraft/src",
     "lint": "cd ../.. && eslint packages/toolcraft/src --ext ts && tsc -p packages/toolcraft/tsconfig.json --noEmit",
-    "prepack": "node ../../scripts/manage-bundled-workspace-deps.mjs prepare . toolcraft-schema toolcraft-design @poe-code/frontmatter @poe-code/agent-mcp-config @poe-code/agent-human-in-loop @poe-code/task-list @poe-code/agent-defs @poe-code/config-mutations @poe-code/user-error @poe-code/process-runner mcp-oauth-server tiny-http-mcp-server tiny-mcp-client tiny-stdio-mcp-server auth-store jose fast-string-width fast-wrap-ansi ignore jsonc-parser sisteransi smol-toml yaml",
+    "prepack": "\"$npm_node_execpath\" \"$npm_execpath\" --prefix ../.. run build:workspaces -- --workspace=\"$npm_package_name\" >&2 && node ../../scripts/manage-bundled-workspace-deps.mjs prepare . toolcraft-schema toolcraft-design @poe-code/frontmatter @poe-code/agent-mcp-config @poe-code/agent-human-in-loop @poe-code/task-list @poe-code/agent-defs @poe-code/config-mutations @poe-code/user-error @poe-code/process-runner mcp-oauth-server tiny-http-mcp-server tiny-mcp-client tiny-stdio-mcp-server auth-store jose fast-string-width fast-wrap-ansi ignore jsonc-parser sisteransi smol-toml yaml",
     "postpack": "node ../../scripts/manage-bundled-workspace-deps.mjs cleanup . toolcraft-schema toolcraft-design @poe-code/frontmatter @poe-code/agent-mcp-config @poe-code/agent-human-in-loop @poe-code/task-list @poe-code/agent-defs @poe-code/config-mutations @poe-code/user-error @poe-code/process-runner mcp-oauth-server tiny-http-mcp-server tiny-mcp-client tiny-stdio-mcp-server auth-store jose fast-string-width fast-wrap-ansi ignore jsonc-parser sisteransi smol-toml yaml"
   },
   "dependencies": {
@@ -158,7 +158,7 @@
     "yaml"
   ],
   "optionalDependencies": {
-    "toolcraft-schema": "0.0.231",
+    "toolcraft-schema": "0.0.233",
     "toolcraft-design": "*",
     "@poe-code/frontmatter": "*",
     "@poe-code/agent-mcp-config": "*",
@@ -173,5 +173,8 @@
     "tiny-mcp-client": "*",
     "tiny-stdio-mcp-server": "*",
     "auth-store": "*"
+  },
+  "devDependencies": {
+    "tiny-stdio-mcp-test-server": "*"
   }
 }