@casekit/orm 0.0.1-alpha.2 → 0.0.1-alpha.4

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.
Files changed (46) hide show
  1. package/lib/queries/clauses/helpers/OptionalColumn.d.ts +2 -1
  2. package/lib/queries/clauses/helpers/OptionalColumn.d.ts.map +1 -1
  3. package/lib/queries/create/tests/createOne.test.js +36 -0
  4. package/lib/queries/create/tests/createOne.test.js.map +1 -1
  5. package/lib/queries/find/getIncludedManyToManyRelations.d.ts +17 -0
  6. package/lib/queries/find/getIncludedManyToManyRelations.d.ts.map +1 -0
  7. package/lib/queries/find/getIncludedManyToManyRelations.js +20 -0
  8. package/lib/queries/find/getIncludedManyToManyRelations.js.map +1 -0
  9. package/lib/queries/find/getIncludedOneToManyRelations.d.ts +12 -0
  10. package/lib/queries/find/getIncludedOneToManyRelations.d.ts.map +1 -0
  11. package/lib/queries/find/getIncludedOneToManyRelations.js +20 -0
  12. package/lib/queries/find/getIncludedOneToManyRelations.js.map +1 -0
  13. package/lib/queries/find/tests/findMany.include.test.d.ts +2 -0
  14. package/lib/queries/find/tests/findMany.include.test.d.ts.map +1 -0
  15. package/lib/queries/find/tests/findMany.include.test.js +93 -0
  16. package/lib/queries/find/tests/findMany.include.test.js.map +1 -0
  17. package/lib/queries/findMany.d.ts.map +1 -1
  18. package/lib/queries/findMany.js +48 -35
  19. package/lib/queries/findMany.js.map +1 -1
  20. package/lib/schema/populate/populateModel.d.ts.map +1 -1
  21. package/lib/schema/populate/populateModel.js +1 -0
  22. package/lib/schema/populate/populateModel.js.map +1 -1
  23. package/lib/schema/types/base/BaseColumn.d.ts +1 -0
  24. package/lib/schema/types/base/BaseColumn.d.ts.map +1 -1
  25. package/lib/schema/types/helpers/IsProvided.d.ts +6 -0
  26. package/lib/schema/types/helpers/IsProvided.d.ts.map +1 -0
  27. package/lib/schema/types/helpers/IsProvided.js +2 -0
  28. package/lib/schema/types/helpers/IsProvided.js.map +1 -0
  29. package/lib/schema/types/loose/LooseColumnDefinition.d.ts +5 -0
  30. package/lib/schema/types/loose/LooseColumnDefinition.d.ts.map +1 -1
  31. package/lib/schema/types/strict/ColumnDefinition.d.ts +5 -0
  32. package/lib/schema/types/strict/ColumnDefinition.d.ts.map +1 -1
  33. package/lib/test/gen/column.d.ts +1 -0
  34. package/lib/test/gen/column.d.ts.map +1 -1
  35. package/package.json +2 -2
  36. package/src/queries/clauses/helpers/OptionalColumn.ts +4 -1
  37. package/src/queries/create/tests/createOne.test.ts +43 -0
  38. package/src/queries/find/getIncludedManyToManyRelations.ts +49 -0
  39. package/src/queries/find/getIncludedOneToManyRelations.ts +44 -0
  40. package/src/queries/find/tests/findMany.include.test.ts +107 -0
  41. package/src/queries/findMany.ts +75 -63
  42. package/src/schema/populate/populateModel.ts +1 -0
  43. package/src/schema/types/base/BaseColumn.ts +1 -0
  44. package/src/schema/types/helpers/IsProvided.ts +10 -0
  45. package/src/schema/types/loose/LooseColumnDefinition.ts +6 -0
  46. package/src/schema/types/strict/ColumnDefinition.ts +6 -0
package/lib/queries/clauses/helpers/OptionalColumn.d.ts CHANGED
@@ -1,10 +1,11 @@
1
1
  import { ColumnName } from "../../../schema/types/helpers/ColumnName";
2
2
  import { HasDefault } from "../../../schema/types/helpers/HasDefault";
3
3
  import { IsNullable } from "../../../schema/types/helpers/IsNullable";
4
+ import { IsProvided } from "../../../schema/types/helpers/IsProvided";
4
5
  import { IsSerial } from "../../../schema/types/helpers/IsSerial";
5
6
  import { ModelName } from "../../../schema/types/helpers/ModelName";
6
7
  import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
7
8
  export type OptionalColumn<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
8
- [C in ColumnName<Models, M>]: IsNullable<Models, M, C> extends true ? C : IsSerial<Models, M, C> extends true ? C : HasDefault<Models, M, C> extends true ? C : never;
9
+ [C in ColumnName<Models, M>]: IsNullable<Models, M, C> extends true ? C : IsSerial<Models, M, C> extends true ? C : HasDefault<Models, M, C> extends true ? C : IsProvided<Models, M, C> extends true ? C : never;
9
10
  }[ColumnName<Models, M>];
10
11
  //# sourceMappingURL=OptionalColumn.d.ts.map
package/lib/queries/clauses/helpers/OptionalColumn.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OptionalColumn.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/OptionalColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE1F,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;KACC,CAAC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GAC7D,CAAC,GACD,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GACjC,CAAC,GACD,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GACnC,CAAC,GACD,KAAK;CAClB,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"OptionalColumn.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/OptionalColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE1F,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;KACC,CAAC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GAC7D,CAAC,GACD,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GACjC,CAAC,GACD,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GACnC,CAAC,GACD,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GACnC,CAAC,GACD,KAAK;CACpB,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC"}
package/lib/queries/create/tests/createOne.test.js CHANGED
@@ -100,5 +100,41 @@ describe("createOne", () => {
100
100
  expect(rows[0].name).toEqual("hello");
101
101
  }, { rollback: true });
102
102
  });
103
+ test("columns that are provided by middleware do not need to be specified", async () => {
104
+ const baz = {
105
+ columns: {
106
+ id: {
107
+ type: "uuid",
108
+ zodSchema: z.string().uuid(),
109
+ provided: true,
110
+ },
111
+ name: { type: "text", zodSchema: z.string() },
112
+ },
113
+ };
114
+ await orm({
115
+ schema: "casekit",
116
+ models: { baz },
117
+ relations: { baz: {} },
118
+ pool: new pg.Pool(),
119
+ middleware: [
120
+ {
121
+ create: {
122
+ values: (values) => ({ id: uuid.v4(), ...values }),
123
+ },
124
+ },
125
+ ],
126
+ }).transact(async (db) => {
127
+ await db.connection.query(createTableSql(db.models.baz));
128
+ await db.createOne("baz", {
129
+ values: { name: "hello" },
130
+ });
131
+ const rows = await db.findMany("baz", {
132
+ select: ["id", "name"],
133
+ });
134
+ expect(rows).toHaveLength(1);
135
+ expect(rows[0].id).toBeTypeOf("string");
136
+ expect(rows[0].name).toEqual("hello");
137
+ }, { rollback: true });
138
+ });
103
139
  });
104
140
  //# sourceMappingURL=createOne.test.js.map
package/lib/queries/create/tests/createOne.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createOne.test.js","sourceRoot":"","sources":["../../../../src/queries/create/tests/createOne.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createOne.test.js","sourceRoot":"","sources":["../../../../src/queries/create/tests/createOne.test.ts"],"names":[],"mappings":"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"}
package/lib/queries/find/getIncludedManyToManyRelations.d.ts ADDED
@@ -0,0 +1,17 @@
1
+ import { BaseConfiguration } from "../../schema/types/base/BaseConfiguration";
2
+ import { BaseFindParams } from "./types/BaseFindParams";
3
+ export type ManyToManySubQuery = {
4
+ model: string;
5
+ name: string;
6
+ relation: {
7
+ model: string;
8
+ type: "N:N";
9
+ foreignKey: string | string[];
10
+ otherKey: string | string[];
11
+ through: string;
12
+ };
13
+ query: BaseFindParams;
14
+ path: string[];
15
+ };
16
+ export declare const getIncludedManyToManyRelations: (config: BaseConfiguration, m: string, query: BaseFindParams, path?: string[]) => ManyToManySubQuery[];
17
+ //# sourceMappingURL=getIncludedManyToManyRelations.d.ts.map
package/lib/queries/find/getIncludedManyToManyRelations.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getIncludedManyToManyRelations.d.ts","sourceRoot":"","sources":["../../../src/queries/find/getIncludedManyToManyRelations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,KAAK,CAAC;QACZ,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAC9B,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAC5B,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,KAAK,EAAE,cAAc,CAAC;IACtB,IAAI,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,8BAA8B,WAC/B,iBAAiB,KACtB,MAAM,SACF,cAAc,SACf,MAAM,EAAE,yBA2BjB,CAAC"}
package/lib/queries/find/getIncludedManyToManyRelations.js ADDED
@@ -0,0 +1,20 @@
1
+ export const getIncludedManyToManyRelations = (config, m, query, path = []) => {
2
+ const rels = config.relations[m];
3
+ const includedManyToManyRelations = Object.entries(query.include ?? {})
4
+ .filter(([r, _]) => rels[r].type === "N:N")
5
+ .map(([r, q]) => ({
6
+ model: m,
7
+ name: r,
8
+ relation: rels[r],
9
+ query: q,
10
+ path: [...path, r],
11
+ }));
12
+ const joinedManyToManyRelations = Object.entries(query.include ?? {})
13
+ .filter(([r, _]) => rels[r].type === "N:1")
14
+ .flatMap(([r, q]) => getIncludedManyToManyRelations(config, rels[r].model, q, [
15
+ ...path,
16
+ r,
17
+ ]));
18
+ return [...includedManyToManyRelations, ...joinedManyToManyRelations];
19
+ };
20
+ //# sourceMappingURL=getIncludedManyToManyRelations.js.map
package/lib/queries/find/getIncludedManyToManyRelations.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getIncludedManyToManyRelations.js","sourceRoot":"","sources":["../../../src/queries/find/getIncludedManyToManyRelations.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC1C,MAAyB,EACzB,CAAS,EACT,KAAqB,EACrB,OAAiB,EAAE,EACrB,EAAE;IACA,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,2BAA2B,GAAyB,MAAM,CAAC,OAAO,CACpE,KAAK,CAAC,OAAO,IAAI,EAAE,CACtB;SACI,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,CAAC;QACP,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAmC;QACnD,KAAK,EAAE,CAAE;QACT,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;KACrB,CAAC,CAAC,CAAC;IAER,MAAM,yBAAyB,GAAyB,MAAM,CAAC,OAAO,CAClE,KAAK,CAAC,OAAO,IAAI,EAAE,CACtB;SACI,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;SAC1C,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAChB,8BAA8B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAE,EAAE;QACtD,GAAG,IAAI;QACP,CAAC;KACJ,CAAC,CACL,CAAC;IAEN,OAAO,CAAC,GAAG,2BAA2B,EAAE,GAAG,yBAAyB,CAAC,CAAC;AAC1E,CAAC,CAAC"}
package/lib/queries/find/getIncludedOneToManyRelations.d.ts ADDED
@@ -0,0 +1,12 @@
1
+ import { BaseConfiguration } from "../../schema/types/base/BaseConfiguration";
2
+ import { BaseRelation } from "../../schema/types/base/BaseRelation";
3
+ import { BaseFindParams } from "./types/BaseFindParams";
4
+ export type OneToManySubQuery = {
5
+ model: string;
6
+ name: string;
7
+ relation: BaseRelation;
8
+ query: BaseFindParams;
9
+ path: string[];
10
+ };
11
+ export declare const getIncludedOneToManyRelations: (config: BaseConfiguration, m: string, query: BaseFindParams, path?: string[]) => OneToManySubQuery[];
12
+ //# sourceMappingURL=getIncludedOneToManyRelations.d.ts.map
package/lib/queries/find/getIncludedOneToManyRelations.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getIncludedOneToManyRelations.d.ts","sourceRoot":"","sources":["../../../src/queries/find/getIncludedOneToManyRelations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,cAAc,CAAC;IACtB,IAAI,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAC9B,iBAAiB,KACtB,MAAM,SACF,cAAc,SACf,MAAM,EAAE,wBA2BjB,CAAC"}
package/lib/queries/find/getIncludedOneToManyRelations.js ADDED
@@ -0,0 +1,20 @@
1
+ export const getIncludedOneToManyRelations = (config, m, query, path = []) => {
2
+ const rels = config.relations[m];
3
+ const includedOneToManyRelations = Object.entries(query.include ?? {})
4
+ .filter(([r, _]) => rels[r].type === "1:N")
5
+ .map(([r, q]) => ({
6
+ model: m,
7
+ name: r,
8
+ relation: rels[r],
9
+ query: q,
10
+ path: [...path, r],
11
+ }));
12
+ const joinedOneToManyRelations = Object.entries(query.include ?? {})
13
+ .filter(([r, _]) => rels[r].type === "N:1")
14
+ .flatMap(([r, q]) => getIncludedOneToManyRelations(config, rels[r].model, q, [
15
+ ...path,
16
+ r,
17
+ ]));
18
+ return [...includedOneToManyRelations, ...joinedOneToManyRelations];
19
+ };
20
+ //# sourceMappingURL=getIncludedOneToManyRelations.js.map
package/lib/queries/find/getIncludedOneToManyRelations.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getIncludedOneToManyRelations.js","sourceRoot":"","sources":["../../../src/queries/find/getIncludedOneToManyRelations.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,6BAA6B,GAAG,CACzC,MAAyB,EACzB,CAAS,EACT,KAAqB,EACrB,OAAiB,EAAE,EACrB,EAAE;IACA,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,0BAA0B,GAAwB,MAAM,CAAC,OAAO,CAClE,KAAK,CAAC,OAAO,IAAI,EAAE,CACtB;SACI,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,CAAC;QACP,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QACjB,KAAK,EAAE,CAAE;QACT,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;KACrB,CAAC,CAAC,CAAC;IAER,MAAM,wBAAwB,GAAwB,MAAM,CAAC,OAAO,CAChE,KAAK,CAAC,OAAO,IAAI,EAAE,CACtB;SACI,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;SAC1C,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAChB,6BAA6B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAE,EAAE;QACrD,GAAG,IAAI;QACP,CAAC;KACJ,CAAC,CACL,CAAC;IAEN,OAAO,CAAC,GAAG,0BAA0B,EAAE,GAAG,wBAAwB,CAAC,CAAC;AACxE,CAAC,CAAC"}
package/lib/queries/find/tests/findMany.include.test.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=findMany.include.test.d.ts.map
package/lib/queries/find/tests/findMany.include.test.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"findMany.include.test.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/tests/findMany.include.test.ts"],"names":[],"mappings":""}
package/lib/queries/find/tests/findMany.include.test.js ADDED
@@ -0,0 +1,93 @@
1
+ import { describe, expect, test } from "vitest";
2
+ import { db } from "../../../test/db";
3
+ import { seed } from "../../../test/seed";
4
+ describe("findMany", () => {
5
+ test("it can include N:1 -> 1:N relations", async () => {
6
+ await db.transact(async (db) => {
7
+ await seed(db, {
8
+ users: [
9
+ {
10
+ username: "Russell",
11
+ tenants: [
12
+ { name: "WFMA", posts: 1 },
13
+ { name: "Popova Park", posts: 0 },
14
+ ],
15
+ },
16
+ {
17
+ username: "Dan",
18
+ tenants: [{ name: "WFMA", posts: 2 }],
19
+ },
20
+ {
21
+ username: "Fairooz",
22
+ tenants: [{ name: "WFMA", posts: 0 }],
23
+ },
24
+ ],
25
+ });
26
+ const results = await db.findMany("post", {
27
+ select: ["id", "title"],
28
+ include: {
29
+ author: {
30
+ select: ["id", "username"],
31
+ include: {
32
+ posts: { select: ["id", "title"] },
33
+ },
34
+ },
35
+ },
36
+ limit: 2,
37
+ });
38
+ expect(results.map((p) => [
39
+ p.author.username,
40
+ p.author.posts.map((p) => p.title),
41
+ ])).toEqual([
42
+ ["Russell", ["Post a"]],
43
+ ["Dan", ["Post b", "Post c"]],
44
+ ]);
45
+ }, { rollback: true });
46
+ });
47
+ test("it can include N:1 -> N:N relations", async () => {
48
+ await db.transact(async (db) => {
49
+ await seed(db, {
50
+ users: [
51
+ {
52
+ username: "Russell",
53
+ tenants: [
54
+ { name: "WFMA", posts: 1 },
55
+ { name: "Popova Park", posts: 0 },
56
+ ],
57
+ },
58
+ {
59
+ username: "Dan",
60
+ tenants: [{ name: "WFMA", posts: 2 }],
61
+ },
62
+ {
63
+ username: "Fairooz",
64
+ tenants: [{ name: "WFMA", posts: 0 }],
65
+ },
66
+ ],
67
+ });
68
+ const results = await db.findMany("post", {
69
+ select: ["id", "title"],
70
+ include: {
71
+ author: {
72
+ select: ["id", "username"],
73
+ include: {
74
+ tenants: {
75
+ select: ["id", "name"],
76
+ orderBy: ["name"],
77
+ },
78
+ },
79
+ },
80
+ },
81
+ limit: 2,
82
+ });
83
+ expect(results.map((p) => [
84
+ p.author.username,
85
+ p.author.tenants.map((t) => t.name),
86
+ ])).toEqual([
87
+ ["Russell", ["Popova Park", "WFMA"]],
88
+ ["Dan", ["WFMA"]],
89
+ ]);
90
+ }, { rollback: true });
91
+ });
92
+ });
93
+ //# sourceMappingURL=findMany.include.test.js.map
package/lib/queries/find/tests/findMany.include.test.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"findMany.include.test.js","sourceRoot":"","sources":["../../../../src/queries/find/tests/findMany.include.test.ts"],"names":[],"mappings":"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"}
package/lib/queries/findMany.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,eAAO,MAAM,QAAQ,SACX,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,cAAc,uCA+FxB,CAAC"}
1
+ {"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,eAAO,MAAM,QAAQ,SACX,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,cAAc,uCAyGxB,CAAC"}
package/lib/queries/findMany.js CHANGED
@@ -1,10 +1,12 @@
1
- import { groupBy } from "lodash-es";
1
+ import { dropRight, get, groupBy, set } from "lodash-es";
2
2
  import hash from "object-hash";
3
3
  import { OrmError } from "../errors";
4
4
  import { logger } from "../logger";
5
5
  import { ensureArray } from "../util/ensureArray";
6
6
  import { buildFind } from "./find/buildFind";
7
7
  import { findToSql } from "./find/findToSql";
8
+ import { getIncludedManyToManyRelations } from "./find/getIncludedManyToManyRelations";
9
+ import { getIncludedOneToManyRelations } from "./find/getIncludedOneToManyRelations";
8
10
  import { rowToObject } from "./util/rowToObject";
9
11
  export const findMany = async (conn, config, m, query) => {
10
12
  const builder = buildFind(config, m, query);
@@ -19,51 +21,62 @@ export const findMany = async (conn, config, m, query) => {
19
21
  const results = await conn
20
22
  .query(statement)
21
23
  .then((result) => result.rows.map(rowToObject(builder.columns)));
22
- for (const [r, subquery] of Object.entries(query.include ?? {})) {
23
- const relation = config.relations[m][r];
24
- if (relation.type === "1:N") {
25
- const relation = config.relations[m][r];
26
- const pk = config.models[m].primaryKey;
27
- const fk = ensureArray(relation.foreignKey);
28
- const lateralBy = fk.map((c, index) => ({
29
- column: c,
30
- values: results.map((result) => result[pk[index]]),
31
- }));
32
- const subqueryResults = await findMany(conn, config, relation.model, { ...subquery, lateralBy });
24
+ const fetchIncludedOneToManyRelations = getIncludedOneToManyRelations(config, m, query).map(({ model, relation, query, path }) => {
25
+ console.log("Fetching 1:N relation");
26
+ const pk = config.models[model].primaryKey;
27
+ const fk = ensureArray(relation.foreignKey);
28
+ const lateralBy = fk.map((c, index) => ({
29
+ column: c,
30
+ values: results.map((result) => get(result, [...dropRight(path, 1), pk[index]])),
31
+ }));
32
+ return findMany(conn, config, relation.model, {
33
+ ...query,
34
+ lateralBy,
35
+ }).then((subqueryResults) => {
33
36
  const lookup = groupBy(subqueryResults, (result) => {
34
37
  return hash(fk.map((c) => result[c]));
35
38
  });
36
39
  for (const result of results) {
37
- const key = hash(pk.map((c) => result[c]));
38
- result[r] = lookup[key] ?? [];
40
+ const key = hash(pk.map((c) => get(result, [...dropRight(path, 1), c])));
41
+ console.log([...path]);
42
+ set(result, [...path], lookup[key] ?? []);
39
43
  }
40
- }
41
- else if (relation.type === "N:N") {
42
- const joinFrom = Object.entries(config.relations[m]).find(([, rel]) => rel.type === "1:N" && rel.model === relation.through)?.[0];
43
- const joinTo = Object.entries(config.relations[relation.through]).find(([, rel]) => rel.type === "N:1" && rel.model === relation.model)?.[0];
44
- if (joinFrom === undefined || joinTo === undefined) {
45
- throw new OrmError("Both sides of a N:N relation must be defined", { data: { joinFrom, joinTo, query } });
46
- }
47
- const pk = config.models[m].primaryKey;
48
- const fk = ensureArray(relation.foreignKey);
49
- const lateralBy = fk.map((c, index) => ({
50
- column: c,
51
- values: results.map((result) => result[pk[index]]),
52
- }));
53
- const subqueryResults = await findMany(conn, config, relation.through, {
54
- select: ensureArray(relation.foreignKey),
55
- include: { [joinTo]: subquery },
56
- lateralBy,
44
+ });
45
+ });
46
+ const fetchIncludedManyToManyRelations = getIncludedManyToManyRelations(config, m, query).map(({ model, relation, query, path }) => {
47
+ console.log("Fetching N:N relation");
48
+ const joinFrom = Object.entries(config.relations[model]).find(([, rel]) => rel.type === "1:N" && rel.model === relation.through)?.[0];
49
+ const joinTo = Object.entries(config.relations[relation.through]).find(([, rel]) => rel.type === "N:1" && rel.model === relation.model)?.[0];
50
+ if (joinFrom === undefined || joinTo === undefined) {
51
+ throw new OrmError("Both sides of a N:N relation must be defined", {
52
+ data: { joinFrom, joinTo, query },
57
53
  });
54
+ }
55
+ const pk = config.models[model].primaryKey;
56
+ const fk = ensureArray(relation.foreignKey);
57
+ const lateralBy = fk.map((c, index) => ({
58
+ column: c,
59
+ values: results.map((result) => get(result, [...dropRight(path, 1), pk[index]])),
60
+ }));
61
+ return findMany(conn, config, relation.through, {
62
+ select: ensureArray(relation.foreignKey),
63
+ include: { [joinTo]: query },
64
+ lateralBy,
65
+ }).then((subqueryResults) => {
58
66
  const lookup = groupBy(subqueryResults, (result) => {
59
67
  return hash(fk.map((c) => result[c]));
60
68
  });
61
69
  for (const result of results) {
62
- const key = hash(pk.map((c) => result[c]));
63
- result[r] = (lookup[key] ?? []).map((relation) => relation[joinTo] ?? []);
70
+ const key = hash(pk.map((c) => get(result, [...dropRight(path, 1), c])));
71
+ console.log([...path]);
72
+ set(result, [...path], (lookup[key] ?? []).map((r) => r[joinTo] ?? []));
64
73
  }
65
- }
66
- }
74
+ });
75
+ });
76
+ await Promise.all([
77
+ ...fetchIncludedOneToManyRelations,
78
+ ...fetchIncludedManyToManyRelations,
79
+ ]);
67
80
  return results;
68
81
  };
69
82
  //# sourceMappingURL=findMany.js.map
package/lib/queries/findMany.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"findMany.js","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"findMany.js","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,IAAI,MAAM,aAAa,CAAC;AAI/B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AACvF,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAErF,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EACzB,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,KAAqB,EACvB,EAAE;IACA,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,iBAAiB;QAC1B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAClD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,OAAO,GAAG,MAAM,IAAI;SACrB,KAAK,CAAC,SAAS,CAAC;SAChB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAErE,MAAM,+BAA+B,GAAG,6BAA6B,CACjE,MAAM,EACN,CAAC,EACD,KAAK,CACR,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;QACvC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC;QAC3C,MAAM,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACpC,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC3B,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAClD;SACJ,CAAC,CAAC,CAAC;QACJ,OAAO,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE;YAC1C,GAAG,KAAK;YACR,SAAS;SACZ,CAAC,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,EAAE;YACxB,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC/C,OAAO,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YACH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,MAAM,GAAG,GAAG,IAAI,CACZ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CACzD,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;gBACvB,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAC9C,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,gCAAgC,GAAG,8BAA8B,CACnE,MAAM,EACN,CAAC,EACD,KAAK,CACR,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;QACvC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACzD,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,OAAO,CACpE,EAAE,CAAC,CAAC,CAAC,CAAC;QAEP,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAClE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,CAClE,EAAE,CAAC,CAAC,CAAC,CAAC;QAEP,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACjD,MAAM,IAAI,QAAQ,CAAC,8CAA8C,EAAE;gBAC/D,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE;aACpC,CAAC,CAAC;QACP,CAAC;QAED,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC;QAC3C,MAAM,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACpC,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC3B,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAClD;SACJ,CAAC,CAAC,CAAC;QAEJ,OAAO,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE;YAC5C,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC;YACxC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE;YAC5B,SAAS;SACZ,CAAC,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,EAAE;YACxB,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC/C,OAAO,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YACH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,MAAM,GAAG,GAAG,IAAI,CACZ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CACzD,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;gBACvB,GAAG,CACC,MAAM,EACN,CAAC,GAAG,IAAI,CAAC,EACT,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAClD,CAAC;YACN,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,GAAG,+BAA+B;QAClC,GAAG,gCAAgC;KACtC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
package/lib/schema/populate/populateModel.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"populateModel.d.ts","sourceRoot":"","sources":["../../../src/schema/populate/populateModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAGpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,eAAO,MAAM,aAAa,WACd,KAAK,iBAAiB,EAAE,QAAQ,GAAG,QAAQ,CAAC,QAC9C,MAAM,SACL,oBAAoB,KAC5B,SAmFF,CAAC"}
1
+ {"version":3,"file":"populateModel.d.ts","sourceRoot":"","sources":["../../../src/schema/populate/populateModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAGpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,eAAO,MAAM,aAAa,WACd,KAAK,iBAAiB,EAAE,QAAQ,GAAG,QAAQ,CAAC,QAC9C,MAAM,SACL,oBAAoB,KAC5B,SAoFF,CAAC"}
package/lib/schema/populate/populateModel.js CHANGED
@@ -7,6 +7,7 @@ export const populateModel = (config, name, model) => {
7
7
  zodSchema: column.zodSchema ?? suggestedColumnSchema(column.type),
8
8
  nullable: column.nullable ?? false,
9
9
  default: column.default ?? null,
10
+ provided: column.provided ?? false,
10
11
  }));
11
12
  const primaryKey = model.primaryKey ??
12
13
  Object.entries(model.columns)
package/lib/schema/populate/populateModel.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"populateModel.js","sourceRoot":"","sources":["../../../src/schema/populate/populateModel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"populateModel.js","sourceRoot":"","sources":["../../../src/schema/populate/populateModel.ts"],"names":[],"mappings":"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"}
package/lib/schema/types/base/BaseColumn.d.ts CHANGED
@@ -5,5 +5,6 @@ export type BaseColumn = {
5
5
  zodSchema: z.ZodType<unknown>;
6
6
  nullable: boolean;
7
7
  default?: unknown;
8
+ provided: boolean;
8
9
  };
9
10
  //# sourceMappingURL=BaseColumn.d.ts.map
package/lib/schema/types/base/BaseColumn.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseColumn.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/base/BaseColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,UAAU,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC"}
1
+ {"version":3,"file":"BaseColumn.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/base/BaseColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,UAAU,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACrB,CAAC"}
package/lib/schema/types/helpers/IsProvided.d.ts ADDED
@@ -0,0 +1,6 @@
1
+ import { LooseModelDefinitions } from "../loose/LooseModelDefinitions";
2
+ import { ColumnName } from "./ColumnName";
3
+ import { Columns } from "./Columns";
4
+ import { ModelName } from "./ModelName";
5
+ export type IsProvided<Models extends LooseModelDefinitions, M extends ModelName<Models>, C extends ColumnName<Models, M>> = Columns<Models, M>[C]["provided"];
6
+ //# sourceMappingURL=IsProvided.d.ts.map
package/lib/schema/types/helpers/IsProvided.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IsProvided.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/helpers/IsProvided.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,UAAU,CAClB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,IAC/B,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC"}
package/lib/schema/types/helpers/IsProvided.js ADDED
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=IsProvided.js.map
package/lib/schema/types/helpers/IsProvided.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IsProvided.js","sourceRoot":"","sources":["../../../../src/schema/types/helpers/IsProvided.ts"],"names":[],"mappings":""}
package/lib/schema/types/loose/LooseColumnDefinition.d.ts CHANGED
@@ -65,5 +65,10 @@ export type LooseColumnDefinition<ColumnType = unknown> = {
65
65
  onUpdate?: SQLStatement;
66
66
  onDelete?: SQLStatement;
67
67
  };
68
+ /**
69
+ * Is this column provided by middleware? If so, it will not be included in
70
+ * the set of required columns for inserts and updates.
71
+ */
72
+ provided?: boolean;
68
73
  };
69
74
  //# sourceMappingURL=LooseColumnDefinition.d.ts.map
package/lib/schema/types/loose/LooseColumnDefinition.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LooseColumnDefinition.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/loose/LooseColumnDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,MAAM,qBAAqB,CAAC,UAAU,GAAG,OAAO,IAAI;IACtD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAElC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CAAC;IAE3C;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,CAAC,EAAE,YAAY,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAExE;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,UAAU,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;KAC3B,CAAC;CACL,CAAC"}
1
+ {"version":3,"file":"LooseColumnDefinition.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/loose/LooseColumnDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,MAAM,qBAAqB,CAAC,UAAU,GAAG,OAAO,IAAI;IACtD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAElC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CAAC;IAE3C;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,CAAC,EAAE,YAAY,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAExE;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,UAAU,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;KAC3B,CAAC;IAEF;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC"}
package/lib/schema/types/strict/ColumnDefinition.d.ts CHANGED
@@ -66,5 +66,10 @@ export type ColumnDefinition<ColumnType = unknown> = {
66
66
  onUpdate?: SQLStatement;
67
67
  onDelete?: SQLStatement;
68
68
  };
69
+ /**
70
+ * Is this column provided by middleware? If so, it will not be included in
71
+ * the set of required columns for inserts and updates.
72
+ */
73
+ provided?: boolean;
69
74
  };
70
75
  //# sourceMappingURL=ColumnDefinition.d.ts.map
package/lib/schema/types/strict/ColumnDefinition.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ColumnDefinition.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/strict/ColumnDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,MAAM,gBAAgB,CAAC,UAAU,GAAG,OAAO,IAAI;IACjD;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IAEf;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAElC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CAAC;IAE3C;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,CAAC,EAAE,YAAY,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAExE;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,UAAU,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;KAC3B,CAAC;CACL,CAAC"}
1
+ {"version":3,"file":"ColumnDefinition.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/strict/ColumnDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,MAAM,gBAAgB,CAAC,UAAU,GAAG,OAAO,IAAI;IACjD;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IAEf;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAElC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CAAC;IAE3C;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,CAAC,EAAE,YAAY,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAExE;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,UAAU,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;KAC3B,CAAC;IAEF;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC"}
package/lib/test/gen/column.d.ts CHANGED
@@ -18,5 +18,6 @@ export declare const column: () => fc.Arbitrary<{
18
18
  onUpdate?: import("../..").SQLStatement | undefined;
19
19
  onDelete?: import("../..").SQLStatement | undefined;
20
20
  } | undefined;
21
+ provided?: boolean | undefined;
21
22
  }>;
22
23
  //# sourceMappingURL=column.d.ts.map
package/lib/test/gen/column.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"column.d.ts","sourceRoot":"","sources":["../../../src/test/gen/column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;EA+BlB,CAAC"}
1
+ {"version":3,"file":"column.d.ts","sourceRoot":"","sources":["../../../src/test/gen/column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;EA+BlB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@casekit/orm",
3
- "version": "0.0.1-alpha.2",
3
+ "version": "0.0.1-alpha.4",
4
4
  "description": "A simple ORM",
5
5
  "type": "module",
6
6
  "main": "lib/index.js",
@@ -20,7 +20,7 @@
20
20
  "@types/pg-format": "^1.0.5",
21
21
  "@types/pluralize": "^0.0.33",
22
22
  "@types/uuid": "^9.0.8",
23
- "@typescript-eslint/eslint-plugin": "^7.6.0",
23
+ "@typescript-eslint/eslint-plugin": "^7.7.0",
24
24
  "@vitest/coverage-istanbul": "^1.4.0",
25
25
  "@vitest/coverage-v8": "^1.4.0",
26
26
  "@vitest/ui": "^1.4.0",
package/src/queries/clauses/helpers/OptionalColumn.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { ColumnName } from "../../../schema/types/helpers/ColumnName";
2
2
  import { HasDefault } from "../../../schema/types/helpers/HasDefault";
3
3
  import { IsNullable } from "../../../schema/types/helpers/IsNullable";
4
+ import { IsProvided } from "../../../schema/types/helpers/IsProvided";
4
5
  import { IsSerial } from "../../../schema/types/helpers/IsSerial";
5
6
  import { ModelName } from "../../../schema/types/helpers/ModelName";
6
7
  import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
@@ -15,5 +16,7 @@ export type OptionalColumn<
15
16
  ? C
16
17
  : HasDefault<Models, M, C> extends true
17
18
  ? C
18
- : never;
19
+ : IsProvided<Models, M, C> extends true
20
+ ? C
21
+ : never;
19
22
  }[ColumnName<Models, M>];
package/src/queries/create/tests/createOne.test.ts CHANGED
@@ -124,4 +124,47 @@ describe("createOne", () => {
124
124
  { rollback: true },
125
125
  );
126
126
  });
127
+ test("columns that are provided by middleware do not need to be specified", async () => {
128
+ const baz = {
129
+ columns: {
130
+ id: {
131
+ type: "uuid",
132
+ zodSchema: z.string().uuid(),
133
+ provided: true,
134
+ },
135
+ name: { type: "text", zodSchema: z.string() },
136
+ },
137
+ } as const satisfies ModelDefinition;
138
+
139
+ await orm({
140
+ schema: "casekit",
141
+ models: { baz },
142
+ relations: { baz: {} },
143
+ pool: new pg.Pool(),
144
+ middleware: [
145
+ {
146
+ create: {
147
+ values: (values) => ({ id: uuid.v4(), ...values }),
148
+ },
149
+ },
150
+ ],
151
+ }).transact(
152
+ async (db) => {
153
+ await db.connection.query(createTableSql(db.models.baz));
154
+
155
+ await db.createOne("baz", {
156
+ values: { name: "hello" },
157
+ });
158
+
159
+ const rows = await db.findMany("baz", {
160
+ select: ["id", "name"],
161
+ });
162
+
163
+ expect(rows).toHaveLength(1);
164
+ expect(rows[0].id).toBeTypeOf("string");
165
+ expect(rows[0].name).toEqual("hello");
166
+ },
167
+ { rollback: true },
168
+ );
169
+ });
127
170
  });
package/src/queries/find/getIncludedManyToManyRelations.ts ADDED
@@ -0,0 +1,49 @@
1
+ import { BaseConfiguration } from "../../schema/types/base/BaseConfiguration";
2
+ import { BaseFindParams } from "./types/BaseFindParams";
3
+
4
+ export type ManyToManySubQuery = {
5
+ model: string;
6
+ name: string;
7
+ relation: {
8
+ model: string;
9
+ type: "N:N";
10
+ foreignKey: string | string[];
11
+ otherKey: string | string[];
12
+ through: string;
13
+ };
14
+ query: BaseFindParams;
15
+ path: string[];
16
+ };
17
+
18
+ export const getIncludedManyToManyRelations = (
19
+ config: BaseConfiguration,
20
+ m: string,
21
+ query: BaseFindParams,
22
+ path: string[] = [],
23
+ ) => {
24
+ const rels = config.relations[m];
25
+ const includedManyToManyRelations: ManyToManySubQuery[] = Object.entries(
26
+ query.include ?? {},
27
+ )
28
+ .filter(([r, _]) => rels[r].type === "N:N")
29
+ .map(([r, q]) => ({
30
+ model: m,
31
+ name: r,
32
+ relation: rels[r] as ManyToManySubQuery["relation"],
33
+ query: q!,
34
+ path: [...path, r],
35
+ }));
36
+
37
+ const joinedManyToManyRelations: ManyToManySubQuery[] = Object.entries(
38
+ query.include ?? {},
39
+ )
40
+ .filter(([r, _]) => rels[r].type === "N:1")
41
+ .flatMap(([r, q]) =>
42
+ getIncludedManyToManyRelations(config, rels[r].model, q!, [
43
+ ...path,
44
+ r,
45
+ ]),
46
+ );
47
+
48
+ return [...includedManyToManyRelations, ...joinedManyToManyRelations];
49
+ };
package/src/queries/find/getIncludedOneToManyRelations.ts ADDED
@@ -0,0 +1,44 @@
1
+ import { BaseConfiguration } from "../../schema/types/base/BaseConfiguration";
2
+ import { BaseRelation } from "../../schema/types/base/BaseRelation";
3
+ import { BaseFindParams } from "./types/BaseFindParams";
4
+
5
+ export type OneToManySubQuery = {
6
+ model: string;
7
+ name: string;
8
+ relation: BaseRelation;
9
+ query: BaseFindParams;
10
+ path: string[];
11
+ };
12
+
13
+ export const getIncludedOneToManyRelations = (
14
+ config: BaseConfiguration,
15
+ m: string,
16
+ query: BaseFindParams,
17
+ path: string[] = [],
18
+ ) => {
19
+ const rels = config.relations[m];
20
+ const includedOneToManyRelations: OneToManySubQuery[] = Object.entries(
21
+ query.include ?? {},
22
+ )
23
+ .filter(([r, _]) => rels[r].type === "1:N")
24
+ .map(([r, q]) => ({
25
+ model: m,
26
+ name: r,
27
+ relation: rels[r],
28
+ query: q!,
29
+ path: [...path, r],
30
+ }));
31
+
32
+ const joinedOneToManyRelations: OneToManySubQuery[] = Object.entries(
33
+ query.include ?? {},
34
+ )
35
+ .filter(([r, _]) => rels[r].type === "N:1")
36
+ .flatMap(([r, q]) =>
37
+ getIncludedOneToManyRelations(config, rels[r].model, q!, [
38
+ ...path,
39
+ r,
40
+ ]),
41
+ );
42
+
43
+ return [...includedOneToManyRelations, ...joinedOneToManyRelations];
44
+ };
package/src/queries/find/tests/findMany.include.test.ts ADDED
@@ -0,0 +1,107 @@
1
+ import { describe, expect, test } from "vitest";
2
+
3
+ import { db } from "../../../test/db";
4
+ import { seed } from "../../../test/seed";
5
+
6
+ describe("findMany", () => {
7
+ test("it can include N:1 -> 1:N relations", async () => {
8
+ await db.transact(
9
+ async (db) => {
10
+ await seed(db, {
11
+ users: [
12
+ {
13
+ username: "Russell",
14
+ tenants: [
15
+ { name: "WFMA", posts: 1 },
16
+ { name: "Popova Park", posts: 0 },
17
+ ],
18
+ },
19
+ {
20
+ username: "Dan",
21
+ tenants: [{ name: "WFMA", posts: 2 }],
22
+ },
23
+ {
24
+ username: "Fairooz",
25
+ tenants: [{ name: "WFMA", posts: 0 }],
26
+ },
27
+ ],
28
+ });
29
+ const results = await db.findMany("post", {
30
+ select: ["id", "title"],
31
+ include: {
32
+ author: {
33
+ select: ["id", "username"],
34
+ include: {
35
+ posts: { select: ["id", "title"] },
36
+ },
37
+ },
38
+ },
39
+ limit: 2,
40
+ });
41
+
42
+ expect(
43
+ results.map((p) => [
44
+ p.author.username,
45
+ p.author.posts.map((p) => p.title),
46
+ ]),
47
+ ).toEqual([
48
+ ["Russell", ["Post a"]],
49
+ ["Dan", ["Post b", "Post c"]],
50
+ ]);
51
+ },
52
+ { rollback: true },
53
+ );
54
+ });
55
+
56
+ test("it can include N:1 -> N:N relations", async () => {
57
+ await db.transact(
58
+ async (db) => {
59
+ await seed(db, {
60
+ users: [
61
+ {
62
+ username: "Russell",
63
+ tenants: [
64
+ { name: "WFMA", posts: 1 },
65
+ { name: "Popova Park", posts: 0 },
66
+ ],
67
+ },
68
+ {
69
+ username: "Dan",
70
+ tenants: [{ name: "WFMA", posts: 2 }],
71
+ },
72
+ {
73
+ username: "Fairooz",
74
+ tenants: [{ name: "WFMA", posts: 0 }],
75
+ },
76
+ ],
77
+ });
78
+ const results = await db.findMany("post", {
79
+ select: ["id", "title"],
80
+ include: {
81
+ author: {
82
+ select: ["id", "username"],
83
+ include: {
84
+ tenants: {
85
+ select: ["id", "name"],
86
+ orderBy: ["name"],
87
+ },
88
+ },
89
+ },
90
+ },
91
+ limit: 2,
92
+ });
93
+
94
+ expect(
95
+ results.map((p) => [
96
+ p.author.username,
97
+ p.author.tenants.map((t) => t.name),
98
+ ]),
99
+ ).toEqual([
100
+ ["Russell", ["Popova Park", "WFMA"]],
101
+ ["Dan", ["WFMA"]],
102
+ ]);
103
+ },
104
+ { rollback: true },
105
+ );
106
+ });
107
+ });
package/src/queries/findMany.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { groupBy } from "lodash-es";
1
+ import { dropRight, get, groupBy, set } from "lodash-es";
2
2
  import hash from "object-hash";
3
3
  import { BaseConfiguration } from "src/schema/types/base/BaseConfiguration";
4
4
 
@@ -8,6 +8,8 @@ import { logger } from "../logger";
8
8
  import { ensureArray } from "../util/ensureArray";
9
9
  import { buildFind } from "./find/buildFind";
10
10
  import { findToSql } from "./find/findToSql";
11
+ import { getIncludedManyToManyRelations } from "./find/getIncludedManyToManyRelations";
12
+ import { getIncludedOneToManyRelations } from "./find/getIncludedOneToManyRelations";
11
13
  import { BaseFindParams } from "./find/types/BaseFindParams";
12
14
  import { rowToObject } from "./util/rowToObject";
13
15
 
@@ -32,82 +34,92 @@ export const findMany = async (
32
34
  .query(statement)
33
35
  .then((result) => result.rows.map(rowToObject(builder.columns)));
34
36
 
35
- for (const [r, subquery] of Object.entries(query.include ?? {})) {
36
- const relation = config.relations[m]![r];
37
- if (relation.type === "1:N") {
38
- const relation = config.relations[m][r];
39
-
40
- const pk = config.models[m].primaryKey;
41
- const fk = ensureArray(relation.foreignKey);
42
-
43
- const lateralBy = fk.map((c, index) => ({
44
- column: c,
45
- values: results.map((result) => result[pk[index]]),
46
- }));
47
-
48
- const subqueryResults = await findMany(
49
- conn,
50
- config,
51
- relation.model,
52
- { ...subquery!, lateralBy },
53
- );
54
-
37
+ const fetchIncludedOneToManyRelations = getIncludedOneToManyRelations(
38
+ config,
39
+ m,
40
+ query,
41
+ ).map(({ model, relation, query, path }) => {
42
+ console.log("Fetching 1:N relation");
43
+ const pk = config.models[model].primaryKey;
44
+ const fk = ensureArray(relation.foreignKey);
45
+ const lateralBy = fk.map((c, index) => ({
46
+ column: c,
47
+ values: results.map((result) =>
48
+ get(result, [...dropRight(path, 1), pk[index]]),
49
+ ),
50
+ }));
51
+ return findMany(conn, config, relation.model, {
52
+ ...query,
53
+ lateralBy,
54
+ }).then((subqueryResults) => {
55
55
  const lookup = groupBy(subqueryResults, (result) => {
56
56
  return hash(fk.map((c) => result[c]));
57
57
  });
58
-
59
58
  for (const result of results) {
60
- const key = hash(pk.map((c) => result[c]));
61
- result[r] = lookup[key] ?? [];
62
- }
63
- } else if (relation.type === "N:N") {
64
- const joinFrom = Object.entries(config.relations[m]).find(
65
- ([, rel]) =>
66
- rel.type === "1:N" && rel.model === relation.through,
67
- )?.[0];
68
-
69
- const joinTo = Object.entries(
70
- config.relations[relation.through],
71
- ).find(
72
- ([, rel]) => rel.type === "N:1" && rel.model === relation.model,
73
- )?.[0];
74
-
75
- if (joinFrom === undefined || joinTo === undefined) {
76
- throw new OrmError(
77
- "Both sides of a N:N relation must be defined",
78
- { data: { joinFrom, joinTo, query } },
59
+ const key = hash(
60
+ pk.map((c) => get(result, [...dropRight(path, 1), c])),
79
61
  );
62
+ console.log([...path]);
63
+ set(result, [...path], lookup[key] ?? []);
80
64
  }
65
+ });
66
+ });
81
67
 
82
- const pk = config.models[m].primaryKey;
83
- const fk = ensureArray(relation.foreignKey);
84
- const lateralBy = fk.map((c, index) => ({
85
- column: c,
86
- values: results.map((result) => result[pk[index]]),
87
- }));
68
+ const fetchIncludedManyToManyRelations = getIncludedManyToManyRelations(
69
+ config,
70
+ m,
71
+ query,
72
+ ).map(({ model, relation, query, path }) => {
73
+ console.log("Fetching N:N relation");
74
+ const joinFrom = Object.entries(config.relations[model]).find(
75
+ ([, rel]) => rel.type === "1:N" && rel.model === relation.through,
76
+ )?.[0];
77
+
78
+ const joinTo = Object.entries(config.relations[relation.through]).find(
79
+ ([, rel]) => rel.type === "N:1" && rel.model === relation.model,
80
+ )?.[0];
81
+
82
+ if (joinFrom === undefined || joinTo === undefined) {
83
+ throw new OrmError("Both sides of a N:N relation must be defined", {
84
+ data: { joinFrom, joinTo, query },
85
+ });
86
+ }
88
87
 
89
- const subqueryResults = await findMany(
90
- conn,
91
- config,
92
- relation.through,
93
- {
94
- select: ensureArray(relation.foreignKey),
95
- include: { [joinTo]: subquery! },
96
- lateralBy,
97
- },
98
- );
88
+ const pk = config.models[model].primaryKey;
89
+ const fk = ensureArray(relation.foreignKey);
90
+ const lateralBy = fk.map((c, index) => ({
91
+ column: c,
92
+ values: results.map((result) =>
93
+ get(result, [...dropRight(path, 1), pk[index]]),
94
+ ),
95
+ }));
96
+
97
+ return findMany(conn, config, relation.through, {
98
+ select: ensureArray(relation.foreignKey),
99
+ include: { [joinTo]: query },
100
+ lateralBy,
101
+ }).then((subqueryResults) => {
99
102
  const lookup = groupBy(subqueryResults, (result) => {
100
103
  return hash(fk.map((c) => result[c]));
101
104
  });
102
-
103
105
  for (const result of results) {
104
- const key = hash(pk.map((c) => result[c]));
105
- result[r] = (lookup[key] ?? []).map(
106
- (relation) => relation[joinTo] ?? [],
106
+ const key = hash(
107
+ pk.map((c) => get(result, [...dropRight(path, 1), c])),
108
+ );
109
+ console.log([...path]);
110
+ set(
111
+ result,
112
+ [...path],
113
+ (lookup[key] ?? []).map((r) => r[joinTo] ?? []),
107
114
  );
108
115
  }
109
- }
110
- }
116
+ });
117
+ });
118
+
119
+ await Promise.all([
120
+ ...fetchIncludedOneToManyRelations,
121
+ ...fetchIncludedManyToManyRelations,
122
+ ]);
111
123
 
112
124
  return results;
113
125
  };
package/src/schema/populate/populateModel.ts CHANGED
@@ -18,6 +18,7 @@ export const populateModel = (
18
18
  zodSchema: column.zodSchema ?? suggestedColumnSchema(column.type),
19
19
  nullable: column.nullable ?? false,
20
20
  default: column.default ?? null,
21
+ provided: column.provided ?? false,
21
22
  }));
22
23
 
23
24
  const primaryKey =
package/src/schema/types/base/BaseColumn.ts CHANGED
@@ -6,4 +6,5 @@ export type BaseColumn = {
6
6
  zodSchema: z.ZodType<unknown>;
7
7
  nullable: boolean;
8
8
  default?: unknown;
9
+ provided: boolean;
9
10
  };
package/src/schema/types/helpers/IsProvided.ts ADDED
@@ -0,0 +1,10 @@
1
+ import { LooseModelDefinitions } from "../loose/LooseModelDefinitions";
2
+ import { ColumnName } from "./ColumnName";
3
+ import { Columns } from "./Columns";
4
+ import { ModelName } from "./ModelName";
5
+
6
+ export type IsProvided<
7
+ Models extends LooseModelDefinitions,
8
+ M extends ModelName<Models>,
9
+ C extends ColumnName<Models, M>,
10
+ > = Columns<Models, M>[C]["provided"];
package/src/schema/types/loose/LooseColumnDefinition.ts CHANGED
@@ -71,4 +71,10 @@ export type LooseColumnDefinition<ColumnType = unknown> = {
71
71
  onUpdate?: SQLStatement;
72
72
  onDelete?: SQLStatement;
73
73
  };
74
+
75
+ /**
76
+ * Is this column provided by middleware? If so, it will not be included in
77
+ * the set of required columns for inserts and updates.
78
+ */
79
+ provided?: boolean;
74
80
  };
package/src/schema/types/strict/ColumnDefinition.ts CHANGED
@@ -72,4 +72,10 @@ export type ColumnDefinition<ColumnType = unknown> = {
72
72
  onUpdate?: SQLStatement;
73
73
  onDelete?: SQLStatement;
74
74
  };
75
+
76
+ /**
77
+ * Is this column provided by middleware? If so, it will not be included in
78
+ * the set of required columns for inserts and updates.
79
+ */
80
+ provided?: boolean;
75
81
  };