joist-orm 0.1.538 → 1.0.0

package/build/src/newTestInstance.js

@@ -0,0 +1,342 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTestIndex = exports.maybeNew = exports.defaultValue = exports.testIndex = exports.newTestInstance = exports.testDate = exports.jan1 = void 0;
+const is_plain_object_1 = __importDefault(require("is-plain-object"));
+const EntityManager_1 = require("./EntityManager");
+const index_1 = require("./index");
+const keys_1 = require("./keys");
+const utils_1 = require("./utils");
+// Chosen b/c it's a monday https://www.timeanddate.com/calendar/monthly.html?year=2018&month=1&country=1
+exports.jan1 = new Date(2018, 0, 1);
+exports.testDate = exports.jan1;
+/** Creates a test instance of `T`. */
+function newTestInstance(em, cstr, opts = {}) {
+    const meta = (0, EntityManager_1.getMetadata)(cstr);
+    // We share a single `use` map for a given `newEntity` factory call
+    const use = useMap(opts);
+    // Create just the primitive and m2o fields 1st, so we can create a minimal/valid
+    // instance of the entity. We'll do the o2m/other fields as a second pass.
+    const initialOpts = Object.values(meta.fields).map((field) => {
+        const { fieldName } = field;
+        // Use the opts value if they passed one in
+        if (fieldName in opts && opts[fieldName] !== defaultValueMarker) {
+            const optValue = opts[fieldName];
+            // We don't explicitly support null (callers should pass undefined), but we accept it
+            // for good measure.
+            if (optValue === null || (optValue === undefined && !field.required)) {
+                return [];
+            }
+            switch (field.kind) {
+                case "m2o":
+                    return [fieldName, resolveFactoryOpt(em, opts, field, optValue, undefined)];
+                case "o2o":
+                case "o2m":
+                case "m2m":
+                    // We do these in the 2nd pass after `entity` exists (see additionalOpts)
+                    return [];
+                case "lo2m":
+                    // If a child is passing themselves into a parent that is a large collection, just ignore it
+                    return [];
+                case "primitive":
+                case "enum":
+                case "poly":
+                case "primaryKey":
+                    // Look for strings that want to use the test index
+                    if (typeof optValue === "string" && optValue.includes(exports.testIndex)) {
+                        const actualIndex = getTestIndex(em, meta.cstr);
+                        return [fieldName, optValue.replace(exports.testIndex, String(actualIndex))];
+                    }
+                    // Otherwise just use the user's opt value as-is
+                    return [fieldName, optValue];
+                default:
+                    return (0, utils_1.assertNever)(field);
+            }
+        }
+        if (field.kind === "primitive" &&
+            (field.required || opts[fieldName] === defaultValueMarker) &&
+            !field.derived &&
+            !field.protected) {
+            const codegenDefault = cstr.defaultValues[field.fieldName];
+            return [fieldName, codegenDefault ?? defaultValueForField(field)];
+        }
+        else if (field.kind === "m2o") {
+            // If neither the user nor the factory (i.e. for an explicit "fan out" case) set this field,
+            // then look in `use` and for an "obvious" there-is-only-one default (even for optional fields)
+            const existing = getObviousDefault(em, field.otherMetadata(), opts);
+            if (existing) {
+                return [fieldName, existing];
+            }
+            // Otherwise, only make a new entity only if the field is required
+            if (field.required) {
+                return [fieldName, resolveFactoryOpt(em, opts, field, undefined, undefined)];
+            }
+        }
+        else if (field.kind === "enum" && field.required) {
+            const codegenDefault = cstr.defaultValues[field.fieldName];
+            return [fieldName, codegenDefault ?? field.enumDetailType.getValues()[0]];
+        }
+        return [];
+    });
+    const entity = em.create(meta.cstr, Object.fromEntries(initialOpts.filter((t) => t.length > 0)));
+    // If the type we just made doesn't exist in `use` yet, remember it. This works better than
+    // looking at the values in `fullOpts`, because instead of waiting until the end of the
+    // `build fullOpts` loop, we're also invoking `newTestInstance` as we go through the loop itself,
+    // creating each test instance within nested/recursive `newTestInstance` calls.
+    if (!use.has(entity.constructor)) {
+        use.set(entity.constructor, [entity, false]);
+    }
+    // Now that we've got the entity, do a 2nd pass for o2m/m2m where we pass
+    // `{ parent: entity }` down to children (i.e. to replace our original
+    // null marker approach).
+    const additionalOpts = Object.entries(opts).map(([fieldName, optValue]) => {
+        const field = meta.fields[fieldName];
+        // Check `!field` b/c `use` won't have a field
+        if (optValue === null || optValue === undefined || !field) {
+            return [];
+        }
+        if (field.kind === "o2m") {
+            // If this is a list of children, i.e. book.authors, handle partials to newTestInstance'd
+            return [fieldName, optValue.map((opt) => resolveFactoryOpt(em, opts, field, opt, entity))];
+        }
+        else if (field.kind == "m2m") {
+            return [fieldName, optValue.map((opt) => resolveFactoryOpt(em, opts, field, opt, [entity]))];
+        }
+        else if (field.kind === "o2o") {
+            // If this is an o2o, i.e. author.image, just pass the optValue (i.e. it won't be a list)
+            return [fieldName, resolveFactoryOpt(em, opts, field, optValue, entity)];
+        }
+        else {
+            return [];
+        }
+    });
+    entity.set(Object.fromEntries(additionalOpts.filter((t) => t.length > 0)));
+    return entity;
+}
+exports.newTestInstance = newTestInstance;
+/**
+ * Resolves a `FactoryEntityOpt` (i.e. maybe an existing entity, maybe an id, maybe a hash of opts) to an entity.
+ *
+ * If `opt` is `undefined`, then the usual factory semantics of "check use", "look for only one instance" are
+ * checked before finally creating a brand new entity.
+ *
+ * We also accept an optional `otherFieldName` so that, if we do create a new entity, we pass along the null
+ * marker for them to know not to create their own version of us.
+ *
+ * (This was originally intended to be a public API, but the use case ended up being handled
+ * by the more-ergonomic `maybeNew` feature; we could explore making this public if another
+ * similar use case comes up in the future.)
+ */
+function resolveFactoryOpt(em, opts, field, opt, maybeEntity) {
+    const meta = field.otherMetadata();
+    if ((0, EntityManager_1.isEntity)(opt)) {
+        return opt;
+    }
+    else if ((0, EntityManager_1.isId)(opt)) {
+        return (em.entities.find((e) => e.id === opt || getTestId(em, e) === opt) || (0, utils_1.fail)(`Did not find tagged id ${opt}`));
+    }
+    else if (opt && !(0, is_plain_object_1.default)(opt) && !(opt instanceof MaybeNew)) {
+        // If opt isn't a POJO, assume this is a completely-custom factory
+        return meta.factory(em, opt);
+    }
+    else {
+        // Look for an obvious default
+        if (opt === undefined || opt instanceof MaybeNew) {
+            const existing = getObviousDefault(em, meta, opts);
+            if (existing) {
+                return existing;
+            }
+            // Otherwise fall though to making a new entity via the factory
+        }
+        // If this is image.author (m2o) but the other-side is a o2o, pass null instead of []
+        maybeEntity ?? (maybeEntity = (field.otherMetadata().fields[field.otherFieldName].kind === "o2o" ? null : []));
+        return meta.factory(em, {
+            // Because of the `!isPlainObject` above, opt will either be undefined or an object here
+            ...applyUse(opt || {}, useMap(opts), meta),
+            ...(opt instanceof MaybeNew && opt.opts),
+            [field.otherFieldName]: maybeEntity,
+        });
+    }
+}
+/** We look for `use`-cached and "if-only-one" defaults. */
+function getObviousDefault(em, metadata, opts) {
+    // If neither the user nor the factory (i.e. for an explicit "fan out" case) set this field then look in use
+    const use = useMap(opts);
+    // ...we used to check "explicit use" vs. "implicit use" here and only use implicit values
+    // if the field was required; but in theory our "use if-only-one" heuristic was already looser
+    // that this, so it seems fine to just always check use, regardless of field required/optional.
+    //
+    // Note that we still use explicit/implicit use to know whether the user's `newAuthor` factory
+    // should have a use param passed to it, or if we should apply it here after-the-fact. (This gives
+    // `newAuthor` the opportunity to apply defaults.)
+    if (use.has(metadata.cstr)) {
+        return use.get(metadata.cstr)[0];
+    }
+    // If there is a single existing instance of this type, assume the caller is fine with that
+    const existing = em.entities.filter((e) => e instanceof metadata.cstr);
+    if (existing.length === 1) {
+        return existing[0];
+    }
+    return undefined;
+}
+// When a factory is called, i.e. `newAuthor`, opts will:
+//
+// - Have values explicitly passed by the user/other factories
+// - Have values from the user's explicit `use` parameter
+// - NOT have guessed (i.e. "only existing entity") or an implicitly-created `use` parameter
+//
+// This allows the factory to "fan out" by default, i.e. newInternalUser creating its own User
+// and Market creating its own ProductAttribute, which originally we couldn't do when
+// guessed/implicit opts were passed directly to `newAuthor`.
+//
+// Now, if the `newAuthor` factory doesn't explicitly "fan out" (by passing `user: {}` to
+// `newTestInstance`), we still "fan in" by having `newTestInstance` sneak in the guessed/implicit
+// opts of only-one-existing or factory-created instances.
+/** Given we're going to call a factory, make sure any `use`s are put into `opts`. */
+function applyUse(opts, use, metadata) {
+    // Find any unset fields
+    Object.values(metadata.fields)
+        .filter((f) => !(f.fieldName in opts))
+        .forEach((f) => {
+        // And set them to the current `use` entity for their type, if it exists
+        if (((0, index_1.isManyToOneField)(f) || (0, index_1.isOneToOneField)(f)) && use.has(f.otherMetadata().cstr)) {
+            const def = use.get(f.otherMetadata().cstr);
+            // Only pass explicit/user-defined `use` entities, so that factories can "fan out" if they want,
+            // and not see other factory-created entities look like user-specific values.
+            if (def[1]) {
+                opts[f.fieldName] = def[0];
+            }
+        }
+    });
+    // Make a copy so we don't leak `use` onto opts that tests might later use in assertions.
+    return { ...opts, use };
+}
+/**
+ * A marker value for later replacement with the test instance's "unique-ish" index.
+ *
+ * This is meant to just be a helpful identifier in fields like entity names/descriptions for
+ * debugging purposes.
+ */
+exports.testIndex = "TEST_INDEX";
+const defaultValueMarker = {};
+/**
+ * A marker value for the default `newTestInstance` behavior.
+ *
+ * Useful for passing arguments to `newTestInstance` where you sometimes want to
+ * provide a specific value, and other times ask for the "pick a default" behavior
+ * (i.e. you don't want to pass `undefined` b/c that means explicitly "leave this
+ * key unset").
+ *
+ * Note that this is a function so that we can infer the return type as basically
+ * `any` without really using `any` (which would disable type-checking in the rest
+ * of the expression).
+ */
+function defaultValue() {
+    return defaultValueMarker;
+}
+exports.defaultValue = defaultValue;
+/**
+ * Allows a factory to provide a default, i.e. for a field that would otherwise
+ * be optional, but still have that field be override by opts & use, without
+ * accidentally creating an extra entity as a side-effect.
+ *
+ * I.e.:
+ *
+ * ```typescript
+ * export function newAuthor(em: Entity, opts: FactoryOpts<Author>) {
+ *   return newTestInstance(em, Author, {
+ *     // publisher is not technically required, but make one
+ *     publisher: maybeNew<Publisher>({}),
+ *     ...opts,
+ *   });
+ * }
+ * ```
+ */
+function maybeNew(opts) {
+    // Return a marker that resolveFactoryOpt will look for
+    return new MaybeNew((opts || {}));
+}
+exports.maybeNew = maybeNew;
+class MaybeNew {
+    constructor(opts) {
+        this.opts = opts;
+    }
+}
+/**
+ * Returns a unique-ish test index for putting in `name` fields.
+ *
+ * Note that `testIndex` is easier to just include in a string, because it doesn't require passing
+ * the `EntityManger` and `type`. But if a factory really wants the test index as a number, they can
+ * call this method.
+ *
+ * Despite the name, these are 1-based, i.e. the first `Author` is `a1`.
+ */
+function getTestIndex(em, type) {
+    const existing = em.entities.filter((e) => e instanceof type);
+    return existing.length + 1;
+}
+exports.getTestIndex = getTestIndex;
+/** Fakes a probably-right id for un-persisted entities. Solely used for quick lookups in tests/factories. */
+function getTestId(em, entity) {
+    const meta = (0, EntityManager_1.getMetadata)(entity);
+    const sameType = em.entities.filter((e) => e instanceof meta.cstr);
+    return (0, keys_1.tagId)(meta, String(sameType.indexOf(entity) + 1));
+}
+function defaultValueForField(field) {
+    switch (field.type) {
+        case "string":
+            return field.fieldName;
+        case "number":
+            return 0;
+        case "Date":
+            return exports.testDate;
+        case "boolean":
+            return false;
+    }
+    return null;
+}
+// Do a one-time conversion of the user's `use` array into a map for internal use
+function useMap(opts) {
+    const use = opts.use;
+    let map;
+    if (use instanceof Map) {
+        // it's already a map
+        map = use;
+    }
+    else {
+        map = new Map();
+        if (use instanceof Array) {
+            // it's a top-level `newAuthor` with a user-passed `use: array`
+            use.forEach((e) => map.set(e.constructor, [e, true]));
+        }
+        else if (use) {
+            // it's a top-level `newAuthor` w/o a `use: entity` param
+            map.set(use.constructor, [use, true]);
+        }
+        // Scan opts for entities to implicitly add to the map, i.e. if the user
+        // calls `newAuthor(em, { book: b1 })`, we'll use `b1` for any other books we
+        // might happen to create.
+        const todo = [opts];
+        while (todo.length > 0) {
+            const opts = todo.pop();
+            Object.values(opts || {}).forEach((opt) => {
+                if ((0, EntityManager_1.isEntity)(opt) && !map.has(opt.constructor)) {
+                    map.set(opt.constructor, [opt, false]);
+                }
+                else if (opt instanceof Array) {
+                    todo.push(...opt);
+                }
+                else if ((0, is_plain_object_1.default)(opt)) {
+                    todo.push(opt);
+                }
+            });
+        }
+    }
+    // Store our potentially-massaged map back into opts i.e. in case resolveFactoryOpt needs it.
+    // Use as any b/c UseMap is our internal impl detail and not public.
+    opts.use = map;
+    return map;
+}
+//# sourceMappingURL=newTestInstance.js.map

package/build/src/newTestInstance.js.map

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

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

@@ -12,12 +12,13 @@ export declare abstract class AbstractRelationImpl<U> {
     abstract refreshIfLoaded(): Promise<void>;
     /**
      * Called when our entity has been `EntityManager.delete`'d _and_ `EntityManager.flush` is being called,
-     * so we can unset any foreign keys to the being-deleted entity.
+     * so we can unset any foreign keys to the being-deleted entity and clear out any pointers to it.
      */
-    abstract onEntityDeletedAndFlushing(): Promise<void>;
+    abstract cleanupOnEntityDeleted(): Promise<void>;
     /**
-     * Called when our entity has been `EntityManager.delete`'d so that we can run any special behavior
-     * like cascades
+     * Called to cascade deletes into the relation if it has cascade behavior enabled.  This function is called twice,
+     * once on the initial `EntityManager.delete` call in a potentially unloaded state, then again from a `beforeDelete`
+     * hook after the relation is fully loaded.
      */
-    abstract onEntityDelete(): void;
+    abstract maybeCascadeDelete(): void;
 }

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

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractRelationImpl.js","sourceRoot":"","sources":["../../../src/relations/AbstractRelationImpl.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAsB,oBAAoB;CAyBzC;AAzBD,oDAyBC"}

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

@@ -0,0 +1,26 @@
+import { Entity, IdOf } from "../EntityManager";
+import { Relation } from "./Relation";
+/** A collection of `U` within `T`, either one-to-many or many-to-many. */
+export interface Collection<T extends Entity, U extends Entity> extends Relation<T, U> {
+    load(opts?: {
+        withDeleted: boolean;
+    }): Promise<ReadonlyArray<U>>;
+    /** Looks up the specific `id` without fully loading the collection. */
+    find(id: IdOf<U>): Promise<U | undefined>;
+    /** Looks up the specific `other` without fully loading the collection. */
+    includes(other: U): Promise<boolean>;
+    add(other: U): void;
+    remove(other: U): void;
+    readonly isLoaded: boolean;
+}
+/** Adds a known-safe `get` accessor. */
+export interface LoadedCollection<T extends Entity, U extends Entity> extends Collection<T, U> {
+    get: ReadonlyArray<U>;
+    getWithDeleted: ReadonlyArray<U>;
+    set(values: U[]): void;
+    removeAll(): void;
+}
+/** Type guard utility for determining if an entity field is a Collection. */
+export declare function isCollection(maybeCollection: any): maybeCollection is Collection<any, any>;
+/** Type guard utility for determining if an entity field is a loaded Collection. */
+export declare function isLoadedCollection(maybeCollection: any): maybeCollection is Collection<any, any> & LoadedCollection<any, any>;

package/build/src/relations/Collection.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLoadedCollection = exports.isCollection = void 0;
+const CustomCollection_1 = require("./CustomCollection");
+const ManyToManyCollection_1 = require("./ManyToManyCollection");
+const OneToManyCollection_1 = require("./OneToManyCollection");
+/** Type guard utility for determining if an entity field is a Collection. */
+function isCollection(maybeCollection) {
+    return (maybeCollection instanceof OneToManyCollection_1.OneToManyCollection ||
+        maybeCollection instanceof ManyToManyCollection_1.ManyToManyCollection ||
+        maybeCollection instanceof CustomCollection_1.CustomCollection);
+}
+exports.isCollection = isCollection;
+/** Type guard utility for determining if an entity field is a loaded Collection. */
+function isLoadedCollection(maybeCollection) {
+    return isCollection(maybeCollection) && maybeCollection.isLoaded;
+}
+exports.isLoadedCollection = isLoadedCollection;
+//# sourceMappingURL=Collection.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../src/relations/Collection.ts"],"names":[],"mappings":";;;AACA,yDAAsD;AACtD,iEAA8D;AAC9D,+DAA4D;AA+B5D,6EAA6E;AAC7E,SAAgB,YAAY,CAAC,eAAoB;IAC/C,OAAO,CACL,eAAe,YAAY,yCAAmB;QAC9C,eAAe,YAAY,2CAAoB;QAC/C,eAAe,YAAY,mCAAgB,CAC5C,CAAC;AACJ,CAAC;AAND,oCAMC;AAED,oFAAoF;AACpF,SAAgB,kBAAkB,CAChC,eAAoB;IAEpB,OAAO,YAAY,CAAC,eAAe,CAAC,IAAI,eAAe,CAAC,QAAQ,CAAC;AACnE,CAAC;AAJD,gDAIC"}

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

@@ -1,6 +1,7 @@
 import { Entity, IdOf } from "../EntityManager";
 import { Collection } from "../index";
 import { AbstractRelationImpl } from "./AbstractRelationImpl";
+import { RelationT, RelationU } from "./Relation";
 export declare type CustomCollectionOpts<T extends Entity, U extends Entity> = {
     load: (entity: T) => Promise<any>;
     get: (entity: T) => readonly U[];
@@ -36,14 +37,17 @@ export declare class CustomCollection<T extends Entity, U extends Entity> extend
     set(values: U[]): void;
     setFromOpts(values: U[]): void;
     find(id: IdOf<U>): Promise<U | undefined>;
+    includes(other: U): Promise<boolean>;
     add(other: U): void;
     remove(other: U): void;
-    onEntityDeletedAndFlushing(): Promise<void>;
-    onEntityDelete(): void;
+    cleanupOnEntityDeleted(): Promise<void>;
+    maybeCascadeDelete(): void;
     refreshIfLoaded(): Promise<void>;
     /** Finds this CustomCollections field name by looking in the entity for the key that we're assigned to. */
     get fieldName(): string;
     toString(): string;
     private doGet;
     private filterDeleted;
+    [RelationT]: T;
+    [RelationU]: U;
 }

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

@@ -1,8 +1,10 @@
 "use strict";
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomCollection = void 0;
 const index_1 = require("../index");
 const AbstractRelationImpl_1 = require("./AbstractRelationImpl");
+const Relation_1 = require("./Relation");
 /**
  * Allows user-defined collections that will work in `populate` / preload hints.
  *
@@ -20,6 +22,8 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
         this.entity = entity;
         this.opts = opts;
         this._isLoaded = false;
+        this[_a] = null;
+        this[_b] = null;
     }
     get get() {
         return this.doGet({ withDeleted: false });
@@ -31,7 +35,7 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
         return this._isLoaded;
     }
     async load(opts) {
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
         if (!this.isLoaded) {
             if (this.loadPromise === undefined) {
                 this.loadPromise = this.opts.load(this.entity);
@@ -64,7 +68,7 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
             values.filter((value) => !current.includes(value)).forEach((value) => this.add(value));
         }
         else {
-            index_1.fail(`'set' not implemented and not inferrable from 'add'/'remove' on ${this}`);
+            (0, index_1.fail)(`'set' not implemented and not inferrable from 'add'/'remove' on ${this}`);
         }
     }
     setFromOpts(values) {
@@ -82,11 +86,14 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
             return find(this.entity, id);
         }
     }
+    async includes(other) {
+        throw new Error("Not implemented");
+    }
     add(other) {
         ensureNewOrLoaded(this);
         const { add } = this.opts;
         if (add === undefined) {
-            index_1.fail(`'add' not implemented on ${this}`);
+            (0, index_1.fail)(`'add' not implemented on ${this}`);
         }
         add(this.entity, other);
     }
@@ -94,13 +101,13 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
         ensureNewOrLoaded(this);
         const { remove } = this.opts;
         if (remove === undefined) {
-            index_1.fail(`'add' not implemented on ${this}`);
+            (0, index_1.fail)(`'add' not implemented on ${this}`);
         }
         remove(this.entity, other);
     }
     // these callbacks should be no-ops as they ought to be handled by the underlying relations
-    async onEntityDeletedAndFlushing() { }
-    onEntityDelete() { }
+    async cleanupOnEntityDeleted() { }
+    maybeCascadeDelete() { }
     async refreshIfLoaded() { }
     /** Finds this CustomCollections field name by looking in the entity for the key that we're assigned to. */
     get fieldName() {
@@ -110,19 +117,20 @@ class CustomCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
         return `CustomCollection(entity: ${this.entity}, fieldName: ${this.fieldName})`;
     }
     doGet(opts) {
-        index_1.ensureNotDeleted(this.entity, { ignore: "pending" });
+        (0, index_1.ensureNotDeleted)(this.entity, { ignore: "pending" });
         ensureNewOrLoaded(this);
         return this.filterDeleted(this.opts.get(this.entity), opts);
     }
     filterDeleted(entities, opts) {
-        return entities.filter((entity) => (opts === null || opts === void 0 ? void 0 : opts.withDeleted) === true || !entity.isDeletedEntity);
+        return entities.filter((entity) => opts?.withDeleted === true || !entity.isDeletedEntity);
     }
 }
 exports.CustomCollection = CustomCollection;
+_a = Relation_1.RelationT, _b = Relation_1.RelationU;
 function ensureNewOrLoaded(reference) {
     if (!(reference.isLoaded || reference.entity.isNewEntity)) {
         // This should only be callable in the type system if we've already resolved this to an instance
-        index_1.fail(`${reference.entity}.${reference.fieldName} was not loaded`);
+        (0, index_1.fail)(`${reference.entity}.${reference.fieldName} was not loaded`);
     }
 }
 //# sourceMappingURL=CustomCollection.js.map

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

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

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

@@ -1,6 +1,8 @@
 import { Entity, IdOf } from "../EntityManager";
 import { Reference } from "../index";
 import { AbstractRelationImpl } from "./AbstractRelationImpl";
+import { ReferenceN } from "./Reference";
+import { RelationT, RelationU } from "./Relation";
 export declare type CustomReferenceOpts<T extends Entity, U extends Entity, N extends never | undefined> = {
     load: (entity: T) => Promise<void>;
     get: (entity: T) => U | N;
@@ -37,12 +39,15 @@ export declare class CustomReference<T extends Entity, U extends Entity, N exten
     get isSet(): boolean;
     set(value: U): void;
     setFromOpts(value: U): void;
-    onEntityDeletedAndFlushing(): Promise<void>;
-    onEntityDelete(): void;
+    cleanupOnEntityDeleted(): Promise<void>;
+    maybeCascadeDelete(): void;
     refreshIfLoaded(): Promise<void>;
     /** Finds this CustomReferences field name by looking in the entity for the key that we're assigned to. */
     get fieldName(): string;
     toString(): string;
     private doGet;
     private filterDeleted;
+    [RelationT]: T;
+    [RelationU]: U;
+    [ReferenceN]: N;
 }