diff --git a/.changeset/lucky-frogs-sleep.md b/.changeset/lucky-frogs-sleep.md new file mode 100644 index 0000000000..d4d349c927 --- /dev/null +++ b/.changeset/lucky-frogs-sleep.md @@ -0,0 +1,8 @@ +--- +"@medusajs/utils": patch +"@medusajs/types": patch +"medusa-plugin-meilisearch": patch +"medusa-plugin-algolia": patch +--- + +fix(utils, types, medusa-plugin-meilisearch, medusa-plugin-algolia): move SoftDeletableFilterKey, variantKeys, indexTypes from types to utils diff --git a/packages/medusa-plugin-algolia/src/services/algolia.ts b/packages/medusa-plugin-algolia/src/services/algolia.ts index 2cb62d3a9e..1051476468 100644 --- a/packages/medusa-plugin-algolia/src/services/algolia.ts +++ b/packages/medusa-plugin-algolia/src/services/algolia.ts @@ -162,9 +162,9 @@ class AlgoliaService extends SearchUtils.AbstractSearchService { } switch (type) { - case SearchTypes.indexTypes.PRODUCTS: + case SearchUtils.indexTypes.PRODUCTS: const productsTransformer = - this.config_.settings?.[SearchTypes.indexTypes.PRODUCTS] + this.config_.settings?.[SearchUtils.indexTypes.PRODUCTS] ?.transformer ?? transformProduct return documents.map(productsTransformer) diff --git a/packages/medusa-plugin-algolia/src/utils/transformer.ts b/packages/medusa-plugin-algolia/src/utils/transformer.ts index 72d8b25350..9733fb65ee 100644 --- a/packages/medusa-plugin-algolia/src/utils/transformer.ts +++ b/packages/medusa-plugin-algolia/src/utils/transformer.ts @@ -1,4 +1,4 @@ -import { variantKeys } from "@medusajs/types" +import { variantKeys } from "@medusajs/utils" const prefix = `variant` diff --git a/packages/medusa-plugin-meilisearch/src/services/meilisearch.ts b/packages/medusa-plugin-meilisearch/src/services/meilisearch.ts index a991ff5679..7bc01b887c 100644 --- a/packages/medusa-plugin-meilisearch/src/services/meilisearch.ts +++ b/packages/medusa-plugin-meilisearch/src/services/meilisearch.ts @@ -105,9 +105,9 @@ class MeiliSearchService extends SearchUtils.AbstractSearchService { } switch (type) { - case SearchTypes.indexTypes.PRODUCTS: + case SearchUtils.indexTypes.PRODUCTS: const productsTransformer = - this.config_.settings?.[SearchTypes.indexTypes.PRODUCTS] + this.config_.settings?.[SearchUtils.indexTypes.PRODUCTS] ?.transformer ?? transformProduct return documents.map(productsTransformer) diff --git a/packages/medusa-plugin-meilisearch/src/utils/transformer.ts b/packages/medusa-plugin-meilisearch/src/utils/transformer.ts index 1fddd75693..7e60568a67 100644 --- a/packages/medusa-plugin-meilisearch/src/utils/transformer.ts +++ b/packages/medusa-plugin-meilisearch/src/utils/transformer.ts @@ -1,4 +1,4 @@ -import { variantKeys } from "@medusajs/types" +import { variantKeys } from "@medusajs/utils" const prefix = `variant` diff --git a/packages/product/src/repositories/base.ts b/packages/product/src/repositories/base.ts index 8dbe406526..36ff06c197 100644 --- a/packages/product/src/repositories/base.ts +++ b/packages/product/src/repositories/base.ts @@ -1,4 +1,5 @@ import { Context, DAL, RepositoryTransformOptions } from "@medusajs/types" +import { SoftDeletableFilterKey } from "@medusajs/utils" import { SqlEntityManager } from "@mikro-orm/postgresql" import { buildQuery, @@ -69,7 +70,7 @@ const mikroOrmUpdateDeletedAtRecursively = async ( const relationEntities = await collectionRelation.getItems({ filters: { - [DAL.SoftDeletableFilterKey]: { + [SoftDeletableFilterKey]: { withDeleted: true, }, }, diff --git a/packages/product/src/utils/soft-deletable.ts b/packages/product/src/utils/soft-deletable.ts index 83c4328111..b2a830f7a9 100644 --- a/packages/product/src/utils/soft-deletable.ts +++ b/packages/product/src/utils/soft-deletable.ts @@ -1,7 +1,7 @@ // TODO: Should we create a mikro orm specific package for this and the base repository? import { Filter } from "@mikro-orm/core" -import { DAL } from "@medusajs/types" +import { SoftDeletableFilterKey } from "@medusajs/utils" interface FilterArguments { withDeleted?: boolean @@ -9,7 +9,7 @@ interface FilterArguments { export const SoftDeletable = (): ClassDecorator => { return Filter({ - name: DAL.SoftDeletableFilterKey, + name: SoftDeletableFilterKey, cond: ({ withDeleted }: FilterArguments = {}) => { if (withDeleted) { return {} diff --git a/packages/types/src/dal/index.ts b/packages/types/src/dal/index.ts index 3309fec05d..fd52c3e0ae 100644 --- a/packages/types/src/dal/index.ts +++ b/packages/types/src/dal/index.ts @@ -21,6 +21,4 @@ export type FindOptions = { options?: OptionsQuery } -export const SoftDeletableFilterKey = "softDeletable" - export * from "./repository-service" diff --git a/packages/types/src/search/index.ts b/packages/types/src/search/index.ts index db65a2b548..0220e334af 100644 --- a/packages/types/src/search/index.ts +++ b/packages/types/src/search/index.ts @@ -1,7 +1,5 @@ -export * from "./index-types" export * from "./interface" export * from "./settings" -export * from "./variant-keys" export type IndexSettings = { /** diff --git a/packages/utils/src/common/dal.ts b/packages/utils/src/common/dal.ts new file mode 100644 index 0000000000..1a2a95f887 --- /dev/null +++ b/packages/utils/src/common/dal.ts @@ -0,0 +1 @@ +export const SoftDeletableFilterKey = "softDeletable" diff --git a/packages/utils/src/common/index.ts b/packages/utils/src/common/index.ts index 2d949d143c..631aecae41 100644 --- a/packages/utils/src/common/index.ts +++ b/packages/utils/src/common/index.ts @@ -22,3 +22,4 @@ export * from "./stringify-circular" export * from "./to-kebab-case" export * from "./to-pascal-case" export * from "./wrap-handler" +export * from "./dal" diff --git a/packages/utils/src/modules-sdk/build-query.ts b/packages/utils/src/modules-sdk/build-query.ts index afadb20cd2..83971928c8 100644 --- a/packages/utils/src/modules-sdk/build-query.ts +++ b/packages/utils/src/modules-sdk/build-query.ts @@ -1,5 +1,6 @@ -import { DAL, FindConfig, SoftDeletableFilterKey } from "@medusajs/types" -import { deduplicate, isObject } from "../common" +import { DAL, FindConfig } from "@medusajs/types" + +import { deduplicate, isObject, SoftDeletableFilterKey } from "../common" export function buildQuery( filters: Record = {}, diff --git a/packages/types/src/search/index-types.ts b/packages/utils/src/search/index-types.ts similarity index 100% rename from packages/types/src/search/index-types.ts rename to packages/utils/src/search/index-types.ts diff --git a/packages/utils/src/search/index.ts b/packages/utils/src/search/index.ts index 26c4d64a6d..1ff2fc7601 100644 --- a/packages/utils/src/search/index.ts +++ b/packages/utils/src/search/index.ts @@ -1,4 +1,6 @@ export * from "./abstract-service" export * from "./is-search-service" export * from "./search-relations" +export * from "./index-types" +export * from "./variant-keys" diff --git a/packages/types/src/search/variant-keys.ts b/packages/utils/src/search/variant-keys.ts similarity index 100% rename from packages/types/src/search/variant-keys.ts rename to packages/utils/src/search/variant-keys.ts