chore: make apis nullable (#7763)

what:

- makes top level attributes of each object an optional field in the http layer where possible

RESOLVES CORE-2229

packages/medusa/src/api/admin/api-keys/validators.ts

@@ -1,10 +1,10 @@
+import { ApiKeyType } from "@medusajs/utils"
 import { z } from "zod"
 import {
   createFindParams,
   createOperatorMap,
   createSelectParams,
 } from "../../utils/validators"
-import { ApiKeyType } from "@medusajs/utils"
 
 export const AdminGetApiKeyParams = createSelectParams()
 

packages/medusa/src/api/admin/campaigns/validators.ts

@@ -29,8 +29,8 @@ export const AdminGetCampaignsParams = createFindParams({
 export const CreateCampaignBudget = z
   .object({
     type: z.nativeEnum(CampaignBudgetType),
-    limit: z.number().optional().nullable(),
-    currency_code: z.string().optional().nullable(),
+    limit: z.number().optional(),
+    currency_code: z.string().nullish(),
   })
   .strict()
   .refine(
@@ -52,7 +52,7 @@ export const CreateCampaignBudget = z
 
 export const UpdateCampaignBudget = z
   .object({
-    limit: z.number().optional().nullable(),
+    limit: z.number().optional(),
   })
   .strict()
 
@@ -61,10 +61,10 @@ export const AdminCreateCampaign = z
   .object({
     name: z.string(),
     campaign_identifier: z.string(),
-    description: z.string().optional(),
+    description: z.string().nullish(),
     budget: CreateCampaignBudget.optional(),
-    starts_at: z.coerce.date().optional(),
-    ends_at: z.coerce.date().optional(),
+    starts_at: z.coerce.date().nullish(),
+    ends_at: z.coerce.date().nullish(),
     promotions: z.array(z.object({ id: z.string() })).optional(),
   })
   .strict()
@@ -73,9 +73,9 @@ export type AdminUpdateCampaignType = z.infer<typeof AdminUpdateCampaign>
 export const AdminUpdateCampaign = z.object({
   name: z.string().optional(),
   campaign_identifier: z.string().optional(),
-  description: z.string().optional(),
+  description: z.string().nullish(),
   budget: UpdateCampaignBudget.optional(),
-  starts_at: z.coerce.date().optional(),
-  ends_at: z.coerce.date().optional(),
+  starts_at: z.coerce.date().nullish(),
+  ends_at: z.coerce.date().nullish(),
   promotions: z.array(z.object({ id: z.string() })).optional(),
 })

packages/medusa/src/api/admin/collections/validators.ts

@@ -1,9 +1,9 @@
+import { z } from "zod"
 import {
   createFindParams,
   createOperatorMap,
   createSelectParams,
 } from "../../utils/validators"
-import { z } from "zod"
 
 export const AdminGetCollectionParams = createSelectParams()
 
@@ -30,12 +30,12 @@ export type AdminCreateCollectionType = z.infer<typeof AdminCreateCollection>
 export const AdminCreateCollection = z.object({
   title: z.string(),
   handle: z.string().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type AdminUpdateCollectionType = z.infer<typeof AdminUpdateCollection>
 export const AdminUpdateCollection = z.object({
   title: z.string().optional(),
   handle: z.string().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })

packages/medusa/src/api/admin/currencies/validators.ts

@@ -1,5 +1,5 @@
-import { createFindParams, createSelectParams } from "../../utils/validators"
 import { z } from "zod"
+import { createFindParams, createSelectParams } from "../../utils/validators"
 
 export const AdminGetCurrencyParams = createSelectParams()
 

packages/medusa/src/api/admin/customer-groups/validators.ts

@@ -58,7 +58,7 @@ export type AdminCreateCustomerGroupType = z.infer<
 >
 export const AdminCreateCustomerGroup = z.object({
   name: z.string(),
-  metadata: z.record(z.any()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type AdminUpdateCustomerGroupType = z.infer<
@@ -66,5 +66,5 @@ export type AdminUpdateCustomerGroupType = z.infer<
 >
 export const AdminUpdateCustomerGroup = z.object({
   name: z.string(),
-  metadata: z.record(z.any()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })

packages/medusa/src/api/admin/customers/validators.ts

@@ -43,38 +43,38 @@ export const AdminCustomersParams = createFindParams({
 )
 
 export const AdminCreateCustomer = z.object({
-  email: z.string().email().optional(),
-  company_name: z.string().optional(),
-  first_name: z.string().optional(),
-  last_name: z.string().optional(),
-  phone: z.string().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  email: z.string().email().nullish(),
+  company_name: z.string().nullish(),
+  first_name: z.string().nullish(),
+  last_name: z.string().nullish(),
+  phone: z.string().nullish(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export const AdminUpdateCustomer = z.object({
-  email: z.string().email().nullable().optional(),
-  company_name: z.string().nullable().optional(),
-  first_name: z.string().nullable().optional(),
-  last_name: z.string().nullable().optional(),
-  phone: z.string().nullable().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  email: z.string().email().nullish(),
+  company_name: z.string().nullish(),
+  first_name: z.string().nullish(),
+  last_name: z.string().nullish(),
+  phone: z.string().nullish(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export const AdminCreateCustomerAddress = z.object({
-  address_name: z.string().optional(),
+  address_name: z.string().nullish(),
   is_default_shipping: z.boolean().optional(),
   is_default_billing: z.boolean().optional(),
-  company: z.string().optional(),
-  first_name: z.string().optional(),
-  last_name: z.string().optional(),
-  address_1: z.string().optional(),
-  address_2: z.string().optional(),
-  city: z.string().optional(),
-  country_code: z.string().optional(),
-  province: z.string().optional(),
-  postal_code: z.string().optional(),
-  phone: z.string().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  company: z.string().nullish(),
+  first_name: z.string().nullish(),
+  last_name: z.string().nullish(),
+  address_1: z.string().nullish(),
+  address_2: z.string().nullish(),
+  city: z.string().nullish(),
+  country_code: z.string().nullish(),
+  province: z.string().nullish(),
+  postal_code: z.string().nullish(),
+  phone: z.string().nullish(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export const AdminUpdateCustomerAddress = AdminCreateCustomerAddress

packages/medusa/src/api/admin/draft-orders/validators.ts

@@ -1,6 +1,6 @@
-import { createFindParams, createSelectParams } from "../../utils/validators"
-import { AddressPayload, BigNumberInput } from "../../utils/common-validators"
 import { z } from "zod"
+import { AddressPayload, BigNumberInput } from "../../utils/common-validators"
+import { createFindParams, createSelectParams } from "../../utils/validators"
 
 export type AdminGetOrderParamsType = z.infer<typeof AdminGetOrderParams>
 export const AdminGetOrderParams = createSelectParams()
@@ -23,8 +23,8 @@ enum Status {
 }
 
 const ShippingMethod = z.object({
-  shipping_method_id: z.string().optional(),
-  order_id: z.string().optional(),
+  shipping_method_id: z.string().nullish(),
+  order_id: z.string().nullish(),
   name: z.string(),
   option_id: z.string(),
   data: z.record(z.string(), z.unknown()).optional(),
@@ -33,13 +33,13 @@ const ShippingMethod = z.object({
 
 const Item = z
   .object({
-    title: z.string().optional(),
-    sku: z.string().optional(),
-    barcode: z.string().optional(),
-    variant_id: z.string().optional(),
-    unit_price: BigNumberInput.optional(),
+    title: z.string().nullish(),
+    sku: z.string().nullish(),
+    barcode: z.string().nullish(),
+    variant_id: z.string().nullish(),
+    unit_price: BigNumberInput.nullish(),
     quantity: z.number(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .refine((data) => {
     if (!data.variant_id) {
@@ -53,18 +53,18 @@ export type AdminCreateDraftOrderType = z.infer<typeof AdminCreateDraftOrder>
 export const AdminCreateDraftOrder = z
   .object({
     status: z.nativeEnum(Status).optional(),
-    sales_channel_id: z.string().optional(),
-    email: z.string().optional(),
-    customer_id: z.string().optional(),
+    sales_channel_id: z.string().nullish(),
+    email: z.string().nullish(),
+    customer_id: z.string().nullish(),
     billing_address: AddressPayload.optional(),
     shipping_address: AddressPayload.optional(),
     items: z.array(Item).optional(),
     region_id: z.string(),
     promo_codes: z.array(z.string()).optional(),
-    currency_code: z.string().optional(),
+    currency_code: z.string().nullish(),
     no_notification_order: z.boolean().optional(),
     shipping_methods: z.array(ShippingMethod),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
   .refine(

packages/medusa/src/api/admin/fulfillment-sets/validators.ts

@@ -30,7 +30,7 @@ export const AdminCreateFulfillmentSetServiceZonesSchema = z
 
 export const AdminUpdateFulfillmentSetServiceZonesSchema = z
   .object({
-    name: z.string().optional(),
+    name: z.string().nullish(),
     geo_zones: z
       .array(
         z.union([

packages/medusa/src/api/admin/fulfillment-sets/validators/geo-zone.ts

@@ -2,7 +2,7 @@ import { z } from "zod"
 
 const geoZoneBaseSchema = z.object({
   country_code: z.string(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export const geoZoneCountrySchema = geoZoneBaseSchema.merge(

packages/medusa/src/api/admin/fulfillments/validators.ts

@@ -9,8 +9,8 @@ const AdminCreateFulfillmentItem = z.object({
   sku: z.string(),
   quantity: z.number(),
   barcode: z.string(),
-  line_item_id: z.string().optional(),
-  inventory_item_id: z.string().optional(),
+  line_item_id: z.string().nullish(),
+  inventory_item_id: z.string().nullish(),
 })
 
 const AdminCreateFulfillmentLabel = z.object({
@@ -32,13 +32,13 @@ export const AdminCreateFulfillment = z.object({
   labels: z.array(AdminCreateFulfillmentLabel),
   order: z.object({}),
   order_id: z.string(),
-  shipping_option_id: z.string().optional(),
-  data: z.record(z.unknown()).optional().nullable(),
-  packed_at: z.coerce.date().optional().nullable(),
-  shipped_at: z.coerce.date().optional().nullable(),
-  delivered_at: z.coerce.date().optional().nullable(),
-  canceled_at: z.coerce.date().optional().nullable(),
-  metadata: z.record(z.unknown()).optional().nullable(),
+  shipping_option_id: z.string().nullish(),
+  data: z.record(z.unknown()).nullable(),
+  packed_at: z.coerce.date().nullish(),
+  shipped_at: z.coerce.date().nullish(),
+  delivered_at: z.coerce.date().nullish(),
+  canceled_at: z.coerce.date().nullish(),
+  metadata: z.record(z.unknown()).nullable(),
 })
 
 export type AdminCreateShipmentType = z.infer<typeof AdminCreateShipment>

packages/medusa/src/api/admin/inventory-items/validators.ts

@@ -90,20 +90,20 @@ export type AdminCreateInventoryItemType = z.infer<
 >
 export const AdminCreateInventoryItem = z
   .object({
-    sku: z.string().optional(),
-    hs_code: z.string().optional(),
-    weight: z.number().optional(),
-    length: z.number().optional(),
-    height: z.number().optional(),
-    width: z.number().optional(),
-    origin_country: z.string().optional(),
-    mid_code: z.string().optional(),
-    material: z.string().optional(),
-    title: z.string().optional(),
-    description: z.string().optional(),
+    sku: z.string().nullish(),
+    hs_code: z.string().nullish(),
+    weight: z.number().nullish(),
+    length: z.number().nullish(),
+    height: z.number().nullish(),
+    width: z.number().nullish(),
+    origin_country: z.string().nullish(),
+    mid_code: z.string().nullish(),
+    material: z.string().nullish(),
+    title: z.string().nullish(),
+    description: z.string().nullish(),
     requires_shipping: z.boolean().optional(),
-    thumbnail: z.string().optional(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    thumbnail: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
     location_levels: z.array(AdminCreateInventoryLocationLevel).optional(),
   })
   .strict()
@@ -113,19 +113,19 @@ export type AdminUpdateInventoryItemType = z.infer<
 >
 export const AdminUpdateInventoryItem = z
   .object({
-    sku: z.string().optional(),
-    hs_code: z.string().optional(),
-    weight: z.number().optional(),
-    length: z.number().optional(),
-    height: z.number().optional(),
-    width: z.number().optional(),
-    origin_country: z.string().optional(),
-    mid_code: z.string().optional(),
-    material: z.string().optional(),
-    title: z.string().optional(),
-    description: z.string().optional(),
+    sku: z.string().nullish(),
+    hs_code: z.string().nullish(),
+    weight: z.number().nullish(),
+    length: z.number().nullish(),
+    height: z.number().nullish(),
+    width: z.number().nullish(),
+    origin_country: z.string().nullish(),
+    mid_code: z.string().nullish(),
+    material: z.string().nullish(),
+    title: z.string().nullish(),
+    description: z.string().nullish(),
     requires_shipping: z.boolean().optional(),
-    thumbnail: z.string().optional(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    thumbnail: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()

packages/medusa/src/api/admin/invites/validators.ts

@@ -44,8 +44,8 @@ export const AdminCreateInvite = z
 export type AdminInviteAcceptType = z.infer<typeof AdminInviteAccept>
 export const AdminInviteAccept = z
   .object({
-    email: z.string().optional(),
-    first_name: z.string().optional(),
-    last_name: z.string().optional(),
+    email: z.string().nullish(),
+    first_name: z.string().nullish(),
+    last_name: z.string().nullish(),
   })
   .strict()

packages/medusa/src/api/admin/orders/validators.ts

@@ -54,9 +54,9 @@ const Item = z.object({
 
 export const AdminOrderCreateFulfillment = z.object({
   items: z.array(Item),
-  location_id: z.string().optional(),
+  location_id: z.string().nullish(),
   no_notification: z.boolean().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type AdminOrderCreateFulfillmentType = z.infer<
@@ -73,7 +73,7 @@ export const AdminOrderCreateShipment = z.object({
   items: z.array(Item),
   labels: z.array(Label).optional(),
   no_notification: z.boolean().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type AdminOrderCreateShipmentType = z.infer<

packages/medusa/src/api/admin/price-lists/validators.ts

@@ -29,8 +29,8 @@ export const AdminCreatePriceListPrice = z.object({
   currency_code: z.string(),
   amount: z.number(),
   variant_id: z.string(),
-  min_quantity: z.number().optional(),
-  max_quantity: z.number().optional(),
+  min_quantity: z.number().nullish(),
+  max_quantity: z.number().nullish(),
   rules: z.record(z.string(), z.string()).optional(),
 })
 
@@ -43,8 +43,8 @@ export const AdminUpdatePriceListPrice = z.object({
   currency_code: z.string().optional(),
   amount: z.number().optional(),
   variant_id: z.string(),
-  min_quantity: z.number().optional(),
-  max_quantity: z.number().optional(),
+  min_quantity: z.number().nullish(),
+  max_quantity: z.number().nullish(),
   rules: z.record(z.string(), z.string()).optional(),
 })
 
@@ -55,8 +55,8 @@ export type AdminUpdatePriceListPriceType = z.infer<
 export const AdminCreatePriceList = z.object({
   title: z.string(),
   description: z.string(),
-  starts_at: z.union([z.string(), z.null()]).optional(),
-  ends_at: z.union([z.string(), z.null()]).optional(),
+  starts_at: z.union([z.string(), z.null()]).nullish(),
+  ends_at: z.union([z.string(), z.null()]).nullish(),
   status: z.nativeEnum(PriceListStatus).optional(),
   type: z.nativeEnum(PriceListType).optional(),
   rules: z.record(z.string(), z.array(z.string())).optional(),
@@ -67,9 +67,9 @@ export type AdminCreatePriceListType = z.infer<typeof AdminCreatePriceList>
 
 export const AdminUpdatePriceList = z.object({
   title: z.string().optional(),
-  description: z.string().optional(),
-  starts_at: z.string().optional().nullable(),
-  ends_at: z.string().optional().nullable(),
+  description: z.string().nullish(),
+  starts_at: z.string().nullish(),
+  ends_at: z.string().nullish(),
   status: z.nativeEnum(PriceListStatus).optional(),
   type: z.nativeEnum(PriceListType).optional(),
   rules: z.record(z.string(), z.array(z.string())).optional(),

packages/medusa/src/api/admin/pricing/validators.ts

@@ -1,5 +1,5 @@
-import { createFindParams, createSelectParams } from "../../utils/validators"
 import { z } from "zod"
+import { createFindParams, createSelectParams } from "../../utils/validators"
 
 export type AdminGetPricingRuleTypeParamsType = z.infer<
   typeof AdminGetPricingRuleTypeParams

packages/medusa/src/api/admin/product-categories/validators.ts

@@ -48,8 +48,8 @@ export const AdminCreateProductCategory = z
     handle: z.string().optional(),
     is_internal: z.boolean().optional(),
     is_active: z.boolean().optional(),
-    parent_category_id: z.string().optional(),
-    metadata: z.record(z.unknown()).optional(),
+    parent_category_id: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
     rank: z.number().nonnegative().optional(),
   })
   .strict()
@@ -65,8 +65,8 @@ export const AdminUpdateProductCategory = z
     handle: z.string().optional(),
     is_internal: z.boolean().optional(),
     is_active: z.boolean().optional(),
-    parent_category_id: z.string().nullable().optional(),
-    metadata: z.record(z.unknown()).optional(),
+    parent_category_id: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
     rank: z.number().nonnegative().optional(),
   })
   .strict()

packages/medusa/src/api/admin/product-tags/validators.ts

@@ -33,7 +33,7 @@ export type AdminCreateProductTagType = z.infer<typeof AdminCreateProductTag>
 export const AdminCreateProductTag = z
   .object({
     value: z.string(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
 
@@ -41,6 +41,6 @@ export type AdminUpdateProductTagType = z.infer<typeof AdminUpdateProductTag>
 export const AdminUpdateProductTag = z
   .object({
     value: z.string().optional(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()

packages/medusa/src/api/admin/product-types/validators.ts

@@ -22,7 +22,7 @@ export const AdminGetProductTypesParams = createFindParams({
     id: z.union([z.string(), z.array(z.string())]).optional(),
     value: z.union([z.string(), z.array(z.string())]).optional(),
     // TODO: To be added in next iteration
-    // discount_condition_id: z.string().optional(),
+    // discount_condition_id: z.string().nullish(),
     created_at: createOperatorMap().optional(),
     updated_at: createOperatorMap().optional(),
     deleted_at: createOperatorMap().optional(),
@@ -35,7 +35,7 @@ export type AdminCreateProductTypeType = z.infer<typeof AdminCreateProductType>
 export const AdminCreateProductType = z
   .object({
     value: z.string(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
 
@@ -43,6 +43,6 @@ export type AdminUpdateProductTypeType = z.infer<typeof AdminUpdateProductType>
 export const AdminUpdateProductType = z
   .object({
     value: z.string().optional(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()

packages/medusa/src/api/admin/products/validators.ts

@@ -71,7 +71,7 @@ export const AdminGetProductOptionsParams = createFindParams({
 
 export type AdminCreateProductTagType = z.infer<typeof AdminCreateProductTag>
 export const AdminCreateProductTag = z.object({
-  value: z.string().optional(),
+  value: z.string(),
 })
 
 export type AdminUpdateProductTagType = z.infer<typeof AdminUpdateProductTag>
@@ -104,8 +104,8 @@ export type AdminCreateVariantPriceType = z.infer<
 export const AdminCreateVariantPrice = z.object({
   currency_code: z.string(),
   amount: z.number(),
-  min_quantity: z.number().optional(),
-  max_quantity: z.number().optional(),
+  min_quantity: z.number().nullish(),
+  max_quantity: z.number().nullish(),
 })
 
 // TODO: Add support for rules
@@ -116,8 +116,8 @@ export const AdminUpdateVariantPrice = z.object({
   id: z.string().optional(),
   currency_code: z.string().optional(),
   amount: z.number().optional(),
-  min_quantity: z.number().optional(),
-  max_quantity: z.number().optional(),
+  min_quantity: z.number().nullish(),
+  max_quantity: z.number().nullish(),
 })
 
 export type AdminCreateProductTypeType = z.infer<typeof AdminCreateProductType>
@@ -131,22 +131,22 @@ export type AdminCreateProductVariantType = z.infer<
 export const AdminCreateProductVariant = z
   .object({
     title: z.string(),
-    sku: z.string().nullable().optional(),
-    ean: z.string().nullable().optional(),
-    upc: z.string().nullable().optional(),
-    barcode: z.string().nullable().optional(),
-    hs_code: z.string().nullable().optional(),
-    mid_code: z.string().nullable().optional(),
+    sku: z.string().nullish(),
+    ean: z.string().nullish(),
+    upc: z.string().nullish(),
+    barcode: z.string().nullish(),
+    hs_code: z.string().nullish(),
+    mid_code: z.string().nullish(),
     allow_backorder: z.boolean().optional().default(false),
     manage_inventory: z.boolean().optional().default(true),
     variant_rank: z.number().optional(),
-    weight: z.number().nullable().optional(),
-    length: z.number().nullable().optional(),
-    height: z.number().nullable().optional(),
-    width: z.number().nullable().optional(),
-    origin_country: z.string().nullable().optional(),
-    material: z.string().nullable().optional(),
-    metadata: z.record(z.unknown()).optional(),
+    weight: z.number().nullish(),
+    length: z.number().nullish(),
+    height: z.number().nullish(),
+    width: z.number().nullish(),
+    origin_country: z.string().nullish(),
+    material: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
     prices: z.array(AdminCreateVariantPrice),
     options: z.record(z.string()).optional(),
     inventory_items: z
@@ -168,22 +168,22 @@ export const AdminUpdateProductVariant = z
     id: z.string().optional(),
     title: z.string().optional(),
     prices: z.array(AdminUpdateVariantPrice).optional(),
-    sku: z.string().nullable().optional().nullable(),
-    ean: z.string().nullable().optional().nullable(),
-    upc: z.string().nullable().optional().nullable(),
-    barcode: z.string().nullable().optional().nullable(),
-    hs_code: z.string().nullable().optional().nullable(),
-    mid_code: z.string().nullable().optional().nullable(),
+    sku: z.string().nullish(),
+    ean: z.string().nullish(),
+    upc: z.string().nullish(),
+    barcode: z.string().nullish(),
+    hs_code: z.string().nullish(),
+    mid_code: z.string().nullish(),
     allow_backorder: z.boolean().optional(),
     manage_inventory: z.boolean().optional(),
     variant_rank: z.number().optional(),
-    weight: z.number().nullable().optional().nullable(),
-    length: z.number().nullable().optional().nullable(),
-    height: z.number().nullable().optional().nullable(),
-    width: z.number().nullable().optional().nullable(),
-    origin_country: z.string().nullable().optional().nullable(),
-    material: z.string().nullable().optional().nullable(),
-    metadata: z.record(z.unknown()).optional().nullable(),
+    weight: z.number().nullish(),
+    length: z.number().nullish(),
+    height: z.number().nullish(),
+    width: z.number().nullish(),
+    origin_country: z.string().nullish(),
+    material: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
     options: z.record(z.string()).optional(),
   })
   .strict()
@@ -203,30 +203,30 @@ export type AdminCreateProductType = z.infer<typeof AdminCreateProduct>
 export const AdminCreateProduct = z
   .object({
     title: z.string(),
-    subtitle: z.string().nullable().optional(),
-    description: z.string().nullable().optional(),
+    subtitle: z.string().nullish(),
+    description: z.string().nullish(),
     is_giftcard: z.boolean().optional().default(false),
     discountable: z.boolean().optional().default(true),
     images: z.array(z.object({ url: z.string() })).optional(),
-    thumbnail: z.string().optional(),
+    thumbnail: z.string().nullish(),
     handle: z.string().optional(),
-    status: statusEnum.optional().default(ProductStatus.DRAFT),
-    type_id: z.string().optional(),
-    collection_id: z.string().optional(),
+    status: statusEnum.nullish().default(ProductStatus.DRAFT),
+    type_id: z.string().nullish(),
+    collection_id: z.string().nullish(),
     categories: z.array(AdminCreateProductProductCategory).optional(),
     tags: z.array(AdminUpdateProductTag).optional(),
     options: z.array(AdminCreateProductOption).optional(),
     variants: z.array(AdminCreateProductVariant).optional(),
     sales_channels: z.array(z.object({ id: z.string() })).optional(),
-    weight: z.number().optional(),
-    length: z.number().optional(),
-    height: z.number().optional(),
-    width: z.number().optional(),
-    hs_code: z.string().optional(),
-    mid_code: z.string().optional(),
-    origin_country: z.string().optional(),
-    material: z.string().optional(),
-    metadata: z.record(z.unknown()).optional(),
+    weight: z.number().nullish(),
+    length: z.number().nullish(),
+    height: z.number().nullish(),
+    width: z.number().nullish(),
+    hs_code: z.string().nullish(),
+    mid_code: z.string().nullish(),
+    origin_country: z.string().nullish(),
+    material: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
 
@@ -239,25 +239,25 @@ export const AdminUpdateProduct = z
     options: z.array(AdminUpdateProductOption).optional(),
     variants: z.array(AdminUpdateProductVariant).optional(),
     status: statusEnum.optional(),
-    subtitle: z.string().optional().nullable(),
-    description: z.string().optional().nullable(),
+    subtitle: z.string().nullish(),
+    description: z.string().nullish(),
     images: z.array(z.object({ url: z.string() })).optional(),
-    thumbnail: z.string().optional().nullable(),
-    handle: z.string().optional(),
-    type_id: z.string().optional().nullable(),
-    collection_id: z.string().optional().nullable(),
+    thumbnail: z.string().nullish(),
+    handle: z.string().nullish(),
+    type_id: z.string().nullish(),
+    collection_id: z.string().nullish(),
     categories: z.array(AdminCreateProductProductCategory).optional(),
-    tags: z.array(AdminUpdateProductTag).nullable().optional(),
+    tags: z.array(AdminUpdateProductTag).optional(),
     sales_channels: z.array(z.object({ id: z.string() })).optional(),
-    weight: z.number().optional().nullable(),
-    length: z.number().optional().nullable(),
-    height: z.number().optional().nullable(),
-    width: z.number().optional().nullable(),
-    hs_code: z.string().optional().nullable(),
-    mid_code: z.string().optional().nullable(),
-    origin_country: z.string().optional().nullable(),
-    material: z.string().optional().nullable(),
-    metadata: z.record(z.unknown()).optional().nullable(),
+    weight: z.number().nullish(),
+    length: z.number().nullish(),
+    height: z.number().nullish(),
+    width: z.number().nullish(),
+    hs_code: z.string().nullish(),
+    mid_code: z.string().nullish(),
+    origin_country: z.string().nullish(),
+    material: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
 

packages/medusa/src/api/admin/promotions/validators.ts

@@ -81,7 +81,7 @@ export type AdminCreatePromotionRuleType = z.infer<
 export const AdminCreatePromotionRule = z
   .object({
     operator: z.nativeEnum(PromotionRuleOperator),
-    description: z.string().optional(),
+    description: z.string().nullish(),
     attribute: z.string(),
     values: z.union([z.string(), z.array(z.string())]),
   })
@@ -94,7 +94,7 @@ export const AdminUpdatePromotionRule = z
   .object({
     id: z.string(),
     operator: z.nativeEnum(PromotionRuleOperator).optional(),
-    description: z.string().optional(),
+    description: z.string().nullish(),
     attribute: z.string().optional(),
     values: z.union([z.string(), z.array(z.string())]),
   })
@@ -105,17 +105,17 @@ export type AdminCreateApplicationMethodType = z.infer<
 >
 export const AdminCreateApplicationMethod = z
   .object({
-    description: z.string().optional(),
+    description: z.string().nullish(),
     value: z.number(),
-    currency_code: z.string().optional().nullable(),
-    max_quantity: z.number().optional().nullable(),
+    currency_code: z.string().nullish(),
+    max_quantity: z.number().nullish(),
     type: z.nativeEnum(ApplicationMethodType),
     target_type: z.nativeEnum(ApplicationMethodTargetType),
     allocation: z.nativeEnum(ApplicationMethodAllocation).optional(),
     target_rules: z.array(AdminCreatePromotionRule).optional(),
     buy_rules: z.array(AdminCreatePromotionRule).optional(),
-    apply_to_quantity: z.number().optional(),
-    buy_rules_min_quantity: z.number().optional(),
+    apply_to_quantity: z.number().nullish(),
+    buy_rules_min_quantity: z.number().nullish(),
   })
   .strict()
 
@@ -124,17 +124,17 @@ export type AdminUpdateApplicationMethodType = z.infer<
 >
 export const AdminUpdateApplicationMethod = z
   .object({
-    description: z.string().optional(),
+    description: z.string().nullish(),
     value: z.number().optional(),
-    max_quantity: z.number().optional().nullable(),
-    currency_code: z.string().optional().nullable(),
+    max_quantity: z.number().nullish(),
+    currency_code: z.string().nullish(),
     type: z.nativeEnum(ApplicationMethodType).optional(),
     target_type: z.nativeEnum(ApplicationMethodTargetType).optional(),
     allocation: z.nativeEnum(ApplicationMethodAllocation).optional(),
     target_rules: z.array(AdminCreatePromotionRule).optional(),
     buy_rules: z.array(AdminCreatePromotionRule).optional(),
-    apply_to_quantity: z.number().optional(),
-    buy_rules_min_quantity: z.number().optional(),
+    apply_to_quantity: z.number().nullish(),
+    buy_rules_min_quantity: z.number().nullish(),
   })
   .strict()
 
@@ -161,7 +161,7 @@ export const AdminCreatePromotion = z
     code: z.string(),
     is_automatic: z.boolean().optional(),
     type: z.nativeEnum(PromotionType),
-    campaign_id: z.string().optional().nullable(),
+    campaign_id: z.string().nullish(),
     campaign: AdminCreateCampaign.optional(),
     application_method: AdminCreateApplicationMethod,
     rules: z.array(AdminCreatePromotionRule).optional(),
@@ -179,7 +179,7 @@ export const AdminUpdatePromotion = z
     code: z.string().optional(),
     is_automatic: z.boolean().optional(),
     type: z.nativeEnum(PromotionType).optional(),
-    campaign_id: z.string().optional().nullable(),
+    campaign_id: z.string().nullish(),
     campaign: AdminCreateCampaign.optional(),
     application_method: AdminUpdateApplicationMethod.optional(),
     rules: z.array(AdminCreatePromotionRule).optional(),

packages/medusa/src/api/admin/regions/validators.ts

@@ -34,7 +34,7 @@ export const AdminCreateRegion = z
     countries: z.array(z.string()).optional(),
     automatic_taxes: z.boolean().optional(),
     payment_providers: z.array(z.string()).optional(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
 
@@ -46,6 +46,6 @@ export const AdminUpdateRegion = z
     countries: z.array(z.string()).optional(),
     automatic_taxes: z.boolean().optional(),
     payment_providers: z.array(z.string()).optional(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()

packages/medusa/src/api/admin/reservations/validators.ts

@@ -1,9 +1,9 @@
+import { z } from "zod"
 import {
   createFindParams,
   createOperatorMap,
   createSelectParams,
 } from "../../utils/validators"
-import { z } from "zod"
 
 export type AdminGetReservationParamsType = z.infer<
   typeof AdminGetReservationParams
@@ -33,12 +33,12 @@ export const AdminGetReservationsParams = createFindParams({
 export type AdminCreateReservationType = z.infer<typeof AdminCreateReservation>
 export const AdminCreateReservation = z
   .object({
-    line_item_id: z.string().optional(),
+    line_item_id: z.string().nullish(),
     location_id: z.string(),
     inventory_item_id: z.string(),
     quantity: z.number(),
-    description: z.string().optional(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    description: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
 
@@ -47,7 +47,7 @@ export const AdminUpdateReservation = z
   .object({
     location_id: z.string().optional(),
     quantity: z.number().optional(),
-    description: z.string().optional(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    description: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()

packages/medusa/src/api/admin/return-reasons/validators.ts

@@ -52,9 +52,9 @@ export type AdminGetReturnReasonsParamsType = z.infer<
 export const AdminCreateReturnReason = z.object({
   value: z.string(),
   label: z.string(),
-  descripton: z.string().optional(),
-  parent_return_reason_id: z.string().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  descripton: z.string().nullish(),
+  parent_return_reason_id: z.string().nullish(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 export type AdminCreateReturnReasonType = z.infer<
   typeof AdminCreateReturnReason
@@ -63,8 +63,8 @@ export type AdminCreateReturnReasonType = z.infer<
 export const AdminUpdateReturnReason = z.object({
   value: z.string(),
   label: z.string(),
-  descripton: z.string().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  descripton: z.string().nullish(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 export type AdminUpdateReturnReasonType = z.infer<
   typeof AdminUpdateReturnReason

packages/medusa/src/api/admin/returns/validators.ts

@@ -45,18 +45,18 @@ const ReturnShippingSchema = z.object({
 const ItemSchema = z.object({
   id: z.string(),
   quantity: z.number().min(1),
-  reason_id: z.string().optional(),
-  note: z.string().optional(),
+  reason_id: z.string().nullish(),
+  note: z.string().nullish(),
 })
 
 export const AdminPostReturnsReqSchema = z.object({
   order_id: z.string(),
   items: z.array(ItemSchema),
   return_shipping: ReturnShippingSchema,
-  note: z.string().optional(),
+  note: z.string().nullish(),
   receive_now: z.boolean().optional(),
   refund_amount: z.number().optional(),
-  location_id: z.string().optional(),
+  location_id: z.string().nullish(),
 })
 export type AdminPostReturnsReqSchemaType = z.infer<
   typeof AdminPostReturnsReqSchema

packages/medusa/src/api/admin/sales-channels/validators.ts

@@ -39,9 +39,9 @@ export type AdminCreateSalesChannelType = z.infer<
 >
 export const AdminCreateSalesChannel = z.object({
   name: z.string(),
-  description: z.string().optional(),
+  description: z.string().nullish(),
   is_disabled: z.boolean().optional(),
-  metadata: z.record(z.string(), z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type AdminUpdateSalesChannelType = z.infer<
@@ -49,7 +49,7 @@ export type AdminUpdateSalesChannelType = z.infer<
 >
 export const AdminUpdateSalesChannel = z.object({
   name: z.string().optional(),
-  description: z.string().nullable().optional(),
+  description: z.string().nullish(),
   is_disabled: z.boolean().optional(),
-  metadata: z.record(z.string(), z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })

packages/medusa/src/api/admin/shipping-profiles/validators.ts

@@ -37,7 +37,7 @@ export const AdminCreateShippingProfile = z
   .object({
     name: z.string(),
     type: z.string(),
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
 
@@ -48,6 +48,6 @@ export const AdminUpdateShippingProfile = z
   .object({
     name: z.string().optional(),
     type: z.string().optional(),
-    metadata: z.record(z.string(), z.unknown()).optional().nullable(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()

packages/medusa/src/api/admin/stock-locations/validators.ts

@@ -36,13 +36,13 @@ export type AdminUpsertStockLocationAddressType = z.infer<
 >
 export const AdminUpsertStockLocationAddress = z.object({
   address_1: z.string(),
-  address_2: z.string().optional(),
-  company: z.string().optional(),
-  city: z.string().optional(),
+  address_2: z.string().nullish(),
+  company: z.string().nullish(),
+  city: z.string().nullish(),
   country_code: z.string(),
-  phone: z.string().optional(),
-  postal_code: z.string().optional(),
-  province: z.string().optional(),
+  phone: z.string().nullish(),
+  postal_code: z.string().nullish(),
+  province: z.string().nullish(),
 })
 
 export type AdminCreateStockLocationType = z.infer<
@@ -51,8 +51,8 @@ export type AdminCreateStockLocationType = z.infer<
 export const AdminCreateStockLocation = z.object({
   name: z.preprocess((val: any) => val.trim(), z.string()),
   address: AdminUpsertStockLocationAddress.optional(),
-  address_id: z.string().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  address_id: z.string().nullish(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type AdminUpdateStockLocationType = z.infer<
@@ -63,8 +63,8 @@ export const AdminUpdateStockLocation = z.object({
     .preprocess((val: any) => val.trim(), z.string().optional())
     .optional(),
   address: AdminUpsertStockLocationAddress.optional(),
-  address_id: z.string().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  address_id: z.string().nullish(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type AdminCreateStockLocationFulfillmentSetType = z.infer<

packages/medusa/src/api/admin/stores/validators.ts

@@ -1,5 +1,5 @@
-import { createFindParams, createSelectParams } from "../../utils/validators"
 import { z } from "zod"
+import { createFindParams, createSelectParams } from "../../utils/validators"
 
 export type AdminGetStoreParamsType = z.infer<typeof AdminGetStoreParams>
 export const AdminGetStoreParams = createSelectParams()
@@ -20,11 +20,11 @@ export const AdminGetStoresParams = createFindParams({
 
 export type AdminUpdateStoreType = z.infer<typeof AdminUpdateStore>
 export const AdminUpdateStore = z.object({
-  name: z.string().optional(),
+  name: z.string().nullish(),
   supported_currency_codes: z.array(z.string()).optional(),
-  default_currency_code: z.string().optional(),
-  default_sales_channel_id: z.string().optional(),
-  default_region_id: z.string().optional(),
-  default_location_id: z.string().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  default_currency_code: z.string().nullish(),
+  default_sales_channel_id: z.string().nullish(),
+  default_region_id: z.string().nullish(),
+  default_location_id: z.string().nullish(),
+  metadata: z.record(z.unknown()).nullish(),
 })

packages/medusa/src/api/admin/tax-rates/validators.ts

@@ -42,7 +42,7 @@ export const AdminCreateTaxRate = z.object({
   is_default: z.boolean().optional(),
   is_combinable: z.boolean().optional(),
   tax_region_id: z.string(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type AdminUpdateTaxRateType = z.infer<typeof AdminUpdateTaxRate>
@@ -53,5 +53,5 @@ export const AdminUpdateTaxRate = z.object({
   name: z.string().optional(),
   is_default: z.boolean().optional(),
   is_combinable: z.boolean().optional(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })

packages/medusa/src/api/admin/tax-regions/validators.ts

@@ -41,8 +41,8 @@ export const AdminGetTaxRegionsParams = createFindParams({
 export type AdminCreateTaxRegionType = z.infer<typeof AdminCreateTaxRegion>
 export const AdminCreateTaxRegion = z.object({
   country_code: z.string(),
-  province_code: z.string().optional(),
-  parent_id: z.string().optional(),
+  province_code: z.string().nullish(),
+  parent_id: z.string().nullish(),
   default_tax_rate: z
     .object({
       rate: z.number().optional(),
@@ -51,8 +51,8 @@ export const AdminCreateTaxRegion = z.object({
       is_combinable: z
         .union([z.literal("true"), z.literal("false")])
         .optional(),
-      metadata: z.record(z.unknown()).optional(),
+      metadata: z.record(z.unknown()).nullish(),
     })
     .optional(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })

packages/medusa/src/api/admin/users/validators.ts

@@ -1,9 +1,9 @@
+import { z } from "zod"
 import {
   createFindParams,
   createOperatorMap,
   createSelectParams,
 } from "../../utils/validators"
-import { z } from "zod"
 
 export const AdminGetUserParams = createSelectParams()
 
@@ -18,23 +18,23 @@ export const AdminGetUsersParams = createFindParams({
     created_at: createOperatorMap().optional(),
     updated_at: createOperatorMap().optional(),
     deleted_at: createOperatorMap().optional(),
-    email: z.string().optional(),
-    first_name: z.string().optional(),
-    last_name: z.string().optional(),
+    email: z.string().nullish(),
+    first_name: z.string().nullish(),
+    last_name: z.string().nullish(),
   })
 )
 
 export type AdminCreateUserType = z.infer<typeof AdminCreateUser>
 export const AdminCreateUser = z.object({
   email: z.string(),
-  first_name: z.string().optional(),
-  last_name: z.string().optional(),
-  avatar_url: z.string().optional(),
+  first_name: z.string().nullish(),
+  last_name: z.string().nullish(),
+  avatar_url: z.string().nullish(),
 })
 
 export type AdminUpdateUserType = z.infer<typeof AdminUpdateUser>
 export const AdminUpdateUser = z.object({
-  first_name: z.string().optional(),
-  last_name: z.string().optional(),
-  avatar_url: z.string().optional(),
+  first_name: z.string().nullish(),
+  last_name: z.string().nullish(),
+  avatar_url: z.string().nullish(),
 })

packages/medusa/src/api/admin/workflows-executions/validators.ts

@@ -1,6 +1,6 @@
 import { TransactionHandlerType } from "@medusajs/utils"
-import { createFindParams, createSelectParams } from "../../utils/validators"
 import { z } from "zod"
+import { createFindParams, createSelectParams } from "../../utils/validators"
 
 export type AdminGetWorkflowExecutionDetailsParamsType = z.infer<
   typeof AdminGetWorkflowExecutionDetailsParams

packages/medusa/src/api/store/carts/validators.ts

@@ -8,20 +8,20 @@ export const StoreGetCartsCart = createSelectParams()
 const ItemSchema = z.object({
   variant_id: z.string(),
   quantity: z.number(),
-  metadata: z.record(z.unknown()).optional().nullable(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type StoreCreateCartType = z.infer<typeof StoreCreateCart>
 export const StoreCreateCart = z
   .object({
-    region_id: z.string().optional().nullable(),
+    region_id: z.string().nullish(),
     shipping_address: z.union([AddressPayload, z.string()]).optional(),
     billing_address: z.union([AddressPayload, z.string()]).optional(),
-    email: z.string().email().optional().nullable(),
-    currency_code: z.string().optional(),
+    email: z.string().email().nullish(),
+    currency_code: z.string().nullish(),
     items: z.array(ItemSchema).optional(),
-    sales_channel_id: z.string().optional().nullable(),
-    metadata: z.record(z.unknown()).optional().nullable(),
+    sales_channel_id: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
 
@@ -44,12 +44,12 @@ export const StoreRemoveCartPromotions = z
 export type StoreUpdateCartType = z.infer<typeof StoreUpdateCart>
 export const StoreUpdateCart = z
   .object({
-    region_id: z.string().optional().nullable(),
-    email: z.string().email().optional().nullable(),
+    region_id: z.string().nullish(),
+    email: z.string().email().nullish(),
     billing_address: z.union([AddressPayload, z.string()]).optional(),
     shipping_address: z.union([AddressPayload, z.string()]).optional(),
-    sales_channel_id: z.string().optional().nullable(),
-    metadata: z.record(z.unknown()).optional().nullable(),
+    sales_channel_id: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
     promo_codes: z.array(z.string()).optional(),
   })
   .strict()
@@ -63,7 +63,7 @@ export type StoreAddCartLineItemType = z.infer<typeof StoreAddCartLineItem>
 export const StoreAddCartLineItem = z.object({
   variant_id: z.string(),
   quantity: z.number(),
-  metadata: z.record(z.unknown()).optional().nullable(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type StoreUpdateCartLineItemType = z.infer<
@@ -71,7 +71,7 @@ export type StoreUpdateCartLineItemType = z.infer<
 >
 export const StoreUpdateCartLineItem = z.object({
   quantity: z.number(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.unknown()).nullish(),
 })
 
 export type StoreAddCartShippingMethodsType = z.infer<

packages/medusa/src/api/store/collections/validators.ts

@@ -1,9 +1,9 @@
+import { z } from "zod"
 import {
   createFindParams,
   createOperatorMap,
   createSelectParams,
 } from "../../utils/validators"
-import { z } from "zod"
 
 export const StoreGetCollectionParams = createSelectParams()
 

packages/medusa/src/api/store/currencies/validators.ts

@@ -1,5 +1,5 @@
-import { createFindParams, createSelectParams } from "../../utils/validators"
 import { z } from "zod"
+import { createFindParams, createSelectParams } from "../../utils/validators"
 
 export const StoreGetCurrencyParams = createSelectParams()
 

packages/medusa/src/api/store/customers/validators.ts

@@ -1,29 +1,29 @@
-import { createFindParams, createSelectParams } from "../../utils/validators"
 import { z } from "zod"
 import { AddressPayload } from "../../utils/common-validators"
+import { createFindParams, createSelectParams } from "../../utils/validators"
 
 export const StoreGetCustomerParams = createSelectParams()
 
 export const StoreCreateCustomer = z.object({
-  email: z.string().email().optional(),
-  company_name: z.string().optional(),
-  first_name: z.string().optional(),
-  last_name: z.string().optional(),
-  phone: z.string().optional(),
+  email: z.string().email().nullish(),
+  company_name: z.string().nullish(),
+  first_name: z.string().nullish(),
+  last_name: z.string().nullish(),
+  phone: z.string().nullish(),
 })
 
 export const StoreUpdateCustomer = z.object({
-  company_name: z.string().nullable().optional(),
-  first_name: z.string().nullable().optional(),
-  last_name: z.string().nullable().optional(),
-  phone: z.string().nullable().optional(),
+  company_name: z.string().nullish(),
+  first_name: z.string().nullish(),
+  last_name: z.string().nullish(),
+  phone: z.string().nullish(),
 })
 
 export const StoreGetCustomerAddressParams = createSelectParams()
 
 export const StoreCreateCustomerAddress = AddressPayload.merge(
   z.object({
-    address_name: z.string().optional(),
+    address_name: z.string().nullish(),
     is_default_shipping: z.boolean().optional(),
     is_default_billing: z.boolean().optional(),
   })

packages/medusa/src/api/store/product-categories/validators.ts

@@ -1,10 +1,10 @@
 import { z } from "zod"
+import { OptionalBooleanValidator } from "../../utils/common-validators"
 import {
   createFindParams,
   createOperatorMap,
   createSelectParams,
 } from "../../utils/validators"
-import { OptionalBooleanValidator } from "../../utils/common-validators"
 
 export type StoreProductCategoryParamsType = z.infer<
   typeof StoreProductCategoryParams

packages/medusa/src/api/store/regions/validators.ts

@@ -1,5 +1,5 @@
-import { createFindParams, createSelectParams } from "../../utils/validators"
 import { z } from "zod"
+import { createFindParams, createSelectParams } from "../../utils/validators"
 
 export type StoreGetRegionParamsType = z.infer<typeof StoreGetRegionParams>
 export const StoreGetRegionParams = createSelectParams()

packages/medusa/src/api/store/return/validators.ts

@@ -22,17 +22,17 @@ const ReturnShippingSchema = z.object({
 const ItemSchema = z.object({
   id: z.string(),
   quantity: z.number().min(1),
-  reason_id: z.string().optional(),
-  note: z.string().optional(),
+  reason_id: z.string().nullish(),
+  note: z.string().nullish(),
 })
 
 export const StorePostReturnsReqSchema = z.object({
   order_id: z.string(),
   items: z.array(ItemSchema),
   return_shipping: ReturnShippingSchema,
-  note: z.string().optional(),
+  note: z.string().nullish(),
   receive_now: z.boolean().optional(),
-  location_id: z.string().optional(),
+  location_id: z.string().nullish(),
 })
 export type StorePostReturnsReqSchemaType = z.infer<
   typeof StorePostReturnsReqSchema

packages/medusa/src/api/utils/common-validators/common.ts

@@ -2,17 +2,17 @@ import { z } from "zod"
 
 export const AddressPayload = z
   .object({
-    first_name: z.string().optional(),
-    last_name: z.string().optional(),
-    phone: z.string().optional(),
-    company: z.string().optional(),
-    address_1: z.string().optional(),
-    address_2: z.string().optional(),
-    city: z.string().optional(),
-    country_code: z.string().optional(),
-    province: z.string().optional(),
-    postal_code: z.string().optional(),
-    metadata: z.record(z.string()).optional().nullable(),
+    first_name: z.string().nullish(),
+    last_name: z.string().nullish(),
+    phone: z.string().nullish(),
+    company: z.string().nullish(),
+    address_1: z.string().nullish(),
+    address_2: z.string().nullish(),
+    city: z.string().nullish(),
+    country_code: z.string().nullish(),
+    province: z.string().nullish(),
+    postal_code: z.string().nullish(),
+    metadata: z.record(z.unknown()).nullish(),
   })
   .strict()
 

packages/medusa/src/api/utils/common-validators/products/index.ts

@@ -8,12 +8,12 @@ export const ProductStatusEnum = z.nativeEnum(ProductStatus)
 export const GetProductsParams = z.object({
   q: z.string().optional(),
   id: z.union([z.string(), z.array(z.string())]).optional(),
-  title: z.string().optional(),
-  handle: z.string().optional(),
+  title: z.string().nullish(),
+  handle: z.string().nullish(),
   is_giftcard: OptionalBooleanValidator,
-  category_id: z.string().array().optional(),
-  sales_channel_id: z.string().array().optional(),
-  collection_id: z.string().array().optional(),
+  category_id: z.string().array().nullish(),
+  sales_channel_id: z.string().array().nullish(),
+  collection_id: z.string().array().nullish(),
   tags: z.string().array().optional(),
   type_id: z.string().array().optional(),
   created_at: createOperatorMap().optional(),