cogsbox-state 0.5.484 → 0.5.485

package/src/CogsState.tsx

@@ -158,6 +158,7 @@ export type EndType<
     errors: ValidationError[],
     source?: 'client' | 'sync_engine' | 'api'
   ) => void;
+  $clearZodValidationPaths: (paths: string[][]) => void;
   $clearValidation: (paths?: string[]) => void;
   $applyOperation: (
     operation: UpdateTypeDetail,
@@ -3393,31 +3394,60 @@ function createProxyHandler<
               zodErrors: any[],
               source: 'client' | 'sync_engine' | 'api'
             ) => {
+              const store = getGlobalStore.getState();
               zodErrors.forEach((error) => {
+                const errorPath = error.path.map(String);
                 const currentMeta =
-                  getGlobalStore
-                    .getState()
-                    .getShadowMetadata(stateKey, error.path) || {};
+                  store.getShadowMetadata(stateKey, errorPath) || {};
 
-                getGlobalStore
-                  .getState()
-                  .setShadowMetadata(stateKey, error.path, {
-                    ...currentMeta,
-                    validation: {
-                      status: 'INVALID',
-                      errors: [
-                        {
-                          source: source || 'client',
-                          message: error.message,
-                          severity: 'error',
-                          code: error.code,
-                        },
-                      ],
-                      lastValidated: Date.now(),
-                      validatedValue: undefined,
-                    },
-                  });
+                store.setShadowMetadata(stateKey, errorPath, {
+                  ...currentMeta,
+                  validation: {
+                    status: 'INVALID',
+                    errors: [
+                      {
+                        source: source || 'client',
+                        message: error.message,
+                        severity: 'error',
+                        code: error.code,
+                      },
+                    ],
+                    lastValidated: Date.now(),
+                    validatedValue: undefined,
+                  },
+                });
+                store.notifyPathSubscribers(
+                  [stateKey, ...errorPath].join('.'),
+                  { type: 'VALIDATION_UPDATE' }
+                );
+              });
+              notifyComponents(stateKey);
+            };
+          }
+
+          if (prop === '$clearZodValidationPaths') {
+            return (paths: string[][]) => {
+              const store = getGlobalStore.getState();
+              paths.forEach((targetPath) => {
+                const currentMeta =
+                  store.getShadowMetadata(stateKey, targetPath) || {};
+                if (!currentMeta.validation) return;
+
+                store.setShadowMetadata(stateKey, targetPath, {
+                  ...currentMeta,
+                  validation: {
+                    status: 'NOT_VALIDATED',
+                    errors: [],
+                    lastValidated: Date.now(),
+                    validatedValue: undefined,
+                  },
+                });
+                store.notifyPathSubscribers(
+                  [stateKey, ...targetPath].join('.'),
+                  { type: 'VALIDATION_CLEAR' }
+                );
               });
+              notifyComponents(stateKey);
             };
           }
 

package/src/Components.tsx

@@ -483,10 +483,7 @@ export function FormElementWrapper({
       clearTimeout(debounceTimeoutRef.current);
       debounceTimeoutRef.current = null;
       isCurrentlyDebouncing.current = false;
-      setState(localValue, path, {
-        updateType: 'update',
-        validationTrigger: 'onBlur',
-      });
+      setState(localValue, path, { updateType: 'update' });
     }
 
     // Clear element's current activity
@@ -500,10 +497,26 @@ export function FormElementWrapper({
       meta?.clientActivityState?.elements?.get(componentId)?.currentActivity
         ?.startTime;
 
-    // Notify plugins
+    const validationOptions = getInitialOptions(stateKey)?.validation;
+    if (validationOptions?.onBlur) {
+      runValidation(
+        {
+          stateKey,
+          path,
+          newValue: localValue,
+          updateType: 'update',
+          timeStamp: Date.now(),
+          status: 'new',
+          oldValue: globalStateValue,
+        },
+        'onBlur'
+      );
+    }
+
+    // Refine / plugin validation runs after field validation so it wins on conflict
     notifyFormUpdate({
       stateKey,
-      activityType: 'blur', // Changed from 'type'
+      activityType: 'blur',
       path,
       timestamp: Date.now(),
       duration: focusStartTime ? Date.now() - focusStartTime : undefined,
@@ -511,21 +524,6 @@ export function FormElementWrapper({
         duration: focusStartTime ? Date.now() - focusStartTime : 0,
       },
     });
-
-    // Run validation if configured
-    const validationOptions = getInitialOptions(stateKey)?.validation;
-    if (validationOptions?.onBlur) {
-      const virtualOperation: UpdateTypeDetail = {
-        stateKey,
-        path,
-        newValue: localValue,
-        updateType: 'update',
-        timeStamp: Date.now(),
-        status: 'new',
-        oldValue: globalStateValue,
-      };
-      runValidation(virtualOperation, 'onBlur');
-    }
   }, [localValue, setState, path, stateKey, componentId, globalStateValue]);
 
   const baseState = rebuildStateShape({

package/src/plugins.ts

@@ -89,6 +89,7 @@ type DeconstructedCogsMethods<TStateSlice = any> = {
   initialiseShadowState: (data: any) => void;
   applyOperation: (patch: any, meta?: { dontUpdate?: boolean }) => void;
   addZodErrors: (errors: any[]) => void;
+  clearZodErrors: (paths: string[][]) => void;
   getState: () => TStateSlice;
   setOptions: (options: any) => void;
 };
@@ -104,6 +105,8 @@ export function toDeconstructedMethods(stateHandler: StateObject<any>) {
     applyOperation: (patch: any, meta?: { dontUpdate?: boolean }) =>
       stateHandler.$applyOperation(patch, meta),
     addZodErrors: (errors: any[]) => stateHandler.$addZodValidation(errors),
+    clearZodErrors: (paths: string[][]) =>
+      stateHandler.$clearZodValidationPaths(paths),
     getState: () => stateHandler.$get(),
     setOptions: (opts: any) => {
       stateHandler.$setOptions(opts);