joist-orm 0.1.536 → 1.0.0

package/build/{collections → src/relations}/ManyToOneReference.js

@@ -1,10 +1,24 @@
 "use strict";
+var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ManyToOneReference = void 0;
+exports.ManyToOneReferenceImpl = exports.isManyToOneReference = exports.hasOne = void 0;
 const EntityManager_1 = require("../EntityManager");
 const index_1 = require("../index");
 const AbstractRelationImpl_1 = require("./AbstractRelationImpl");
 const OneToManyCollection_1 = require("./OneToManyCollection");
+const Reference_1 = require("./Reference");
+const Relation_1 = require("./Relation");
+/** An alias for creating `ManyToOneReference`s. */
+function hasOne(otherMeta, fieldName, otherFieldName) {
+    const entity = EntityManager_1.currentlyInstantiatingEntity;
+    return new ManyToOneReferenceImpl(entity, otherMeta, fieldName, otherFieldName);
+}
+exports.hasOne = hasOne;
+/** Type guard utility for determining if an entity field is a ManyToOneReference. */
+function isManyToOneReference(maybeReference) {
+    return maybeReference instanceof ManyToOneReferenceImpl;
+}
+exports.isManyToOneReference = isManyToOneReference;
 /**
  * Manages a foreign key from one entity to another, i.e. `Book.author --> Author`.
  *
@@ -13,28 +27,34 @@ const OneToManyCollection_1 = require("./OneToManyCollection");
  * `Author` that the user has set.
  *
  * Note that if our `images.author_id` column is unique, this `ManyToOneReference` will essentially
- * be half of a one-to-one relationship, but we'll keep using this reference on the "owning"
- * side; the other side, i.e. `Author.image` will use a `OneToOneReference` to point back to us.
+ * be half of a one-to-one relationship, but we'll keep using this `ManyToOneReference` on the "many"
+ * side, and the other side, i.e. `Author.image` will use a `OneToOneReference` to point back to us.
  */
-class ManyToOneReference extends AbstractRelationImpl_1.AbstractRelationImpl {
+class ManyToOneReferenceImpl extends AbstractRelationImpl_1.AbstractRelationImpl {
     constructor(entity, otherMeta, fieldName, otherFieldName) {
         super();
         this.entity = entity;
         this.otherMeta = otherMeta;
         this.fieldName = fieldName;
         this.otherFieldName = otherFieldName;
-        // We need a separate boolean to b/c loaded == undefined can still mean "isLoaded" for nullable fks.
-        this.isLoaded = false;
+        // We need a separate boolean to b/c loaded == undefined can still mean "_isLoaded" for nullable fks.
+        this._isLoaded = false;
+        this[_a] = null;
+        this[_b] = null;
+        this[_c] = null;
         this.isCascadeDelete = otherMeta.config.__data.cascadeDeleteFields.includes(fieldName);
     }
     async load(opts) {
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
+        if (this._isLoaded && this.loaded) {
+            return this.loaded;
+        }
         const current = this.current();
         // Resolve the id to an entity
-        if (!EntityManager_1.isEntity(current) && current !== undefined) {
-            this.loaded = (await index_1.getEm(this.entity).load(this.otherMeta.cstr, current));
+        if (!(0, EntityManager_1.isEntity)(current) && current !== undefined) {
+            this.loaded = (await this.entity.em.load(this.otherMeta.cstr, current));
         }
-        this.isLoaded = true;
+        this._isLoaded = true;
         return this.filterDeleted(this.loaded, opts);
     }
     set(other) {
@@ -43,17 +63,20 @@ class ManyToOneReference extends AbstractRelationImpl_1.AbstractRelationImpl {
     get isSet() {
         return this.current() !== undefined;
     }
+    get isLoaded() {
+        return this._isLoaded;
+    }
     doGet(opts) {
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
         // This should only be callable in the type system if we've already resolved this to an instance,
         // but, just in case we somehow got here in an unloaded state, check to see if we're already in the UoW
-        if (!this.isLoaded) {
-            const existing = this.maybeFindExisting();
+        if (!this._isLoaded) {
+            const existing = this.maybeFindEntity();
             if (existing === undefined) {
                 throw new Error(`${this.entity}.${this.fieldName} was not loaded`);
             }
             this.loaded = existing;
-            this.isLoaded = true;
+            this._isLoaded = true;
         }
         return this.filterDeleted(this.loaded, opts);
     }
@@ -64,18 +87,30 @@ class ManyToOneReference extends AbstractRelationImpl_1.AbstractRelationImpl {
         return this.doGet({ withDeleted: false });
     }
     get id() {
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
-        return index_1.maybeResolveReferenceToId(this.current());
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
+        return (0, index_1.maybeResolveReferenceToId)(this.current());
+    }
+    set id(id) {
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
+        const previous = this.maybeFindEntity();
+        const changed = (0, index_1.setField)(this.entity, this.fieldName, id);
+        if (!changed) {
+            return;
+        }
+        this.loaded = id ? this.entity.em.getEntity(id) : undefined;
+        this._isLoaded = !!this.loaded;
+        this.maybeRemove(previous);
+        this.maybeAdd(this.maybeFindEntity());
     }
     get idOrFail() {
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
-        return this.id || index_1.fail("Reference is unset or assigned to a new entity");
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
+        return this.id || (0, index_1.fail)("Reference is unset or assigned to a new entity");
     }
     get idUntagged() {
-        return this.id && index_1.deTagIds(this.otherMeta, [this.id])[0];
+        return this.id && (0, index_1.deTagIds)(this.otherMeta, [this.id])[0];
     }
     get idUntaggedOrFail() {
-        return this.idUntagged || index_1.fail("Reference is unset or assigned to a new entity");
+        return this.idUntagged || (0, index_1.fail)("Reference is unset or assigned to a new entity");
     }
     // private impl
     setFromOpts(other) {
@@ -83,74 +118,86 @@ class ManyToOneReference extends AbstractRelationImpl_1.AbstractRelationImpl {
     }
     initializeForNewEntity() {
         // Our codegen'd Opts type will ensure our field is inititalized if necessary/notNull
-        this.isLoaded = true;
+        this._isLoaded = true;
     }
     async refreshIfLoaded() {
         // TODO We should remember what load hints have been applied to this collection and re-apply them.
-        if (this.isLoaded) {
+        if (this._isLoaded) {
             const current = this.current();
             if (typeof current === "string") {
-                this.loaded = (await index_1.getEm(this.entity).load(this.otherMeta.cstr, current));
+                this.loaded = (await this.entity.em.load(this.otherMeta.cstr, current));
             }
             else {
                 this.loaded = current;
             }
         }
     }
-    onEntityDelete() {
+    maybeCascadeDelete() {
         if (this.isCascadeDelete) {
             const current = this.current({ withDeleted: true });
             if (current !== undefined && typeof current !== "string") {
-                index_1.getEm(this.entity).delete(current);
+                this.entity.em.delete(current);
             }
         }
     }
-    async onEntityDeletedAndFlushing() {
+    async cleanupOnEntityDeleted() {
         const current = await this.load({ withDeleted: true });
         if (current !== undefined) {
             const o2m = this.getOtherRelation(current);
             if (o2m instanceof OneToManyCollection_1.OneToManyCollection) {
                 o2m.remove(this.entity, { requireLoaded: false });
             }
-            else {
+            else if (o2m instanceof index_1.OneToManyLargeCollection) {
+                o2m.remove(this.entity);
+            }
+            else if (o2m instanceof index_1.OneToOneReferenceImpl) {
                 o2m.set(undefined);
             }
+            else {
+                throw new Error(`Unhandled ${o2m}`);
+            }
         }
-        index_1.setField(this.entity, this.fieldName, undefined);
+        (0, index_1.setField)(this.entity, this.fieldName, undefined);
         this.loaded = undefined;
-        this.isLoaded = true;
+        this._isLoaded = true;
     }
     // Internal method used by OneToManyCollection
     setImpl(other) {
-        var _a, _b;
-        if ((other === null || other === void 0 ? void 0 : other.isNewEntity) ? other === this.loaded : this.id === (other === null || other === void 0 ? void 0 : other.id)) {
+        if ((0, EntityManager_1.sameEntity)(other, this.otherMeta, this.current())) {
             return;
         }
-        // we may not be loaded yet, but our previous entity might already be in the UoW
-        const previousLoaded = (_a = this.loaded) !== null && _a !== void 0 ? _a : this.maybeFindExisting();
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
+        const previous = this.maybeFindEntity();
         // Prefer to keep the id in our data hash, but if this is a new entity w/o an id, use the entity itself
-        const changed = index_1.setField(this.entity, this.fieldName, (_b = other === null || other === void 0 ? void 0 : other.id) !== null && _b !== void 0 ? _b : other);
-        if (!changed) {
-            return;
-        }
+        (0, index_1.setField)(this.entity, this.fieldName, other?.id ?? other);
         this.loaded = other;
-        this.isLoaded = true;
-        // If had an existing value, remove us from its collection
-        if (previousLoaded) {
-            const prevRelation = this.getOtherRelation(previousLoaded);
+        this._isLoaded = true;
+        this.maybeRemove(previous);
+        this.maybeAdd(other);
+    }
+    maybeRemove(other) {
+        if (other) {
+            const prevRelation = this.getOtherRelation(other);
             if (prevRelation instanceof OneToManyCollection_1.OneToManyCollection) {
                 prevRelation.removeIfLoaded(this.entity);
             }
+            else if (prevRelation instanceof index_1.OneToManyLargeCollection) {
+                prevRelation.remove(this.entity);
+            }
             else {
                 prevRelation.set(undefined);
             }
         }
-        if (other !== undefined) {
+    }
+    maybeAdd(other) {
+        if (other) {
             const newRelation = this.getOtherRelation(other);
             if (newRelation instanceof OneToManyCollection_1.OneToManyCollection) {
                 newRelation.add(this.entity);
             }
+            else if (newRelation instanceof index_1.OneToManyLargeCollection) {
+                newRelation.add(this.entity);
+            }
             else {
                 newRelation.set(this.entity);
             }
@@ -159,7 +206,7 @@ class ManyToOneReference extends AbstractRelationImpl_1.AbstractRelationImpl {
     // We need to keep U in data[fieldName] to handle entities without an id assigned yet.
     current(opts) {
         const current = this.entity.__orm.data[this.fieldName];
-        if (current !== undefined && EntityManager_1.isEntity(current)) {
+        if (current !== undefined && (0, EntityManager_1.isEntity)(current)) {
             return this.filterDeleted(current, opts);
         }
         return current;
@@ -168,15 +215,21 @@ class ManyToOneReference extends AbstractRelationImpl_1.AbstractRelationImpl {
         return `ManyToOneReference(entity: ${this.entity}, fieldName: ${this.fieldName}, otherType: ${this.otherMeta.type}, otherFieldName: ${this.otherFieldName}, id: ${this.id})`;
     }
     filterDeleted(entity, opts) {
-        return (opts === null || opts === void 0 ? void 0 : opts.withDeleted) === true || entity === undefined || !entity.isDeletedEntity ? entity : undefined;
+        return opts?.withDeleted === true || entity === undefined || !entity.isDeletedEntity ? entity : undefined;
     }
     /** Returns the other relation that points back at us, i.e. we're `book.author_id` and this is `Author.books`. */
     getOtherRelation(other) {
         return other[this.otherFieldName];
     }
-    maybeFindExisting() {
-        return this.id !== undefined ? index_1.getEm(this.entity)["findExistingInstance"](this.id) : undefined;
+    /**
+     * Looks for an entity in `EntityManager`, b/c we may have it in memory even if
+     * our reference is not specifically loaded.
+     */
+    maybeFindEntity() {
+        // Check this.loaded first b/c a new entity won't have an id yet
+        return this.loaded ?? (this.id !== undefined ? this.entity.em.getEntity(this.id) : undefined);
     }
 }
-exports.ManyToOneReference = ManyToOneReference;
+exports.ManyToOneReferenceImpl = ManyToOneReferenceImpl;
+_a = Relation_1.RelationT, _b = Relation_1.RelationU, _c = Reference_1.ReferenceN;
 //# sourceMappingURL=ManyToOneReference.js.map

package/build/src/relations/ManyToOneReference.js.map

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

package/build/{collections → src/relations}/OneToManyCollection.d.ts

@@ -1,5 +1,8 @@
 import { Collection, Entity, EntityMetadata, IdOf } from "../index";
 import { AbstractRelationImpl } from "./AbstractRelationImpl";
+import { RelationT, RelationU } from "./Relation";
+/** An alias for creating `OneToManyCollection`s. */
+export declare function hasMany<T extends Entity, U extends Entity>(otherMeta: EntityMetadata<U>, fieldName: keyof T, otherFieldName: keyof U, otherColumnName: string): Collection<T, U>;
 export declare class OneToManyCollection<T extends Entity, U extends Entity> extends AbstractRelationImpl<U[]> implements Collection<T, U> {
     entity: T;
     otherMeta: EntityMetadata<U>;
@@ -14,6 +17,8 @@ export declare class OneToManyCollection<T extends Entity, U extends Entity> ext
         withDeleted?: boolean;
     }): Promise<readonly U[]>;
     find(id: IdOf<U>): Promise<U | undefined>;
+    includes(other: U): Promise<boolean>;
+    get isLoaded(): boolean;
     get get(): U[];
     get getWithDeleted(): U[];
     private doGet;
@@ -27,14 +32,17 @@ export declare class OneToManyCollection<T extends Entity, U extends Entity> ext
     initializeForNewEntity(): void;
     removeIfLoaded(other: U): void;
     refreshIfLoaded(): Promise<void>;
-    onEntityDelete(): void;
-    onEntityDeletedAndFlushing(): Promise<void>;
+    maybeCascadeDelete(): void;
+    cleanupOnEntityDeleted(): Promise<void>;
     private maybeAppendAddedBeforeLoaded;
     current(opts?: {
         withDeleted?: boolean;
     }): U[];
+    get meta(): EntityMetadata<T>;
     toString(): string;
     private filterDeleted;
     /** Returns the other relation that points back at us, i.e. we're `Author.image` and this is `Image.author_id`. */
     private getOtherRelation;
+    [RelationT]: T;
+    [RelationU]: U;
 }

package/build/{collections → src/relations}/OneToManyCollection.js

@@ -1,13 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OneToManyCollection = void 0;
-const dataloader_1 = __importDefault(require("dataloader"));
+exports.OneToManyCollection = exports.hasMany = void 0;
+const oneToManyDataLoader_1 = require("../dataloaders/oneToManyDataLoader");
+const oneToManyFindDataLoader_1 = require("../dataloaders/oneToManyFindDataLoader");
 const index_1 = require("../index");
 const utils_1 = require("../utils");
 const AbstractRelationImpl_1 = require("./AbstractRelationImpl");
+const Relation_1 = require("./Relation");
+/** An alias for creating `OneToManyCollection`s. */
+function hasMany(otherMeta, fieldName, otherFieldName, otherColumnName) {
+    const entity = index_1.currentlyInstantiatingEntity;
+    return new OneToManyCollection(entity, otherMeta, fieldName, otherFieldName, otherColumnName);
+}
+exports.hasMany = hasMany;
 class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
     constructor(
     // These are public to our internal implementation but not exposed in the Collection API
@@ -23,24 +29,44 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
         // groups the hydrated rows by their _current parent m2o field value_, which for a removed child will no
         // longer be us, so it will effectively not show up in our post-load `loaded` array.
         this.addedBeforeLoaded = [];
-        this.isCascadeDelete = index_1.getMetadata(entity).config.__data.cascadeDeleteFields.includes(fieldName);
+        this[_a] = null;
+        this[_b] = null;
+        this.isCascadeDelete = (0, index_1.getMetadata)(entity).config.__data.cascadeDeleteFields.includes(fieldName);
     }
     // opts is an internal parameter
     async load(opts) {
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
         if (this.loaded === undefined) {
             if (this.entity.id === undefined) {
                 this.loaded = [];
             }
             else {
-                this.loaded = await loaderForCollection(this).load(this.entity.id);
+                this.loaded = await (0, oneToManyDataLoader_1.oneToManyDataLoader)(this.entity.em, this).load(this.entity.id);
             }
             this.maybeAppendAddedBeforeLoaded();
         }
         return this.filterDeleted(this.loaded, opts);
     }
     async find(id) {
-        return (await this.load()).find((u) => u.id === id);
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
+        if (this.loaded !== undefined) {
+            return this.loaded.find((other) => other.id === id);
+        }
+        else {
+            const added = this.addedBeforeLoaded.find((u) => u.id === id);
+            if (added) {
+                return added;
+            }
+            // Make a cacheable tuple to look up this specific o2m row
+            const key = `id=${id},${this.otherColumnName}=${this.entity.idOrFail}`;
+            return (0, oneToManyFindDataLoader_1.oneToManyFindDataLoader)(this.entity.em, this).load(key);
+        }
+    }
+    async includes(other) {
+        return (0, index_1.sameEntity)(this.entity, this.meta, this.getOtherRelation(other).current());
+    }
+    get isLoaded() {
+        return this.loaded !== undefined;
     }
     get get() {
         return this.filterDeleted(this.doGet(), { withDeleted: false });
@@ -49,7 +75,7 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
         return this.filterDeleted(this.doGet(), { withDeleted: true });
     }
     doGet() {
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
         if (this.loaded === undefined) {
             if (this.entity.id === undefined) {
                 return this.addedBeforeLoaded;
@@ -62,7 +88,7 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
         return this.loaded;
     }
     set(values) {
-        index_1.ensureNotDeleted(this.entity);
+        (0, index_1.ensureNotDeleted)(this.entity);
         if (this.loaded === undefined) {
             throw new Error("set was called when not loaded");
         }
@@ -81,7 +107,7 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
         }
     }
     add(other) {
-        index_1.ensureNotDeleted(this.entity);
+        (0, index_1.ensureNotDeleted)(this.entity);
         if (this.loaded === undefined) {
             if (!this.addedBeforeLoaded.includes(other)) {
                 this.addedBeforeLoaded.push(other);
@@ -98,16 +124,16 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
     // We're not supported remove(other) because that might leave other.otherFieldName as undefined,
     // which we don't know if that's valid or not, i.e. depending on whether the field is nullable.
     remove(other, opts = { requireLoaded: true }) {
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
         if (this.loaded === undefined && opts.requireLoaded) {
             throw new Error("remove was called when not loaded");
         }
-        utils_1.remove(this.loaded || this.addedBeforeLoaded, other);
+        (0, utils_1.remove)(this.loaded || this.addedBeforeLoaded, other);
         // This will no-op and mark other dirty if necessary
         this.getOtherRelation(other).set(undefined);
     }
     removeAll() {
-        index_1.ensureNotDeleted(this.entity);
+        (0, index_1.ensureNotDeleted)(this.entity);
         if (this.loaded === undefined) {
             throw new Error("removeAll was called when not loaded");
         }
@@ -128,31 +154,29 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
     }
     removeIfLoaded(other) {
         if (this.loaded !== undefined) {
-            utils_1.remove(this.loaded, other);
+            (0, utils_1.remove)(this.loaded, other);
         }
         else {
-            utils_1.remove(this.addedBeforeLoaded, other);
+            (0, utils_1.remove)(this.addedBeforeLoaded, other);
         }
     }
     async refreshIfLoaded() {
         // TODO We should remember what load hints have been applied to this collection and re-apply them.
         if (this.loaded !== undefined && this.entity.id !== undefined) {
-            const loader = loaderForCollection(this);
-            loader.clear(this.entity.id);
-            this.loaded = await loader.load(this.entity.id);
+            this.loaded = await (0, oneToManyDataLoader_1.oneToManyDataLoader)(this.entity.em, this).load(this.entity.id);
         }
     }
-    onEntityDelete() {
+    maybeCascadeDelete() {
         if (this.isCascadeDelete) {
-            this.current({ withDeleted: true }).forEach(index_1.getEm(this.entity).delete);
+            this.current({ withDeleted: true }).forEach((e) => this.entity.em.delete(e));
         }
     }
     // We already unhooked all children in our addedBeforeLoaded list; now load the full list if necessary.
-    async onEntityDeletedAndFlushing() {
+    async cleanupOnEntityDeleted() {
         const current = await this.load({ withDeleted: true });
         current.forEach((other) => {
             const m2o = this.getOtherRelation(other);
-            if (index_1.maybeResolveReferenceToId(m2o.current()) === this.entity.id) {
+            if ((0, index_1.maybeResolveReferenceToId)(m2o.current()) === this.entity.id) {
                 // TODO What if other.otherFieldName is required/not-null?
                 m2o.set(undefined);
             }
@@ -162,7 +186,7 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
     }
     maybeAppendAddedBeforeLoaded() {
         if (this.loaded) {
-            const newEntities = this.addedBeforeLoaded.filter((e) => { var _a; return !((_a = this.loaded) === null || _a === void 0 ? void 0 : _a.includes(e)); });
+            const newEntities = this.addedBeforeLoaded.filter((e) => !this.loaded?.includes(e));
             // Push on the end to better match the db order of "newer things come last"
             for (const e of newEntities) {
                 this.loaded.push(e);
@@ -173,11 +197,14 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
     current(opts) {
         return this.filterDeleted(this.loaded || this.addedBeforeLoaded, opts);
     }
+    get meta() {
+        return (0, index_1.getMetadata)(this.entity);
+    }
     toString() {
         return `OneToManyCollection(entity: ${this.entity}, fieldName: ${this.fieldName}, otherType: ${this.otherMeta.type}, otherFieldName: ${this.otherFieldName})`;
     }
     filterDeleted(entities, opts) {
-        return (opts === null || opts === void 0 ? void 0 : opts.withDeleted) === true ? [...entities] : entities.filter((e) => !e.isDeletedEntity);
+        return opts?.withDeleted === true ? [...entities] : entities.filter((e) => !e.isDeletedEntity);
     }
     /** Returns the other relation that points back at us, i.e. we're `Author.image` and this is `Image.author_id`. */
     getOtherRelation(other) {
@@ -185,37 +212,5 @@ class OneToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
     }
 }
 exports.OneToManyCollection = OneToManyCollection;
-function loaderForCollection(collection) {
-    const em = index_1.getEm(collection.entity);
-    // The metadata for the entity that contains the collection
-    const meta = index_1.getMetadata(collection.entity);
-    const loaderName = `${meta.tableName}.${collection.fieldName}`;
-    return utils_1.getOrSet(em.__data.loaders, loaderName, () => {
-        return new dataloader_1.default(async (_keys) => {
-            const { otherMeta } = collection;
-            index_1.assertIdsAreTagged(_keys);
-            const keys = index_1.deTagIds(meta, _keys);
-            const rows = await em.knex
-                .select("*")
-                .from(otherMeta.tableName)
-                .whereIn(collection.otherColumnName, keys)
-                .orderBy("id");
-            const entities = rows.map((row) => em.hydrate(otherMeta.cstr, row, { overwriteExisting: false }));
-            // .filter((e) => !e.isDeletedEntity);
-            const rowsById = utils_1.groupBy(entities, (entity) => {
-                // TODO If this came from the UoW, it may not be an id? I.e. pre-insert.
-                const ownerId = index_1.maybeResolveReferenceToId(entity.__orm.data[collection.otherFieldName]);
-                // We almost always expect ownerId to be found, b/c normally we just hydrated this entity
-                // directly from a SQL row with owner_id=X, however we might be loading this collection
-                // (i.e. find all children where owner_id=X) when the SQL thinks a child is still pointing
-                // at the parent (i.e. owner_id=X in the db), but our already-loaded child has had its
-                // `child.owner` field either changed to some other owner, or set to undefined. In either,
-                // that child should no longer be parent of this owner's collection, so just return a
-                // dummy value.
-                return ownerId !== null && ownerId !== void 0 ? ownerId : "dummyNoLongerOwned";
-            });
-            return _keys.map((k) => rowsById.get(k) || []);
-        });
-    });
-}
+_a = Relation_1.RelationT, _b = Relation_1.RelationU;
 //# sourceMappingURL=OneToManyCollection.js.map

package/build/src/relations/OneToManyCollection.js.map

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

package/build/src/relations/OneToManyLargeCollection.d.ts

@@ -0,0 +1,25 @@
+import { Entity, EntityMetadata, IdOf } from "../EntityManager";
+import { LargeCollection } from "./LargeCollection";
+import { RelationT, RelationU } from "./Relation";
+/** An alias for creating `OneToManyLargeCollection`s. */
+export declare function hasLargeMany<T extends Entity, U extends Entity>(otherMeta: EntityMetadata<U>, fieldName: keyof T, otherFieldName: keyof U, otherColumnName: string): LargeCollection<T, U>;
+export declare class OneToManyLargeCollection<T extends Entity, U extends Entity> implements LargeCollection<T, U> {
+    entity: T;
+    otherMeta: EntityMetadata<U>;
+    fieldName: keyof T;
+    otherFieldName: keyof U;
+    otherColumnName: string;
+    private locallyAdded;
+    private locallyRemoved;
+    constructor(entity: T, otherMeta: EntityMetadata<U>, fieldName: keyof T, otherFieldName: keyof U, otherColumnName: string);
+    find(id: IdOf<U>): Promise<U | undefined>;
+    includes(other: U): Promise<boolean>;
+    add(other: U): void;
+    remove(other: U): void;
+    get meta(): EntityMetadata<T>;
+    toString(): string;
+    /** Returns the other relation that points back at us, i.e. we're `Author.image` and this is `Image.author_id`. */
+    private getOtherRelation;
+    [RelationT]: T;
+    [RelationU]: U;
+}