@regle/schemas 0.7.5 → 0.8.0

package/dist/regle-schemas.mjs

@@ -1,8 +1,5 @@
 import { useRootStorage } from '@regle/core';
-import { ref, computed, unref, isRef, watch, reactive, toRef, effectScope, onScopeDispose } from 'vue';
-import { withMessage, withAsync, withParams, required, minLength, maxLength, exactLength } from '@regle/rules';
-import * as v3 from 'valibot';
-import z, { z as z$1 } from 'zod';
+import { ref, computed, unref, isRef, watch } from 'vue';
 
 // src/core/useRegleSchema.ts
 
@@ -45,12 +42,6 @@ function cloneDeep(obj) {
 }
 
 // ../shared/utils/object.utils.ts
-function isObject(obj) {
-  if (obj && (obj instanceof Date || obj.constructor.name == "File" || obj.constructor.name == "FileList")) {
-    return false;
-  }
-  return typeof obj === "object" && obj !== null && !Array.isArray(obj);
-}
 function setObjectError(obj, propsArg, value, isArray) {
   var props, lastProp;
   if (Array.isArray(propsArg)) {
@@ -87,447 +78,56 @@ function setObjectError(obj, propsArg, value, isArray) {
     }
   }
   if (isArray) {
-    obj[lastProp] = { ...obj[lastProp], $self: value };
-  } else {
-    obj[lastProp] = value;
-  }
-  return true;
-}
-function prototypeCheck(prop) {
-  if (prop == "__proto__" || prop == "constructor" || prop == "prototype") {
-    throw new Error("setting of prototype values not supported");
-  }
-}
-function transformValibotAdapter(schema) {
-  const isAsync = schema.async;
-  const validatorFn = (value) => {
-    const result = trySafeTransform(schema, value);
-    if (result instanceof Promise) {
-      return result;
-    }
-    if (result.success) {
-      return {
-        $valid: true,
-        $issues: []
-      };
+    if (!obj[lastProp]) {
+      obj[lastProp] = { ...obj[lastProp], $self: value };
     } else {
-      return {
-        $valid: false,
-        $issues: result.issues
-      };
+      obj[lastProp].$self = (obj[lastProp].$self ??= []).concat(value);
     }
-  };
-  if ("__depsArray" in schema && Array.isArray(schema.__depsArray) && schema.__depsArray.length) {
-    return isAsync ? withAsync(validatorFn, schema.__depsArray) : withParams(validatorFn, schema.__depsArray);
-  }
-  return isAsync ? withAsync(validatorFn) : validatorFn;
-}
-function trySafeTransform(schema, value) {
-  try {
-    if (schema.async) {
-      return new Promise(async (resolve) => {
-        const result = await v3.safeParseAsync(schema, value);
-        if (result.success) {
-          resolve({
-            $valid: true,
-            $issues: []
-          });
-        } else {
-          resolve({
-            $valid: false,
-            $issues: result.issues
-          });
-        }
-      });
-    } else {
-      const result = v3.safeParse(schema, value);
-      return result;
-    }
-  } catch (e) {
-    return {};
-  }
-}
-
-// src/core/converters/valibot/guards.ts
-function isIntersectSchema(schema) {
-  return schema.type === "intersect";
-}
-function isObjectSchema(schema) {
-  return schema.type === "object";
-}
-function isWrappedType(schema) {
-  return "wrapped" in schema;
-}
-
-// src/core/converters/valibot/validators/valibotObjectToRegle.ts
-function getNestedValibotObjectSchema(schema) {
-  if (isIntersectSchema(schema)) {
-    const allEntries = schema.options.reduce(
-      (acc, value) => {
-        const nestedSchema = getNestedValibotObjectSchema(value);
-        if (nestedSchema) {
-          acc = {
-            ...acc,
-            ...nestedSchema.entries
-          };
-        }
-        return acc;
-      },
-      {}
-    );
-    return v3.object({ ...allEntries });
-  } else if (isObjectSchema(schema)) {
-    return schema;
-  } else if (isWrappedType(schema)) {
-    return getNestedValibotObjectSchema(schema.wrapped);
   } else {
-    return undefined;
-  }
-}
-function valibotObjectToRegle(schema, state) {
-  const nestedSchema = getNestedValibotObjectSchema(schema);
-  if (nestedSchema) {
-    return Object.fromEntries(
-      Object.entries(nestedSchema.entries).map(([key, shape]) => {
-        if (typeof shape === "object") {
-          const childState = toRef(isObject(state.value) ? state.value : {}, key);
-          return [key, processValibotTypeDef(shape, childState)];
-        }
-        return [key, {}];
-      })
-    );
-  }
-  return {};
-}
-
-// src/core/converters/valibot/validators/valibotVariantToRegle.ts
-function isLiteralSchema(schema) {
-  return schema?.type === "literal";
-}
-function valibotVariantToRegle(schema, state) {
-  const scope = effectScope();
-  const scopeState = scope.run(() => {
-    const valibotRule = ref({});
-    watch(
-      state,
-      () => {
-        if (isObject(state.value) && state.value[schema.key]) {
-          const selectedDiscriminant = schema.options.find((o) => {
-            const nestedSchema = getNestedValibotObjectSchema(o);
-            const schemaVariantKey = nestedSchema?.entries[schema.key];
-            if (isLiteralSchema(schemaVariantKey) && isObject(state.value)) {
-              return schemaVariantKey.literal === state.value[schema.key];
-            }
-            return false;
-          });
-          if (selectedDiscriminant && isObjectSchema(selectedDiscriminant)) {
-            valibotRule.value = Object.fromEntries(
-              Object.entries(selectedDiscriminant.entries).map(([key, shape]) => {
-                return [key, processValibotTypeDef(shape, toRef(isObject(state.value) ? state.value : {}, key))];
-              })
-            );
-          } else {
-            valibotRule.value = {};
-          }
-        } else {
-          valibotRule.value = {
-            [schema.key]: { required }
-          };
-        }
-      },
-      { deep: true, flush: "pre", immediate: true }
-    );
-    onScopeDispose(() => {
-      scope.stop();
-    });
-    return { valibotRule };
-  });
-  return scopeState;
-}
-
-// src/core/converters/extractIssuesMessages.ts
-function extractIssuesMessages() {
-  return (metadata) => {
-    const issueMessages = metadata.$issues?.map((issue) => issue.message);
-    return issueMessages.length ? issueMessages : "Error";
-  };
-}
-
-// src/core/converters/valibot/processValibotTypeDef.ts
-function isArraySchema(schema) {
-  return schema.type === "array";
-}
-function isObjectSchema2(schema) {
-  return schema.type === "object";
-}
-function isVariantSchema(schema) {
-  return schema.type === "variant";
-}
-function getNestedInnerType(schema) {
-  if (isWrappedType(schema)) {
-    return getNestedInnerType(schema.wrapped);
-  } else {
-    return schema;
-  }
-}
-function processValibotTypeDef(schema, state) {
-  const nestedSchema = getNestedInnerType(schema);
-  if (isArraySchema(nestedSchema)) {
-    return valibotArrayToRegle(nestedSchema, state);
-  } else if (isObjectSchema2(nestedSchema)) {
-    return valibotObjectToRegle(nestedSchema, state);
-  } else if (isVariantSchema(nestedSchema)) {
-    const valibotRule = valibotVariantToRegle(nestedSchema, state);
-    return valibotRule.valibotRule;
-  } else {
-    return {
-      [nestedSchema.type]: withMessage(transformValibotAdapter(nestedSchema), extractIssuesMessages())
-    };
-  }
-}
-
-// src/core/converters/valibot/validators/valibotArrayToRegle.ts
-function valibotArrayToRegle(schema, state) {
-  let filteredSelfSchema = {};
-  if ("pipe" in schema) {
-    schema.pipe.filter((f) => f.kind === "validation").forEach((validation) => {
-      filteredSelfSchema[validation.type] = withMessage(
-        transformValibotAdapter(v3.pipe(v3.array(v3.any()), validation)),
-        extractIssuesMessages()
-      );
-    });
-  }
-  return {
-    $each: processValibotTypeDef(schema.item, state),
-    ...filteredSelfSchema
-  };
-}
-function transformZodValidatorAdapter(schema) {
-  const isAsync = hasAsyncRefinement(schema);
-  const validatorFn = (value) => {
-    const result = trySafeTransform2(schema, value);
-    if (result instanceof Promise) {
-      return result;
-    }
-    if (result.success) {
-      return {
-        $valid: true,
-        $issues: []
-      };
+    if (Array.isArray(obj[lastProp])) {
+      obj[lastProp] = obj[lastProp].concat(value);
     } else {
-      return {
-        $valid: false,
-        $issues: result.error.issues
-      };
-    }
-  };
-  if ("__depsArray" in schema && Array.isArray(schema.__depsArray) && schema.__depsArray.length) {
-    return isAsync ? withAsync(validatorFn, schema.__depsArray) : withParams(validatorFn, schema.__depsArray);
-  }
-  return isAsync ? withAsync(validatorFn) : validatorFn;
-}
-function trySafeTransform2(schema, value) {
-  try {
-    const result = schema.safeParse(value);
-    return result;
-  } catch (e) {
-    try {
-      return new Promise(async (resolve) => {
-        const result = await schema.safeParseAsync(value);
-        if (result.success) {
-          resolve({
-            $valid: true,
-            $issues: []
-          });
-        } else {
-          resolve({
-            $valid: false,
-            $issues: result.error.issues
-          });
-        }
-      });
-    } catch (e2) {
-      return {};
+      obj[lastProp] = value;
     }
   }
+  return true;
 }
-function isAsyncFunctionOrPromiseReturning(fn) {
-  if (typeof fn !== "function") return false;
-  if (fn.constructor.name === "AsyncFunction") {
-    return true;
+function getDotPath(obj, propsArg, defaultValue) {
+  if (!obj) {
+    return defaultValue;
   }
-  try {
-    const result = fn();
-    return result instanceof Promise;
-  } catch {
-    return false;
+  var props, prop;
+  if (Array.isArray(propsArg)) {
+    props = propsArg.slice(0);
   }
-}
-function hasAsyncRefinement(schema) {
-  if (schema?._def) {
-    if (schema._def.typeName === "ZodEffects") {
-      const effect = schema._def.effect;
-      return isAsyncFunctionOrPromiseReturning(effect.refinement || effect.transform);
-    }
-    if (schema._def.typeName === "ZodObject") {
-      return Object.values(schema._def.shape()).some((schema2) => hasAsyncRefinement(schema2));
-    }
-    if (schema._def.typeName === "ZodUnion" || schema._def.typeName === "ZodIntersection") {
-      return schema._def.options.some(hasAsyncRefinement);
-    }
-    if (schema._def.typeName === "ZodArray") {
-      return hasAsyncRefinement(schema._def.type);
-    }
-    if (schema._def.typeName === "ZodOptional" || schema._def.typeName === "ZodNullable") {
-      return hasAsyncRefinement(schema._def.innerType);
-    }
-    if (schema._def.typeName === "ZodTuple") {
-      return schema._def.items.some(hasAsyncRefinement);
-    }
-    if (schema._def.typeName === "ZodString" || schema._def.typeName === "ZodNumber" || schema._def.typeName === "ZodDate") {
-      return schema._def.checks?.some((check) => isAsyncFunctionOrPromiseReturning(check.refinement));
-    }
+  if (typeof propsArg == "string") {
+    props = propsArg.split(".");
   }
-  return false;
-}
-function zodDiscriminatedUnionToRegle(schema, state) {
-  const scope = effectScope();
-  const scopeState = scope.run(() => {
-    const zodRule = ref({});
-    watch(
-      state,
-      () => {
-        if (isObject(state.value) && state.value[schema._def.discriminator]) {
-          const selectedDiscriminant = schema._def.optionsMap.get(state.value[schema._def.discriminator]);
-          if (selectedDiscriminant) {
-            zodRule.value = Object.fromEntries(
-              Object.entries(selectedDiscriminant._def.shape()).map(([key, shape]) => {
-                if (typeof shape === "object" && "_def" in shape) {
-                  return [key, processZodTypeDef(shape, toRef(isObject(state.value) ? state.value : {}, key))];
-                }
-                return [key, {}];
-              })
-            );
-          } else {
-            zodRule.value = {};
-          }
-        } else {
-          zodRule.value = {
-            [schema._def.discriminator]: { required: required }
-          };
-        }
-      },
-      { deep: true, flush: "pre", immediate: true }
-    );
-    onScopeDispose(() => {
-      scope.stop();
-    });
-    return { zodRule };
-  });
-  return scopeState;
-}
-
-// src/core/converters/zod/processZodTypeDef.ts
-var typesWithInnerTypes = [
-  z.ZodFirstPartyTypeKind.ZodDefault,
-  z.ZodFirstPartyTypeKind.ZodCatch,
-  z.ZodFirstPartyTypeKind.ZodNullable,
-  z.ZodFirstPartyTypeKind.ZodOptional,
-  z.ZodFirstPartyTypeKind.ZodReadonly
-];
-function isDefWithInnerType(schema) {
-  if (schema._def && typeof schema._def === "object" && "typeName" in schema._def) {
-    return typesWithInnerTypes.includes(schema._def.typeName);
+  if (typeof propsArg == "symbol") {
+    props = [propsArg];
   }
-  return false;
-}
-function isDefWithInnerSchema(schema) {
-  if (schema._def && typeof schema._def === "object" && "typeName" in schema._def) {
-    return "schema" in schema._def;
+  if (!Array.isArray(props)) {
+    throw new Error("props arg must be an array, a string or a symbol");
   }
-  return false;
-}
-function getNestedInnerType2(schema) {
-  if (schema?._def && typeof schema._def === "object" && "typeName" in schema._def) {
-    if (isDefWithInnerType(schema)) {
-      return getNestedInnerType2(schema._def.innerType);
-    } else if (isDefWithInnerSchema(schema)) {
-      return getNestedInnerType2(schema._def.schema);
-    } else {
-      return schema;
+  while (props.length) {
+    prop = props.shift();
+    if (!obj) {
+      return defaultValue;
     }
-  }
-  return undefined;
-}
-function processZodTypeDef(schema, state) {
-  const schemaDef = getNestedInnerType2(schema);
-  if (schemaDef?._def && "typeName" in schemaDef._def) {
-    if (schemaDef._def.typeName === z.ZodFirstPartyTypeKind.ZodArray || schemaDef._def.typeName === z.ZodFirstPartyTypeKind.ZodTuple) {
-      return zodArrayToRegle(schema, state);
-    } else if (schemaDef._def.typeName === z.ZodFirstPartyTypeKind.ZodObject || schemaDef._def.typeName === z.ZodFirstPartyTypeKind.ZodIntersection) {
-      return zodObjectToRegle(schemaDef, state);
-    } else if (schemaDef._def.typeName === z.ZodFirstPartyTypeKind.ZodDiscriminatedUnion) {
-      const zodRule = zodDiscriminatedUnionToRegle(schemaDef, state);
-      return zodRule.zodRule;
-    } else {
-      return {
-        [schemaDef.constructor.name]: withMessage(
-          transformZodValidatorAdapter(schema),
-          extractIssuesMessages()
-        )
-      };
+    if (!prop) {
+      return defaultValue;
     }
-  }
-  return {};
-}
-
-// src/core/converters/zod/validators/zodArrayToRegle.ts
-function zodArrayToRegle(schema, state) {
-  const arrayValidators = schema._def.typeName === z$1.ZodFirstPartyTypeKind.ZodArray ? {
-    ...!!schema._def.minLength && { minLength: minLength(schema._def.minLength?.value) },
-    ...!!schema._def.maxLength && { maxLength: maxLength(schema._def.maxLength?.value) },
-    ...!!schema._def.exactLength && { exactLength: exactLength(schema._def.exactLength?.value) }
-  } : {};
-  const items = schema._def.typeName === z$1.ZodFirstPartyTypeKind.ZodArray ? schema._def.type : schema._def.items;
-  return {
-    $each: processZodTypeDef(items, state),
-    ...arrayValidators
-  };
-}
-function getNestedZodObjectSchema(schema) {
-  if (schema._def && "typeName" in schema._def) {
-    if (schema._def.typeName === z$1.ZodFirstPartyTypeKind.ZodEffects) {
-      return getNestedZodObjectSchema(schema._def.schema);
-    } else if (schema._def.typeName === z$1.ZodFirstPartyTypeKind.ZodIntersection) {
-      const leftObject = getNestedZodObjectSchema(schema._def.left);
-      const rightObject = getNestedZodObjectSchema(schema._def.right);
-      if (leftObject && rightObject) {
-        return getNestedZodObjectSchema(leftObject.merge(rightObject));
-      }
-      return undefined;
-    } else {
-      return schema;
+    obj = obj[prop];
+    if (obj === undefined) {
+      return defaultValue;
     }
   }
-  return undefined;
+  return obj;
 }
-function zodObjectToRegle(schema, state) {
-  if (schema && "_def" in schema && "typeName" in schema._def) {
-    const nestedSchema = getNestedZodObjectSchema(schema);
-    if (nestedSchema?._def?.typeName === z$1.ZodFirstPartyTypeKind.ZodObject) {
-      return Object.fromEntries(
-        Object.entries(nestedSchema._def.shape()).map(([key, shape]) => {
-          if (shape && typeof shape === "object" && "_def" in shape) {
-            const childState = toRef(isObject(state.value) ? state.value : {}, key);
-            return [key, processZodTypeDef(shape, childState)];
-          }
-          return [key, {}];
-        })
-      );
-    }
-    return {};
+function prototypeCheck(prop) {
+  if (prop == "__proto__" || prop == "constructor" || prop == "prototype") {
+    throw new Error("setting of prototype values not supported");
   }
-  return {};
 }
 
 // src/core/useRegleSchema.ts
@@ -541,72 +141,56 @@ function createUseRegleSchemaComposable(options, shortcuts) {
   function useRegleSchema2(state, schema, options2) {
     const convertedRules = ref({});
     const computedSchema = computed(() => unref(schema));
-    const { mode = "rules", ...regleOptions } = options2 ?? {};
     const resolvedOptions = {
       ...globalOptions,
-      ...regleOptions
+      ...options2
     };
     const processedState = isRef(state) ? state : ref(state);
     const initialState = ref({ ...cloneDeep(processedState.value) });
     const customErrors = ref({});
     let onValidate = undefined;
-    if (mode === "rules") {
-      watch(
-        computedSchema,
-        () => {
-          if (computedSchema.value && typeof computedSchema.value === "object") {
-            if (computedSchema.value["~standard"].vendor === "zod") {
-              convertedRules.value = reactive(zodObjectToRegle(computedSchema.value, processedState));
-            } else if (computedSchema.value["~standard"].vendor === "valibot") {
-              convertedRules.value = reactive(valibotObjectToRegle(computedSchema.value, processedState));
-            }
-          }
-        },
-        { deep: true, immediate: true, flush: "post" }
-      );
-    } else {
-      let issuesToRegleErrors2 = function(result) {
-        const output = {};
-        if (result.issues) {
-          const errors = result.issues.map((issue) => {
-            const path = issue.path?.map((item) => typeof item === "object" ? item.key : item).join(".");
-            const lastItem = issue.path?.[issue.path.length - 1];
-            const isArray = (typeof lastItem === "object" && "value" in lastItem ? Array.isArray(lastItem.value) : false) || ("type" in issue ? issue.type === "array" : false);
-            return {
-              path,
-              message: issue.message,
-              isArray
-            };
-          });
-          errors.forEach((error) => {
-            setObjectError(output, error.path, [error.message], error.isArray);
-          });
-        }
-        return output;
-      };
-      const emptySkeleton = computedSchema.value["~standard"].validate(initialState.value);
-      customErrors.value = issuesToRegleErrors2(emptySkeleton);
-      watch(
-        [processedState, computedSchema],
-        async () => {
-          const result = await computedSchema.value["~standard"].validate(processedState.value);
-          customErrors.value = issuesToRegleErrors2(result);
-        },
-        { deep: true, immediate: true, flush: "post" }
-      );
-      onValidate = async () => {
-        try {
-          const result = await computedSchema.value["~standard"].validate(processedState.value);
-          customErrors.value = issuesToRegleErrors2(result);
+    if (!computedSchema.value?.["~standard"]) {
+      throw new Error(`Only "standard-schema" compatible libraries are supported`);
+    }
+    function issuesToRegleErrors(result) {
+      const output = {};
+      if (result.issues) {
+        const errors = result.issues.map((issue) => {
+          const path = issue.path?.map((item) => typeof item === "object" ? item.key : item.toString()).join(".") ?? "";
+          const lastItem = issue.path?.[issue.path.length - 1];
+          const isArray = (typeof lastItem === "object" && "value" in lastItem ? Array.isArray(lastItem.value) : false) || ("type" in issue ? issue.type === "array" : false) || Array.isArray(getDotPath(processedState.value, path));
           return {
-            result: !result.issues?.length,
-            data: processedState.value
+            path,
+            message: issue.message,
+            isArray
           };
-        } catch (e) {
-          return Promise.reject(e);
-        }
-      };
+        });
+        errors.forEach((error) => {
+          setObjectError(output, error.path, [error.message], error.isArray);
+        });
+      }
+      return output;
+    }
+    async function computeErrors() {
+      let result = computedSchema.value["~standard"].validate(processedState.value);
+      if (result instanceof Promise) {
+        result = await result;
+      }
+      customErrors.value = issuesToRegleErrors(result);
+      return result;
     }
+    watch([processedState, computedSchema], computeErrors, { deep: true, immediate: true });
+    onValidate = async () => {
+      try {
+        const result = await computeErrors();
+        return {
+          result: !result.issues?.length,
+          data: processedState.value
+        };
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
     const regle = useRootStorage({
       scopeRules: convertedRules,
       state: processedState,
@@ -614,7 +198,7 @@ function createUseRegleSchemaComposable(options, shortcuts) {
       schemaErrors: customErrors,
       initialState,
       shortcuts,
-      schemaMode: mode === "schema",
+      schemaMode: true,
       onValidate
     });
     return {
@@ -625,7 +209,7 @@ function createUseRegleSchemaComposable(options, shortcuts) {
 }
 var useRegleSchema = createUseRegleSchemaComposable();
 function withDeps(schema, depsArray) {
-  return { ...schema, __depsArray: depsArray };
+  return schema;
 }
 function createInferValibotSchemaHelper() {
   function inferRules(state, rulesFactory) {

package/package.json

@@ -1,13 +1,23 @@
 {
   "name": "@regle/schemas",
-  "version": "0.7.5",
+  "version": "0.8.0",
   "description": "Schemas adapter for Regle",
   "dependencies": {
-    "@standard-schema/spec": "1.0.0-rc.0",
-    "valibot": "1.0.0-beta.14",
-    "zod": "^3.24.0",
-    "@regle/core": "0.7.5",
-    "@regle/rules": "0.7.5"
+    "@standard-schema/spec": "1.0.0",
+    "@regle/core": "0.8.0",
+    "@regle/rules": "0.8.0"
+  },
+  "peerDependencies": {
+    "valibot": "^1.0.0-beta.11",
+    "zod": "^3.24.0"
+  },
+  "peerDependenciesMeta": {
+    "valibot": {
+      "optional": true
+    },
+    "zod": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@total-typescript/ts-reset": "0.6.1",
@@ -25,7 +35,7 @@
     "tsup": "8.3.5",
     "type-fest": "4.28.0",
     "typescript": "5.6.3",
-    "valibot": "1.0.0-beta.12",
+    "valibot": "1.0.0-beta.14",
     "vitest": "2.1.8",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3",