joist-orm 1.114.0 → 1.115.0

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":";;;AAEA,qDAA4D;AAC5D,mDAAoD;AAEpD;;;;;;GAMG;AACH,MAAa,gBAAgB;IAC3B,oFAAoF;IAC5E,qBAAqB,GAAoC,IAAI,GAAG,EAAE,CAAC;IAE3E;;;;;;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,GAAG,CAAC,MAAM,CAAC,CAAC;aACjC;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,iFAAiF;gBACjF,iFAAiF;gBACjF,+EAA+E;gBAC/E,sCAAsC;gBACtC,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC1B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;iBACxB;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,GAAG,CAAC,MAAM,CAAC,CAAC;SACjC;IACH,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,CAAC;gBAC1B,OAAO,CAAC,KAAK,EAAE,CAAC;gBAChB,qFAAqF;gBACrF,8FAA8F;gBAC9F,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oBACnB,WAAW,GAAG,IAAI,CAAC;iBACpB;gBACD,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,IAAI,GAAG,EAAE,CAAC;YACpB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;SAC7C;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AA9GD,4CA8GC"}
+{"version":3,"file":"ReactionsManager.js","sourceRoot":"","sources":["../../src/ReactionsManager.ts"],"names":[],"mappings":"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"}

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"}

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

@@ -0,0 +1,12 @@
+import DataLoader from "dataloader";
+import { Entity } from "../Entity";
+import { EntityMetadata } from "../EntityMetadata";
+import { EntityManager } from "../index";
+import { LoadHint } from "../loadHints";
+export declare function populateDataLoader(em: EntityManager, meta: EntityMetadata<any>, hint: LoadHint<any>, mode: "preload" | "intermixed", opts?: {
+    forceReload?: boolean;
+}): DataLoader<{
+    entity: Entity;
+    hint: LoadHint<any>;
+}, any>;
+//# sourceMappingURL=populateDataLoader.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"populateDataLoader.d.ts","sourceRoot":"","sources":["../../../src/dataloaders/populateDataLoader.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,cAAc,EAAS,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAgE,MAAM,UAAU,CAAC;AACvG,OAAO,EAAE,QAAQ,EAAkB,MAAM,cAAc,CAAC;AAKxD,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,EACzB,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,EACnB,IAAI,EAAE,SAAS,GAAG,YAAY,EAC9B,IAAI,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACnC,UAAU,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;CAAE,EAAE,GAAG,CAAC,CAiH1D"}

package/build/src/dataloaders/populateDataLoader.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.populateDataLoader = void 0;
+const HintTree_1 = require("../HintTree");
+const index_1 = require("../index");
+const hasPersistedAsyncProperty_1 = require("../relations/hasPersistedAsyncProperty");
+const utils_1 = require("../utils");
+function populateDataLoader(em, meta, hint, mode, opts = {}) {
+    // For batching populates, we want different levels of course-ness:
+    // - preloading populates that are only SQL should be batched together as much as possible, but
+    // - intermixed populates (some with custom relations) should be batched as separately as possible
+    //   (while still batching identical populates together) to reduce the chance of promise deadlocks.
+    //
+    // I.e. if we know this is a sql-only hint, we can batch all loads for a given entity
+    // together do leverage join-based preloading.
+    //
+    // However, intermixed batches can be prone to promise deadlocking (one relation .load getting
+    // stuck in a batch that is asking for its own dependencies to load), so if this is an intermixed
+    // hint, then use a batch key that includes the hint itself, which will make it unlikely
+    // for non-sql relations to deadlock on each other/themselves.
+    const batchKey = mode === "preload"
+        ? `${meta.tagName}:${opts.forceReload}`
+        : `${meta.tagName}:${JSON.stringify(hint)}:${opts.forceReload}`;
+    return em.getLoader("populate", batchKey, async (populates) => {
+        async function populateLayer(layerMeta, layerNode) {
+            // Skip join-based preloading if nothing in this layer needs loading. If any entity in the list
+            // needs loading, just load everything
+            const { preloader } = (0, index_1.getEmInternalApi)(em);
+            // We may not have a layerMeta if we're going through non-field properties
+            if (preloader && layerMeta) {
+                const preloadThisLayer = Object.entries(layerNode.subHints).some(([key, hint]) => {
+                    return [...hint.entities].some((entity) => !!entity[key] && !entity[key].isLoaded && !entity[key].isPreloaded);
+                });
+                if (preloadThisLayer) {
+                    await preloader.preloadPopulate(em, layerMeta, layerNode);
+                }
+            }
+            // One breadth-width pass (only 1 level deep, our 2nd pass recurses) to ensure each relation is loaded
+            const loadPromises = Object.entries(layerNode.subHints).flatMap(([key, tree]) => {
+                return [...tree.entities].map((entity) => {
+                    const relation = entity[key];
+                    if (!relation || typeof relation.load !== "function") {
+                        throw new Error(`Invalid load hint '${key}' on ${entity}`);
+                    }
+                    // If we're populating a hasPersistedAsyncProperty, don't bother loading it
+                    // if it's already been calculated (i.e. we have no reason to believe its value
+                    // is stale, so we should avoid pulling all of its data into memory).
+                    // _Unless_ the ReactionsManager has noticed a change that might have invalidated it.
+                    if ((relation instanceof hasPersistedAsyncProperty_1.PersistedAsyncPropertyImpl || relation instanceof index_1.PersistedAsyncReferenceImpl) &&
+                        relation.isSet &&
+                        !(0, index_1.getEmInternalApi)(em).rm.isMaybePendingRecalc(entity, key))
+                        return;
+                    if (relation.isLoaded && !opts.forceReload)
+                        return undefined;
+                    // Avoid creating a promise for preloaded relations
+                    if (relation.isPreloaded) {
+                        relation.preload();
+                        return undefined;
+                    }
+                    return relation.load(opts);
+                });
+            });
+            // 2nd breadth-width pass to do nested load hints, this will fan out at the sibling level.
+            // i.e. populateLayer(...reviews...) & populateLayer(...comments...)
+            return Promise.all(loadPromises).then(() => {
+                // Each of these keys will be fanning out to a new entity, like book -> reviews or book -> comments
+                const nestedLoadPromises = Object.entries(layerNode.subHints).map(([key, tree]) => {
+                    if (Object.keys(tree.subHints).length === 0)
+                        return;
+                    // Get the children we found, i.e. [a1, a2, a3] -> all of their books
+                    const childrenByParent = new Map([...tree.entities].map((entity) => [entity, (0, utils_1.toArray)(getEvenDeleted(entity[key]))]));
+                    if (childrenByParent.size === 0)
+                        return;
+                    // Rewrite our node.entities to be the next layer of children, i.e. children will be all books, for all of
+                    // `[a1, a2, a3]`, but only the books of `a2` need to recurse into `book: reviews` and only the books of
+                    // `a3` need to recurse into `book: comments`, so swap `node.entities` (which is currently authors)
+                    // with the books. This is what prevents our dataloader-merged TreeHint from over-fetching and loading
+                    // the superset load hint for all entities.
+                    function rewrite(node) {
+                        node.entities = new Set(Array.from(node.entities).flatMap((entity) => childrenByParent.get(entity) ?? []));
+                        Object.values(node.subHints).forEach((node) => rewrite(node));
+                    }
+                    rewrite(tree);
+                    const nextMeta = layerMeta?.allFields[key]?.otherMetadata?.();
+                    return populateLayer(nextMeta, tree);
+                });
+                return Promise.all(nestedLoadPromises);
+            });
+        }
+        return populateLayer(meta, (0, HintTree_1.buildHintTree)(populates)).then(() => populates);
+    }, 
+    // We always disable caching, because during a UoW, having called `populate(author, nestedHint1)`
+    // once doesn't mean that, on the 2nd call to `populate(author, nestedHint1)`, we can completely
+    // skip it b/c author's relations may have been changed/mutated to different not-yet-loaded
+    // entities.
+    //
+    // Even though having `{ cache: false }` looks weird here, i.e. why use dataloader at all?, it
+    // still helps us fan-in resolvers callers that are happening ~simultaneously into the same
+    // effort.
+    { cache: false });
+}
+exports.populateDataLoader = populateDataLoader;
+/** Probes `relation` to see if it's a m2o/o2m/m2m relation that supports `getWithDeleted`, otherwise calls `get`. */
+function getEvenDeleted(relation) {
+    return "getWithDeleted" in relation ? relation.getWithDeleted : relation.get;
+}
+//# sourceMappingURL=populateDataLoader.js.map

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

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

package/build/src/drivers/buildKnexQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildKnexQuery.d.ts","sourceRoot":"","sources":["../../../src/drivers/buildKnexQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAA2C,eAAe,EAAe,MAAM,gBAAgB,CAAC;AAGvG,OAAO,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;AAExC;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5C,YAAY,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CA2D7B"}
+{"version":3,"file":"buildKnexQuery.d.ts","sourceRoot":"","sources":["../../../src/drivers/buildKnexQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAA2C,eAAe,EAAe,MAAM,gBAAgB,CAAC;AAGvG,OAAO,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;AAExC;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5C,YAAY,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CA+D7B"}

package/build/src/drivers/buildKnexQuery.js

@@ -40,6 +40,9 @@ function buildKnexQuery(knex, parsed, settings) {
                 (0, utils_1.assertNever)(t);
         }
     });
+    if (parsed.lateralJoins) {
+        query.joinRaw(parsed.lateralJoins.joins.join("\n"), parsed.lateralJoins.bindings);
+    }
     parsed.conditions.forEach((c) => {
         addColumnCondition(knex, query, c);
     });

package/build/src/drivers/buildKnexQuery.js.map

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

package/build/src/index.d.ts

@@ -8,31 +8,36 @@ export declare const testing: {
     isAllSqlPaths: typeof isAllSqlPaths;
 };
 export { newPgConnectionConfig } from "joist-utils";
+export { AliasAssigner } from "./AliasAssigner";
 export * from "./Aliases";
 export { BaseEntity } from "./BaseEntity";
-export * from "./changes";
-export { ConfigApi, EntityHook } from "./config";
-export { DeepPartialOrNull } from "./createOrUpdatePartial";
-export * from "./drivers";
 export { Entity, EntityOrmField, isEntity } from "./Entity";
 export * from "./EntityFilter";
 export * from "./EntityGraphQLFilter";
 export * from "./EntityManager";
 export * from "./EntityMetadata";
 export { EnumMetadata } from "./EnumMetadata";
+export { EntityOrId, HintNode } from "./HintTree";
+export * from "./QueryBuilder";
+export * from "./QueryParser";
+export * from "./changes";
+export { ConfigApi, EntityHook } from "./config";
+export { DeepPartialOrNull } from "./createOrUpdatePartial";
+export * from "./drivers";
 export * from "./getProperties";
 export * from "./keys";
-export { assertLoaded, DeepNew, ensureLoaded, isLoaded, isNew, Loadable, Loaded, LoadHint, MarkLoaded, maybePopulateThen, New, RelationsIn, } from "./loadHints";
+export { kq, kqDot, kqStar } from "./keywords";
+export { DeepNew, LoadHint, Loadable, Loaded, MarkLoaded, NestedLoadHint, New, RelationsIn, assertLoaded, ensureLoaded, isLoaded, isNew, maybePopulateThen, } from "./loadHints";
 export * from "./loadLens";
 export * from "./newTestInstance";
-export * from "./QueryBuilder";
-export * from "./QueryParser";
+export { deepNormalizeHint, normalizeHint } from "./normalizeHints";
+export { PreloadPlugin } from "./plugins/PreloadPlugin";
 export { Reactable, Reacted, ReactiveHint, reverseReactiveHint } from "./reactiveHints";
 export * from "./relations";
-export { cannotBeUpdated, GenericError, maxValueRule, minValueRule, newRequiredRule, rangeValueRule, ValidationError, ValidationErrors, ValidationRule, ValidationRuleResult, } from "./rules";
+export { GenericError, ValidationError, ValidationErrors, ValidationRule, ValidationRuleResult, cannotBeUpdated, maxValueRule, minValueRule, newRequiredRule, rangeValueRule, } from "./rules";
 export * from "./serde";
-export { asNew, cleanStringValue, fail } from "./utils";
-export { ensureWithLoaded, withLoaded, WithLoaded } from "./withLoaded";
+export { asNew, assertNever, cleanStringValue, fail, indexBy } from "./utils";
+export { WithLoaded, ensureWithLoaded, withLoaded } from "./withLoaded";
 interface Flavoring<FlavorT> {
     _type?: FlavorT;
 }
@@ -67,6 +72,7 @@ export declare function getRequiredKeys<T extends Entity>(type: EntityConstructo
 export declare function configureMetadata(metas: EntityMetadata<any>[]): void;
 export declare function getEm(entity: Entity): EntityManager<any>;
 export declare function getRelations(entity: Entity): AbstractRelationImpl<any>[];
+export declare function getRelationEntries(entity: Entity): [string, AbstractRelationImpl<any>][];
 export declare function getConstructorFromTaggedId(id: string): MaybeAbstractEntityConstructor<any>;
 export declare function maybeGetConstructorFromReference(value: string | Entity | Reference<any, any, any> | undefined): MaybeAbstractEntityConstructor<any> | undefined;
 /** Casts a "maybe abstract" cstr to a concrete cstr when the calling code knows it's safe. */

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

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

package/build/src/index.js

@@ -14,14 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asConcreteCstr = exports.maybeGetConstructorFromReference = exports.getConstructorFromTaggedId = exports.getRelations = exports.getEm = exports.configureMetadata = exports.getRequiredKeys = exports.ensureNotDeleted = exports.setOpts = exports.setField = exports.withLoaded = exports.ensureWithLoaded = exports.fail = exports.cleanStringValue = exports.asNew = exports.ValidationErrors = exports.rangeValueRule = exports.newRequiredRule = exports.minValueRule = exports.maxValueRule = exports.cannotBeUpdated = exports.reverseReactiveHint = exports.maybePopulateThen = exports.isNew = exports.isLoaded = exports.ensureLoaded = exports.assertLoaded = exports.isEntity = exports.EntityOrmField = exports.ConfigApi = exports.BaseEntity = exports.newPgConnectionConfig = exports.testing = void 0;
+exports.asConcreteCstr = exports.maybeGetConstructorFromReference = exports.getConstructorFromTaggedId = exports.getRelationEntries = exports.getRelations = exports.getEm = exports.configureMetadata = exports.getRequiredKeys = exports.ensureNotDeleted = exports.setOpts = exports.setField = exports.withLoaded = exports.ensureWithLoaded = exports.indexBy = exports.fail = exports.cleanStringValue = exports.assertNever = exports.asNew = exports.rangeValueRule = exports.newRequiredRule = exports.minValueRule = exports.maxValueRule = exports.cannotBeUpdated = exports.ValidationErrors = exports.reverseReactiveHint = exports.normalizeHint = exports.deepNormalizeHint = exports.maybePopulateThen = exports.isNew = exports.isLoaded = exports.ensureLoaded = exports.assertLoaded = exports.kqStar = exports.kqDot = exports.kq = exports.ConfigApi = exports.isEntity = exports.EntityOrmField = exports.BaseEntity = exports.AliasAssigner = exports.newPgConnectionConfig = exports.testing = void 0;
 const Entity_1 = require("./Entity");
 const EntityManager_1 = require("./EntityManager");
 const EntityMetadata_1 = require("./EntityMetadata");
 const getProperties_1 = require("./getProperties");
 const keys_1 = require("./keys");
 const loadLens_1 = require("./loadLens");
-const QueryBuilder_1 = require("./QueryBuilder");
 const reactiveHints_1 = require("./reactiveHints");
 const AbstractRelationImpl_1 = require("./relations/AbstractRelationImpl");
 const rules_1 = require("./rules");
@@ -29,13 +28,11 @@ const utils_1 = require("./utils");
 exports.testing = { isAllSqlPaths: loadLens_1.isAllSqlPaths };
 var joist_utils_1 = require("joist-utils");
 Object.defineProperty(exports, "newPgConnectionConfig", { enumerable: true, get: function () { return joist_utils_1.newPgConnectionConfig; } });
+var AliasAssigner_1 = require("./AliasAssigner");
+Object.defineProperty(exports, "AliasAssigner", { enumerable: true, get: function () { return AliasAssigner_1.AliasAssigner; } });
 __exportStar(require("./Aliases"), exports);
 var BaseEntity_1 = require("./BaseEntity");
 Object.defineProperty(exports, "BaseEntity", { enumerable: true, get: function () { return BaseEntity_1.BaseEntity; } });
-__exportStar(require("./changes"), exports);
-var config_1 = require("./config");
-Object.defineProperty(exports, "ConfigApi", { enumerable: true, get: function () { return config_1.ConfigApi; } });
-__exportStar(require("./drivers"), exports);
 var Entity_2 = require("./Entity");
 Object.defineProperty(exports, "EntityOrmField", { enumerable: true, get: function () { return Entity_2.EntityOrmField; } });
 Object.defineProperty(exports, "isEntity", { enumerable: true, get: function () { return Entity_2.isEntity; } });
@@ -43,8 +40,18 @@ __exportStar(require("./EntityFilter"), exports);
 __exportStar(require("./EntityGraphQLFilter"), exports);
 __exportStar(require("./EntityManager"), exports);
 __exportStar(require("./EntityMetadata"), exports);
+__exportStar(require("./QueryBuilder"), exports);
+__exportStar(require("./QueryParser"), exports);
+__exportStar(require("./changes"), exports);
+var config_1 = require("./config");
+Object.defineProperty(exports, "ConfigApi", { enumerable: true, get: function () { return config_1.ConfigApi; } });
+__exportStar(require("./drivers"), exports);
 __exportStar(require("./getProperties"), exports);
 __exportStar(require("./keys"), exports);
+var keywords_1 = require("./keywords");
+Object.defineProperty(exports, "kq", { enumerable: true, get: function () { return keywords_1.kq; } });
+Object.defineProperty(exports, "kqDot", { enumerable: true, get: function () { return keywords_1.kqDot; } });
+Object.defineProperty(exports, "kqStar", { enumerable: true, get: function () { return keywords_1.kqStar; } });
 var loadHints_1 = require("./loadHints");
 Object.defineProperty(exports, "assertLoaded", { enumerable: true, get: function () { return loadHints_1.assertLoaded; } });
 Object.defineProperty(exports, "ensureLoaded", { enumerable: true, get: function () { return loadHints_1.ensureLoaded; } });
@@ -53,23 +60,26 @@ Object.defineProperty(exports, "isNew", { enumerable: true, get: function () { r
 Object.defineProperty(exports, "maybePopulateThen", { enumerable: true, get: function () { return loadHints_1.maybePopulateThen; } });
 __exportStar(require("./loadLens"), exports);
 __exportStar(require("./newTestInstance"), exports);
-__exportStar(require("./QueryBuilder"), exports);
-__exportStar(require("./QueryParser"), exports);
+var normalizeHints_1 = require("./normalizeHints");
+Object.defineProperty(exports, "deepNormalizeHint", { enumerable: true, get: function () { return normalizeHints_1.deepNormalizeHint; } });
+Object.defineProperty(exports, "normalizeHint", { enumerable: true, get: function () { return normalizeHints_1.normalizeHint; } });
 var reactiveHints_2 = require("./reactiveHints");
 Object.defineProperty(exports, "reverseReactiveHint", { enumerable: true, get: function () { return reactiveHints_2.reverseReactiveHint; } });
 __exportStar(require("./relations"), exports);
 var rules_2 = require("./rules");
+Object.defineProperty(exports, "ValidationErrors", { enumerable: true, get: function () { return rules_2.ValidationErrors; } });
 Object.defineProperty(exports, "cannotBeUpdated", { enumerable: true, get: function () { return rules_2.cannotBeUpdated; } });
 Object.defineProperty(exports, "maxValueRule", { enumerable: true, get: function () { return rules_2.maxValueRule; } });
 Object.defineProperty(exports, "minValueRule", { enumerable: true, get: function () { return rules_2.minValueRule; } });
 Object.defineProperty(exports, "newRequiredRule", { enumerable: true, get: function () { return rules_2.newRequiredRule; } });
 Object.defineProperty(exports, "rangeValueRule", { enumerable: true, get: function () { return rules_2.rangeValueRule; } });
-Object.defineProperty(exports, "ValidationErrors", { enumerable: true, get: function () { return rules_2.ValidationErrors; } });
 __exportStar(require("./serde"), exports);
 var utils_2 = require("./utils");
 Object.defineProperty(exports, "asNew", { enumerable: true, get: function () { return utils_2.asNew; } });
+Object.defineProperty(exports, "assertNever", { enumerable: true, get: function () { return utils_2.assertNever; } });
 Object.defineProperty(exports, "cleanStringValue", { enumerable: true, get: function () { return utils_2.cleanStringValue; } });
 Object.defineProperty(exports, "fail", { enumerable: true, get: function () { return utils_2.fail; } });
+Object.defineProperty(exports, "indexBy", { enumerable: true, get: function () { return utils_2.indexBy; } });
 var withLoaded_1 = require("./withLoaded");
 Object.defineProperty(exports, "ensureWithLoaded", { enumerable: true, get: function () { return withLoaded_1.ensureWithLoaded; } });
 Object.defineProperty(exports, "withLoaded", { enumerable: true, get: function () { return withLoaded_1.withLoaded; } });
@@ -247,7 +257,6 @@ function configureMetadata(metas) {
     }, {});
     // Setup subTypes/baseTypes
     metas.forEach((m) => {
-        const abbr = `${(0, QueryBuilder_1.abbreviation)(m.tableName)}0`;
         // This is basically m.fields.mapValues to assign the primary alias
         m.allFields = Object.fromEntries(Object.entries(m.fields).map(([name, field]) => [name, { ...field, aliasSuffix: "" }]));
         // Only supporting one level of inheritance for now, ideally would loop `while current !== null`
@@ -317,6 +326,10 @@ function getRelations(entity) {
     return Object.values(entity).filter((v) => v instanceof AbstractRelationImpl_1.AbstractRelationImpl);
 }
 exports.getRelations = getRelations;
+function getRelationEntries(entity) {
+    return Object.entries(entity).filter(([_, v]) => v instanceof AbstractRelationImpl_1.AbstractRelationImpl);
+}
+exports.getRelationEntries = getRelationEntries;
 function getConstructorFromTaggedId(id) {
     const tag = (0, keys_1.tagFromId)(id);
     return tagToConstructorMap.get(tag) ?? (0, utils_1.fail)(`Unknown tag: "${tag}" `);