Merge pull request #921 from evershopcommerce/fix/imports

Fix: Fix the missing exports

Author: treoden

packages/evershop/src/modules/catalog/services/index.ts

@@ -1,37 +1,48 @@
-import createAttribute from './attribute/createProductAttribute.js';
-import deleteAttribute from './attribute/deleteProductAttribute.js';
-import updateAttribute from './attribute/updateProductAttribute.js';
-import createCategory from './category/createCategory.js';
-import deleteCategory from './category/deleteCategory.js';
-import updateCategory from './category/updateCategory.js';
-import createCollection from './collection/createCollection.js';
-import deleteCollection from './collection/deleteCollection.js';
-import updateCollection from './collection/updateCollection.js';
-import { getCategoriesBaseQuery } from './getCategoriesBaseQuery.js';
-import { getCollectionsBaseQuery } from './getCollectionsBaseQuery.js';
-import { getProductsBaseQuery } from './getProductsBaseQuery.js';
-import { getProductsByCategoryBaseQuery } from './getProductsByCategoryBaseQuery.js';
-import { getProductsByCollectionBaseQuery } from './getProductsByCollectionBaseQuery.js';
-import createProduct from './product/createProduct.js';
-import deleteProduct from './product/deleteProduct.js';
-import updateProduct from './product/updateProduct.js';
+// Products
+export { default as createProduct } from './product/createProduct.js';
+export * from './product/createProduct.js';
+export { default as updateProduct } from './product/updateProduct.js';
+export * from './product/updateProduct.js';
+export { default as deleteProduct } from './product/deleteProduct.js';
+export * from './product/deleteProduct.js';
 
+// Categories
+export { default as createCategory } from './category/createCategory.js';
+export * from './category/createCategory.js';
+export { default as updateCategory } from './category/updateCategory.js';
+export * from './category/updateCategory.js';
+export { default as deleteCategory } from './category/deleteCategory.js';
+export * from './category/deleteCategory.js';
+
+// Collections
+export { default as createCollection } from './collection/createCollection.js';
+export * from './collection/createCollection.js';
+export { default as updateCollection } from './collection/updateCollection.js';
+export * from './collection/updateCollection.js';
+export { default as deleteCollection } from './collection/deleteCollection.js';
+export * from './collection/deleteCollection.js';
+
+// Attributes
+// AttributeData is exported from createProductAttribute only to avoid name conflict
+export { default as createAttribute } from './attribute/createProductAttribute.js';
+export * from './attribute/createProductAttribute.js';
+export { default as updateAttribute } from './attribute/updateProductAttribute.js';
 export {
-  createProduct,
-  updateProduct,
-  deleteProduct,
-  createCollection,
-  updateCollection,
-  deleteCollection,
-  createCategory,
-  updateCategory,
-  deleteCategory,
-  createAttribute,
-  updateAttribute,
-  deleteAttribute,
-  getCategoriesBaseQuery,
-  getCollectionsBaseQuery,
-  getProductsBaseQuery,
-  getProductsByCategoryBaseQuery,
-  getProductsByCollectionBaseQuery
-};
+  hookBeforeUpdateAttributeData,
+  hookAfterUpdateAttributeData,
+  hookBeforeUpdateAttributeGroups,
+  hookAfterUpdateAttributeGroups,
+  hookBeforeUpdateAttributeOptions,
+  hookAfterUpdateAttributeOptions,
+  hookBeforeUpdateAttribute,
+  hookAfterUpdateAttribute
+} from './attribute/updateProductAttribute.js';
+export { default as deleteAttribute } from './attribute/deleteProductAttribute.js';
+export * from './attribute/deleteProductAttribute.js';
+
+// Query helpers
+export * from './getCategoriesBaseQuery.js';
+export * from './getCollectionsBaseQuery.js';
+export * from './getProductsBaseQuery.js';
+export * from './getProductsByCategoryBaseQuery.js';
+export * from './getProductsByCollectionBaseQuery.js';

packages/evershop/src/modules/checkout/services/addBillingAddress.ts

@@ -30,7 +30,7 @@ interface BillingAddress extends Address {
  * @throws {Error} If cart does not exist or address validation fails
  * @returns {Promise<Address>} The newly created address object
  */
-async function addBillingAddressService<
+const _addBillingAddress = async function addBillingAddress<
   T extends Address = Address,
   R = BillingAddress
 >(
@@ -85,7 +85,7 @@ async function addBillingAddressService<
     })(addressData, connection);
 
     // Update cart with billing address
-    await hookable(updateCartWithAddress, {
+    await hookable(updateCartWithBillingAddress, {
       cartUUID,
       addressData,
       cart,
@@ -100,7 +100,7 @@ async function addBillingAddressService<
     await rollback(connection);
     throw error;
   }
-}
+};
 
 /**
  * Save billing address to database
@@ -126,7 +126,7 @@ async function saveBillingAddress(
 /**
  * Update cart with billing address
  */
-async function updateCartWithAddress(
+async function updateCartWithBillingAddress(
   cartId: number,
   addressId: number,
   connection: PoolClient
@@ -148,7 +148,7 @@ export const addBillingAddress = async (
   addressData: Address,
   context: Record<string, unknown> = {}
 ) => {
-  const result = await hookable(addBillingAddressService, {
+  const result = await hookable(_addBillingAddress, {
     cartUUID,
     addressData,
     ...context
@@ -159,10 +159,7 @@ export const addBillingAddress = async (
 export function hookBeforeSaveBillingAddress(
   callback: (
     this: Record<string, unknown>,
-    ...args: [
-    addressData: Address,
-    connection: PoolClient
-    ]
+    ...args: [addressData: Address, connection: PoolClient]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
@@ -172,68 +169,57 @@ export function hookBeforeSaveBillingAddress(
 export function hookAfterSaveBillingAddress(
   callback: (
     this: Record<string, unknown>,
-    ...args: [
-    addressData: Address,
-    connection: PoolClient
-    ]
+    ...args: [addressData: Address, connection: PoolClient]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
   hookAfter('saveBillingAddress', callback, priority);
 }
 
-export function hookBeforeUpdateCartWithAddress(
+export function hookBeforeUpdateCartWithBillingAddress(
   callback: (
     this: Record<string, unknown>,
-    ...args: [
-    cartId: number,
-    addressId: number,
-    connection: PoolClient
-    ]
+    ...args: [cartId: number, addressId: number, connection: PoolClient]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
-  hookBefore('updateCartWithAddress', callback, priority);
+  hookBefore('updateCartWithBillingAddress', callback, priority);
 }
 
-export function hookAfterUpdateCartWithAddress(
+export function hookAfterUpdateCartWithBillingAddress(
   callback: (
     this: Record<string, unknown>,
-    ...args: [
-    cartId: number,
-    addressId: number,
-    connection: PoolClient
-    ]
+    ...args: [cartId: number, addressId: number, connection: PoolClient]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
-  hookAfter('updateCartWithAddress', callback, priority);
+  hookAfter('updateCartWithBillingAddress', callback, priority);
 }
 
-export function hookBeforeAddBillingAddressService(
+export function hookBeforeAddBillingAddress(
   callback: (
     this: Record<string, unknown>,
     ...args: [
-    cartUUID: string,
-    addressData: Address,
-    context: Record<string, unknown>
+      cartUUID: string,
+      addressData: Address,
+      context: Record<string, unknown>
     ]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
-  hookBefore('addBillingAddressService', callback, priority);
+  hookBefore('addBillingAddress', callback, priority);
 }
 
-export function hookAfterAddBillingAddressService(
+export function hookAfterAddBillingAddress(
   callback: (
     this: Record<string, unknown>,
     ...args: [
-    cartUUID: string,
-    addressData: Address,
-    context: Record<string, unknown>
+      cartUUID: string,
+      addressData: Address,
+      context: Record<string, unknown>
     ]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
-  hookAfter('addBillingAddressService', callback, priority);
+  hookAfter('addBillingAddress', callback, priority);
 }

packages/evershop/src/modules/checkout/services/addShippingAddress.ts

@@ -29,7 +29,7 @@ interface ShippingAddress extends Address {
  * @throws {Error} If cart does not exist, address validation fails, or shipping zone is not available
  * @returns {Promise<Address>} The newly created address object
  */
-async function addShippingAddressService<
+const _addShippingAddress = async function addShippingAddress<
   T extends Address = Address,
   R = ShippingAddress
 >(
@@ -97,7 +97,7 @@ async function addShippingAddressService<
     })(addressData, connection);
 
     // Update cart with shipping zone and address
-    await hookable(updateCartWithAddress, {
+    await hookable(updateCartWithShippingAddress, {
       cartUUID,
       addressData,
       cart,
@@ -113,7 +113,7 @@ async function addShippingAddressService<
     await rollback(connection);
     throw error;
   }
-}
+};
 
 /**
  * Find shipping zone for the given address
@@ -161,7 +161,7 @@ async function saveShippingAddress(
 /**
  * Update cart with shipping zone and address
  */
-async function updateCartWithAddress(
+async function updateCartWithShippingAddress(
   cartId: number,
   addressId: number,
   connection: PoolClient
@@ -183,7 +183,7 @@ export const addShippingAddress = async (
   addressData: Address,
   context: Record<string, unknown> = {}
 ) => {
-  const result = await hookable(addShippingAddressService, {
+  const result = await hookable(_addShippingAddress, {
     cartUUID,
     addressData,
     ...context
@@ -194,10 +194,7 @@ export const addShippingAddress = async (
 export function hookBeforeSaveShippingAddress(
   callback: (
     this: Record<string, unknown>,
-    ...args: [
-    addressData: Address,
-    connection: PoolClient
-    ]
+    ...args: [addressData: Address, connection: PoolClient]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
@@ -207,40 +204,37 @@ export function hookBeforeSaveShippingAddress(
 export function hookAfterSaveShippingAddress(
   callback: (
     this: Record<string, unknown>,
-    ...args: [
-    addressData: Address,
-    connection: PoolClient
-    ]
+    ...args: [addressData: Address, connection: PoolClient]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
   hookAfter('saveShippingAddress', callback, priority);
 }
 
-export function hookBeforeAddShippingAddressService(
+export function hookBeforeAddShippingAddress(
   callback: (
     this: Record<string, unknown>,
     ...args: [
-    cartUUID: string,
-    addressData: Address,
-    context: Record<string, unknown>
+      cartUUID: string,
+      addressData: Address,
+      context: Record<string, unknown>
     ]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
-  hookBefore('addShippingAddressService', callback, priority);
+  hookBefore('addShippingAddress', callback, priority);
 }
 
-export function hookAfterAddShippingAddressService(
+export function hookAfterAddShippingAddress(
   callback: (
     this: Record<string, unknown>,
     ...args: [
-    cartUUID: string,
-    addressData: Address,
-    context: Record<string, unknown>
+      cartUUID: string,
+      addressData: Address,
+      context: Record<string, unknown>
     ]
   ) => void | Promise<void>,
   priority: number = 10
 ): void {
-  hookAfter('addShippingAddressService', callback, priority);
+  hookAfter('addShippingAddress', callback, priority);
 }

packages/evershop/src/modules/checkout/services/index.ts

@@ -8,6 +8,20 @@ export * from './toPrice.js';
 export * from './orderCreator.js';
 export * from './orderValidator.js';
 export * from './addShippingAddress.js';
-export { default as removeCartItem } from './removeCartItem.js';
-export { default as updateCartItemQty } from './updateCartItemQty.js';
-export { default as addCartItem } from './addCartItem.js';
+export * from './addBillingAddress.js';
+export * from './checkout.js';
+export {
+  default as removeCartItem,
+  hookBeforeRemoveCartItem,
+  hookAfterRemoveCartItem
+} from './removeCartItem.js';
+export {
+  default as updateCartItemQty,
+  hookBeforeUpdateCartItemQty,
+  hookAfterUpdateCartItemQty
+} from './updateCartItemQty.js';
+export {
+  default as addCartItem,
+  hookBeforeAddCartItem,
+  hookAfterAddCartItem
+} from './addCartItem.js';

packages/evershop/src/modules/cms/api/createCmsPage/createPage[finish].ts

@@ -1,6 +1,6 @@
 import { EvershopRequest } from '../../../../types/request.js';
 import { EvershopResponse } from '../../../../types/response.js';
-import createPage from '../../services/page/createPage.js';
+import { createPage } from '../../services/page/createPage.js';
 
 export default async (request: EvershopRequest, response: EvershopResponse) => {
   const data = request.body;

packages/evershop/src/modules/cms/services/index.ts

@@ -2,3 +2,6 @@ export * from './browFiles.js';
 export * from './createFolder.js';
 export * from './deleteFile.js';
 export * from './uploadFile.js';
+export * from './page/createPage.js';
+export * from './page/deletePage.js';
+export * from './page/updatePage.js';