typhex 0.1.0-alpha.1 → 0.1.0-alpha.2
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 +11 -0
- package/README.md +1 -1
- package/dist/arrow/aggregates.d.ts +5 -1
- package/dist/arrow/aggregates.d.ts.map +1 -1
- package/dist/arrow/aggregates.js +23 -1
- package/dist/arrow/aggregates.js.map +1 -1
- package/dist/arrow/index.d.ts +7 -3
- package/dist/arrow/index.d.ts.map +1 -1
- package/dist/arrow/index.js +24 -3
- package/dist/arrow/index.js.map +1 -1
- package/dist/dbs/base-migrator.d.ts +0 -1
- package/dist/dbs/base-migrator.d.ts.map +1 -1
- package/dist/dbs/base-migrator.js +5 -7
- package/dist/dbs/base-migrator.js.map +1 -1
- package/dist/dbs/postgres/driver.d.ts.map +1 -1
- package/dist/dbs/postgres/driver.js +3 -0
- package/dist/dbs/postgres/driver.js.map +1 -1
- package/dist/dbs/postgres/query-compiler.d.ts +6 -2
- package/dist/dbs/postgres/query-compiler.d.ts.map +1 -1
- package/dist/dbs/postgres/query-compiler.js +11 -11
- package/dist/dbs/postgres/query-compiler.js.map +1 -1
- package/dist/dbs/query-compiler.d.ts +13 -13
- package/dist/dbs/query-compiler.d.ts.map +1 -1
- package/dist/dbs/query-compiler.js +11 -37
- package/dist/dbs/query-compiler.js.map +1 -1
- package/dist/dbs/sqlite/index.d.ts +2 -2
- package/dist/dbs/sqlite/index.d.ts.map +1 -1
- package/dist/dbs/sqlite/index.js +1 -1
- package/dist/dbs/sqlite/index.js.map +1 -1
- package/dist/dbs/sqlite/query-compiler.d.ts +4 -1
- package/dist/dbs/sqlite/query-compiler.d.ts.map +1 -1
- package/dist/dbs/sqlite/query-compiler.js +11 -2
- package/dist/dbs/sqlite/query-compiler.js.map +1 -1
- package/dist/dbs/types.d.ts +5 -11
- package/dist/dbs/types.d.ts.map +1 -1
- package/dist/dbs/types.js +1 -1
- package/dist/dbs/types.js.map +1 -1
- package/dist/driver/compile-only.d.ts +8 -0
- package/dist/driver/compile-only.d.ts.map +1 -0
- package/dist/driver/compile-only.js +26 -0
- package/dist/driver/compile-only.js.map +1 -0
- package/dist/driver/sqlite.d.ts.map +1 -1
- package/dist/driver/sqlite.js +3 -0
- package/dist/driver/sqlite.js.map +1 -1
- package/dist/entity/entity.d.ts +1 -1
- package/dist/entity/entity.d.ts.map +1 -1
- package/dist/entity/entity.js +14 -11
- package/dist/entity/entity.js.map +1 -1
- package/dist/entity/global-driver.d.ts +5 -3
- package/dist/entity/global-driver.d.ts.map +1 -1
- package/dist/entity/global-driver.js +51 -2
- package/dist/entity/global-driver.js.map +1 -1
- package/dist/entity/index.d.ts +1 -1
- package/dist/entity/index.d.ts.map +1 -1
- package/dist/entity/index.js +1 -1
- package/dist/entity/index.js.map +1 -1
- package/dist/entity/pk-columns.d.ts +0 -2
- package/dist/entity/pk-columns.d.ts.map +1 -1
- package/dist/entity/pk-columns.js +2 -10
- package/dist/entity/pk-columns.js.map +1 -1
- package/dist/entity/relations.d.ts +0 -4
- package/dist/entity/relations.d.ts.map +1 -1
- package/dist/entity/relations.js.map +1 -1
- package/dist/index.d.ts +3 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/migration/cli.js +120 -117
- package/dist/migration/cli.js.map +1 -1
- package/dist/migration/index.d.ts +1 -1
- package/dist/migration/index.d.ts.map +1 -1
- package/dist/migration/runner.d.ts +2 -6
- package/dist/migration/runner.d.ts.map +1 -1
- package/dist/migration/runner.js +1 -3
- package/dist/migration/runner.js.map +1 -1
- package/dist/migration/types.d.ts +0 -5
- package/dist/migration/types.d.ts.map +1 -1
- package/dist/orm/db.d.ts +16 -10
- package/dist/orm/db.d.ts.map +1 -1
- package/dist/orm/db.js +37 -9
- package/dist/orm/db.js.map +1 -1
- package/dist/orm/helpers/insert-graph/insert-graph-batch-executor.d.ts +2 -2
- package/dist/orm/helpers/insert-graph/insert-graph-batch-executor.d.ts.map +1 -1
- package/dist/orm/helpers/insert-graph/insert-graph-batch-executor.js.map +1 -1
- package/dist/orm/helpers/insert-graph/insert-graph-executor.d.ts +3 -3
- package/dist/orm/helpers/insert-graph/insert-graph-executor.d.ts.map +1 -1
- package/dist/orm/helpers/insert-graph/insert-graph-executor.js.map +1 -1
- package/dist/orm/helpers/insert-graph/insert-graph-planner.d.ts +3 -3
- package/dist/orm/helpers/insert-graph/insert-graph-planner.d.ts.map +1 -1
- package/dist/orm/helpers/insert-graph/insert-graph-planner.js +1 -1
- package/dist/orm/helpers/insert-graph/insert-graph-planner.js.map +1 -1
- package/dist/orm/helpers/insert-graph/insert-graph-sequential-executor.d.ts +2 -2
- package/dist/orm/helpers/insert-graph/insert-graph-sequential-executor.d.ts.map +1 -1
- package/dist/orm/helpers/insert-graph/insert-graph-sequential-executor.js.map +1 -1
- package/dist/orm/helpers/insert-graph/sequence-id-assigner.d.ts +2 -2
- package/dist/orm/helpers/insert-graph/sequence-id-assigner.d.ts.map +1 -1
- package/dist/orm/helpers/insert-graph/sequence-id-assigner.js.map +1 -1
- package/dist/orm/helpers/query-plan/query-plan.d.ts +19 -11
- package/dist/orm/helpers/query-plan/query-plan.d.ts.map +1 -1
- package/dist/orm/helpers/query-plan/query-plan.js +24 -4
- package/dist/orm/helpers/query-plan/query-plan.js.map +1 -1
- package/dist/orm/helpers/relations/relation-assembler.d.ts.map +1 -1
- package/dist/orm/helpers/relations/relation-assembler.js +14 -5
- package/dist/orm/helpers/relations/relation-assembler.js.map +1 -1
- package/dist/orm/helpers/relations/relation-fetcher.d.ts +20 -0
- package/dist/orm/helpers/relations/relation-fetcher.d.ts.map +1 -1
- package/dist/orm/helpers/relations/relation-fetcher.js +106 -23
- package/dist/orm/helpers/relations/relation-fetcher.js.map +1 -1
- package/dist/orm/index.d.ts +1 -1
- package/dist/orm/index.d.ts.map +1 -1
- package/dist/orm/index.js +1 -1
- package/dist/orm/index.js.map +1 -1
- package/dist/orm/insert-builder.d.ts +37 -0
- package/dist/orm/insert-builder.d.ts.map +1 -0
- package/dist/orm/insert-builder.js +134 -0
- package/dist/orm/insert-builder.js.map +1 -0
- package/dist/orm/query-builder.d.ts +51 -52
- package/dist/orm/query-builder.d.ts.map +1 -1
- package/dist/orm/query-builder.js +197 -223
- package/dist/orm/query-builder.js.map +1 -1
- package/dist/orm/query-execution-context.d.ts +5 -0
- package/dist/orm/query-execution-context.d.ts.map +1 -0
- package/dist/orm/query-execution-context.js +16 -0
- package/dist/orm/query-execution-context.js.map +1 -0
- package/dist/orm/query-helpers.d.ts.map +1 -1
- package/dist/orm/query-helpers.js +1 -1
- package/dist/orm/query-helpers.js.map +1 -1
- package/dist/orm/query-state.d.ts +10 -6
- package/dist/orm/query-state.d.ts.map +1 -1
- package/dist/orm/query-state.js.map +1 -1
- package/dist/orm/statement.d.ts +33 -0
- package/dist/orm/statement.d.ts.map +1 -0
- package/dist/orm/statement.js +31 -0
- package/dist/orm/statement.js.map +1 -0
- package/dist/parser/group-by.d.ts.map +1 -1
- package/dist/parser/group-by.js +2 -1
- package/dist/parser/group-by.js.map +1 -1
- package/dist/parser/predicate-walk.d.ts.map +1 -1
- package/dist/parser/predicate-walk.js +12 -32
- package/dist/parser/predicate-walk.js.map +1 -1
- package/dist/parser/resolve.js +1 -1
- package/dist/parser/resolve.js.map +1 -1
- package/dist/parser/select.js +3 -3
- package/dist/parser/select.js.map +1 -1
- package/dist/schema/column-definition.d.ts +10 -0
- package/dist/schema/column-definition.d.ts.map +1 -0
- package/dist/schema/column-definition.js +13 -0
- package/dist/schema/column-definition.js.map +1 -0
- package/dist/transformer/ir-emit.d.ts.map +1 -1
- package/dist/transformer/ir-emit.js +3 -0
- package/dist/transformer/ir-emit.js.map +1 -1
- package/dist/transformer/select-transformer.d.ts.map +1 -1
- package/dist/transformer/select-transformer.js +18 -0
- package/dist/transformer/select-transformer.js.map +1 -1
- package/dist/transformer/ts-aggregates.d.ts.map +1 -1
- package/dist/transformer/ts-aggregates.js +9 -14
- package/dist/transformer/ts-aggregates.js.map +1 -1
- package/dist/transformer/where-transformer.d.ts.map +1 -1
- package/dist/transformer/where-transformer.js +15 -24
- package/dist/transformer/where-transformer.js.map +1 -1
- package/docs/guide/entities-relations.md +12 -3
- package/docs/guide/getting-started.md +10 -3
- package/docs/public-api.md +6 -6
- package/docs/reference/api.md +14 -6
- package/docs/reference/architecture.md +11 -3
- package/etc/typhex.api.md +59 -59
- package/package.json +2 -2
- package/dist/dbs/sqlite/driver.d.ts +0 -9
- package/dist/dbs/sqlite/driver.d.ts.map +0 -1
- package/dist/dbs/sqlite/driver.js +0 -66
- package/dist/dbs/sqlite/driver.js.map +0 -1
- package/dist/schema/index.d.ts +0 -2
- package/dist/schema/index.d.ts.map +0 -1
- package/dist/schema/index.js +0 -2
- package/dist/schema/index.js.map +0 -1
- package/dist/schema/types.d.ts +0 -16
- package/dist/schema/types.d.ts.map +0 -1
- package/dist/schema/types.js +0 -40
- package/dist/schema/types.js.map +0 -1
package/dist/entity/entity.js
CHANGED
|
@@ -2,14 +2,12 @@
|
|
|
2
2
|
* Entity(table, schema, relations) — the only supported way to define entities.
|
|
3
3
|
* Returns a class whose instances are Row<TSchema, TRels>.
|
|
4
4
|
*/
|
|
5
|
-
import { getColumnNames } from "../schema/types.js";
|
|
6
5
|
import { QueryBuilder } from "../orm/query-builder.js";
|
|
7
6
|
import { QueryState } from "../orm/query-state.js";
|
|
8
7
|
import { SingleRowQueryBuilder } from "../orm/single-row-query-builder.js";
|
|
9
8
|
import { getDefaultDb, registerEntity, enqueuePendingJunction } from "./global-driver.js";
|
|
10
|
-
import { getActiveTrx } from "../orm/db.js";
|
|
11
|
-
import {
|
|
12
|
-
export { getPkColumnsFromSchema } from "./pk-columns.js";
|
|
9
|
+
import { getActiveTrx, isResolvedQueryExecutor } from "../orm/db.js";
|
|
10
|
+
import { getPkColumnsFromSchema } from "./pk-columns.js";
|
|
13
11
|
function createTableDef(table, schema, relations) {
|
|
14
12
|
return {
|
|
15
13
|
_table: table,
|
|
@@ -26,14 +24,21 @@ function createTableDef(table, schema, relations) {
|
|
|
26
24
|
export function Entity(tableName, schema, relations) {
|
|
27
25
|
const rels = (relations ?? {});
|
|
28
26
|
const tableDef = createTableDef(tableName, schema, rels);
|
|
29
|
-
const cols =
|
|
30
|
-
const pkCols =
|
|
27
|
+
const cols = Object.keys(schema);
|
|
28
|
+
const pkCols = getPkColumnsFromSchema(schema);
|
|
31
29
|
function resolveDb() {
|
|
32
30
|
const resolved = getDefaultDb();
|
|
33
31
|
if (!resolved)
|
|
34
32
|
throw new Error(`Entity "${tableName}": no Db. Use new Db(driver) to instantiate typhex.`);
|
|
35
33
|
return resolved;
|
|
36
34
|
}
|
|
35
|
+
function resolveExecutor(executor) {
|
|
36
|
+
const resolved = executor ?? resolveDb();
|
|
37
|
+
if (!isResolvedQueryExecutor(resolved)) {
|
|
38
|
+
throw new Error(`Entity "${tableName}": QueryExecutor dialect "${resolved.dialect.name}" must provide compiler, migrator, and insert capabilities.`);
|
|
39
|
+
}
|
|
40
|
+
return resolved;
|
|
41
|
+
}
|
|
37
42
|
function resolveRelationTarget(rel) {
|
|
38
43
|
try {
|
|
39
44
|
const target = rel._target();
|
|
@@ -44,7 +49,7 @@ export function Entity(tableName, schema, relations) {
|
|
|
44
49
|
const tbl = entityClass?.table;
|
|
45
50
|
if (tbl) {
|
|
46
51
|
const schema = tbl._schema;
|
|
47
|
-
return { table: tbl._table, pk:
|
|
52
|
+
return { table: tbl._table, pk: getPkColumnsFromSchema(schema), schema };
|
|
48
53
|
}
|
|
49
54
|
return null;
|
|
50
55
|
}
|
|
@@ -58,7 +63,7 @@ export function Entity(tableName, schema, relations) {
|
|
|
58
63
|
return new QueryState({
|
|
59
64
|
tableName,
|
|
60
65
|
columnNames: cols,
|
|
61
|
-
qe: executor
|
|
66
|
+
qe: resolveExecutor(executor),
|
|
62
67
|
pkColumns: pkCols,
|
|
63
68
|
whereIr: null,
|
|
64
69
|
whereParams: {},
|
|
@@ -93,9 +98,7 @@ export function Entity(tableName, schema, relations) {
|
|
|
93
98
|
sourcePkCols: pkCols,
|
|
94
99
|
options: opts,
|
|
95
100
|
resolveTarget: () => resolveRelationTarget(rd),
|
|
96
|
-
materialize: (junctionSchema) =>
|
|
97
|
-
Entity(opts.junction, junctionSchema);
|
|
98
|
-
},
|
|
101
|
+
materialize: (junctionSchema) => Entity(opts.junction, junctionSchema),
|
|
99
102
|
});
|
|
100
103
|
}
|
|
101
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/entity/entity.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/entity/entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Global default Db and entity registry.
|
|
3
3
|
* - Db: set by Db constructor, fallback when entities don't have a per-entity Db.
|
|
4
|
-
* - Registry: populated by Entity(), used by Db
|
|
4
|
+
* - Registry: populated by Entity(), used by schema operations when Db has no explicit entities.
|
|
5
5
|
*/
|
|
6
6
|
import type { Db } from "../orm/db.js";
|
|
7
7
|
import type { JunctionOptions } from "./relations.js";
|
|
8
8
|
export declare function getDefaultDb(): Db | null;
|
|
9
9
|
export declare function setDefaultDb(db: Db | null): void;
|
|
10
|
+
export declare function clearDefaultDb(db: Db): void;
|
|
10
11
|
/** Minimal view of an entity class as held in the global registry. */
|
|
11
12
|
export interface RegisteredEntity {
|
|
12
13
|
/** Table name and schema, used for migrations and validation. */
|
|
@@ -14,7 +15,7 @@ export interface RegisteredEntity {
|
|
|
14
15
|
_table: string;
|
|
15
16
|
_schema: Record<string, string>;
|
|
16
17
|
};
|
|
17
|
-
/**
|
|
18
|
+
/** Wires up many-to-many junction relations. */
|
|
18
19
|
_registerJunctions?: () => void;
|
|
19
20
|
}
|
|
20
21
|
export interface PendingJunction {
|
|
@@ -28,11 +29,12 @@ export interface PendingJunction {
|
|
|
28
29
|
schema: Record<string, string>;
|
|
29
30
|
} | null;
|
|
30
31
|
/** Materialize the junction entity given a fully-built schema. Captured at enqueue time so finalize doesn't need to import Entity (avoids cycle). */
|
|
31
|
-
materialize: (junctionSchema: Record<string, string>) =>
|
|
32
|
+
materialize: (junctionSchema: Record<string, string>) => RegisteredEntity;
|
|
32
33
|
}
|
|
33
34
|
export declare function enqueuePendingJunction(p: PendingJunction): void;
|
|
34
35
|
export declare function registerEntity(entity: RegisteredEntity): void;
|
|
35
36
|
export declare function getRegisteredEntities(): readonly RegisteredEntity[];
|
|
37
|
+
export declare function finalizeEntityCollection(entities: readonly RegisteredEntity[]): readonly RegisteredEntity[];
|
|
36
38
|
export declare function getEntityByTableName(tableName: string): RegisteredEntity | undefined;
|
|
37
39
|
export declare function clearRegistry(): void;
|
|
38
40
|
//# sourceMappingURL=global-driver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-driver.d.ts","sourceRoot":"","sources":["../../src/entity/global-driver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAKtD,wBAAgB,YAAY,IAAI,EAAE,GAAG,IAAI,CAExC;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,CAEhD;AAED,sEAAsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,iEAAiE;IACjE,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IAC3D,
|
|
1
|
+
{"version":3,"file":"global-driver.d.ts","sourceRoot":"","sources":["../../src/entity/global-driver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAKtD,wBAAgB,YAAY,IAAI,EAAE,GAAG,IAAI,CAExC;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,CAEhD;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAE3C;AAED,sEAAsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,iEAAiE;IACjE,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IAC3D,gDAAgD;IAChD,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,eAAe,CAAC;IACzB,aAAa,EAAE,MAAM;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5F,qJAAqJ;IACrJ,WAAW,EAAE,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,gBAAgB,CAAC;CAC3E;AA2JD,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,eAAe,GAAG,IAAI,CAE/D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAG7D;AAED,wBAAgB,qBAAqB,IAAI,SAAS,gBAAgB,EAAE,CAInE;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,SAAS,gBAAgB,EAAE,GACpC,SAAS,gBAAgB,EAAE,CAE7B;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAIpF;AAED,wBAAgB,aAAa,IAAI,IAAI,CAGpC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Global default Db and entity registry.
|
|
3
3
|
* - Db: set by Db constructor, fallback when entities don't have a per-entity Db.
|
|
4
|
-
* - Registry: populated by Entity(), used by Db
|
|
4
|
+
* - Registry: populated by Entity(), used by schema operations when Db has no explicit entities.
|
|
5
5
|
*/
|
|
6
6
|
import { extractBaseType, toArray } from "../utils.js";
|
|
7
7
|
let defaultDb = null;
|
|
@@ -11,11 +11,20 @@ export function getDefaultDb() {
|
|
|
11
11
|
export function setDefaultDb(db) {
|
|
12
12
|
defaultDb = db;
|
|
13
13
|
}
|
|
14
|
+
export function clearDefaultDb(db) {
|
|
15
|
+
if (defaultDb === db)
|
|
16
|
+
defaultDb = null;
|
|
17
|
+
}
|
|
14
18
|
const entityRegistry = [];
|
|
15
19
|
class JunctionRegistry {
|
|
16
20
|
pending = [];
|
|
21
|
+
materialized = new Set();
|
|
17
22
|
draining = false;
|
|
18
23
|
enqueue(p) {
|
|
24
|
+
if (this.pending.some((existing) => existing.sourceTable === p.sourceTable &&
|
|
25
|
+
existing.options.junction === p.options.junction)) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
19
28
|
this.pending.push(p);
|
|
20
29
|
}
|
|
21
30
|
drain() {
|
|
@@ -49,8 +58,43 @@ class JunctionRegistry {
|
|
|
49
58
|
}
|
|
50
59
|
clear() {
|
|
51
60
|
this.pending = [];
|
|
61
|
+
this.materialized.clear();
|
|
52
62
|
this.draining = false;
|
|
53
63
|
}
|
|
64
|
+
finalizeFor(entities) {
|
|
65
|
+
const resolved = new Map(entities.map((entity) => [entity.table._table, entity]));
|
|
66
|
+
for (const entity of entities)
|
|
67
|
+
entity._registerJunctions?.();
|
|
68
|
+
const remaining = [];
|
|
69
|
+
for (const pending of this.pending) {
|
|
70
|
+
if (!resolved.has(pending.sourceTable)) {
|
|
71
|
+
remaining.push(pending);
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
const target = pending.resolveTarget();
|
|
75
|
+
if (!target) {
|
|
76
|
+
throw new Error(`manyToMany: cannot finalize junction "${pending.options.junction}" for explicit Db entities: ` +
|
|
77
|
+
`target entity for "${pending.sourceTable}" is not available.`);
|
|
78
|
+
}
|
|
79
|
+
if (!resolved.has(target.table)) {
|
|
80
|
+
throw new Error(`manyToMany: explicit Db entities must include target entity "${target.table}" ` +
|
|
81
|
+
`for junction "${pending.options.junction}".`);
|
|
82
|
+
}
|
|
83
|
+
const existing = resolved.get(pending.options.junction) ??
|
|
84
|
+
[...this.materialized].find((entity) => entity.table._table === pending.options.junction);
|
|
85
|
+
const registered = entityRegistry.find((entity) => entity.table._table === pending.options.junction);
|
|
86
|
+
if (!existing && registered) {
|
|
87
|
+
throw new Error(`manyToMany: explicit Db entities must include junction entity ` +
|
|
88
|
+
`"${pending.options.junction}" because it was defined explicitly.`);
|
|
89
|
+
}
|
|
90
|
+
const junction = existing ?? pending.materialize(buildJunctionSchema(pending, target));
|
|
91
|
+
if (!existing)
|
|
92
|
+
this.materialized.add(junction);
|
|
93
|
+
resolved.set(junction.table._table, junction);
|
|
94
|
+
}
|
|
95
|
+
this.pending = remaining;
|
|
96
|
+
return [...resolved.values()];
|
|
97
|
+
}
|
|
54
98
|
tryMaterialize(p) {
|
|
55
99
|
if (getEntityByTableName(p.options.junction))
|
|
56
100
|
return true;
|
|
@@ -58,7 +102,7 @@ class JunctionRegistry {
|
|
|
58
102
|
if (!target)
|
|
59
103
|
return false;
|
|
60
104
|
const schema = buildJunctionSchema(p, target);
|
|
61
|
-
p.materialize(schema);
|
|
105
|
+
this.materialized.add(p.materialize(schema));
|
|
62
106
|
return true;
|
|
63
107
|
}
|
|
64
108
|
}
|
|
@@ -99,7 +143,12 @@ export function getRegisteredEntities() {
|
|
|
99
143
|
junctionRegistry.assertAllResolved();
|
|
100
144
|
return entityRegistry;
|
|
101
145
|
}
|
|
146
|
+
export function finalizeEntityCollection(entities) {
|
|
147
|
+
return junctionRegistry.finalizeFor(entities);
|
|
148
|
+
}
|
|
102
149
|
export function getEntityByTableName(tableName) {
|
|
150
|
+
// Junction entities materialize lazily; without this, lookups fail before migrate()/validate().
|
|
151
|
+
junctionRegistry.drain();
|
|
103
152
|
return entityRegistry.find((e) => e.table._table === tableName);
|
|
104
153
|
}
|
|
105
154
|
export function clearRegistry() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-driver.js","sourceRoot":"","sources":["../../src/entity/global-driver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEvD,IAAI,SAAS,GAAc,IAAI,CAAC;AAEhC,MAAM,UAAU,YAAY;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,EAAa;IACxC,SAAS,GAAG,EAAE,CAAC;AACjB,CAAC;AAoBD,MAAM,cAAc,GAAuB,EAAE,CAAC;AAE9C,MAAM,gBAAgB;IACZ,OAAO,GAAsB,EAAE,CAAC;IAChC,QAAQ,GAAG,KAAK,CAAC;IAEzB,OAAO,CAAC,CAAkB;QACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC;YACH,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,OAAO,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3C,QAAQ,GAAG,KAAK,CAAC;gBACjB,MAAM,SAAS,GAAsB,EAAE,CAAC;gBACxC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC7B,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;wBAAE,QAAQ,GAAG,IAAI,CAAC;;wBACvC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC;gBACD,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YAC3B,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACxB,CAAC;IACH,CAAC;IAED,iBAAiB;QACf,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAC5B,CAAC,CAAC,EAAE,EAAE,CACJ,iBAAiB,CAAC,CAAC,OAAO,CAAC,QAAQ,SAAS,CAAC,CAAC,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,iCAAiC,CAC/J,CAAC;QACF,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,CAAC,OAAO,CAAC,MAAM,wBAAwB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YAC5F,2GAA2G,CAC9G,CAAC;IACJ,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACxB,CAAC;IAEO,cAAc,CAAC,CAAkB;QACvC,IAAI,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC;QAC1D,MAAM,MAAM,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;QACjC,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC1B,MAAM,MAAM,GAAG,mBAAmB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"global-driver.js","sourceRoot":"","sources":["../../src/entity/global-driver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEvD,IAAI,SAAS,GAAc,IAAI,CAAC;AAEhC,MAAM,UAAU,YAAY;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,EAAa;IACxC,SAAS,GAAG,EAAE,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAAM;IACnC,IAAI,SAAS,KAAK,EAAE;QAAE,SAAS,GAAG,IAAI,CAAC;AACzC,CAAC;AAoBD,MAAM,cAAc,GAAuB,EAAE,CAAC;AAE9C,MAAM,gBAAgB;IACZ,OAAO,GAAsB,EAAE,CAAC;IAChC,YAAY,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC3C,QAAQ,GAAG,KAAK,CAAC;IAEzB,OAAO,CAAC,CAAkB;QACxB,IACE,IAAI,CAAC,OAAO,CAAC,IAAI,CACf,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW;YACtC,QAAQ,CAAC,OAAO,CAAC,QAAQ,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CACnD,EACD,CAAC;YACD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC;YACH,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,OAAO,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3C,QAAQ,GAAG,KAAK,CAAC;gBACjB,MAAM,SAAS,GAAsB,EAAE,CAAC;gBACxC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC7B,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;wBAAE,QAAQ,GAAG,IAAI,CAAC;;wBACvC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC;gBACD,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YAC3B,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACxB,CAAC;IACH,CAAC;IAED,iBAAiB;QACf,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAC5B,CAAC,CAAC,EAAE,EAAE,CACJ,iBAAiB,CAAC,CAAC,OAAO,CAAC,QAAQ,SAAS,CAAC,CAAC,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,iCAAiC,CAC/J,CAAC;QACF,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,CAAC,OAAO,CAAC,MAAM,wBAAwB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YAC5F,2GAA2G,CAC9G,CAAC;IACJ,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,QAAqC;QAC/C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAClF,KAAK,MAAM,MAAM,IAAI,QAAQ;YAAE,MAAM,CAAC,kBAAkB,EAAE,EAAE,CAAC;QAE7D,MAAM,SAAS,GAAsB,EAAE,CAAC;QACxC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBACvC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACxB,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CACb,yCAAyC,OAAO,CAAC,OAAO,CAAC,QAAQ,8BAA8B;oBAC7F,sBAAsB,OAAO,CAAC,WAAW,qBAAqB,CACjE,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CACb,gEAAgE,MAAM,CAAC,KAAK,IAAI;oBAC9E,iBAAiB,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,CAChD,CAAC;YACJ,CAAC;YAED,MAAM,QAAQ,GACZ,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;gBACtC,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC5F,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CACpC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,QAAQ,CAC7D,CAAC;YACF,IAAI,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CACb,gEAAgE;oBAC9D,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,sCAAsC,CACrE,CAAC;YACJ,CAAC;YACD,MAAM,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;YACvF,IAAI,CAAC,QAAQ;gBAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC/C,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QAEzB,OAAO,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAChC,CAAC;IAEO,cAAc,CAAC,CAAkB;QACvC,IAAI,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC;QAC1D,MAAM,MAAM,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;QACjC,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC1B,MAAM,MAAM,GAAG,mBAAmB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,SAAS,KAAK,CAAC,CAAoB;IACjC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,mBAAmB,CAC1B,CAAkB,EAClB,MAAuE;IAEvE,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChD,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC3F,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAExF,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACpF,CAAC;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/E,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,iBAAiB,CACxB,YAAsB,EACtB,SAAmB,EACnB,QAAgB,EAChB,YAAoB,EACpB,IAAmC;IAEnC,IAAI,YAAY,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;QAAE,OAAO;IACrD,MAAM,IAAI,KAAK,CACb,yBAAyB,YAAY,KAAK,IAAI,QAAQ,YAAY,CAAC,MAAM,aAAa;QACpF,0BAA0B,QAAQ,SAAS,SAAS,CAAC,MAAM,0BAA0B;QACrF,+BAA+B,CAClC,CAAC;AACJ,CAAC;AAED,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC;AAEhD,MAAM,UAAU,sBAAsB,CAAC,CAAkB;IACvD,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAwB;IACrD,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,kBAAkB,EAAE,EAAE,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,qBAAqB;IACnC,gBAAgB,CAAC,KAAK,EAAE,CAAC;IACzB,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;IACrC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,QAAqC;IAErC,OAAO,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,gGAAgG;IAChG,gBAAgB,CAAC,KAAK,EAAE,CAAC;IACzB,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1B,gBAAgB,CAAC,KAAK,EAAE,CAAC;AAC3B,CAAC"}
|
package/dist/entity/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { Entity
|
|
1
|
+
export { Entity } from "./entity.js";
|
|
2
2
|
export type { AnyEntityClass, EntityClass, EntityClassOf, EntityInstance, EntityRow, EntitySchema, EntityRelations, EntityFields, SelectRow, RelationLoadedValue, RelationTarget, EntityRelationProps, EntityRelationPropsLoaded, Row, } from "./entity.js";
|
|
3
3
|
export type { TableDef, EntityBase } from "./types.js";
|
|
4
4
|
export type { InferTable, InferInsert, Flatten, InferColumnType, Materialized, MaterializeShape, Mutable, IsNotNull, IsGenerated, HasDefault, SQLToTS, SQLTypeMap, ExtractSQLBase, StripParens, OptionalOnInsert, } from "./schema-inference.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/entity/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/entity/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,YAAY,EACV,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACd,SAAS,EACT,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,SAAS,EACT,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,yBAAyB,EACzB,GAAG,GACJ,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,YAAY,EACV,UAAU,EACV,WAAW,EACX,OAAO,EACP,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,OAAO,EACP,SAAS,EACT,WAAW,EACX,UAAU,EACV,OAAO,EACP,UAAU,EACV,cAAc,EACd,WAAW,EACX,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjF,YAAY,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,EACrB,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,aAAa,GACd,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC"}
|
package/dist/entity/index.js
CHANGED
package/dist/entity/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/entity/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/entity/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAmCrC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
declare function getPkColumns(schema: Record<string, string>): string[];
|
|
2
1
|
/** Primary key column names from a schema map. */
|
|
3
2
|
export declare function getPkColumnsFromSchema(schema: Record<string, string>): string[];
|
|
4
|
-
export { getPkColumns };
|
|
5
3
|
//# sourceMappingURL=pk-columns.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pk-columns.d.ts","sourceRoot":"","sources":["../../src/entity/pk-columns.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pk-columns.d.ts","sourceRoot":"","sources":["../../src/entity/pk-columns.ts"],"names":[],"mappings":"AAEA,kDAAkD;AAClD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAE/E"}
|
|
@@ -1,14 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
const stripped = def.replaceAll(/'[^']*'/g, "").replaceAll(/--[^\n]*/g, "");
|
|
3
|
-
return /\bprimary\s+key\b/i.test(stripped);
|
|
4
|
-
}
|
|
5
|
-
function getPkColumns(schema) {
|
|
6
|
-
const names = Object.keys(schema);
|
|
7
|
-
return names.filter((c) => hasPrimaryKey(schema[c]));
|
|
8
|
-
}
|
|
1
|
+
import { parseColumnDefinition } from "../schema/column-definition.js";
|
|
9
2
|
/** Primary key column names from a schema map. */
|
|
10
3
|
export function getPkColumnsFromSchema(schema) {
|
|
11
|
-
return
|
|
4
|
+
return Object.keys(schema).filter((column) => parseColumnDefinition(schema[column]).primaryKey);
|
|
12
5
|
}
|
|
13
|
-
export { getPkColumns };
|
|
14
6
|
//# sourceMappingURL=pk-columns.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pk-columns.js","sourceRoot":"","sources":["../../src/entity/pk-columns.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"pk-columns.js","sourceRoot":"","sources":["../../src/entity/pk-columns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,kDAAkD;AAClD,MAAM,UAAU,sBAAsB,CAAC,MAA8B;IACnE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;AAClG,CAAC"}
|
|
@@ -80,10 +80,6 @@ export type ManyToOne<E extends AnyEntityClass | EntityBase> = SingleRelation<To
|
|
|
80
80
|
export type OneToOne<E extends AnyEntityClass | EntityBase> = SingleRelation<ToEntityInstance<E>>;
|
|
81
81
|
/** Relation property type for many-to-many associations. Declare on entity subclasses. */
|
|
82
82
|
export type ManyToMany<E extends AnyEntityClass | EntityBase> = E extends EntityBase ? ManyRelation<E> : RelatedEntityInstance<EntityClassOf<E>, "many">;
|
|
83
|
-
/** @deprecated Prefer OneToMany<Post> with import type + EntityClassOf. Kept for backward compatibility. */
|
|
84
|
-
export type UntypedOneToMany = RelationQueryBuilder<SelectRow<any>> & EntityInstance<any>[];
|
|
85
|
-
/** @deprecated Prefer ManyToOne<Post> with import type + EntityClassOf. Kept for backward compatibility. */
|
|
86
|
-
export type UntypedManyToOne = RelationQueryBuilder<SelectRow<any>> & EntityInstance<any>;
|
|
87
83
|
/** Converts a `RelationDef` to its runtime queryable shape (array builder or single instance). */
|
|
88
84
|
export type RelationQueryable<R> = R extends RelationDef<infer E, infer TType> ? E extends AnyEntityClass ? RelatedEntityInstance<E, RelationKind<TType>> : TType extends "one-to-many" | "many-to-many" ? RelationQueryBuilder<E> & E[] : RelationQueryBuilder<E> & E : never;
|
|
89
85
|
/** oneToOne: FK on this table; target is the other entity */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relations.d.ts","sourceRoot":"","sources":["../../src/entity/relations.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"relations.d.ts","sourceRoot":"","sources":["../../src/entity/relations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relations.js","sourceRoot":"","sources":["../../src/entity/relations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"relations.js","sourceRoot":"","sources":["../../src/entity/relations.ts"],"names":[],"mappings":"AAoHA,SAAS,YAAY,CACnB,IAAW,EACX,MAAqB,EACrB,OAA0C;IAE1C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAA2B,CAAC;AACzF,CAAC;AAiBD,MAAM,UAAU,QAAQ,CACtB,MAAqB,EACrB,OAAwB;IAExB,OAAO,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACrD,CAAC;AAiBD,MAAM,UAAU,SAAS,CACvB,MAAqB,EACrB,OAAwB;IAExB,OAAO,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAiBD,MAAM,UAAU,SAAS,CACvB,MAAqB,EACrB,OAA0C;IAE1C,OAAO,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAiBD,MAAM,UAAU,UAAU,CACxB,MAAqB,EACrB,OAAwB;IAExB,OAAO,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC;AAED,2FAA2F;AAC3F,MAAM,CAAC,MAAM,GAAG,GAAG;IACjB,QAAQ;IACR,SAAS;IACT,SAAS;IACT,UAAU;CACX,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -3,17 +3,16 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export { Db, Trx, QueryBuilder, SingleRowQueryBuilder, InsertBuilder } from "./orm/index.js";
|
|
5
5
|
export { count, sum, avg, min, max, distinct } from "./orm/aggregates.js";
|
|
6
|
-
export { Entity, rel,
|
|
6
|
+
export { Entity, rel, oneToOne, manyToOne, oneToMany, manyToMany } from "./entity/index.js";
|
|
7
7
|
export { createSqliteDriver, createDriver } from "./driver/index.js";
|
|
8
8
|
export { createPostgresDriver } from "./dbs/postgres/driver.js";
|
|
9
9
|
export { appliedMigrations, diffSchema, dryRunMigrations, generateMigrationFiles, migrationStatus, pendingMigrations, runMigrations, upMigration, downMigration, } from "./migration/index.js";
|
|
10
10
|
export { loadConfig } from "./config/load-config.js";
|
|
11
|
-
export type { DbOptions, QueryExecutor, OrderDirection } from "./orm/index.js";
|
|
11
|
+
export type { DbOptions, QueryExecutor, OrderDirection, SqlAndParams, RelationFetchSql, Statement, } from "./orm/index.js";
|
|
12
12
|
export type { DialectInfo, Driver, Connection, ExecuteResult, TransactionOptions, } from "./driver/types.js";
|
|
13
13
|
export type { SqliteDriverOptions, CreateDriverOptions } from "./driver/index.js";
|
|
14
14
|
export type { PostgresDriverOptions } from "./dbs/index.js";
|
|
15
|
-
export type {
|
|
16
|
-
export type { WithClause, CompiledCteBody } from "./dbs/types.js";
|
|
15
|
+
export type { DialectColumnDef, ColumnChange, DbColumnInfo } from "./dbs/types.js";
|
|
17
16
|
export type { AnyEntityClass, EntityBase, EntityClass, EntityClassOf, EntityInstance, EntityRow, EntitySchema, EntityRelations, EntityFields, SelectRow, TableDef, RelationLoadedValue, RelationTarget, EntityRelationProps, EntityRelationPropsLoaded, } from "./entity/index.js";
|
|
18
17
|
export type { InferTable, InferInsert, Flatten, InferColumnType, Materialized, MaterializeShape, Mutable, IsNotNull, IsGenerated, HasDefault, SQLToTS, SQLTypeMap, ExtractSQLBase, StripParens, OptionalOnInsert, } from "./entity/index.js";
|
|
19
18
|
export type { Row } from "./entity/index.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD,YAAY,EACV,SAAS,EACT,aAAa,EACb,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,SAAS,GACV,MAAM,gBAAgB,CAAC;AAGxB,YAAY,EACV,WAAW,EACX,MAAM,EACN,UAAU,EACV,aAAa,EACb,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAClF,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC5D,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGnF,YAAY,EACV,cAAc,EACd,UAAU,EACV,WAAW,EACX,aAAa,EACb,cAAc,EACd,SAAS,EACT,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAG3B,YAAY,EACV,UAAU,EACV,WAAW,EACX,OAAO,EACP,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,OAAO,EACP,SAAS,EACT,WAAW,EACX,UAAU,EACV,OAAO,EACP,UAAU,EACV,cAAc,EACd,WAAW,EACX,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAG3B,YAAY,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAG7C,YAAY,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,EACrB,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,aAAa,GACd,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,YAAY,EACV,UAAU,EACV,WAAW,EACX,aAAa,EACb,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAG9B,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
// Core runtime
|
|
5
5
|
export { Db, Trx, QueryBuilder, SingleRowQueryBuilder, InsertBuilder } from "./orm/index.js";
|
|
6
6
|
export { count, sum, avg, min, max, distinct } from "./orm/aggregates.js";
|
|
7
|
-
export { Entity, rel,
|
|
7
|
+
export { Entity, rel, oneToOne, manyToOne, oneToMany, manyToMany } from "./entity/index.js";
|
|
8
8
|
export { createSqliteDriver, createDriver } from "./driver/index.js";
|
|
9
9
|
export { createPostgresDriver } from "./dbs/postgres/driver.js";
|
|
10
10
|
export { appliedMigrations, diffSchema, dryRunMigrations, generateMigrationFiles, migrationStatus, pendingMigrations, runMigrations, upMigration, downMigration, } from "./migration/index.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAe;AACf,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAe;AACf,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC"}
|