From cc77ca141309233c0d007bb182091a7fba688c21 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" <37986729+carlos-r-l-rodrigues@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:54:43 -0300 Subject: [PATCH] chore(types): index module type (#9473) --- .../modules-sdk/src/remote-query/to-remote-query.ts | 8 ++------ packages/core/types/src/bundles.ts | 4 ++-- .../__fixtures__/index-service-entry-points.ts | 0 .../src/{index => index-data}/__tests__/index.spec.ts | 2 +- .../core/types/src/{index => index-data}/common.ts | 0 .../index-operator-map.ts} | 2 +- .../index-service-entry-points.ts | 0 packages/core/types/src/{index => index-data}/index.ts | 5 ++--- .../src/{index => index-data}/query-config/common.ts | 0 .../src/{index => index-data}/query-config/index.ts | 0 .../query-config/query-input-config-fields.ts | 0 .../query-config/query-input-config-filters.ts | 2 +- .../query-config/query-input-config-order-by.ts | 0 .../query-config/query-input-config.ts | 10 +++------- .../core/types/src/{index => index-data}/service.ts | 0 .../src/{index => index-data}/sotrage-provider.ts | 0 packages/core/types/src/index.ts | 4 ++-- .../src/modules-sdk/remote-query-object-from-string.ts | 2 +- 18 files changed, 15 insertions(+), 24 deletions(-) rename packages/core/types/src/{index => index-data}/__fixtures__/index-service-entry-points.ts (100%) rename packages/core/types/src/{index => index-data}/__tests__/index.spec.ts (95%) rename packages/core/types/src/{index => index-data}/common.ts (100%) rename packages/core/types/src/{index/operator-map.ts => index-data/index-operator-map.ts} (73%) rename packages/core/types/src/{index => index-data}/index-service-entry-points.ts (100%) rename packages/core/types/src/{index => index-data}/index.ts (83%) rename packages/core/types/src/{index => index-data}/query-config/common.ts (100%) rename packages/core/types/src/{index => index-data}/query-config/index.ts (100%) rename packages/core/types/src/{index => index-data}/query-config/query-input-config-fields.ts (100%) rename packages/core/types/src/{index => index-data}/query-config/query-input-config-filters.ts (96%) rename packages/core/types/src/{index => index-data}/query-config/query-input-config-order-by.ts (100%) rename packages/core/types/src/{index => index-data}/query-config/query-input-config.ts (87%) rename packages/core/types/src/{index => index-data}/service.ts (100%) rename packages/core/types/src/{index => index-data}/sotrage-provider.ts (100%) diff --git a/packages/core/modules-sdk/src/remote-query/to-remote-query.ts b/packages/core/modules-sdk/src/remote-query/to-remote-query.ts index 64f47d1554..4236d7117a 100644 --- a/packages/core/modules-sdk/src/remote-query/to-remote-query.ts +++ b/packages/core/modules-sdk/src/remote-query/to-remote-query.ts @@ -2,9 +2,9 @@ import { RemoteQueryEntryPoints, RemoteQueryFilters, RemoteQueryGraph, + RemoteQueryInput, RemoteQueryObjectConfig, } from "@medusajs/types" -import { IndexOrderBy } from "@medusajs/types/dist/index/query-config/query-input-config-order-by" import { QueryContext, QueryFilter, isObject } from "@medusajs/utils" import { parseAndAssignFilters } from "./parse-filters" @@ -34,11 +34,7 @@ export function toRemoteQuery( entity: TEntity | keyof RemoteQueryEntryPoints fields: RemoteQueryObjectConfig["fields"] filters?: RemoteQueryFilters - pagination?: { - skip?: number - take?: number - order?: IndexOrderBy - } + pagination?: Partial["pagination"]> context?: Record }, entitiesMap: Map diff --git a/packages/core/types/src/bundles.ts b/packages/core/types/src/bundles.ts index d8c1d6672a..5378c65f02 100644 --- a/packages/core/types/src/bundles.ts +++ b/packages/core/types/src/bundles.ts @@ -7,11 +7,13 @@ export * as CommonTypes from "./common" export * as CurrencyTypes from "./currency" export * as CustomerTypes from "./customer" export * as DAL from "./dal" +export * as DmlTypes from "./dml" export * as EventBusTypes from "./event-bus" export * as FeatureFlagTypes from "./feature-flag" export * as FileTypes from "./file" export * as FulfillmentTypes from "./fulfillment" export * as HttpTypes from "./http" +export * as IndexTypes from "./index-data/index" export * as InventoryTypes from "./inventory" export * as LoggerTypes from "./logger" export * as ModulesSdkTypes from "./modules-sdk" @@ -30,5 +32,3 @@ export * as TransactionBaseTypes from "./transaction-base" export * as UserTypes from "./user" export * as WorkflowTypes from "./workflow" export * as WorkflowsSdkTypes from "./workflows-sdk" -export * as DmlTypes from "./dml" -export * as IndexTypes from "./index/index" diff --git a/packages/core/types/src/index/__fixtures__/index-service-entry-points.ts b/packages/core/types/src/index-data/__fixtures__/index-service-entry-points.ts similarity index 100% rename from packages/core/types/src/index/__fixtures__/index-service-entry-points.ts rename to packages/core/types/src/index-data/__fixtures__/index-service-entry-points.ts diff --git a/packages/core/types/src/index/__tests__/index.spec.ts b/packages/core/types/src/index-data/__tests__/index.spec.ts similarity index 95% rename from packages/core/types/src/index/__tests__/index.spec.ts rename to packages/core/types/src/index-data/__tests__/index.spec.ts index 3e2b387e12..6bc52e8140 100644 --- a/packages/core/types/src/index/__tests__/index.spec.ts +++ b/packages/core/types/src/index-data/__tests__/index.spec.ts @@ -1,6 +1,6 @@ import { expectTypeOf } from "expect-type" import "../__fixtures__/index-service-entry-points" -import { OperatorMap } from "../operator-map" +import { IndexOperatorMap as OperatorMap } from "../index-operator-map" import { IndexQueryConfig, OrderBy } from "../query-config" describe("IndexQueryConfig", () => { diff --git a/packages/core/types/src/index/common.ts b/packages/core/types/src/index-data/common.ts similarity index 100% rename from packages/core/types/src/index/common.ts rename to packages/core/types/src/index-data/common.ts diff --git a/packages/core/types/src/index/operator-map.ts b/packages/core/types/src/index-data/index-operator-map.ts similarity index 73% rename from packages/core/types/src/index/operator-map.ts rename to packages/core/types/src/index-data/index-operator-map.ts index d1e0ddb8bf..5a679f4c36 100644 --- a/packages/core/types/src/index/operator-map.ts +++ b/packages/core/types/src/index-data/index-operator-map.ts @@ -1,4 +1,4 @@ -export type OperatorMap = { +export type IndexOperatorMap = { $eq: T $lt: T $lte: T diff --git a/packages/core/types/src/index/index-service-entry-points.ts b/packages/core/types/src/index-data/index-service-entry-points.ts similarity index 100% rename from packages/core/types/src/index/index-service-entry-points.ts rename to packages/core/types/src/index-data/index-service-entry-points.ts diff --git a/packages/core/types/src/index/index.ts b/packages/core/types/src/index-data/index.ts similarity index 83% rename from packages/core/types/src/index/index.ts rename to packages/core/types/src/index-data/index.ts index bfd5605b1c..b504b4d578 100644 --- a/packages/core/types/src/index/index.ts +++ b/packages/core/types/src/index-data/index.ts @@ -1,6 +1,5 @@ -export * from "./service" +export * from "./common" export * from "./index-service-entry-points" export * from "./query-config" -export * from "./operator-map" -export * from "./common" +export * from "./service" export * from "./sotrage-provider" diff --git a/packages/core/types/src/index/query-config/common.ts b/packages/core/types/src/index-data/query-config/common.ts similarity index 100% rename from packages/core/types/src/index/query-config/common.ts rename to packages/core/types/src/index-data/query-config/common.ts diff --git a/packages/core/types/src/index/query-config/index.ts b/packages/core/types/src/index-data/query-config/index.ts similarity index 100% rename from packages/core/types/src/index/query-config/index.ts rename to packages/core/types/src/index-data/query-config/index.ts diff --git a/packages/core/types/src/index/query-config/query-input-config-fields.ts b/packages/core/types/src/index-data/query-config/query-input-config-fields.ts similarity index 100% rename from packages/core/types/src/index/query-config/query-input-config-fields.ts rename to packages/core/types/src/index-data/query-config/query-input-config-fields.ts diff --git a/packages/core/types/src/index/query-config/query-input-config-filters.ts b/packages/core/types/src/index-data/query-config/query-input-config-filters.ts similarity index 96% rename from packages/core/types/src/index/query-config/query-input-config-filters.ts rename to packages/core/types/src/index-data/query-config/query-input-config-filters.ts index d26a49a0f1..07c844b1be 100644 --- a/packages/core/types/src/index/query-config/query-input-config-filters.ts +++ b/packages/core/types/src/index-data/query-config/query-input-config-filters.ts @@ -1,6 +1,6 @@ import { Prettify } from "../../common" +import { IndexOperatorMap as OperatorMap } from "../index-operator-map" import { IndexServiceEntryPoints } from "../index-service-entry-points" -import { OperatorMap } from "../operator-map" import { CleanupObject, Depth, diff --git a/packages/core/types/src/index/query-config/query-input-config-order-by.ts b/packages/core/types/src/index-data/query-config/query-input-config-order-by.ts similarity index 100% rename from packages/core/types/src/index/query-config/query-input-config-order-by.ts rename to packages/core/types/src/index-data/query-config/query-input-config-order-by.ts diff --git a/packages/core/types/src/index/query-config/query-input-config.ts b/packages/core/types/src/index-data/query-config/query-input-config.ts similarity index 87% rename from packages/core/types/src/index/query-config/query-input-config.ts rename to packages/core/types/src/index-data/query-config/query-input-config.ts index 189ef338fc..a39f6655b4 100644 --- a/packages/core/types/src/index/query-config/query-input-config.ts +++ b/packages/core/types/src/index-data/query-config/query-input-config.ts @@ -1,7 +1,7 @@ +import { RemoteQueryInput } from "../../modules-sdk/remote-query-object-from-string" +import { IndexServiceEntryPoints } from "../index-service-entry-points" import { ObjectToIndexFields } from "./query-input-config-fields" import { IndexFilters } from "./query-input-config-filters" -import { IndexOrderBy } from "./query-input-config-order-by" -import { IndexServiceEntryPoints } from "../index-service-entry-points" export type IndexQueryConfig = { fields: ObjectToIndexFields< @@ -13,11 +13,7 @@ export type IndexQueryConfig = { >[] filters?: IndexFilters joinFilters?: IndexFilters - pagination?: { - skip?: number - take?: number - order?: IndexOrderBy - } + pagination?: Partial["pagination"]> keepFilteredEntities?: boolean } diff --git a/packages/core/types/src/index/service.ts b/packages/core/types/src/index-data/service.ts similarity index 100% rename from packages/core/types/src/index/service.ts rename to packages/core/types/src/index-data/service.ts diff --git a/packages/core/types/src/index/sotrage-provider.ts b/packages/core/types/src/index-data/sotrage-provider.ts similarity index 100% rename from packages/core/types/src/index/sotrage-provider.ts rename to packages/core/types/src/index-data/sotrage-provider.ts diff --git a/packages/core/types/src/index.ts b/packages/core/types/src/index.ts index 884fde6cdd..e4a137401d 100644 --- a/packages/core/types/src/index.ts +++ b/packages/core/types/src/index.ts @@ -9,12 +9,14 @@ export * from "./common" export * from "./currency" export * from "./customer" export * from "./dal" +export * from "./dml" export * from "./event-bus" export * from "./feature-flag" export * from "./file" export * from "./file-service" export * from "./fulfillment" export * from "./http" +export * from "./index-data" export * from "./inventory" export * from "./joiner" export * from "./link-modules" @@ -40,5 +42,3 @@ export * from "./user" export * from "./workflow" export * from "./workflows" export * from "./workflows-sdk" -export * from "./dml" -export * from "./index" diff --git a/packages/core/types/src/modules-sdk/remote-query-object-from-string.ts b/packages/core/types/src/modules-sdk/remote-query-object-from-string.ts index 1f17986545..ad69df760a 100644 --- a/packages/core/types/src/modules-sdk/remote-query-object-from-string.ts +++ b/packages/core/types/src/modules-sdk/remote-query-object-from-string.ts @@ -1,4 +1,4 @@ -import { IndexOrderBy } from "../index/query-config/query-input-config-order-by" +import { IndexOrderBy } from "../index-data/query-config/query-input-config-order-by" import { ObjectToRemoteQueryFields } from "./object-to-remote-query-fields" import { RemoteQueryEntryPoints } from "./remote-query-entry-points" import { RemoteQueryFilters } from "./to-remote-query"