uql-orm 0.7.9 → 0.8.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 +21 -1
- package/README.md +36 -7
- package/dist/browser/cc-BVTDOeZ_.js.map +1 -1
- package/dist/browser/uql-browser.min.js +125 -1
- package/dist/browser/uql-browser.min.js.map +1 -1
- package/dist/entity/decorator/entity.d.ts +1 -1
- package/dist/entity/decorator/entity.d.ts.map +1 -1
- package/dist/entity/decorator/entity.js +1 -1
- package/dist/entity/decorator/entity.js.map +1 -1
- package/dist/entity/decorator/field.js +1 -1
- package/dist/entity/decorator/field.js.map +1 -1
- package/dist/entity/decorator/hook.js +1 -1
- package/dist/entity/decorator/hook.js.map +1 -1
- package/dist/entity/decorator/id.js +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 +2 -6
- package/dist/entity/decorator/index-decorator.js.map +1 -1
- package/dist/entity/decorator/index.d.ts +1 -1
- package/dist/entity/decorator/index.d.ts.map +1 -1
- package/dist/entity/decorator/index.js +1 -1
- package/dist/entity/decorator/index.js.map +1 -1
- package/dist/entity/decorator/relation.js +1 -1
- package/dist/entity/decorator/relation.js.map +1 -1
- package/dist/entity/{decorator → metadata}/definition.d.ts +8 -4
- package/dist/entity/metadata/definition.d.ts.map +1 -0
- package/dist/entity/{decorator → metadata}/definition.js +81 -29
- package/dist/entity/metadata/definition.js.map +1 -0
- package/dist/entity/test-helpers.d.ts +4 -0
- package/dist/entity/test-helpers.d.ts.map +1 -0
- package/dist/entity/test-helpers.js +15 -0
- package/dist/entity/test-helpers.js.map +1 -0
- package/dist/querier/abstractSqlQuerier.d.ts +2 -0
- package/dist/querier/abstractSqlQuerier.d.ts.map +1 -1
- package/dist/querier/abstractSqlQuerier.js +47 -2
- package/dist/querier/abstractSqlQuerier.js.map +1 -1
- package/dist/schema/schemaASTBuilder.js +1 -1
- package/dist/schema/schemaASTBuilder.js.map +1 -1
- package/dist/type/config.d.ts +1 -1
- package/dist/type/entity.d.ts +39 -30
- package/dist/type/entity.d.ts.map +1 -1
- package/package.json +2 -2
- package/dist/entity/decorator/definition.d.ts.map +0 -1
- package/dist/entity/decorator/definition.js.map +0 -1
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { EntityOptions, Type } from '../../type/index.js';
|
|
2
|
-
export declare function Entity<E>(opts?: EntityOptions): (entity: Type<E>) => void;
|
|
2
|
+
export declare function Entity<E>(opts?: EntityOptions<E>): (entity: Type<E>) => void;
|
|
3
3
|
//# sourceMappingURL=entity.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../src/entity/decorator/entity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAG/D,wBAAgB,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../src/entity/decorator/entity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAG/D,wBAAgB,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,IACvC,QAAQ,IAAI,CAAC,CAAC,CAAC,KAAG,IAAI,CAG/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/entity/decorator/entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/entity/decorator/entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,MAAM,UAAU,MAAM,CAAI,IAAuB;IAC/C,OAAO,CAAC,MAAe,EAAQ,EAAE;QAC/B,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field.js","sourceRoot":"","sources":["../../../src/entity/decorator/field.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"field.js","sourceRoot":"","sources":["../../../src/entity/decorator/field.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,UAAU,KAAK,CAAI,IAAmB;IAC1C,OAAO,CAAC,MAAc,EAAE,GAAW,EAAQ,EAAE;QAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,WAAsB,CAAC;QAC7C,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../src/entity/decorator/hook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../src/entity/decorator/hook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,SAAS,mBAAmB,CAAC,KAAgB;IAC3C,OAAO,GAAG,EAAE,CACV,CAAC,MAAc,EAAE,GAAoB,EAAQ,EAAE;QAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,WAA4B,CAAC;QACnD,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;AAChE,MAAM,CAAC,MAAM,WAAW,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;AAC9D,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;AAChE,MAAM,CAAC,MAAM,WAAW,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;AAC9D,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;AAChE,MAAM,CAAC,MAAM,WAAW,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;AAC9D,MAAM,CAAC,MAAM,SAAS,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../src/entity/decorator/id.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../src/entity/decorator/id.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,MAAM,UAAU,EAAE,CAAI,OAAqB,EAAE;IAC3C,OAAO,CAAC,MAAc,EAAE,GAAW,EAAQ,EAAE;QAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,WAAsB,CAAC;QAC7C,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-decorator.d.ts","sourceRoot":"","sources":["../../../src/entity/decorator/index-decorator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAGpE;;GAEG;AACH,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,wBAAwB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,qBAA0B,IACrE,QAAQ,IAAI,CAAC,CAAC,CAAC,KAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"index-decorator.d.ts","sourceRoot":"","sources":["../../../src/entity/decorator/index-decorator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAGpE;;GAEG;AACH,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,wBAAwB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,qBAA0B,IACrE,QAAQ,IAAI,CAAC,CAAC,CAAC,KAAG,IAAI,CAG/B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { appendEntityIndex, ensureMeta } from '../metadata/definition.js';
|
|
2
2
|
/**
|
|
3
3
|
* Define a composite index on an entity class.
|
|
4
4
|
*
|
|
@@ -21,11 +21,7 @@ import { getOrCreateMeta } from './definition.js';
|
|
|
21
21
|
*/
|
|
22
22
|
export function Index(columns, options = {}) {
|
|
23
23
|
return (target) => {
|
|
24
|
-
|
|
25
|
-
if (!meta.indexes) {
|
|
26
|
-
meta.indexes = [];
|
|
27
|
-
}
|
|
28
|
-
meta.indexes.push({ ...options, columns, unique: options.unique ?? false });
|
|
24
|
+
appendEntityIndex(ensureMeta(target), { ...options, columns });
|
|
29
25
|
};
|
|
30
26
|
}
|
|
31
27
|
//# sourceMappingURL=index-decorator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-decorator.js","sourceRoot":"","sources":["../../../src/entity/decorator/index-decorator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index-decorator.js","sourceRoot":"","sources":["../../../src/entity/decorator/index-decorator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAgB1E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,KAAK,CAAI,OAAiB,EAAE,UAAiC,EAAE;IAC7E,OAAO,CAAC,MAAe,EAAQ,EAAE;QAC/B,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACjE,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { defineHook, getEntities, getMeta } from '
|
|
1
|
+
export { defineEntity, defineField, defineHook, defineId, defineRelation, getEntities, getMeta, } from '../metadata/definition.js';
|
|
2
2
|
export * from './entity.js';
|
|
3
3
|
export * from './field.js';
|
|
4
4
|
export * from './hook.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/entity/decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/entity/decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,UAAU,EACV,QAAQ,EACR,cAAc,EACd,WAAW,EACX,OAAO,GACR,MAAM,2BAA2B,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { defineHook, getEntities, getMeta } from '
|
|
1
|
+
export { defineEntity, defineField, defineHook, defineId, defineRelation, getEntities, getMeta, } from '../metadata/definition.js';
|
|
2
2
|
export * from './entity.js';
|
|
3
3
|
export * from './field.js';
|
|
4
4
|
export * from './hook.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/entity/decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/entity/decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,UAAU,EACV,QAAQ,EACR,cAAc,EACd,WAAW,EACX,OAAO,GACR,MAAM,2BAA2B,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation.js","sourceRoot":"","sources":["../../../src/entity/decorator/relation.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"relation.js","sourceRoot":"","sources":["../../../src/entity/decorator/relation.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,SAAS,QAAQ,CAAI,IAAwB;IAC3C,OAAO,CAAC,MAAc,EAAE,GAAW,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,MAAM,CAAC,WAAsB,CAAC;QAC7C,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC;AAID,MAAM,UAAU,QAAQ,CAAI,IAAiC;IAC3D,OAAO,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,SAAS,CAAI,IAAkC;IAC7D,OAAO,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,SAAS,CAAI,IAAiC;IAC5D,OAAO,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,UAAU,CAAI,IAAkC;IAC9D,OAAO,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import 'reflect-metadata';
|
|
2
|
-
import type { EntityMeta, EntityOptions, FieldOptions, HookEvent, RelationOptions, Type } from '../../type/index.js';
|
|
2
|
+
import type { EntityIndexMeta, EntityMeta, EntityOptions, FieldOptions, HookEvent, RelationOptions, Type } from '../../type/index.js';
|
|
3
|
+
/**
|
|
4
|
+
* Append a composite index entry with normalized `unique` (default false).
|
|
5
|
+
*/
|
|
6
|
+
export declare function appendEntityIndex<E>(meta: EntityMeta<E>, index: EntityIndexMeta): void;
|
|
3
7
|
export declare function defineField<E>(entity: Type<E>, key: string, opts?: FieldOptions): EntityMeta<E>;
|
|
4
8
|
export declare function defineId<E>(entity: Type<E>, key: string, opts: FieldOptions): EntityMeta<E>;
|
|
5
9
|
export declare function defineRelation<E>(entity: Type<E>, key: string, opts: RelationOptions<E>): EntityMeta<E>;
|
|
6
|
-
export declare function defineEntity<E>(entity: Type<E>, opts?: EntityOptions): EntityMeta<E>;
|
|
7
|
-
export declare function getEntities(): Type<unknown>[];
|
|
8
10
|
export declare function defineHook<E>(entity: Type<E>, methodName: string, event: HookEvent): EntityMeta<E>;
|
|
11
|
+
export declare function defineEntity<E>(entity: Type<E>, opts?: EntityOptions<E>): EntityMeta<E>;
|
|
12
|
+
export declare function getEntities(): Type<unknown>[];
|
|
13
|
+
export declare function ensureMeta<E>(entity: Type<E>): EntityMeta<E>;
|
|
9
14
|
export declare function getMeta<E>(entity: Type<E>): EntityMeta<E>;
|
|
10
15
|
export declare function isValidEntityType(type: unknown): type is Type<unknown>;
|
|
11
|
-
export declare function getOrCreateMeta<E>(entity: Type<E>): EntityMeta<E>;
|
|
12
16
|
//# sourceMappingURL=definition.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../../src/entity/metadata/definition.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EACV,eAAe,EACf,UAAU,EACV,aAAa,EAEb,YAAY,EACZ,SAAS,EAKT,eAAe,EACf,IAAI,EACL,MAAM,qBAAqB,CAAC;AAY7B;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI,CAGtF;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,GAAG,UAAU,CAAC,CAAC,CAAC,CASnG;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,CAQ3F;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAWvG;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAMlG;AAiDD,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,GAAE,aAAa,CAAC,CAAC,CAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAuC3F;AAED,wBAAgB,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAO7C;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAQ5D;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAUzD;AA8JD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAUtE"}
|
|
@@ -1,9 +1,19 @@
|
|
|
1
1
|
import 'reflect-metadata';
|
|
2
2
|
import { getKeys, hasKeys, lowerFirst, upperFirst } from '../../util/index.js';
|
|
3
|
+
import { LoggerWrapper } from '../../util/logger.js';
|
|
3
4
|
const holder = globalThis;
|
|
4
|
-
const metaKey = Symbol.for('uql-orm/entity/
|
|
5
|
+
const metaKey = Symbol.for('uql-orm/entity/metadata');
|
|
5
6
|
const metas = holder[metaKey] ?? new Map();
|
|
6
7
|
holder[metaKey] = metas;
|
|
8
|
+
const registrationLogger = new LoggerWrapper(true);
|
|
9
|
+
/**
|
|
10
|
+
* Append a composite index entry with normalized `unique` (default false).
|
|
11
|
+
*/
|
|
12
|
+
export function appendEntityIndex(meta, index) {
|
|
13
|
+
if (!meta.indexes)
|
|
14
|
+
meta.indexes = [];
|
|
15
|
+
meta.indexes.push({ ...index, unique: index.unique ?? false });
|
|
16
|
+
}
|
|
7
17
|
export function defineField(entity, key, opts = {}) {
|
|
8
18
|
const meta = ensureMeta(entity);
|
|
9
19
|
if (!opts.type) {
|
|
@@ -18,23 +28,85 @@ export function defineId(entity, key, opts) {
|
|
|
18
28
|
const meta = ensureMeta(entity);
|
|
19
29
|
const id = getIdKey(meta);
|
|
20
30
|
if (id) {
|
|
21
|
-
|
|
31
|
+
registrationLogger.logInfo(`Overriding ID property for '${entity.name}' from '${id}' to '${key}'`);
|
|
22
32
|
delete meta.fields[id];
|
|
23
33
|
}
|
|
24
34
|
return defineField(entity, key, { ...opts, isId: true });
|
|
25
35
|
}
|
|
26
36
|
export function defineRelation(entity, key, opts) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
37
|
+
const resolved = opts.entity
|
|
38
|
+
? opts
|
|
39
|
+
: (() => {
|
|
40
|
+
const inferredType = inferEntityType(entity, key);
|
|
41
|
+
return { ...opts, entity: () => inferredType };
|
|
42
|
+
})();
|
|
31
43
|
const meta = ensureMeta(entity);
|
|
32
44
|
const relKey = key;
|
|
33
|
-
meta.relations[relKey] = { ...meta.relations[relKey], ...
|
|
45
|
+
meta.relations[relKey] = { ...meta.relations[relKey], ...resolved };
|
|
46
|
+
return meta;
|
|
47
|
+
}
|
|
48
|
+
export function defineHook(entity, methodName, event) {
|
|
49
|
+
const meta = ensureMeta(entity);
|
|
50
|
+
if (!meta.hooks)
|
|
51
|
+
meta.hooks = {};
|
|
52
|
+
if (!meta.hooks[event])
|
|
53
|
+
meta.hooks[event] = [];
|
|
54
|
+
meta.hooks[event].push({ methodName });
|
|
34
55
|
return meta;
|
|
35
56
|
}
|
|
57
|
+
function applyBulkFields(entity, fields) {
|
|
58
|
+
for (const key of Object.keys(fields)) {
|
|
59
|
+
const spec = fields[key];
|
|
60
|
+
if (!spec)
|
|
61
|
+
continue;
|
|
62
|
+
if (spec.isId) {
|
|
63
|
+
defineId(entity, key, spec);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
defineField(entity, key, spec);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
function applyBulkRelations(entity, relations) {
|
|
71
|
+
for (const key of Object.keys(relations)) {
|
|
72
|
+
const spec = relations[key];
|
|
73
|
+
if (spec)
|
|
74
|
+
defineRelation(entity, key, spec);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
function applyBulkIndexes(entity, indexes) {
|
|
78
|
+
const meta = ensureMeta(entity);
|
|
79
|
+
for (const idx of indexes) {
|
|
80
|
+
appendEntityIndex(meta, idx);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function applyBulkHooks(entity, hooks) {
|
|
84
|
+
for (const event of Object.keys(hooks)) {
|
|
85
|
+
const methodNames = hooks[event];
|
|
86
|
+
if (!methodNames?.length)
|
|
87
|
+
continue;
|
|
88
|
+
for (const methodName of methodNames) {
|
|
89
|
+
defineHook(entity, methodName, event);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Applies `fields`, `relations`, `indexes`, and `hooks` from {@link EntityOptions} before
|
|
95
|
+
* entity finalization. Used by `defineEntity` for decorator-free registration.
|
|
96
|
+
*/
|
|
97
|
+
function applyBulkEntityOptions(entity, opts) {
|
|
98
|
+
if (opts.fields)
|
|
99
|
+
applyBulkFields(entity, opts.fields);
|
|
100
|
+
if (opts.relations)
|
|
101
|
+
applyBulkRelations(entity, opts.relations);
|
|
102
|
+
if (opts.indexes?.length)
|
|
103
|
+
applyBulkIndexes(entity, opts.indexes);
|
|
104
|
+
if (opts.hooks)
|
|
105
|
+
applyBulkHooks(entity, opts.hooks);
|
|
106
|
+
}
|
|
36
107
|
export function defineEntity(entity, opts = {}) {
|
|
37
108
|
const meta = ensureMeta(entity);
|
|
109
|
+
applyBulkEntityOptions(entity, opts);
|
|
38
110
|
if (!hasKeys(meta.fields)) {
|
|
39
111
|
throw TypeError(`'${entity.name}' must have fields`);
|
|
40
112
|
}
|
|
@@ -57,7 +129,7 @@ export function defineEntity(entity, opts = {}) {
|
|
|
57
129
|
}
|
|
58
130
|
const id = getIdKey(meta);
|
|
59
131
|
if (!id) {
|
|
60
|
-
throw TypeError(`'${entity.name}' must have one field
|
|
132
|
+
throw TypeError(`'${entity.name}' must have exactly one id field (use @Id, defineId, or defineEntity({ fields: { ..., isId: true } }))`);
|
|
61
133
|
}
|
|
62
134
|
meta.id = id;
|
|
63
135
|
return meta;
|
|
@@ -70,16 +142,7 @@ export function getEntities() {
|
|
|
70
142
|
return acc;
|
|
71
143
|
}, []);
|
|
72
144
|
}
|
|
73
|
-
export function
|
|
74
|
-
const meta = ensureMeta(entity);
|
|
75
|
-
if (!meta.hooks)
|
|
76
|
-
meta.hooks = {};
|
|
77
|
-
if (!meta.hooks[event])
|
|
78
|
-
meta.hooks[event] = [];
|
|
79
|
-
meta.hooks[event].push({ methodName });
|
|
80
|
-
return meta;
|
|
81
|
-
}
|
|
82
|
-
function ensureMeta(entity) {
|
|
145
|
+
export function ensureMeta(entity) {
|
|
83
146
|
let meta = metas.get(entity);
|
|
84
147
|
if (meta) {
|
|
85
148
|
return meta;
|
|
@@ -242,15 +305,4 @@ export function isValidEntityType(type) {
|
|
|
242
305
|
type !== Date &&
|
|
243
306
|
type !== Symbol);
|
|
244
307
|
}
|
|
245
|
-
export function getOrCreateMeta(entity) {
|
|
246
|
-
const metas = holder[metaKey] ??
|
|
247
|
-
new Map();
|
|
248
|
-
holder[metaKey] = metas;
|
|
249
|
-
let meta = metas.get(entity);
|
|
250
|
-
if (!meta) {
|
|
251
|
-
meta = { entity, fields: {}, relations: {} };
|
|
252
|
-
metas.set(entity, meta);
|
|
253
|
-
}
|
|
254
|
-
return meta;
|
|
255
|
-
}
|
|
256
308
|
//# sourceMappingURL=definition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"definition.js","sourceRoot":"","sources":["../../../src/entity/metadata/definition.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { EntityMeta, Type } from '../type/index.js';
|
|
2
|
+
/** Stable projection for parity assertions (drops `entity` and `processed`). */
|
|
3
|
+
export declare function metaCore<E>(entity: Type<E>): Pick<EntityMeta<E>, 'id' | 'name' | 'fields' | 'relations' | 'indexes' | 'hooks' | 'softDelete'>;
|
|
4
|
+
//# sourceMappingURL=test-helpers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-helpers.d.ts","sourceRoot":"","sources":["../../src/entity/test-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGzD,gFAAgF;AAChF,wBAAgB,QAAQ,CAAC,CAAC,EACxB,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,GACd,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,GAAG,OAAO,GAAG,YAAY,CAAC,CAWlG"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { getMeta } from './metadata/definition.js';
|
|
2
|
+
/** Stable projection for parity assertions (drops `entity` and `processed`). */
|
|
3
|
+
export function metaCore(entity) {
|
|
4
|
+
const m = getMeta(entity);
|
|
5
|
+
return {
|
|
6
|
+
id: m.id,
|
|
7
|
+
name: m.name,
|
|
8
|
+
fields: m.fields,
|
|
9
|
+
relations: m.relations,
|
|
10
|
+
indexes: m.indexes,
|
|
11
|
+
hooks: m.hooks,
|
|
12
|
+
softDelete: m.softDelete,
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=test-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-helpers.js","sourceRoot":"","sources":["../../src/entity/test-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,gFAAgF;AAChF,MAAM,UAAU,QAAQ,CACtB,MAAe;IAEf,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO;QACL,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,SAAS,EAAE,CAAC,CAAC,SAAS;QACtB,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,UAAU,EAAE,CAAC,CAAC,UAAU;KACzB,CAAC;AACJ,CAAC"}
|
|
@@ -36,6 +36,8 @@ export declare abstract class AbstractSqlQuerier extends AbstractQuerier impleme
|
|
|
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
|
+
private hydrateJsonFields;
|
|
40
|
+
private hydrateJsonFieldsRecursive;
|
|
39
41
|
protected internalCount<E extends object>(entity: Type<E>, q?: QuerySearch<E>): Promise<number>;
|
|
40
42
|
protected internalAggregate<E extends object, Q extends QueryAggregate<E>>(entity: Type<E>, q: Q): Promise<QueryAggregateResult<E, Q['$group']>[]>;
|
|
41
43
|
internalInsertMany<E extends object>(entity: Type<E>, payload: E[]): Promise<IdValue<E>[]>;
|
|
@@ -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;AAE1B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,8BAAsB,kBAAmB,SAAQ,eAAgB,YAAW,UAAU;IAIlF,QAAQ,CAAC,OAAO,EAAE,kBAAkB;aAClB,KAAK,CAAC,EAAE,YAAY;IAJxC,OAAO,CAAC,qBAAqB,CAAC,CAAU;gBAG7B,OAAO,EAAE,kBAAkB,EAClB,KAAK,CAAC,EAAE,YAAY,YAAA;IAKxC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAElF;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAE7F;;OAEG;IACH,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB;IAOjF;;;OAGG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAGtC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;YAM/C,QAAQ;IAKhB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;YAM1D,QAAQ;cAIG,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;cAS9D,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IAW/F;;;;OAIG;cACc,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"abstractSqlQuerier.d.ts","sourceRoot":"","sources":["../../src/querier/abstractSqlQuerier.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ export class AbstractSqlQuerier extends AbstractQuerier {
|
|
|
44
44
|
const ctx = this.dialect.createContext();
|
|
45
45
|
this.dialect.find(ctx, entity, q);
|
|
46
46
|
const res = await this.all(ctx.sql, ctx.values);
|
|
47
|
-
const founds = unflatObjects(res);
|
|
47
|
+
const founds = unflatObjects(res).map((row) => this.hydrateJsonFields(entity, row));
|
|
48
48
|
await this.fillToManyRelations(entity, founds, q.$select);
|
|
49
49
|
return founds;
|
|
50
50
|
}
|
|
@@ -55,7 +55,7 @@ export class AbstractSqlQuerier extends AbstractQuerier {
|
|
|
55
55
|
let attrsPaths;
|
|
56
56
|
for await (const row of this.internalStream(ctx.sql, normalizedParams)) {
|
|
57
57
|
attrsPaths ??= obtainAttrsPaths(row);
|
|
58
|
-
yield unflatObject(row, attrsPaths);
|
|
58
|
+
yield this.hydrateJsonFields(entity, unflatObject(row, attrsPaths));
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
/**
|
|
@@ -67,6 +67,51 @@ export class AbstractSqlQuerier extends AbstractQuerier {
|
|
|
67
67
|
const rows = await this.internalAll(query, this.dialect.normalizeValues(values));
|
|
68
68
|
yield* rows;
|
|
69
69
|
}
|
|
70
|
+
hydrateJsonFields(entity, dto) {
|
|
71
|
+
this.hydrateJsonFieldsRecursive(entity, dto, new WeakSet());
|
|
72
|
+
return dto;
|
|
73
|
+
}
|
|
74
|
+
hydrateJsonFieldsRecursive(entity, dto, visited) {
|
|
75
|
+
if (!dto || typeof dto !== 'object' || visited.has(dto)) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
visited.add(dto);
|
|
79
|
+
const meta = getMeta(entity);
|
|
80
|
+
const row = dto;
|
|
81
|
+
for (const key in meta.fields) {
|
|
82
|
+
const field = meta.fields[key];
|
|
83
|
+
if (!field || (field.type !== 'json' && field.type !== 'jsonb')) {
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
const value = row[key];
|
|
87
|
+
if (typeof value !== 'string') {
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
try {
|
|
91
|
+
row[key] = JSON.parse(value);
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
// Keep the original value when the driver returns non-JSON text.
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
for (const key in meta.relations) {
|
|
98
|
+
const rel = meta.relations[key];
|
|
99
|
+
const relEntity = rel?.entity?.();
|
|
100
|
+
if (!relEntity) {
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
const value = row[key];
|
|
104
|
+
if (Array.isArray(value)) {
|
|
105
|
+
for (const it of value) {
|
|
106
|
+
this.hydrateJsonFieldsRecursive(relEntity, it, visited);
|
|
107
|
+
}
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
if (value && typeof value === 'object') {
|
|
111
|
+
this.hydrateJsonFieldsRecursive(relEntity, value, visited);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
70
115
|
async internalCount(entity, q = {}) {
|
|
71
116
|
const ctx = this.dialect.createContext();
|
|
72
117
|
this.dialect.count(ctx, entity, q);
|
|
@@ -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,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE3G,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,OAAgB,kBAAmB,SAAQ,eAAe;IAInD;IACS;IAJZ,qBAAqB,CAAW;IAExC,YACW,OAA2B,EAClB,KAAoB;QAEtC,KAAK,CAAC,KAAK,CAAC,CAAC;QAHJ,YAAO,GAAP,OAAO,CAAoB;QAClB,UAAK,GAAL,KAAK,CAAe;IAGxC,CAAC;IAYD;;OAEG;IACO,iBAAiB,CAAC,OAAiC;QAC3D,OAAO,iBAAiB,CAAC;YACvB,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB;YAC/C,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACO,KAAK,CAAC,WAAW,KAAmB,CAAC;IAGzC,AAAN,KAAK,CAAC,GAAG,CAAI,KAAa,EAAE,MAAkB;QAC5C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAI,KAAK,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAGa,AAAN,KAAK,CAAC,QAAQ,CAAI,KAAa,EAAE,MAAkB;QACzD,OAAO,IAAI,CAAC,WAAW,CAAI,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1E,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CAAC,KAAa,EAAE,MAAkB;QACzC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAGa,AAAN,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAE,MAAkB;QACtD,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IACvE,CAAC;IAEkB,KAAK,CAAC,gBAAgB,CAAmB,MAAe,EAAE,CAAW;QACtF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAS,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,aAAa,CAAI,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"abstractSqlQuerier.js","sourceRoot":"","sources":["../../src/querier/abstractSqlQuerier.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* - Entity metadata (decorator-based entities)
|
|
6
6
|
* - Database introspection results (TableSchema[])
|
|
7
7
|
*/
|
|
8
|
-
import { getMeta } from '../entity/
|
|
8
|
+
import { getMeta } from '../entity/metadata/definition.js';
|
|
9
9
|
import { fieldOptionsToCanonical } from './canonicalType.js';
|
|
10
10
|
import { SchemaAST } from './schemaAST.js';
|
|
11
11
|
import { DEFAULT_FOREIGN_KEY_ACTION } from './types.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaASTBuilder.js","sourceRoot":"","sources":["../../src/schema/schemaASTBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"schemaASTBuilder.js","sourceRoot":"","sources":["../../src/schema/schemaASTBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/type/config.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export interface Config {
|
|
|
16
16
|
pool: QuerierPool<Querier, AbstractDialect>;
|
|
17
17
|
/**
|
|
18
18
|
* List of entity classes to be managed by the ORM.
|
|
19
|
-
* If
|
|
19
|
+
* If omitted, classes that completed `defineEntity` (including via `@Entity()`) are discovered via `getEntities()`.
|
|
20
20
|
*/
|
|
21
21
|
entities?: Type<unknown>[];
|
|
22
22
|
/**
|