diff --git a/.changeset/metal-toys-juggle.md b/.changeset/metal-toys-juggle.md new file mode 100644 index 0000000..ee98067 --- /dev/null +++ b/.changeset/metal-toys-juggle.md @@ -0,0 +1,5 @@ +--- +"mikro-orm-find-dataloader": minor +--- + +fix: support excludes syntax from latest v6 alpha diff --git a/examples/graphql/package.json b/examples/graphql/package.json index 1aae640..0ff7676 100755 --- a/examples/graphql/package.json +++ b/examples/graphql/package.json @@ -17,8 +17,8 @@ }, "dependencies": { "@graphql-tools/executor-http": "^1.0.5", - "@mikro-orm/core": "6.0.0-dev.261", - "@mikro-orm/sqlite": "6.0.0-dev.261", + "@mikro-orm/core": "6.0.0-dev.283", + "@mikro-orm/sqlite": "6.0.0-dev.283", "graphql": "16.8.1", "graphql-tag": "^2.12.6", "graphql-yoga": "5.0.2", diff --git a/package.json b/package.json index 2436657..e287c4d 100644 --- a/package.json +++ b/package.json @@ -26,13 +26,13 @@ "@changesets/cli": "^2.27.1", "@types/eslint": "^8.44.9", "@types/jest": "^29.5.11", - "@types/node": "^20.10.4", - "@typescript-eslint/eslint-plugin": "^6.14.0", - "@typescript-eslint/parser": "^6.14.0", - "eslint": "^8.55.0", + "@types/node": "^20.10.5", + "@typescript-eslint/eslint-plugin": "^6.15.0", + "@typescript-eslint/parser": "^6.15.0", + "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", - "eslint-config-standard-with-typescript": "^42.0.0", - "eslint-plugin-import": "^2.29.0", + "eslint-config-standard-with-typescript": "^43.0.0", + "eslint-plugin-import": "^2.29.1", "eslint-plugin-jest": "^27.6.0", "eslint-plugin-n": "^16.4.0", "eslint-plugin-prettier": "^5.0.1", diff --git a/packages/find/package.json b/packages/find/package.json index a3a7e4f..54bda2d 100644 --- a/packages/find/package.json +++ b/packages/find/package.json @@ -54,7 +54,7 @@ "tslib": "2.6.2" }, "devDependencies": { - "@mikro-orm/core": "6.0.0-dev.261", - "@mikro-orm/sqlite": "6.0.0-dev.261" + "@mikro-orm/core": "6.0.0-dev.283", + "@mikro-orm/sqlite": "6.0.0-dev.283" } } diff --git a/packages/find/src/findDataloader.ts b/packages/find/src/findDataloader.ts index 38d8716..736a1e0 100644 --- a/packages/find/src/findDataloader.ts +++ b/packages/find/src/findDataloader.ts @@ -11,7 +11,6 @@ import { type FilterItemValue, type Scalar, type ExpandProperty, - type ExpandQuery, type ExpandScalar, type EntityProps, type EntityManager, @@ -25,12 +24,15 @@ import type DataLoader from "dataloader"; export interface OperatorMapDataloader { // $and?: ExpandQuery[]; - $or?: Array>; + $or?: Array>; // $eq?: ExpandScalar | ExpandScalar[]; // $ne?: ExpandScalar; // $in?: ExpandScalar[]; // $nin?: ExpandScalar[]; // $not?: ExpandQuery; + // $none?: ExpandQuery; + // $some?: ExpandQuery; + // $every?: ExpandQuery; // $gt?: ExpandScalar; // $gte?: ExpandScalar; // $lt?: ExpandScalar; @@ -39,9 +41,9 @@ export interface OperatorMapDataloader { // $re?: string; // $ilike?: string; // $fulltext?: string; - // $overlap?: string[]; - // $contains?: string[]; - // $contained?: string[]; + // $overlap?: string[] | object; + // $contains?: string[] | object; + // $contained?: string[] | object; // $exists?: boolean; } @@ -49,7 +51,7 @@ export type FilterValueDataloader = /* OperatorMapDataloader> | */ FilterItemValue | FilterItemValue[] | null; -export type QueryDataloader = T extends object +export type ExpandQueryDataloader = T extends object ? T extends Scalar ? never : FilterQueryDataloader @@ -57,16 +59,18 @@ export type QueryDataloader = T extends object export type FilterObjectDataloader = { -readonly [K in EntityKey]?: - | QueryDataloader> + | ExpandQueryDataloader> | FilterValueDataloader> | null; }; -export type Compute = { - [K in keyof T]: T[K]; -} & {}; +export type ExpandObjectDataloader = T extends object + ? T extends Scalar + ? never + : FilterObjectDataloader + : never; -export type ObjectQueryDataloader = Compute & FilterObjectDataloader>; +export type ObjectQueryDataloader = OperatorMapDataloader & ExpandObjectDataloader; // FilterQuery export type FilterQueryDataloader = @@ -360,6 +364,7 @@ function updateQueryFilter( const curValue = (cur as Record)[key]!; if (Array.isArray(value)) { // value.push(...curValue.reduce((acc, cur) => acc.concat(cur), [])); + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument value.push(...structuredClone(curValue)); } else { updateQueryFilter([value], curValue); @@ -465,6 +470,7 @@ export function getFindBatchLoadFn( const res = entities[many ? "filter" : "find"]((entity) => { return filterResult(entity, newFilter); }); + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument acc.push(...(Array.isArray(res) ? res : [res])); return acc; }, []); @@ -493,6 +499,7 @@ export function getFindBatchLoadFn( if (!entityValue.getItems().some((entity) => filterResult(entity, value))) { return false; } + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument } else if (!filterResult(entityValue as object, value)) { return false; } @@ -514,6 +521,7 @@ export function optsMapToQueries( populate: options.populate === true ? ["*"] : Array.from(options.populate), }), } satisfies Pick, "populate">; + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument const entities = await em.find(entityName, filter, findOptions); return [key, entities]; }); diff --git a/packages/find/src/findRepository.ts b/packages/find/src/findRepository.ts index df0c195..02cbdfe 100644 --- a/packages/find/src/findRepository.ts +++ b/packages/find/src/findRepository.ts @@ -17,50 +17,50 @@ export interface IFindDataloaderEntityRepository { readonly dataloader: D; - find( + find( where: FilterQuery, - options?: { dataloader: false } & FindOptions, - ): Promise>>; - find( + options?: { dataloader: false } & FindOptions, + ): Promise>>; + find( where: FilterQueryDataloader, - options?: { dataloader: boolean } & Pick, "populate">, - ): Promise>>; - find( + options?: { dataloader: boolean } & Pick, "populate">, + ): Promise>>; + find( where: D extends true ? FilterQueryDataloader : FilterQueryDataloader | FilterQuery, options?: { dataloader?: undefined } & (D extends true - ? Pick, "populate"> - : FindOptions), - ): Promise>>; + ? Pick, "populate"> + : FindOptions), + ): Promise>>; - findOne( + findOne( where: FilterQuery, - options?: { dataloader: false } & FindOneOptions, - ): Promise | null>; - findOne( + options?: { dataloader: false } & FindOneOptions, + ): Promise | null>; + findOne( where: FilterQueryDataloader, - options?: { dataloader: boolean } & Pick, "populate">, - ): Promise | null>; - findOne( + options?: { dataloader: boolean } & Pick, "populate">, + ): Promise | null>; + findOne( where: D extends true ? FilterQueryDataloader : FilterQueryDataloader | FilterQuery, options?: { dataloader?: undefined } & (D extends true - ? Pick, "populate"> - : FindOneOptions), - ): Promise | null>; + ? Pick, "populate"> + : FindOneOptions), + ): Promise | null>; - findOneOrFail( + findOneOrFail( where: FilterQuery, - options?: { dataloader: false } & FindOneOrFailOptions, - ): Promise>; - findOneOrFail( + options?: { dataloader: false } & FindOneOrFailOptions, + ): Promise>; + findOneOrFail( where: FilterQueryDataloader, - options?: { dataloader: boolean } & Pick, "populate">, - ): Promise>; - findOneOrFail( + options?: { dataloader: boolean } & Pick, "populate">, + ): Promise>; + findOneOrFail( where: D extends true ? FilterQueryDataloader : FilterQueryDataloader | FilterQuery, options?: { dataloader?: undefined } & (D extends true - ? Pick, "populate"> - : FindOneOrFailOptions), - ): Promise>; + ? Pick, "populate"> + : FindOneOrFailOptions), + ): Promise>; } export type FindDataloaderEntityRepositoryCtor = new ( @@ -78,13 +78,13 @@ export function getFindDataloaderEntityRepository( + async find( where: FilterQueryDataloader | FilterQuery, options?: { dataloader?: boolean } & ( - | Pick, "populate"> - | FindOptions + | Pick, "populate"> + | FindOptions ), - ): Promise>> { + ): Promise>> { const entityName = Utils.className(this.entityName); const res = await (options?.dataloader ?? this.dataloader ? this.findLoader.load({ @@ -94,17 +94,17 @@ export function getFindDataloaderEntityRepository(this.entityName, where as FilterQuery, options)); - return res as Array>; + : this.em.find(this.entityName, where as FilterQuery, options)); + return res as Array>; } - async findOne( + async findOne( where: FilterQueryDataloader | FilterQuery, options?: { dataloader?: boolean } & ( - | Pick, "populate"> - | FindOneOptions + | Pick, "populate"> + | FindOneOptions ), - ): Promise | null> { + ): Promise | null> { const entityName = Utils.className(this.entityName); const res = await (options?.dataloader ?? this.dataloader ? this.findLoader.load({ @@ -114,17 +114,17 @@ export function getFindDataloaderEntityRepository(this.entityName, where as FilterQuery, options)); - return res as Loaded | null; + : this.em.findOne(this.entityName, where as FilterQuery, options)); + return res as Loaded | null; } - async findOneOrFail( + async findOneOrFail( where: FilterQueryDataloader | FilterQuery, options?: { dataloader?: boolean } & ( - | Pick, "populate"> - | FindOneOrFailOptions + | Pick, "populate"> + | FindOneOrFailOptions ), - ): Promise> { + ): Promise> { const entityName = Utils.className(this.entityName); const res = await (options?.dataloader ?? this.dataloader ? this.findLoader.load({ @@ -134,11 +134,15 @@ export function getFindDataloaderEntityRepository(this.entityName, where as FilterQuery, options)); + : this.em.findOneOrFail( + this.entityName, + where as FilterQuery, + options, + )); if (res == null) { throw new Error("Cannot find result"); } - return res as Loaded; + return res as Loaded; } } diff --git a/yarn.lock b/yarn.lock index 4d69e5f..c759582 100644 --- a/yarn.lock +++ b/yarn.lock @@ -743,10 +743,10 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:8.55.0": - version: 8.55.0 - resolution: "@eslint/js@npm:8.55.0" - checksum: 34b001a95b16501fd64f525b1de3ab0e4c252e5820b74069004934cb13977fc04ba4522a3e8f8074bd6af49da10d3444cd49fa711819f425ad73d6bf46eea82d +"@eslint/js@npm:8.56.0": + version: 8.56.0 + resolution: "@eslint/js@npm:8.56.0" + checksum: 97a4b5ccf7e24f4d205a1fb0f21cdcd610348ecf685f6798a48dd41ba443f2c1eedd3050ff5a0b8f30b8cf6501ab512aa9b76e531db15e59c9ebaa41f3162e37 languageName: node linkType: hard @@ -1262,45 +1262,45 @@ __metadata: languageName: node linkType: hard -"@mikro-orm/core@npm:6.0.0-dev.261": - version: 6.0.0-dev.261 - resolution: "@mikro-orm/core@npm:6.0.0-dev.261" +"@mikro-orm/core@npm:6.0.0-dev.283": + version: 6.0.0-dev.283 + resolution: "@mikro-orm/core@npm:6.0.0-dev.283" dependencies: dataloader: "npm:2.2.2" dotenv: "npm:16.3.1" esprima: "npm:4.0.1" fs-extra: "npm:11.2.0" globby: "npm:11.1.0" - mikro-orm: "npm:6.0.0-dev.261" - reflect-metadata: "npm:0.1.14" - checksum: 4e4e8595705d261c7c41566797199f7faa1df40f8d4d45e1e1514b06dfa5b298806501ab60ff7169e05e40e3b1d5869ce9527a13d2c338aa485b611117bc743a + mikro-orm: "npm:6.0.0-dev.283" + reflect-metadata: "npm:0.2.1" + checksum: 452057b2adcbaf3009c83241a5a17e357a8d779215197b9b2c398d07e706ffe08ca1425499eceeb1f04faceb48a2be0142b1c6cc80462b3d71c58c620d071374 languageName: node linkType: hard -"@mikro-orm/knex@npm:6.0.0-dev.261": - version: 6.0.0-dev.261 - resolution: "@mikro-orm/knex@npm:6.0.0-dev.261" +"@mikro-orm/knex@npm:6.0.0-dev.283": + version: 6.0.0-dev.283 + resolution: "@mikro-orm/knex@npm:6.0.0-dev.283" dependencies: fs-extra: "npm:11.2.0" knex: "npm:3.1.0" sqlstring: "npm:2.3.3" peerDependencies: - "@mikro-orm/core": 6.0.0-dev.261 - checksum: 7a3292c3e84e931da66e5f43730c86a2f2993504a7ffc47cdb75c6d6cb0ac1cb1d371dc5235ea069b892d9391f85bd2b8052ec629e686127496bc747a4c910ab + "@mikro-orm/core": 6.0.0-dev.283 + checksum: 3b18fbf3334844c1fc035f6802b912445a57accdece97631c015fe229c9dbf12751a45b12361433b72b467455cd3d85329c025b3578c1113efdc7af8a5d85d5b languageName: node linkType: hard -"@mikro-orm/sqlite@npm:6.0.0-dev.261": - version: 6.0.0-dev.261 - resolution: "@mikro-orm/sqlite@npm:6.0.0-dev.261" +"@mikro-orm/sqlite@npm:6.0.0-dev.283": + version: 6.0.0-dev.283 + resolution: "@mikro-orm/sqlite@npm:6.0.0-dev.283" dependencies: - "@mikro-orm/knex": "npm:6.0.0-dev.261" + "@mikro-orm/knex": "npm:6.0.0-dev.283" fs-extra: "npm:11.2.0" sqlite3: "npm:5.1.6" sqlstring-sqlite: "npm:0.1.1" peerDependencies: - "@mikro-orm/core": 6.0.0-dev.261 - checksum: 9f343ad871a145a11348ac23368d01a333b8b27c41d2c033657b3a371fce58b7a73e4eda6b15a459ce3d5394a353b2e123913b8b777734465ff8ffdd4b3fd0eb + "@mikro-orm/core": 6.0.0-dev.283 + checksum: b1f005378982ce25196e90295944e25fef4f60c9af36275098f92b44a00b8fd3ec826591222cbbb0f45f350319760aeaba601cab74c09176fa9dca3666ea84e9 languageName: node linkType: hard @@ -1475,11 +1475,11 @@ __metadata: linkType: hard "@types/babel__generator@npm:*": - version: 7.6.7 - resolution: "@types/babel__generator@npm:7.6.7" + version: 7.6.8 + resolution: "@types/babel__generator@npm:7.6.8" dependencies: "@babel/types": "npm:^7.0.0" - checksum: 11d36fdcee9968a7fa05e5e5086bcc349ad32b7d7117728334be76b82444b5e1c89c0efe15205a3f47f299a4864912165e6f0d31ba285fc4f05dbbafcb83e9b6 + checksum: b53c215e9074c69d212402990b0ca8fa57595d09e10d94bda3130aa22b55d796e50449199867879e4ea0ee968f3a2099e009cfb21a726a53324483abbf25cd30 languageName: node linkType: hard @@ -1584,12 +1584,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^20.10.4": - version: 20.10.4 - resolution: "@types/node@npm:20.10.4" +"@types/node@npm:*, @types/node@npm:^20.10.5": + version: 20.10.5 + resolution: "@types/node@npm:20.10.5" dependencies: undici-types: "npm:~5.26.4" - checksum: c10c1dd13f5c2341ad866777dc32946538a99e1ebd203ae127730814b8e5fa4aedfbcb01cb3e24a5466f1af64bcdfa16e7de6e745ff098fff0942aa779b7fe03 + checksum: 4a378428d2c9f692b19801a5a3d20dc4c0ad5d4a3d103350f8b401af439941a9aa5efeadc8eb9db13c66c620318bc7f336abfc8934f82fd32c4a689d85068c6f languageName: node linkType: hard @@ -1637,15 +1637,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.14.0" +"@typescript-eslint/eslint-plugin@npm:^6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.15.0" dependencies: "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:6.14.0" - "@typescript-eslint/type-utils": "npm:6.14.0" - "@typescript-eslint/utils": "npm:6.14.0" - "@typescript-eslint/visitor-keys": "npm:6.14.0" + "@typescript-eslint/scope-manager": "npm:6.15.0" + "@typescript-eslint/type-utils": "npm:6.15.0" + "@typescript-eslint/utils": "npm:6.15.0" + "@typescript-eslint/visitor-keys": "npm:6.15.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.2.4" @@ -1658,25 +1658,25 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: d420277bed0104713fb4a3c2e0fed32b300919708db3f2e3d13bc83e80a9aec181bfc4e1e6012c65408c318f3ac113926fc77e6667d7657e34fa0d5a2c21ee32 + checksum: 9020370c5e89b52b65ed2373c755d4b70f57ec7ebcf02d3e2f323f31ec81717af110d8e5f903b189b71e0a952f042e0fe2b637e77959c3102907efed4ba55512 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^6.14.0, @typescript-eslint/parser@npm:^6.4.0": - version: 6.14.0 - resolution: "@typescript-eslint/parser@npm:6.14.0" +"@typescript-eslint/parser@npm:^6.15.0, @typescript-eslint/parser@npm:^6.4.0": + version: 6.15.0 + resolution: "@typescript-eslint/parser@npm:6.15.0" dependencies: - "@typescript-eslint/scope-manager": "npm:6.14.0" - "@typescript-eslint/types": "npm:6.14.0" - "@typescript-eslint/typescript-estree": "npm:6.14.0" - "@typescript-eslint/visitor-keys": "npm:6.14.0" + "@typescript-eslint/scope-manager": "npm:6.15.0" + "@typescript-eslint/types": "npm:6.15.0" + "@typescript-eslint/typescript-estree": "npm:6.15.0" + "@typescript-eslint/visitor-keys": "npm:6.15.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 34f46aa8aaadb0d0ecb7d791a8436fcf44ec04af33ee9d198bcf6f7ca3927d8caa79d4756e0c4ef0d50979d895df0b8f1a2473fc83104423c96856e9d56047f3 + checksum: fdd1f584e5068216c36a01e40750950ef309b36a522f6ecde36931690558a319960a702b4b4a806f335fb28ca99f8a07bb206571141550aaab1f6f40066f6605 languageName: node linkType: hard @@ -1690,22 +1690,22 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/scope-manager@npm:6.14.0" +"@typescript-eslint/scope-manager@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/scope-manager@npm:6.15.0" dependencies: - "@typescript-eslint/types": "npm:6.14.0" - "@typescript-eslint/visitor-keys": "npm:6.14.0" - checksum: fbe945169fe092df5953a54a552a9e8d9dc3dc158a39cd99de7f1843a169c82d3ba59e314b7d0f5b8110dbbe8c37c9e62dc2dda91a31536fe054221d5d8972c3 + "@typescript-eslint/types": "npm:6.15.0" + "@typescript-eslint/visitor-keys": "npm:6.15.0" + checksum: 168d783c06a99784362e2eaaa56396b31716ee785779707ef984c2abb3e822c56440473efc6580cb8b84b2da508731ad184a00b3618bc7f3f93d8243804f2fcf languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/type-utils@npm:6.14.0" +"@typescript-eslint/type-utils@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/type-utils@npm:6.15.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:6.14.0" - "@typescript-eslint/utils": "npm:6.14.0" + "@typescript-eslint/typescript-estree": "npm:6.15.0" + "@typescript-eslint/utils": "npm:6.15.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.0.1" peerDependencies: @@ -1713,7 +1713,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 52c2a380d694f629ed2d37ce9decc5d8f6d276b030dcb8ee2d0a21b667d789e0d50c8a4d06fa60a053cbcc162b50c3708260f569ccd765609f17499d5294c19d + checksum: 8dabb355f09f57de8b46d726ad95a57593e5b87427dee5182afecb490624424afec02b69a27018b352dcb5f930eb391cb8cdc12cd60a93231d4f04e63e2f2c0b languageName: node linkType: hard @@ -1724,10 +1724,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/types@npm:6.14.0" - checksum: bcb32d69ac4a570634e37a3f149b7653a85334ac7b1d736961b627647ceff74797c4ac30b1405c508ede9462fad53b0b4442dbdf21877bf91263390c6e426e95 +"@typescript-eslint/types@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/types@npm:6.15.0" + checksum: d55de64d532c9016c922cc36b86ab661d7d64d942057486a0bca7a7db07fade95c3de59bfe364bc76ab538fb979ca2e4e6744c3acf8919a2d61e73cc7f544363 languageName: node linkType: hard @@ -1749,12 +1749,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.14.0" +"@typescript-eslint/typescript-estree@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.15.0" dependencies: - "@typescript-eslint/types": "npm:6.14.0" - "@typescript-eslint/visitor-keys": "npm:6.14.0" + "@typescript-eslint/types": "npm:6.15.0" + "@typescript-eslint/visitor-keys": "npm:6.15.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -1763,24 +1763,24 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 870f00e81de428c0afae3f753c04229170aeec76d62dcded0e22cff1c733fe60a350cf68571c889f87ea7a6008b73f7c62a079e91ab056d79aa2b9803a5b7150 + checksum: 920f7f3bfe463a9da943e1a686b7f13ac802a5e33be52f39ac711aa53a1e274dbe173b41bba05581c560fabfc3e1fadcfd81ab53a036afe25fb1a76651fcad7a languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/utils@npm:6.14.0" +"@typescript-eslint/utils@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/utils@npm:6.15.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.12" "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:6.14.0" - "@typescript-eslint/types": "npm:6.14.0" - "@typescript-eslint/typescript-estree": "npm:6.14.0" + "@typescript-eslint/scope-manager": "npm:6.15.0" + "@typescript-eslint/types": "npm:6.15.0" + "@typescript-eslint/typescript-estree": "npm:6.15.0" semver: "npm:^7.5.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: fec7338edc31d89d5413ec49ce690e05741511ba1ba2a8c59ce14321f5026e73e0584dc9f35645ab4100561bcf8ecef8a08c042388743db53fe73f047132a150 + checksum: 7895240933ad28295508f8c4286a8b905550a35eda83a11ecf9511e53078e0af07e75a1872f1bc757f165b41fdc84616ea97c1e2e3bf80cff985935f25596228 languageName: node linkType: hard @@ -1812,13 +1812,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.14.0" +"@typescript-eslint/visitor-keys@npm:6.15.0": + version: 6.15.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.15.0" dependencies: - "@typescript-eslint/types": "npm:6.14.0" + "@typescript-eslint/types": "npm:6.15.0" eslint-visitor-keys: "npm:^3.4.1" - checksum: 404f87a121b4375b13e59ffc11ac2fe3c8e40025d0ef5cd6738ab7b3648ce1d41378414b1130ee68e0b454d7e6ec1937540799cdaa4ea572e2447b04d737ee44 + checksum: 4641a829485f67a5d9d3558aa0d152e5ab57b468cfd9653168ce9a141e1f051730669a024505183b64f7a7e5d8f62533af4ebd4ad7366b551390461e9c45ec18 languageName: node linkType: hard @@ -1847,15 +1847,15 @@ __metadata: linkType: hard "@whatwg-node/node-fetch@npm:^0.5.0": - version: 0.5.2 - resolution: "@whatwg-node/node-fetch@npm:0.5.2" + version: 0.5.3 + resolution: "@whatwg-node/node-fetch@npm:0.5.3" dependencies: "@kamilkisiela/fast-url-parser": "npm:^1.1.4" "@whatwg-node/events": "npm:^0.1.0" busboy: "npm:^1.6.0" fast-querystring: "npm:^1.1.1" tslib: "npm:^2.3.1" - checksum: 78777ce524cbc5d0160b2dfeec654449bbdfb745b5ec492ad33612fff0abef7124ccda6464dcaaa88966457a3aa66fe8bbbe0ecf8f0c79c6b9da5c0653b89c4a + checksum: 3680774b52978e3c33a88d8f11e75bbcd613e4a17f5bce63f99e75b3301bf5c7e9864e151a5e36aa6505fc77f76ee638c9f5133c5e9e59f489c58cceae794702 languageName: node linkType: hard @@ -3070,9 +3070,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.601": - version: 1.4.612 - resolution: "electron-to-chromium@npm:1.4.612" - checksum: 3c7c09d778e68aa161637a934dc1466fb87385ab3b964fd96399dfb8701c7fbe1ab1576cc25f02a2f8c618b2c4d8800379fdd29f121735e59277e67a4e783fab + version: 1.4.615 + resolution: "electron-to-chromium@npm:1.4.615" + checksum: dbf9deb234cbd381a91f41f6c6729cc8b4bed9b1580d6aea589d689d5f2a8aadf88837ef6887e761c143a1e1015f5eb3ae1bd2728a3068fa6a235c16c0fd76ae languageName: node linkType: hard @@ -3272,9 +3272,9 @@ __metadata: languageName: node linkType: hard -"eslint-config-standard-with-typescript@npm:^42.0.0": - version: 42.0.0 - resolution: "eslint-config-standard-with-typescript@npm:42.0.0" +"eslint-config-standard-with-typescript@npm:^43.0.0": + version: 43.0.0 + resolution: "eslint-config-standard-with-typescript@npm:43.0.0" dependencies: "@typescript-eslint/parser": "npm:^6.4.0" eslint-config-standard: "npm:17.1.0" @@ -3285,7 +3285,7 @@ __metadata: eslint-plugin-n: "^15.0.0 || ^16.0.0 " eslint-plugin-promise: ^6.0.0 typescript: "*" - checksum: 52bacf2d048133ca66200e72c02123ad4c5f749e702ea9e17d62039cec3ddd5f14ea3f1d2beaf595b1bcc2663d8984cb22ce421bc7ee7597fc43fd5d4d5c053c + checksum: 5c6ac9a204e613678484849826c88dab2821699278632145e50323ff88a5ca6fce7d18daa0a4fdb4e15f44de054a0f306950933aebe6358b3fcbc862c2831d2e languageName: node linkType: hard @@ -3337,9 +3337,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:^2.29.0": - version: 2.29.0 - resolution: "eslint-plugin-import@npm:2.29.0" +"eslint-plugin-import@npm:^2.29.1": + version: 2.29.1 + resolution: "eslint-plugin-import@npm:2.29.1" dependencies: array-includes: "npm:^3.1.7" array.prototype.findlastindex: "npm:^1.2.3" @@ -3357,10 +3357,10 @@ __metadata: object.groupby: "npm:^1.0.1" object.values: "npm:^1.1.7" semver: "npm:^6.3.1" - tsconfig-paths: "npm:^3.14.2" + tsconfig-paths: "npm:^3.15.0" peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: d6e8d016f38369892c85b866f762c03dee2b337d4f12031756e30d7490879261d1192a3c2f682fd7c4d2b923465f7a1e3d22cfdad5da1b1391c3bd39ea87af1a + checksum: 5865f05c38552145423c535326ec9a7113ab2305c7614c8b896ff905cfabc859c8805cac21e979c9f6f742afa333e6f62f812eabf891a7e8f5f0b853a32593c1 languageName: node linkType: hard @@ -3457,14 +3457,14 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.55.0": - version: 8.55.0 - resolution: "eslint@npm:8.55.0" +"eslint@npm:^8.56.0": + version: 8.56.0 + resolution: "eslint@npm:8.56.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.2.0" "@eslint-community/regexpp": "npm:^4.6.1" "@eslint/eslintrc": "npm:^2.1.4" - "@eslint/js": "npm:8.55.0" + "@eslint/js": "npm:8.56.0" "@humanwhocodes/config-array": "npm:^0.11.13" "@humanwhocodes/module-importer": "npm:^1.0.1" "@nodelib/fs.walk": "npm:^1.2.8" @@ -3501,7 +3501,7 @@ __metadata: text-table: "npm:^0.2.0" bin: eslint: bin/eslint.js - checksum: afd016cfbe9e9d667b3f98c14c681a7e518808f6c30856e56cbb02248900eac5bf6dc5e577a7eaec259539486db48ef7d16ef58fb14b1585ba7c84b35490c53c + checksum: ef6193c6e4cef20774b985a5cc2fd4bf6d3c4decd423117cbc4a0196617861745db291217ad3c537bc3a160650cca965bc818f55e1f3e446af1fcb293f9940a5 languageName: node linkType: hard @@ -3740,11 +3740,11 @@ __metadata: linkType: hard "fastq@npm:^1.6.0": - version: 1.15.0 - resolution: "fastq@npm:1.15.0" + version: 1.16.0 + resolution: "fastq@npm:1.16.0" dependencies: reusify: "npm:^1.0.4" - checksum: 67c01b1c972e2d5b6fea197a1a39d5d582982aea69ff4c504badac71080d8396d4843b165a9686e907c233048f15a86bbccb0e7f83ba771f6fa24bcde059d0c3 + checksum: de151543aab9d91900ed5da88860c46987ece925c628df586fac664235f25e020ec20729e1c032edb5fd2520fd4aa5b537d69e39b689e65e82112cfbecb4479e languageName: node linkType: hard @@ -4179,8 +4179,8 @@ __metadata: resolution: "graphql-example@workspace:examples/graphql" dependencies: "@graphql-tools/executor-http": "npm:^1.0.5" - "@mikro-orm/core": "npm:6.0.0-dev.261" - "@mikro-orm/sqlite": "npm:6.0.0-dev.261" + "@mikro-orm/core": "npm:6.0.0-dev.283" + "@mikro-orm/sqlite": "npm:6.0.0-dev.283" graphql: "npm:16.8.1" graphql-tag: "npm:^2.12.6" graphql-yoga: "npm:5.0.2" @@ -5861,18 +5861,18 @@ __metadata: version: 0.0.0-use.local resolution: "mikro-orm-find-dataloader@workspace:packages/find" dependencies: - "@mikro-orm/core": "npm:6.0.0-dev.261" - "@mikro-orm/sqlite": "npm:6.0.0-dev.261" + "@mikro-orm/core": "npm:6.0.0-dev.283" + "@mikro-orm/sqlite": "npm:6.0.0-dev.283" tslib: "npm:2.6.2" peerDependencies: "@mikro-orm/core": ^6.0.0 languageName: unknown linkType: soft -"mikro-orm@npm:6.0.0-dev.261": - version: 6.0.0-dev.261 - resolution: "mikro-orm@npm:6.0.0-dev.261" - checksum: 67a3e16d4555cca70d5a1eff4710276ca4e4bd0a25c90678c65138144a0d040a087991953dbfcc0d8f3c65493c06e42c6fbee8a9ab82abbdddf369afa4d292a7 +"mikro-orm@npm:6.0.0-dev.283": + version: 6.0.0-dev.283 + resolution: "mikro-orm@npm:6.0.0-dev.283" + checksum: b2fa818529f834eccc8e5595da0e981b0740a04a55c1f74fa4eb115e4282fae3611e8911acef538a82562d8a2edebc9515b41d8a7540fa3c99073bc37260910a languageName: node linkType: hard @@ -6818,17 +6818,17 @@ __metadata: languageName: node linkType: hard -"reflect-metadata@npm:0.1.14": - version: 0.1.14 - resolution: "reflect-metadata@npm:0.1.14" - checksum: fcab9c17ec3b9fea0e2f748c2129aceb57c24af6d8d13842b8a77c8c79dde727d7456ce293e76e8d7b267d1dbf93eea4c5b3c9101299a789a075824f2e40f1ee +"reflect-metadata@npm:0.2.1": + version: 0.2.1 + resolution: "reflect-metadata@npm:0.2.1" + checksum: 394b293bd4a538b644ed0e8730c5aeb1e08e78972c915b3d2cf3b302241952cfee8f8bd8a0fdf7d8c7fa78d31d0585489061624692e2577d767abd120cad968c languageName: node linkType: hard "regenerator-runtime@npm:^0.14.0": - version: 0.14.0 - resolution: "regenerator-runtime@npm:0.14.0" - checksum: 6c19495baefcf5fbb18a281b56a97f0197b5f219f42e571e80877f095320afac0bdb31dab8f8186858e6126950068c3f17a1226437881e3e70446ea66751897c + version: 0.14.1 + resolution: "regenerator-runtime@npm:0.14.1" + checksum: 5db3161abb311eef8c45bcf6565f4f378f785900ed3945acf740a9888c792f75b98ecb77f0775f3bf95502ff423529d23e94f41d80c8256e8fa05ed4b07cf471 languageName: node linkType: hard @@ -6981,13 +6981,13 @@ __metadata: "@changesets/cli": "npm:^2.27.1" "@types/eslint": "npm:^8.44.9" "@types/jest": "npm:^29.5.11" - "@types/node": "npm:^20.10.4" - "@typescript-eslint/eslint-plugin": "npm:^6.14.0" - "@typescript-eslint/parser": "npm:^6.14.0" - eslint: "npm:^8.55.0" + "@types/node": "npm:^20.10.5" + "@typescript-eslint/eslint-plugin": "npm:^6.15.0" + "@typescript-eslint/parser": "npm:^6.15.0" + eslint: "npm:^8.56.0" eslint-config-prettier: "npm:^9.1.0" - eslint-config-standard-with-typescript: "npm:^42.0.0" - eslint-plugin-import: "npm:^2.29.0" + eslint-config-standard-with-typescript: "npm:^43.0.0" + eslint-plugin-import: "npm:^2.29.1" eslint-plugin-jest: "npm:^27.6.0" eslint-plugin-n: "npm:^16.4.0" eslint-plugin-prettier: "npm:^5.0.1" @@ -7813,15 +7813,15 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:^3.14.2": - version: 3.14.2 - resolution: "tsconfig-paths@npm:3.14.2" +"tsconfig-paths@npm:^3.15.0": + version: 3.15.0 + resolution: "tsconfig-paths@npm:3.15.0" dependencies: "@types/json5": "npm:^0.0.29" json5: "npm:^1.0.2" minimist: "npm:^1.2.6" strip-bom: "npm:^3.0.0" - checksum: 17f23e98612a60cf23b80dc1d3b7b840879e41fcf603868fc3618a30f061ac7b463ef98cad8c28b68733b9bfe0cc40ffa2bcf29e94cf0d26e4f6addf7ac8527d + checksum: 2041beaedc6c271fc3bedd12e0da0cc553e65d030d4ff26044b771fac5752d0460944c0b5e680f670c2868c95c664a256cec960ae528888db6ded83524e33a14 languageName: node linkType: hard