@regle/schemas 1.7.0-beta.3 → 1.7.1

package/dist/regle-schemas.d.ts

@@ -3305,13 +3305,13 @@ interface useRegleSchemaFn<TShortcuts extends RegleShortcutDefinition<any> = nev
  *
  * ```ts
  * import { useRegleSchema } from '@regle/schemas';
-  import * as v from 'valibot';
-
-  const { r$ } = useRegleSchema({ name: '' }, v.object({
-    name: v.pipe(v.string(), v.minLength(3))
-  }))
+ * import * as v from 'valibot';
+ *
+ * const { r$ } = useRegleSchema({ name: '' }, v.object({
+ *   name: v.pipe(v.string(), v.minLength(3))
+ * }))
  * ```
- * Docs: {@link https://reglejs.dev/integrations/valibot#usage}
+ * Docs: {@link https://reglejs.dev/integrations/schemas-libraries}
  */
 declare const useRegleSchema: useRegleSchemaFn<RegleShortcutDefinition<any>, {}, {}>;
 //#endregion

package/dist/regle-schemas.js

@@ -1,6 +1,36 @@
 import { createScopedUseRegle, useRootStorage } from "@regle/core";
 import { computed, isRef, ref, unref, watch } from "vue";
 
+//#region ../shared/utils/isFile.ts
+/**
+* Server side friendly way of checking for a File
+*/
+function isFile(value) {
+	return value?.constructor.name == "File" || value?.constructor.name == "FileList";
+}
+
+//#endregion
+//#region ../shared/utils/isEmpty.ts
+/**
+* This is the inverse of isFilled. It will check if the value is in any way empty (including arrays and objects)
+*
+* isEmpty also acts as a type guard.
+*
+* @param value - the target value
+* @param [considerEmptyArrayInvalid=true] - will return false if set to `false`. (default: `true`)
+*/
+function isEmpty(value, considerEmptyArrayInvalid = true) {
+	if (value === void 0 || value === null) return true;
+	if (value instanceof Date) return isNaN(value.getTime());
+	else if (isFile(value)) return value.size <= 0;
+	else if (Array.isArray(value)) {
+		if (considerEmptyArrayInvalid) return value.length === 0;
+		return false;
+	} else if (typeof value === "object" && value != null) return Object.keys(value).length === 0;
+	return !String(value).length;
+}
+
+//#endregion
 //#region ../shared/utils/symbol.ts
 const RegleRuleSymbol = Symbol("regle-rule");
 
@@ -51,7 +81,8 @@ function setObjectError(obj, propsArg, value, isArray) {
 	while (thisProp = props.shift()) {
 		prototypeCheck(thisProp);
 		if (!isNaN(parseInt(thisProp))) {
-			(obj.$each ??= [])[thisProp] = {};
+			if (obj.$each == void 0) obj.$each = [];
+			if (isEmpty(obj.$each[thisProp])) obj.$each[thisProp] = {};
 			obj = obj.$each[thisProp];
 		} else {
 			if (typeof obj[thisProp] == "undefined") obj[thisProp] = {};
@@ -212,16 +243,16 @@ function createUseRegleSchemaComposable(options, shortcuts) {
 * @param state - This can be a plain object, a ref, a reactive object, or a structure containing nested refs.
 * @param schema - These should align with the structure of your state.
 * @param modifiers - customize regle behaviour
-* 
+*
 * ```ts
 * import { useRegleSchema } from '@regle/schemas';
-import * as v from 'valibot';
-
-const { r$ } = useRegleSchema({ name: '' }, v.object({
-name: v.pipe(v.string(), v.minLength(3))
-}))
+* import * as v from 'valibot';
+*
+* const { r$ } = useRegleSchema({ name: '' }, v.object({
+*   name: v.pipe(v.string(), v.minLength(3))
+* }))
 * ```
-* Docs: {@link https://reglejs.dev/integrations/valibot#usage}
+* Docs: {@link https://reglejs.dev/integrations/schemas-libraries}
 */
 const useRegleSchema = createUseRegleSchemaComposable();
 

package/dist/regle-schemas.min.js

@@ -1 +1 @@
-import{createScopedUseRegle as e,useRootStorage as t}from"@regle/core";import{computed as n,isRef as r,ref as i,unref as a,watch as o}from"vue";Symbol(`regle-rule`);function s(e){if(typeof e.source.flags==`string`)return e.source.flags;{let t=[];return e.global&&t.push(`g`),e.ignoreCase&&t.push(`i`),e.multiline&&t.push(`m`),e.sticky&&t.push(`y`),e.unicode&&t.push(`u`),t.join(``)}}function c(e){let t=e,n={}.toString.call(e).slice(8,-1);if(n==`Set`&&(t=new Set([...e].map(e=>c(e)))),n==`Map`&&(t=new Map([...e].map(e=>[c(e[0]),c(e[1])]))),n==`Date`&&(t=new Date(e.getTime())),n==`RegExp`&&(t=RegExp(e.source,s(e))),n==`Array`||n==`Object`)for(let n in t=Array.isArray(e)?[]:{},e)t[n]=c(e[n]);return t}function l(e){return e&&(e instanceof Date||e.constructor.name==`File`||e.constructor.name==`FileList`)?!1:typeof e==`object`&&!!e&&!Array.isArray(e)}function u(e,t,n,r){var i,a;if(Array.isArray(t)&&(i=t.slice(0)),typeof t==`string`&&(i=t.split(`.`)),typeof t==`symbol`&&(i=[t]),!Array.isArray(i))throw Error(`props arg must be an array, a string or a symbol`);if(a=i.pop(),!a)return!1;f(a);for(var o;o=i.shift();)if(f(o),isNaN(parseInt(o))?(e[o]===void 0&&(e[o]={}),e=e[o]):((e.$each??=[])[o]={},e=e.$each[o]),!e||typeof e!=`object`)return!1;return r?e[a]?e[a].$self=(e[a].$self??=[]).concat(n):e[a]={...e[a],$self:n}:Array.isArray(e[a])?e[a]=e[a].concat(n):e[a]=n,!0}function d(e,t,n){if(!e)return n;var r,i;if(Array.isArray(t)&&(r=t.slice(0)),typeof t==`string`&&(r=t.split(`.`)),typeof t==`symbol`&&(r=[t]),!Array.isArray(r))throw Error(`props arg must be an array, a string or a symbol`);for(;r.length;)if(i=r.shift(),!e||!i||(e=e[i],e===void 0))return n;return e}function f(e){if(e==`__proto__`||e==`constructor`||e==`prototype`)throw Error(`setting of prototype values not supported`)}function p(e,...t){for(var n=[].slice.call(arguments),r,i=n.length;r=n[i-1],i--;)if(!r||typeof r!=`object`&&typeof r!=`function`)throw Error(`expected object, got `+r);for(var a=n[0],o=n.slice(1),s=o.length,i=0;i<s;i++){var c=o[i];for(var l in c)a[l]=c[l]}return a}function m(e,s){let f={autoDirty:e?.autoDirty,lazy:e?.lazy,rewardEarly:e?.rewardEarly,clearExternalErrorsOnChange:e?.clearExternalErrorsOnChange};function m(e,m,h){let g=n(()=>a(m)),{syncState:_={onUpdate:!1,onValidate:!1},...v}=h??{},{onUpdate:y=!1,onValidate:b=!1}=_,x={...f,...v},S=n(()=>!l(C.value)),C=r(e)?e:i(e),w=i(l(C.value)?{...c(C.value)}:c(C.value)),T=i({}),E;if(!g.value?.[`~standard`])throw Error(`Only "standard-schema" compatible libraries are supported`);function D(e){let t={};if(e.issues){let n=e.issues.map(e=>{let t=e.path?.map(e=>typeof e==`object`?e.key:e.toString()).join(`.`)??``,n=e.path?.[e.path.length-1],r=typeof n==`object`?n.key:n,i=(typeof n==`object`&&`value`in n?Array.isArray(n.value):!1)||(`type`in e?e.type===`array`:!1)||Array.isArray(d(C.value,t)),a=!i&&typeof r==`number`;return a&&(t=e.path?.slice(0,e.path.length-1)?.map(e=>typeof e==`object`?e.key:e.toString()).join(`.`)??``),{...e,$path:t,isArray:i,$property:r,$rule:`schema`,$message:e.message}});n.forEach(({isArray:e,$path:n,...r})=>{u(t,n,[r],e)})}return t}async function O(e=!1){let t=g.value[`~standard`].validate(C.value);return t instanceof Promise&&(t=await t),S.value?T.value=t.issues?.map(e=>({$message:e.message,$property:e.path?.[e.path.length-1]?.toString()??`-`,$rule:`schema`,...e}))??[]:T.value=D(t),t.issues||(e&&b||!e&&y)&&(k?.(),l(C.value)?C.value=p(C.value,t.value):C.value=t.value,A()),t}let k;function A(){k=o([C,g],()=>O(),{deep:!0})}A(),O(),E=async()=>{try{let e=await O(!0);return{valid:!e.issues?.length,data:C.value}}catch(e){return Promise.reject(e)}};let j=t({scopeRules:n(()=>({})),state:C,options:x,schemaErrors:T,initialState:w,shortcuts:s,schemaMode:!0,onValidate:E});return{r$:j.regle}}return m}const h=m();function g(e,t){return e}function _(){function e(e,t){return t}return e}const v=_();function y({modifiers:e,shortcuts:t}){let n=m(e,t),r=_();return{useRegleSchema:n,inferSchema:r}}const{useCollectScope:b,useScopedRegle:x}=e({customUseRegle:h}),S=t=>{let{customStore:n,customUseRegle:r=h,asRecord:i=!1}=t??{};return e({customStore:n,customUseRegle:r,asRecord:i})};export{S as createScopedUseRegleSchema,y as defineRegleSchemaConfig,v as inferSchema,b as useCollectSchemaScope,h as useRegleSchema,x as useScopedRegleSchema,g as withDeps};
+import{createScopedUseRegle as e,useRootStorage as t}from"@regle/core";import{computed as n,isRef as r,ref as i,unref as a,watch as o}from"vue";function s(e){return e?.constructor.name==`File`||e?.constructor.name==`FileList`}function c(e,t=!0){return e==null?!0:e instanceof Date?isNaN(e.getTime()):s(e)?e.size<=0:Array.isArray(e)?t?e.length===0:!1:typeof e==`object`&&e?Object.keys(e).length===0:!String(e).length}Symbol(`regle-rule`);function l(e){if(typeof e.source.flags==`string`)return e.source.flags;{let t=[];return e.global&&t.push(`g`),e.ignoreCase&&t.push(`i`),e.multiline&&t.push(`m`),e.sticky&&t.push(`y`),e.unicode&&t.push(`u`),t.join(``)}}function u(e){let t=e,n={}.toString.call(e).slice(8,-1);if(n==`Set`&&(t=new Set([...e].map(e=>u(e)))),n==`Map`&&(t=new Map([...e].map(e=>[u(e[0]),u(e[1])]))),n==`Date`&&(t=new Date(e.getTime())),n==`RegExp`&&(t=RegExp(e.source,l(e))),n==`Array`||n==`Object`)for(let n in t=Array.isArray(e)?[]:{},e)t[n]=u(e[n]);return t}function d(e){return e&&(e instanceof Date||e.constructor.name==`File`||e.constructor.name==`FileList`)?!1:typeof e==`object`&&!!e&&!Array.isArray(e)}function f(e,t,n,r){var i,a;if(Array.isArray(t)&&(i=t.slice(0)),typeof t==`string`&&(i=t.split(`.`)),typeof t==`symbol`&&(i=[t]),!Array.isArray(i))throw Error(`props arg must be an array, a string or a symbol`);if(a=i.pop(),!a)return!1;m(a);for(var o;o=i.shift();)if(m(o),isNaN(parseInt(o))?(e[o]===void 0&&(e[o]={}),e=e[o]):(e.$each??=[],c(e.$each[o])&&(e.$each[o]={}),e=e.$each[o]),!e||typeof e!=`object`)return!1;return r?e[a]?e[a].$self=(e[a].$self??=[]).concat(n):e[a]={...e[a],$self:n}:Array.isArray(e[a])?e[a]=e[a].concat(n):e[a]=n,!0}function p(e,t,n){if(!e)return n;var r,i;if(Array.isArray(t)&&(r=t.slice(0)),typeof t==`string`&&(r=t.split(`.`)),typeof t==`symbol`&&(r=[t]),!Array.isArray(r))throw Error(`props arg must be an array, a string or a symbol`);for(;r.length;)if(i=r.shift(),!e||!i||(e=e[i],e===void 0))return n;return e}function m(e){if(e==`__proto__`||e==`constructor`||e==`prototype`)throw Error(`setting of prototype values not supported`)}function h(e,...t){for(var n=[].slice.call(arguments),r,i=n.length;r=n[i-1],i--;)if(!r||typeof r!=`object`&&typeof r!=`function`)throw Error(`expected object, got `+r);for(var a=n[0],o=n.slice(1),s=o.length,i=0;i<s;i++){var c=o[i];for(var l in c)a[l]=c[l]}return a}function g(e,s){let c={autoDirty:e?.autoDirty,lazy:e?.lazy,rewardEarly:e?.rewardEarly,clearExternalErrorsOnChange:e?.clearExternalErrorsOnChange};function l(e,l,m){let g=n(()=>a(l)),{syncState:_={onUpdate:!1,onValidate:!1},...v}=m??{},{onUpdate:y=!1,onValidate:b=!1}=_,x={...c,...v},S=n(()=>!d(C.value)),C=r(e)?e:i(e),w=i(d(C.value)?{...u(C.value)}:u(C.value)),T=i({}),E;if(!g.value?.[`~standard`])throw Error(`Only "standard-schema" compatible libraries are supported`);function D(e){let t={};if(e.issues){let n=e.issues.map(e=>{let t=e.path?.map(e=>typeof e==`object`?e.key:e.toString()).join(`.`)??``,n=e.path?.[e.path.length-1],r=typeof n==`object`?n.key:n,i=(typeof n==`object`&&`value`in n?Array.isArray(n.value):!1)||(`type`in e?e.type===`array`:!1)||Array.isArray(p(C.value,t)),a=!i&&typeof r==`number`;return a&&(t=e.path?.slice(0,e.path.length-1)?.map(e=>typeof e==`object`?e.key:e.toString()).join(`.`)??``),{...e,$path:t,isArray:i,$property:r,$rule:`schema`,$message:e.message}});n.forEach(({isArray:e,$path:n,...r})=>{f(t,n,[r],e)})}return t}async function O(e=!1){let t=g.value[`~standard`].validate(C.value);return t instanceof Promise&&(t=await t),S.value?T.value=t.issues?.map(e=>({$message:e.message,$property:e.path?.[e.path.length-1]?.toString()??`-`,$rule:`schema`,...e}))??[]:T.value=D(t),t.issues||(e&&b||!e&&y)&&(k?.(),d(C.value)?C.value=h(C.value,t.value):C.value=t.value,A()),t}let k;function A(){k=o([C,g],()=>O(),{deep:!0})}A(),O(),E=async()=>{try{let e=await O(!0);return{valid:!e.issues?.length,data:C.value}}catch(e){return Promise.reject(e)}};let j=t({scopeRules:n(()=>({})),state:C,options:x,schemaErrors:T,initialState:w,shortcuts:s,schemaMode:!0,onValidate:E});return{r$:j.regle}}return l}const _=g();function v(e,t){return e}function y(){function e(e,t){return t}return e}const b=y();function x({modifiers:e,shortcuts:t}){let n=g(e,t),r=y();return{useRegleSchema:n,inferSchema:r}}const{useCollectScope:S,useScopedRegle:C}=e({customUseRegle:_}),w=t=>{let{customStore:n,customUseRegle:r=_,asRecord:i=!1}=t??{};return e({customStore:n,customUseRegle:r,asRecord:i})};export{w as createScopedUseRegleSchema,x as defineRegleSchemaConfig,b as inferSchema,S as useCollectSchemaScope,_ as useRegleSchema,C as useScopedRegleSchema,v as withDeps};

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@regle/schemas",
-  "version": "1.7.0-beta.3",
+  "version": "1.7.1",
   "description": "Schemas adapter for Regle",
   "dependencies": {
     "@standard-schema/spec": "1.0.0",
-    "@regle/core": "1.7.0-beta.3",
-    "@regle/rules": "1.7.0-beta.3"
+    "@regle/core": "1.7.1",
+    "@regle/rules": "1.7.1"
   },
   "peerDependencies": {
     "valibot": "^1.0.0",