Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .github/workflows/checks.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/publish-image.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/workflows/publish-npm.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/tools.yml

This file was deleted.

578 changes: 110 additions & 468 deletions .pnp.cjs

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
defaultSemverRangePrefix: ""
defaultSemverRangePrefix: ''

enableGlobalCache: true

globalFolder: ../.yarn/berry

npmRegistryServer: "https://registry.npmjs.org"
npmRegistryServer: 'https://registry.npmjs.org'

npmScopes:
atls:
npmRegistryServer: "https://registry.npmjs.org"
npmRegistryServer: 'https://registry.npmjs.org'

packageExtensions:
"@mikro-orm/postgresql@*":
'@mikro-orm/postgresql@*':
dependencies:
"@mikro-orm/core": "*"
'@mikro-orm/core': '*'
'@types/pg': '*'

pnpEnableEsmLoader: true

Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@
"type": "project",
"migration": "1711577800849"
}
}
},
"typecheckSkipLibCheck": true
}
7 changes: 4 additions & 3 deletions packages/mikro-orm-logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"@atls/logger": "0.0.3"
},
"devDependencies": {
"@mikro-orm/core": "6.4.9",
"@mikro-orm/core": "7.1.5",
"@types/node": "22.13.10"
},
"peerDependencies": {
"@mikro-orm/core": "^5 || ^6"
"@mikro-orm/core": "^7"
},
"publishConfig": {
"access": "public",
Expand All @@ -38,5 +38,6 @@
},
"main": "dist/index.js",
"typings": "dist/index.d.ts"
}
},
"typecheckSkipLibCheck": true
}
16 changes: 7 additions & 9 deletions packages/mikro-orm-query-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,16 @@
},
"dependencies": {
"@atls/query-types": "0.0.1",
"@mikro-orm/postgresql": "*",
"lodash.set": "4.3.2"
},
"devDependencies": {
"@types/lodash.set": "4.3.9"
"@mikro-orm/core": "7.1.5",
"@mikro-orm/postgresql": "7.1.5",
"@types/lodash.set": "4.3.9",
"@types/pg": "8.20.0"
},
"peerDependencies": {
"@mikro-orm/postgresql": "*"
},
"peerDependenciesMeta": {
"@mikro-orm/core": {
"optional": true
}
"@mikro-orm/postgresql": "^7"
},
"publishConfig": {
"exports": {
Expand All @@ -43,5 +40,6 @@
},
"main": "dist/index.js",
"typings": "dist/index.d.ts"
}
},
"typecheckSkipLibCheck": true
}
34 changes: 21 additions & 13 deletions packages/mikro-orm-query-builder/src/mikro-orm.query-builder.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import type { QueryBuilder } from '@mikro-orm/postgresql'
import type { QBFilterQuery } from '@mikro-orm/postgresql'
import type { QueryBuilder } from '@mikro-orm/postgresql'

import { Query } from '@atls/query-types'
import set from 'lodash.set'
import { Query } from '@atls/query-types'
import set from 'lodash.set'

type ConditionQuery<TConditions> = {
conditions?: TConditions
Expand Down Expand Up @@ -29,6 +30,9 @@ type StringConditions = ContainsCondition & EqualityCondition<string> & Inclusio

type NumberConditions = EqualityCondition<number> & InclusionCondition<number>

const toFilterQuery = <T extends object>(value: object): QBFilterQuery<T> =>
value as QBFilterQuery<T>

export class MikroORMQueryBuilder<T extends object> {
#take?: number

Expand Down Expand Up @@ -56,12 +60,14 @@ export class MikroORMQueryBuilder<T extends object> {

search(fields?: Array<Query.SearchField>, value?: string): MikroORMQueryBuilder<T> {
if (value && fields && fields.length > 0) {
this.qb.andWhere({
$or: fields.map((field) =>
set({}, field.path, {
$ilike: value,
})),
})
this.qb.andWhere(
toFilterQuery<T>({
$or: fields.map((field) =>
set({}, field.path, {
$ilike: value,
})),
})
)
}

return this
Expand Down Expand Up @@ -159,17 +165,19 @@ export class MikroORMQueryBuilder<T extends object> {
if (keys.length === 1) {
const [singleKey] = keys

this.qb.andWhere(set({}, field, { [singleKey]: collected[singleKey] }))
this.qb.andWhere(toFilterQuery<T>(set({}, field, { [singleKey]: collected[singleKey] })))

return
}

const operator = (query?.operator || Query.Operator.AND) === Query.Operator.AND ? '$and' : '$or'

this.qb.andWhere(
set({}, field, {
[operator]: keys.map((key) => ({ [key]: collected[key] })),
})
toFilterQuery<T>(
set({}, field, {
[operator]: keys.map((key) => ({ [key]: collected[key] })),
})
)
)
}
}
Loading
Loading