Remove barrel files

src/app/env/[envUrl]/checkout/[checkoutId]/page.tsx

@@ -1,10 +1,8 @@
 import { BaseError } from "@/lib/errors";
-import {
-  Billing,
-  DeliveryMethod,
-  getCheckoutDetails,
-  Shipping,
-} from "@/modules/checkout-details";
+import { getCheckoutDetails } from "@/modules/checkout-details/actions/get-checkout-details";
+import { Billing } from "@/modules/checkout-details/components/billing";
+import { DeliveryMethod } from "@/modules/checkout-details/components/delivery-method";
+import { Shipping } from "@/modules/checkout-details/components/shipping";
 
 const CheckoutDetailsPageError = BaseError.subclass("CheckoutDetailsPageError");
 

src/app/env/[envUrl]/checkout/[checkoutId]/payment-gateway/[paymentGatewayId]/page.tsx

@@ -1,12 +1,10 @@
 import { readFragment } from "gql.tada";
 
 import { BaseError } from "@/lib/errors";
-import {
-  AdyenDropin,
-  getCheckoutTotalPrice,
-  initalizePaymentGateway,
-  TotalPriceFragment,
-} from "@/modules/dropin";
+import { getCheckoutTotalPrice } from "@/modules/dropin/actions/get-checkout-total-price";
+import { initalizePaymentGateway } from "@/modules/dropin/actions/initalize-payment-gateway";
+import { AdyenDropin } from "@/modules/dropin/components/adyen-dropin";
+import { TotalPriceFragment } from "@/modules/dropin/fragments";
 
 const PaymentGatewayError = BaseError.subclass("PaymentGatewayError");
 

src/app/env/[envUrl]/checkout/[checkoutId]/payment-gateway/[paymentGatewayId]/summary/page.tsx

@@ -2,11 +2,9 @@ import { readFragment } from "gql.tada";
 import Link from "next/link";
 
 import { BaseError } from "@/lib/errors";
-import {
-  CheckoutFragment,
-  getCheckoutSummary,
-  Summary,
-} from "@/modules/summary";
+import { getCheckoutSummary } from "@/modules/summary/actions/get-checkout-summary";
+import { Summary } from "@/modules/summary/components/summary";
+import { CheckoutFragment } from "@/modules/summary/fragments";
 
 const CheckoutSummaryPageError = BaseError.subclass("CheckoutSummaryPageError");
 

src/app/env/[envUrl]/checkout/[checkoutId]/payment-gateway/page.tsx

@@ -1,8 +1,6 @@
 import { BaseError } from "@/lib/errors";
-import {
-  getPaymentGateways,
-  PaymentGatewaySelect,
-} from "@/modules/payment-gateway";
+import { getPaymentGateways } from "@/modules/payment-gateway/actions/get-payment-gateways";
+import { PaymentGatewaySelect } from "@/modules/payment-gateway/components/payment-gateway-select";
 
 const PaymentGatewaysError = BaseError.subclass("PaymentGatewaysError");
 

src/app/page.tsx

@@ -1,4 +1,4 @@
-import { Environment } from "@/modules/environment";
+import { Environment } from "@/modules/environment/components/environment";
 
 export default function IndexPage() {
   return (

src/graphql-cache.d.ts

@@ -20,8 +20,6 @@ declare module 'gql.tada' {
       TadaDocumentNode<{ checkoutBillingAddressUpdate: { errors: { field: string | null; message: string | null; }[]; } | null; }, { input: { metadata?: { value: string; key: string; }[] | null | undefined; phone?: string | null | undefined; countryArea?: string | null | undefined; country?: "ID" | "AF" | "AX" | "AL" | "DZ" | "AS" | "AD" | "AO" | "AI" | "AQ" | "AG" | "AR" | "AM" | "AW" | "AU" | "AT" | "AZ" | "BS" | "BH" | "BD" | "BB" | "BY" | "BE" | "BZ" | "BJ" | "BM" | "BT" | "BO" | "BQ" | "BA" | "BW" | "BV" | "BR" | "IO" | "BN" | "BG" | "BF" | "BI" | "CV" | "KH" | "CM" | "CA" | "KY" | "CF" | "TD" | "CL" | "CN" | "CX" | "CC" | "CO" | "KM" | "CG" | "CD" | "CK" | "CR" | "CI" | "HR" | "CU" | "CW" | "CY" | "CZ" | "DK" | "DJ" | "DM" | "DO" | "EC" | "EG" | "SV" | "GQ" | "ER" | "EE" | "SZ" | "ET" | "EU" | "FK" | "FO" | "FJ" | "FI" | "FR" | "GF" | "PF" | "TF" | "GA" | "GM" | "GE" | "DE" | "GH" | "GI" | "GR" | "GL" | "GD" | "GP" | "GU" | "GT" | "GG" | "GN" | "GW" | "GY" | "HT" | "HM" | "VA" | "HN" | "HK" | "HU" | "IS" | "IN" | "IR" | "IQ" | "IE" | "IM" | "IL" | "IT" | "JM" | "JP" | "JE" | "JO" | "KZ" | "KE" | "KI" | "KW" | "KG" | "LA" | "LV" | "LB" | "LS" | "LR" | "LY" | "LI" | "LT" | "LU" | "MO" | "MG" | "MW" | "MY" | "MV" | "ML" | "MT" | "MH" | "MQ" | "MR" | "MU" | "YT" | "MX" | "FM" | "MD" | "MC" | "MN" | "ME" | "MS" | "MA" | "MZ" | "MM" | "NA" | "NR" | "NP" | "NL" | "NC" | "NZ" | "NI" | "NE" | "NG" | "NU" | "NF" | "KP" | "MK" | "MP" | "NO" | "OM" | "PK" | "PW" | "PS" | "PA" | "PG" | "PY" | "PE" | "PH" | "PN" | "PL" | "PT" | "PR" | "QA" | "RE" | "RO" | "RU" | "RW" | "BL" | "SH" | "KN" | "LC" | "MF" | "PM" | "VC" | "WS" | "SM" | "ST" | "SA" | "SN" | "RS" | "SC" | "SL" | "SG" | "SX" | "SK" | "SI" | "SB" | "SO" | "ZA" | "GS" | "KR" | "SS" | "ES" | "LK" | "SD" | "SR" | "SJ" | "SE" | "CH" | "SY" | "TW" | "TJ" | "TZ" | "TH" | "TL" | "TG" | "TK" | "TO" | "TT" | "TN" | "TR" | "TM" | "TC" | "TV" | "UG" | "UA" | "AE" | "GB" | "UM" | "US" | "UY" | "UZ" | "VU" | "VE" | "VN" | "VG" | "VI" | "WF" | "EH" | "YE" | "ZM" | "ZW" | null | undefined; postalCode?: string | null | undefined; cityArea?: string | null | undefined; city?: string | null | undefined; streetAddress2?: string | null | undefined; streetAddress1?: string | null | undefined; companyName?: string | null | undefined; lastName?: string | null | undefined; firstName?: string | null | undefined; }; checkoutId: string; }, void>;
     "\n  mutation updateShippingAddress($checkoutId: ID!, $input: AddressInput!) {\n    checkoutShippingAddressUpdate(\n      checkoutId: $checkoutId\n      shippingAddress: $input\n    ) {\n      errors {\n        field\n        message\n      }\n    }\n  }\n":
       TadaDocumentNode<{ checkoutShippingAddressUpdate: { errors: { field: string | null; message: string | null; }[]; } | null; }, { input: { metadata?: { value: string; key: string; }[] | null | undefined; phone?: string | null | undefined; countryArea?: string | null | undefined; country?: "PL" | "SE" | "US" | "ID" | "AF" | "AX" | "AL" | "DZ" | "AS" | "AD" | "AO" | "AI" | "AQ" | "AG" | "AR" | "AM" | "AW" | "AU" | "AT" | "AZ" | "BS" | "BH" | "BD" | "BB" | "BY" | "BE" | "BZ" | "BJ" | "BM" | "BT" | "BO" | "BQ" | "BA" | "BW" | "BV" | "BR" | "IO" | "BN" | "BG" | "BF" | "BI" | "CV" | "KH" | "CM" | "CA" | "KY" | "CF" | "TD" | "CL" | "CN" | "CX" | "CC" | "CO" | "KM" | "CG" | "CD" | "CK" | "CR" | "CI" | "HR" | "CU" | "CW" | "CY" | "CZ" | "DK" | "DJ" | "DM" | "DO" | "EC" | "EG" | "SV" | "GQ" | "ER" | "EE" | "SZ" | "ET" | "EU" | "FK" | "FO" | "FJ" | "FI" | "FR" | "GF" | "PF" | "TF" | "GA" | "GM" | "GE" | "DE" | "GH" | "GI" | "GR" | "GL" | "GD" | "GP" | "GU" | "GT" | "GG" | "GN" | "GW" | "GY" | "HT" | "HM" | "VA" | "HN" | "HK" | "HU" | "IS" | "IN" | "IR" | "IQ" | "IE" | "IM" | "IL" | "IT" | "JM" | "JP" | "JE" | "JO" | "KZ" | "KE" | "KI" | "KW" | "KG" | "LA" | "LV" | "LB" | "LS" | "LR" | "LY" | "LI" | "LT" | "LU" | "MO" | "MG" | "MW" | "MY" | "MV" | "ML" | "MT" | "MH" | "MQ" | "MR" | "MU" | "YT" | "MX" | "FM" | "MD" | "MC" | "MN" | "ME" | "MS" | "MA" | "MZ" | "MM" | "NA" | "NR" | "NP" | "NL" | "NC" | "NZ" | "NI" | "NE" | "NG" | "NU" | "NF" | "KP" | "MK" | "MP" | "NO" | "OM" | "PK" | "PW" | "PS" | "PA" | "PG" | "PY" | "PE" | "PH" | "PN" | "PT" | "PR" | "QA" | "RE" | "RO" | "RU" | "RW" | "BL" | "SH" | "KN" | "LC" | "MF" | "PM" | "VC" | "WS" | "SM" | "ST" | "SA" | "SN" | "RS" | "SC" | "SL" | "SG" | "SX" | "SK" | "SI" | "SB" | "SO" | "ZA" | "GS" | "KR" | "SS" | "ES" | "LK" | "SD" | "SR" | "SJ" | "CH" | "SY" | "TW" | "TJ" | "TZ" | "TH" | "TL" | "TG" | "TK" | "TO" | "TT" | "TN" | "TR" | "TM" | "TC" | "TV" | "UG" | "UA" | "AE" | "GB" | "UM" | "UY" | "UZ" | "VU" | "VE" | "VN" | "VG" | "VI" | "WF" | "EH" | "YE" | "ZM" | "ZW" | null | undefined; postalCode?: string | null | undefined; cityArea?: string | null | undefined; city?: string | null | undefined; streetAddress2?: string | null | undefined; streetAddress1?: string | null | undefined; companyName?: string | null | undefined; lastName?: string | null | undefined; firstName?: string | null | undefined; }; checkoutId: string; }, void>;
-    "\n  mutation checkoutDeliveryMethodUpdate($checkoutId: ID!, $input: ID!) {\n    checkoutDeliveryMethodUpdate(id: $checkoutId, deliveryMethodId: $input) {\n      errors {\n        field\n        message\n      }\n    }\n  }\n":
-      TadaDocumentNode<{ checkoutDeliveryMethodUpdate: { errors: { field: string | null; message: string | null; }[]; } | null; }, { input: string; checkoutId: string; }, void>;
     "\n  fragment TotalPrice on TaxedMoney {\n    gross {\n      amount\n      currency\n    }\n  }\n":
       TadaDocumentNode<{ gross: { amount: number; currency: string; }; }, {}, { fragment: "TotalPrice"; on: "TaxedMoney"; masked: true; }>;
     "\n    query GetCheckoutTotalPrice($checkoutId: ID!) {\n      checkout(id: $checkoutId) {\n        totalPrice {\n          ...TotalPrice\n        }\n      }\n    }\n  ":
@@ -50,5 +48,7 @@ declare module 'gql.tada' {
       TadaDocumentNode<{ checkoutComplete: { order: { id: string; } | null; errors: { field: string | null; message: string | null; code: "GRAPHQL_ERROR" | "INVALID" | "NOT_FOUND" | "UNIQUE" | "BILLING_ADDRESS_NOT_SET" | "CHECKOUT_NOT_FULLY_PAID" | "PRODUCT_NOT_PUBLISHED" | "PRODUCT_UNAVAILABLE_FOR_PURCHASE" | "INSUFFICIENT_STOCK" | "INVALID_SHIPPING_METHOD" | "PAYMENT_ERROR" | "QUANTITY_GREATER_THAN_LIMIT" | "REQUIRED" | "SHIPPING_ADDRESS_NOT_SET" | "SHIPPING_METHOD_NOT_APPLICABLE" | "DELIVERY_METHOD_NOT_APPLICABLE" | "SHIPPING_METHOD_NOT_SET" | "SHIPPING_NOT_REQUIRED" | "TAX_ERROR" | "VOUCHER_NOT_APPLICABLE" | "GIFT_CARD_NOT_APPLICABLE" | "ZERO_QUANTITY" | "MISSING_CHANNEL_SLUG" | "CHANNEL_INACTIVE" | "UNAVAILABLE_VARIANT_IN_CHANNEL" | "EMAIL_NOT_SET" | "NO_LINES" | "INACTIVE_PAYMENT" | "SHIPPING_CHANGE_FORBIDDEN"; }[]; } | null; }, { checkoutId: string; }, void>;
     "\n    query getCheckoutSummary($checkoutId: ID!) {\n      checkout(id: $checkoutId) {\n        ...Checkout\n      }\n    }\n  ":
       TadaDocumentNode<{ checkout: { [$tada.fragmentRefs]: { Checkout: "Checkout"; }; } | null; }, { checkoutId: string; }, void>;
+    "\n  mutation checkoutDeliveryMethodUpdate($checkoutId: ID!, $input: ID!) {\n    checkoutDeliveryMethodUpdate(id: $checkoutId, deliveryMethodId: $input) {\n      errors {\n        field\n        message\n      }\n    }\n  }\n":
+      TadaDocumentNode<{ checkoutDeliveryMethodUpdate: { errors: { field: string | null; message: string | null; }[]; } | null; }, { input: string; checkoutId: string; }, void>;
   }
 }

src/modules/checkout-details/actions/get-checkout-details.ts

@@ -8,13 +8,13 @@ import { envUrlSchema } from "@/lib/env-url";
 import { BaseError, UnknownError } from "@/lib/errors";
 import { actionClient } from "@/lib/safe-action";
 
+import { BillingAddressFragment } from "../fragments/billing-address";
 import {
-  BillingAddressFragment,
   CollectionPointFragment,
   DeliveryMethodFragment,
-  ShippingAddressFragment,
   ShippingMethodFragment,
-} from "../fragments";
+} from "../fragments/delivery-method";
+import { ShippingAddressFragment } from "../fragments/shipping";
 
 const GetCheckoutQuery = graphql(
   `

src/modules/checkout-details/actions/update-billing-address.ts

@@ -9,7 +9,7 @@ import { BaseError, UnknownError } from "@/lib/errors";
 import { actionClient } from "@/lib/safe-action";
 import { createPath } from "@/lib/utils";
 
-import { BillingAddressSchema } from "../schemas";
+import { BillingAddressSchema } from "../schemas/billing-address";
 
 const UpdateBillingAddressSchema = z.object({
   checkoutBillingAddressUpdate: z.object({

src/modules/checkout-details/actions/update-shipping-address.ts

@@ -9,7 +9,7 @@ import { BaseError, UnknownError } from "@/lib/errors";
 import { actionClient } from "@/lib/safe-action";
 import { createPath } from "@/lib/utils";
 
-import { ShippingAddressSchema } from "../schemas";
+import { ShippingAddressSchema } from "../schemas/shipping-address";
 
 const UpdateShippingAddressSchema = z.object({
   checkoutShippingAddressUpdate: z.object({

src/modules/checkout-details/components/billing.tsx

@@ -17,11 +17,11 @@ import {
 import { Input } from "@/components/ui/input";
 import { toast } from "@/components/ui/use-toast";
 
-import { updateBillingAddress } from "../actions";
+import { updateBillingAddress } from "../actions/update-billing-address";
 import { getDefaultAddressByCountryCode } from "../address";
 import { convertStringToCountryCode } from "../countries";
-import { BillingAddressFragment } from "../fragments";
-import { BillingAddressSchema } from "../schemas";
+import { BillingAddressFragment } from "../fragments/billing-address";
+import { BillingAddressSchema } from "../schemas/billing-address";
 
 export type BillingAddressSchemaType = z.infer<typeof BillingAddressSchema>;
 

src/modules/checkout-details/components/delivery-method.tsx

@@ -24,10 +24,10 @@ import { toast } from "@/components/ui/use-toast";
 
 import { updateDeliveryMethod } from "../actions/update-delivery-method";
 import {
-  CollectionPointFragment,
+  type CollectionPointFragment,
   DeliveryMethodFragment,
   ShippingMethodFragment,
-} from "../fragments";
+} from "../fragments/delivery-method";
 
 const DeliveryMethodSchema = z.object({
   deliveryMethodId: z.string(),

src/modules/checkout-details/components/shipping.tsx

@@ -17,11 +17,11 @@ import {
 import { Input } from "@/components/ui/input";
 import { toast } from "@/components/ui/use-toast";
 
-import { updateShippingAddress } from "../actions";
+import { updateShippingAddress } from "../actions/update-shipping-address";
 import { getDefaultAddressByCountryCode } from "../address";
 import { convertStringToCountryCode } from "../countries";
-import { ShippingAddressFragment } from "../fragments";
-import { ShippingAddressSchema } from "../schemas";
+import { ShippingAddressFragment } from "../fragments/shipping";
+import { ShippingAddressSchema } from "../schemas/shipping-address";
 
 export type ShippingAddressSchemaType = z.infer<typeof ShippingAddressSchema>;
 

src/modules/dropin/actions/initalize-payment-gateway.ts

@@ -7,7 +7,7 @@ import { envUrlSchema } from "@/lib/env-url";
 import { BaseError, UnknownError } from "@/lib/errors";
 import { actionClient } from "@/lib/safe-action";
 
-import { InitalizePaymentGatewaySchema } from "../schemas";
+import { InitalizePaymentGatewaySchema } from "../schemas/initalize-payment-gateway";
 
 const InitalizePaymentGatewayMutation = graphql(`
   mutation initalizePaymentGateway(

src/modules/dropin/actions/initalize-transaction.ts

@@ -8,7 +8,7 @@ import { envUrlSchema } from "@/lib/env-url";
 import { BaseError, UnknownError } from "@/lib/errors";
 import { actionClient } from "@/lib/safe-action";
 
-import { InitalizeTransactionSchema } from "../schemas";
+import { InitalizeTransactionSchema } from "../schemas/initalize-transaction";
 
 const initalizeTransactionMutation = graphql(`
   mutation InitalizeTransaction(

src/modules/dropin/adyen/dropin-config.tsx

@@ -4,13 +4,11 @@ import { z } from "zod";
 import { toast } from "@/components/ui/use-toast";
 import { createLogger } from "@/lib/logger";
 
-import {
-  initalizePaymentGateway,
-  initalizeTransaction,
-  processTransaction,
-  redirectToCheckoutSummary,
-} from "../actions";
-import { PaymentMethodsResponseSchema } from "../schemas";
+import { initalizePaymentGateway } from "../actions/initalize-payment-gateway";
+import { initalizeTransaction } from "../actions/initalize-transaction";
+import { processTransaction } from "../actions/process-transaction";
+import { redirectToCheckoutSummary } from "../actions/redirect-to-summary";
+import type { PaymentMethodsResponseSchema } from "../schemas/payment-method-response";
 import {
   AdyenGiftCardBalanceResponse,
   AdyenOrderCancelledResponse,

src/modules/dropin/adyen/gateway-config-responses.ts

@@ -2,12 +2,12 @@ import { z } from "zod";
 
 import { createLogger } from "@/lib/logger";
 
-import {
+import type {
   GiftCardBalanceResponseSchema,
-  type InitalizePaymentGatewaySchemaType,
+  InitalizePaymentGatewaySchemaType,
   OrderCancelResponseSchema,
   OrderCreateResponseSchema,
-} from "../schemas";
+} from "../schemas/initalize-payment-gateway";
 
 const logger = createLogger("AdyenGatewayConfigResponse");
 

src/modules/dropin/adyen/payment-response.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { InitalizeTransactionSchema } from "../schemas";
+import type { InitalizeTransactionSchema } from "../schemas/initalize-transaction";
 
 export class AdyenPaymentResponse {
   private constructor(

src/modules/dropin/components/adyen-dropin.tsx

@@ -7,10 +7,10 @@ import { useEffect, useRef } from "react";
 
 import { UnknownError } from "@/lib/errors";
 
-import { getAdyenDropinConfig } from "../adyen";
+import { getAdyenDropinConfig } from "../adyen/dropin-config";
 import { SaleorPrice } from "../adyen/price";
 import { TotalPriceFragment } from "../fragments";
-import { type InitalizePaymentGatewaySchemaType } from "../schemas";
+import type { InitalizePaymentGatewaySchemaType } from "../schemas/initalize-payment-gateway";
 
 export const AdyenDropin = (props: {
   initalizePaymentGatewayData: InitalizePaymentGatewaySchemaType;

src/modules/environment/components/cart.tsx

@@ -7,7 +7,7 @@ import { useTransition } from "react";
 import { FormButton } from "@/components/form-button";
 import { toast } from "@/components/ui/use-toast";
 
-import { createCheckout } from "../actions";
+import { createCheckout } from "../actions/create-checkout";
 import { ProductFragment } from "../fragments";
 
 export const Cart = (props: {

src/modules/environment/components/environment.tsx

@@ -20,7 +20,7 @@ import { toast } from "@/components/ui/use-toast";
 import { env } from "@/env";
 import { envUrlSchema } from "@/lib/env-url";
 
-import { fetchProduct } from "../actions";
+import { fetchProduct } from "../actions/fetch-product";
 import { ProductFragment } from "../fragments";
 import { Cart } from "./cart";
 

src/modules/payment-gateway/components/payment-gateway-select.tsx

@@ -23,7 +23,7 @@ import {
 } from "@/components/ui/select";
 import { toast } from "@/components/ui/use-toast";
 
-import { redirectToAdyenDropin } from "../actions";
+import { redirectToAdyenDropin } from "../actions/redirect-to-adyen-dropin";
 import { PaymentGatewayFragment } from "../fragments";
 
 const PaymentGatewaySchema = z.object({