1,494th Commit

Shyam-Chen · Jun 28, 2024 · 31f4db2 · 31f4db2
1 parent 8366890
commit 31f4db2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 22 deletions.
diff --git a/app/src/routes/(backstage)/(playground)/crud-operations/[id]/schema.ts b/app/src/routes/(backstage)/(playground)/crud-operations/[id]/schema.ts
@@ -1,7 +1,7 @@
-import { useValdnLocale } from '@x/ui';
-import { minLength, nullish, object, string } from 'valibot';
 import { computed, toRef } from 'vue';
-import { useValibotSchema } from 'vue-formor';
+import { useSchema } from 'vue-formor';
+import { useValdnLocale } from '@x/ui';
+import * as v from 'valibot';
 
 import useStore from './store';
 
@@ -10,10 +10,10 @@ export default () => {
 
   const { state } = useStore();
 
-  const schema = useValibotSchema(
+  const schema = useSchema(
     computed(() =>
-      object({
-        title: nullish(string([minLength(1, valdnLocale.value.required)]), ''),
+      v.object({
+        title: v.nullish(v.pipe(v.string(), v.minLength(1, valdnLocale.value.required)), ''),
       }),
     ),
     toRef(state, 'todoForm'),

diff --git a/app/src/routes/(portal)/forgot-password/schema.ts b/app/src/routes/(portal)/forgot-password/schema.ts
@@ -1,7 +1,7 @@
-import { useValdnLocale } from '@x/ui';
-import { email, minLength, object, string } from 'valibot';
 import { computed, toRef } from 'vue';
-import { useValibotSchema } from 'vue-formor';
+import { useSchema } from 'vue-formor';
+import { useValdnLocale } from '@x/ui';
+import * as v from 'valibot';
 
 import useStore from './store';
 
@@ -10,10 +10,17 @@ export default () => {
 
   const { state } = useStore();
 
-  const schema = useValibotSchema(
+  const schema = useSchema(
     computed(() =>
-      object({
-        email: string([minLength(1, valdnLocale.value.required), email(valdnLocale.value.email)]),
+      v.object({
+        email: v.nullish(
+          v.pipe(
+            v.string(),
+            v.minLength(1, valdnLocale.value.required),
+            v.email(valdnLocale.value.email),
+          ),
+          '',
+        ),
       }),
     ),
     toRef(state, 'form'),

diff --git a/app/src/routes/(portal)/sign-in/schema.ts b/app/src/routes/(portal)/sign-in/schema.ts
@@ -1,8 +1,8 @@
-import { useValdnLocale } from '@x/ui';
-import { minLength, object, string } from 'valibot';
 import { computed, toRef } from 'vue';
-import { useValibotSchema } from 'vue-formor';
+import { useSchema } from 'vue-formor';
 import { useLocaler } from 'vue-localer';
+import { useValdnLocale } from '@x/ui';
+import * as v from 'valibot';
 
 import useStore from './store';
 
@@ -12,14 +12,18 @@ export default () => {
 
   const { state } = useStore();
 
-  const schema = useValibotSchema(
+  const schema = useSchema(
     computed(() =>
-      object({
-        username: string([minLength(1, valdnLocale.value.required)]),
-        password: string([
-          minLength(1, valdnLocale.value.required),
-          minLength(8, localer.f(valdnLocale.value.minLength, [8])),
-        ]),
+      v.object({
+        username: v.nullish(v.pipe(v.string(), v.minLength(1, valdnLocale.value.required)), ''),
+        password: v.nullish(
+          v.pipe(
+            v.string(),
+            v.minLength(1, valdnLocale.value.required),
+            v.minLength(8, localer.f(valdnLocale.value.minLength, [8])),
+          ),
+          '',
+        ),
       }),
     ),
     toRef(state, 'signInForm'),