diff --git a/console/env.d.ts b/console/env.d.ts index b379b1e1f..10c13c2ab 100644 --- a/console/env.d.ts +++ b/console/env.d.ts @@ -4,6 +4,7 @@ export {}; import type { CoreMenuGroupId } from "@halo-dev/console-shared"; +import type { FormKitInputs } from "@formkit/inputs"; import "vue-router"; @@ -37,3 +38,12 @@ declare module "axios" { mute?: boolean; } } + +declare module "@formkit/inputs" { + export interface FormKitInputProps> { + "datetime-local": { + type: "datetime-local"; + value?: string; + }; + } +} diff --git a/console/package.json b/console/package.json index 625742423..f625645ff 100644 --- a/console/package.json +++ b/console/package.json @@ -44,13 +44,13 @@ "@codemirror/state": "^6.1.4", "@codemirror/view": "^6.5.1", "@emoji-mart/data": "^1.0.8", - "@formkit/core": "^0.17.5", - "@formkit/i18n": "^0.17.5", - "@formkit/inputs": "^0.17.5", - "@formkit/themes": "^0.17.5", - "@formkit/utils": "^0.17.5", - "@formkit/validation": "0.17.5", - "@formkit/vue": "^0.17.5", + "@formkit/core": "^0.18.1", + "@formkit/i18n": "^0.18.1", + "@formkit/inputs": "^0.18.1", + "@formkit/themes": "^0.18.1", + "@formkit/utils": "^0.18.1", + "@formkit/validation": "0.18.1", + "@formkit/vue": "^0.18.1", "@halo-dev/api-client": "workspace:*", "@halo-dev/components": "workspace:*", "@halo-dev/console-shared": "workspace:*", diff --git a/console/pnpm-lock.yaml b/console/pnpm-lock.yaml index ad239f62a..f10381de8 100644 --- a/console/pnpm-lock.yaml +++ b/console/pnpm-lock.yaml @@ -39,26 +39,26 @@ importers: specifier: ^1.0.8 version: 1.0.8 '@formkit/core': - specifier: ^0.17.5 - version: 0.17.5 + specifier: ^0.18.1 + version: 0.18.1 '@formkit/i18n': - specifier: ^0.17.5 - version: 0.17.5 + specifier: ^0.18.1 + version: 0.18.1 '@formkit/inputs': - specifier: ^0.17.5 - version: 0.17.5 + specifier: ^0.18.1 + version: 0.18.1 '@formkit/themes': - specifier: ^0.17.5 - version: 0.17.5(tailwindcss@3.3.0) + specifier: ^0.18.1 + version: 0.18.1(tailwindcss@3.3.0) '@formkit/utils': - specifier: ^0.17.5 - version: 0.17.5 + specifier: ^0.18.1 + version: 0.18.1 '@formkit/validation': - specifier: 0.17.5 - version: 0.17.5 + specifier: 0.18.1 + version: 0.18.1 '@formkit/vue': - specifier: ^0.17.5 - version: 0.17.5(tailwindcss@3.3.0)(vue@3.3.4) + specifier: ^0.18.1 + version: 0.18.1(tailwindcss@3.3.0) '@halo-dev/api-client': specifier: workspace:* version: link:packages/api-client @@ -2279,51 +2279,51 @@ packages: '@floating-ui/core': 0.3.1 dev: false - /@formkit/core@0.17.5: - resolution: {integrity: sha512-BrtvKOfJ/W7Z2r25LiQC10hy+5TG+22Y57dpQrYdp3bMEziaXHwWxxreX9VgnADUXbwgxxhViEsexINWYsnKQw==} + /@formkit/core@0.18.1: + resolution: {integrity: sha512-qoVpV5gF7k7WtVdJB85pT59AxzEVDefGna6q1zfODhoJ+VtrjhGnFtHUENRahLTB1fz5iknFDG8fCN/uG5wBMw==} dependencies: - '@formkit/utils': 0.17.5 + '@formkit/utils': 0.18.1 dev: false - /@formkit/dev@0.17.5: - resolution: {integrity: sha512-bnGQemvEL/Nkx1w8XiJd7cQZ8kOGz9TT+zUdun44XBfD8r3vRdrHi7BkL5c7v8rC2DJ8jOmb4AdT9v4xu2ijlg==} + /@formkit/dev@0.18.1: + resolution: {integrity: sha512-iDwRKUvR4edlTikijn6NmNdBYEC+Iz7INGdvDflvckZAWYNaqm21T5Gf7aXLjqrzhr5kB2yijcCct+zojkkaAg==} dependencies: - '@formkit/core': 0.17.5 - '@formkit/utils': 0.17.5 + '@formkit/core': 0.18.1 + '@formkit/utils': 0.18.1 dev: false - /@formkit/i18n@0.17.5: - resolution: {integrity: sha512-pN0CtaAa1xVWGEHfg259X7j3sm93wRM9NC+BjWL9bh1NmXWg4vvxZvUD4eA9ks85VN5zL5+sqpb7cn4UFZW1pw==} + /@formkit/i18n@0.18.1: + resolution: {integrity: sha512-7TPLd+l3enVKwmCOK7r+5NBObvvFPtKvyxz31kvQenXEk9rPUzmj4VpMzxMBDhJ9B19LiH/Kwn5m20rwdu9z4w==} dependencies: - '@formkit/core': 0.17.5 - '@formkit/utils': 0.17.5 - '@formkit/validation': 0.17.5 + '@formkit/core': 0.18.1 + '@formkit/utils': 0.18.1 + '@formkit/validation': 0.18.1 dev: false - /@formkit/inputs@0.17.5: - resolution: {integrity: sha512-cFULXWLM6+rPW9vzoOhnZcu7m8xVfan7tzLY6qBKaAIISmfnq1HV/qSvwR2Ttx4m0CPnUnERjxCgQLd23mfHhQ==} + /@formkit/inputs@0.18.1: + resolution: {integrity: sha512-nTcidV7O16wHIz4Jy/YqRJf/gCSLijfC404rCIe9mTtvmvj3+wnpErYfjNnWUmIPTQEjdHSriv6zOl0MDcVARA==} dependencies: - '@formkit/core': 0.17.5 - '@formkit/utils': 0.17.5 + '@formkit/core': 0.18.1 + '@formkit/utils': 0.18.1 dev: false - /@formkit/observer@0.17.5: - resolution: {integrity: sha512-HoMtPsx6nr3WQkrhv8isHTwXHlslowwyKDH3r44vgrf9bCl0/1VgyfZ7DMHZnxhnWYx0whkyOxrFr+P1yimrWA==} + /@formkit/observer@0.18.1: + resolution: {integrity: sha512-3AFfkg5+4DRICG10pW2nWEk0xOthi+MjUamfKan4317VSG3Hku4nTp2w4vAhfocoIWv4Y57DwLS3Q79BDyLY6w==} dependencies: - '@formkit/core': 0.17.5 - '@formkit/utils': 0.17.5 + '@formkit/core': 0.18.1 + '@formkit/utils': 0.18.1 dev: false - /@formkit/rules@0.17.5: - resolution: {integrity: sha512-/5Taf5NIJ0oAPZlYFJ2BmpDX8aoOLzm38RKOFCS2FJcNcVW53rA727O89bV2JTqt4ld5vaZEXjQPeNOnRWut3w==} + /@formkit/rules@0.18.1: + resolution: {integrity: sha512-DVL8tU0y2yhvu73BKHNjQgSkZlutXTcJlDtWq7FKh8Omooi6qFmHpl0ihk8Lk0NaU7ulXK54lZEn7P61c2vJpQ==} dependencies: - '@formkit/core': 0.17.5 - '@formkit/utils': 0.17.5 - '@formkit/validation': 0.17.5 + '@formkit/core': 0.18.1 + '@formkit/utils': 0.18.1 + '@formkit/validation': 0.18.1 dev: false - /@formkit/themes@0.17.5(tailwindcss@3.3.0): - resolution: {integrity: sha512-LzAoV2JAbP7HzgdDAqO2/FgNYFqcDmceaBkzME+MIWDcDSCwHHS81bVHejIkuWm3p5oGiinnqL1UnoCddzIrjg==} + /@formkit/themes@0.18.1(tailwindcss@3.3.0): + resolution: {integrity: sha512-K7Q2z0f4TUXPgLuqamrTxXE32EO6g0In4rznG60cafbZj+JkhtsA+b0qzvRLq5Fu0FZrczqwgAX+loWpVid3bw==} peerDependencies: tailwindcss: ^3.2.0 unocss: ^0.31.0 @@ -2336,36 +2336,34 @@ packages: windicss: optional: true dependencies: - '@formkit/core': 0.17.5 + '@formkit/core': 0.18.1 tailwindcss: 3.3.0(postcss@8.4.21) dev: false - /@formkit/utils@0.17.5: - resolution: {integrity: sha512-VhGdmuyXQKB6ceQeQx1pJ/TP+vCUG5+ZiXeKySuFItAjfk7euTwtalDgv1tXrgCtPwANr6KPMC3rPGsoHS9cSQ==} + /@formkit/utils@0.18.1: + resolution: {integrity: sha512-a4Ls7evdXxB3vYVOmtYBsA7lEKvKDqYrpfNpcTu0tqMN1Zb8ThMt7sB/zD673m9MdVO/p6nOb59UfDKGbaqGkw==} dev: false - /@formkit/validation@0.17.5: - resolution: {integrity: sha512-InG5Yg/d8wu4R1og99rXEJ1dyLazVdSmFKgTLXB6bFgNK1OJnFcpU76jPLzJ6FiUOUH6sCVr/zWekF0iLbDl8g==} + /@formkit/validation@0.18.1: + resolution: {integrity: sha512-nVOO0rbQ+j+0nmOxR3SUlHq8bGSzkx2SQgYdkG7ad6gXjWxTAvoddqepyvnSl5q8ZX0oK2ldZH1cMMlObFi2eQ==} dependencies: - '@formkit/core': 0.17.5 - '@formkit/observer': 0.17.5 - '@formkit/utils': 0.17.5 + '@formkit/core': 0.18.1 + '@formkit/observer': 0.18.1 + '@formkit/utils': 0.18.1 dev: false - /@formkit/vue@0.17.5(tailwindcss@3.3.0)(vue@3.3.4): - resolution: {integrity: sha512-jqGSoScC5rc/zcOj2VEjqvKq8z1X1vJmqm78efLlCydwRZP/e82EZGYebQAiOFIto+KIrIvd+iOFM+greuQPGg==} - peerDependencies: - vue: ^3.2.1 + /@formkit/vue@0.18.1(tailwindcss@3.3.0): + resolution: {integrity: sha512-XV44zm+cwQJA0UqRYhyUMEcH2HNT6IamUio364K7FJdrwxYnKXlGl5Tld1B90DlvIlWZgVdLCAA/26vn1yAwkQ==} dependencies: - '@formkit/core': 0.17.5 - '@formkit/dev': 0.17.5 - '@formkit/i18n': 0.17.5 - '@formkit/inputs': 0.17.5 - '@formkit/observer': 0.17.5 - '@formkit/rules': 0.17.5 - '@formkit/themes': 0.17.5(tailwindcss@3.3.0) - '@formkit/utils': 0.17.5 - '@formkit/validation': 0.17.5 + '@formkit/core': 0.18.1 + '@formkit/dev': 0.18.1 + '@formkit/i18n': 0.18.1 + '@formkit/inputs': 0.18.1 + '@formkit/observer': 0.18.1 + '@formkit/rules': 0.18.1 + '@formkit/themes': 0.18.1(tailwindcss@3.3.0) + '@formkit/utils': 0.18.1 + '@formkit/validation': 0.18.1 vue: 3.3.4 transitivePeerDependencies: - tailwindcss @@ -4099,7 +4097,7 @@ packages: grapheme-splitter: 1.0.4 ignore: 5.2.0 natural-compare-lite: 1.4.0 - semver: 7.5.2 + semver: 7.5.4 tsutils: 3.21.0(typescript@5.0.4) typescript: 5.0.4 transitivePeerDependencies: @@ -11567,7 +11565,7 @@ packages: espree: 9.5.2 esquery: 1.5.0 lodash: 4.17.21 - semver: 7.5.2 + semver: 7.5.4 transitivePeerDependencies: - supports-color dev: true @@ -11662,7 +11660,7 @@ packages: dependencies: '@vue/language-core': 1.8.8(typescript@5.0.4) '@vue/typescript': 1.8.8(typescript@5.0.4) - semver: 7.5.2 + semver: 7.5.4 typescript: 5.0.4 dev: true diff --git a/console/src/formkit/inputs/attachment-group-select.ts b/console/src/formkit/inputs/attachment-group-select.ts index ffa7eda4b..c41c67a2d 100644 --- a/console/src/formkit/inputs/attachment-group-select.ts +++ b/console/src/formkit/inputs/attachment-group-select.ts @@ -1,6 +1,16 @@ import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { select, selects, defaultIcon } from "@formkit/inputs"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + attachmentGroupSelect: { + type: "attachmentGroupSelect"; + value?: string; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/attachment-policy-select.ts b/console/src/formkit/inputs/attachment-policy-select.ts index 9905962ee..a988687f2 100644 --- a/console/src/formkit/inputs/attachment-policy-select.ts +++ b/console/src/formkit/inputs/attachment-policy-select.ts @@ -1,6 +1,16 @@ import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { select, selects, defaultIcon } from "@formkit/inputs"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + attachmentPolicySelect: { + type: "attachmentPolicySelect"; + value?: string; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/attachment/index.ts b/console/src/formkit/inputs/attachment/index.ts index ba74535ed..c5f4dd4fb 100644 --- a/console/src/formkit/inputs/attachment/index.ts +++ b/console/src/formkit/inputs/attachment/index.ts @@ -2,6 +2,17 @@ import { initialValue } from "@formkit/inputs"; import { createInput } from "@formkit/vue"; import AttachmentInput from "./AttachmentInput.vue"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + attachment: { + type: "attachment"; + value?: string; + }; + } +} + export const attachment = createInput(AttachmentInput, { type: "input", props: ["accepts"], diff --git a/console/src/formkit/inputs/category-checkbox.ts b/console/src/formkit/inputs/category-checkbox.ts index 6df15cd39..037269d19 100644 --- a/console/src/formkit/inputs/category-checkbox.ts +++ b/console/src/formkit/inputs/category-checkbox.ts @@ -1,6 +1,16 @@ import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { checkbox, checkboxes, defaultIcon } from "@formkit/inputs"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + categoryCheckbox: { + type: "categoryCheckbox"; + value?: string[]; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/category-select/index.ts b/console/src/formkit/inputs/category-select/index.ts index 6507627fa..2fa7c7c5e 100644 --- a/console/src/formkit/inputs/category-select/index.ts +++ b/console/src/formkit/inputs/category-select/index.ts @@ -13,6 +13,16 @@ import { } from "@formkit/inputs"; import CategorySelect from "./CategorySelect.vue"; import { CategorySelectSection } from "./sections"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + categorySelect: { + type: "categorySelect"; + value?: string | string[]; + }; + } +} export const categorySelect: FormKitTypeDefinition = { schema: outer( diff --git a/console/src/formkit/inputs/menu-checkbox.ts b/console/src/formkit/inputs/menu-checkbox.ts index 6ab0d3fd1..dd373533a 100644 --- a/console/src/formkit/inputs/menu-checkbox.ts +++ b/console/src/formkit/inputs/menu-checkbox.ts @@ -1,6 +1,16 @@ import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { checkbox, checkboxes, defaultIcon } from "@formkit/inputs"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + menuCheckbox: { + type: "menuCheckbox"; + value?: string[]; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/menu-item-select.ts b/console/src/formkit/inputs/menu-item-select.ts index e06f13b46..5f9c962f2 100644 --- a/console/src/formkit/inputs/menu-item-select.ts +++ b/console/src/formkit/inputs/menu-item-select.ts @@ -1,6 +1,16 @@ import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { select, selects, defaultIcon } from "@formkit/inputs"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + menuItemSelect: { + type: "menuItemSelect"; + value?: string; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/menu-radio.ts b/console/src/formkit/inputs/menu-radio.ts index 166a28a86..c94180e59 100644 --- a/console/src/formkit/inputs/menu-radio.ts +++ b/console/src/formkit/inputs/menu-radio.ts @@ -1,6 +1,16 @@ import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { radio, radios, defaultIcon } from "@formkit/inputs"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + menuRadio: { + type: "menuRadio"; + value?: string; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/post-select.ts b/console/src/formkit/inputs/post-select.ts index d6edc8c1d..aec9ffda0 100644 --- a/console/src/formkit/inputs/post-select.ts +++ b/console/src/formkit/inputs/post-select.ts @@ -2,6 +2,16 @@ import { postLabels } from "@/constants/labels"; import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { select, selects, defaultIcon } from "@formkit/inputs"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + postSelect: { + type: "postSelect"; + value?: string; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/repeater/index.ts b/console/src/formkit/inputs/repeater/index.ts index 01bc1a837..911f094a2 100644 --- a/console/src/formkit/inputs/repeater/index.ts +++ b/console/src/formkit/inputs/repeater/index.ts @@ -12,6 +12,16 @@ import { } from "@formkit/inputs"; import { repeaterItems } from "./sections"; import Repeater from "./Repeater.vue"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + repeater: { + type: "repeater"; + value?: Record[]; + }; + } +} export const repeater: FormKitTypeDefinition = { schema: outer( diff --git a/console/src/formkit/inputs/role-select.ts b/console/src/formkit/inputs/role-select.ts index 8ad62a127..4fc1d835c 100644 --- a/console/src/formkit/inputs/role-select.ts +++ b/console/src/formkit/inputs/role-select.ts @@ -4,6 +4,16 @@ import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { select, selects, defaultIcon } from "@formkit/inputs"; import { i18n } from "@/locales"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + roleSelect: { + type: "roleSelect"; + value?: string; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/singlePage-select.ts b/console/src/formkit/inputs/singlePage-select.ts index 79070f460..07beb12a2 100644 --- a/console/src/formkit/inputs/singlePage-select.ts +++ b/console/src/formkit/inputs/singlePage-select.ts @@ -2,6 +2,16 @@ import { singlePageLabels } from "@/constants/labels"; import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { select, selects, defaultIcon } from "@formkit/inputs"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + singlePageSelect: { + type: "singlePageSelect"; + value?: string; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/tag-checkbox.ts b/console/src/formkit/inputs/tag-checkbox.ts index 138b4b401..197f72eb4 100644 --- a/console/src/formkit/inputs/tag-checkbox.ts +++ b/console/src/formkit/inputs/tag-checkbox.ts @@ -1,6 +1,16 @@ import { apiClient } from "@/utils/api-client"; import type { FormKitNode, FormKitTypeDefinition } from "@formkit/core"; import { checkbox, checkboxes, defaultIcon } from "@formkit/inputs"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + tagCheckbox: { + type: "tagCheckbox"; + value?: string[]; + }; + } +} function optionsHandler(node: FormKitNode) { node.on("created", async () => { diff --git a/console/src/formkit/inputs/tag-select/index.ts b/console/src/formkit/inputs/tag-select/index.ts index 5efc26d59..9369ed21c 100644 --- a/console/src/formkit/inputs/tag-select/index.ts +++ b/console/src/formkit/inputs/tag-select/index.ts @@ -13,6 +13,16 @@ import { } from "@formkit/inputs"; import TagSelect from "./TagSelect.vue"; import { TagSelectSection } from "./sections"; +import type { FormKitInputs } from "@formkit/inputs"; + +declare module "@formkit/inputs" { + interface FormKitInputProps> { + tagSelect: { + type: "tagSelect"; + value?: string | string[]; + }; + } +} export const tagSelect: FormKitTypeDefinition = { schema: outer(