feat(BUN-2245): types directory import no-cycle

apps/storefront/.eslintrc.json

@@ -8,8 +8,8 @@
         "src/components/**/*.{ts,tsx}",
         "src/hooks/dom/*.ts",
         "src/hooks/*.ts",
-        "src/shared/**/**/**/*.ts",
-        "src/types/*.ts"
+        "src/shared/**/**/**/*.ts"
+        // "src/types/*.ts"
       ],
       "rules": {
         "import/no-cycle": 0

apps/storefront/src/types/cart.ts

@@ -1,4 +1,4 @@
-import { OptionValueProps } from '@/utils/b3Product/shared/config'
+import { OptionValueProps } from './products'
 
 export interface LineItems {
   quantity: number

apps/storefront/src/types/common.ts

@@ -0,0 +1,49 @@
+export interface Modifiers {
+  config?: {
+    default_value?: string
+    text_characters_limited?: boolean
+    text_max_length?: number
+    text_min_length?: number
+    text_lines_limited?: boolean
+    text_max_lines?: number
+    date_earliest_value?: string
+    date_latest_value?: string
+    date_limit_mode?: string
+    date_limited?: boolean
+    number_highest_value?: number
+    number_integers_only?: boolean
+    number_limit_mode?: string
+    number_limited?: boolean
+    number_lowest_value?: number
+    checkbox_label?: string
+    checked_by_default?: boolean
+    file_max_size?: number
+    file_types_mode?: string
+    file_types_other?: string[]
+    file_types_supported?: string[]
+  }
+  display_name: string
+  id?: number | string
+  option_values: ModifiersOption[]
+  required: boolean
+  type: string
+  isVariantOption?: boolean
+}
+
+export interface ModifiersOption {
+  id: number
+  is_default: boolean
+  label: string
+  option_id: number
+  value_data?: {
+    colors?: string[]
+    product_id?: number
+  }
+}
+
+export interface ProductItemOption {
+  display_name: string
+  is_required: boolean
+  option_id: number
+  sort_order: number
+}

apps/storefront/src/types/index.ts

@@ -4,3 +4,4 @@ export * from './order'
 export * from './orderDetail'
 export * from './products'
 export * from './shoppingList'
+export * from './common'

apps/storefront/src/types/products.ts

@@ -1,7 +1,15 @@
-import {
-  ShoppingListProductItemModifiers,
-  ShoppingListProductItemOption,
-} from '@/types/shoppingList'
+import { Modifiers, ProductItemOption } from './common'
+
+interface DateProps {
+  day: string
+  month: string
+  year: string
+}
+
+export interface OptionValueProps {
+  optionId: string | number
+  optionValue: string | DateProps
+}
 
 export interface ProductOptionsItem {
   option_id: number
@@ -166,9 +174,9 @@ export interface Product {
   variants?: Partial<Variant>[]
   currencyCode: string
   imageUrl: string
-  modifiers: ShoppingListProductItemModifiers[]
-  options?: ShoppingListProductItemOption[]
-  optionsV3?: ShoppingListProductItemModifiers[]
+  modifiers: Modifiers[]
+  options?: ProductItemOption[]
+  optionsV3?: Modifiers[]
   allOptions?: Partial<AllOptionProps>[]
   productUrl: string
   quantity: number | string

apps/storefront/src/types/shoppingList.ts

@@ -1,3 +1,4 @@
+import { Modifiers, ProductItemOption } from './common'
 import { AllOptionProps, ProductItem, Variant } from './products'
 
 export interface ShoppingListItem {
@@ -18,56 +19,6 @@ export interface ShoppingListItem {
   totalTax: string
 }
 
-export interface ShoppingListProductItemOption {
-  display_name: string
-  is_required: boolean
-  option_id: number
-  sort_order: number
-}
-
-export interface ShoppingListProductItemModifiersOption {
-  id: number
-  is_default: boolean
-  label: string
-  option_id: number
-  value_data?: {
-    colors?: string[]
-    product_id?: number
-  }
-}
-
-export interface ShoppingListProductItemModifiers {
-  config?: {
-    default_value?: string
-    text_characters_limited?: boolean
-    text_max_length?: number
-    text_min_length?: number
-    text_lines_limited?: boolean
-    text_max_lines?: number
-    date_earliest_value?: string
-    date_latest_value?: string
-    date_limit_mode?: string
-    date_limited?: boolean
-    number_highest_value?: number
-    number_integers_only?: boolean
-    number_limit_mode?: string
-    number_limited?: boolean
-    number_lowest_value?: number
-    checkbox_label?: string
-    checked_by_default?: boolean
-    file_max_size?: number
-    file_types_mode?: string
-    file_types_other?: string[]
-    file_types_supported?: string[]
-  }
-  display_name: string
-  id?: number | string
-  option_values: ShoppingListProductItemModifiersOption[]
-  required: boolean
-  type: string
-  isVariantOption?: boolean
-}
-
 export interface ShoppingListProductItemVariantsOption {
   id?: number
   label: string
@@ -76,9 +27,9 @@ export interface ShoppingListProductItemVariantsOption {
 }
 
 export interface ShoppingListProductItem extends ProductItem {
-  options?: ShoppingListProductItemOption[]
-  optionsV3?: ShoppingListProductItemModifiers[]
-  modifiers?: ShoppingListProductItemModifiers[]
+  options?: ProductItemOption[]
+  optionsV3?: Modifiers[]
+  modifiers?: Modifiers[]
   costPrice?: string
   variants?: Variant[]
   allOptions?: Partial<AllOptionProps>[]

apps/storefront/src/utils/b3Product/b3Product.ts

@@ -14,14 +14,12 @@ import {
   BcCalculatedPrice,
   Calculateditems,
   CalculatedOptions,
+  Modifiers,
   OptionValue,
   Product,
-  Variant,
-} from '@/types/products'
-import {
   ShoppingListProductItem,
-  ShoppingListProductItemModifiers,
-} from '@/types/shoppingList'
+  Variant,
+} from '@/types'
 import {
   B3LStorage,
   B3SStorage,
@@ -892,8 +890,8 @@ const calculateProductListPrice = async (
       let allOptions: Partial<AllOptionProps>[] = []
       let variants: Partial<Variant>[] = []
       let variantId = 0
-      let modifiers: Partial<ShoppingListProductItemModifiers>[] = []
-      let optionsV3: Partial<ShoppingListProductItemModifiers>[] = []
+      let modifiers: Partial<Modifiers>[] = []
+      let optionsV3: Partial<Modifiers>[] = []
 
       if (type === '1') {
         newSelectOptionList = products[i].newSelectOptionList

apps/storefront/src/utils/b3Product/shared/config.ts

@@ -6,6 +6,7 @@ import { AllOptionProps, ALlOptionValue, Product } from '@/types/products'
 
 import {
   BcCalculatedPrice,
+  OptionValueProps,
   ShoppingListProductItem,
   ShoppingListSelectProductOption,
   SimpleObject,
@@ -606,17 +607,6 @@ interface OptionListProps {
   option_value: string
 }
 
-interface DateProps {
-  day: string
-  month: string
-  year: string
-}
-
-export interface OptionValueProps {
-  optionId: string | number
-  optionValue: string | DateProps
-}
-
 interface AllOptionsProps {
   id: string | number
   type: string