uql-orm 0.11.0 → 0.14.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/CHANGELOG.md +109 -47
- package/README.md +1 -0
- package/dist/browser/http/http.d.ts.map +1 -1
- package/dist/browser/http/http.js.map +1 -1
- package/dist/browser/querier/httpQuerier.d.ts.map +1 -1
- package/dist/browser/querier/httpQuerier.js +2 -2
- package/dist/browser/querier/httpQuerier.js.map +1 -1
- package/dist/browser/type/clientQuerier.d.ts +2 -2
- package/dist/browser/uql-browser.min.js +2 -2
- package/dist/browser/uql-browser.min.js.map +5 -5
- package/dist/bunSql/bunSqlPostgresDialect.d.ts.map +1 -1
- package/dist/bunSql/bunSqlPostgresDialect.js.map +1 -1
- package/dist/bunSql/bunSqlQuerier.d.ts.map +1 -1
- package/dist/bunSql/bunSqlQuerier.js.map +1 -1
- package/dist/bunSql/bunSqlQuerierPool.d.ts.map +1 -1
- package/dist/bunSql/bunSqlQuerierPool.js.map +1 -1
- package/dist/cockroachdb/crdbQuerierPool.d.ts.map +1 -1
- package/dist/context/context.browser.d.ts +7 -0
- package/dist/context/context.browser.d.ts.map +1 -0
- package/dist/context/context.browser.js +28 -0
- package/dist/context/context.browser.js.map +1 -0
- package/dist/context/context.d.ts +15 -0
- package/dist/context/context.d.ts.map +1 -0
- package/dist/context/context.js +21 -0
- package/dist/context/context.js.map +1 -0
- package/dist/context/securityError.d.ts +5 -0
- package/dist/context/securityError.d.ts.map +1 -0
- package/dist/context/securityError.js +5 -0
- package/dist/context/securityError.js.map +1 -0
- package/dist/d1/d1Querier.d.ts.map +1 -1
- package/dist/d1/d1Querier.js.map +1 -1
- package/dist/d1/d1QuerierPool.d.ts.map +1 -1
- package/dist/dialect/abstractDialect.d.ts.map +1 -1
- package/dist/dialect/abstractDialect.js.map +1 -1
- package/dist/dialect/abstractSqlDialect.d.ts +3 -1
- package/dist/dialect/abstractSqlDialect.d.ts.map +1 -1
- package/dist/dialect/abstractSqlDialect.js +24 -25
- package/dist/dialect/abstractSqlDialect.js.map +1 -1
- package/dist/dialect/mysqlLikeSqlDialect.d.ts.map +1 -1
- package/dist/dialect/mysqlLikeSqlDialect.js.map +1 -1
- package/dist/dialect/queryContext.d.ts.map +1 -1
- package/dist/dialect/queryContext.js.map +1 -1
- package/dist/entity/decorator/entity.d.ts.map +1 -1
- package/dist/entity/decorator/field.d.ts.map +1 -1
- package/dist/entity/decorator/filter.d.ts +8 -0
- package/dist/entity/decorator/filter.d.ts.map +1 -0
- package/dist/entity/decorator/filter.js +12 -0
- package/dist/entity/decorator/filter.js.map +1 -0
- package/dist/entity/decorator/id.d.ts.map +1 -1
- package/dist/entity/decorator/id.js.map +1 -1
- package/dist/entity/decorator/index-decorator.d.ts.map +1 -1
- package/dist/entity/decorator/index-decorator.js.map +1 -1
- package/dist/entity/decorator/index.d.ts +2 -1
- package/dist/entity/decorator/index.d.ts.map +1 -1
- package/dist/entity/decorator/index.js +2 -1
- package/dist/entity/decorator/index.js.map +1 -1
- package/dist/entity/decorator/relation.d.ts.map +1 -1
- package/dist/entity/metadata/definition.d.ts +2 -1
- package/dist/entity/metadata/definition.d.ts.map +1 -1
- package/dist/entity/metadata/definition.js +43 -6
- package/dist/entity/metadata/definition.js.map +1 -1
- package/dist/entity/test-helpers.d.ts +1 -1
- package/dist/entity/test-helpers.d.ts.map +1 -1
- package/dist/entity/test-helpers.js +1 -0
- package/dist/entity/test-helpers.js.map +1 -1
- package/dist/express/querierMiddleware.js.map +1 -1
- package/dist/http/contract.d.ts +25 -25
- package/dist/http/contract.d.ts.map +1 -1
- package/dist/http/fetchHandler.js.map +1 -1
- package/dist/http/handler.d.ts +10 -4
- package/dist/http/handler.d.ts.map +1 -1
- package/dist/http/handler.js +21 -16
- package/dist/http/handler.js.map +1 -1
- package/dist/http/query.d.ts +1 -1
- package/dist/http/query.d.ts.map +1 -1
- package/dist/http/query.js +21 -3
- package/dist/http/query.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/libsql/libsqlQuerier.d.ts.map +1 -1
- package/dist/libsql/libsqlQuerier.js.map +1 -1
- package/dist/libsql/libsqlQuerierPool.d.ts +1 -1
- package/dist/libsql/libsqlQuerierPool.d.ts.map +1 -1
- package/dist/libsql/libsqlQuerierPool.js +1 -1
- package/dist/maria/mariaDialect.d.ts.map +1 -1
- package/dist/maria/mariaDialect.js.map +1 -1
- package/dist/maria/mariadbQuerier.d.ts.map +1 -1
- package/dist/maria/mariadbQuerierPool.d.ts.map +1 -1
- package/dist/maria/mariadbQuerierPool.js +1 -1
- package/dist/migrate/builder/columnBuilder.d.ts.map +1 -1
- package/dist/migrate/builder/columnBuilder.js.map +1 -1
- package/dist/migrate/builder/expressions.d.ts.map +1 -1
- package/dist/migrate/builder/expressions.js.map +1 -1
- package/dist/migrate/builder/migrationBuilder.d.ts.map +1 -1
- package/dist/migrate/builder/migrationBuilder.js.map +1 -1
- package/dist/migrate/builder/tableBuilder.d.ts.map +1 -1
- package/dist/migrate/builder/tableBuilder.js.map +1 -1
- package/dist/migrate/cli.d.ts +1 -1
- package/dist/migrate/cli.js +1 -1
- package/dist/migrate/codegen/entityCodeGenerator.d.ts.map +1 -1
- package/dist/migrate/codegen/entityCodeGenerator.js.map +1 -1
- package/dist/migrate/codegen/entityMerger.d.ts.map +1 -1
- package/dist/migrate/codegen/entityMerger.js +1 -1
- package/dist/migrate/codegen/entityMerger.js.map +1 -1
- package/dist/migrate/codegen/migrationCodeGenerator.d.ts.map +1 -1
- package/dist/migrate/codegen/migrationCodeGenerator.js.map +1 -1
- package/dist/migrate/codegen/smartRelationDetector.d.ts.map +1 -1
- package/dist/migrate/codegen/smartRelationDetector.js.map +1 -1
- package/dist/migrate/drift/driftDetector.d.ts.map +1 -1
- package/dist/migrate/drift/driftDetector.js.map +1 -1
- package/dist/migrate/generator/mongoSchemaGenerator.d.ts.map +1 -1
- package/dist/migrate/generator/mongoSchemaGenerator.js.map +1 -1
- package/dist/migrate/introspection/abstractSqlSchemaIntrospector.d.ts.map +1 -1
- package/dist/migrate/introspection/baseSqlIntrospector.d.ts.map +1 -1
- package/dist/migrate/introspection/baseSqlIntrospector.js.map +1 -1
- package/dist/migrate/introspection/mongoIntrospector.d.ts.map +1 -1
- package/dist/migrate/introspection/mongoIntrospector.js.map +1 -1
- package/dist/migrate/introspection/mysqlIntrospector.d.ts.map +1 -1
- package/dist/migrate/introspection/mysqlIntrospector.js.map +1 -1
- package/dist/migrate/introspection/postgresIntrospector.d.ts.map +1 -1
- package/dist/migrate/introspection/postgresIntrospector.js.map +1 -1
- package/dist/migrate/introspection/sqliteIntrospector.d.ts.map +1 -1
- package/dist/migrate/introspection/sqliteIntrospector.js.map +1 -1
- package/dist/migrate/migrator.d.ts.map +1 -1
- package/dist/migrate/migrator.js.map +1 -1
- package/dist/migrate/schemaGenerator.d.ts.map +1 -1
- package/dist/migrate/schemaGenerator.js.map +1 -1
- package/dist/migrate/storage/databaseStorage.d.ts.map +1 -1
- package/dist/migrate/storage/databaseStorage.js.map +1 -1
- package/dist/migrate/storage/jsonStorage.d.ts.map +1 -1
- package/dist/migrate/sync/schemaSync.d.ts.map +1 -1
- package/dist/migrate/sync/schemaSync.js.map +1 -1
- package/dist/mongo/mongoDialect.d.ts +7 -5
- package/dist/mongo/mongoDialect.d.ts.map +1 -1
- package/dist/mongo/mongoDialect.js +20 -17
- package/dist/mongo/mongoDialect.js.map +1 -1
- package/dist/mongo/mongodbQuerier.d.ts +5 -5
- package/dist/mongo/mongodbQuerier.d.ts.map +1 -1
- package/dist/mongo/mongodbQuerier.js +29 -29
- package/dist/mongo/mongodbQuerier.js.map +1 -1
- package/dist/mongo/mongodbQuerierPool.d.ts.map +1 -1
- package/dist/mysql/mysql2Querier.d.ts.map +1 -1
- package/dist/mysql/mysql2QuerierPool.d.ts.map +1 -1
- package/dist/namingStrategy/defaultNamingStrategy.d.ts.map +1 -1
- package/dist/namingStrategy/snakeCaseNamingStrategy.d.ts.map +1 -1
- package/dist/neon/neonQuerierPool.d.ts.map +1 -1
- package/dist/nestjs/index.d.ts +1 -0
- package/dist/nestjs/index.d.ts.map +1 -1
- package/dist/nestjs/index.js +1 -0
- package/dist/nestjs/index.js.map +1 -1
- package/dist/nestjs/uqlContextInterceptor.d.ts +14 -0
- package/dist/nestjs/uqlContextInterceptor.d.ts.map +1 -0
- package/dist/nestjs/uqlContextInterceptor.js +26 -0
- package/dist/nestjs/uqlContextInterceptor.js.map +1 -0
- package/dist/nestjs/uqlModule.d.ts +32 -11
- package/dist/nestjs/uqlModule.d.ts.map +1 -1
- package/dist/nestjs/uqlModule.js +30 -11
- package/dist/nestjs/uqlModule.js.map +1 -1
- package/dist/postgres/abstractPgQuerier.d.ts.map +1 -1
- package/dist/postgres/abstractPgQuerierPool.d.ts +1 -1
- package/dist/postgres/abstractPgQuerierPool.d.ts.map +1 -1
- package/dist/postgres/abstractPgQuerierPool.js +1 -1
- package/dist/postgres/abstractPgQuerierPool.js.map +1 -1
- package/dist/postgres/pgDialect.d.ts.map +1 -1
- package/dist/postgres/pgDialect.js.map +1 -1
- package/dist/postgres/pgQuerierPool.d.ts.map +1 -1
- package/dist/postgres/postgresDialect.d.ts.map +1 -1
- package/dist/postgres/postgresDialect.js.map +1 -1
- package/dist/postgres/postgresWireDriverCapabilities.d.ts +1 -1
- package/dist/postgres/postgresWireDriverCapabilities.js +1 -1
- package/dist/querier/abstractPoolQuerier.d.ts.map +1 -1
- package/dist/querier/abstractPoolQuerier.js.map +1 -1
- package/dist/querier/abstractQuerier.d.ts +29 -26
- package/dist/querier/abstractQuerier.d.ts.map +1 -1
- package/dist/querier/abstractQuerier.js +48 -43
- package/dist/querier/abstractQuerier.js.map +1 -1
- package/dist/querier/abstractQuerierPool.d.ts.map +1 -1
- package/dist/querier/abstractQuerierPool.js.map +1 -1
- package/dist/querier/abstractSqlQuerier.d.ts +6 -6
- package/dist/querier/abstractSqlQuerier.d.ts.map +1 -1
- package/dist/querier/abstractSqlQuerier.js +16 -14
- package/dist/querier/abstractSqlQuerier.js.map +1 -1
- package/dist/querier/decorator/injectQuerier.d.ts.map +1 -1
- package/dist/querier/decorator/injectQuerier.js +1 -1
- package/dist/querier/decorator/log.d.ts.map +1 -1
- package/dist/querier/decorator/serialized.d.ts.map +1 -1
- package/dist/querier/decorator/transactional.d.ts.map +1 -1
- package/dist/querier/decorator/transactional.js +1 -1
- package/dist/querier/decorator/transactional.js.map +1 -1
- package/dist/schema/schemaAST.d.ts.map +1 -1
- package/dist/schema/schemaASTBuilder.d.ts +2 -2
- package/dist/schema/schemaASTBuilder.d.ts.map +1 -1
- package/dist/schema/schemaASTBuilder.js +2 -2
- package/dist/schema/schemaASTBuilder.js.map +1 -1
- package/dist/schema/schemaASTDiffer.d.ts.map +1 -1
- package/dist/schema/schemaASTDiffer.js.map +1 -1
- package/dist/sqlite/sqliteDialect.d.ts.map +1 -1
- package/dist/sqlite/sqliteDialect.js.map +1 -1
- package/dist/sqlite/sqliteQuerier.d.ts.map +1 -1
- package/dist/sqlite/sqliteQuerier.js.map +1 -1
- package/dist/sqlite/sqliteQuerierPool.d.ts.map +1 -1
- package/dist/sqlite/sqliteQuerierPool.js.map +1 -1
- package/dist/type/entity.d.ts +22 -7
- package/dist/type/entity.d.ts.map +1 -1
- package/dist/type/querier.d.ts +23 -16
- package/dist/type/querier.d.ts.map +1 -1
- package/dist/type/querier.js.map +1 -1
- package/dist/type/querierPool.d.ts +1 -1
- package/dist/type/query.d.ts +71 -21
- package/dist/type/query.d.ts.map +1 -1
- package/dist/type/query.js.map +1 -1
- package/dist/type/universalQuerier.d.ts +1 -1
- package/dist/util/ansiSqlLiteral.d.ts +1 -1
- package/dist/util/ansiSqlLiteral.js +1 -1
- package/dist/util/ansiSqlLiteral.js.map +1 -1
- package/dist/util/dialect.util.d.ts +27 -3
- package/dist/util/dialect.util.d.ts.map +1 -1
- package/dist/util/dialect.util.js +77 -0
- package/dist/util/dialect.util.js.map +1 -1
- package/dist/util/filters.util.d.ts +11 -0
- package/dist/util/filters.util.d.ts.map +1 -0
- package/dist/util/filters.util.js +12 -0
- package/dist/util/filters.util.js.map +1 -0
- package/dist/util/index.d.ts +1 -0
- package/dist/util/index.d.ts.map +1 -1
- package/dist/util/index.js +1 -0
- package/dist/util/index.js.map +1 -1
- package/dist/util/logger.d.ts +1 -1
- package/dist/util/logger.d.ts.map +1 -1
- package/dist/util/logger.js +1 -1
- package/dist/util/logger.js.map +1 -1
- package/dist/util/raw.d.ts +1 -1
- package/dist/util/raw.js +1 -1
- package/dist/util/sql.util.js +1 -1
- package/dist/util/sql.util.js.map +1 -1
- package/package.json +22 -10
|
@@ -48,58 +48,62 @@ export class AbstractQuerier {
|
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
51
|
-
* Resolves entity
|
|
51
|
+
* Resolves `[entity, query, opts]` for the dual call pattern: `(entity, q, opts)` (entity argument)
|
|
52
|
+
* vs `(query, opts)` (entity via the query's `$entity` field).
|
|
52
53
|
*/
|
|
53
|
-
|
|
54
|
+
resolveEntityQuery(entityOrQuery, maybeQueryOrOpts, maybeOpts) {
|
|
54
55
|
if (typeof entityOrQuery === 'function' && entityOrQuery.prototype) {
|
|
55
|
-
return [entityOrQuery,
|
|
56
|
+
return [entityOrQuery, maybeQueryOrOpts ?? {}, maybeOpts];
|
|
56
57
|
}
|
|
57
58
|
const q = entityOrQuery;
|
|
58
59
|
if (!q.$entity) {
|
|
59
60
|
throw new TypeError('$entity is required when using query-object syntax');
|
|
60
61
|
}
|
|
61
62
|
const { $entity, ...query } = q;
|
|
62
|
-
return [$entity, query];
|
|
63
|
+
return [$entity, query, maybeQueryOrOpts];
|
|
63
64
|
}
|
|
64
|
-
findOneById(entity, id, q = {}) {
|
|
65
|
+
findOneById(entity, id, q = {}, opts) {
|
|
65
66
|
const meta = getMeta(entity);
|
|
66
67
|
q.$where = augmentWhere(meta, q.$where, id);
|
|
67
|
-
return this.findOne(entity, q);
|
|
68
|
+
return this.findOne(entity, q, opts);
|
|
68
69
|
}
|
|
69
|
-
async findOne(entityOrQuery,
|
|
70
|
-
const [entity, q] = this.
|
|
71
|
-
const rows = await this.findMany(entity, { ...q, $limit: 1 });
|
|
70
|
+
async findOne(entityOrQuery, maybeQueryOrOpts, maybeOpts) {
|
|
71
|
+
const [entity, q, opts] = this.resolveEntityQuery(entityOrQuery, maybeQueryOrOpts, maybeOpts);
|
|
72
|
+
const rows = await this.findMany(entity, { ...q, $limit: 1 }, opts);
|
|
72
73
|
return rows[0];
|
|
73
74
|
}
|
|
74
|
-
async findMany(entityOrQuery,
|
|
75
|
-
const [entity, q] = this.
|
|
75
|
+
async findMany(entityOrQuery, maybeQueryOrOpts, maybeOpts) {
|
|
76
|
+
const [entity, q, opts] = this.resolveEntityQuery(entityOrQuery, maybeQueryOrOpts, maybeOpts);
|
|
76
77
|
this.validateProjectionQuery(entity, q);
|
|
77
|
-
const founds = await this.internalFindMany(entity, q);
|
|
78
|
+
const founds = await this.internalFindMany(entity, q, opts);
|
|
78
79
|
await this.emitHook(entity, 'afterLoad', founds);
|
|
79
80
|
return founds;
|
|
80
81
|
}
|
|
81
|
-
findManyStream(entityOrQuery,
|
|
82
|
-
const [entity, q] = this.
|
|
82
|
+
findManyStream(entityOrQuery, maybeQueryOrOpts, maybeOpts) {
|
|
83
|
+
const [entity, q, opts] = this.resolveEntityQuery(entityOrQuery, maybeQueryOrOpts, maybeOpts);
|
|
83
84
|
this.validateProjectionQuery(entity, q);
|
|
84
|
-
return this.internalFindManyStream(entity, q);
|
|
85
|
+
return this.internalFindManyStream(entity, q, opts);
|
|
85
86
|
}
|
|
86
|
-
async findManyAndCount(entityOrQuery,
|
|
87
|
-
const [entity, q] = this.
|
|
87
|
+
async findManyAndCount(entityOrQuery, maybeQueryOrOpts, maybeOpts) {
|
|
88
|
+
const [entity, q, opts] = this.resolveEntityQuery(entityOrQuery, maybeQueryOrOpts, maybeOpts);
|
|
88
89
|
this.validateProjectionQuery(entity, q);
|
|
89
90
|
const { $sort: _, $limit: _l, $skip: _s, ...qCount } = q;
|
|
90
|
-
const [founds, count] = await Promise.all([
|
|
91
|
+
const [founds, count] = await Promise.all([
|
|
92
|
+
this.internalFindMany(entity, q, opts),
|
|
93
|
+
this.internalCount(entity, qCount, opts),
|
|
94
|
+
]);
|
|
91
95
|
await this.emitHook(entity, 'afterLoad', founds);
|
|
92
96
|
return [founds, count];
|
|
93
97
|
}
|
|
94
|
-
count(entityOrQuery,
|
|
95
|
-
const [entity, q] = this.
|
|
96
|
-
return this.internalCount(entity, q);
|
|
98
|
+
count(entityOrQuery, maybeQueryOrOpts, maybeOpts) {
|
|
99
|
+
const [entity, q, opts] = this.resolveEntityQuery(entityOrQuery, maybeQueryOrOpts, maybeOpts);
|
|
100
|
+
return this.internalCount(entity, q, opts);
|
|
97
101
|
}
|
|
98
102
|
/**
|
|
99
103
|
* Run an aggregate query.
|
|
100
104
|
*/
|
|
101
|
-
aggregate(entity, q) {
|
|
102
|
-
return this.internalAggregate(entity, q);
|
|
105
|
+
aggregate(entity, q, opts) {
|
|
106
|
+
return this.internalAggregate(entity, q, opts);
|
|
103
107
|
}
|
|
104
108
|
async insertOne(entity, payload) {
|
|
105
109
|
const [id] = await this.insertMany(entity, [payload]);
|
|
@@ -111,33 +115,33 @@ export class AbstractQuerier {
|
|
|
111
115
|
await this.emitHook(entity, 'afterInsert', payload);
|
|
112
116
|
return ids;
|
|
113
117
|
}
|
|
114
|
-
updateOneById(entity, id, payload) {
|
|
115
|
-
return this.updateMany(entity, { $where: id }, payload);
|
|
118
|
+
updateOneById(entity, id, payload, opts) {
|
|
119
|
+
return this.updateMany(entity, { $where: id }, payload, opts);
|
|
116
120
|
}
|
|
117
|
-
async updateMany(entity, q, payload) {
|
|
121
|
+
async updateMany(entity, q, payload, opts) {
|
|
118
122
|
await this.emitHook(entity, 'beforeUpdate', [payload]);
|
|
119
|
-
const changes = await this.internalUpdateMany(entity, q, payload);
|
|
123
|
+
const changes = await this.internalUpdateMany(entity, q, payload, opts);
|
|
120
124
|
await this.emitHook(entity, 'afterUpdate', [payload]);
|
|
121
125
|
return changes;
|
|
122
126
|
}
|
|
127
|
+
restoreOneById(entity, id) {
|
|
128
|
+
return this.restoreMany(entity, { $where: id });
|
|
129
|
+
}
|
|
130
|
+
async restoreMany(entity, q) {
|
|
131
|
+
const meta = getMeta(entity);
|
|
132
|
+
if (!meta.softDelete) {
|
|
133
|
+
throw new TypeError(`'${entity.name}' has not enabled 'softDelete'`);
|
|
134
|
+
}
|
|
135
|
+
const $where = augmentWhere(meta, q.$where, { [meta.softDelete]: { $ne: null } });
|
|
136
|
+
return this.updateMany(entity, { ...q, $where }, { [meta.softDelete]: null }, {
|
|
137
|
+
filters: { softDelete: false },
|
|
138
|
+
});
|
|
139
|
+
}
|
|
123
140
|
deleteOneById(entity, id, opts) {
|
|
124
141
|
return this.deleteMany(entity, { $where: id }, opts);
|
|
125
142
|
}
|
|
126
143
|
async deleteMany(entityOrQuery, qOrOpts, maybeOpts) {
|
|
127
|
-
|
|
128
|
-
let q;
|
|
129
|
-
let opts;
|
|
130
|
-
if (typeof entityOrQuery === 'function' && entityOrQuery.prototype) {
|
|
131
|
-
entity = entityOrQuery;
|
|
132
|
-
q = qOrOpts;
|
|
133
|
-
opts = maybeOpts;
|
|
134
|
-
}
|
|
135
|
-
else {
|
|
136
|
-
const { $entity, ...rest } = entityOrQuery;
|
|
137
|
-
entity = $entity;
|
|
138
|
-
q = rest;
|
|
139
|
-
opts = qOrOpts;
|
|
140
|
-
}
|
|
144
|
+
const [entity, q, opts] = this.resolveEntityQuery(entityOrQuery, qOrOpts, maybeOpts);
|
|
141
145
|
await this.emitHook(entity, 'beforeDelete', []);
|
|
142
146
|
const changes = await this.internalDeleteMany(entity, q, opts);
|
|
143
147
|
await this.emitHook(entity, 'afterDelete', []);
|
|
@@ -261,19 +265,20 @@ export class AbstractQuerier {
|
|
|
261
265
|
return;
|
|
262
266
|
await Promise.all(entries.map(({ it, relKeys }) => Promise.all(relKeys.map((relKey) => this.saveRelation(entity, it, relKey)))));
|
|
263
267
|
}
|
|
264
|
-
async updateRelations(entity, q, payload) {
|
|
268
|
+
async updateRelations(entity, q, payload, opts) {
|
|
265
269
|
const meta = getMeta(entity);
|
|
266
270
|
const relKeys = filterPersistableRelationKeys(meta, payload, 'persist');
|
|
267
271
|
if (!relKeys.length) {
|
|
268
272
|
return;
|
|
269
273
|
}
|
|
270
|
-
const founds = await this.findMany(entity, { ...q, $select: { [meta.id]: true } });
|
|
274
|
+
const founds = await this.findMany(entity, { ...q, $select: { [meta.id]: true } }, opts);
|
|
271
275
|
const ids = founds.map((found) => found[meta.id]);
|
|
272
276
|
await Promise.all(ids.map((id) => Promise.all(relKeys.map((relKey) => this.saveRelation(entity, { ...payload, [meta.id]: id }, relKey, true)))));
|
|
273
277
|
}
|
|
274
278
|
async deleteRelations(entity, ids, opts) {
|
|
275
279
|
const meta = getMeta(entity);
|
|
276
280
|
const relKeys = filterPersistableRelationKeys(meta, meta.relations, 'delete');
|
|
281
|
+
// Cascade forwards `opts` (including `hardDelete`); each child soft-deletes only if it can.
|
|
277
282
|
for (const relKey of relKeys) {
|
|
278
283
|
const relOpts = meta.relations[relKey];
|
|
279
284
|
if (!relOpts)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstractQuerier.js","sourceRoot":"","sources":["../../src/querier/abstractQuerier.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"abstractQuerier.js","sourceRoot":"","sources":["../../src/querier/abstractQuerier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstractQuerierPool.d.ts","sourceRoot":"","sources":["../../src/querier/abstractQuerierPool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/F;;GAEG;AACH,8BAAsB,mBAAmB,CAAC,CAAC,SAAS,eAAe,EAAE,CAAC,SAAS,OAAO,CAAE,YAAW,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;IAEhH,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"abstractQuerierPool.d.ts","sourceRoot":"","sources":["../../src/querier/abstractQuerierPool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/F;;GAEG;AACH,8BAAsB,mBAAmB,CAAC,CAAC,SAAS,eAAe,EAAE,CAAC,SAAS,OAAO,CAAE,YAAW,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;IAEhH,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY;IAF/B,YACW,OAAO,EAAE,CAAC,EACV,KAAK,CAAC,EAAE,YAAY,YAAA,EAC3B;IAEJ;;OAEG;IACH,QAAQ,CAAC,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IAElC;;OAEG;IACG,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC,CAGhG;IAED;;OAEG;IACG,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAOrE;IAED;;OAEG;IACH,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstractQuerierPool.js","sourceRoot":"","sources":["../../src/querier/abstractQuerierPool.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,OAAgB,mBAAmB;IAE5B;
|
|
1
|
+
{"version":3,"file":"abstractQuerierPool.js","sourceRoot":"","sources":["../../src/querier/abstractQuerierPool.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,OAAgB,mBAAmB;IAE5B,OAAO;IACP,KAAK;IAFhB,YACW,OAAU,EACV,KAAoB;uBADpB,OAAO;qBACP,KAAK;IACb,CAAC;IAOJ;;OAEG;IACH,KAAK,CAAC,WAAW,CAAI,QAAoC,EAAE,IAAyB;QAClF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAI,QAAoC;QACvD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,OAAO,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;gBAAS,CAAC;YACT,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;CAMF"}
|
|
@@ -28,20 +28,20 @@ export declare abstract class AbstractSqlQuerier extends AbstractQuerier impleme
|
|
|
28
28
|
private timedAll;
|
|
29
29
|
run(query: string, values?: unknown[]): Promise<QueryUpdateResult>;
|
|
30
30
|
private timedRun;
|
|
31
|
-
protected internalFindMany<E extends object>(entity: Type<E>, q: Query<E
|
|
32
|
-
protected internalFindManyStream<E extends object>(entity: Type<E>, q: Query<E
|
|
31
|
+
protected internalFindMany<E extends object>(entity: Type<E>, q: Query<E>, opts?: QueryOptions): Promise<E[]>;
|
|
32
|
+
protected internalFindManyStream<E extends object>(entity: Type<E>, q: Query<E>, opts?: QueryOptions): AsyncGenerator<Awaited<E>, void, unknown>;
|
|
33
33
|
/**
|
|
34
|
-
* Internal streaming query
|
|
34
|
+
* Internal streaming query - returns an async iterable of raw rows.
|
|
35
35
|
* Default implementation falls back to `internalAll()` then yields each row.
|
|
36
36
|
* Drivers with native cursor/streaming APIs (SQLite, Pg) should override this.
|
|
37
37
|
*/
|
|
38
38
|
protected internalStream<T>(query: string, values?: unknown[]): AsyncIterable<T>;
|
|
39
39
|
private hydrateJsonFields;
|
|
40
40
|
private hydrateJsonFieldsRecursive;
|
|
41
|
-
protected internalCount<E extends object>(entity: Type<E>, q?: QuerySearch<E
|
|
42
|
-
protected internalAggregate<E extends object, Q extends QueryAggregate<E>>(entity: Type<E>, q: Q): Promise<QueryAggregateResult<E, Q['$group']>[]>;
|
|
41
|
+
protected internalCount<E extends object>(entity: Type<E>, q?: QuerySearch<E>, opts?: QueryOptions): Promise<number>;
|
|
42
|
+
protected internalAggregate<E extends object, Q extends QueryAggregate<E>>(entity: Type<E>, q: Q, opts?: QueryOptions): Promise<QueryAggregateResult<E, Q['$group']>[]>;
|
|
43
43
|
internalInsertMany<E extends object>(entity: Type<E>, payload: E[]): Promise<IdValue<E>[]>;
|
|
44
|
-
internalUpdateMany<E extends object>(entity: Type<E>, q: QuerySearch<E>, payload: UpdatePayload<E
|
|
44
|
+
internalUpdateMany<E extends object>(entity: Type<E>, q: QuerySearch<E>, payload: UpdatePayload<E>, opts?: QueryOptions): Promise<number>;
|
|
45
45
|
upsertOne<E extends object>(entity: Type<E>, conflictPaths: QueryConflictPaths<E>, payload: E): Promise<QueryUpdateResult>;
|
|
46
46
|
upsertMany<E extends object>(entity: Type<E>, conflictPaths: QueryConflictPaths<E>, payload: E[]): Promise<QueryUpdateResult>;
|
|
47
47
|
protected internalDeleteMany<E extends object>(entity: Type<E>, q: QuerySearch<E>, opts?: QueryOptions): Promise<number>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstractSqlQuerier.d.ts","sourceRoot":"","sources":["../../src/querier/abstractSqlQuerier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,OAAO,KAAK,EACV,YAAY,EACZ,OAAO,EACP,KAAK,EACL,cAAc,EACd,oBAAoB,EACpB,kBAAkB,EAClB,YAAY,EACZ,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,kBAAkB,EAClB,IAAI,EACJ,aAAa,EACd,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"abstractSqlQuerier.d.ts","sourceRoot":"","sources":["../../src/querier/abstractSqlQuerier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate, __metadata } from "tslib";
|
|
2
2
|
import { getMeta } from '../entity/index.js';
|
|
3
|
-
import { buildUpdateResult, clone, getRelationRequestSummary, obtainAttrsPaths, throwNoPendingTransaction, throwPendingTransaction, unflatObject, unflatObjects, } from '../util/index.js';
|
|
3
|
+
import { buildUpdateResult, clone, getRelationRequestSummary, obtainAttrsPaths, throwNoPendingTransaction, throwPendingTransaction, unflatObject, unflatObjects, withoutSoftDeleteFilter, } from '../util/index.js';
|
|
4
4
|
import { AbstractQuerier } from './abstractQuerier.js';
|
|
5
5
|
import { Log, Serialized } from './decorator/index.js';
|
|
6
6
|
export class AbstractSqlQuerier extends AbstractQuerier {
|
|
@@ -40,22 +40,22 @@ export class AbstractSqlQuerier extends AbstractQuerier {
|
|
|
40
40
|
async timedRun(query, values) {
|
|
41
41
|
return this.internalRun(query, this.dialect.normalizeValues(values));
|
|
42
42
|
}
|
|
43
|
-
async internalFindMany(entity, q) {
|
|
43
|
+
async internalFindMany(entity, q, opts) {
|
|
44
44
|
const ctx = this.dialect.createContext();
|
|
45
|
-
this.dialect.find(ctx, entity, q);
|
|
45
|
+
this.dialect.find(ctx, entity, q, opts);
|
|
46
46
|
const res = await this.all(ctx.sql, ctx.values);
|
|
47
47
|
const founds = unflatObjects(res).map((row) => this.hydrateJsonFields(entity, row));
|
|
48
48
|
await this.fillToManyRelations(entity, founds, q.$populate);
|
|
49
49
|
return founds;
|
|
50
50
|
}
|
|
51
|
-
async *internalFindManyStream(entity, q) {
|
|
51
|
+
async *internalFindManyStream(entity, q, opts) {
|
|
52
52
|
const meta = getMeta(entity);
|
|
53
53
|
const { toManyKeys } = getRelationRequestSummary(meta, q.$populate);
|
|
54
54
|
if (toManyKeys.length) {
|
|
55
55
|
throw new TypeError(`findManyStream does not load to-many relations (${toManyKeys.join(', ')}). Use findMany so fillToManyRelations can run, or omit those keys from the stream query.`);
|
|
56
56
|
}
|
|
57
57
|
const ctx = this.dialect.createContext();
|
|
58
|
-
this.dialect.find(ctx, entity, q);
|
|
58
|
+
this.dialect.find(ctx, entity, q, opts);
|
|
59
59
|
const normalizedParams = this.dialect.normalizeValues(ctx.values);
|
|
60
60
|
let attrsPaths;
|
|
61
61
|
for await (const row of this.internalStream(ctx.sql, normalizedParams)) {
|
|
@@ -64,7 +64,7 @@ export class AbstractSqlQuerier extends AbstractQuerier {
|
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
/**
|
|
67
|
-
* Internal streaming query
|
|
67
|
+
* Internal streaming query - returns an async iterable of raw rows.
|
|
68
68
|
* Default implementation falls back to `internalAll()` then yields each row.
|
|
69
69
|
* Drivers with native cursor/streaming APIs (SQLite, Pg) should override this.
|
|
70
70
|
*/
|
|
@@ -117,15 +117,15 @@ export class AbstractSqlQuerier extends AbstractQuerier {
|
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
|
-
async internalCount(entity, q = {}) {
|
|
120
|
+
async internalCount(entity, q = {}, opts) {
|
|
121
121
|
const ctx = this.dialect.createContext();
|
|
122
|
-
this.dialect.count(ctx, entity, q);
|
|
122
|
+
this.dialect.count(ctx, entity, q, opts);
|
|
123
123
|
const res = await this.all(ctx.sql, ctx.values);
|
|
124
124
|
return Number(res[0].count);
|
|
125
125
|
}
|
|
126
|
-
async internalAggregate(entity, q) {
|
|
126
|
+
async internalAggregate(entity, q, opts) {
|
|
127
127
|
const ctx = this.dialect.createContext();
|
|
128
|
-
this.dialect.aggregate(ctx, entity, q);
|
|
128
|
+
this.dialect.aggregate(ctx, entity, q, opts);
|
|
129
129
|
// biome-ignore lint/suspicious/noExplicitAny: raw DB rows satisfy QueryAggregateResult at runtime but TS can't verify
|
|
130
130
|
return this.all(ctx.sql, ctx.values);
|
|
131
131
|
}
|
|
@@ -147,12 +147,12 @@ export class AbstractSqlQuerier extends AbstractQuerier {
|
|
|
147
147
|
await this.insertRelations(entity, payload);
|
|
148
148
|
return payloadIds;
|
|
149
149
|
}
|
|
150
|
-
async internalUpdateMany(entity, q, payload) {
|
|
150
|
+
async internalUpdateMany(entity, q, payload, opts) {
|
|
151
151
|
payload = clone(payload);
|
|
152
152
|
const ctx = this.dialect.createContext();
|
|
153
|
-
this.dialect.update(ctx, entity, q, payload);
|
|
153
|
+
this.dialect.update(ctx, entity, q, payload, opts);
|
|
154
154
|
const { changes = 0 } = await this.run(ctx.sql, ctx.values);
|
|
155
|
-
await this.updateRelations(entity, q, payload);
|
|
155
|
+
await this.updateRelations(entity, q, payload, opts);
|
|
156
156
|
return changes;
|
|
157
157
|
}
|
|
158
158
|
async upsertOne(entity, conflictPaths, payload) {
|
|
@@ -169,8 +169,10 @@ export class AbstractSqlQuerier extends AbstractQuerier {
|
|
|
169
169
|
}
|
|
170
170
|
async internalDeleteMany(entity, q, opts) {
|
|
171
171
|
const meta = getMeta(entity);
|
|
172
|
+
// A hard delete also targets already-soft-deleted rows, so drop the soft-delete filter when finding ids.
|
|
173
|
+
const findOpts = opts?.hardDelete ? { ...opts, filters: withoutSoftDeleteFilter(opts.filters) } : opts;
|
|
172
174
|
const findCtx = this.dialect.createContext();
|
|
173
|
-
this.dialect.find(findCtx, entity, { ...q, $select: { [meta.id]: true } });
|
|
175
|
+
this.dialect.find(findCtx, entity, { ...q, $select: { [meta.id]: true } }, findOpts);
|
|
174
176
|
const founds = await this.all(findCtx.sql, findCtx.values);
|
|
175
177
|
if (!founds.length) {
|
|
176
178
|
return 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstractSqlQuerier.js","sourceRoot":"","sources":["../../src/querier/abstractSqlQuerier.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAiB7C,OAAO,EACL,iBAAiB,EACjB,KAAK,EACL,yBAAyB,EACzB,gBAAgB,EAChB,yBAAyB,EACzB,uBAAuB,EACvB,YAAY,EACZ,aAAa,
|
|
1
|
+
{"version":3,"file":"abstractSqlQuerier.js","sourceRoot":"","sources":["../../src/querier/abstractSqlQuerier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"injectQuerier.d.ts","sourceRoot":"","sources":["../../../src/querier/decorator/injectQuerier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAIhE,wBAAgB,aAAa,
|
|
1
|
+
{"version":3,"file":"injectQuerier.d.ts","sourceRoot":"","sources":["../../../src/querier/decorator/injectQuerier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAIhE,wBAAgB,aAAa,YAEZ,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,MAAM,SAAS,MAAM,UAkBlE;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,OAmBvE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const metadataKey = Symbol('InjectQuerier');
|
|
2
2
|
export function InjectQuerier() {
|
|
3
|
-
// biome-ignore lint/suspicious/noExplicitAny: `any` is required
|
|
3
|
+
// biome-ignore lint/suspicious/noExplicitAny: `any` is required - class prototypes don't satisfy Record<K, unknown>
|
|
4
4
|
return (proto, key, index) => {
|
|
5
5
|
if (!proto[metadataKey]) {
|
|
6
6
|
proto[metadataKey] = new WeakMap();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../src/querier/decorator/log.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,GAAG,
|
|
1
|
+
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../src/querier/decorator/log.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,GAAG,cACA,MAAM,QAAQ,MAAM,kBAAkB,kBAAkB,KAAG,IAAI,CAkBjF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialized.d.ts","sourceRoot":"","sources":["../../../src/querier/decorator/serialized.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,UAAU,
|
|
1
|
+
{"version":3,"file":"serialized.d.ts","sourceRoot":"","sources":["../../../src/querier/decorator/serialized.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,UAAU,cACP,MAAM,QAAQ,MAAM,kBAAkB,kBAAkB,KAAG,IAAI,CAMjF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactional.d.ts","sourceRoot":"","sources":["../../../src/querier/decorator/transactional.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAW,WAAW,EAAQ,MAAM,qBAAqB,CAAC;AAGtF,wBAAgB,aAAa,CAAC,EAC5B,WAAwB,EACxB,IAAI,EACJ,cAAc,GACf,GAAE;IACD,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC;IAChD,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;CACrC,
|
|
1
|
+
{"version":3,"file":"transactional.d.ts","sourceRoot":"","sources":["../../../src/querier/decorator/transactional.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAW,WAAW,EAAQ,MAAM,qBAAqB,CAAC;AAGtF,wBAAgB,aAAa,CAAC,EAC5B,WAAwB,EACxB,IAAI,EACJ,cAAc,GACf,GAAE;IACD,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC;IAChD,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;CACrC,YACY,MAAM,OAAO,MAAM,kBAAkB,kBAAkB,KAAG,IAAI,CA6C/E"}
|
|
@@ -2,7 +2,7 @@ import { getQuerierPool } from '../../options.js';
|
|
|
2
2
|
import { getInjectedQuerierIndex } from './injectQuerier.js';
|
|
3
3
|
export function Transactional({ propagation = 'required', pool, isolationLevel, } = {}) {
|
|
4
4
|
return (target, key, propDescriptor) => {
|
|
5
|
-
// biome-ignore lint/suspicious/noExplicitAny: decorator pattern
|
|
5
|
+
// biome-ignore lint/suspicious/noExplicitAny: decorator pattern - runtime constructor type is erased
|
|
6
6
|
const theClass = target.constructor;
|
|
7
7
|
const originalMethod = propDescriptor.value;
|
|
8
8
|
const injectedQuerierIndex = getInjectedQuerierIndex(theClass, key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/querier/decorator/transactional.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,MAAM,UAAU,aAAa,CAAC,EAC5B,WAAW,GAAG,UAAU,EACxB,IAAI,EACJ,cAAc,
|
|
1
|
+
{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/querier/decorator/transactional.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,MAAM,UAAU,aAAa,CAAC,EAC5B,WAAW,GAAG,UAAU,EACxB,IAAI,EACJ,cAAc,GACf,GAIG,EAAE;IACJ,OAAO,CAAC,MAAc,EAAE,GAAW,EAAE,cAAkC,EAAQ,EAAE;QAC/E,qGAAqG;QACrG,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAwB,CAAC;QACjD,MAAM,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC;QAC5C,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEpE,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,SAAS,CAAC,0CAA0C,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,GAAG,GAAG,CAAC,CAAC;QAC/F,CAAC;QAED,cAAc,CAAC,KAAK,GAAG,KAAK,UAAU,IAAI,CAAe,GAAG,IAAe;YACzE,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;YACzB,IAAI,gBAAgB,GAAG,KAAK,CAAC;YAC7B,IAAI,OAAgB,CAAC;YAErB,IAAI,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBACjC,OAAO,GAAG,MAAM,CAAC,oBAAoB,CAAY,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,gBAAgB,GAAG,IAAI,CAAC;gBACxB,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC1B,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClC,MAAM,CAAC,oBAAoB,CAAC,GAAG,OAAO,CAAC;YACzC,CAAC;YAED,IAAI,CAAC;gBACH,IAAI,WAAW,KAAK,UAAU,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;oBAC9D,MAAM,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gBAClF,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBACtD,IAAI,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;oBACnD,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBACpC,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;oBACnD,MAAM,OAAO,CAAC,mBAAmB,EAAE,CAAC;gBACtC,CAAC;gBACD,MAAM,GAAG,CAAC;YACZ,CAAC;oBAAS,CAAC;gBACT,IAAI,gBAAgB,EAAE,CAAC;oBACrB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC1B,CAAC;YACH,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaAST.d.ts","sourceRoot":"","sources":["../../src/schema/schemaAST.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,SAAS,EACT,SAAS,IAAI,UAAU,EACvB,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;GASG;AACH,qBAAa,SAAU,YAAW,UAAU;IAC1C,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IACpD,QAAQ,CAAC,aAAa,EAAE,gBAAgB,EAAE,CAAM;IAChD,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,CAAM;IAMnC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"schemaAST.d.ts","sourceRoot":"","sources":["../../src/schema/schemaAST.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,SAAS,EACT,SAAS,IAAI,UAAU,EACvB,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;GASG;AACH,qBAAa,SAAU,YAAW,UAAU;IAC1C,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IACpD,QAAQ,CAAC,aAAa,EAAE,gBAAgB,EAAE,CAAM;IAChD,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,CAAM;IAMnC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAE5C;IAED;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAG/B;IAED;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAoBjC;IAED;;OAEG;IACH,SAAS,IAAI,SAAS,EAAE,CAEvB;IAED;;OAEG;IACH,aAAa,IAAI,MAAM,EAAE,CAExB;IAMD;;;OAGG;IACH,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,EAAE,CAEhD;IAED;;;OAGG;IACH,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,EAAE,CAE7C;IAED;;OAEG;IACH,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS,CAE5E;IAED;;OAEG;IACH,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,gBAAgB,EAAE,CAE1D;IAED;;OAEG;IACH,mBAAmB,CAAC,QAAQ,EAAE,UAAU,GAAG,UAAU,GAAG,SAAS,CAEhE;IAMD;;;OAGG;IACH,0BAA0B,IAAI,SAAS,EAAE,EAAE,CA8B1C;IAED;;OAEG;IACH,uBAAuB,IAAI,OAAO,CAEjC;IAED;;;OAGG;IACH,cAAc,IAAI,SAAS,EAAE,CAE5B;IAED;;;OAGG;IACH,YAAY,IAAI,SAAS,EAAE,CAE1B;IAED;;;OAGG;IACH,OAAO,CAAC,eAAe;IA4BvB;;;;;;;OAOG;IACH,QAAQ,IAAI,eAAe,EAAE,CAwC5B;IAED;;OAEG;IACH,OAAO,IAAI,OAAO,CAEjB;IAMD;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAwBzC;IAED;;OAEG;IACH,iBAAiB,CAAC,GAAG,EAAE,gBAAgB,GAAG,gBAAgB,CAezD;IAED;;OAEG;IACH,sBAAsB,CAAC,IAAI,EAAE,gBAAgB,GAAG,gBAAgB,CAW/D;IAMD;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAK/B;IAED;;OAEG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,CAG9C;IAED;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAE5C;IAMD;;OAEG;IACH,eAAe,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAc3C;IAED;;OAEG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CA0BxC;IAMD;;OAEG;IACH,KAAK,IAAI,SAAS,CAuFjB;IAED;;OAEG;IACH,QAAQ,IAAI;QACV,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,UAAU,EAAE,MAAM,CAAC;KACpB,CAYA;IAED;;OAEG;IACH,MAAM,IAAI,MAAM,CA2Bf;CACF"}
|
|
@@ -50,13 +50,13 @@ export declare class SchemaASTBuilder {
|
|
|
50
50
|
*
|
|
51
51
|
* Without this, a field like `creatorId?: UUID` (a bare TypeScript alias for
|
|
52
52
|
* `string`, erased at runtime) falls back to the generic string inference in
|
|
53
|
-
* {@link fieldOptionsToCanonical} and gets typed as TEXT/VARCHAR
|
|
53
|
+
* {@link fieldOptionsToCanonical} and gets typed as TEXT/VARCHAR - producing a
|
|
54
54
|
* foreign key column whose type doesn't match the UUID primary key it
|
|
55
55
|
* references, which Postgres (and most databases) reject outright.
|
|
56
56
|
*
|
|
57
57
|
* `field.typeInferred` (set by `defineField`, see entity/metadata/definition.ts)
|
|
58
58
|
* is what distinguishes "no type was given" from "the decorator explicitly set
|
|
59
|
-
* a type"
|
|
59
|
+
* a type" - including explicit constructor overrides like `type: BigInt`, which
|
|
60
60
|
* a value-based check (e.g. `typeof field.type === 'string'`) would miss since
|
|
61
61
|
* reflection also produces constructor values like `String`/`Number`.
|
|
62
62
|
* `columnType` remains the unambiguous, always-respected explicit override.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaASTBuilder.d.ts","sourceRoot":"","sources":["../../src/schema/schemaASTBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAA6B,gBAAgB,EAA0C,MAAM,YAAY,CAAC;AAGtH;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC;IAChF,kCAAkC;IAClC,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,KAAK,MAAM,CAAC;IACjE,6BAA6B;IAC7B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,qEAAqE;IACrE,uBAAuB,CAAC,EAAE,gBAAgB,CAAC;CAC5C;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAIzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAJ1C,OAAO,CAAC,GAAG,CAAY;
|
|
1
|
+
{"version":3,"file":"schemaASTBuilder.d.ts","sourceRoot":"","sources":["../../src/schema/schemaASTBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAA6B,gBAAgB,EAA0C,MAAM,YAAY,CAAC;AAGtH;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC;IAChF,kCAAkC;IAClC,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,KAAK,MAAM,CAAC;IACjE,6BAA6B;IAC7B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,qEAAqE;IACrE,uBAAuB,CAAC,EAAE,gBAAgB,CAAC;CAC5C;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAIzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAJ1C,OAAO,CAAC,GAAG,CAAY;IAEvB,YACmB,cAAc,CAAC,EAAE,cAAc,YAAA,EAC/B,uBAAuB,GAAE,gBAA6C,EAGxF;IAED;;OAEG;IACH,KAAK,IAAI,IAAI,CAGZ;IAED;;OAEG;IACH,MAAM,IAAI,SAAS,CAElB;IAMD;;OAEG;IACH,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,GAAE,wBAA6B,GAAG,SAAS,CA4BzF;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,CAAC,0BAA0B;IAalC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA0D1B;;OAEG;IACH,OAAO,CAAC,0BAA0B;IA0DlC;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAqE7B"}
|
|
@@ -70,13 +70,13 @@ export class SchemaASTBuilder {
|
|
|
70
70
|
*
|
|
71
71
|
* Without this, a field like `creatorId?: UUID` (a bare TypeScript alias for
|
|
72
72
|
* `string`, erased at runtime) falls back to the generic string inference in
|
|
73
|
-
* {@link fieldOptionsToCanonical} and gets typed as TEXT/VARCHAR
|
|
73
|
+
* {@link fieldOptionsToCanonical} and gets typed as TEXT/VARCHAR - producing a
|
|
74
74
|
* foreign key column whose type doesn't match the UUID primary key it
|
|
75
75
|
* references, which Postgres (and most databases) reject outright.
|
|
76
76
|
*
|
|
77
77
|
* `field.typeInferred` (set by `defineField`, see entity/metadata/definition.ts)
|
|
78
78
|
* is what distinguishes "no type was given" from "the decorator explicitly set
|
|
79
|
-
* a type"
|
|
79
|
+
* a type" - including explicit constructor overrides like `type: BigInt`, which
|
|
80
80
|
* a value-based check (e.g. `typeof field.type === 'string'`) would miss since
|
|
81
81
|
* reflection also produces constructor values like `String`/`Number`.
|
|
82
82
|
* `columnType` remains the unambiguous, always-respected explicit override.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaASTBuilder.js","sourceRoot":"","sources":["../../src/schema/schemaASTBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAI3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAgBxD;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAIR;
|
|
1
|
+
{"version":3,"file":"schemaASTBuilder.js","sourceRoot":"","sources":["../../src/schema/schemaASTBuilder.ts"],"names":[],"mappings":"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"}
|