@ptc-org/nestjs-query-typeorm 2.0.0-alpha.0 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -6
- package/package.json +9 -10
- package/src/common/index.js +1 -1
- package/src/common/index.js.map +1 -1
- package/src/module.d.ts +2 -2
- package/src/module.js.map +1 -1
- package/src/providers.d.ts +2 -2
- package/src/providers.js.map +1 -1
- package/src/query/filter-query.builder.d.ts +2 -2
- package/src/query/filter-query.builder.js +1 -1
- package/src/query/filter-query.builder.js.map +1 -1
- package/src/query/index.js +5 -5
- package/src/query/index.js.map +1 -1
- package/src/query/relation-query.builder.d.ts +3 -3
- package/src/query/relation-query.builder.js +1 -1
- package/src/query/relation-query.builder.js.map +1 -1
- package/src/query/sql-comparison.builder.d.ts +2 -2
- package/src/query/sql-comparison.builder.js +4 -4
- package/src/query/sql-comparison.builder.js.map +1 -1
- package/src/query/where.builder.d.ts +3 -3
- package/src/query/where.builder.js +1 -1
- package/src/query/where.builder.js.map +1 -1
- package/src/services/index.js +1 -1
- package/src/services/index.js.map +1 -1
- package/src/services/relation-query.service.js +5 -2
- package/src/services/relation-query.service.js.map +1 -1
- package/src/services/typeorm-query.service.js +4 -2
- package/src/services/typeorm-query.service.js.map +1 -1
package/README.md
CHANGED
|
@@ -1,11 +1,21 @@
|
|
|
1
|
-
|
|
1
|
+
<p align="center">
|
|
2
|
+
<a href="https://tripss.github.io/nestjs-query" target="blank"><img src="https://tripss.github.io/nestjs-query/img/logo.svg" width="120" alt="Nestjs-query Logo" /></a>
|
|
3
|
+
</p>
|
|
2
4
|
|
|
3
|
-
|
|
5
|
+
[](https://www.npmjs.org/package/@ptc-org/nestjs-query-graphql)
|
|
6
|
+
[](https://github.com/tripss/nestjs-query/actions?query=workflow%3ATest+and+branch%3Amaster+)
|
|
7
|
+
[](https://codecov.io/gh/TriPSs/nestjs-query)
|
|
8
|
+
[](https://snyk.io/test/github/tripss/nestjs-query?targetFile=packages/query-typeorm/package.json)
|
|
4
9
|
|
|
5
|
-
|
|
10
|
+
# `@ptc-org/nestjs-query-typeorm`
|
|
6
11
|
|
|
7
|
-
|
|
12
|
+
This package provides a code first implementation of graphql CRUD endpoints. It is built on top of of [nestjs](https://nestjs.com/).
|
|
8
13
|
|
|
9
|
-
##
|
|
14
|
+
## Installation
|
|
10
15
|
|
|
11
|
-
|
|
16
|
+
[Install Guide](https://tripss.github.io/nestjs-query/docs/introduction/install)
|
|
17
|
+
|
|
18
|
+
## Getting Started
|
|
19
|
+
|
|
20
|
+
The get started with the `@ptc-org/nestjs-query-typeorm` package checkout
|
|
21
|
+
the [Getting Started](https://tripss.github.io/nestjs-query/docs/persistence/typeorm/getting-started) docs.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ptc-org/nestjs-query-typeorm",
|
|
3
|
-
"version": "2.0.0
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"description": "Typeorm adapter for @ptc-org/nestjs-query-core",
|
|
5
5
|
"author": "doug-martin <doug@dougamartin.com>",
|
|
6
6
|
"homepage": "https://github.com/tripss/nestjs-query#readme",
|
|
@@ -23,15 +23,15 @@
|
|
|
23
23
|
"lodash.merge": "^4.6.2",
|
|
24
24
|
"lodash.omit": "^4.5.0",
|
|
25
25
|
"tslib": "^2.4.0",
|
|
26
|
-
"uuid": "^
|
|
26
|
+
"uuid": "^9.0.0"
|
|
27
27
|
},
|
|
28
28
|
"peerDependencies": {
|
|
29
|
-
"@nestjs/common": "^8.0.
|
|
30
|
-
"@nestjs/typeorm": "^8.0.0",
|
|
31
|
-
"class-transformer": "^0.2.3 || 0.3.1 || 0.
|
|
32
|
-
"typeorm": "0.
|
|
33
|
-
"@ptc-org/nestjs-query-core": "2.0.0
|
|
34
|
-
"reflect-metadata": "
|
|
29
|
+
"@nestjs/common": "^8.0.0 || ^9.0.0",
|
|
30
|
+
"@nestjs/typeorm": "^8.1.0 || ^9.0.0",
|
|
31
|
+
"class-transformer": "^0.2.3 || 0.3.1 || ^0.5",
|
|
32
|
+
"typeorm": "^0.3.8",
|
|
33
|
+
"@ptc-org/nestjs-query-core": "2.0.0",
|
|
34
|
+
"reflect-metadata": "0.1.13"
|
|
35
35
|
},
|
|
36
36
|
"repository": {
|
|
37
37
|
"type": "git",
|
|
@@ -40,6 +40,5 @@
|
|
|
40
40
|
},
|
|
41
41
|
"bugs": {
|
|
42
42
|
"url": "https://github.com/tripss/nestjs-query/issues"
|
|
43
|
-
}
|
|
44
|
-
"typings": "./src/index.d.ts"
|
|
43
|
+
}
|
|
45
44
|
}
|
package/src/common/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
|
|
4
|
+
tslib_1.__exportStar(require("./randomString"), exports);
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
package/src/common/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/common/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/common/index.ts"],"names":[],"mappings":";;;AAAA,yDAA8B"}
|
package/src/module.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DynamicModule } from '@nestjs/common';
|
|
2
2
|
import { Class } from '@ptc-org/nestjs-query-core';
|
|
3
|
-
import {
|
|
3
|
+
import type { DataSource } from 'typeorm';
|
|
4
4
|
export declare class NestjsQueryTypeOrmModule {
|
|
5
|
-
static forFeature(entities: Class<unknown>[], connection?:
|
|
5
|
+
static forFeature(entities: Class<unknown>[], connection?: DataSource | string): DynamicModule;
|
|
6
6
|
}
|
package/src/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../packages/query-typeorm/src/module.ts"],"names":[],"mappings":";;;AACA,6CAA+C;
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../packages/query-typeorm/src/module.ts"],"names":[],"mappings":";;;AACA,6CAA+C;AAK/C,2CAAgE;AAEhE,MAAa,wBAAwB;IACnC,MAAM,CAAC,UAAU,CAAC,QAA0B,EAAE,UAAgC;QAC5E,MAAM,qBAAqB,GAAG,IAAA,8CAAkC,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QACtF,MAAM,aAAa,GAAG,uBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAEpE,OAAO;YACL,OAAO,EAAE,CAAC,aAAa,CAAC;YACxB,MAAM,EAAE,wBAAwB;YAChC,SAAS,EAAE,CAAC,GAAG,qBAAqB,CAAC;YACrC,OAAO,EAAE,CAAC,GAAG,qBAAqB,EAAE,aAAa,CAAC;SACnD,CAAA;IACH,CAAC;CACF;AAZD,4DAYC"}
|
package/src/providers.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { FactoryProvider } from '@nestjs/common';
|
|
2
2
|
import { Class } from '@ptc-org/nestjs-query-core';
|
|
3
|
-
import {
|
|
4
|
-
export declare const createTypeOrmQueryServiceProviders: (entities: Class<unknown>[], connection?:
|
|
3
|
+
import type { DataSource } from 'typeorm';
|
|
4
|
+
export declare const createTypeOrmQueryServiceProviders: (entities: Class<unknown>[], connection?: DataSource | string) => FactoryProvider[];
|
package/src/providers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../../packages/query-typeorm/src/providers.ts"],"names":[],"mappings":";;;AACA,6CAAoD;AACpD,kEAAwE;
|
|
1
|
+
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../../packages/query-typeorm/src/providers.ts"],"names":[],"mappings":";;;AACA,6CAAoD;AACpD,kEAAwE;AAIxE,yCAAgD;AAEhD,SAAS,iCAAiC,CACxC,WAA0B,EAC1B,UAAgC;IAEhC,OAAO;QACL,OAAO,EAAE,IAAA,wCAAoB,EAAC,WAAW,CAAC;QAC1C,UAAU,CAAC,IAAwB;YACjC,OAAO,IAAI,8BAAmB,CAAC,IAAI,CAAC,CAAA;QACtC,CAAC;QACD,MAAM,EAAE,CAAC,IAAA,4BAAkB,EAAC,WAAW,EAAE,UAAU,CAAC,CAAC;KACtD,CAAA;AACH,CAAC;AAEM,MAAM,kCAAkC,GAAG,CAChD,QAA0B,EAC1B,UAAgC,EACb,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iCAAiC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;AAH1F,QAAA,kCAAkC,sCAGwD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AggregateQuery, Filter, Paging, Query, SortField } from '@ptc-org/nestjs-query-core';
|
|
2
|
-
import { DeleteQueryBuilder, EntityMetadata, QueryBuilder, Repository, SelectQueryBuilder, UpdateQueryBuilder,
|
|
2
|
+
import { DeleteQueryBuilder, EntityMetadata, QueryBuilder, Repository, SelectQueryBuilder, UpdateQueryBuilder, WhereExpressionBuilder } from 'typeorm';
|
|
3
3
|
import { SoftDeleteQueryBuilder } from 'typeorm/query-builder/SoftDeleteQueryBuilder';
|
|
4
4
|
import { AggregateBuilder } from './aggregate.builder';
|
|
5
5
|
import { WhereBuilder } from './where.builder';
|
|
@@ -91,7 +91,7 @@ export declare class FilterQueryBuilder<Entity> {
|
|
|
91
91
|
* @param filter - the filter.
|
|
92
92
|
* @param alias - optional alias to use to qualify an identifier
|
|
93
93
|
*/
|
|
94
|
-
applyFilter<Where extends
|
|
94
|
+
applyFilter<Where extends WhereExpressionBuilder>(qb: Where, filter?: Filter<Entity>, alias?: string): Where;
|
|
95
95
|
/**
|
|
96
96
|
* Applies the ORDER BY clause to a `typeorm` QueryBuilder.
|
|
97
97
|
* @param qb - the `typeorm` QueryBuilder.
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.FilterQueryBuilder = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const nestjs_query_core_1 = require("@ptc-org/nestjs-query-core");
|
|
6
|
-
const lodash_merge_1 =
|
|
6
|
+
const lodash_merge_1 = tslib_1.__importDefault(require("lodash.merge"));
|
|
7
7
|
const aggregate_builder_1 = require("./aggregate.builder");
|
|
8
8
|
const where_builder_1 = require("./where.builder");
|
|
9
9
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/filter-query.builder.ts"],"names":[],"mappings":";;;;AAAA,kEAA8G;AAC9G,
|
|
1
|
+
{"version":3,"file":"filter-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/filter-query.builder.ts"],"names":[],"mappings":"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"}
|
package/src/query/index.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
tslib_1.__exportStar(require("./aggregate.builder"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./filter-query.builder"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./relation-query.builder"), exports);
|
|
7
|
+
tslib_1.__exportStar(require("./sql-comparison.builder"), exports);
|
|
8
|
+
tslib_1.__exportStar(require("./where.builder"), exports);
|
|
9
9
|
//# sourceMappingURL=index.js.map
|
package/src/query/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/index.ts"],"names":[],"mappings":";;;AAAA,8DAAmC;AACnC,iEAAsC;AACtC,mEAAwC;AACxC,mEAAwC;AACxC,0DAA+B"}
|
|
@@ -11,11 +11,11 @@ interface JoinColumn {
|
|
|
11
11
|
alias: string;
|
|
12
12
|
conditions: JoinCondition[];
|
|
13
13
|
}
|
|
14
|
-
|
|
14
|
+
type SQLFragment = {
|
|
15
15
|
sql: string;
|
|
16
16
|
params: ObjectLiteral;
|
|
17
17
|
};
|
|
18
|
-
|
|
18
|
+
type PrimaryKey = {
|
|
19
19
|
databasePath: string;
|
|
20
20
|
selectPath: string;
|
|
21
21
|
propertyName: string;
|
|
@@ -30,7 +30,7 @@ interface RelationQuery<Relation, Entity> {
|
|
|
30
30
|
batchSelect(qb: SelectQueryBuilder<Relation>, entities: Entity[]): SelectQueryBuilder<Relation>;
|
|
31
31
|
whereCondition(entity: Entity): SQLFragment;
|
|
32
32
|
}
|
|
33
|
-
export
|
|
33
|
+
export type EntityIndexRelation<Relation> = Relation & {
|
|
34
34
|
__nestjsQuery__entityIndex__: number;
|
|
35
35
|
};
|
|
36
36
|
/**
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RelationQueryBuilder = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const lodash_filter_1 =
|
|
5
|
+
const lodash_filter_1 = tslib_1.__importDefault(require("lodash.filter"));
|
|
6
6
|
const typeorm_1 = require("typeorm");
|
|
7
7
|
const DriverUtils_1 = require("typeorm/driver/DriverUtils");
|
|
8
8
|
const aggregate_builder_1 = require("./aggregate.builder");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/relation-query.builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"relation-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/relation-query.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,14 @@ import { ObjectLiteral } from 'typeorm';
|
|
|
3
3
|
/**
|
|
4
4
|
* @internal
|
|
5
5
|
*/
|
|
6
|
-
|
|
6
|
+
type CmpSQLType = {
|
|
7
7
|
sql: string;
|
|
8
8
|
params: ObjectLiteral;
|
|
9
9
|
};
|
|
10
10
|
/**
|
|
11
11
|
* @internal
|
|
12
12
|
*/
|
|
13
|
-
export
|
|
13
|
+
export type EntityComparisonField<Entity, F extends keyof Entity> = Entity[F] | Entity[F][] | CommonFieldComparisonBetweenType<Entity[F]> | true | false | null;
|
|
14
14
|
/**
|
|
15
15
|
* @internal
|
|
16
16
|
* Builder to create SQL Comparisons. (=, !=, \>, etc...)
|
|
@@ -64,10 +64,10 @@ class SQLComparisonBuilder {
|
|
|
64
64
|
return { sql: `${col} IS NULL`, params: {} };
|
|
65
65
|
}
|
|
66
66
|
if (val === true) {
|
|
67
|
-
return { sql: `${col}
|
|
67
|
+
return { sql: `${col} = TRUE`, params: {} };
|
|
68
68
|
}
|
|
69
69
|
if (val === false) {
|
|
70
|
-
return { sql: `${col}
|
|
70
|
+
return { sql: `${col} = FALSE`, params: {} };
|
|
71
71
|
}
|
|
72
72
|
throw new Error(`unexpected is operator param ${JSON.stringify(val)}`);
|
|
73
73
|
}
|
|
@@ -76,10 +76,10 @@ class SQLComparisonBuilder {
|
|
|
76
76
|
return { sql: `${col} IS NOT NULL`, params: {} };
|
|
77
77
|
}
|
|
78
78
|
if (val === true) {
|
|
79
|
-
return { sql: `${col}
|
|
79
|
+
return { sql: `${col} != TRUE`, params: {} };
|
|
80
80
|
}
|
|
81
81
|
if (val === false) {
|
|
82
|
-
return { sql: `${col}
|
|
82
|
+
return { sql: `${col} != FALSE`, params: {} };
|
|
83
83
|
}
|
|
84
84
|
throw new Error(`unexpected isNot operator param ${JSON.stringify(val)}`);
|
|
85
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-comparison.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/sql-comparison.builder.ts"],"names":[],"mappings":";;;AAGA,sCAAwC;AAkBxC;;;GAGG;AACH,MAAa,oBAAoB;IAc/B,YAAqB,gBAAwC,oBAAoB,CAAC,sBAAsB;QAAnF,kBAAa,GAAb,aAAa,CAAsE;IAAG,CAAC;IAE5G,IAAY,SAAS;QACnB,OAAO,QAAQ,IAAA,qBAAY,GAAE,EAAE,CAAA;IACjC,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CACH,KAAQ,EACR,GAAyC,EACzC,GAAqC,EACrC,KAAc;QAEd,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,KAAe,EAAE,CAAC,CAAC,CAAC,GAAG,KAAe,EAAE,CAAA;QACxE,MAAM,aAAa,GAAI,GAAc,CAAC,WAAW,EAAE,CAAA;QACnD,IAAI,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE;YACrC,yCAAyC;YACzC,OAAO,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;SACzD;QACD,IAAI,aAAa,KAAK,IAAI,EAAE;YAC1B,6CAA6C;YAC7C,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SACtC;QACD,IAAI,aAAa,KAAK,OAAO,EAAE;YAC7B,iEAAiE;YACjE,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SACzC;QACD,IAAI,aAAa,KAAK,IAAI,EAAE;YAC1B,mCAAmC;YACnC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SACtC;QACD,IAAI,aAAa,KAAK,OAAO,EAAE;YAC7B,mCAAmC;YACnC,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SACzC;QACD,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,6CAA6C;YAC7C,OAAO,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SAC3C;QACD,IAAI,aAAa,KAAK,YAAY,EAAE;YAClC,oDAAoD;YACpD,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SAC9C;QACD,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC5D,CAAC;IAEO,mBAAmB,CACzB,GAAW,EACX,GAAW,EACX,GAAqC;QAErC,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;QACxC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAA;QAC1B,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,QAAQ,KAAK,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,CAAA;IAClF,CAAC;IAEO,eAAe,CAAyB,GAAW,EAAE,GAAqC;QAChG,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;SAC7C;QACD,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"sql-comparison.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/sql-comparison.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Filter } from '@ptc-org/nestjs-query-core';
|
|
2
|
-
import {
|
|
2
|
+
import type { WhereExpressionBuilder } from 'typeorm';
|
|
3
3
|
import { NestedRecord } from './filter-query.builder';
|
|
4
4
|
import { SQLComparisonBuilder } from './sql-comparison.builder';
|
|
5
5
|
/**
|
|
@@ -16,7 +16,7 @@ export declare class WhereBuilder<Entity> {
|
|
|
16
16
|
* @param relationNames - the relations tree.
|
|
17
17
|
* @param alias - optional alias to use to qualify an identifier
|
|
18
18
|
*/
|
|
19
|
-
build<Where extends
|
|
19
|
+
build<Where extends WhereExpressionBuilder>(where: Where, filter: Filter<Entity>, relationNames: NestedRecord, alias?: string): Where;
|
|
20
20
|
/**
|
|
21
21
|
* ANDs multiple filters together. This will properly group every clause to ensure proper precedence.
|
|
22
22
|
*
|
|
@@ -36,7 +36,7 @@ export declare class WhereBuilder<Entity> {
|
|
|
36
36
|
*/
|
|
37
37
|
private filterOr;
|
|
38
38
|
/**
|
|
39
|
-
* Wraps a filter in
|
|
39
|
+
* Wraps a filter in brackets to ensure precedence.
|
|
40
40
|
* ```
|
|
41
41
|
* {a: { eq: 1 } } // "(a = 1)"
|
|
42
42
|
* {a: { eq: 1 }, b: { gt: 2 } } // "((a = 1) AND (b > 2))"
|
|
@@ -51,7 +51,7 @@ class WhereBuilder {
|
|
|
51
51
|
return where.andWhere(new typeorm_1.Brackets((qb) => filter.reduce((w, f) => qb.orWhere(this.createBrackets(f, relationNames, alias)), qb)));
|
|
52
52
|
}
|
|
53
53
|
/**
|
|
54
|
-
* Wraps a filter in
|
|
54
|
+
* Wraps a filter in brackets to ensure precedence.
|
|
55
55
|
* ```
|
|
56
56
|
* {a: { eq: 1 } } // "(a = 1)"
|
|
57
57
|
* {a: { eq: 1 }, b: { gt: 2 } } // "((a = 1) AND (b > 2))"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"where.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/where.builder.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"where.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/where.builder.ts"],"names":[],"mappings":";;;AACA,qCAAkC;AAKlC,qEAAsF;AAEtF;;;GAGG;AACH,MAAa,YAAY;IACvB,YAAqB,uBAAqD,IAAI,6CAAoB,EAAU;QAAvF,yBAAoB,GAApB,oBAAoB,CAAmE;IAAG,CAAC;IAEhH;;;;;;OAMG;IAEI,KAAK,CACV,KAAY,EACZ,MAAsB,EACtB,aAA2B,EAC3B,KAAc;QAEd,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,MAAM,CAAA;QAC1B,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE;YACrB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,CAAA;SACjD;QACD,IAAI,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE;YACnB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,CAAC,CAAA;SAC/C;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,CAAC,CAAA;IAC/D,CAAC;IAED;;;;;;;OAOG;IACK,SAAS,CACf,KAAY,EACZ,OAAyB,EACzB,aAA2B,EAC3B,KAAc;QAEd,OAAO,KAAK,CAAC,QAAQ,CACnB,IAAI,kBAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAC9G,CAAA;IACH,CAAC;IAED;;;;;;;OAOG;IACK,QAAQ,CACd,KAAY,EACZ,MAAwB,EACxB,aAA2B,EAC3B,KAAc;QAEd,OAAO,KAAK,CAAC,QAAQ,CACnB,IAAI,kBAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAC5G,CAAA;IACH,CAAC;IAED;;;;;;;;;OASG;IACK,cAAc,CAAC,MAAsB,EAAE,aAA2B,EAAE,KAAc;QACxF,OAAO,IAAI,kBAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3E,CAAC;IAED;;;;;;OAMG;IACK,YAAY,CAClB,KAAY,EACZ,MAAsB,EACtB,aAA2B,EAC3B,KAAc;QAEd,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,IAAI,EAAE;gBACrC,OAAO,IAAI,CAAC,oBAAoB,CAC9B,KAAK,EACL,KAAqB,EACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAqB,CAAC,EAC5C,aAAa,EACb,KAAK,CACN,CAAA;aACF;YACD,OAAO,CAAC,CAAA;QACV,CAAC,EAAE,KAAK,CAAC,CAAA;IACX,CAAC;IAEO,QAAQ,CACd,GAA8B,EAC9B,KAAQ;QAER,OAAO,GAAG,CAAC,KAAK,CAAqC,CAAA;IACvD,CAAC;IAEO,oBAAoB,CAC1B,KAAY,EACZ,KAAQ,EACR,GAAqC,EACrC,aAA2B,EAC3B,KAAc;QAEd,IAAI,aAAa,CAAC,KAAe,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAwB,EAAE,aAAa,CAAC,KAAe,CAAC,CAAC,CAAA;SACvG;QACD,OAAO,KAAK,CAAC,QAAQ,CACnB,IAAI,kBAAQ,CAAC,CAAC,EAAE,EAAE,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAA+C,CAAA;YAC3E,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC1C,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAqC,EAAE,KAAK,CAAC,CACzG,CAAA;YACD,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;QAClE,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAEO,kBAAkB,CACxB,KAAY,EACZ,KAAQ,EACR,GAAsB,EACtB,aAA2B;QAE3B,OAAO,KAAK,CAAC,QAAQ,CACnB,IAAI,kBAAQ,CAAC,CAAC,EAAE,EAAE,EAAE;YAClB,MAAM,aAAa,GAAG,IAAI,YAAY,EAAa,CAAA;YACnD,OAAO,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,KAAe,CAAC,CAAA;QACrE,CAAC,CAAC,CACH,CAAA;IACH,CAAC;CACF;AAnJD,oCAmJC"}
|
package/src/services/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
|
|
4
|
+
tslib_1.__exportStar(require("./typeorm-query.service"), exports);
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/index.ts"],"names":[],"mappings":";;;AAAA,kEAAuC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.RelationQueryService = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const nestjs_query_core_1 = require("@ptc-org/nestjs-query-core");
|
|
6
|
-
const lodash_omit_1 =
|
|
6
|
+
const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
|
|
7
7
|
const query_1 = require("../query");
|
|
8
8
|
/**
|
|
9
9
|
* Base class to house relations loading.
|
|
@@ -242,7 +242,10 @@ class RelationQueryService {
|
|
|
242
242
|
getRelationEntity(relationName) {
|
|
243
243
|
const relationMeta = this.getRelationMeta(relationName);
|
|
244
244
|
if (typeof relationMeta.type === 'string') {
|
|
245
|
-
|
|
245
|
+
const relationMetaData = this.repo.manager.connection.entityMetadatas.find((em) => em.targetName == relationMeta.type);
|
|
246
|
+
if (relationMetaData) {
|
|
247
|
+
return relationMetaData.target;
|
|
248
|
+
}
|
|
246
249
|
}
|
|
247
250
|
return relationMeta.type;
|
|
248
251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/relation-query.service.ts"],"names":[],"mappings":";;;;AAAA,kEAUmC;AACnC,
|
|
1
|
+
{"version":3,"file":"relation-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/relation-query.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,8 @@ class TypeOrmQueryService extends relation_query_service_1.RelationQueryService
|
|
|
68
68
|
if (opts?.withDeleted) {
|
|
69
69
|
qb.withDeleted();
|
|
70
70
|
}
|
|
71
|
-
|
|
71
|
+
const result = await qb.getOne();
|
|
72
|
+
return result === null ? undefined : result;
|
|
72
73
|
}
|
|
73
74
|
/**
|
|
74
75
|
* Gets an entity by it's `id`. If the entity is not found a rejected promise is returned.
|
|
@@ -284,7 +285,8 @@ class TypeOrmQueryService extends relation_query_service_1.RelationQueryService
|
|
|
284
285
|
}
|
|
285
286
|
async ensureEntityDoesNotExist(e) {
|
|
286
287
|
if (this.repo.hasId(e)) {
|
|
287
|
-
const
|
|
288
|
+
const where = this.repo.metadata.getEntityIdMap(e);
|
|
289
|
+
const found = await this.repo.findOne({ where });
|
|
288
290
|
if (found) {
|
|
289
291
|
throw new Error('Entity already exists');
|
|
290
292
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/typeorm-query.service.ts"],"names":[],"mappings":";;;AAAA,2CAA6E;AAsB7E,oCAA+D;AAC/D,qEAA+D;AAO/D;;;;;;;;;;;;;;;GAeG;AACH,MAAa,mBACX,SAAQ,6CAA4B;IAOpC,YAAqB,IAAwB,EAAE,IAAsC;QACnF,KAAK,EAAE,CAAA;QADY,SAAI,GAAJ,IAAI,CAAoB;QAG3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,EAAE,kBAAkB,IAAI,IAAI,0BAAkB,CAAS,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/F,IAAI,CAAC,aAAa,GAAG,IAAI,EAAE,aAAa,IAAI,KAAK,CAAA;IACnD,CAAC;IAED,gEAAgE;IAChE,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,MAAuB,CAAA;IAC1C,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,KAAK,CAAC,KAAoB;QAC9B,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAsB,EAAE,SAAiC;QACvE,OAAO,wBAAgB,CAAC,+BAA+B,CACrD,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,CAAC,UAAU,EAA2B,CAC/F,CAAA;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAsB;QAChC,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC9D,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,QAAQ,CAAC,EAAmB,EAAE,IAA8B;QAChE,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,CAAA;QAC7D,IAAI,IAAI,EAAE,WAAW,EAAE;YACrB,EAAE,CAAC,WAAW,EAAE,CAAA;SACjB;QACD,
|
|
1
|
+
{"version":3,"file":"typeorm-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/typeorm-query.service.ts"],"names":[],"mappings":"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"}
|