Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add-zod(4): Move isYocoIcon to @3yourmind/yoco, Add yocoSchema #508

Merged
merged 1 commit into from
Sep 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/kotti-ui/source/kotti-banner/KtBanner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 1 addition & 3 deletions packages/kotti-ui/source/kotti-breadcrumb/KtBreadcrumb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand Down
3 changes: 1 addition & 2 deletions packages/kotti-ui/source/kotti-button/KtButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>({
Expand Down
2 changes: 1 addition & 1 deletion packages/kotti-ui/source/kotti-field/constants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isYocoIcon } from '../validators'
import { isYocoIcon } from '@3yourmind/yoco'

import { KottiField } from './types'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions packages/kotti-ui/source/kotti-heading/KtHeading.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
3 changes: 1 addition & 2 deletions packages/kotti-ui/source/kotti-popover/KtPopover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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) =>
Expand Down
5 changes: 0 additions & 5 deletions packages/kotti-ui/source/validators.ts

This file was deleted.

3 changes: 3 additions & 0 deletions packages/yoco/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions packages/yoco/source/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export * from './schema'
export * as Yoco from './types'
carsoli marked this conversation as resolved.
Show resolved Hide resolved
export * from './validator'
5 changes: 5 additions & 0 deletions packages/yoco/source/schema.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { z } from 'zod'

import { Icon } from './types'

export const yocoIconSchema = z.nativeEnum(Icon)
5 changes: 5 additions & 0 deletions packages/yoco/source/validator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { yocoIconSchema } from './schema'
import { Icon } from './types'

export const isYocoIcon = (value: unknown): value is Icon =>
yocoIconSchema.safeParse(value).success
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down