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

package/lib/queries/delete/types/DeleteOneResult.d.ts

@@ -3,7 +3,7 @@ import { ModelName } from "../../../schema/types/helpers/ModelName";
 import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
 import { ReturningClause } from "../../clauses/ReturningClause";
 import { DeleteParams } from "./DeleteParams";
-export type DeleteOneResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends DeleteParams<Models, M>> = P["returning"] extends ReturningClause<Models, M> ? Readonly<{
+export type DeleteOneResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends DeleteParams<Models, M>> = P["returning"] extends ReturningClause<Models[M]> ? Readonly<{
     [C in P["returning"][number]]: ColumnType<Models, M, C>;
 }> : number;
 //# sourceMappingURL=DeleteOneResult.d.ts.map

package/lib/queries/delete/types/DeleteOneResult.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeleteOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAEjC,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,GACF,MAAM,CAAC"}
+{"version":3,"file":"DeleteOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAEjC,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,GACF,MAAM,CAAC"}

package/lib/queries/delete/types/DeleteParams.d.ts

@@ -4,6 +4,6 @@ import { ReturningClause } from "../../clauses/ReturningClause";
 import { WhereClause } from "../../clauses/WhereClause";
 export type DeleteParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
     where: WhereClause<Models, M>;
-    returning?: ReturningClause<Models, M>;
+    returning?: ReturningClause<Models[M]>;
 };
 //# sourceMappingURL=DeleteParams.d.ts.map

package/lib/queries/delete/types/DeleteParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeleteParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,CACpB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;CAC1C,CAAC"}
+{"version":3,"file":"DeleteParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,CACpB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAC1C,CAAC"}

package/lib/queries/deleteMany.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteMany.d.ts","sourceRoot":"","sources":["../../src/queries/deleteMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,gBAAgB,gDAiB3B,CAAC"}
+{"version":3,"file":"deleteMany.d.ts","sourceRoot":"","sources":["../../src/queries/deleteMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,gBAAgB,gDAmB3B,CAAC"}

package/lib/queries/deleteMany.js

@@ -10,8 +10,10 @@ export const deleteMany = async (conn, config, m, params) => {
         sql: statement.text,
         values: statement.values,
     });
-    if (process.env.NODE_ENV === "test" && !process.env.CI)
+    if (process.env.ORM_VERBOSE_LOGGING) {
         console.log(statement.text);
+        console.log(statement.values);
+    }
     const result = await conn.query(statement);
     return params.returning
         ? result.rows.map(rowToObject(builder.returning))

package/lib/queries/deleteMany.js.map

@@ -1 +1 @@
-{"version":3,"file":"deleteMany.js","sourceRoot":"","sources":["../../src/queries/deleteMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAAwB,EAC1B,EAAE;IACA,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,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,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;AAC/B,CAAC,CAAC"}
+{"version":3,"file":"deleteMany.js","sourceRoot":"","sources":["../../src/queries/deleteMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAAwB,EAC1B,EAAE;IACA,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;AAC/B,CAAC,CAAC"}

package/lib/queries/find/buildFind.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildFind.d.ts","sourceRoot":"","sources":["../../../src/queries/find/buildFind.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,eAAO,MAAM,SAAS,WACV,iBAAiB,KACtB,MAAM,SACF,cAAc,SACf,MAAM,EAAE,2BAEf,WAoHF,CAAC"}
+{"version":3,"file":"buildFind.d.ts","sourceRoot":"","sources":["../../../src/queries/find/buildFind.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,eAAO,MAAM,SAAS,WACV,iBAAiB,KACtB,MAAM,SACF,cAAc,SACf,MAAM,EAAE,2BAEf,WA+HF,CAAC"}

package/lib/queries/find/buildFind.js

@@ -3,23 +3,27 @@ import { ensureArray } from "../../util/ensureArray";
 import { tableAlias } from "../util/tableAlias";
 export const buildFind = (config, m, query, path = [], _tableIndex = 0) => {
     const builder = {
-        tableIndex: _tableIndex,
         columns: [],
-        tables: [],
+        table: {
+            table: config.models[m]["table"],
+            model: m,
+            schema: config.models[m]["schema"],
+            alias: tableAlias(_tableIndex++),
+            where: config.middleware.find?.where
+                ? config.middleware.find.where(query.where, {
+                    config,
+                    model: m,
+                })
+                : query.where,
+            joins: [],
+        },
         orderBy: [],
+        for: query.for,
+        tableIndex: _tableIndex,
     };
     const model = config.models[m];
-    const alias = tableAlias(builder.tableIndex++);
+    const alias = builder.table.alias;
     let colIndex = 0;
-    builder.tables.push({
-        name: config.models[m]["table"],
-        model: m,
-        schema: config.models[m]["schema"],
-        alias: alias,
-        where: config.middleware.find?.where
-            ? config.middleware.find.where(query.where, { config, model: m })
-            : query.where,
-    });
     // make sure we always select the model's primary key,
     // and if necessary the foreign key for a lateral join
     // - we'll strip them out later
@@ -41,30 +45,34 @@ export const buildFind = (config, m, query, path = [], _tableIndex = 0) => {
         const joinedModel = config.models[relation.model];
         if (relation.type === "N:1") {
             const joinBuilder = buildFind(config, relation.model, subquery, [...path, r], builder.tableIndex++);
-            const [joinedTable, ...otherTables] = joinBuilder.tables;
-            builder.tables.push({
-                ...joinedTable,
-                joins: [
-                    ...(joinedTable.joins ?? []),
-                    {
-                        from: {
-                            table: alias,
-                            columns: ensureArray(relation.foreignKey).map((c) => model.columns[c].name),
-                        },
-                        to: {
-                            table: joinedTable.alias,
-                            columns: joinedModel.primaryKey.map((c) => joinedModel.columns[c].name),
-                        },
-                    },
-                ],
-            });
+            const joinedTable = joinBuilder.table;
+            builder.table.joins.push({
+                from: {
+                    schema: config.models[m].schema,
+                    table: config.models[m].table,
+                    alias,
+                    model: m,
+                    columns: ensureArray(relation.foreignKey).map((c) => model.columns[c].name),
+                },
+                to: {
+                    schema: joinedModel.schema,
+                    table: joinedTable.table,
+                    alias: joinedTable.alias,
+                    model: relation.model,
+                    columns: joinedModel.primaryKey.map((c) => joinedModel.columns[c].name),
+                },
+                type: relation.optional ? "left" : "inner",
+                where: joinedTable.where,
+            }, ...joinedTable.joins);
+            // update the parent builder's tableIndex with the one from the
+            // joinBuilder, so that we don't have overlapping table indices
+            builder.tableIndex = joinBuilder.tableIndex;
             // this is admittedly a bit weird,
             // we wouldn't expect N:1 relations to specify
             // ordering, skipping, and limiting, and typescript
             // prevents users from doing this, but
             // we rely on them being present as part of the N:N
             // implementation
-            builder.tables.push(...otherTables);
             builder.columns.push(...joinBuilder.columns);
             builder.orderBy.push(...joinBuilder.orderBy);
             builder.limit = min([builder.limit, joinBuilder.limit]);
@@ -85,7 +93,7 @@ export const buildFind = (config, m, query, path = [], _tableIndex = 0) => {
     if (query.orderBy) {
         builder.orderBy = query.orderBy.map((o) => ({
             table: alias,
-            column: Array.isArray(o) ? o[0] : o,
+            column: model.columns[Array.isArray(o) ? o[0] : o].name,
             direction: Array.isArray(o) ? o[1] : "asc",
         }));
     }

package/lib/queries/find/buildFind.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildFind.js","sourceRoot":"","sources":["../../../src/queries/find/buildFind.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildFind.js","sourceRoot":"","sources":["../../../src/queries/find/buildFind.ts"],"names":[],"mappings":"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"}

package/lib/queries/find/findResultSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/find/findResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,eAAO,MAAM,gBAAgB,WACjB,iBAAiB,KACtB,MAAM,SACF,cAAc;;;;EAgBxB,CAAC"}
+{"version":3,"file":"findResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/find/findResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,eAAO,MAAM,gBAAgB,WACjB,iBAAiB,KACtB,MAAM,SACF,cAAc;;;;EAuBxB,CAAC"}

package/lib/queries/find/findResultSchema.js

@@ -3,12 +3,19 @@ export const findResultSchema = (config, m, query) => {
     const obj = {};
     query.select.forEach((field) => {
         const col = config.models[m].columns[field];
-        obj[field] = col.nullable ? col.zodSchema.nullable() : col.zodSchema;
+        obj[field] = col.nullable
+            ? col.zodSchema.nullish().transform((x) => x ?? null)
+            : col.zodSchema;
     });
     for (const [field, subquery] of Object.entries(query.include || {})) {
         const relation = config.relations[m][field];
         const schema = findResultSchema(config, relation.model, subquery);
-        obj[field] = relation.type === "N:1" ? schema : z.array(schema);
+        obj[field] =
+            relation.type === "N:1"
+                ? relation.optional
+                    ? schema.nullish().transform((x) => x ?? null)
+                    : schema
+                : z.array(schema);
     }
     return z.object(obj);
 };

package/lib/queries/find/findResultSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"findResultSchema.js","sourceRoot":"","sources":["../../../src/queries/find/findResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAInC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,MAAyB,EACzB,CAAS,EACT,KAAqB,EACvB,EAAE;IACA,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5C,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAClE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAS,CAAC,CAAC;QACnE,GAAG,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
+{"version":3,"file":"findResultSchema.js","sourceRoot":"","sources":["../../../src/queries/find/findResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAInC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,MAAyB,EACzB,CAAS,EACT,KAAqB,EACvB,EAAE;IACA,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5C,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ;YACrB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;YACrD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAClE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAS,CAAC,CAAC;QACnE,GAAG,CAAC,KAAK,CAAC;YACN,QAAQ,CAAC,IAAI,KAAK,KAAK;gBACnB,CAAC,CAAC,QAAQ,CAAC,QAAQ;oBACf,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;oBAC9C,CAAC,CAAC,MAAM;gBACZ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}

package/lib/queries/find/findToSql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/find/findToSql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAI9C,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,eAAO,MAAM,SAAS,WACV,iBAAiB,WAChB,WAAW,KACrB,YAgIF,CAAC"}
+{"version":3,"file":"findToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/find/findToSql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAI9C,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,eAAO,MAAM,SAAS,WACV,iBAAiB,WAChB,WAAW,KACrB,YA+HF,CAAC"}

package/lib/queries/find/findToSql.js

@@ -6,7 +6,7 @@ import { buildWhereClauses } from "../clauses/where/buildWhereClauses";
 import { hasConditions } from "../util/hasConditions";
 export const findToSql = (config, builder) => {
     const frag = new SQLStatement();
-    const [table, ...joinedTables] = builder.tables;
+    const table = builder.table;
     if (builder.lateralBy) {
         const { columns, groupTable, itemTable } = builder.lateralBy;
         frag.push(pgfmt(`SELECT %I.* FROM (\nSELECT `, itemTable));
@@ -21,23 +21,18 @@ export const findToSql = (config, builder) => {
         frag.push(pgfmt(`) %I\nJOIN LATERAL (\n`, groupTable));
     }
     frag.push(pgfmt(`SELECT\n${builder.columns.map((c) => pgfmt(`    %I.%I AS %I`, c.table, c.name, c.alias)).join(",\n")}`));
-    frag.push(pgfmt(`\nFROM %I.%I %I`, table.schema, table.name, table.alias));
-    for (const joinedTable of joinedTables) {
-        if (!joinedTable.joins)
-            throw new OrmError("Joined table without join clauses", {
-                data: builder,
-            });
-        frag.push(pgfmt("\nJOIN %I.%I %I\n    ON ", joinedTable.schema, joinedTable.name, joinedTable.alias));
-        frag.push(joinedTable.joins
-            .flatMap((join) => {
-            if (join.from.columns.length !== join.to.columns.length) {
-                throw new OrmError("Number of foreign keys doesn't match number of primary keys in join", { data: builder });
-            }
-            return join.from.columns.map((from, i) => pgfmt("%I.%I = %I.%I", table.alias, from, joinedTable.alias, join.to.columns[i]));
-        })
+    frag.push(pgfmt(`\nFROM %I.%I %I`, table.schema, table.table, table.alias));
+    for (const join of table.joins ?? []) {
+        if (join.from.columns.length !== join.to.columns.length) {
+            throw new OrmError("Number of foreign keys doesn't match number of primary keys in join", { data: builder });
+        }
+        frag.push(join.type === "left" ? "\nLEFT JOIN" : "\nJOIN");
+        frag.push(pgfmt(" %I.%I %I\n    ON ", join.to.schema, join.to.table, join.to.alias));
+        frag.push(join.from.columns
+            .map((from, i) => pgfmt("%I.%I = %I.%I", join.from.alias, from, join.to.alias, join.to.columns[i]))
             .join(" AND "));
-        if (hasConditions(joinedTable.where)) {
-            frag.push(sql `\n    AND ${buildWhereClauses(config, joinedTable, joinedTable.where)}`);
+        if (hasConditions(join.where)) {
+            frag.push(sql `\n    AND ${buildWhereClauses(config, join.to, join.where)}`);
         }
     }
     frag.push(sql `\nWHERE 1 = 1`);
@@ -62,6 +57,9 @@ export const findToSql = (config, builder) => {
     if (builder.offset !== undefined) {
         frag.push(sql `\nOFFSET ${builder.offset}`);
     }
+    if (builder.for) {
+        frag.push(pgfmt(`\nFOR ${builder.for.toUpperCase()}`));
+    }
     if (builder.lateralBy) {
         const { itemTable } = builder.lateralBy;
         frag.push(pgfmt(`\n) %I ON TRUE`, itemTable));

package/lib/queries/find/findToSql.js.map

@@ -1 +1 @@
-{"version":3,"file":"findToSql.js","sourceRoot":"","sources":["../../../src/queries/find/findToSql.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"findToSql.js","sourceRoot":"","sources":["../../../src/queries/find/findToSql.ts"],"names":[],"mappings":"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"}

package/lib/queries/find/getIncludedManyToManyRelations.d.ts

@@ -0,0 +1,17 @@
+import { BaseConfiguration } from "../../schema/types/base/BaseConfiguration";
+import { BaseFindParams } from "./types/BaseFindParams";
+export type ManyToManySubQuery = {
+    model: string;
+    name: string;
+    relation: {
+        model: string;
+        type: "N:N";
+        foreignKey: string | string[];
+        otherKey: string | string[];
+        through: string;
+    };
+    query: BaseFindParams;
+    path: string[];
+};
+export declare const getIncludedManyToManyRelations: (config: BaseConfiguration, m: string, query: BaseFindParams, path?: string[]) => ManyToManySubQuery[];
+//# sourceMappingURL=getIncludedManyToManyRelations.d.ts.map

package/lib/queries/find/getIncludedManyToManyRelations.d.ts.map

@@ -0,0 +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

@@ -0,0 +1,20 @@
+export const getIncludedManyToManyRelations = (config, m, query, path = []) => {
+    const rels = config.relations[m];
+    const includedManyToManyRelations = Object.entries(query.include ?? {})
+        .filter(([r, _]) => rels[r].type === "N:N")
+        .map(([r, q]) => ({
+        model: m,
+        name: r,
+        relation: rels[r],
+        query: q,
+        path: [...path, r],
+    }));
+    const joinedManyToManyRelations = Object.entries(query.include ?? {})
+        .filter(([r, _]) => rels[r].type === "N:1")
+        .flatMap(([r, q]) => getIncludedManyToManyRelations(config, rels[r].model, q, [
+        ...path,
+        r,
+    ]));
+    return [...includedManyToManyRelations, ...joinedManyToManyRelations];
+};
+//# sourceMappingURL=getIncludedManyToManyRelations.js.map

package/lib/queries/find/getIncludedManyToManyRelations.js.map

@@ -0,0 +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

@@ -0,0 +1,12 @@
+import { BaseConfiguration } from "../../schema/types/base/BaseConfiguration";
+import { BaseRelation } from "../../schema/types/base/BaseRelation";
+import { BaseFindParams } from "./types/BaseFindParams";
+export type OneToManySubQuery = {
+    model: string;
+    name: string;
+    relation: BaseRelation;
+    query: BaseFindParams;
+    path: string[];
+};
+export declare const getIncludedOneToManyRelations: (config: BaseConfiguration, m: string, query: BaseFindParams, path?: string[]) => OneToManySubQuery[];
+//# sourceMappingURL=getIncludedOneToManyRelations.d.ts.map

package/lib/queries/find/getIncludedOneToManyRelations.d.ts.map

@@ -0,0 +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

@@ -0,0 +1,20 @@
+export const getIncludedOneToManyRelations = (config, m, query, path = []) => {
+    const rels = config.relations[m];
+    const includedOneToManyRelations = Object.entries(query.include ?? {})
+        .filter(([r, _]) => rels[r].type === "1:N")
+        .map(([r, q]) => ({
+        model: m,
+        name: r,
+        relation: rels[r],
+        query: q,
+        path: [...path, r],
+    }));
+    const joinedOneToManyRelations = Object.entries(query.include ?? {})
+        .filter(([r, _]) => rels[r].type === "N:1")
+        .flatMap(([r, q]) => getIncludedOneToManyRelations(config, rels[r].model, q, [
+        ...path,
+        r,
+    ]));
+    return [...includedOneToManyRelations, ...joinedOneToManyRelations];
+};
+//# sourceMappingURL=getIncludedOneToManyRelations.js.map

package/lib/queries/find/getIncludedOneToManyRelations.js.map

@@ -0,0 +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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=findMany.include.test.d.ts.map

package/lib/queries/find/tests/findMany.include.test.d.ts.map

@@ -0,0 +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

@@ -0,0 +1,93 @@
+import { describe, expect, test } from "vitest";
+import { db } from "../../../test/db";
+import { seed } from "../../../test/seed";
+describe("findMany", () => {
+    test("it can include N:1 -> 1:N relations", async () => {
+        await db.transact(async (db) => {
+            await seed(db, {
+                users: [
+                    {
+                        username: "Russell",
+                        tenants: [
+                            { name: "WFMA", posts: 1 },
+                            { name: "Popova Park", posts: 0 },
+                        ],
+                    },
+                    {
+                        username: "Dan",
+                        tenants: [{ name: "WFMA", posts: 2 }],
+                    },
+                    {
+                        username: "Fairooz",
+                        tenants: [{ name: "WFMA", posts: 0 }],
+                    },
+                ],
+            });
+            const results = await db.findMany("post", {
+                select: ["id", "title"],
+                include: {
+                    author: {
+                        select: ["id", "username"],
+                        include: {
+                            posts: { select: ["id", "title"] },
+                        },
+                    },
+                },
+                limit: 2,
+            });
+            expect(results.map((p) => [
+                p.author.username,
+                p.author.posts.map((p) => p.title),
+            ])).toEqual([
+                ["Russell", ["Post a"]],
+                ["Dan", ["Post b", "Post c"]],
+            ]);
+        }, { rollback: true });
+    });
+    test("it can include N:1 -> N:N relations", async () => {
+        await db.transact(async (db) => {
+            await seed(db, {
+                users: [
+                    {
+                        username: "Russell",
+                        tenants: [
+                            { name: "WFMA", posts: 1 },
+                            { name: "Popova Park", posts: 0 },
+                        ],
+                    },
+                    {
+                        username: "Dan",
+                        tenants: [{ name: "WFMA", posts: 2 }],
+                    },
+                    {
+                        username: "Fairooz",
+                        tenants: [{ name: "WFMA", posts: 0 }],
+                    },
+                ],
+            });
+            const results = await db.findMany("post", {
+                select: ["id", "title"],
+                include: {
+                    author: {
+                        select: ["id", "username"],
+                        include: {
+                            tenants: {
+                                select: ["id", "name"],
+                                orderBy: ["name"],
+                            },
+                        },
+                    },
+                },
+                limit: 2,
+            });
+            expect(results.map((p) => [
+                p.author.username,
+                p.author.tenants.map((t) => t.name),
+            ])).toEqual([
+                ["Russell", ["Popova Park", "WFMA"]],
+                ["Dan", ["WFMA"]],
+            ]);
+        }, { rollback: true });
+    });
+});
+//# sourceMappingURL=findMany.include.test.js.map

package/lib/queries/find/tests/findMany.include.test.js.map

@@ -0,0 +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/find/tests/findMany.lateral.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=findMany.lateral.test.d.ts.map

package/lib/queries/find/tests/findMany.lateral.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findMany.lateral.test.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/tests/findMany.lateral.test.ts"],"names":[],"mappings":""}

package/lib/queries/find/tests/findMany.lateral.test.js

@@ -0,0 +1,86 @@
+import { describe, expect, test } from "vitest";
+import { db } from "../../../test/db";
+import { seed } from "../../../test/seed";
+describe("findMany", () => {
+    test("it can apply lateral clauses to queries with 1:N relations without creating duplicates", async () => {
+        await db.transact(async (db) => {
+            await seed(db, {
+                users: [
+                    {
+                        username: "Russell",
+                        tenants: [{ name: "Popova Park", posts: 3 }],
+                    },
+                    {
+                        username: "Eliza",
+                        tenants: [{ name: "Popova Park", posts: 2 }],
+                    },
+                ],
+            });
+            const result = await db.findMany("post", {
+                select: ["title"],
+                include: {
+                    author: {
+                        select: ["username"],
+                        include: {
+                            posts: {
+                                select: ["title"],
+                                orderBy: ["title"],
+                            },
+                        },
+                    },
+                },
+                orderBy: ["title"],
+            });
+            expect(result).toEqual([
+                {
+                    title: "Post a",
+                    author: {
+                        username: "Russell",
+                        posts: [
+                            { title: "Post a" },
+                            { title: "Post b" },
+                            { title: "Post c" },
+                        ],
+                    },
+                },
+                {
+                    title: "Post b",
+                    author: {
+                        username: "Russell",
+                        posts: [
+                            { title: "Post a" },
+                            { title: "Post b" },
+                            { title: "Post c" },
+                        ],
+                    },
+                },
+                {
+                    title: "Post c",
+                    author: {
+                        username: "Russell",
+                        posts: [
+                            { title: "Post a" },
+                            { title: "Post b" },
+                            { title: "Post c" },
+                        ],
+                    },
+                },
+                {
+                    title: "Post d",
+                    author: {
+                        username: "Eliza",
+                        posts: [{ title: "Post d" }, { title: "Post e" }],
+                    },
+                },
+                {
+                    title: "Post e",
+                    author: {
+                        username: "Eliza",
+                        posts: [{ title: "Post d" }, { title: "Post e" }],
+                    },
+                },
+            ]);
+        }, { rollback: true });
+    });
+});
+//# sourceMappingURL=findMany.lateral.test.js.map

package/lib/queries/find/tests/findMany.lateral.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"findMany.lateral.test.js","sourceRoot":"","sources":["../../../../src/queries/find/tests/findMany.lateral.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE1C,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACtB,IAAI,CAAC,wFAAwF,EAAE,KAAK,IAAI,EAAE;QACtG,MAAM,EAAE,CAAC,QAAQ,CACb,KAAK,EAAE,EAAE,EAAE,EAAE;YACT,MAAM,IAAI,CAAC,EAAE,EAAE;gBACX,KAAK,EAAE;oBACH;wBACI,QAAQ,EAAE,SAAS;wBACnB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;qBAC/C;oBACD;wBACI,QAAQ,EAAE,OAAO;wBACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;qBAC/C;iBACJ;aACJ,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACrC,MAAM,EAAE,CAAC,OAAO,CAAC;gBACjB,OAAO,EAAE;oBACL,MAAM,EAAE;wBACJ,MAAM,EAAE,CAAC,UAAU,CAAC;wBACpB,OAAO,EAAE;4BACL,KAAK,EAAE;gCACH,MAAM,EAAE,CAAC,OAAO,CAAC;gCACjB,OAAO,EAAE,CAAC,OAAO,CAAC;6BACrB;yBACJ;qBACJ;iBACJ;gBACD,OAAO,EAAE,CAAC,OAAO,CAAC;aACrB,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACnB;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE;4BACH,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;yBACtB;qBACJ;iBACJ;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE;4BACH,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;yBACtB;qBACJ;iBACJ;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE;4BACH,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;yBACtB;qBACJ;iBACJ;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,OAAO;wBACjB,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;qBACpD;iBACJ;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,OAAO;wBACjB,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;qBACpD;iBACJ;aACJ,CAAC,CAAC;QACP,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}