@formkit/zod 1.6.0-ecccdc6 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/index.cjs +1 -1
  2. package/dist/index.cjs.map +1 -1
  3. package/dist/index.dev.mjs +1 -1
  4. package/dist/index.dev.mjs.map +1 -1
  5. package/dist/index.mjs +1 -1
  6. package/dist/index.mjs.map +1 -1
  7. package/package.json +3 -3
package/dist/index.cjs CHANGED
@@ -105,7 +105,7 @@ function createZodPlugin(zodSchema, submitCallback) {
105
105
  zodValidationListeners.set(targetNode, validationListener);
106
106
  }
107
107
  targetNode.store.set(
108
- core.createMessage({
108
+ /* @__PURE__ */ core.createMessage({
109
109
  blocking: true,
110
110
  type: "validation",
111
111
  key: `${path}:zod`,
package/dist/index.cjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/zod.ts"],"names":["node"],"mappings":"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","sourcesContent":["import { FormKitNode, FormKitPlugin, createMessage } from '@formkit/core'\nimport { z } from 'zod'\n\n/**\n * Extend FormKitNode with setZodErrors.\n */\ndeclare module '@formkit/core' {\n interface FormKitNodeExtensions {\n setZodErrors(zodError: z.ZodError | undefined): FormKitNode\n }\n}\n\nfunction createMessageName(node: FormKitNode): string {\n if (typeof node.props.validationLabel === 'function') {\n return node.props.validationLabel(node)\n }\n return (\n node.props.validationLabel ||\n node.props.label ||\n node.props.name ||\n String(node.name)\n )\n}\n\n/**\n * Creates a new Zod schema plugin for form validation.\n *\n * @param zodSchema - A Zod schema to validate the form against.\n * @param submitCallback - A callback to run when the form is submitted and it passes validation.\n *\n * @returns A tuple of a {@link @formkit/core#FormKitPlugin | FormKitPlugin} and a submit handler.\n *\n * @public\n */\nexport function createZodPlugin<Z extends z.ZodTypeAny>(\n zodSchema: Z,\n submitCallback: (\n payload: z.infer<typeof zodSchema>,\n node: FormKitNode | undefined\n ) => void | Promise<void>\n): [FormKitPlugin, (payload: any, node: FormKitNode | undefined) => void] {\n const zodValidationSet = new Set<FormKitNode>()\n const zodValidationListeners = new Map<FormKitNode, string>()\n // The Zod plugin — maps zod schema to validation rules on\n // matching FormKit nodes.\n const zodPlugin = (node: FormKitNode) => {\n if (node.props.type !== 'form') return false\n\n node.ledger.count('existingValidation', (message) => {\n if (message.type === 'validation' || message.type === 'error') {\n return !message.key.endsWith(':zod')\n }\n return false\n })\n\n node.on('created', () => {\n node.extend('setZodErrors', {\n get: (node) => async (zodError: z.ZodError) => {\n if (!zodError) return\n await node.settled\n const [formErrors, fieldErrors] = zodErrorToFormKitErrors(\n zodError,\n node\n )\n node.setErrors(fieldErrors, formErrors)\n },\n set: false,\n })\n })\n\n node.on('destroyed', () => {\n zodValidationSet.clear()\n zodValidationListeners.clear()\n })\n\n let commitTimout: ReturnType<typeof setTimeout> | number = 0\n let start = Date.now()\n node.on('commit', ({ payload }) => {\n clearTimeout(commitTimout)\n const now = Date.now()\n // perform at least every 600ms\n if (now - start > 600) {\n start = now\n performZodValidation(payload, node)\n }\n // also perform after 150ms of no commits\n commitTimout = setTimeout(() => {\n performZodValidation(payload, node)\n }, 150)\n })\n\n node.on('message-added', (message) => {\n if (\n message.payload.type === 'state' &&\n message.payload.key === 'submitted'\n ) {\n // perform validation on submit so that check\n // for form level errors can be done\n performZodValidation(node.value, node)\n }\n })\n\n return false\n }\n\n function performZodValidation(payload: any, node: FormKitNode) {\n const zodResults = zodSchema.safeParse(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n zodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n const receipt = zodValidationListeners.get(node)\n node.off(receipt as string)\n zodValidationListeners.delete(node)\n })\n zodValidationSet.clear()\n }\n }\n\n // The submit handler — validates the payload against the zod schema\n // and then passes the data to the user's submit callback.\n async function submitHandler(payload: any, node?: FormKitNode | undefined) {\n const zodResults = await zodSchema.safeParseAsync(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n await submitCallback(zodResults.data, node)\n }\n }\n\n // Sets the form errors on the correct nodes.\n function setFormValidations(\n zodErrors: z.ZodError,\n node?: FormKitNode | undefined\n ) {\n if (!node) return\n const [formErrors, InputErrors] = zodErrorToFormKitErrors(zodErrors, node)\n const oldZodValidationSet = new Set(zodValidationSet)\n Object.entries(InputErrors).map((issue) => {\n const [path, message] = issue\n const targetNode = node.at(path)\n if (targetNode) {\n oldZodValidationSet.delete(targetNode)\n const existingValidationCount =\n targetNode.ledger.value('existingValidation')\n if (existingValidationCount === 0) {\n if (!targetNode.store[`${path}:zod`]) {\n const validationListener = targetNode.on(\n 'unsettled:existingValidation',\n () => {\n targetNode.store.remove(`${path}:zod`)\n zodValidationSet.delete(targetNode)\n }\n )\n zodValidationListeners.set(targetNode, validationListener)\n }\n\n targetNode.store.set(\n createMessage({\n blocking: true,\n type: 'validation',\n key: `${path}:zod`,\n value: message,\n meta: {\n i18nArgs: [\n {\n node: targetNode,\n name: createMessageName(targetNode),\n args: [issue],\n },\n ],\n messageKey: 'zod',\n },\n })\n )\n zodValidationSet.add(targetNode)\n }\n }\n })\n\n // on submit, all remaining errors are global errors\n if (node?.context?.state.submitted) {\n node.setErrors([], formErrors)\n }\n\n oldZodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n zodValidationSet.delete(node)\n })\n }\n\n function zodErrorToFormKitErrors(\n zodError: z.ZodError,\n node: FormKitNode\n ): [string[], Record<string, string>] {\n const fieldErrors: Record<string, string> = {}\n const formErrors: string[] = []\n zodError.issues.forEach((error) => {\n const path = error.path.join('.')\n const targetNode = node.at(path)\n if (targetNode) {\n if (!fieldErrors[path]) {\n fieldErrors[path] = error.message\n }\n } else {\n formErrors.push(`${path}: ${error.message}`)\n }\n })\n return [formErrors, fieldErrors]\n }\n\n return [zodPlugin, submitHandler]\n}\n"]}
1
+ {"version":3,"sources":["../src/zod.ts"],"names":["node"],"mappings":";AAAA,SAAqC,qBAAqB;AAY1D,SAAS,kBAAkB,MAA2B;AACpD,MAAI,OAAO,KAAK,MAAM,oBAAoB,YAAY;AACpD,WAAO,KAAK,MAAM,gBAAgB,IAAI;AAAA,EACxC;AACA,SACE,KAAK,MAAM,mBACX,KAAK,MAAM,SACX,KAAK,MAAM,QACX,OAAO,KAAK,IAAI;AAEpB;AAYO,SAAS,gBACd,WACA,gBAIwE;AACxE,QAAM,mBAAmB,oBAAI,IAAiB;AAC9C,QAAM,yBAAyB,oBAAI,IAAyB;AAG5D,QAAM,YAAY,CAAC,SAAsB;AACvC,QAAI,KAAK,MAAM,SAAS;AAAQ,aAAO;AAEvC,SAAK,OAAO,MAAM,sBAAsB,CAAC,YAAY;AACnD,UAAI,QAAQ,SAAS,gBAAgB,QAAQ,SAAS,SAAS;AAC7D,eAAO,CAAC,QAAQ,IAAI,SAAS,MAAM;AAAA,MACrC;AACA,aAAO;AAAA,IACT,CAAC;AAED,SAAK,GAAG,WAAW,MAAM;AACvB,WAAK,OAAO,gBAAgB;AAAA,QAC1B,KAAK,CAACA,UAAS,OAAO,aAAyB;AAC7C,cAAI,CAAC;AAAU;AACf,gBAAMA,MAAK;AACX,gBAAM,CAAC,YAAY,WAAW,IAAI;AAAA,YAChC;AAAA,YACAA;AAAA,UACF;AACA,UAAAA,MAAK,UAAU,aAAa,UAAU;AAAA,QACxC;AAAA,QACA,KAAK;AAAA,MACP,CAAC;AAAA,IACH,CAAC;AAED,SAAK,GAAG,aAAa,MAAM;AACzB,uBAAiB,MAAM;AACvB,6BAAuB,MAAM;AAAA,IAC/B,CAAC;AAED,QAAI,eAAuD;AAC3D,QAAI,QAAQ,KAAK,IAAI;AACrB,SAAK,GAAG,UAAU,CAAC,EAAE,QAAQ,MAAM;AACjC,mBAAa,YAAY;AACzB,YAAM,MAAM,KAAK,IAAI;AAErB,UAAI,MAAM,QAAQ,KAAK;AACrB,gBAAQ;AACR,6BAAqB,SAAS,IAAI;AAAA,MACpC;AAEA,qBAAe,WAAW,MAAM;AAC9B,6BAAqB,SAAS,IAAI;AAAA,MACpC,GAAG,GAAG;AAAA,IACR,CAAC;AAED,SAAK,GAAG,iBAAiB,CAAC,YAAY;AACpC,UACE,QAAQ,QAAQ,SAAS,WACzB,QAAQ,QAAQ,QAAQ,aACxB;AAGA,6BAAqB,KAAK,OAAO,IAAI;AAAA,MACvC;AAAA,IACF,CAAC;AAED,WAAO;AAAA,EACT;AAEA,WAAS,qBAAqB,SAAc,MAAmB;AAC7D,UAAM,aAAa,UAAU,UAAU,OAAO;AAC9C,QAAI,CAAC,WAAW,SAAS;AACvB,yBAAmB,WAAW,OAAO,IAAI;AAAA,IAC3C,OAAO;AACL,uBAAiB,QAAQ,CAACA,UAAS;AACjC,QAAAA,MAAK,MAAM,OAAO,GAAGA,MAAK,QAAQ,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,MAAM;AAC1D,cAAM,UAAU,uBAAuB,IAAIA,KAAI;AAC/C,QAAAA,MAAK,IAAI,OAAiB;AAC1B,+BAAuB,OAAOA,KAAI;AAAA,MACpC,CAAC;AACD,uBAAiB,MAAM;AAAA,IACzB;AAAA,EACF;AAIA,iBAAe,cAAc,SAAc,MAAgC;AACzE,UAAM,aAAa,MAAM,UAAU,eAAe,OAAO;AACzD,QAAI,CAAC,WAAW,SAAS;AACvB,yBAAmB,WAAW,OAAO,IAAI;AAAA,IAC3C,OAAO;AACL,YAAM,eAAe,WAAW,MAAM,IAAI;AAAA,IAC5C;AAAA,EACF;AAGA,WAAS,mBACP,WACA,MACA;AACA,QAAI,CAAC;AAAM;AACX,UAAM,CAAC,YAAY,WAAW,IAAI,wBAAwB,WAAW,IAAI;AACzE,UAAM,sBAAsB,IAAI,IAAI,gBAAgB;AACpD,WAAO,QAAQ,WAAW,EAAE,IAAI,CAAC,UAAU;AACzC,YAAM,CAAC,MAAM,OAAO,IAAI;AACxB,YAAM,aAAa,KAAK,GAAG,IAAI;AAC/B,UAAI,YAAY;AACd,4BAAoB,OAAO,UAAU;AACrC,cAAM,0BACJ,WAAW,OAAO,MAAM,oBAAoB;AAC9C,YAAI,4BAA4B,GAAG;AACjC,cAAI,CAAC,WAAW,MAAM,GAAG,IAAI,MAAM,GAAG;AACpC,kBAAM,qBAAqB,WAAW;AAAA,cACpC;AAAA,cACA,MAAM;AACJ,2BAAW,MAAM,OAAO,GAAG,IAAI,MAAM;AACrC,iCAAiB,OAAO,UAAU;AAAA,cACpC;AAAA,YACF;AACA,mCAAuB,IAAI,YAAY,kBAAkB;AAAA,UAC3D;AAEA,qBAAW,MAAM;AAAA,YACC,8BAAc;AAAA,cAC5B,UAAU;AAAA,cACV,MAAM;AAAA,cACN,KAAK,GAAG,IAAI;AAAA,cACZ,OAAO;AAAA,cACP,MAAM;AAAA,gBACJ,UAAU;AAAA,kBACR;AAAA,oBACE,MAAM;AAAA,oBACN,MAAM,kBAAkB,UAAU;AAAA,oBAClC,MAAM,CAAC,KAAK;AAAA,kBACd;AAAA,gBACF;AAAA,gBACA,YAAY;AAAA,cACd;AAAA,YACF,CAAC;AAAA,UACH;AACA,2BAAiB,IAAI,UAAU;AAAA,QACjC;AAAA,MACF;AAAA,IACF,CAAC;AAGD,QAAI,MAAM,SAAS,MAAM,WAAW;AAClC,WAAK,UAAU,CAAC,GAAG,UAAU;AAAA,IAC/B;AAEA,wBAAoB,QAAQ,CAACA,UAAS;AACpC,MAAAA,MAAK,MAAM,OAAO,GAAGA,MAAK,QAAQ,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,MAAM;AAC1D,uBAAiB,OAAOA,KAAI;AAAA,IAC9B,CAAC;AAAA,EACH;AAEA,WAAS,wBACP,UACA,MACoC;AACpC,UAAM,cAAsC,CAAC;AAC7C,UAAM,aAAuB,CAAC;AAC9B,aAAS,OAAO,QAAQ,CAAC,UAAU;AACjC,YAAM,OAAO,MAAM,KAAK,KAAK,GAAG;AAChC,YAAM,aAAa,KAAK,GAAG,IAAI;AAC/B,UAAI,YAAY;AACd,YAAI,CAAC,YAAY,IAAI,GAAG;AACtB,sBAAY,IAAI,IAAI,MAAM;AAAA,QAC5B;AAAA,MACF,OAAO;AACL,mBAAW,KAAK,GAAG,IAAI,KAAK,MAAM,OAAO,EAAE;AAAA,MAC7C;AAAA,IACF,CAAC;AACD,WAAO,CAAC,YAAY,WAAW;AAAA,EACjC;AAEA,SAAO,CAAC,WAAW,aAAa;AAClC","sourcesContent":["import { FormKitNode, FormKitPlugin, createMessage } from '@formkit/core'\nimport { z } from 'zod'\n\n/**\n * Extend FormKitNode with setZodErrors.\n */\ndeclare module '@formkit/core' {\n interface FormKitNodeExtensions {\n setZodErrors(zodError: z.ZodError | undefined): FormKitNode\n }\n}\n\nfunction createMessageName(node: FormKitNode): string {\n if (typeof node.props.validationLabel === 'function') {\n return node.props.validationLabel(node)\n }\n return (\n node.props.validationLabel ||\n node.props.label ||\n node.props.name ||\n String(node.name)\n )\n}\n\n/**\n * Creates a new Zod schema plugin for form validation.\n *\n * @param zodSchema - A Zod schema to validate the form against.\n * @param submitCallback - A callback to run when the form is submitted and it passes validation.\n *\n * @returns A tuple of a {@link @formkit/core#FormKitPlugin | FormKitPlugin} and a submit handler.\n *\n * @public\n */\nexport function createZodPlugin<Z extends z.ZodTypeAny>(\n zodSchema: Z,\n submitCallback: (\n payload: z.infer<typeof zodSchema>,\n node: FormKitNode | undefined\n ) => void | Promise<void>\n): [FormKitPlugin, (payload: any, node: FormKitNode | undefined) => void] {\n const zodValidationSet = new Set<FormKitNode>()\n const zodValidationListeners = new Map<FormKitNode, string>()\n // The Zod plugin — maps zod schema to validation rules on\n // matching FormKit nodes.\n const zodPlugin = (node: FormKitNode) => {\n if (node.props.type !== 'form') return false\n\n node.ledger.count('existingValidation', (message) => {\n if (message.type === 'validation' || message.type === 'error') {\n return !message.key.endsWith(':zod')\n }\n return false\n })\n\n node.on('created', () => {\n node.extend('setZodErrors', {\n get: (node) => async (zodError: z.ZodError) => {\n if (!zodError) return\n await node.settled\n const [formErrors, fieldErrors] = zodErrorToFormKitErrors(\n zodError,\n node\n )\n node.setErrors(fieldErrors, formErrors)\n },\n set: false,\n })\n })\n\n node.on('destroyed', () => {\n zodValidationSet.clear()\n zodValidationListeners.clear()\n })\n\n let commitTimout: ReturnType<typeof setTimeout> | number = 0\n let start = Date.now()\n node.on('commit', ({ payload }) => {\n clearTimeout(commitTimout)\n const now = Date.now()\n // perform at least every 600ms\n if (now - start > 600) {\n start = now\n performZodValidation(payload, node)\n }\n // also perform after 150ms of no commits\n commitTimout = setTimeout(() => {\n performZodValidation(payload, node)\n }, 150)\n })\n\n node.on('message-added', (message) => {\n if (\n message.payload.type === 'state' &&\n message.payload.key === 'submitted'\n ) {\n // perform validation on submit so that check\n // for form level errors can be done\n performZodValidation(node.value, node)\n }\n })\n\n return false\n }\n\n function performZodValidation(payload: any, node: FormKitNode) {\n const zodResults = zodSchema.safeParse(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n zodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n const receipt = zodValidationListeners.get(node)\n node.off(receipt as string)\n zodValidationListeners.delete(node)\n })\n zodValidationSet.clear()\n }\n }\n\n // The submit handler — validates the payload against the zod schema\n // and then passes the data to the user's submit callback.\n async function submitHandler(payload: any, node?: FormKitNode | undefined) {\n const zodResults = await zodSchema.safeParseAsync(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n await submitCallback(zodResults.data, node)\n }\n }\n\n // Sets the form errors on the correct nodes.\n function setFormValidations(\n zodErrors: z.ZodError,\n node?: FormKitNode | undefined\n ) {\n if (!node) return\n const [formErrors, InputErrors] = zodErrorToFormKitErrors(zodErrors, node)\n const oldZodValidationSet = new Set(zodValidationSet)\n Object.entries(InputErrors).map((issue) => {\n const [path, message] = issue\n const targetNode = node.at(path)\n if (targetNode) {\n oldZodValidationSet.delete(targetNode)\n const existingValidationCount =\n targetNode.ledger.value('existingValidation')\n if (existingValidationCount === 0) {\n if (!targetNode.store[`${path}:zod`]) {\n const validationListener = targetNode.on(\n 'unsettled:existingValidation',\n () => {\n targetNode.store.remove(`${path}:zod`)\n zodValidationSet.delete(targetNode)\n }\n )\n zodValidationListeners.set(targetNode, validationListener)\n }\n\n targetNode.store.set(\n /* #__PURE__ */ createMessage({\n blocking: true,\n type: 'validation',\n key: `${path}:zod`,\n value: message,\n meta: {\n i18nArgs: [\n {\n node: targetNode,\n name: createMessageName(targetNode),\n args: [issue],\n },\n ],\n messageKey: 'zod',\n },\n })\n )\n zodValidationSet.add(targetNode)\n }\n }\n })\n\n // on submit, all remaining errors are global errors\n if (node?.context?.state.submitted) {\n node.setErrors([], formErrors)\n }\n\n oldZodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n zodValidationSet.delete(node)\n })\n }\n\n function zodErrorToFormKitErrors(\n zodError: z.ZodError,\n node: FormKitNode\n ): [string[], Record<string, string>] {\n const fieldErrors: Record<string, string> = {}\n const formErrors: string[] = []\n zodError.issues.forEach((error) => {\n const path = error.path.join('.')\n const targetNode = node.at(path)\n if (targetNode) {\n if (!fieldErrors[path]) {\n fieldErrors[path] = error.message\n }\n } else {\n formErrors.push(`${path}: ${error.message}`)\n }\n })\n return [formErrors, fieldErrors]\n }\n\n return [zodPlugin, submitHandler]\n}\n"]}
package/dist/index.dev.mjs CHANGED
@@ -103,7 +103,7 @@ function createZodPlugin(zodSchema, submitCallback) {
103
103
  zodValidationListeners.set(targetNode, validationListener);
104
104
  }
105
105
  targetNode.store.set(
106
- createMessage({
106
+ /* @__PURE__ */ createMessage({
107
107
  blocking: true,
108
108
  type: "validation",
109
109
  key: `${path}:zod`,
package/dist/index.dev.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/zod.ts"],"names":["node"],"mappings":"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","sourcesContent":["import { FormKitNode, FormKitPlugin, createMessage } from '@formkit/core'\nimport { z } from 'zod'\n\n/**\n * Extend FormKitNode with setZodErrors.\n */\ndeclare module '@formkit/core' {\n interface FormKitNodeExtensions {\n setZodErrors(zodError: z.ZodError | undefined): FormKitNode\n }\n}\n\nfunction createMessageName(node: FormKitNode): string {\n if (typeof node.props.validationLabel === 'function') {\n return node.props.validationLabel(node)\n }\n return (\n node.props.validationLabel ||\n node.props.label ||\n node.props.name ||\n String(node.name)\n )\n}\n\n/**\n * Creates a new Zod schema plugin for form validation.\n *\n * @param zodSchema - A Zod schema to validate the form against.\n * @param submitCallback - A callback to run when the form is submitted and it passes validation.\n *\n * @returns A tuple of a {@link @formkit/core#FormKitPlugin | FormKitPlugin} and a submit handler.\n *\n * @public\n */\nexport function createZodPlugin<Z extends z.ZodTypeAny>(\n zodSchema: Z,\n submitCallback: (\n payload: z.infer<typeof zodSchema>,\n node: FormKitNode | undefined\n ) => void | Promise<void>\n): [FormKitPlugin, (payload: any, node: FormKitNode | undefined) => void] {\n const zodValidationSet = new Set<FormKitNode>()\n const zodValidationListeners = new Map<FormKitNode, string>()\n // The Zod plugin — maps zod schema to validation rules on\n // matching FormKit nodes.\n const zodPlugin = (node: FormKitNode) => {\n if (node.props.type !== 'form') return false\n\n node.ledger.count('existingValidation', (message) => {\n if (message.type === 'validation' || message.type === 'error') {\n return !message.key.endsWith(':zod')\n }\n return false\n })\n\n node.on('created', () => {\n node.extend('setZodErrors', {\n get: (node) => async (zodError: z.ZodError) => {\n if (!zodError) return\n await node.settled\n const [formErrors, fieldErrors] = zodErrorToFormKitErrors(\n zodError,\n node\n )\n node.setErrors(fieldErrors, formErrors)\n },\n set: false,\n })\n })\n\n node.on('destroyed', () => {\n zodValidationSet.clear()\n zodValidationListeners.clear()\n })\n\n let commitTimout: ReturnType<typeof setTimeout> | number = 0\n let start = Date.now()\n node.on('commit', ({ payload }) => {\n clearTimeout(commitTimout)\n const now = Date.now()\n // perform at least every 600ms\n if (now - start > 600) {\n start = now\n performZodValidation(payload, node)\n }\n // also perform after 150ms of no commits\n commitTimout = setTimeout(() => {\n performZodValidation(payload, node)\n }, 150)\n })\n\n node.on('message-added', (message) => {\n if (\n message.payload.type === 'state' &&\n message.payload.key === 'submitted'\n ) {\n // perform validation on submit so that check\n // for form level errors can be done\n performZodValidation(node.value, node)\n }\n })\n\n return false\n }\n\n function performZodValidation(payload: any, node: FormKitNode) {\n const zodResults = zodSchema.safeParse(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n zodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n const receipt = zodValidationListeners.get(node)\n node.off(receipt as string)\n zodValidationListeners.delete(node)\n })\n zodValidationSet.clear()\n }\n }\n\n // The submit handler — validates the payload against the zod schema\n // and then passes the data to the user's submit callback.\n async function submitHandler(payload: any, node?: FormKitNode | undefined) {\n const zodResults = await zodSchema.safeParseAsync(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n await submitCallback(zodResults.data, node)\n }\n }\n\n // Sets the form errors on the correct nodes.\n function setFormValidations(\n zodErrors: z.ZodError,\n node?: FormKitNode | undefined\n ) {\n if (!node) return\n const [formErrors, InputErrors] = zodErrorToFormKitErrors(zodErrors, node)\n const oldZodValidationSet = new Set(zodValidationSet)\n Object.entries(InputErrors).map((issue) => {\n const [path, message] = issue\n const targetNode = node.at(path)\n if (targetNode) {\n oldZodValidationSet.delete(targetNode)\n const existingValidationCount =\n targetNode.ledger.value('existingValidation')\n if (existingValidationCount === 0) {\n if (!targetNode.store[`${path}:zod`]) {\n const validationListener = targetNode.on(\n 'unsettled:existingValidation',\n () => {\n targetNode.store.remove(`${path}:zod`)\n zodValidationSet.delete(targetNode)\n }\n )\n zodValidationListeners.set(targetNode, validationListener)\n }\n\n targetNode.store.set(\n createMessage({\n blocking: true,\n type: 'validation',\n key: `${path}:zod`,\n value: message,\n meta: {\n i18nArgs: [\n {\n node: targetNode,\n name: createMessageName(targetNode),\n args: [issue],\n },\n ],\n messageKey: 'zod',\n },\n })\n )\n zodValidationSet.add(targetNode)\n }\n }\n })\n\n // on submit, all remaining errors are global errors\n if (node?.context?.state.submitted) {\n node.setErrors([], formErrors)\n }\n\n oldZodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n zodValidationSet.delete(node)\n })\n }\n\n function zodErrorToFormKitErrors(\n zodError: z.ZodError,\n node: FormKitNode\n ): [string[], Record<string, string>] {\n const fieldErrors: Record<string, string> = {}\n const formErrors: string[] = []\n zodError.issues.forEach((error) => {\n const path = error.path.join('.')\n const targetNode = node.at(path)\n if (targetNode) {\n if (!fieldErrors[path]) {\n fieldErrors[path] = error.message\n }\n } else {\n formErrors.push(`${path}: ${error.message}`)\n }\n })\n return [formErrors, fieldErrors]\n }\n\n return [zodPlugin, submitHandler]\n}\n"]}
1
+ {"version":3,"sources":["../src/zod.ts"],"names":["node"],"mappings":"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","sourcesContent":["import { FormKitNode, FormKitPlugin, createMessage } from '@formkit/core'\nimport { z } from 'zod'\n\n/**\n * Extend FormKitNode with setZodErrors.\n */\ndeclare module '@formkit/core' {\n interface FormKitNodeExtensions {\n setZodErrors(zodError: z.ZodError | undefined): FormKitNode\n }\n}\n\nfunction createMessageName(node: FormKitNode): string {\n if (typeof node.props.validationLabel === 'function') {\n return node.props.validationLabel(node)\n }\n return (\n node.props.validationLabel ||\n node.props.label ||\n node.props.name ||\n String(node.name)\n )\n}\n\n/**\n * Creates a new Zod schema plugin for form validation.\n *\n * @param zodSchema - A Zod schema to validate the form against.\n * @param submitCallback - A callback to run when the form is submitted and it passes validation.\n *\n * @returns A tuple of a {@link @formkit/core#FormKitPlugin | FormKitPlugin} and a submit handler.\n *\n * @public\n */\nexport function createZodPlugin<Z extends z.ZodTypeAny>(\n zodSchema: Z,\n submitCallback: (\n payload: z.infer<typeof zodSchema>,\n node: FormKitNode | undefined\n ) => void | Promise<void>\n): [FormKitPlugin, (payload: any, node: FormKitNode | undefined) => void] {\n const zodValidationSet = new Set<FormKitNode>()\n const zodValidationListeners = new Map<FormKitNode, string>()\n // The Zod plugin — maps zod schema to validation rules on\n // matching FormKit nodes.\n const zodPlugin = (node: FormKitNode) => {\n if (node.props.type !== 'form') return false\n\n node.ledger.count('existingValidation', (message) => {\n if (message.type === 'validation' || message.type === 'error') {\n return !message.key.endsWith(':zod')\n }\n return false\n })\n\n node.on('created', () => {\n node.extend('setZodErrors', {\n get: (node) => async (zodError: z.ZodError) => {\n if (!zodError) return\n await node.settled\n const [formErrors, fieldErrors] = zodErrorToFormKitErrors(\n zodError,\n node\n )\n node.setErrors(fieldErrors, formErrors)\n },\n set: false,\n })\n })\n\n node.on('destroyed', () => {\n zodValidationSet.clear()\n zodValidationListeners.clear()\n })\n\n let commitTimout: ReturnType<typeof setTimeout> | number = 0\n let start = Date.now()\n node.on('commit', ({ payload }) => {\n clearTimeout(commitTimout)\n const now = Date.now()\n // perform at least every 600ms\n if (now - start > 600) {\n start = now\n performZodValidation(payload, node)\n }\n // also perform after 150ms of no commits\n commitTimout = setTimeout(() => {\n performZodValidation(payload, node)\n }, 150)\n })\n\n node.on('message-added', (message) => {\n if (\n message.payload.type === 'state' &&\n message.payload.key === 'submitted'\n ) {\n // perform validation on submit so that check\n // for form level errors can be done\n performZodValidation(node.value, node)\n }\n })\n\n return false\n }\n\n function performZodValidation(payload: any, node: FormKitNode) {\n const zodResults = zodSchema.safeParse(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n zodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n const receipt = zodValidationListeners.get(node)\n node.off(receipt as string)\n zodValidationListeners.delete(node)\n })\n zodValidationSet.clear()\n }\n }\n\n // The submit handler — validates the payload against the zod schema\n // and then passes the data to the user's submit callback.\n async function submitHandler(payload: any, node?: FormKitNode | undefined) {\n const zodResults = await zodSchema.safeParseAsync(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n await submitCallback(zodResults.data, node)\n }\n }\n\n // Sets the form errors on the correct nodes.\n function setFormValidations(\n zodErrors: z.ZodError,\n node?: FormKitNode | undefined\n ) {\n if (!node) return\n const [formErrors, InputErrors] = zodErrorToFormKitErrors(zodErrors, node)\n const oldZodValidationSet = new Set(zodValidationSet)\n Object.entries(InputErrors).map((issue) => {\n const [path, message] = issue\n const targetNode = node.at(path)\n if (targetNode) {\n oldZodValidationSet.delete(targetNode)\n const existingValidationCount =\n targetNode.ledger.value('existingValidation')\n if (existingValidationCount === 0) {\n if (!targetNode.store[`${path}:zod`]) {\n const validationListener = targetNode.on(\n 'unsettled:existingValidation',\n () => {\n targetNode.store.remove(`${path}:zod`)\n zodValidationSet.delete(targetNode)\n }\n )\n zodValidationListeners.set(targetNode, validationListener)\n }\n\n targetNode.store.set(\n /* #__PURE__ */ createMessage({\n blocking: true,\n type: 'validation',\n key: `${path}:zod`,\n value: message,\n meta: {\n i18nArgs: [\n {\n node: targetNode,\n name: createMessageName(targetNode),\n args: [issue],\n },\n ],\n messageKey: 'zod',\n },\n })\n )\n zodValidationSet.add(targetNode)\n }\n }\n })\n\n // on submit, all remaining errors are global errors\n if (node?.context?.state.submitted) {\n node.setErrors([], formErrors)\n }\n\n oldZodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n zodValidationSet.delete(node)\n })\n }\n\n function zodErrorToFormKitErrors(\n zodError: z.ZodError,\n node: FormKitNode\n ): [string[], Record<string, string>] {\n const fieldErrors: Record<string, string> = {}\n const formErrors: string[] = []\n zodError.issues.forEach((error) => {\n const path = error.path.join('.')\n const targetNode = node.at(path)\n if (targetNode) {\n if (!fieldErrors[path]) {\n fieldErrors[path] = error.message\n }\n } else {\n formErrors.push(`${path}: ${error.message}`)\n }\n })\n return [formErrors, fieldErrors]\n }\n\n return [zodPlugin, submitHandler]\n}\n"]}
package/dist/index.mjs CHANGED
@@ -103,7 +103,7 @@ function createZodPlugin(zodSchema, submitCallback) {
103
103
  zodValidationListeners.set(targetNode, validationListener);
104
104
  }
105
105
  targetNode.store.set(
106
- createMessage({
106
+ /* @__PURE__ */ createMessage({
107
107
  blocking: true,
108
108
  type: "validation",
109
109
  key: `${path}:zod`,
package/dist/index.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/zod.ts"],"names":["node"],"mappings":"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","sourcesContent":["import { FormKitNode, FormKitPlugin, createMessage } from '@formkit/core'\nimport { z } from 'zod'\n\n/**\n * Extend FormKitNode with setZodErrors.\n */\ndeclare module '@formkit/core' {\n interface FormKitNodeExtensions {\n setZodErrors(zodError: z.ZodError | undefined): FormKitNode\n }\n}\n\nfunction createMessageName(node: FormKitNode): string {\n if (typeof node.props.validationLabel === 'function') {\n return node.props.validationLabel(node)\n }\n return (\n node.props.validationLabel ||\n node.props.label ||\n node.props.name ||\n String(node.name)\n )\n}\n\n/**\n * Creates a new Zod schema plugin for form validation.\n *\n * @param zodSchema - A Zod schema to validate the form against.\n * @param submitCallback - A callback to run when the form is submitted and it passes validation.\n *\n * @returns A tuple of a {@link @formkit/core#FormKitPlugin | FormKitPlugin} and a submit handler.\n *\n * @public\n */\nexport function createZodPlugin<Z extends z.ZodTypeAny>(\n zodSchema: Z,\n submitCallback: (\n payload: z.infer<typeof zodSchema>,\n node: FormKitNode | undefined\n ) => void | Promise<void>\n): [FormKitPlugin, (payload: any, node: FormKitNode | undefined) => void] {\n const zodValidationSet = new Set<FormKitNode>()\n const zodValidationListeners = new Map<FormKitNode, string>()\n // The Zod plugin — maps zod schema to validation rules on\n // matching FormKit nodes.\n const zodPlugin = (node: FormKitNode) => {\n if (node.props.type !== 'form') return false\n\n node.ledger.count('existingValidation', (message) => {\n if (message.type === 'validation' || message.type === 'error') {\n return !message.key.endsWith(':zod')\n }\n return false\n })\n\n node.on('created', () => {\n node.extend('setZodErrors', {\n get: (node) => async (zodError: z.ZodError) => {\n if (!zodError) return\n await node.settled\n const [formErrors, fieldErrors] = zodErrorToFormKitErrors(\n zodError,\n node\n )\n node.setErrors(fieldErrors, formErrors)\n },\n set: false,\n })\n })\n\n node.on('destroyed', () => {\n zodValidationSet.clear()\n zodValidationListeners.clear()\n })\n\n let commitTimout: ReturnType<typeof setTimeout> | number = 0\n let start = Date.now()\n node.on('commit', ({ payload }) => {\n clearTimeout(commitTimout)\n const now = Date.now()\n // perform at least every 600ms\n if (now - start > 600) {\n start = now\n performZodValidation(payload, node)\n }\n // also perform after 150ms of no commits\n commitTimout = setTimeout(() => {\n performZodValidation(payload, node)\n }, 150)\n })\n\n node.on('message-added', (message) => {\n if (\n message.payload.type === 'state' &&\n message.payload.key === 'submitted'\n ) {\n // perform validation on submit so that check\n // for form level errors can be done\n performZodValidation(node.value, node)\n }\n })\n\n return false\n }\n\n function performZodValidation(payload: any, node: FormKitNode) {\n const zodResults = zodSchema.safeParse(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n zodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n const receipt = zodValidationListeners.get(node)\n node.off(receipt as string)\n zodValidationListeners.delete(node)\n })\n zodValidationSet.clear()\n }\n }\n\n // The submit handler — validates the payload against the zod schema\n // and then passes the data to the user's submit callback.\n async function submitHandler(payload: any, node?: FormKitNode | undefined) {\n const zodResults = await zodSchema.safeParseAsync(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n await submitCallback(zodResults.data, node)\n }\n }\n\n // Sets the form errors on the correct nodes.\n function setFormValidations(\n zodErrors: z.ZodError,\n node?: FormKitNode | undefined\n ) {\n if (!node) return\n const [formErrors, InputErrors] = zodErrorToFormKitErrors(zodErrors, node)\n const oldZodValidationSet = new Set(zodValidationSet)\n Object.entries(InputErrors).map((issue) => {\n const [path, message] = issue\n const targetNode = node.at(path)\n if (targetNode) {\n oldZodValidationSet.delete(targetNode)\n const existingValidationCount =\n targetNode.ledger.value('existingValidation')\n if (existingValidationCount === 0) {\n if (!targetNode.store[`${path}:zod`]) {\n const validationListener = targetNode.on(\n 'unsettled:existingValidation',\n () => {\n targetNode.store.remove(`${path}:zod`)\n zodValidationSet.delete(targetNode)\n }\n )\n zodValidationListeners.set(targetNode, validationListener)\n }\n\n targetNode.store.set(\n createMessage({\n blocking: true,\n type: 'validation',\n key: `${path}:zod`,\n value: message,\n meta: {\n i18nArgs: [\n {\n node: targetNode,\n name: createMessageName(targetNode),\n args: [issue],\n },\n ],\n messageKey: 'zod',\n },\n })\n )\n zodValidationSet.add(targetNode)\n }\n }\n })\n\n // on submit, all remaining errors are global errors\n if (node?.context?.state.submitted) {\n node.setErrors([], formErrors)\n }\n\n oldZodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n zodValidationSet.delete(node)\n })\n }\n\n function zodErrorToFormKitErrors(\n zodError: z.ZodError,\n node: FormKitNode\n ): [string[], Record<string, string>] {\n const fieldErrors: Record<string, string> = {}\n const formErrors: string[] = []\n zodError.issues.forEach((error) => {\n const path = error.path.join('.')\n const targetNode = node.at(path)\n if (targetNode) {\n if (!fieldErrors[path]) {\n fieldErrors[path] = error.message\n }\n } else {\n formErrors.push(`${path}: ${error.message}`)\n }\n })\n return [formErrors, fieldErrors]\n }\n\n return [zodPlugin, submitHandler]\n}\n"]}
1
+ {"version":3,"sources":["../src/zod.ts"],"names":["node"],"mappings":"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","sourcesContent":["import { FormKitNode, FormKitPlugin, createMessage } from '@formkit/core'\nimport { z } from 'zod'\n\n/**\n * Extend FormKitNode with setZodErrors.\n */\ndeclare module '@formkit/core' {\n interface FormKitNodeExtensions {\n setZodErrors(zodError: z.ZodError | undefined): FormKitNode\n }\n}\n\nfunction createMessageName(node: FormKitNode): string {\n if (typeof node.props.validationLabel === 'function') {\n return node.props.validationLabel(node)\n }\n return (\n node.props.validationLabel ||\n node.props.label ||\n node.props.name ||\n String(node.name)\n )\n}\n\n/**\n * Creates a new Zod schema plugin for form validation.\n *\n * @param zodSchema - A Zod schema to validate the form against.\n * @param submitCallback - A callback to run when the form is submitted and it passes validation.\n *\n * @returns A tuple of a {@link @formkit/core#FormKitPlugin | FormKitPlugin} and a submit handler.\n *\n * @public\n */\nexport function createZodPlugin<Z extends z.ZodTypeAny>(\n zodSchema: Z,\n submitCallback: (\n payload: z.infer<typeof zodSchema>,\n node: FormKitNode | undefined\n ) => void | Promise<void>\n): [FormKitPlugin, (payload: any, node: FormKitNode | undefined) => void] {\n const zodValidationSet = new Set<FormKitNode>()\n const zodValidationListeners = new Map<FormKitNode, string>()\n // The Zod plugin — maps zod schema to validation rules on\n // matching FormKit nodes.\n const zodPlugin = (node: FormKitNode) => {\n if (node.props.type !== 'form') return false\n\n node.ledger.count('existingValidation', (message) => {\n if (message.type === 'validation' || message.type === 'error') {\n return !message.key.endsWith(':zod')\n }\n return false\n })\n\n node.on('created', () => {\n node.extend('setZodErrors', {\n get: (node) => async (zodError: z.ZodError) => {\n if (!zodError) return\n await node.settled\n const [formErrors, fieldErrors] = zodErrorToFormKitErrors(\n zodError,\n node\n )\n node.setErrors(fieldErrors, formErrors)\n },\n set: false,\n })\n })\n\n node.on('destroyed', () => {\n zodValidationSet.clear()\n zodValidationListeners.clear()\n })\n\n let commitTimout: ReturnType<typeof setTimeout> | number = 0\n let start = Date.now()\n node.on('commit', ({ payload }) => {\n clearTimeout(commitTimout)\n const now = Date.now()\n // perform at least every 600ms\n if (now - start > 600) {\n start = now\n performZodValidation(payload, node)\n }\n // also perform after 150ms of no commits\n commitTimout = setTimeout(() => {\n performZodValidation(payload, node)\n }, 150)\n })\n\n node.on('message-added', (message) => {\n if (\n message.payload.type === 'state' &&\n message.payload.key === 'submitted'\n ) {\n // perform validation on submit so that check\n // for form level errors can be done\n performZodValidation(node.value, node)\n }\n })\n\n return false\n }\n\n function performZodValidation(payload: any, node: FormKitNode) {\n const zodResults = zodSchema.safeParse(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n zodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n const receipt = zodValidationListeners.get(node)\n node.off(receipt as string)\n zodValidationListeners.delete(node)\n })\n zodValidationSet.clear()\n }\n }\n\n // The submit handler — validates the payload against the zod schema\n // and then passes the data to the user's submit callback.\n async function submitHandler(payload: any, node?: FormKitNode | undefined) {\n const zodResults = await zodSchema.safeParseAsync(payload)\n if (!zodResults.success) {\n setFormValidations(zodResults.error, node)\n } else {\n await submitCallback(zodResults.data, node)\n }\n }\n\n // Sets the form errors on the correct nodes.\n function setFormValidations(\n zodErrors: z.ZodError,\n node?: FormKitNode | undefined\n ) {\n if (!node) return\n const [formErrors, InputErrors] = zodErrorToFormKitErrors(zodErrors, node)\n const oldZodValidationSet = new Set(zodValidationSet)\n Object.entries(InputErrors).map((issue) => {\n const [path, message] = issue\n const targetNode = node.at(path)\n if (targetNode) {\n oldZodValidationSet.delete(targetNode)\n const existingValidationCount =\n targetNode.ledger.value('existingValidation')\n if (existingValidationCount === 0) {\n if (!targetNode.store[`${path}:zod`]) {\n const validationListener = targetNode.on(\n 'unsettled:existingValidation',\n () => {\n targetNode.store.remove(`${path}:zod`)\n zodValidationSet.delete(targetNode)\n }\n )\n zodValidationListeners.set(targetNode, validationListener)\n }\n\n targetNode.store.set(\n /* #__PURE__ */ createMessage({\n blocking: true,\n type: 'validation',\n key: `${path}:zod`,\n value: message,\n meta: {\n i18nArgs: [\n {\n node: targetNode,\n name: createMessageName(targetNode),\n args: [issue],\n },\n ],\n messageKey: 'zod',\n },\n })\n )\n zodValidationSet.add(targetNode)\n }\n }\n })\n\n // on submit, all remaining errors are global errors\n if (node?.context?.state.submitted) {\n node.setErrors([], formErrors)\n }\n\n oldZodValidationSet.forEach((node) => {\n node.store.remove(`${node.address.slice(1).join('.')}:zod`)\n zodValidationSet.delete(node)\n })\n }\n\n function zodErrorToFormKitErrors(\n zodError: z.ZodError,\n node: FormKitNode\n ): [string[], Record<string, string>] {\n const fieldErrors: Record<string, string> = {}\n const formErrors: string[] = []\n zodError.issues.forEach((error) => {\n const path = error.path.join('.')\n const targetNode = node.at(path)\n if (targetNode) {\n if (!fieldErrors[path]) {\n fieldErrors[path] = error.message\n }\n } else {\n formErrors.push(`${path}: ${error.message}`)\n }\n })\n return [formErrors, fieldErrors]\n }\n\n return [zodPlugin, submitHandler]\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@formkit/zod",
3
- "version": "1.6.0-ecccdc6",
3
+ "version": "1.6.1",
4
4
  "type": "module",
5
5
  "description": "Zod validation for FormKit.",
6
6
  "main": "dist/index.cjs",
@@ -36,10 +36,10 @@
36
36
  ],
37
37
  "license": "MIT",
38
38
  "dependencies": {
39
- "@formkit/core": "1.6.0-ecccdc6"
39
+ "@formkit/core": "1.6.1"
40
40
  },
41
41
  "devDependencies": {
42
- "@formkit/vue": "^1.5.9"
42
+ "@formkit/vue": "^1.6.1"
43
43
  },
44
44
  "peerDependencies": {
45
45
  "zod": "^3.0.0"