cogsbox-shape 0.5.213 → 0.5.215

package/cogsbox-shape-state/dist/index.d.ts

@@ -1 +1 @@
-export { createShapePlugin, validateShapeRefines, wireShapeValidationOptions, type InferShapeBoxState, type ShapeRefineInfo, type ShapeSchemaBox, type ShapeSchemaBoxEntry, } from "./plugin.js";
+export { createShapePlugin, validateShapeKeys, validateShapeRefines, wireShapeValidationOptions, type InferShapeBoxState, type ShapeRefineInfo, type ShapeSchemaBox, type ShapeSchemaBoxEntry, } from "./plugin.js";

package/cogsbox-shape-state/dist/index.js

@@ -1 +1 @@
-export { createShapePlugin, validateShapeRefines, wireShapeValidationOptions, } from "./plugin.js";
+export { createShapePlugin, validateShapeKeys, validateShapeRefines, wireShapeValidationOptions, } from "./plugin.js";

package/cogsbox-shape-state/dist/plugin.d.ts

@@ -1,3 +1,4 @@
+import type { ChainMethodContext } from "cogsbox-state";
 import { z } from "zod";
 /** Minimal shape of a createSchemaBox entry — matches journalSchemaBox.journalTechnical etc. */
 export type ShapeRefineInfo = {
@@ -47,10 +48,52 @@ type FormUpdateParams = {
     }>) => void;
     clearZodErrors?: (paths: string[][]) => void;
 };
+type UpdateParams = {
+    stateKey: string;
+    update: {
+        path: string[];
+        updateType: string;
+        oldValue: unknown;
+        newValue: unknown;
+    };
+    getState: () => unknown;
+    addZodErrors: (errors: Array<{
+        path: string[];
+        message: string;
+        code?: string;
+    }>) => void;
+    clearZodErrors?: (paths: string[][]) => void;
+};
+type ShapeKeyValidationParams = {
+    stateKey: string;
+    path: string[];
+    keys?: readonly string[];
+    getState?: () => unknown;
+};
 export declare function wireShapeValidationOptions(box: ShapeSchemaBox, params: TransformStateParams): void;
 /** Cross-field refine errors only — field rules are handled by state via setOptions. */
 export declare function validateShapeRefines(box: ShapeSchemaBox, params: FormUpdateParams): void;
+export declare function validateShapeRefinesOnUpdate(box: ShapeSchemaBox, params: UpdateParams): void;
+export declare function validateShapeKeys(box: ShapeSchemaBox, params: ShapeKeyValidationParams): {
+    success: boolean;
+    results: {
+        key: string;
+        path: string[];
+        success: boolean;
+        data: any;
+    }[];
+};
 export declare function createShapePlugin<const TBox extends ShapeSchemaBox>(box: TBox): import("cogsbox-state").CogsPluginBuilder<"shape", {
     logs: boolean | undefined;
-}, unknown, unknown, never, {}, true, false, true, false, false, true, InferShapeBoxState<TBox>>;
+}, unknown, unknown, never, {
+    validateShape: import("cogsbox-state").ChainMethodDefinition<(ctx: ChainMethodContext, keys?: readonly string[]) => {
+        success: boolean;
+        results: {
+            key: string;
+            path: string[];
+            success: boolean;
+            data: any;
+        }[];
+    }>;
+}, true, true, true, true, false, true, InferShapeBoxState<TBox>>;
 export {};

package/cogsbox-shape-state/dist/plugin.js

@@ -108,6 +108,41 @@ function addValidationIssues(params, issues) {
     params.addZodErrors(issues);
     notifyValidationPaths(params.stateKey, issues.map((issue) => issue.path));
 }
+function setValidationIssues(stateKey, issues) {
+    if (issues.length === 0)
+        return;
+    const store = getGlobalStore.getState();
+    for (const issue of issues) {
+        const currentMeta = store.getShadowMetadata(stateKey, issue.path) || {};
+        store.setShadowMetadata(stateKey, issue.path, {
+            ...currentMeta,
+            validation: {
+                status: "INVALID",
+                errors: [
+                    {
+                        source: "client",
+                        message: issue.message,
+                        severity: "error",
+                        code: issue.code,
+                    },
+                ],
+                lastValidated: Date.now(),
+                validatedValue: store.getShadowValue(stateKey, issue.path),
+            },
+        });
+    }
+    notifyValidationPaths(stateKey, issues.map((issue) => issue.path));
+}
+function issueMatchesSelectedKeys(issue, parentPath, selectedKeys) {
+    const issuePath = issue.path.map(String);
+    if (issuePath.length <= parentPath.length)
+        return false;
+    for (let index = 0; index < parentPath.length; index++) {
+        if (issuePath[index] !== parentPath[index])
+            return false;
+    }
+    return selectedKeys.has(issuePath[parentPath.length]);
+}
 function getRelatedFields(entry, field) {
     const groupIndexes = entry.refineInfo?.fieldToGroup[field];
     if (!groupIndexes?.length)
@@ -126,6 +161,74 @@ function issueMatchesRelatedFields(issue, relatedFields) {
     const leaf = String(issue.path.at(-1) ?? "");
     return relatedFields.has(leaf);
 }
+function getChangedObjectFields(oldValue, newValue) {
+    if (oldValue === null ||
+        newValue === null ||
+        typeof oldValue !== "object" ||
+        typeof newValue !== "object" ||
+        Array.isArray(oldValue) ||
+        Array.isArray(newValue)) {
+        return null;
+    }
+    const fields = new Set();
+    const oldRecord = oldValue;
+    const newRecord = newValue;
+    for (const key of new Set([
+        ...Object.keys(oldRecord),
+        ...Object.keys(newRecord),
+    ])) {
+        if (!Object.is(oldRecord[key], newRecord[key]))
+            fields.add(key);
+    }
+    return fields;
+}
+function resolveUpdateRefineTarget(entry, updatePath, oldValue, newValue) {
+    const changedObjectFields = getChangedObjectFields(oldValue, newValue);
+    if (changedObjectFields) {
+        const parentPath = updatePath;
+        const relatedFields = new Set();
+        for (const field of changedObjectFields) {
+            const groupFields = getRelatedFields(entry, field);
+            if (!groupFields)
+                continue;
+            for (const related of groupFields)
+                relatedFields.add(related);
+        }
+        if (relatedFields.size === 0)
+            return null;
+        return {
+            relatedFields,
+            relatedPaths: [...relatedFields].map((field) => [...parentPath, field]),
+        };
+    }
+    const field = updatePath.at(-1);
+    if (!field)
+        return null;
+    const relatedFields = getRelatedFields(entry, field);
+    if (!relatedFields)
+        return null;
+    return {
+        relatedFields,
+        relatedPaths: resolveRelatedPaths(updatePath, relatedFields),
+    };
+}
+function applyRefineValidation(box, params, target, state) {
+    const entry = box[params.stateKey];
+    const clientSchema = entry?.validators?.client ?? entry?.schemas.client;
+    if (!entry || !clientSchema)
+        return;
+    const result = clientSchema.safeParse(state);
+    if (result.success) {
+        clearValidationPaths(params, target.relatedPaths);
+        return;
+    }
+    const issues = result.error.issues.filter((issue) => issueMatchesRelatedFields(issue, target.relatedFields));
+    const mapped = mapZodIssues(issues);
+    const activeKeys = new Set(mapped.map((entry) => pathKey(entry.path)));
+    const stalePaths = target.relatedPaths.filter((targetPath) => !activeKeys.has(pathKey(targetPath)));
+    clearValidationPaths(params, stalePaths);
+    addValidationIssues(params, mapped);
+}
 export function wireShapeValidationOptions(box, params) {
     const entry = box[params.stateKey];
     if (!entry)
@@ -144,8 +247,7 @@ export function validateShapeRefines(box, params) {
         return;
     }
     const entry = box[params.stateKey];
-    const clientSchema = entry?.validators?.client ?? entry?.schemas.client;
-    if (!entry || !clientSchema)
+    if (!entry)
         return;
     const field = params.path.at(-1);
     if (!field)
@@ -153,18 +255,79 @@ export function validateShapeRefines(box, params) {
     const relatedFields = getRelatedFields(entry, field);
     if (!relatedFields)
         return;
-    const relatedPaths = resolveRelatedPaths(params.path, relatedFields);
-    const result = clientSchema.safeParse(getStateForValidation(params));
-    if (result.success) {
-        clearValidationPaths(params, relatedPaths);
+    applyRefineValidation(box, params, {
+        relatedFields,
+        relatedPaths: resolveRelatedPaths(params.path, relatedFields),
+    }, getStateForValidation(params));
+}
+export function validateShapeRefinesOnUpdate(box, params) {
+    if (params.update.updateType !== "update")
+        return;
+    const entry = box[params.stateKey];
+    if (!entry)
         return;
+    const target = resolveUpdateRefineTarget(entry, params.update.path, params.update.oldValue, params.update.newValue);
+    if (!target)
+        return;
+    applyRefineValidation(box, params, target, params.getState());
+}
+export function validateShapeKeys(box, params) {
+    const entry = box[params.stateKey];
+    const clientSchema = entry?.validators?.client ?? entry?.schemas.client;
+    if (!entry || !clientSchema)
+        return { success: true, results: [] };
+    const store = getGlobalStore.getState();
+    const rootState = params.getState?.() ?? store.getShadowValue(params.stateKey, []);
+    const result = clientSchema.safeParse(rootState);
+    const selectedKeys = params.keys ? new Set(params.keys) : null;
+    const targetPaths = params.keys?.map((key) => [...params.path, key]) ??
+        (result.success
+            ? []
+            : mapZodIssues(result.error.issues).map((issue) => issue.path));
+    if (result.success) {
+        clearValidationPaths({
+            stateKey: params.stateKey,
+            getState: () => rootState,
+            addZodErrors: () => { },
+        }, targetPaths);
+        return {
+            success: true,
+            results: params.keys?.map((key) => ({
+                key,
+                path: [...params.path, key],
+                success: true,
+                data: store.getShadowValue(params.stateKey, [...params.path, key]),
+            })) ?? [],
+        };
     }
-    const issues = result.error.issues.filter((issue) => issueMatchesRelatedFields(issue, relatedFields));
+    const issues = selectedKeys
+        ? result.error.issues.filter((issue) => issueMatchesSelectedKeys(issue, params.path, selectedKeys))
+        : result.error.issues;
     const mapped = mapZodIssues(issues);
-    const activeKeys = new Set(mapped.map((entry) => pathKey(entry.path)));
-    const stalePaths = relatedPaths.filter((targetPath) => !activeKeys.has(pathKey(targetPath)));
-    clearValidationPaths(params, stalePaths);
-    addValidationIssues(params, mapped);
+    const activeKeys = new Set(mapped.map((issue) => pathKey(issue.path)));
+    const stalePaths = targetPaths.filter((targetPath) => !activeKeys.has(pathKey(targetPath)));
+    clearValidationPaths({
+        stateKey: params.stateKey,
+        getState: () => rootState,
+        addZodErrors: () => { },
+    }, stalePaths);
+    setValidationIssues(params.stateKey, mapped);
+    return {
+        success: mapped.length === 0,
+        results: params.keys?.map((key) => {
+            const keyPath = [...params.path, key];
+            const keyIssues = mapped.filter((issue) => issue.path[params.path.length] === key);
+            return {
+                key,
+                path: keyPath,
+                success: keyIssues.length === 0,
+                data: keyIssues.length === 0
+                    ? store.getShadowValue(params.stateKey, keyPath)
+                    : undefined,
+                error: keyIssues.length === 0 ? undefined : { issues: keyIssues },
+            };
+        }) ?? [],
+    };
 }
 function buildInitialState(box) {
     const state = {};
@@ -193,5 +356,16 @@ export function createShapePlugin(box) {
             console.log("[shape]", params.stateKey, params.path, params.event.activityType);
         }
         validateShapeRefines(box, params);
-    });
+    })
+        .onUpdate((params) => {
+        validateShapeRefinesOnUpdate(box, params);
+    })
+        .methods((m) => ({
+        validateShape: m.object((ctx, keys) => validateShapeKeys(box, {
+            stateKey: ctx.stateKey,
+            path: ctx.path,
+            keys,
+            getState: ctx.$get,
+        })),
+    }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cogsbox-shape",
-  "version": "0.5.213",
+  "version": "0.5.215",
   "description": "A TypeScript library for creating type-safe database schemas with Zod validation, SQL type definitions, and automatic client/server transformations. Unifies client, server, and database types through a single schema definition, with built-in support for relationships and serialization.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -65,7 +65,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "cogsbox-state": "^0.5.481",
+    "cogsbox-state": "^0.5.488",
     "commander": "^13.1.0",
     "kysely": "^0.29.2",
     "tsx": "^4.19.3",