@expo/entity 0.43.0 → 0.44.0

package/build/EntityQueryContext.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityNestedTransactionalQueryContext = exports.EntityTransactionalQueryContext = exports.EntityNonTransactionalQueryContext = exports.EntityQueryContext = exports.TransactionIsolationLevel = void 0;
+exports.EntityNestedTransactionalQueryContext = exports.EntityTransactionalQueryContext = exports.EntityNonTransactionalQueryContext = exports.EntityQueryContext = exports.TransactionalDataLoaderMode = exports.TransactionIsolationLevel = void 0;
 const assert_1 = __importDefault(require("assert"));
 var TransactionIsolationLevel;
 (function (TransactionIsolationLevel) {
@@ -11,6 +11,12 @@ var TransactionIsolationLevel;
     TransactionIsolationLevel["REPEATABLE_READ"] = "REPEATABLE_READ";
     TransactionIsolationLevel["SERIALIZABLE"] = "SERIALIZABLE";
 })(TransactionIsolationLevel || (exports.TransactionIsolationLevel = TransactionIsolationLevel = {}));
+var TransactionalDataLoaderMode;
+(function (TransactionalDataLoaderMode) {
+    TransactionalDataLoaderMode["ENABLED"] = "ENABLED";
+    TransactionalDataLoaderMode["ENABLED_BATCH_ONLY"] = "ENABLED_BATCH_ONLY";
+    TransactionalDataLoaderMode["DISABLED"] = "DISABLED";
+})(TransactionalDataLoaderMode || (exports.TransactionalDataLoaderMode = TransactionalDataLoaderMode = {}));
 /**
  * Entity framework representation of transactional and non-transactional database
  * query execution units.
@@ -55,12 +61,24 @@ exports.EntityNonTransactionalQueryContext = EntityNonTransactionalQueryContext;
  */
 class EntityTransactionalQueryContext extends EntityQueryContext {
     entityQueryContextProvider;
+    transactionId;
+    transactionalDataLoaderMode;
+    /**
+     * @internal
+     */
+    childQueryContexts = [];
     postCommitInvalidationCallbacks = [];
     postCommitCallbacks = [];
     preCommitCallbacks = [];
-    constructor(queryInterface, entityQueryContextProvider) {
+    constructor(queryInterface, entityQueryContextProvider, 
+    /**
+     * @internal
+     */
+    transactionId, transactionalDataLoaderMode) {
         super(queryInterface);
         this.entityQueryContextProvider = entityQueryContextProvider;
+        this.transactionId = transactionId;
+        this.transactionalDataLoaderMode = transactionalDataLoaderMode;
     }
     /**
      * Schedule a pre-commit callback. These will be run within the transaction right before it is
@@ -90,6 +108,9 @@ class EntityTransactionalQueryContext extends EntityQueryContext {
     appendPostCommitCallback(callback) {
         this.postCommitCallbacks.push(callback);
     }
+    /**
+     * @internal
+     */
     async runPreCommitCallbacksAsync() {
         const callbacks = [...this.preCommitCallbacks]
             .sort((a, b) => a.order - b.order)
@@ -99,6 +120,9 @@ class EntityTransactionalQueryContext extends EntityQueryContext {
             await callback(this);
         }
     }
+    /**
+     * @internal
+     */
     async runPostCommitCallbacksAsync() {
         const invalidationCallbacks = [...this.postCommitInvalidationCallbacks];
         this.postCommitInvalidationCallbacks.length = 0;
@@ -110,6 +134,9 @@ class EntityTransactionalQueryContext extends EntityQueryContext {
     isInTransaction() {
         return true;
     }
+    isInNestedTransaction() {
+        return false;
+    }
     async runInTransactionIfNotInTransactionAsync(transactionScope, transactionConfig) {
         (0, assert_1.default)(transactionConfig === undefined, 'Should not pass transactionConfig to a nested transaction');
         return await transactionScope(this);
@@ -131,23 +158,51 @@ class EntityNestedTransactionalQueryContext extends EntityTransactionalQueryCont
     parentQueryContext;
     postCommitInvalidationCallbacksToTransfer = [];
     postCommitCallbacksToTransfer = [];
-    constructor(queryInterface, parentQueryContext, entityQueryContextProvider) {
-        super(queryInterface, entityQueryContextProvider);
+    constructor(queryInterface, 
+    /**
+     * @internal
+     */
+    parentQueryContext, entityQueryContextProvider, transactionId, transactionalDataLoaderMode) {
+        super(queryInterface, entityQueryContextProvider, transactionId, transactionalDataLoaderMode);
         this.parentQueryContext = parentQueryContext;
+        parentQueryContext.childQueryContexts.push(this);
     }
-    appendPostCommitCallback(callback) {
-        this.postCommitInvalidationCallbacksToTransfer.push(callback);
+    isInNestedTransaction() {
+        return true;
     }
-    appendPostCommitInvalidationCallback(callback) {
+    appendPostCommitCallback(callback) {
+        // explicitly do not add to the super-class's post-commit callbacks
+        // instead, we will add them to the parent transaction's post-commit callbacks
+        // after the nested transaction has been committed
         this.postCommitCallbacksToTransfer.push(callback);
     }
-    runPostCommitCallbacksAsync() {
-        throw new Error('Must not call runPostCommitCallbacksAsync on EntityNestedTransactionalQueryContext');
+    appendPostCommitInvalidationCallback(callback) {
+        super.appendPostCommitInvalidationCallback(callback);
+        this.postCommitInvalidationCallbacksToTransfer.push(callback);
     }
-    transferPostCommitCallbacksToParent() {
+    /**
+     * The behavior of callbacks for nested transactions are a bit different than for normal
+     * transactions.
+     * - Post-commit (non-invalidation) callbacks are run at the end of the outermost transaction
+     *   since they often contain side-effects that only should run if the transaction doesn't roll back.
+     *   The outermost transaction has the final say on the commit state of itself and all sub-transactions.
+     * - Invalidation callbacks are run at the end of both the nested transaction iteself but also transferred
+     *   to the parent transaction to be run at the end of it (and recurse upwards, accumulating invalations).
+     *   This is to ensure the dataloader cache is never stale no matter the DBMS transaction isolation
+     *   semantics. See the note in `AuthorizationResultBasedBaseMutator` for more details.
+     *
+     * @internal
+     */
+    async runPostCommitCallbacksAsync() {
+        // run the post-commit callbacks for the nested transaction now
+        // (this technically also would run regular post-commit callbacks, but they are empty)
+        await super.runPostCommitCallbacksAsync();
+        // transfer a copy of the post-commit invalidation callbacks to the parent transaction
+        // to also be run at the end of it (or recurse in the case of the parent transaction being nested as well)
         for (const callback of this.postCommitInvalidationCallbacksToTransfer) {
             this.parentQueryContext.appendPostCommitInvalidationCallback(callback);
         }
+        // transfer post-commit callbacks to patent
         for (const callback of this.postCommitCallbacksToTransfer) {
             this.parentQueryContext.appendPostCommitCallback(callback);
         }

package/build/EntityQueryContext.js.map

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

package/build/EntityQueryContextProvider.d.ts

@@ -1,4 +1,4 @@
-import { EntityTransactionalQueryContext, EntityNonTransactionalQueryContext, EntityNestedTransactionalQueryContext, TransactionConfig } from './EntityQueryContext';
+import { EntityTransactionalQueryContext, EntityNonTransactionalQueryContext, EntityNestedTransactionalQueryContext, TransactionConfig, TransactionalDataLoaderMode } from './EntityQueryContext';
 /**
  * A query context provider vends transactional and non-transactional query contexts.
  */
@@ -11,6 +11,10 @@ export default abstract class EntityQueryContextProvider {
      * Get the query interface for constructing a query context.
      */
     protected abstract getQueryInterface(): any;
+    /**
+     * @returns true if the transactional dataloader should be disabled for all transactions.
+     */
+    protected defaultTransactionalDataLoaderMode(): TransactionalDataLoaderMode;
     /**
      * Vend a transaction runner for use in runInTransactionAsync.
      */

package/build/EntityQueryContextProvider.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_crypto_1 = require("node:crypto");
 const EntityQueryContext_1 = require("./EntityQueryContext");
 /**
  * A query context provider vends transactional and non-transactional query contexts.
@@ -11,13 +12,19 @@ class EntityQueryContextProvider {
     getQueryContext() {
         return new EntityQueryContext_1.EntityNonTransactionalQueryContext(this.getQueryInterface(), this);
     }
+    /**
+     * @returns true if the transactional dataloader should be disabled for all transactions.
+     */
+    defaultTransactionalDataLoaderMode() {
+        return EntityQueryContext_1.TransactionalDataLoaderMode.ENABLED;
+    }
     /**
      * Start a transaction and execute the provided transaction-scoped closure within the transaction.
      * @param transactionScope - async callback to execute within the transaction
      */
     async runInTransactionAsync(transactionScope, transactionConfig) {
         const [returnedValue, queryContext] = await this.createTransactionRunner(transactionConfig)(async (queryInterface) => {
-            const queryContext = new EntityQueryContext_1.EntityTransactionalQueryContext(queryInterface, this);
+            const queryContext = new EntityQueryContext_1.EntityTransactionalQueryContext(queryInterface, this, (0, node_crypto_1.randomUUID)(), transactionConfig?.transactionalDataLoaderMode ?? this.defaultTransactionalDataLoaderMode());
             const result = await transactionScope(queryContext);
             await queryContext.runPreCommitCallbacksAsync();
             return [result, queryContext];
@@ -33,13 +40,13 @@ class EntityQueryContextProvider {
      */
     async runInNestedTransactionAsync(outerQueryContext, transactionScope) {
         const [returnedValue, innerQueryContext] = await this.createNestedTransactionRunner(outerQueryContext.getQueryInterface())(async (innerQueryInterface) => {
-            const innerQueryContext = new EntityQueryContext_1.EntityNestedTransactionalQueryContext(innerQueryInterface, outerQueryContext, this);
+            const innerQueryContext = new EntityQueryContext_1.EntityNestedTransactionalQueryContext(innerQueryInterface, outerQueryContext, this, (0, node_crypto_1.randomUUID)(), outerQueryContext.transactionalDataLoaderMode);
             const result = await transactionScope(innerQueryContext);
             await innerQueryContext.runPreCommitCallbacksAsync();
             return [result, innerQueryContext];
         });
-        // post-commit callbacks are appended to parent transaction instead of run, but only after the transaction has succeeded
-        innerQueryContext.transferPostCommitCallbacksToParent();
+        // behavior of this call differs for nested transaction query contexts from regular transaction query contexts
+        await innerQueryContext.runPostCommitCallbacksAsync();
         return returnedValue;
     }
 }

package/build/EntityQueryContextProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityQueryContextProvider.js","sourceRoot":"","sources":["../src/EntityQueryContextProvider.ts"],"names":[],"mappings":";;AAAA,6DAK8B;AAE9B;;GAEG;AACH,MAA8B,0BAA0B;IACtD;;OAEG;IACI,eAAe;QACpB,OAAO,IAAI,uDAAkC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,CAAC;IAChF,CAAC;IAkBD;;;OAGG;IACH,KAAK,CAAC,qBAAqB,CACzB,gBAA+E,EAC/E,iBAAqC;QAErC,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAEtE,iBAAiB,CAAC,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;YAC5C,MAAM,YAAY,GAAG,IAAI,oDAA+B,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YAC/E,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACpD,MAAM,YAAY,CAAC,0BAA0B,EAAE,CAAC;YAChD,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,MAAM,YAAY,CAAC,2BAA2B,EAAE,CAAC;QACjD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,2BAA2B,CAC/B,iBAAkD,EAClD,gBAA0F;QAE1F,MAAM,CAAC,aAAa,EAAE,iBAAiB,CAAC,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAEjF,iBAAiB,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,EAAE,EAAE;YACrE,MAAM,iBAAiB,GAAG,IAAI,0DAAqC,CACjE,mBAAmB,EACnB,iBAAiB,EACjB,IAAI,CACL,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;YACzD,MAAM,iBAAiB,CAAC,0BAA0B,EAAE,CAAC;YACrD,OAAO,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,wHAAwH;QACxH,iBAAiB,CAAC,mCAAmC,EAAE,CAAC;QACxD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAtED,6CAsEC"}
+{"version":3,"file":"EntityQueryContextProvider.js","sourceRoot":"","sources":["../src/EntityQueryContextProvider.ts"],"names":[],"mappings":";;AAAA,6CAAyC;AAEzC,6DAM8B;AAE9B;;GAEG;AACH,MAA8B,0BAA0B;IACtD;;OAEG;IACI,eAAe;QACpB,OAAO,IAAI,uDAAkC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,CAAC;IAChF,CAAC;IAOD;;OAEG;IACO,kCAAkC;QAC1C,OAAO,gDAA2B,CAAC,OAAO,CAAC;IAC7C,CAAC;IAaD;;;OAGG;IACH,KAAK,CAAC,qBAAqB,CACzB,gBAA+E,EAC/E,iBAAqC;QAErC,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAEtE,iBAAiB,CAAC,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;YAC5C,MAAM,YAAY,GAAG,IAAI,oDAA+B,CACtD,cAAc,EACd,IAAI,EACJ,IAAA,wBAAU,GAAE,EACZ,iBAAiB,EAAE,2BAA2B,IAAI,IAAI,CAAC,kCAAkC,EAAE,CAC5F,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACpD,MAAM,YAAY,CAAC,0BAA0B,EAAE,CAAC;YAChD,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,MAAM,YAAY,CAAC,2BAA2B,EAAE,CAAC;QACjD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,2BAA2B,CAC/B,iBAAkD,EAClD,gBAA0F;QAE1F,MAAM,CAAC,aAAa,EAAE,iBAAiB,CAAC,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAEjF,iBAAiB,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,EAAE,EAAE;YACrE,MAAM,iBAAiB,GAAG,IAAI,0DAAqC,CACjE,mBAAmB,EACnB,iBAAiB,EACjB,IAAI,EACJ,IAAA,wBAAU,GAAE,EACZ,iBAAiB,CAAC,2BAA2B,CAC9C,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;YACzD,MAAM,iBAAiB,CAAC,0BAA0B,EAAE,CAAC;YACrD,OAAO,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,8GAA8G;QAC9G,MAAM,iBAAiB,CAAC,2BAA2B,EAAE,CAAC;QACtD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AApFD,6CAoFC"}

package/build/IEntityGenericCacher.d.ts

@@ -43,8 +43,8 @@ export default interface IEntityGenericCacher<TFields extends Record<string, any
      * from makeCacheKeyForStorage because invalidation can optionally be configured to invalidate a larger set of keys than
      * the one for just the current cache version, which can be useful for things like push safety.
      *
-     * @param key - load key of the cache key
-     * @param values - load values of the cache key
+     * @param key - load key for the cache keys
+     * @param value - load value for the cache keys
      */
     makeCacheKeysForInvalidation<TLoadKey extends IEntityLoadKey<TFields, TIDField, TSerializedLoadValue, TLoadValue>, TSerializedLoadValue, TLoadValue extends IEntityLoadValue<TSerializedLoadValue>>(key: TLoadKey, value: TLoadValue): readonly string[];
 }

package/build/internal/CompositeFieldHolder.d.ts

@@ -1,12 +1,17 @@
 import EntityConfiguration, { EntityCompositeField, EntityCompositeFieldValue } from '../EntityConfiguration';
 import { EntityLoadMethodType, IEntityLoadKey, IEntityLoadValue, LoadValueMap } from '../internal/EntityLoadInterfaces';
 declare const CompositeFieldHolderSerializedBrand: unique symbol;
+/**
+ * @internal
+ */
 export type SerializedCompositeFieldHolder = string & {
     readonly [CompositeFieldHolderSerializedBrand]: true;
 };
 /**
  * A load key that represents a composite field (set of fieldName) on an entity.
  * Must be defined in the entity configuration composite field definition.
+ *
+ * @internal
  */
 export declare class CompositeFieldHolder<TFields extends Record<string, any>, TIDField extends keyof TFields> implements IEntityLoadKey<TFields, TIDField, SerializedCompositeFieldValueHolder, CompositeFieldValueHolder<TFields, EntityCompositeField<TFields>>> {
     readonly compositeField: EntityCompositeField<TFields>;
@@ -28,11 +33,16 @@ export declare class CompositeFieldHolder<TFields extends Record<string, any>, T
     vendNewLoadValueMap<V>(): LoadValueMap<SerializedCompositeFieldValueHolder, CompositeFieldValueHolder<TFields, EntityCompositeField<TFields>>, V>;
 }
 declare const CompositeFieldValueHolderSerializedBrand: unique symbol;
+/**
+ * @internal
+ */
 export type SerializedCompositeFieldValueHolder = string & {
     readonly [CompositeFieldValueHolderSerializedBrand]: true;
 };
 /**
  * A load value for a CompositeFieldHolder.
+ *
+ * @internal
  */
 export declare class CompositeFieldValueHolder<TFields extends Record<string, any>, TCompositeField extends EntityCompositeField<TFields>> implements IEntityLoadValue<SerializedCompositeFieldValueHolder> {
     readonly compositeFieldValue: EntityCompositeFieldValue<TFields, TCompositeField>;
@@ -42,6 +52,9 @@ export declare class CompositeFieldValueHolder<TFields extends Record<string, an
     static deserialize<TFields extends Record<string, any>, TCompositeField extends EntityCompositeField<TFields>>(serialized: SerializedCompositeFieldValueHolder): CompositeFieldValueHolder<TFields, TCompositeField>;
     serialize(): SerializedCompositeFieldValueHolder;
 }
+/**
+ * @internal
+ */
 export declare class CompositeFieldValueHolderMap<TFields extends Record<string, any>, N extends EntityCompositeField<TFields>, V> extends LoadValueMap<SerializedCompositeFieldValueHolder, CompositeFieldValueHolder<TFields, N>, V> {
     protected deserializeKey(serializedKey: SerializedCompositeFieldValueHolder): CompositeFieldValueHolder<TFields, N>;
 }

package/build/internal/CompositeFieldHolder.js

@@ -11,6 +11,8 @@ const EntityLoadInterfaces_1 = require("../internal/EntityLoadInterfaces");
 /**
  * A load key that represents a composite field (set of fieldName) on an entity.
  * Must be defined in the entity configuration composite field definition.
+ *
+ * @internal
  */
 class CompositeFieldHolder {
     compositeField;
@@ -80,6 +82,8 @@ class CompositeFieldHolder {
 exports.CompositeFieldHolder = CompositeFieldHolder;
 /**
  * A load value for a CompositeFieldHolder.
+ *
+ * @internal
  */
 class CompositeFieldValueHolder {
     compositeFieldValue;
@@ -107,6 +111,9 @@ class CompositeFieldValueHolder {
     }
 }
 exports.CompositeFieldValueHolder = CompositeFieldValueHolder;
+/**
+ * @internal
+ */
 class CompositeFieldValueHolderMap extends EntityLoadInterfaces_1.LoadValueMap {
     deserializeKey(serializedKey) {
         return CompositeFieldValueHolder.deserialize(serializedKey);

package/build/internal/CompositeFieldHolder.js.map

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

package/build/internal/CompositeFieldValueMap.d.ts

@@ -1,5 +1,8 @@
 import { EntityCompositeField, EntityCompositeFieldValue } from '../EntityConfiguration';
 import { CompositeFieldValueHolder } from './CompositeFieldHolder';
+/**
+ * @internal
+ */
 export declare class CompositeFieldValueMap<TFields extends Record<string, any>, N extends EntityCompositeField<TFields>, TOutput> implements ReadonlyMap<EntityCompositeFieldValue<TFields, N>, TOutput> {
     private readonly map;
     constructor(entries: [CompositeFieldValueHolder<TFields, N>, TOutput][]);

package/build/internal/CompositeFieldValueMap.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompositeFieldValueMap = void 0;
 const CompositeFieldHolder_1 = require("./CompositeFieldHolder");
+/**
+ * @internal
+ */
 class CompositeFieldValueMap {
     map;
     constructor(entries) {

package/build/internal/CompositeFieldValueMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"CompositeFieldValueMap.js","sourceRoot":"","sources":["../../src/internal/CompositeFieldValueMap.ts"],"names":[],"mappings":";;;AACA,iEAGgC;AAEhC,MAAa,sBAAsB;IAMhB,GAAG,CAAoD;IAExE,YAAY,OAA2D;QACrE,MAAM,GAAG,GAAG,IAAI,GAAG,EAAgD,CAAC;QACpE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;YACnC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,GAAG,CAAC,mBAA0D;QAC5D,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,gDAAyB,CAAC,mBAAmB,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IACtF,CAAC;IAED,GAAG,CAAC,mBAA0D;QAC5D,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,gDAAyB,CAAC,mBAAmB,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IACtF,CAAC;IAED,OAAO,CACL,UAIS,EACT,OAAa;QAEb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC9B,UAAU,CAAC,IAAI,CACb,OAAO,EACP,KAAK,EACL,gDAAyB,CAAC,WAAW,CAAa,GAAG,CAAC,CAAC,mBAAmB,EAC1E,IAAI,CACL,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,CAAC,OAAO;QACN,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9C,MAAM,CAAC,gDAAyB,CAAC,WAAW,CAAa,GAAG,CAAC,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAED,CAAC,IAAI;QACH,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;YAClC,MAAM,gDAAyB,CAAC,WAAW,CAAa,GAAG,CAAC,CAAC,mBAAmB,CAAC;QACnF,CAAC;IACH,CAAC;IAED,CAAC,MAAM;QACL,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;YACtC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,CAAC,MAAM,CAAC,QAAQ,CAAC;QACf,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QACtB,OAAO,wBAAwB,CAAC;IAClC,CAAC;CACF;AAvED,wDAuEC"}
+{"version":3,"file":"CompositeFieldValueMap.js","sourceRoot":"","sources":["../../src/internal/CompositeFieldValueMap.ts"],"names":[],"mappings":";;;AACA,iEAGgC;AAEhC;;GAEG;AACH,MAAa,sBAAsB;IAMhB,GAAG,CAAoD;IAExE,YAAY,OAA2D;QACrE,MAAM,GAAG,GAAG,IAAI,GAAG,EAAgD,CAAC;QACpE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;YACnC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,GAAG,CAAC,mBAA0D;QAC5D,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,gDAAyB,CAAC,mBAAmB,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IACtF,CAAC;IAED,GAAG,CAAC,mBAA0D;QAC5D,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,gDAAyB,CAAC,mBAAmB,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IACtF,CAAC;IAED,OAAO,CACL,UAIS,EACT,OAAa;QAEb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC9B,UAAU,CAAC,IAAI,CACb,OAAO,EACP,KAAK,EACL,gDAAyB,CAAC,WAAW,CAAa,GAAG,CAAC,CAAC,mBAAmB,EAC1E,IAAI,CACL,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,CAAC,OAAO;QACN,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9C,MAAM,CAAC,gDAAyB,CAAC,WAAW,CAAa,GAAG,CAAC,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAED,CAAC,IAAI;QACH,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;YAClC,MAAM,gDAAyB,CAAC,WAAW,CAAa,GAAG,CAAC,CAAC,mBAAmB,CAAC;QACnF,CAAC;IACH,CAAC;IAED,CAAC,MAAM;QACL,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;YACtC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,CAAC,MAAM,CAAC,QAAQ,CAAC;QACf,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QACtB,OAAO,wBAAwB,CAAC;IAClC,CAAC;CACF;AAvED,wDAuEC"}

package/build/internal/EntityDataManager.d.ts

@@ -1,6 +1,6 @@
 import ReadThroughEntityCache from './ReadThroughEntityCache';
 import EntityDatabaseAdapter, { FieldEqualityCondition, QuerySelectionModifiers, QuerySelectionModifiersWithOrderByRaw } from '../EntityDatabaseAdapter';
-import { EntityQueryContext } from '../EntityQueryContext';
+import { EntityQueryContext, EntityTransactionalQueryContext } from '../EntityQueryContext';
 import EntityQueryContextProvider from '../EntityQueryContextProvider';
 import { IEntityLoadKey, IEntityLoadValue, LoadPair } from './EntityLoadInterfaces';
 import IEntityMetricsAdapter from '../metrics/IEntityMetricsAdapter';
@@ -9,6 +9,8 @@ import IEntityMetricsAdapter from '../metrics/IEntityMetricsAdapter';
  * data including local caches, EntityCacheAdapter, and EntityDatabaseAdapter.
  *
  * It is also responsible for invalidating all sources of data when mutated using EntityMutator.
+ *
+ * @internal
  */
 export default class EntityDataManager<TFields extends Record<string, any>, TIDField extends keyof TFields> {
     private readonly databaseAdapter;
@@ -16,10 +18,13 @@ export default class EntityDataManager<TFields extends Record<string, any>, TIDF
     private readonly queryContextProvider;
     private readonly metricsAdapter;
     private readonly entityClassName;
-    private readonly dataloaders;
+    private readonly dataLoaders;
+    private readonly transactionalDataLoaders;
     constructor(databaseAdapter: EntityDatabaseAdapter<TFields, TIDField>, entityCache: ReadThroughEntityCache<TFields, TIDField>, queryContextProvider: EntityQueryContextProvider, metricsAdapter: IEntityMetricsAdapter, entityClassName: string);
     private getDataLoaderForLoadKey;
-    private loadManyForDataLoaderAsync;
+    private loadManyForNonTransactionalDataLoaderAsync;
+    private getTransactionalDataLoaderForLoadKey;
+    private loadManyForTransactionalDataLoaderAsync;
     /**
      * Load many objects through read-through dataloader (batcher) and cache (optional).
      *
@@ -51,9 +56,23 @@ export default class EntityDataManager<TFields extends Record<string, any>, TIDF
      */
     loadManyByRawWhereClauseAsync(queryContext: EntityQueryContext, rawWhereClause: string, bindings: any[] | object, querySelectionModifiers: QuerySelectionModifiersWithOrderByRaw<TFields>): Promise<readonly Readonly<TFields>[]>;
     private invalidateOneAsync;
+    private invalidateOneForTransaction;
     /**
      * Invalidate all caches, in-memory or otherwise, for sets of key-value pairs.
      * @param pairs - key-value pairs to invalidate
      */
     invalidateKeyValuePairsAsync(pairs: readonly LoadPair<TFields, TIDField, any, any, any>[]): Promise<void>;
+    /**
+     * Invalidate all in-memory caches for sets of key-value pairs for all transactions and parent transactions.
+     * @param pairs - key-value pairs to invalidate
+     */
+    invalidateKeyValuePairsForTransaction(queryContext: EntityTransactionalQueryContext, pairs: readonly LoadPair<TFields, TIDField, any, any, any>[]): void;
+    /**
+     * Traverse to root of transactional query context tree.
+     */
+    private static getOutermostTransactionalQueryContextIfInNestedTransaction;
+    /**
+     * Get a list of all child query contexts recursively for a given query context.
+     */
+    private static getAllDescendantTransactionalQueryContexts;
 }

package/build/internal/EntityDataManager.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const dataloader_1 = __importDefault(require("dataloader"));
 const invariant_1 = __importDefault(require("invariant"));
+const EntityQueryContext_1 = require("../EntityQueryContext");
 const entityUtils_1 = require("../entityUtils");
 const EntityMetricsUtils_1 = require("../metrics/EntityMetricsUtils");
 const IEntityMetricsAdapter_1 = require("../metrics/IEntityMetricsAdapter");
@@ -14,6 +15,8 @@ const maps_1 = require("../utils/collections/maps");
  * data including local caches, EntityCacheAdapter, and EntityDatabaseAdapter.
  *
  * It is also responsible for invalidating all sources of data when mutated using EntityMutator.
+ *
+ * @internal
  */
 class EntityDataManager {
     databaseAdapter;
@@ -21,7 +24,10 @@ class EntityDataManager {
     queryContextProvider;
     metricsAdapter;
     entityClassName;
-    dataloaders = new Map();
+    // map from (load method type + data manager data loader key) to dataloader
+    dataLoaders = new Map();
+    // map from transaction id to dataloader map
+    transactionalDataLoaders = new Map();
     constructor(databaseAdapter, entityCache, queryContextProvider, metricsAdapter, entityClassName) {
         this.databaseAdapter = databaseAdapter;
         this.entityCache = entityCache;
@@ -30,17 +36,18 @@ class EntityDataManager {
         this.entityClassName = entityClassName;
     }
     getDataLoaderForLoadKey(key) {
-        return (0, maps_1.computeIfAbsent)(this.dataloaders, key.getLoadMethodType() + key.getDataManagerDataLoaderKey(), () => {
+        return (0, maps_1.computeIfAbsent)(this.dataLoaders, key.getLoadMethodType() + key.getDataManagerDataLoaderKey(), () => {
             return new dataloader_1.default(async (serializedLoadValues) => {
                 const values = serializedLoadValues.map((serializedLoadValue) => key.deserializeLoadValue(serializedLoadValue));
-                const objectMap = await this.loadManyForDataLoaderAsync(key, values);
+                const objectMap = await this.loadManyForNonTransactionalDataLoaderAsync(key, values);
                 return values.map((value) => objectMap.get(value) ?? []);
             });
         });
     }
-    async loadManyForDataLoaderAsync(key, values) {
+    async loadManyForNonTransactionalDataLoaderAsync(key, values) {
         this.metricsAdapter.incrementDataManagerLoadCount({
             type: IEntityMetricsAdapter_1.IncrementLoadCountEventType.CACHE,
+            isInTransaction: false,
             fieldValueCount: values.length,
             entityClassName: this.entityClassName,
             loadType: key.getLoadMethodType(),
@@ -48,6 +55,7 @@ class EntityDataManager {
         return await this.entityCache.readManyThroughAsync(key, values, async (fetcherValues) => {
             this.metricsAdapter.incrementDataManagerLoadCount({
                 type: IEntityMetricsAdapter_1.IncrementLoadCountEventType.DATABASE,
+                isInTransaction: false,
                 fieldValueCount: fetcherValues.length,
                 entityClassName: this.entityClassName,
                 loadType: key.getLoadMethodType(),
@@ -55,6 +63,29 @@ class EntityDataManager {
             return await this.databaseAdapter.fetchManyWhereAsync(this.queryContextProvider.getQueryContext(), key, fetcherValues);
         });
     }
+    getTransactionalDataLoaderForLoadKey(queryContext, key) {
+        const dataLoaderMapForTransaction = (0, maps_1.computeIfAbsent)(this.transactionalDataLoaders, queryContext.transactionId, () => new Map());
+        return (0, maps_1.computeIfAbsent)(dataLoaderMapForTransaction, key.getLoadMethodType() + key.getDataManagerDataLoaderKey(), () => {
+            return new dataloader_1.default(async (serializedLoadValues) => {
+                const values = serializedLoadValues.map((serializedLoadValue) => key.deserializeLoadValue(serializedLoadValue));
+                const objectMap = await this.loadManyForTransactionalDataLoaderAsync(queryContext, key, values);
+                return values.map((value) => objectMap.get(value) ?? []);
+            }, {
+                // only cache if transactional dataloader caching is enabled for the transactional query context
+                cache: queryContext.transactionalDataLoaderMode === EntityQueryContext_1.TransactionalDataLoaderMode.ENABLED,
+            });
+        });
+    }
+    async loadManyForTransactionalDataLoaderAsync(queryContext, key, values) {
+        this.metricsAdapter.incrementDataManagerLoadCount({
+            type: IEntityMetricsAdapter_1.IncrementLoadCountEventType.DATABASE,
+            isInTransaction: true,
+            fieldValueCount: values.length,
+            entityClassName: this.entityClassName,
+            loadType: key.getLoadMethodType(),
+        });
+        return await this.databaseAdapter.fetchManyWhereAsync(queryContext, key, values);
+    }
     /**
      * Load many objects through read-through dataloader (batcher) and cache (optional).
      *
@@ -64,21 +95,31 @@ class EntityDataManager {
      * @returns map from load value to objects that match the query for that load value
      */
     async loadManyEqualingAsync(queryContext, key, values) {
-        return await (0, EntityMetricsUtils_1.timeAndLogLoadMapEventAsync)(this.metricsAdapter, IEntityMetricsAdapter_1.EntityMetricsLoadType.LOAD_MANY, this.entityClassName)(this.loadManyEqualingInternalAsync(queryContext, key, values));
+        return await (0, EntityMetricsUtils_1.timeAndLogLoadMapEventAsync)(this.metricsAdapter, IEntityMetricsAdapter_1.EntityMetricsLoadType.LOAD_MANY, this.entityClassName, queryContext)(this.loadManyEqualingInternalAsync(queryContext, key, values));
     }
     async loadManyEqualingInternalAsync(queryContext, key, values) {
         key.validateRuntimeLoadValuesForDataManagerDataLoader(values, this.entityClassName);
-        // don't cache when in transaction, as rollbacks complicate things significantly
-        if (queryContext.isInTransaction()) {
+        if (queryContext.isInTransaction() &&
+            queryContext.transactionalDataLoaderMode === EntityQueryContext_1.TransactionalDataLoaderMode.DISABLED) {
+            this.metricsAdapter.incrementDataManagerLoadCount({
+                type: IEntityMetricsAdapter_1.IncrementLoadCountEventType.DATABASE,
+                isInTransaction: true,
+                fieldValueCount: values.length,
+                entityClassName: this.entityClassName,
+                loadType: key.getLoadMethodType(),
+            });
             return await this.databaseAdapter.fetchManyWhereAsync(queryContext, key, values);
         }
         this.metricsAdapter.incrementDataManagerLoadCount({
             type: IEntityMetricsAdapter_1.IncrementLoadCountEventType.DATALOADER,
+            isInTransaction: queryContext.isInTransaction(),
             fieldValueCount: values.length,
             entityClassName: this.entityClassName,
             loadType: key.getLoadMethodType(),
         });
-        const dataLoader = this.getDataLoaderForLoadKey(key);
+        const dataLoader = queryContext.isInTransaction()
+            ? this.getTransactionalDataLoaderForLoadKey(queryContext, key)
+            : this.getDataLoaderForLoadKey(key);
         const results = await dataLoader.loadMany(values.map((v) => key.serializeLoadValue(v)));
         const [successfulValues, errors] = (0, entityUtils_1.partitionErrors)(results);
         if (errors.length > 0) {
@@ -102,7 +143,7 @@ class EntityDataManager {
      * @returns array of objects matching the query
      */
     async loadManyByFieldEqualityConjunctionAsync(queryContext, fieldEqualityOperands, querySelectionModifiers) {
-        return await (0, EntityMetricsUtils_1.timeAndLogLoadEventAsync)(this.metricsAdapter, IEntityMetricsAdapter_1.EntityMetricsLoadType.LOAD_MANY_EQUALITY_CONJUNCTION, this.entityClassName)(this.databaseAdapter.fetchManyByFieldEqualityConjunctionAsync(queryContext, fieldEqualityOperands, querySelectionModifiers));
+        return await (0, EntityMetricsUtils_1.timeAndLogLoadEventAsync)(this.metricsAdapter, IEntityMetricsAdapter_1.EntityMetricsLoadType.LOAD_MANY_EQUALITY_CONJUNCTION, this.entityClassName, queryContext)(this.databaseAdapter.fetchManyByFieldEqualityConjunctionAsync(queryContext, fieldEqualityOperands, querySelectionModifiers));
     }
     /**
      * Loads many objects matching the raw WHERE clause.
@@ -114,20 +155,67 @@ class EntityDataManager {
      * @returns array of objects matching the query
      */
     async loadManyByRawWhereClauseAsync(queryContext, rawWhereClause, bindings, querySelectionModifiers) {
-        return await (0, EntityMetricsUtils_1.timeAndLogLoadEventAsync)(this.metricsAdapter, IEntityMetricsAdapter_1.EntityMetricsLoadType.LOAD_MANY_RAW, this.entityClassName)(this.databaseAdapter.fetchManyByRawWhereClauseAsync(queryContext, rawWhereClause, bindings, querySelectionModifiers));
+        return await (0, EntityMetricsUtils_1.timeAndLogLoadEventAsync)(this.metricsAdapter, IEntityMetricsAdapter_1.EntityMetricsLoadType.LOAD_MANY_RAW, this.entityClassName, queryContext)(this.databaseAdapter.fetchManyByRawWhereClauseAsync(queryContext, rawWhereClause, bindings, querySelectionModifiers));
     }
     async invalidateOneAsync(key, value) {
         await this.entityCache.invalidateManyAsync(key, [value]);
         this.getDataLoaderForLoadKey(key).clear(key.serializeLoadValue(value));
     }
+    invalidateOneForTransaction(queryContext, key, value) {
+        this.getTransactionalDataLoaderForLoadKey(queryContext, key).clear(key.serializeLoadValue(value));
+    }
     /**
      * Invalidate all caches, in-memory or otherwise, for sets of key-value pairs.
      * @param pairs - key-value pairs to invalidate
      */
     async invalidateKeyValuePairsAsync(pairs) {
-        // TODO(wschurman): check for races with load
         await Promise.all(pairs.map(([key, value]) => this.invalidateOneAsync(key, value)));
     }
+    /**
+     * Invalidate all in-memory caches for sets of key-value pairs for all transactions and parent transactions.
+     * @param pairs - key-value pairs to invalidate
+     */
+    invalidateKeyValuePairsForTransaction(queryContext, pairs) {
+        if (queryContext.transactionalDataLoaderMode === EntityQueryContext_1.TransactionalDataLoaderMode.DISABLED) {
+            return;
+        }
+        // invalidate all query contexts in transaction tree
+        const outermostTransactionalQueryContext = EntityDataManager.getOutermostTransactionalQueryContextIfInNestedTransaction(queryContext);
+        const allQueryContextsToInvalidate = [
+            outermostTransactionalQueryContext,
+            ...EntityDataManager.getAllDescendantTransactionalQueryContexts(outermostTransactionalQueryContext),
+        ];
+        for (const currentQueryContext of allQueryContextsToInvalidate) {
+            for (const [key, value] of pairs) {
+                this.invalidateOneForTransaction(currentQueryContext, key, value);
+            }
+        }
+    }
+    /**
+     * Traverse to root of transactional query context tree.
+     */
+    static getOutermostTransactionalQueryContextIfInNestedTransaction(queryContext) {
+        if (queryContext.isInNestedTransaction()) {
+            return EntityDataManager.getOutermostTransactionalQueryContextIfInNestedTransaction(queryContext.parentQueryContext);
+        }
+        else {
+            return queryContext;
+        }
+    }
+    /**
+     * Get a list of all child query contexts recursively for a given query context.
+     */
+    static getAllDescendantTransactionalQueryContexts(queryContext) {
+        if (queryContext.childQueryContexts.length === 0) {
+            return [];
+        }
+        return queryContext.childQueryContexts.flatMap((childQueryContext) => {
+            return [
+                childQueryContext,
+                ...EntityDataManager.getAllDescendantTransactionalQueryContexts(childQueryContext),
+            ];
+        });
+    }
 }
 exports.default = EntityDataManager;
 //# sourceMappingURL=EntityDataManager.js.map