This reverts commit a095245d71.
This commit is contained in:
1 parent
ccff121691
commit
0b55295fc7
60 files changed
+711
-862
No files matched your search
@@ -27,16 +27,16 @@
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@medusajs/framework": "2.10.1",
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"awilix": "^8.0.1",
|
||||
"expect-type": "^0.20.0",
|
||||
"jest": "^29.7.0",
|
||||
"pg": "^8.16.3",
|
||||
"pg": "^8.13.0",
|
||||
"rimraf": "^5.0.1",
|
||||
"typescript": "^5.6.2"
|
||||
},
|
||||
|
||||
@@ -56,10 +56,10 @@
|
||||
"devDependencies": {
|
||||
"@aws-sdk/client-dynamodb": "^3.218.0",
|
||||
"@medusajs/cli": "2.10.1",
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"@types/cors": "^2.8.17",
|
||||
@@ -68,7 +68,7 @@
|
||||
"connect-dynamodb": "^3.0.5",
|
||||
"ioredis": "^5.4.1",
|
||||
"jest": "^29.7.0",
|
||||
"pg": "^8.16.3",
|
||||
"pg": "^8.13.0",
|
||||
"rimraf": "^3.0.2",
|
||||
"supertest": "^4.0.2",
|
||||
"typescript": "^5.6.2",
|
||||
@@ -103,15 +103,15 @@
|
||||
"peerDependencies": {
|
||||
"@aws-sdk/client-dynamodb": "^3.218.0",
|
||||
"@medusajs/cli": "2.10.1",
|
||||
"@mikro-orm/cli": "6.5.2",
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/cli": "6.4.3",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"awilix": "^8.0.1",
|
||||
"connect-dynamodb": "^3.0.5",
|
||||
"ioredis": "^5.4.1",
|
||||
"pg": "^8.16.3",
|
||||
"pg": "^8.13.0",
|
||||
"vite": "^5.4.14"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
|
||||
@@ -31,16 +31,16 @@
|
||||
"watch": "tsc --build --watch"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"awilix": "^8.0.1",
|
||||
"cross-env": "^5.2.1",
|
||||
"jest": "^29.7.0",
|
||||
"pg": "^8.16.3",
|
||||
"pg": "^8.13.0",
|
||||
"rimraf": "^5.0.1",
|
||||
"typescript": "^5.6.2"
|
||||
},
|
||||
@@ -50,12 +50,12 @@
|
||||
"@medusajs/utils": "2.10.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"awilix": "^8.0.1",
|
||||
"express": "^4.21.0",
|
||||
"pg": "^8.16.3"
|
||||
"pg": "^8.13.0"
|
||||
}
|
||||
}
|
||||
@@ -36,7 +36,7 @@ export function toRemoteQuery<const TEntity extends string>(
|
||||
pagination?: Partial<RemoteQueryInput<TEntity>["pagination"]>
|
||||
context?: Record<string, any>
|
||||
withDeleted?: boolean
|
||||
strategy?: "joined" | "select-in" | "balanced"
|
||||
strategy?: "joined" | "select-in"
|
||||
},
|
||||
entitiesMap: Map<string, any>
|
||||
): RemoteQueryGraph<TEntity> {
|
||||
|
||||
@@ -26,15 +26,15 @@
|
||||
"author": "Medusa",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"awilix": "^8.0.1",
|
||||
"jest": "^29.7.0",
|
||||
"pg": "^8.16.3",
|
||||
"pg": "^8.13.0",
|
||||
"rimraf": "^5.0.1",
|
||||
"typescript": "^5.6.2"
|
||||
},
|
||||
@@ -44,13 +44,13 @@
|
||||
"ulid": "^2.3.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"awilix": "^8.0.1",
|
||||
"express": "^4.21.0",
|
||||
"pg": "^8.16.3"
|
||||
"pg": "^8.13.0"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "rimraf dist && tsc --build",
|
||||
|
||||
@@ -55,7 +55,7 @@ export interface OptionsQuery<T> {
|
||||
/**
|
||||
* Load strategy (e.g for mikro orm it accept select-in or joined)
|
||||
*/
|
||||
strategy?: "select-in" | "joined" | "balanced" | (string & {})
|
||||
strategy?: "select-in" | "joined" | (string & {})
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -74,7 +74,7 @@ export type RemoteQueryInput<TEntry extends string> =
|
||||
/**
|
||||
* Strategy will be send to the entry module called method
|
||||
*/
|
||||
strategy?: "joined" | "select-in" | "balanced"
|
||||
strategy?: "joined" | "select-in"
|
||||
}
|
||||
: {
|
||||
/**
|
||||
@@ -119,7 +119,7 @@ export type RemoteQueryInput<TEntry extends string> =
|
||||
/**
|
||||
* Strategy will be send to the entry module called method
|
||||
*/
|
||||
strategy?: "joined" | "select-in" | "balanced"
|
||||
strategy?: "joined" | "select-in"
|
||||
}
|
||||
|
||||
export type RemoteQueryGraph<TEntry extends string> = {
|
||||
|
||||
@@ -26,10 +26,10 @@
|
||||
"author": "Medusa",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"@types/express": "^4.17.21",
|
||||
@@ -37,7 +37,7 @@
|
||||
"expect-type": "^0.20.0",
|
||||
"express": "^4.21.0",
|
||||
"jest": "^29.7.0",
|
||||
"pg": "^8.16.3",
|
||||
"pg": "^8.13.0",
|
||||
"pg-god": "^1.0.12",
|
||||
"rimraf": "^5.0.1",
|
||||
"typescript": "^5.6.2"
|
||||
@@ -60,13 +60,13 @@
|
||||
"zod": "3.25.76"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"awilix": "^8.0.1",
|
||||
"express": "^4.21.0",
|
||||
"pg": "^8.16.3"
|
||||
"pg": "^8.13.0"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "rimraf dist && tsc --build",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { BigNumberInput } from "@medusajs/types"
|
||||
import { EntityProperty, Platform, Property, Type } from "@mikro-orm/core"
|
||||
import { isDefined, isObject, isPresent, trimZeros } from "../../common"
|
||||
import { Property } from "@mikro-orm/core"
|
||||
import { isDefined, isPresent, trimZeros } from "../../common"
|
||||
import { BigNumber } from "../../totals/big-number"
|
||||
|
||||
export function MikroOrmBigNumberProperty(
|
||||
@@ -24,11 +24,6 @@ export function MikroOrmBigNumberProperty(
|
||||
return value
|
||||
},
|
||||
set(value: BigNumberInput) {
|
||||
// convert 'null' to null
|
||||
if (value === "null") {
|
||||
value = null as unknown as BigNumberInput
|
||||
}
|
||||
|
||||
if (options?.nullable && !isPresent(value)) {
|
||||
this.__helper.__data[columnName] = null
|
||||
this.__helper.__data[rawColumnName] = null
|
||||
@@ -94,7 +89,7 @@ export function MikroOrmBigNumberProperty(
|
||||
})
|
||||
|
||||
Property({
|
||||
type: BigNumberNumeric,
|
||||
type: "any",
|
||||
columnType: "numeric",
|
||||
trackChanges: false,
|
||||
runtimeType: "any",
|
||||
@@ -102,43 +97,3 @@ export function MikroOrmBigNumberProperty(
|
||||
})(target, columnName)
|
||||
}
|
||||
}
|
||||
|
||||
class BigNumberNumeric extends Type<string | number, string> {
|
||||
constructor(public mode?: "number" | "string") {
|
||||
super()
|
||||
}
|
||||
|
||||
override convertToJSValue(value: string): number | string {
|
||||
if ((this.mode ?? this.prop?.runtimeType) === "number") {
|
||||
return +value
|
||||
}
|
||||
|
||||
if (isObject(value)) {
|
||||
return value // Special case for BigNumberRawValue because the setter will manage the dispatch automatically at a later stage
|
||||
}
|
||||
|
||||
return String(value)
|
||||
}
|
||||
|
||||
override compareValues(a: string, b: string): boolean {
|
||||
return this.format(a) === this.format(b)
|
||||
}
|
||||
|
||||
private format(val: string | number) {
|
||||
/* istanbul ignore next */
|
||||
if (this.prop?.scale == null) {
|
||||
return +val
|
||||
}
|
||||
|
||||
const base = Math.pow(10, this.prop.scale)
|
||||
return Math.round((+val + Number.EPSILON) * base) / base
|
||||
}
|
||||
|
||||
override getColumnType(prop: EntityProperty, platform: Platform) {
|
||||
return platform.getDecimalTypeDeclarationSQL(prop)
|
||||
}
|
||||
|
||||
override compareAsType(): string {
|
||||
return this.mode ?? this.prop?.runtimeType ?? "string"
|
||||
}
|
||||
}
|
||||
@@ -64,9 +64,11 @@ export class MikroOrmBase {
|
||||
transaction?: TManager
|
||||
} = {}
|
||||
): Promise<any> {
|
||||
this.manager_.global = true // this prevent mikro orm from synchronising the transaction manager entity map back to the manager. Also, it will save us from always forking the manager for each transaction while the transacation manager will fork it again for transaction purpose
|
||||
const freshManager = this.getFreshManager
|
||||
? this.getFreshManager()
|
||||
: this.manager_
|
||||
|
||||
return await transactionWrapper(this.manager_, task, options).catch(
|
||||
return await transactionWrapper(freshManager, task, options).catch(
|
||||
dbErrorMapper
|
||||
)
|
||||
}
|
||||
@@ -465,7 +467,11 @@ export function mikroOrmBaseRepositoryFactory<const T extends object>(
|
||||
if (!("strategy" in findOptions_.options)) {
|
||||
if (findOptions_.options.limit != null || findOptions_.options.offset) {
|
||||
Object.assign(findOptions_.options, {
|
||||
strategy: LoadStrategy.BALANCED,
|
||||
strategy: LoadStrategy.SELECT_IN,
|
||||
})
|
||||
} else {
|
||||
Object.assign(findOptions_.options, {
|
||||
strategy: LoadStrategy.JOINED,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,7 +162,7 @@ describe("Entity builder", () => {
|
||||
kind: "scalar",
|
||||
setter: true,
|
||||
trackChanges: false,
|
||||
type: expect.any(Function),
|
||||
type: "any",
|
||||
runtimeType: "any",
|
||||
},
|
||||
raw_spend_limit: {
|
||||
@@ -306,7 +306,7 @@ describe("Entity builder", () => {
|
||||
kind: "scalar",
|
||||
setter: true,
|
||||
trackChanges: false,
|
||||
type: expect.any(Function),
|
||||
type: "any",
|
||||
runtimeType: "any",
|
||||
},
|
||||
raw_spend_limit: {
|
||||
@@ -441,7 +441,7 @@ describe("Entity builder", () => {
|
||||
kind: "scalar",
|
||||
setter: true,
|
||||
trackChanges: false,
|
||||
type: expect.any(Function),
|
||||
type: "any",
|
||||
runtimeType: "any",
|
||||
},
|
||||
raw_spend_limit: {
|
||||
@@ -555,7 +555,7 @@ describe("Entity builder", () => {
|
||||
kind: "scalar",
|
||||
setter: true,
|
||||
trackChanges: false,
|
||||
type: expect.any(Function),
|
||||
type: "any",
|
||||
runtimeType: "any",
|
||||
},
|
||||
raw_spend_limit: {
|
||||
@@ -701,7 +701,7 @@ describe("Entity builder", () => {
|
||||
kind: "scalar",
|
||||
setter: true,
|
||||
trackChanges: false,
|
||||
type: expect.any(Function),
|
||||
type: "any",
|
||||
runtimeType: "any",
|
||||
},
|
||||
raw_spend_limit: {
|
||||
@@ -858,7 +858,7 @@ describe("Entity builder", () => {
|
||||
kind: "scalar",
|
||||
setter: true,
|
||||
trackChanges: false,
|
||||
type: expect.any(Function),
|
||||
type: "any",
|
||||
runtimeType: "any",
|
||||
},
|
||||
created_at: {
|
||||
@@ -3916,7 +3916,6 @@ describe("Entity builder", () => {
|
||||
type: "string",
|
||||
},
|
||||
group: {
|
||||
defaultRaw: "",
|
||||
entity: "Group",
|
||||
fieldName: "group_id",
|
||||
name: "group",
|
||||
@@ -4537,7 +4536,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
user: {
|
||||
defaultRaw: "",
|
||||
entity: "User",
|
||||
fieldName: "user_id",
|
||||
name: "user",
|
||||
@@ -5149,7 +5147,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
user: {
|
||||
defaultRaw: "",
|
||||
name: "user",
|
||||
kind: "m:1",
|
||||
entity: "User",
|
||||
@@ -5339,7 +5336,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
user: {
|
||||
defaultRaw: "",
|
||||
name: "user",
|
||||
kind: "m:1",
|
||||
fieldName: "user_id",
|
||||
@@ -5888,7 +5884,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
parent: {
|
||||
defaultRaw: "",
|
||||
name: "parent",
|
||||
fieldName: "parent_id",
|
||||
kind: "m:1",
|
||||
@@ -6140,7 +6135,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
teams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "teams",
|
||||
entity: "Team",
|
||||
@@ -6210,7 +6204,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
users: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "users",
|
||||
inversedBy: "teams",
|
||||
@@ -6323,7 +6316,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
teams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "teams",
|
||||
entity: "Team",
|
||||
@@ -6393,7 +6385,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
users: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "users",
|
||||
entity: "User",
|
||||
@@ -6620,7 +6611,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
teams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "teams",
|
||||
entity: "Team",
|
||||
@@ -6690,7 +6680,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
users: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "users",
|
||||
entity: "User",
|
||||
@@ -6803,7 +6792,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
teams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "teams",
|
||||
entity: "Team",
|
||||
@@ -6873,7 +6861,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
users: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "users",
|
||||
entity: "User",
|
||||
@@ -7004,7 +6991,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
teams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "teams",
|
||||
entity: "Team",
|
||||
@@ -7013,7 +6999,6 @@ describe("Entity builder", () => {
|
||||
mappedBy: "users",
|
||||
},
|
||||
activeTeams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "activeTeams",
|
||||
entity: "Team",
|
||||
@@ -7083,7 +7068,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
users: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "users",
|
||||
entity: "User",
|
||||
@@ -7092,7 +7076,6 @@ describe("Entity builder", () => {
|
||||
inversedBy: "teams",
|
||||
},
|
||||
activeTeamsUsers: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "activeTeamsUsers",
|
||||
entity: "User",
|
||||
@@ -7208,7 +7191,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
teams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "teams",
|
||||
entity: "Team",
|
||||
@@ -7279,7 +7261,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
users: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "users",
|
||||
entity: "User",
|
||||
@@ -7368,7 +7349,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
teams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "teams",
|
||||
entity: "TeamSquad",
|
||||
@@ -7438,7 +7418,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
users: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "users",
|
||||
entity: "RandomUser",
|
||||
@@ -7554,7 +7533,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
teams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "teams",
|
||||
entity: "Team",
|
||||
@@ -7624,7 +7602,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
users: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "users",
|
||||
owner: false,
|
||||
@@ -7834,7 +7811,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
users: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "users",
|
||||
entity: "User",
|
||||
@@ -7904,7 +7880,6 @@ describe("Entity builder", () => {
|
||||
setter: false,
|
||||
},
|
||||
teams: {
|
||||
defaultRaw: "",
|
||||
kind: "m:n",
|
||||
name: "teams",
|
||||
entity: "Team",
|
||||
|
||||
@@ -6,7 +6,7 @@ import type {
|
||||
Infer,
|
||||
PropertyType,
|
||||
} from "@medusajs/types"
|
||||
import { Entity, Filter, MetadataStorage } from "@mikro-orm/core"
|
||||
import { Entity, Filter } from "@mikro-orm/core"
|
||||
|
||||
import {
|
||||
mikroOrmFreeTextSearchFilterOptionsFactory,
|
||||
@@ -116,16 +116,12 @@ function createMikrORMEntity() {
|
||||
Filter(mikroOrmFreeTextSearchFilterOptionsFactory(modelName))(
|
||||
MikroORMEntity
|
||||
)
|
||||
|
||||
Entity({ tableName })(
|
||||
const RegisteredEntity = Entity({ tableName })(
|
||||
Filter(mikroOrmSoftDeletableFilterOptions)(MikroORMEntity)
|
||||
) as any
|
||||
) as Infer<T>
|
||||
|
||||
const entityMetadata =
|
||||
MetadataStorage.getMetadataFromDecorator(MikroORMEntity)
|
||||
|
||||
ENTITIES[modelName] = entityMetadata.class as Constructor<any>
|
||||
return entityMetadata.class as Infer<T>
|
||||
ENTITIES[modelName] = RegisteredEntity
|
||||
return RegisteredEntity
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -294,7 +294,6 @@ export function defineHasManyRelationship(
|
||||
}
|
||||
|
||||
OneToMany(options)(MikroORMEntity.prototype, relationship.name)
|
||||
// MikroORMEntity.prototype[relationship.name] = new Collection(MikroORMEntity)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -467,7 +466,6 @@ export function defineBelongsToRelationship(
|
||||
|
||||
ManyToOne({
|
||||
entity: relatedModelName,
|
||||
defaultRaw: "", // This is a workaround since we are hacking mikro orm default behavior. The default value here is [Object object] which pass the check here and in turns is returned as a returning field -> @mikro-orm/knex/AbstractSqlDriver.js:462
|
||||
fieldName: foreignKeyName,
|
||||
persist: false,
|
||||
nullable: relationship.nullable,
|
||||
@@ -743,7 +741,6 @@ export function defineManyToManyRelationship(
|
||||
const manytoManyOptions = {
|
||||
owner: isOwner,
|
||||
entity: relatedModelName,
|
||||
defaultRaw: "", // This is a workaround since we are hacking mikro orm default behavior. The default value here is [Object object] which pass the check here and in turns is returned as a returning field -> @mikro-orm/knex/AbstractSqlDriver.js:462
|
||||
...(pivotTableName
|
||||
? {
|
||||
pivotTable: pgSchema
|
||||
|
||||
@@ -16,7 +16,6 @@ describe("Internal Module Service Factory", () => {
|
||||
[modelRepositoryName]: {
|
||||
transaction: (task) => task(),
|
||||
getFreshManager: jest.fn().mockReturnThis(),
|
||||
getActiveManager: jest.fn().mockReturnThis(),
|
||||
find: jest.fn(),
|
||||
findAndCount: jest.fn(),
|
||||
create: jest.fn(),
|
||||
@@ -29,7 +28,6 @@ describe("Internal Module Service Factory", () => {
|
||||
[`composite${Model.name}Repository`]: {
|
||||
transaction: (task) => task(),
|
||||
getFreshManager: jest.fn().mockReturnThis(),
|
||||
getActiveManager: jest.fn().mockReturnThis(),
|
||||
find: jest.fn(),
|
||||
findAndCount: jest.fn(),
|
||||
create: jest.fn(),
|
||||
|
||||
@@ -7,7 +7,6 @@ const baseRepoMock = {
|
||||
serialize: jest.fn().mockImplementation((item) => item),
|
||||
transaction: (task) => task("transactionManager"),
|
||||
getFreshManager: jest.fn().mockReturnThis(),
|
||||
getActiveManager: jest.fn().mockReturnThis(),
|
||||
}
|
||||
|
||||
const defaultContext = {
|
||||
|
||||
@@ -52,8 +52,7 @@ export function InjectManager(managerProperty?: string): MethodDecorator {
|
||||
}
|
||||
|
||||
copiedContext.manager =
|
||||
originalContext.manager ??
|
||||
resourceWithManager.getActiveManager(originalContext)
|
||||
originalContext.manager ?? resourceWithManager.getFreshManager()
|
||||
|
||||
if (originalContext?.transactionManager) {
|
||||
copiedContext.transactionManager = originalContext?.transactionManager
|
||||
|
||||
@@ -27,16 +27,16 @@
|
||||
"author": "Medusa",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"awilix": "^8.0.1",
|
||||
"expect-type": "^0.20.0",
|
||||
"jest": "^29.7.0",
|
||||
"pg": "^8.16.3",
|
||||
"pg": "^8.13.0",
|
||||
"rimraf": "^5.0.1",
|
||||
"typescript": "^5.6.2",
|
||||
"zod": "3.25.76"
|
||||
@@ -49,13 +49,13 @@
|
||||
"ulid": "^2.3.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@mikro-orm/core": "6.5.2",
|
||||
"@mikro-orm/knex": "6.5.2",
|
||||
"@mikro-orm/migrations": "6.5.2",
|
||||
"@mikro-orm/postgresql": "6.5.2",
|
||||
"@mikro-orm/core": "6.4.3",
|
||||
"@mikro-orm/knex": "6.4.3",
|
||||
"@mikro-orm/migrations": "6.4.3",
|
||||
"@mikro-orm/postgresql": "6.4.3",
|
||||
"awilix": "^8.0.1",
|
||||
"express": "^4.21.0",
|
||||
"pg": "^8.16.3"
|
||||
"pg": "^8.13.0"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "rimraf dist && tsc --build",
|
||||
|
||||
Reference in new issue
Block a user