fix: outreach custom field validation (#244)

Author: zlalvani

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesselapi/integrations",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "description": "Vessel integrations",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

src/platforms/outreach/actions/prospects/create.ts

@@ -1,7 +1,31 @@
 import { client } from '@/platforms/outreach/client';
 import { action } from '@/sdk';
+import { omit } from 'radash';
 import { z } from 'zod';
 
+const customFieldsSchema = z
+  .record(
+    z
+      .string()
+      .regex(/^custom[0-9]+$/, 'Custom fields must be of the form custom[0-9]+')
+      .transform((key) => key as `custom${number}`),
+    z.string().nullable(),
+  )
+  .optional();
+
+const attributesSchema = z.object({
+  firstName: z.string().nullish(),
+  lastName: z.string().nullish(),
+  occupation: z.string().nullish(),
+  addressCity: z.string().nullish(),
+  addressCountry: z.string().nullish(),
+  addressState: z.string().nullish(),
+  addressStreet: z.string().nullish(),
+  addressStreet2: z.string().nullish(),
+  addressZip: z.string().nullish(),
+  emails: z.array(z.string()).optional(),
+});
+
 export default action(
   'create-prospect',
   {
@@ -10,28 +34,17 @@ export default action(
     mutation: true,
     schema: z.object({
       attributes: z
-        .object({
-          firstName: z.string().nullish(),
-          lastName: z.string().nullish(),
-          occupation: z.string().nullish(),
-          addressCity: z.string().nullish(),
-          addressCountry: z.string().nullish(),
-          addressState: z.string().nullish(),
-          addressStreet: z.string().nullish(),
-          addressStreet2: z.string().nullish(),
-          addressZip: z.string().nullish(),
-          emails: z.array(z.string()).optional(),
-        })
-        .catchall(
-          z
-            .string()
-            .regex(
-              /^custom[0-9]+$/,
-              'Custom fields must be of the form custom[0-9]+',
-            )
-            .transform((key) => key as `custom${number}`)
-            .nullable(),
-        ),
+        .preprocess((input) => {
+          const attributes = attributesSchema.parse(input);
+          const customFields = customFieldsSchema.parse(
+            omit(input as any, Object.keys(attributes)),
+          );
+          return { customFields, ...attributes };
+        }, attributesSchema.extend({ customFields: customFieldsSchema }))
+        .transform((attr) => ({
+          ...omit(attr, ['customFields']),
+          ...attr.customFields,
+        })),
       relationships: z.object({
         ownerId: z.number().optional(),
         accountId: z.number().optional(),

src/platforms/outreach/actions/prospects/update.ts

@@ -1,7 +1,30 @@
 import { client } from '@/platforms/outreach/client';
 import { action } from '@/sdk';
+import { omit } from 'radash';
 import { z } from 'zod';
 
+const customFieldsSchema = z
+  .record(
+    z
+      .string()
+      .regex(/^custom[0-9]+$/, 'Custom fields must be of the form custom[0-9]+')
+      .transform((key) => key as `custom${number}`),
+    z.string().nullable(),
+  )
+  .optional();
+
+const attributesSchema = z.object({
+  firstName: z.string().nullish(),
+  lastName: z.string().nullish(),
+  occupation: z.string().nullish(),
+  addressCity: z.string().nullish(),
+  addressCountry: z.string().nullish(),
+  addressState: z.string().nullish(),
+  addressStreet: z.string().nullish(),
+  addressStreet2: z.string().nullish(),
+  addressZip: z.string().nullish(),
+});
+
 export default action(
   'update-prospect',
   {
@@ -11,27 +34,17 @@ export default action(
     schema: z.object({
       id: z.number(),
       attributes: z
-        .object({
-          firstName: z.string().nullish(),
-          lastName: z.string().nullish(),
-          occupation: z.string().nullish(),
-          addressCity: z.string().nullish(),
-          addressCountry: z.string().nullish(),
-          addressState: z.string().nullish(),
-          addressStreet: z.string().nullish(),
-          addressStreet2: z.string().nullish(),
-          addressZip: z.string().nullish(),
-        })
-        .catchall(
-          z
-            .string()
-            .regex(
-              /^custom[0-9]+$/,
-              'Custom fields must be of the form custom[0-9]+',
-            )
-            .transform((key) => key as `custom${number}`)
-            .nullable(),
-        ),
+        .preprocess((input) => {
+          const attributes = attributesSchema.parse(input);
+          const customFields = customFieldsSchema.parse(
+            omit(input as any, Object.keys(attributes)),
+          );
+          return { customFields, ...attributes };
+        }, attributesSchema.extend({ customFields: customFieldsSchema }))
+        .transform((attr) => ({
+          ...omit(attr, ['customFields']),
+          ...attr.customFields,
+        })),
     }),
     scopes: [],
   },