Merge pull request #508 from 3YOURMIND/add-zod/move-yoco-validator-to…

…-yoco add-zod(4): Move isYocoIcon to @3yourmind/yoco, Add yocoSchema
3YOURMIND · Sep 22, 2021 · 9e0bad2 · 9e0bad2
2 parents b36199f + 6d085b2
commit 9e0bad2
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 20 deletions.
diff --git a/packages/kotti-ui/source/kotti-banner/KtBanner.vue b/packages/kotti-ui/source/kotti-banner/KtBanner.vue
@@ -18,12 +18,11 @@
 </template>
 
 <script lang="ts">
-import { Yoco } from '@3yourmind/yoco'
+import { isYocoIcon, Yoco } from '@3yourmind/yoco'
 import { computed, defineComponent, ref } from '@vue/composition-api'
 
 import { KtButton } from '../kotti-button'
 import { useTranslationNamespace } from '../kotti-translation/hooks'
-import { isYocoIcon } from '../validators'
 
 import { KottiBanner } from './types'
 

diff --git a/packages/kotti-ui/source/kotti-breadcrumb/KtBreadcrumb.vue b/packages/kotti-ui/source/kotti-breadcrumb/KtBreadcrumb.vue
@@ -25,12 +25,10 @@
 </template>
 
 <script lang="ts">
-import { Yoco } from '@3yourmind/yoco'
+import { isYocoIcon, Yoco } from '@3yourmind/yoco'
 import { defineComponent } from '@vue/composition-api'
 import { isBoolean, isFunction, isString } from 'lodash'
 
-import { isYocoIcon } from '../validators'
-
 import { KottiBreadcrumb } from './types'
 
 const breadcrumbValidator = (

diff --git a/packages/kotti-ui/source/kotti-button/KtButton.vue b/packages/kotti-ui/source/kotti-button/KtButton.vue
@@ -15,10 +15,9 @@
 </template>
 
 <script lang="ts">
+import { isYocoIcon } from '@3yourmind/yoco'
 import { computed, defineComponent } from '@vue/composition-api'
 
-import { isYocoIcon } from '../validators'
-
 import { KottiButton } from './types'
 
 export default defineComponent<KottiButton.PropsInternal>({

diff --git a/packages/kotti-ui/source/kotti-field/constants.ts b/packages/kotti-ui/source/kotti-field/constants.ts
@@ -1,4 +1,4 @@
-import { isYocoIcon } from '../validators'
+import { isYocoIcon } from '@3yourmind/yoco'
 
 import { KottiField } from './types'
 

diff --git a/packages/kotti-ui/source/kotti-filters/components/ButtonLink.vue b/packages/kotti-ui/source/kotti-filters/components/ButtonLink.vue
@@ -7,11 +7,10 @@
 </template>
 
 <script lang="ts">
-import { Yoco } from '@3yourmind/yoco'
+import { isYocoIcon, Yoco } from '@3yourmind/yoco'
 import { computed, defineComponent } from '@vue/composition-api'
 
 import { Kotti } from '../../types'
-import { isYocoIcon } from '../../validators'
 
 export default defineComponent<{
 	icon: Yoco.Icon | null

diff --git a/packages/kotti-ui/source/kotti-heading/KtHeading.vue b/packages/kotti-ui/source/kotti-heading/KtHeading.vue
@@ -20,11 +20,9 @@
 </template>
 
 <script lang="ts">
-import { Yoco } from '@3yourmind/yoco'
+import { isYocoIcon, Yoco } from '@3yourmind/yoco'
 import { computed, defineComponent } from '@vue/composition-api'
 
-import { isYocoIcon } from '../validators'
-
 export default defineComponent({
 	name: 'KtHeading',
 	props: {

diff --git a/packages/kotti-ui/source/kotti-popover/KtPopover.vue b/packages/kotti-ui/source/kotti-popover/KtPopover.vue
@@ -24,11 +24,10 @@
 </template>
 
 <script>
+import { isYocoIcon } from '@3yourmind/yoco'
 import { createPopper } from '@popperjs/core'
 import { mixin as clickaway } from 'vue-clickaway'
 
-import { isYocoIcon } from '../validators'
-
 import IconTextItem from './components/IconTextItem.vue'
 
 const optionIsValid = (option) =>

diff --git a/packages/kotti-ui/source/validators.ts b/packages/kotti-ui/source/validators.ts
diff --git a/packages/yoco/package.json b/packages/yoco/package.json
@@ -14,6 +14,9 @@
 			"url": "https://hello.dodekeract.com/npm/@3yourmind/yoco"
 		}
 	],
+	"dependencies": {
+		"zod": "^3.8.2"
+	},
 	"description": "3YOURMIND Icon Font",
 	"devDependencies": {
 		"icon-font-buildr": "^1.4.2"

diff --git a/packages/yoco/source/index.ts b/packages/yoco/source/index.ts
@@ -1 +1,3 @@
+export * from './schema'
 export * as Yoco from './types'
+export * from './validator'
diff --git a/packages/yoco/source/schema.ts b/packages/yoco/source/schema.ts
@@ -0,0 +1,5 @@
+import { z } from 'zod'
+
+import { Icon } from './types'
+
+export const yocoIconSchema = z.nativeEnum(Icon)
diff --git a/packages/yoco/source/validator.ts b/packages/yoco/source/validator.ts
@@ -0,0 +1,5 @@
+import { yocoIconSchema } from './schema'
+import { Icon } from './types'
+
+export const isYocoIcon = (value: unknown): value is Icon =>
+	yocoIconSchema.safeParse(value).success
diff --git a/yarn.lock b/yarn.lock
@@ -21192,6 +21192,11 @@ yorkie@^2.0.0:
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
 
+zod@^3.8.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.8.2.tgz#f25b78bc76e64f31318d242e301c23d3d610b7a1"
+  integrity sha512-kpwVRACazsOhELVt5h4R2pC2OndrqaBK4+z134TWOsnzn7n2uOYnSyvx0QAn410pl28CgVtkSi5ew7e/AgO0oA==
+
 zwitch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"