joist-orm 1.114.1 → 1.115.0

package/build/src/HintTree.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildHintTree = void 0;
+const normalizeHints_1 = require("./normalizeHints");
+/**
+ * Given a number of potentially overlapping load hints, i.e. `{ authors: "books" }` and
+ * `{ authors: "reviews" }`, combines them into a single `HintNode` tree, with bookkeeping
+ * of which entities requested each specific node of the tree.
+ *
+ * I.e. if we're populating three publishers, two with `{ authors: "books" }` and one with
+ * `{ authors: "reviews" }`, we'll end up with a tree like:
+ *
+ * ```
+ *  {
+ *    authors: {
+ *      entities: [p1, p2, p3],
+ *      subHints: {
+ *        books: { entities: [p1, p2], subHints: {} },
+ *        reviews: { entities: [p3], subHints: {} },
+ *      }
+ *    }
+ *  }
+ * ```
+ *
+ * Which will let us preload `authors` for all three publishers, but `books` only for the
+ * first two, and `reviews` only for the third, i.e. we can prevent over-fetching.
+ */
+function buildHintTree(populates) {
+    const root = { entities: new Set(), subHints: {} };
+    for (const { entity, hint } of populates) {
+        populateHintNode(root, entity, hint);
+    }
+    return root;
+}
+exports.buildHintTree = buildHintTree;
+function populateHintNode(node, entity, hint) {
+    // It's tempting to filter out new entities here, but we need to call `.load()` on their
+    // relations to ensure the `.get`s will later work, even if we don't look in the db for them.
+    node.entities.add(entity);
+    if (hint) {
+        for (const [key, nestedHint] of Object.entries((0, normalizeHints_1.normalizeHint)(hint))) {
+            const child = (node.subHints[key] ??= { entities: new Set(), subHints: {} });
+            populateHintNode(child, entity, nestedHint);
+        }
+    }
+}
+//# sourceMappingURL=HintTree.js.map

package/build/src/HintTree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HintTree.js","sourceRoot":"","sources":["../../src/HintTree.ts"],"names":[],"mappings":";;;AAEA,qDAAiD;AAcjD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,SAAgB,aAAa,CAC3B,SAAoE;IAEpE,MAAM,IAAI,GAAgB,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAChE,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,SAAS,EAAE;QACxC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;KACtC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AARD,sCAQC;AAED,SAAS,gBAAgB,CAAuB,IAAiB,EAAE,MAAS,EAAE,IAA+B;IAC3G,wFAAwF;IACxF,6FAA6F;IAC7F,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,IAAI,IAAI,EAAE;QACR,KAAK,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAA,8BAAa,EAAC,IAAI,CAAC,CAAC,EAAE;YACnE,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7E,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;SAC7C;KACF;AACH,CAAC"}

package/build/src/JoinRows.d.ts

@@ -14,6 +14,8 @@ export declare class JoinRows {
     addRemove(m2m: ManyToManyCollection<any, any>, e1: Entity, e2: Entity): void;
     /** Return any "old values" for a m2m collection that might need reactivity checks. */
     removedFor(m2m: ManyToManyCollection<any, any>, e1: Entity): Entity[];
+    /** Adds an existing join row to this table. */
+    addExisting(m2m: ManyToManyCollection<any, any>, id: number, e1: Entity, e2: Entity): void;
     /**
      * Look up/create our JoinRow psuedo-entity for the given db row.
      *

package/build/src/JoinRows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JoinRows.d.ts","sourceRoot":"","sources":["../../src/JoinRows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAGxE,8EAA8E;AAC9E,qBAAa,QAAQ;IAKjB,QAAQ,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC;IAC5C,OAAO,CAAC,EAAE;IAJZ,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;gBAG3B,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EACpC,EAAE,EAAE,gBAAgB;IAG9B,yCAAyC;IACzC,MAAM,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAazE,uCAAuC;IACvC,SAAS,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAiB5E,sFAAsF;IACtF,UAAU,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAQrE;;;;;OAKG;IACG,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B9C,yFAAyF;IACzF,MAAM,IAAI,WAAW,GAAG,SAAS;CAQlC;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IAEvB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,IAAI,CAAC;IAC/D,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}
+{"version":3,"file":"JoinRows.d.ts","sourceRoot":"","sources":["../../src/JoinRows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAGxE,8EAA8E;AAC9E,qBAAa,QAAQ;IAKjB,QAAQ,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC;IAC5C,OAAO,CAAC,EAAE;IAJZ,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;gBAG3B,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EACpC,EAAE,EAAE,gBAAgB;IAG9B,yCAAyC;IACzC,MAAM,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAazE,uCAAuC;IACvC,SAAS,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAiB5E,sFAAsF;IACtF,UAAU,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAQrE,+CAA+C;IAC/C,WAAW,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAW1F;;;;;OAKG;IACG,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B9C,yFAAyF;IACzF,MAAM,IAAI,WAAW,GAAG,SAAS;CAQlC;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IAEvB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,IAAI,CAAC;IAC/D,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}

package/build/src/JoinRows.js

@@ -54,6 +54,18 @@ class JoinRows {
         const rows = this.rows.filter((r) => r[columnName] === e1 && r.deleted);
         return rows.map((r) => r[otherColumnName]);
     }
+    /** Adds an existing join row to this table. */
+    addExisting(m2m, id, e1, e2) {
+        const { columnName, otherColumnName } = m2m;
+        const existing = this.rows.find((r) => r[columnName] === e1 && r[otherColumnName] === e2);
+        if (existing) {
+            // Treat any existing WIP change as source-of-truth, so leave it alone
+        }
+        else {
+            const joinRow = { id, [m2m.columnName]: e1, [m2m.otherColumnName]: e2 };
+            this.rows.push(joinRow);
+        }
+    }
     /**
      * Look up/create our JoinRow psuedo-entity for the given db row.
      *

package/build/src/JoinRows.js.map

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

package/build/src/QueryParser.d.ts

@@ -10,6 +10,10 @@ export interface ColumnCondition {
     column: string;
     dbType: string;
     cond: ParsedValueFilter<any>;
+    /**
+     * A pruneable condition is one that was auto-added by something like soft-delete, and shouldn't
+     * be something that marks a join as actually used by the user's query.
+     */
     pruneable?: boolean;
 }
 /** A marker condition for alias methods to indicate they should be skipped/pruned. */
@@ -38,6 +42,11 @@ export interface ParsedFindQuery {
     selects: string[];
     /** The primary table plus any joins. */
     tables: ParsedTable[];
+    /** Any cross lateral joins, where the `joins: string[]` has the full join as raw SQL; currently only for preloading. */
+    lateralJoins?: {
+        joins: string[];
+        bindings: any[];
+    };
     /** Simple conditions that are ANDd together. */
     conditions: ColumnCondition[];
     /** Any optional complex conditions that will be ANDd with the simple conditions. */
@@ -138,4 +147,6 @@ export declare function maybeAddNotSoftDeleted(conditions: ColumnCondition[], me
 export declare function combineConditions(query: ParsedFindQuery): ParsedExpressionFilter;
 export declare function getTables(query: ParsedFindQuery): [PrimaryTable, JoinTable[]];
 export declare function joinKeywords(join: JoinTable): string;
+export declare function joinClause(join: JoinTable): string;
+export declare function joinClauses(joins: ParsedTable[]): string[];
 //# sourceMappingURL=QueryParser.d.ts.map

package/build/src/QueryParser.d.ts.map

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

package/build/src/QueryParser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinKeywords = exports.getTables = exports.combineConditions = exports.maybeAddNotSoftDeleted = exports.addTablePerClassJoinsAndClassTag = exports.maybeAddOrderBy = exports.mapToDb = exports.parseValueFilter = exports.parseEntityFilter = exports.parseFindQuery = exports.skipCondition = void 0;
+exports.joinClauses = exports.joinClause = exports.joinKeywords = exports.getTables = exports.combineConditions = exports.maybeAddNotSoftDeleted = exports.addTablePerClassJoinsAndClassTag = exports.maybeAddOrderBy = exports.mapToDb = exports.parseValueFilter = exports.parseEntityFilter = exports.parseFindQuery = exports.skipCondition = void 0;
 const is_plain_object_1 = require("is-plain-object");
 const joist_utils_1 = require("joist-utils");
 const Aliases_1 = require("./Aliases");
@@ -718,6 +718,14 @@ function joinKeywords(join) {
     return join.join === "inner" ? "JOIN" : "LEFT OUTER JOIN";
 }
 exports.joinKeywords = joinKeywords;
+function joinClause(join) {
+    return `${joinKeywords(join)} ${(0, keywords_1.kq)(join.table)} ${(0, keywords_1.kq)(join.alias)} ON ${join.col1} = ${join.col2}`;
+}
+exports.joinClause = joinClause;
+function joinClauses(joins) {
+    return joins.map((t) => (t.join !== "primary" ? joinClause(t) : ""));
+}
+exports.joinClauses = joinClauses;
 function needsClassPerTableJoins(meta) {
     return meta.subTypes.length > 0 || meta.baseTypes.length > 0;
 }

package/build/src/QueryParser.js.map

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

package/build/src/ReactionsManager.d.ts

@@ -9,6 +9,16 @@ import { Entity } from "./Entity";
 export declare class ReactionsManager {
     /** Stores all source `ReactiveField`s that have been marked for later traversal. */
     private pendingFieldReactions;
+    /**
+     * A map of entity tagName -> fields that have been marked as dirty.
+     *
+     * The key of the map is "just" the tag name, instead of a specific entity, b/c at the time of
+     * being marked dirty, we only have the upstream/source entity + fieldName that has changed, and
+     * not the 1-or-more downstream/target entities that will actually recalc.
+     *
+     * Instead, we just track the dirty fields by type-of-entity, which is enough for `isPendingRecalc`.
+     */
+    private dirtyFields;
     /**
      * Queue all downstream reactive fields that depend on `fieldName` as a source field.
      *
@@ -21,6 +31,19 @@ export declare class ReactionsManager {
     dequeueDownstreamReactiveFields(entity: Entity, fieldName: string): void;
     /** Queue all downstream reactive fields that depend on this entity being created or deleted. */
     queueAllDownstreamFields(entity: Entity): void;
+    /**
+     * Returns whether this field might be pending recalc.
+     *
+     * This is technically a guess, b/c our reaction infra may not yet have crawled up an upstream
+     * source field down to the `N` specific target entities that need recalced, and instead just
+     * knows "it will need to do that soon" i.e. at the next `em.flush`.
+     *
+     * So, instead this is a heuristic that says this `fieldName` has been marked dirty for _some_
+     * entities, but we don't technically know if it's _this_ entity.
+     *
+     * I.e. this might return false positives, but should never return false negatives.
+     */
+    isMaybePendingRecalc(entity: Entity, fieldName: string): boolean;
     /**
      * Given source `ReactiveField` "reverse indexes" that have been queued as dirty by calls
      * to setters, `em.register`, or `em.delete`, asynchronously walks/crawls to the downstream
@@ -32,5 +55,6 @@ export declare class ReactionsManager {
     /** Clears all the pending source fields, i.e. after `em.flush` is complete. */
     clear(): void;
     private getPending;
+    private getDirtyFields;
 }
 //# sourceMappingURL=ReactionsManager.d.ts.map

package/build/src/ReactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactionsManager.d.ts","sourceRoot":"","sources":["../../src/ReactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B,oFAAoF;IACpF,OAAO,CAAC,qBAAqB,CAA8C;IAE3E;;;;;;OAMG;IACH,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAkBtE,wEAAwE;IACxE,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAiBxE,gGAAgG;IAChG,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAO9C;;;;;;OAMG;IACG,0BAA0B;IAmChC,+EAA+E;IAC/E,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,UAAU;CAQnB"}
+{"version":3,"file":"ReactionsManager.d.ts","sourceRoot":"","sources":["../../src/ReactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B,oFAAoF;IACpF,OAAO,CAAC,qBAAqB,CAA2E;IACxG;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW,CAAuC;IAE1D;;;;;;OAMG;IACH,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAmBtE,wEAAwE;IACxE,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IA0BxE,gGAAgG;IAChG,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAQ9C;;;;;;;;;;;OAWG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAIhE;;;;;;OAMG;IACG,0BAA0B;IAoChC,+EAA+E;IAC/E,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,cAAc;CAQvB"}

package/build/src/ReactionsManager.js

@@ -13,6 +13,16 @@ const reactiveHints_1 = require("./reactiveHints");
 class ReactionsManager {
     /** Stores all source `ReactiveField`s that have been marked for later traversal. */
     pendingFieldReactions = new Map();
+    /**
+     * A map of entity tagName -> fields that have been marked as dirty.
+     *
+     * The key of the map is "just" the tag name, instead of a specific entity, b/c at the time of
+     * being marked dirty, we only have the upstream/source entity + fieldName that has changed, and
+     * not the 1-or-more downstream/target entities that will actually recalc.
+     *
+     * Instead, we just track the dirty fields by type-of-entity, which is enough for `isPendingRecalc`.
+     */
+    dirtyFields = new Map();
     /**
      * Queue all downstream reactive fields that depend on `fieldName` as a source field.
      *
@@ -33,7 +43,8 @@ class ReactionsManager {
                 // - if we skip re-queuing firstName's RFs, we will miss that initials needs
                 //   its `.load()` called again so that it's `setField` marks `initials` as
                 //   dirty, otherwise it will be left out of any INSERTs/UPDATEs.
-                this.getPending(rf).add(entity);
+                this.getPending(rf).todo.add(entity);
+                this.getDirtyFields((0, EntityMetadata_1.getMetadata)(rf.cstr)).add(rf.name);
             }
         }
     }
@@ -44,12 +55,22 @@ class ReactionsManager {
         for (const rf of rfs) {
             if (rf.fields.includes(fieldName)) {
                 const pending = this.getPending(rf);
-                // We can only delete/dequeue a reaction if `fieldName` is the only or last field
-                // that had triggered `rf` to run. Since we don't track that currently, i.e. we'd
-                // need to have a `Pending.dirtyFields`, for now just only dequeue if `rf` only
-                // has one field (which is us) anyway.
-                if (rf.fields.length === 1) {
-                    pending.delete(entity);
+                if (pending.done.has(entity)) {
+                    // Ironically, if we've already run this RF, asking to dequeue probably means
+                    // we need run it again (to recalc its value), b/c this could be a mid-flush change, i.e.:
+                    // - firstName = a1 from db
+                    // - firstName is changed to a2, triggers initials RF
+                    // - firstName is changed back to a1, which is the original value, so setField
+                    //   thinks we can dequeue the RF
+                    // - but actually our RF needs to be re-run with the restored value
+                    pending.todo.add(entity);
+                }
+                else if (rf.fields.length === 1) {
+                    // We can only delete/dequeue a reaction if `fieldName` is the only or last field
+                    // that had triggered `rf` to run. Since we don't track that currently, i.e. we'd
+                    // need to have a `Pending.dirtyFields`, for now just only dequeue if `rf` only
+                    // has one field (which is us) anyway.
+                    pending.todo.delete(entity);
                 }
             }
         }
@@ -58,9 +79,25 @@ class ReactionsManager {
     queueAllDownstreamFields(entity) {
         const rfs = (0, EntityMetadata_1.getAllMetas)((0, EntityMetadata_1.getMetadata)(entity)).flatMap((m) => m.config.__data.reactiveDerivedValues);
         for (const rf of rfs) {
-            this.getPending(rf).add(entity);
+            this.getPending(rf).todo.add(entity);
+            this.getDirtyFields((0, EntityMetadata_1.getMetadata)(rf.cstr)).add(rf.name);
         }
     }
+    /**
+     * Returns whether this field might be pending recalc.
+     *
+     * This is technically a guess, b/c our reaction infra may not yet have crawled up an upstream
+     * source field down to the `N` specific target entities that need recalced, and instead just
+     * knows "it will need to do that soon" i.e. at the next `em.flush`.
+     *
+     * So, instead this is a heuristic that says this `fieldName` has been marked dirty for _some_
+     * entities, but we don't technically know if it's _this_ entity.
+     *
+     * I.e. this might return false positives, but should never return false negatives.
+     */
+    isMaybePendingRecalc(entity, fieldName) {
+        return this.getDirtyFields((0, EntityMetadata_1.getMetadata)(entity)).has(fieldName);
+    }
     /**
      * Given source `ReactiveField` "reverse indexes" that have been queued as dirty by calls
      * to setters, `em.register`, or `em.delete`, asynchronously walks/crawls to the downstream
@@ -75,13 +112,15 @@ class ReactionsManager {
             scanPending = false;
             const relations = await Promise.all([...this.pendingFieldReactions.entries()].map(async ([rf, pending]) => {
                 // Copy pending and clear it
-                const todo = [...pending];
-                pending.clear();
+                const todo = [...pending.todo];
+                pending.todo.clear();
                 // If we found any pending, loop again b/c we might be a dependency of another field,
                 // which our `.load()` will have marked as pending by calling `queueDownstreamReactiveFields`.
                 if (todo.length > 0) {
                     scanPending = true;
                 }
+                for (const doing of todo)
+                    pending.done.add(doing);
                 // Walk back from the source to any downstream fields
                 return (await (0, reactiveHints_1.followReverseHint)(todo, rf.path))
                     .filter((entity) => !entity.isDeletedEntity)
@@ -107,11 +146,19 @@ class ReactionsManager {
     getPending(rf) {
         let pending = this.pendingFieldReactions.get(rf);
         if (!pending) {
-            pending = new Set();
+            pending = { todo: new Set(), done: new Set() };
             this.pendingFieldReactions.set(rf, pending);
         }
         return pending;
     }
+    getDirtyFields(meta) {
+        let dirty = this.dirtyFields.get(meta.tagName);
+        if (!dirty) {
+            dirty = new Set();
+            this.dirtyFields.set(meta.tagName, dirty);
+        }
+        return dirty;
+    }
 }
 exports.ReactionsManager = ReactionsManager;
 //# sourceMappingURL=ReactionsManager.js.map

package/build/src/ReactionsManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReactionsManager.js","sourceRoot":"","sources":["../../src/ReactionsManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ReactionsManager.js","sourceRoot":"","sources":["../../src/ReactionsManager.ts"],"names":[],"mappings":";;;AAEA,qDAA4E;AAC5E,mDAAoD;AAEpD;;;;;;GAMG;AACH,MAAa,gBAAgB;IAC3B,oFAAoF;IAC5E,qBAAqB,GAAiE,IAAI,GAAG,EAAE,CAAC;IACxG;;;;;;;;OAQG;IACK,WAAW,GAA6B,IAAI,GAAG,EAAE,CAAC;IAE1D;;;;;;OAMG;IACH,6BAA6B,CAAC,MAAc,EAAE,SAAiB;QAC7D,yEAAyE;QACzE,MAAM,GAAG,GAAG,IAAA,4BAAW,EAAC,IAAA,4BAAW,EAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACnG,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE;YACpB,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACjC,uFAAuF;gBACvF,uCAAuC;gBACvC,mEAAmE;gBACnE,mFAAmF;gBACnF,yEAAyE;gBACzE,4EAA4E;gBAC5E,2EAA2E;gBAC3E,iEAAiE;gBACjE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACrC,IAAI,CAAC,cAAc,CAAC,IAAA,4BAAW,EAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;aACxD;SACF;IACH,CAAC;IAED,wEAAwE;IACxE,+BAA+B,CAAC,MAAc,EAAE,SAAiB;QAC/D,yEAAyE;QACzE,MAAM,GAAG,GAAG,IAAA,4BAAW,EAAC,IAAA,4BAAW,EAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACnG,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE;YACpB,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACjC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBACpC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBAC5B,6EAA6E;oBAC7E,0FAA0F;oBAC1F,2BAA2B;oBAC3B,qDAAqD;oBACrD,8EAA8E;oBAC9E,iCAAiC;oBACjC,mEAAmE;oBACnE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;iBAC1B;qBAAM,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;oBACjC,iFAAiF;oBACjF,iFAAiF;oBACjF,+EAA+E;oBAC/E,sCAAsC;oBACtC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;iBAC7B;aACF;SACF;IACH,CAAC;IAED,gGAAgG;IAChG,wBAAwB,CAAC,MAAc;QACrC,MAAM,GAAG,GAAG,IAAA,4BAAW,EAAC,IAAA,4BAAW,EAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACnG,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE;YACpB,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,CAAC,cAAc,CAAC,IAAA,4BAAW,EAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;SACxD;IACH,CAAC;IAED;;;;;;;;;;;OAWG;IACH,oBAAoB,CAAC,MAAc,EAAE,SAAiB;QACpD,OAAO,IAAI,CAAC,cAAc,CAAC,IAAA,4BAAW,EAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,0BAA0B;QAC9B,IAAI,WAAW,GAAG,IAAI,CAAC;QACvB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,WAAW,EAAE;YAClB,WAAW,GAAG,KAAK,CAAC;YACpB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE;gBACpE,4BAA4B;gBAC5B,MAAM,IAAI,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC/B,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACrB,qFAAqF;gBACrF,8FAA8F;gBAC9F,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oBACnB,WAAW,GAAG,IAAI,CAAC;iBACpB;gBACD,KAAK,MAAM,KAAK,IAAI,IAAI;oBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAClD,qDAAqD;gBACrD,OAAO,CAAC,MAAM,IAAA,iCAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;qBAC5C,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;qBAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC;qBACnC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAE,MAAc,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/C,CAAC,CAAC,CACH,CAAC;YACF,4EAA4E;YAC5E,mDAAmD;YACnD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YACzC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACzD,sFAAsF;YACtF,qFAAqF;YACrF,+DAA+D;YAC/D,IAAI,KAAK,EAAE,GAAG,EAAE,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;aACjF;SACF;IACH,CAAC;IAED,+EAA+E;IAC/E,KAAK;QACH,IAAI,CAAC,qBAAqB,GAAG,IAAI,GAAG,EAAE,CAAC;IACzC,CAAC;IAEO,UAAU,CAAC,EAAiB;QAClC,IAAI,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;YAC/C,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;SAC7C;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,cAAc,CAAC,IAAyB;QAC9C,IAAI,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC3C;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA7JD,4CA6JC"}

package/build/src/dataloaders/loadDataLoader.d.ts

@@ -2,5 +2,9 @@ import DataLoader from "dataloader";
 import { Entity } from "../Entity";
 import { EntityManager } from "../EntityManager";
 import { EntityMetadata } from "../EntityMetadata";
-export declare function loadDataLoader<T extends Entity>(em: EntityManager, meta: EntityMetadata<T>): DataLoader<string, T | undefined>;
+import { LoadHint } from "../loadHints";
+export declare function loadDataLoader<T extends Entity>(em: EntityManager, meta: EntityMetadata<T>): DataLoader<{
+    entity: string;
+    hint: LoadHint<T> | undefined;
+}, T | undefined>;
 //# sourceMappingURL=loadDataLoader.d.ts.map

package/build/src/dataloaders/loadDataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadDataLoader.d.ts","sourceRoot":"","sources":["../../../src/dataloaders/loadDataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMnD,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GACtB,UAAU,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAwCnC"}
+{"version":3,"file":"loadDataLoader.d.ts","sourceRoot":"","sources":["../../../src/dataloaders/loadDataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,aAAa,EAAoB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKnD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGxC,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GACtB,UAAU,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;CAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CA0C9E"}

package/build/src/dataloaders/loadDataLoader.js

@@ -1,37 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadDataLoader = void 0;
+const EntityManager_1 = require("../EntityManager");
+const HintTree_1 = require("../HintTree");
 const QueryBuilder_1 = require("../QueryBuilder");
 const QueryParser_1 = require("../QueryParser");
 const keys_1 = require("../keys");
 const utils_1 = require("../utils");
 function loadDataLoader(em, meta) {
-    return em.getLoader("load", meta.type, async (_keys) => {
-        (0, keys_1.assertIdsAreTagged)(_keys);
-        const keys = (0, keys_1.deTagIds)(meta, _keys);
-        // const rows = await em.driver.load(em, meta, keys);
-        const alias = (0, QueryBuilder_1.abbreviation)(meta.tableName);
-        const query = {
-            selects: [`"${alias}".*`],
-            tables: [{ alias, join: "primary", table: meta.tableName }],
-            conditions: [{ alias, column: "id", dbType: meta.idType, cond: { kind: "in", value: keys } }],
-            orderBys: [{ alias, column: "id", order: "ASC" }],
-        };
-        (0, QueryParser_1.addTablePerClassJoinsAndClassTag)(query, meta, alias, true);
-        // Skip maybeAddOrderBy jj
-        // maybeAddNotSoftDeleted(conditions, meta, alias, "include");
-        const rows = await em.driver.executeFind(em, query, {});
-        // Pass overwriteExisting (which is the default anyway) because it might be EntityManager.refresh calling us.
-        const entities = rows.map((row) => em.hydrate(meta.cstr, row, { overwriteExisting: true }));
-        const entitiesById = (0, utils_1.indexBy)(entities, (e) => e.idTagged);
+    // Batch different populate hints together and defer to the hint tree to do the right thing
+    return em.getLoader("load", meta.type, async (loads) => {
+        let entities;
+        const { preloader } = (0, EntityManager_1.getEmInternalApi)(em);
+        if (preloader) {
+            const rootTree = (0, HintTree_1.buildHintTree)(loads);
+            entities = await preloader.preloadLoad(em, meta, rootTree);
+        }
+        else {
+            const keys = loads.map((l) => (0, keys_1.keyToNumber)(meta, l.entity));
+            const alias = (0, QueryBuilder_1.abbreviation)(meta.tableName);
+            const query = {
+                selects: [`"${alias}".*`],
+                tables: [{ alias, join: "primary", table: meta.tableName }],
+                conditions: [{ alias, column: "id", dbType: meta.idType, cond: { kind: "in", value: keys } }],
+                orderBys: [{ alias, column: "id", order: "ASC" }],
+            };
+            (0, QueryParser_1.addTablePerClassJoinsAndClassTag)(query, meta, alias, true);
+            // Skip maybeAddOrderBy?
+            // maybeAddNotSoftDeleted(conditions, meta, alias, "include");
+            const rows = await em.driver.executeFind(em, query, {});
+            // Pass overwriteExisting (which is the default anyway) because it might be EntityManager.refresh calling us.
+            entities = rows.map((row) => em.hydrate(meta.cstr, row, { overwriteExisting: true }));
+        }
         // Return the results back in the same order as the keys
-        return _keys.map((k) => {
-            const entity = entitiesById.get(k);
+        const entitiesById = (0, utils_1.indexBy)(entities, (e) => e.idTagged);
+        return loads.map(({ entity: id }) => {
+            const entity = entitiesById.get(id);
             // We generally expect all of our entities to be found, but they may not for API calls like
             // `findOneOrFail` or for `EntityManager.refresh` when the entity has been deleted out from
             // under us.
             if (entity === undefined) {
-                const existingEntity = em.findExistingInstance(k);
+                const existingEntity = em.findExistingInstance(id);
                 if (existingEntity) {
                     existingEntity.__orm.deleted = "deleted";
                 }

package/build/src/dataloaders/loadDataLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadDataLoader.js","sourceRoot":"","sources":["../../../src/dataloaders/loadDataLoader.ts"],"names":[],"mappings":";;;AAIA,kDAA+C;AAC/C,gDAAmF;AACnF,kCAAuD;AACvD,oCAAmC;AAEnC,SAAgB,cAAc,CAC5B,EAAiB,EACjB,IAAuB;IAEvB,OAAO,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACrD,IAAA,yBAAkB,EAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEnC,qDAAqD;QAErD,MAAM,KAAK,GAAG,IAAA,2BAAY,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAoB;YAC7B,OAAO,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC;YACzB,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3D,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;YAC7F,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;SAClD,CAAC;QAEF,IAAA,8CAAgC,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC3D,0BAA0B;QAC1B,8DAA8D;QAE9D,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAExD,6GAA6G;QAC7G,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC5F,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAS,CAAC,CAAC;QAE3D,wDAAwD;QACxD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACrB,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACnC,2FAA2F;YAC3F,2FAA2F;YAC3F,YAAY;YACZ,IAAI,MAAM,KAAK,SAAS,EAAE;gBACxB,MAAM,cAAc,GAAG,EAAE,CAAC,oBAAoB,CAAI,CAAC,CAAC,CAAC;gBACrD,IAAI,cAAc,EAAE;oBAClB,cAAc,CAAC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;iBAC1C;aACF;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA3CD,wCA2CC"}
+{"version":3,"file":"loadDataLoader.js","sourceRoot":"","sources":["../../../src/dataloaders/loadDataLoader.ts"],"names":[],"mappings":";;;AAEA,oDAAmE;AAEnE,0CAA4C;AAC5C,kDAA+C;AAC/C,gDAAmF;AACnF,kCAAsC;AAEtC,oCAAmC;AAEnC,SAAgB,cAAc,CAC5B,EAAiB,EACjB,IAAuB;IAEvB,2FAA2F;IAC3F,OAAO,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACrD,IAAI,QAAa,CAAC;QAElB,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,gCAAgB,EAAC,EAAE,CAAC,CAAC;QAC3C,IAAI,SAAS,EAAE;YACb,MAAM,QAAQ,GAAG,IAAA,wBAAa,EAAS,KAAK,CAAC,CAAC;YAC9C,QAAQ,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;SAC5D;aAAM;YACL,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kBAAW,EAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAC3D,MAAM,KAAK,GAAG,IAAA,2BAAY,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,MAAM,KAAK,GAAoB;gBAC7B,OAAO,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC;gBACzB,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC3D,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;gBAC7F,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aAClD,CAAC;YACF,IAAA,8CAAgC,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAC3D,wBAAwB;YACxB,8DAA8D;YAC9D,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACxD,6GAA6G;YAC7G,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;SACvF;QAED,wDAAwD;QACxD,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAS,CAAC,CAAC;QAC3D,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE;YAClC,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpC,2FAA2F;YAC3F,2FAA2F;YAC3F,YAAY;YACZ,IAAI,MAAM,KAAK,SAAS,EAAE;gBACxB,MAAM,cAAc,GAAG,EAAE,CAAC,oBAAoB,CAAI,EAAE,CAAC,CAAC;gBACtD,IAAI,cAAc,EAAE;oBAClB,cAAc,CAAC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;iBAC1C;aACF;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA7CD,wCA6CC"}