joist-orm 0.1.538 → 1.0.0

package/build/src/changes.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.newChangesProxy = void 0;
+const EntityManager_1 = require("./EntityManager");
+function newChangesProxy(entity) {
+    return new Proxy(entity, {
+        get(target, p) {
+            if (p === "fields") {
+                return (entity.isNewEntity ? Object.keys(entity.__orm.data) : Object.keys(entity.__orm.originalData));
+            }
+            else if (typeof p === "symbol") {
+                throw new Error(`Unsupported call to ${String(p)}`);
+            }
+            const originalValue = entity.__orm.originalData[p];
+            const hasChanged = (entity.isNewEntity && p in entity.__orm.data) || p in entity.__orm.originalData;
+            const hasUpdated = !entity.isNewEntity && p in entity.__orm.originalData;
+            return {
+                hasChanged,
+                hasUpdated,
+                originalValue,
+                get originalEntity() {
+                    if ((0, EntityManager_1.isEntity)(originalValue)) {
+                        return Promise.resolve(originalValue);
+                    }
+                    else if ((0, EntityManager_1.isId)(originalValue)) {
+                        return entity.em.load(entity[p].otherMeta.cstr, originalValue);
+                    }
+                    else {
+                        return Promise.resolve();
+                    }
+                },
+            };
+        },
+    });
+}
+exports.newChangesProxy = newChangesProxy;
+//# sourceMappingURL=changes.js.map

package/build/src/changes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../src/changes.ts"],"names":[],"mappings":";;;AAAA,mDAAuE;AAyCvE,SAAgB,eAAe,CAAmB,MAAS;IACzD,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACvB,GAAG,CAAC,MAAM,EAAE,CAAc;YACxB,IAAI,CAAC,KAAK,QAAQ,EAAE;gBAClB,OAAO,CACL,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CACtE,CAAC;aAC1B;iBAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;gBAChC,MAAM,IAAI,KAAK,CAAC,uBAAuB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACrD;YAED,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;YACpG,MAAM,UAAU,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;YACzE,OAAO;gBACL,UAAU;gBACV,UAAU;gBACV,aAAa;gBACb,IAAI,cAAc;oBAChB,IAAI,IAAA,wBAAQ,EAAC,aAAa,CAAC,EAAE;wBAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;qBACvC;yBAAM,IAAI,IAAA,oBAAI,EAAC,aAAa,CAAC,EAAE;wBAC9B,OAAO,MAAM,CAAC,EAAE,CAAC,IAAI,CAAE,MAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;qBACzE;yBAAM;wBACL,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;qBAC1B;gBACH,CAAC;aACF,CAAC;QACJ,CAAC;KACF,CAAQ,CAAC;AACZ,CAAC;AA9BD,0CA8BC"}

package/build/src/config.d.ts

@@ -0,0 +1,43 @@
+import { Entity } from "./EntityManager";
+import { Loaded, LoadHint, RelationsIn } from "./index";
+import { MaybePromise, ValidationRule } from "./rules";
+export declare type EntityHook = "beforeFlush" | "beforeCreate" | "beforeUpdate" | "beforeDelete" | "afterValidation" | "afterCommit";
+declare type HookFn<T extends Entity, C> = (entity: T, ctx: C) => MaybePromise<void>;
+/** The public API to configure an Entity's hooks & validation rules. */
+export declare class ConfigApi<T extends Entity, C> {
+    __data: ConfigData<T, C>;
+    addRule<H extends LoadHint<T>>(populate: H, rule: ValidationRule<Loaded<T, H>>): void;
+    addRule(rule: ValidationRule<T>): void;
+    cascadeDelete(relationship: keyof RelationsIn<T> & LoadHint<T>): void;
+    /** Registers `fn` as the lambda to provide the async value for `key`. */
+    setAsyncDerivedField<P extends keyof T, H extends LoadHint<T>>(key: P, populate: H, fn: (entity: Loaded<T, H>) => T[P]): void;
+    private addHook;
+    beforeDelete<H extends LoadHint<T>>(populate: H, fn: HookFn<Loaded<T, H>, C>): void;
+    beforeDelete(fn: HookFn<T, C>): void;
+    beforeFlush<H extends LoadHint<T>>(populate: H, fn: HookFn<Loaded<T, H>, C>): void;
+    beforeFlush(fn: HookFn<T, C>): void;
+    beforeCreate<H extends LoadHint<T>>(populate: H, fn: HookFn<Loaded<T, H>, C>): void;
+    beforeCreate(fn: HookFn<T, C>): void;
+    beforeUpdate<H extends LoadHint<T>>(populate: H, fn: HookFn<Loaded<T, H>, C>): void;
+    beforeUpdate(fn: HookFn<T, C>): void;
+    afterValidation<H extends LoadHint<T>>(populate: H, fn: HookFn<Loaded<T, H>, C>): void;
+    afterValidation(fn: HookFn<T, C>): void;
+    afterCommit(fn: HookFn<T, C>): void;
+    /**
+     * A noop method that exists solely to keep the `config.placeholder()` line in the initial entity file,
+     * until the user is ready to use it. */
+    placeholder(): void;
+}
+/** The internal state of an entity's configuration data, i.e. validation rules/hooks. */
+export declare class ConfigData<T extends Entity, C> {
+    /** The validation rules for this entity type. */
+    rules: ValidationRule<T>[];
+    /** The async derived fields for this entity type. */
+    asyncDerivedFields: Partial<Record<keyof T, [LoadHint<T>, (entity: T) => any]>>;
+    /** The hooks for this instance. */
+    hooks: Record<EntityHook, HookFn<T, C>[]>;
+    reactiveRules: string[][];
+    reactiveDerivedValues: string[][];
+    cascadeDeleteFields: Array<keyof RelationsIn<T>>;
+}
+export {};

package/build/src/config.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigData = exports.ConfigApi = void 0;
+/** The public API to configure an Entity's hooks & validation rules. */
+class ConfigApi {
+    constructor() {
+        this.__data = new ConfigData();
+    }
+    addRule(ruleOrHint, maybeRule) {
+        if (typeof ruleOrHint === "function") {
+            this.__data.rules.push(ruleOrHint);
+        }
+        else {
+            const fn = async (entity) => {
+                const loaded = await entity.em.populate(entity, ruleOrHint);
+                return maybeRule(loaded);
+            };
+            // Squirrel our hint away where configureMetadata can find it
+            fn.hint = ruleOrHint;
+            // Keep the name for easy debugging/tracing later
+            fn.ruleName = getCallerName();
+            this.__data.rules.push(fn);
+        }
+    }
+    cascadeDelete(relationship) {
+        this.__data.cascadeDeleteFields.push(relationship);
+        this.beforeDelete(relationship, (entity) => {
+            const relation = entity[relationship];
+            relation.maybeCascadeDelete();
+        });
+    }
+    /** Registers `fn` as the lambda to provide the async value for `key`. */
+    setAsyncDerivedField(key, populate, fn) {
+        this.__data.asyncDerivedFields[key] = [populate, fn];
+    }
+    addHook(hook, ruleOrHint, maybeFn) {
+        if (typeof ruleOrHint === "function") {
+            this.__data.hooks[hook].push(ruleOrHint);
+        }
+        else {
+            const fn = async (entity, ctx) => {
+                // TODO Use this for reactive beforeFlush
+                const loaded = await entity.em.populate(entity, ruleOrHint);
+                return maybeFn(loaded, ctx);
+            };
+            // Squirrel our hint away where configureMetadata can find it
+            fn.hint = ruleOrHint;
+            this.__data.hooks[hook].push(fn);
+        }
+    }
+    beforeDelete(ruleOrHint, maybeFn) {
+        this.addHook("beforeDelete", ruleOrHint, maybeFn);
+    }
+    beforeFlush(ruleOrHint, maybeFn) {
+        this.addHook("beforeFlush", ruleOrHint, maybeFn);
+    }
+    beforeCreate(ruleOrHint, maybeFn) {
+        this.addHook("beforeCreate", ruleOrHint, maybeFn);
+    }
+    beforeUpdate(ruleOrHint, maybeFn) {
+        this.addHook("beforeUpdate", ruleOrHint, maybeFn);
+    }
+    afterValidation(ruleOrHint, maybeFn) {
+        this.addHook("afterValidation", ruleOrHint, maybeFn);
+    }
+    afterCommit(fn) {
+        this.addHook("afterCommit", fn);
+    }
+    /**
+     * A noop method that exists solely to keep the `config.placeholder()` line in the initial entity file,
+     * until the user is ready to use it. */
+    placeholder() { }
+}
+exports.ConfigApi = ConfigApi;
+/** The internal state of an entity's configuration data, i.e. validation rules/hooks. */
+class ConfigData {
+    constructor() {
+        /** The validation rules for this entity type. */
+        this.rules = [];
+        /** The async derived fields for this entity type. */
+        this.asyncDerivedFields = {};
+        /** The hooks for this instance. */
+        this.hooks = {
+            beforeDelete: [],
+            beforeFlush: [],
+            beforeCreate: [],
+            beforeUpdate: [],
+            afterCommit: [],
+            afterValidation: [],
+        };
+        // Load-hint-ish structures that point back to instances that depend on us for validation rules.
+        this.reactiveRules = [];
+        // Load-hint-ish structures that point back to instances that depend on us for derived values.
+        this.reactiveDerivedValues = [];
+        this.cascadeDeleteFields = [];
+    }
+}
+exports.ConfigData = ConfigData;
+function getCallerName() {
+    const err = getErrorObject();
+    // E.g. at Object.<anonymous> (/home/stephen/homebound/graphql-service/src/entities/Activity.ts:86:8)
+    const line = err.stack.split("\n")[4];
+    const parts = line.split("/");
+    return parts[parts.length - 1].replace(")", "");
+}
+function getErrorObject() {
+    try {
+        throw Error("");
+    }
+    catch (err) {
+        return err;
+    }
+}
+//# sourceMappingURL=config.js.map

package/build/src/config.js.map

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

package/build/{createOrUpdatePartial.d.ts → src/createOrUpdatePartial.d.ts}

@@ -1,6 +1,6 @@
-import { NullOrDefinedOr } from "./utils";
 import { Entity, EntityConstructor, EntityManager, IdOf, OptIdsOf, OptsOf } from "./EntityManager";
 import { PartialOrNull } from "./index";
+import { NullOrDefinedOr } from "./utils";
 /**
  * The type for `EntityManager.createOrUpdateUnsafe` that allows "upsert"-ish behavior.
  *
@@ -16,6 +16,7 @@ declare type AllowRelationsToBeIdsOrEntitiesOrPartials<T> = {
     [P in keyof T]: T[P] extends NullOrDefinedOr<infer U> ? U extends Array<infer V> ? V extends Entity ? Array<V | (DeepPartialOrNull<V> & {
         delete?: boolean | null;
         remove?: boolean | null;
+        op?: "remove" | "delete" | "include" | "incremental";
     }) | IdOf<V>> | null : T[P] : U extends Entity ? U | DeepPartialOrNull<U> | IdOf<U> | null : T[P] : T[P];
 };
 /**

package/build/{createOrUpdatePartial.js → src/createOrUpdatePartial.js}

@@ -2,21 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrUpdatePartial = void 0;
 const EntityManager_1 = require("./EntityManager");
+const index_1 = require("./index");
 /**
  * A utility function to create-or-update entities coming from a partial-update style API.
  */
 async function createOrUpdatePartial(em, constructor, opts) {
     const { id, ...others } = opts;
-    const meta = EntityManager_1.getMetadata(constructor);
+    const meta = (0, EntityManager_1.getMetadata)(constructor);
     const isNew = id === null || id === undefined;
+    const collectionsToLoad = [];
     // The values in others might be themselves partials, so walk through and resolve them to entities.
     const p = Object.entries(others).map(async ([key, value]) => {
         // Watch for the `bookId` / `bookIds` aliases
-        const field = meta.fields.find((f) => f.fieldName === key) || meta.fields.find((f) => f.fieldIdName === key);
+        const field = meta.fields[key] || Object.values(meta.fields).find((f) => f.fieldIdName === key);
         if (!field) {
             // Allow delete/remove flags that we assume the API layer (i.e. GraphQL) will have specifically
             // allowed, i.e. this isn't the Rails form bug where users can POST in any random field they want.
-            const flagField = key === "delete" || key === "remove";
+            const flagField = key === "delete" || key === "remove" || key === "op";
             if (flagField) {
                 // Pass these along for setOpts to look for
                 return [key, value];
@@ -25,11 +27,24 @@ async function createOrUpdatePartial(em, constructor, opts) {
         }
         // Don't use key b/c it might be the bookId alias
         const name = field.fieldName;
-        if (field.kind === "m2o" && !EntityManager_1.isEntity(value)) {
-            if (!value || EntityManager_1.isEntity(value)) {
+        if (field.kind === "poly" && !(0, EntityManager_1.isEntity)(value)) {
+            if (!value) {
                 return [name, value];
             }
-            else if (EntityManager_1.isKey(value)) {
+            else if ((0, EntityManager_1.isKey)(value)) {
+                // This is a polymorphic reference
+                const entity = await em.load((0, index_1.getConstructorFromTaggedId)(value), value);
+                return [name, entity];
+            }
+            else {
+                throw new Error(`Cannot use partial value for polymorphic field `);
+            }
+        }
+        else if (field.kind === "m2o" && !(0, EntityManager_1.isEntity)(value)) {
+            if (!value || (0, EntityManager_1.isEntity)(value)) {
+                return [name, value];
+            }
+            else if ((0, EntityManager_1.isKey)(value)) {
                 // This is a many-to-one reference
                 const entity = await em.load(field.otherMetadata().cstr, value);
                 return [name, entity];
@@ -65,32 +80,43 @@ async function createOrUpdatePartial(em, constructor, opts) {
             // Look for one-to-many/many-to-many partials
             // We allow `delete` and `remove` commands but only if they don't collide with existing fields
             // Also we trust the API layer, i.e. GraphQL, to not let these fields leak unless explicitly allowed.
-            const allowDelete = !field.otherMetadata().fields.some((f) => f.fieldName === "delete");
-            const allowRemove = !field.otherMetadata().fields.some((f) => f.fieldName === "remove");
+            const allowDelete = !field.otherMetadata().fields["delete"];
+            const allowRemove = !field.otherMetadata().fields["remove"];
+            const allowOp = !field.otherMetadata().fields["op"];
+            collectionsToLoad.push(field.fieldName);
             const entities = !value
                 ? []
                 : value.map(async (value) => {
-                    if (!value || EntityManager_1.isEntity(value)) {
+                    if (!value || (0, EntityManager_1.isEntity)(value)) {
                         return value;
                     }
-                    else if (EntityManager_1.isKey(value)) {
+                    else if ((0, EntityManager_1.isKey)(value)) {
                         return await em.load(field.otherMetadata().cstr, value);
                     }
                     else {
                         // Look for `delete: true/false` and `remove: true/false` markers
                         const deleteMarker = allowDelete && value["delete"];
                         const removeMarker = allowRemove && value["remove"];
+                        const opMarker = allowOp && value["op"];
+                        // If this is the incremental marker, just leave it in as-is so that setOpts can see it
+                        if (opMarker === "incremental") {
+                            return value;
+                        }
                         // Remove the markers, regardless of true/false, before recursing into createOrUpdatePartial to avoid unknown fields
                         if (deleteMarker !== undefined)
                             delete value.delete;
                         if (removeMarker !== undefined)
                             delete value.remove;
+                        if (opMarker !== undefined)
+                            delete value.op;
                         const entity = await createOrUpdatePartial(em, field.otherMetadata().cstr, value);
                         // Put the markers back for setOpts to find
                         if (deleteMarker === true)
                             entity.delete = true;
                         if (removeMarker === true)
                             entity.remove = true;
+                        if (opMarker)
+                            entity.op = opMarker;
                         return entity;
                     }
                 });
@@ -106,6 +132,12 @@ async function createOrUpdatePartial(em, constructor, opts) {
     }
     else {
         const entity = await em.load(constructor, id);
+        // For o2m and m2m .set to work, they need to be loaded so that they know what to remove.
+        // Note that we also have the `delete: true` pattern for flagging not only "remove" but "delete",
+        // for a parent's mutation to control the lifecycle of a child entity (i.e. line items).
+        // Musing: Maybe this should happen implicitly, like if a LineItem.parent is set to null, that
+        // LineItem knows to just `em.delete` itself? Instead of relying on hints from GraphQL mutations.
+        await Promise.all(collectionsToLoad.map((fieldName) => entity[fieldName].load()));
         entity.setPartial(_opts);
         return entity;
     }

package/build/src/createOrUpdatePartial.js.map

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

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

@@ -0,0 +1,5 @@
+import DataLoader from "dataloader";
+import { Entity, EntityConstructor, EntityManager } from "../EntityManager";
+import { FilterAndSettings } from "../QueryBuilder";
+export declare function findDataLoader<T extends Entity>(em: EntityManager, type: EntityConstructor<T>): DataLoader<FilterAndSettings<T>, unknown[]>;
+export declare function whereFilterHash(where: FilterAndSettings<any>): string;

package/build/src/dataloaders/findDataLoader.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.whereFilterHash = exports.findDataLoader = void 0;
+const dataloader_1 = __importDefault(require("dataloader"));
+const object_hash_1 = __importDefault(require("object-hash"));
+const EntityManager_1 = require("../EntityManager");
+const utils_1 = require("../utils");
+function findDataLoader(em, type) {
+    return (0, utils_1.getOrSet)(em.findLoaders, type.name, () => {
+        return new dataloader_1.default((queries) => {
+            return em.driver.find(em, type, queries);
+        }, {
+            // Our filter/order tuple is a complex object, so object-hash it to ensure caching works
+            cacheKeyFn: whereFilterHash,
+        });
+    });
+}
+exports.findDataLoader = findDataLoader;
+// If a where clause includes an entity, object-hash cannot hash it, so just use the id.
+const replacer = (v) => ((0, EntityManager_1.isEntity)(v) ? v.id : v);
+function whereFilterHash(where) {
+    return (0, object_hash_1.default)(where, { replacer });
+}
+exports.whereFilterHash = whereFilterHash;
+//# sourceMappingURL=findDataLoader.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"findDataLoader.js","sourceRoot":"","sources":["../../../src/dataloaders/findDataLoader.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AACpC,8DAA+B;AAC/B,oDAAsF;AAEtF,oCAAoC;AAEpC,SAAgB,cAAc,CAC5B,EAAiB,EACjB,IAA0B;IAE1B,OAAO,IAAA,gBAAQ,EAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;QAC9C,OAAO,IAAI,oBAAU,CACnB,CAAC,OAAO,EAAE,EAAE;YACV,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC,EACD;YACE,wFAAwF;YACxF,UAAU,EAAE,eAAe;SAC5B,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAfD,wCAeC;AAED,wFAAwF;AACxF,MAAM,QAAQ,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,IAAA,wBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtD,SAAgB,eAAe,CAAC,KAA6B;IAC3D,OAAO,IAAA,qBAAI,EAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;AACnC,CAAC;AAFD,0CAEC"}

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

@@ -0,0 +1,3 @@
+import DataLoader from "dataloader";
+import { Entity, EntityManager, EntityMetadata } from "../EntityManager";
+export declare function loadDataLoader<T extends Entity>(em: EntityManager, meta: EntityMetadata<T>): DataLoader<string, T | undefined>;

package/build/src/dataloaders/loadDataLoader.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadDataLoader = void 0;
+const dataloader_1 = __importDefault(require("dataloader"));
+const keys_1 = require("../keys");
+const utils_1 = require("../utils");
+function loadDataLoader(em, meta) {
+    return (0, utils_1.getOrSet)(em.loadLoaders, meta.type, () => {
+        return new dataloader_1.default(async (_keys) => {
+            (0, keys_1.assertIdsAreTagged)(_keys);
+            const keys = (0, keys_1.deTagIds)(meta, _keys);
+            const rows = await em.driver.load(em, meta, keys);
+            // 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.id);
+            // Return the results back in the same order as the keys
+            return _keys.map((k) => {
+                const entity = entitiesById.get(k);
+                // 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);
+                    if (existingEntity) {
+                        existingEntity.__orm.deleted = "deleted";
+                    }
+                }
+                return entity;
+            });
+        });
+    });
+}
+exports.loadDataLoader = loadDataLoader;
+//# sourceMappingURL=loadDataLoader.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"loadDataLoader.js","sourceRoot":"","sources":["../../../src/dataloaders/loadDataLoader.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AAEpC,kCAAuD;AACvD,oCAA6C;AAE7C,SAAgB,cAAc,CAC5B,EAAiB,EACjB,IAAuB;IAEvB,OAAO,IAAA,gBAAQ,EAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;QAC9C,OAAO,IAAI,oBAAU,CAAwB,KAAK,EAAE,KAAK,EAAE,EAAE;YAC3D,IAAA,yBAAkB,EAAC,KAAK,CAAC,CAAC;YAC1B,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEnC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAElD,6GAA6G;YAC7G,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;YAC5F,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAG,CAAC,CAAC;YAErD,wDAAwD;YACxD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrB,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACnC,2FAA2F;gBAC3F,2FAA2F;gBAC3F,YAAY;gBACZ,IAAI,MAAM,KAAK,SAAS,EAAE;oBACxB,MAAM,cAAc,GAAG,EAAE,CAAC,oBAAoB,CAAI,CAAC,CAAC,CAAC;oBACrD,IAAI,cAAc,EAAE;wBAClB,cAAc,CAAC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;qBAC1C;iBACF;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA/BD,wCA+BC"}

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

@@ -0,0 +1,5 @@
+import DataLoader from "dataloader";
+import { Entity, EntityManager } from "../EntityManager";
+import { ManyToManyCollection } from "../index";
+/** Batches m2m.load calls. */
+export declare function manyToManyDataLoader<T extends Entity, U extends Entity>(em: EntityManager, collection: ManyToManyCollection<T, U>): DataLoader<any, any, any>;

package/build/src/dataloaders/manyToManyDataLoader.js

@@ -0,0 +1,78 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.manyToManyDataLoader = void 0;
+const dataloader_1 = __importDefault(require("dataloader"));
+const index_1 = require("../index");
+const utils_1 = require("../utils");
+/** Batches m2m.load calls. */
+function manyToManyDataLoader(em, collection) {
+    // Note that we cache the dataloader on the joinTableName, and not
+    // which side of the relation the `collection` is coming from, so
+    // the `load` impl will have to handle keys that come from either
+    // side of the relation.
+    return (0, utils_1.getOrSet)(em.loadLoaders, collection.joinTableName, () => new dataloader_1.default((keys) => load(collection, keys)));
+}
+exports.manyToManyDataLoader = manyToManyDataLoader;
+/**
+ * Loads join rows (batched).
+ *
+ * I.e. we can load the `books_to_tags` join rows for multiple `Book`s at a time, or even
+ * load `books_to_tags` for several `Book`s and several `Tag`s in a single SQL query.
+ */
+async function load(collection, keys) {
+    const { joinTableName } = collection;
+    const { em } = collection.entity;
+    // Make a map that will be both `tag_id=t:2 -> [...]` and `book_id=b:3 -> [...]`
+    const rowsByKey = {};
+    // Keep a reference to our row to track updates/deletes
+    const emJoinRows = (0, utils_1.getOrSet)(em.__data.joinRows, joinTableName, []);
+    const rows = await em.driver.loadManyToMany(em, collection, keys);
+    // The order of column1/column2 doesn't really matter, i.e. if the opposite-side collection is later used
+    const column1 = collection.columnName;
+    const meta1 = collection.entity.__orm.metadata;
+    const column2 = collection.otherColumnName;
+    const meta2 = collection.otherMeta;
+    // For each join table row, we use `EntityManager.load` to get both entities loaded.
+    // This will be another 1 or 2 queries (depending on whether we're loading just
+    // `book.getTags` (1 query to load new tags) or both `book.getTags` and `tag.getBooks
+    // (1 query to load the new tags and 1 query to look the new books)).
+    //
+    // Eventually we could have this query join into the entity tables themselves, i.e.
+    // `books` and `tags`, and use those results to hydrate the newly-found entities.
+    await Promise.all(rows.map(async (dbRow) => {
+        // We may have already loaded this join row in a prior load of the opposite side of this m2m.
+        let emRow = emJoinRows.find((jr) => {
+            return (jr[column1].id === (0, index_1.keyToString)(meta1, dbRow[column1]) &&
+                jr[column2].id === (0, index_1.keyToString)(meta2, dbRow[column2]));
+        });
+        if (!emRow) {
+            // For this join table row, load the entities of both foreign keys. Because we are `EntityManager.load`,
+            // this is N+1 safe (and will check the Unit of Work for already-loaded entities), but per ^ comment
+            // we chould pull these from the row itself if we did a fancier join.
+            const p1 = em.load(meta1.cstr, (0, index_1.keyToString)(meta1, dbRow[column1]));
+            const p2 = em.load(meta2.cstr, (0, index_1.keyToString)(meta2, dbRow[column2]));
+            const [e1, e2] = await Promise.all([p1, p2]);
+            emRow = { id: dbRow.id, m2m: collection, [column1]: e1, [column2]: e2, created_at: dbRow.created_at };
+            emJoinRows.push(emRow);
+        }
+        else {
+            // If a placeholder row was created while a ManyToManyCollection was unloaded, and we find it during
+            // a subsequent load/query, update its id to be what is in the database.
+            emRow.id = dbRow.id;
+        }
+        // Put this row into the map for both join table columns, i.e. `book_id=2` and `tag_id=3`
+        (0, utils_1.getOrSet)(rowsByKey, `${column1}=${emRow[column1].id}`, []).push(emRow);
+        (0, utils_1.getOrSet)(rowsByKey, `${column2}=${emRow[column2].id}`, []).push(emRow);
+    }));
+    // Map the requested keys, i.e. book_id=2 back to "the tags for book 2".
+    return keys.map((key) => {
+        const [column] = key.split("=");
+        const joinRows = rowsByKey[key] || [];
+        const otherColumn = column === collection.columnName ? collection.otherColumnName : collection.columnName;
+        return joinRows.map((joinRow) => joinRow[otherColumn]);
+    });
+}
+//# sourceMappingURL=manyToManyDataLoader.js.map

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

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

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

@@ -0,0 +1,5 @@
+import DataLoader from "dataloader";
+import { Entity, EntityManager } from "../EntityManager";
+import { ManyToManyCollection, ManyToManyLargeCollection } from "../index";
+/** Batches m2m.find/include calls (i.e. that don't fully load the m2m relation). */
+export declare function manyToManyFindDataLoader<T extends Entity, U extends Entity>(em: EntityManager, collection: ManyToManyCollection<T, U> | ManyToManyLargeCollection<T, U>): DataLoader<string, boolean>;

package/build/src/dataloaders/manyToManyFindDataLoader.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.manyToManyFindDataLoader = void 0;
+const dataloader_1 = __importDefault(require("dataloader"));
+const index_1 = require("../index");
+const utils_1 = require("../utils");
+/** Batches m2m.find/include calls (i.e. that don't fully load the m2m relation). */
+function manyToManyFindDataLoader(em, collection) {
+    return (0, utils_1.getOrSet)(em.loadLoaders, `find-${collection.joinTableName}`, () => new dataloader_1.default((keys) => load(collection, keys)));
+}
+exports.manyToManyFindDataLoader = manyToManyFindDataLoader;
+async function load(collection, keys) {
+    const { joinTableName } = collection;
+    const { em } = collection.entity;
+    const rows = await em.driver.findManyToMany(em, collection, keys);
+    const column1 = collection.columnName;
+    const column2 = collection.otherColumnName;
+    const meta1 = collection.meta;
+    const meta2 = collection.otherMeta;
+    // Because keys might come from either side of the m2m relationship, build
+    // a list of both `foo_id=2,bar_id=3` and `bar_id=3,foo_id=2` to make the
+    // final return value just a map of `Set.has`.
+    const found = new Set(rows.flatMap((dbRow) => {
+        const a = `${column1}=${(0, index_1.tagId)(meta1, dbRow[column1])}`;
+        const b = `${column2}=${(0, index_1.tagId)(meta2, dbRow[column2])}`;
+        return [`${a},${b}`, `${b},${a}`];
+    }));
+    return keys.map((key) => found.has(key));
+}
+//# sourceMappingURL=manyToManyFindDataLoader.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"manyToManyFindDataLoader.js","sourceRoot":"","sources":["../../../src/dataloaders/manyToManyFindDataLoader.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AAEpC,oCAAkF;AAClF,oCAAoC;AAEpC,oFAAoF;AACpF,SAAgB,wBAAwB,CACtC,EAAiB,EACjB,UAAwE;IAExE,OAAO,IAAA,gBAAQ,EACb,EAAE,CAAC,WAAW,EACd,QAAQ,UAAU,CAAC,aAAa,EAAE,EAClC,GAAG,EAAE,CAAC,IAAI,oBAAU,CAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CACxE,CAAC;AACJ,CAAC;AATD,4DASC;AAED,KAAK,UAAU,IAAI,CACjB,UAAwE,EACxE,IAA2B;IAE3B,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC;IACrC,MAAM,EAAE,EAAE,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC;IAEjC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC;IACtC,MAAM,OAAO,GAAG,UAAU,CAAC,eAAe,CAAC;IAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC;IAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC;IAEnC,0EAA0E;IAC1E,yEAAyE;IACzE,8CAA8C;IAC9C,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACrB,MAAM,CAAC,GAAG,GAAG,OAAO,IAAI,IAAA,aAAK,EAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAW,CAAC,EAAE,CAAC;QACjE,MAAM,CAAC,GAAG,GAAG,OAAO,IAAI,IAAA,aAAK,EAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAW,CAAC,EAAE,CAAC;QACjE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AAC3C,CAAC"}

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

@@ -0,0 +1,4 @@
+import DataLoader from "dataloader";
+import { Entity, EntityManager } from "../EntityManager";
+import { OneToManyCollection } from "../index";
+export declare function oneToManyDataLoader<T extends Entity, U extends Entity>(em: EntityManager, collection: OneToManyCollection<T, U>): DataLoader<string, U[]>;

package/build/src/dataloaders/oneToManyDataLoader.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.oneToManyDataLoader = void 0;
+const dataloader_1 = __importDefault(require("dataloader"));
+const index_1 = require("../index");
+const utils_1 = require("../utils");
+function oneToManyDataLoader(em, collection) {
+    // The metadata for the entity that contains the collection
+    const { meta, fieldName } = collection;
+    const loaderName = `${meta.tableName}.${fieldName}`;
+    return (0, utils_1.getOrSet)(em.loadLoaders, loaderName, () => {
+        return new dataloader_1.default(async (_keys) => {
+            const { otherMeta } = collection;
+            (0, index_1.assertIdsAreTagged)(_keys);
+            const keys = (0, index_1.deTagIds)(meta, _keys);
+            const { em } = collection.entity;
+            const rows = await em.driver.loadOneToMany(em, collection, keys);
+            const entities = rows.map((row) => em.hydrate(otherMeta.cstr, row, { overwriteExisting: false }));
+            // .filter((e) => !e.isDeletedEntity);
+            const rowsById = (0, utils_1.groupBy)(entities, (entity) => {
+                // TODO If this came from the UoW, it may not be an id? I.e. pre-insert.
+                const ownerId = (0, 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 ?? "dummyNoLongerOwned";
+            });
+            return _keys.map((k) => rowsById.get(k) || []);
+        });
+    });
+}
+exports.oneToManyDataLoader = oneToManyDataLoader;
+//# sourceMappingURL=oneToManyDataLoader.js.map