@expo/entity 0.40.0 → 0.42.0

package/build/EnforcingEntityLoader.d.ts

@@ -1,4 +1,5 @@
 import AuthorizationResultBasedEntityLoader from './AuthorizationResultBasedEntityLoader';
+import { EntityCompositeField, EntityCompositeFieldValue } from './EntityConfiguration';
 import { FieldEqualityCondition, QuerySelectionModifiers, QuerySelectionModifiersWithOrderByRaw } from './EntityDatabaseAdapter';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import ReadonlyEntity from './ReadonlyEntity';
@@ -8,59 +9,144 @@ import ViewerContext from './ViewerContext';
  * cached, and authorized against the entity's EntityPrivacyPolicy. All loads
  * through this loader will throw if the load is not successful.
  */
-export default class EnforcingEntityLoader<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields>, TSelectedFields extends keyof TFields> {
+export default class EnforcingEntityLoader<TFields extends Record<string, any>, TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>, TSelectedFields extends keyof TFields> {
     private readonly entityLoader;
-    constructor(entityLoader: AuthorizationResultBasedEntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>);
+    constructor(entityLoader: AuthorizationResultBasedEntityLoader<TFields, TIDField, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>);
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load many entities where fieldName is one of fieldValues.
+     * @param fieldName - entity field being queried
+     * @param fieldValues - fieldName field values being queried
+     * @returns map from fieldValue to entities that match the query for that fieldValue
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
      */
     loadManyByFieldEqualingManyAsync<N extends keyof Pick<TFields, TSelectedFields>>(fieldName: N, fieldValues: readonly NonNullable<TFields[N]>[]): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly TEntity[]>>;
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load many entities where compositeField is one of compositeFieldValues.
+     * @param compositeField - composite field being queried
+     * @param compositeFieldValues - compositeField values being queried
+     * @returns map from compositeFieldValue to entities that match the query for that compositeFieldValue
+     * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     */
+    loadManyByCompositeFieldEqualingManyAsync<N extends EntityCompositeField<Pick<TFields, TSelectedFields>>>(compositeField: N, compositeFieldValues: readonly EntityCompositeFieldValue<Pick<TFields, TSelectedFields>, N>[]): Promise<ReadonlyMap<EntityCompositeFieldValue<TFields, N>, readonly TEntity[]>>;
+    /**
+     * Load many entities where fieldName equals fieldValue.
+     * @param fieldName - entity field being queried
+     * @param fieldValue - fieldName field value being queried
+     * @returns array of entities that match the query for fieldValue
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
      */
     loadManyByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(fieldName: N, fieldValue: NonNullable<TFields[N]>): Promise<readonly TEntity[]>;
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load many entities where compositeField equals compositeFieldValue.
+     * @param compositeField - composite field being queried
+     * @param compositeFieldValue - compositeField value being queried
+     * @returns array of entities that match the query for compositeFieldValue
+     * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     */
+    loadManyByCompositeFieldEqualingAsync<N extends EntityCompositeField<Pick<TFields, TSelectedFields>>>(compositeField: N, compositeFieldValue: EntityCompositeFieldValue<Pick<TFields, TSelectedFields>, N>): Promise<readonly TEntity[]>;
+    /**
+     * Load an entity where fieldName equals fieldValue, or null if no entity exists.
+     * @param uniqueFieldName - entity field being queried
+     * @param fieldValue - uniqueFieldName field value being queried
+     * @returns entity where uniqueFieldName equals fieldValue, or null if no entity matches the condition.
+     * @throws when multiple entities match the condition
      * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
-     * @throws when multiple entities are found matching the condition
      */
     loadByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(uniqueFieldName: N, fieldValue: NonNullable<TFields[N]>): Promise<TEntity | null>;
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load an entity where compositeField equals compositeFieldValue, or null if no entity exists.
+     * @param compositeField - composite field being queried
+     * @param compositeFieldValue - compositeField value being queried
+     * @returns entity where compositeField equals compositeFieldValue, or null if no entity matches the condition.
+     * @throws when multiple entities match the condition
+     * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
+     */
+    loadByCompositeFieldEqualingAsync<N extends EntityCompositeField<Pick<TFields, TSelectedFields>>>(compositeField: N, compositeFieldValue: EntityCompositeFieldValue<Pick<TFields, TSelectedFields>, N>): Promise<TEntity | null>;
+    /**
+     * Loads an entity by a specified ID.
+     * @param id - ID of the entity
+     * @returns entity matching ID
      * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
+     * @throws EntityNotFoundError when no entity exists for ID
      */
-    loadByIDAsync(id: TID): Promise<TEntity>;
+    loadByIDAsync(id: TFields[TIDField]): Promise<TEntity>;
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load an entity by a specified ID, or return null if non-existent.
+     * @param id - ID of the entity
+     * @returns entity for matching ID, or null if no entity exists for ID.
      * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
      * @throws when multiple entities are found matching the condition
      */
-    loadByIDNullableAsync(id: TID): Promise<TEntity | null>;
+    loadByIDNullableAsync(id: TFields[TIDField]): Promise<TEntity | null>;
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Loads many entities for a list of IDs.
+     * @param ids - IDs of the entities to load
+     * @returns map from ID to corresponding entity result, where result error can be UnauthorizedError or EntityNotFoundError.
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     * @throws EntityNotFoundError when no entity exists for one or more of the IDs
      */
-    loadManyByIDsAsync(ids: readonly TID[]): Promise<ReadonlyMap<TID, TEntity>>;
+    loadManyByIDsAsync(ids: readonly TFields[TIDField][]): Promise<ReadonlyMap<TFields[TIDField], TEntity>>;
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Loads many entities for a list of IDs, returning null for any IDs that are non-existent.
+     * @param ids - IDs of the entities to load
+     * @returns map from ID to nullable corresponding entity
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
      */
-    loadManyByIDsNullableAsync(ids: readonly TID[]): Promise<ReadonlyMap<TID, TEntity | null>>;
+    loadManyByIDsNullableAsync(ids: readonly TFields[TIDField][]): Promise<ReadonlyMap<TFields[TIDField], TEntity | null>>;
     /**
-     * Enforcing version of entity loader method by the same name.
-     * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     * Loads the first entity matching the selection constructed from the conjunction of specified
+     * operands, or null if no matching entity exists. Entities loaded using this method are not
+     * batched or cached.
+     *
+     * This is a convenience method for {@link loadManyByFieldEqualityConjunctionAsync}. However, the
+     * `orderBy` option must be specified to define what "first" means. If ordering doesn't matter,
+     * explicitly pass in an empty array.
+     *
+     * @param fieldEqualityOperands - list of field equality selection operand specifications
+     * @param querySelectionModifiers - orderBy and optional offset for the query
+     * @returns the first entity that matches the query or null if no entity matches the query
+     * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
      */
     loadFirstByFieldEqualityConjunctionAsync<N extends keyof Pick<TFields, TSelectedFields>>(fieldEqualityOperands: FieldEqualityCondition<TFields, N>[], querySelectionModifiers: Omit<QuerySelectionModifiers<TFields>, 'limit'> & Required<Pick<QuerySelectionModifiers<TFields>, 'orderBy'>>): Promise<TEntity | null>;
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Loads many entities matching the selection constructed from the conjunction of specified operands.
+     * Entities loaded using this method are not batched or cached.
+     *
+     * @example
+     * fieldEqualityOperands:
+     * `[{fieldName: 'hello', fieldValue: 1}, {fieldName: 'world', fieldValues: [2, 3]}]`
+     * Entities returned with a SQL EntityDatabaseAdapter:
+     * `WHERE hello = 1 AND world = ANY({2, 3})`
+     *
+     * @param fieldEqualityOperands - list of field equality selection operand specifications
+     * @param querySelectionModifiers - limit, offset, and orderBy for the query
+     * @returns array of entities that match the query
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
      */
     loadManyByFieldEqualityConjunctionAsync<N extends keyof Pick<TFields, TSelectedFields>>(fieldEqualityOperands: FieldEqualityCondition<TFields, N>[], querySelectionModifiers?: QuerySelectionModifiers<TFields>): Promise<readonly TEntity[]>;
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Loads many entities matching the raw WHERE clause. Corresponds to the knex `whereRaw` argument format.
+     *
+     * @remarks
+     * Important notes:
+     * - Fields in clause are database column names instead of transformed entity field names.
+     * - Entities loaded using this method are not batched or cached.
+     * - Not all database adapters implement the ability to execute this method of fetching entities.
+     *
+     * @example
+     * rawWhereClause: `id = ?`
+     * bindings: `[1]`
+     * Entites returned `WHERE id = 1`
+     *
+     * http://knexjs.org/#Builder-whereRaw
+     * http://knexjs.org/#Raw-Bindings
+     *
+     * @param rawWhereClause - parameterized SQL WHERE clause with positional binding placeholders or named binding placeholders
+     * @param bindings - array of positional bindings or object of named bindings
+     * @param querySelectionModifiers - limit, offset, orderBy, and orderByRaw for the query
+     * @returns array of entities that match the query
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     * @throws Error when rawWhereClause or bindings are invalid
      */
     loadManyByRawWhereClauseAsync(rawWhereClause: string, bindings: any[] | object, querySelectionModifiers?: QuerySelectionModifiersWithOrderByRaw<TFields>): Promise<readonly TEntity[]>;
 }

package/build/EnforcingEntityLoader.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const CompositeFieldHolder_1 = require("./internal/CompositeFieldHolder");
+const CompositeFieldValueMap_1 = require("./internal/CompositeFieldValueMap");
 const maps_1 = require("./utils/collections/maps");
 /**
  * Enforcing entity loader. All normal loads are batched,
@@ -12,7 +14,10 @@ class EnforcingEntityLoader {
         this.entityLoader = entityLoader;
     }
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load many entities where fieldName is one of fieldValues.
+     * @param fieldName - entity field being queried
+     * @param fieldValues - fieldName field values being queried
+     * @returns map from fieldValue to entities that match the query for that fieldValue
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
      */
     async loadManyByFieldEqualingManyAsync(fieldName, fieldValues) {
@@ -20,7 +25,26 @@ class EnforcingEntityLoader {
         return (0, maps_1.mapMap)(fieldValuesToResults, (results) => results.map((result) => result.enforceValue()));
     }
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load many entities where compositeField is one of compositeFieldValues.
+     * @param compositeField - composite field being queried
+     * @param compositeFieldValues - compositeField values being queried
+     * @returns map from compositeFieldValue to entities that match the query for that compositeFieldValue
+     * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     */
+    async loadManyByCompositeFieldEqualingManyAsync(compositeField, compositeFieldValues) {
+        const compositeFieldValuesToResults = await this.entityLoader.loadManyByCompositeFieldEqualingManyAsync(compositeField, compositeFieldValues);
+        return new CompositeFieldValueMap_1.CompositeFieldValueMap(Array.from(compositeFieldValuesToResults.entries()).map(([compositeFieldValue, results]) => {
+            return [
+                new CompositeFieldHolder_1.CompositeFieldValueHolder(compositeFieldValue),
+                results.map((result) => result.enforceValue()),
+            ];
+        }));
+    }
+    /**
+     * Load many entities where fieldName equals fieldValue.
+     * @param fieldName - entity field being queried
+     * @param fieldValue - fieldName field value being queried
+     * @returns array of entities that match the query for fieldValue
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
      */
     async loadManyByFieldEqualingAsync(fieldName, fieldValue) {
@@ -28,24 +52,55 @@ class EnforcingEntityLoader {
         return entityResults.map((result) => result.enforceValue());
     }
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load many entities where compositeField equals compositeFieldValue.
+     * @param compositeField - composite field being queried
+     * @param compositeFieldValue - compositeField value being queried
+     * @returns array of entities that match the query for compositeFieldValue
+     * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     */
+    async loadManyByCompositeFieldEqualingAsync(compositeField, compositeFieldValue) {
+        const entityResults = await this.entityLoader.loadManyByCompositeFieldEqualingAsync(compositeField, compositeFieldValue);
+        return entityResults.map((result) => result.enforceValue());
+    }
+    /**
+     * Load an entity where fieldName equals fieldValue, or null if no entity exists.
+     * @param uniqueFieldName - entity field being queried
+     * @param fieldValue - uniqueFieldName field value being queried
+     * @returns entity where uniqueFieldName equals fieldValue, or null if no entity matches the condition.
+     * @throws when multiple entities match the condition
      * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
-     * @throws when multiple entities are found matching the condition
      */
     async loadByFieldEqualingAsync(uniqueFieldName, fieldValue) {
         const entityResult = await this.entityLoader.loadByFieldEqualingAsync(uniqueFieldName, fieldValue);
         return entityResult ? entityResult.enforceValue() : null;
     }
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load an entity where compositeField equals compositeFieldValue, or null if no entity exists.
+     * @param compositeField - composite field being queried
+     * @param compositeFieldValue - compositeField value being queried
+     * @returns entity where compositeField equals compositeFieldValue, or null if no entity matches the condition.
+     * @throws when multiple entities match the condition
+     * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
+     */
+    async loadByCompositeFieldEqualingAsync(compositeField, compositeFieldValue) {
+        const entityResult = await this.entityLoader.loadByCompositeFieldEqualingAsync(compositeField, compositeFieldValue);
+        return entityResult ? entityResult.enforceValue() : null;
+    }
+    /**
+     * Loads an entity by a specified ID.
+     * @param id - ID of the entity
+     * @returns entity matching ID
      * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
+     * @throws EntityNotFoundError when no entity exists for ID
      */
     async loadByIDAsync(id) {
         const entityResult = await this.entityLoader.loadByIDAsync(id);
         return entityResult.enforceValue();
     }
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Load an entity by a specified ID, or return null if non-existent.
+     * @param id - ID of the entity
+     * @returns entity for matching ID, or null if no entity exists for ID.
      * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
      * @throws when multiple entities are found matching the condition
      */
@@ -54,15 +109,20 @@ class EnforcingEntityLoader {
         return entityResult ? entityResult.enforceValue() : null;
     }
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Loads many entities for a list of IDs.
+     * @param ids - IDs of the entities to load
+     * @returns map from ID to corresponding entity result, where result error can be UnauthorizedError or EntityNotFoundError.
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     * @throws EntityNotFoundError when no entity exists for one or more of the IDs
      */
     async loadManyByIDsAsync(ids) {
         const entityResults = await this.entityLoader.loadManyByIDsAsync(ids);
         return (0, maps_1.mapMap)(entityResults, (result) => result.enforceValue());
     }
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Loads many entities for a list of IDs, returning null for any IDs that are non-existent.
+     * @param ids - IDs of the entities to load
+     * @returns map from ID to nullable corresponding entity
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
      */
     async loadManyByIDsNullableAsync(ids) {
@@ -70,15 +130,36 @@ class EnforcingEntityLoader {
         return (0, maps_1.mapMap)(entityResults, (result) => result?.enforceValue() ?? null);
     }
     /**
-     * Enforcing version of entity loader method by the same name.
-     * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     * Loads the first entity matching the selection constructed from the conjunction of specified
+     * operands, or null if no matching entity exists. Entities loaded using this method are not
+     * batched or cached.
+     *
+     * This is a convenience method for {@link loadManyByFieldEqualityConjunctionAsync}. However, the
+     * `orderBy` option must be specified to define what "first" means. If ordering doesn't matter,
+     * explicitly pass in an empty array.
+     *
+     * @param fieldEqualityOperands - list of field equality selection operand specifications
+     * @param querySelectionModifiers - orderBy and optional offset for the query
+     * @returns the first entity that matches the query or null if no entity matches the query
+     * @throws EntityNotAuthorizedError when viewer is not authorized to view the returned entity
      */
     async loadFirstByFieldEqualityConjunctionAsync(fieldEqualityOperands, querySelectionModifiers) {
         const entityResult = await this.entityLoader.loadFirstByFieldEqualityConjunctionAsync(fieldEqualityOperands, querySelectionModifiers);
         return entityResult ? entityResult.enforceValue() : null;
     }
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Loads many entities matching the selection constructed from the conjunction of specified operands.
+     * Entities loaded using this method are not batched or cached.
+     *
+     * @example
+     * fieldEqualityOperands:
+     * `[{fieldName: 'hello', fieldValue: 1}, {fieldName: 'world', fieldValues: [2, 3]}]`
+     * Entities returned with a SQL EntityDatabaseAdapter:
+     * `WHERE hello = 1 AND world = ANY({2, 3})`
+     *
+     * @param fieldEqualityOperands - list of field equality selection operand specifications
+     * @param querySelectionModifiers - limit, offset, and orderBy for the query
+     * @returns array of entities that match the query
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
      */
     async loadManyByFieldEqualityConjunctionAsync(fieldEqualityOperands, querySelectionModifiers = {}) {
@@ -86,8 +167,28 @@ class EnforcingEntityLoader {
         return entityResults.map((result) => result.enforceValue());
     }
     /**
-     * Enforcing version of entity loader method by the same name.
+     * Loads many entities matching the raw WHERE clause. Corresponds to the knex `whereRaw` argument format.
+     *
+     * @remarks
+     * Important notes:
+     * - Fields in clause are database column names instead of transformed entity field names.
+     * - Entities loaded using this method are not batched or cached.
+     * - Not all database adapters implement the ability to execute this method of fetching entities.
+     *
+     * @example
+     * rawWhereClause: `id = ?`
+     * bindings: `[1]`
+     * Entites returned `WHERE id = 1`
+     *
+     * http://knexjs.org/#Builder-whereRaw
+     * http://knexjs.org/#Raw-Bindings
+     *
+     * @param rawWhereClause - parameterized SQL WHERE clause with positional binding placeholders or named binding placeholders
+     * @param bindings - array of positional bindings or object of named bindings
+     * @param querySelectionModifiers - limit, offset, orderBy, and orderByRaw for the query
+     * @returns array of entities that match the query
      * @throws EntityNotAuthorizedError when viewer is not authorized to view one or more of the returned entities
+     * @throws Error when rawWhereClause or bindings are invalid
      */
     async loadManyByRawWhereClauseAsync(rawWhereClause, bindings, querySelectionModifiers = {}) {
         const entityResults = await this.entityLoader.loadManyByRawWhereClauseAsync(rawWhereClause, bindings, querySelectionModifiers);

package/build/EnforcingEntityLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnforcingEntityLoader.js","sourceRoot":"","sources":["../src/EnforcingEntityLoader.ts"],"names":[],"mappings":";;AASA,mDAAkD;AAElD;;;;GAIG;AACH,MAAqB,qBAAqB;IAerB;IADnB,YACmB,YAOhB;QAPgB,iBAAY,GAAZ,YAAY,CAO5B;IACA,CAAC;IAEJ;;;OAGG;IACH,KAAK,CAAC,gCAAgC,CACpC,SAAY,EACZ,WAA+C;QAE/C,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,gCAAgC,CACnF,SAAS,EACT,WAAW,CACZ,CAAC;QACF,OAAO,IAAA,aAAM,EAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,EAAE,CAC9C,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAC/C,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,4BAA4B,CAChC,SAAY,EACZ,UAAmC;QAEnC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,4BAA4B,CACxE,SAAS,EACT,UAAU,CACX,CAAC;QACF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,wBAAwB,CAC5B,eAAkB,EAClB,UAAmC;QAEnC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,wBAAwB,CACnE,eAAe,EACf,UAAU,CACX,CAAC;QACF,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa,CAAC,EAAO;QACzB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC/D,OAAO,YAAY,CAAC,YAAY,EAAE,CAAC;IACrC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CAAC,EAAO;QACjC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACvE,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,kBAAkB,CAAC,GAAmB;QAC1C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACtE,OAAO,IAAA,aAAM,EAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAClE,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,0BAA0B,CAAC,GAAmB;QAClD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAC;QAC9E,OAAO,IAAA,aAAM,EAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,IAAI,CAAC,CAAC;IAC3E,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,wCAAwC,CAC5C,qBAA2D,EAC3D,uBAC6D;QAE7D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,wCAAwC,CACnF,qBAAqB,EACrB,uBAAuB,CACxB,CAAC;QACF,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,uCAAuC,CAC3C,qBAA2D,EAC3D,0BAA4D,EAAE;QAE9D,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uCAAuC,CACnF,qBAAqB,EACrB,uBAAuB,CACxB,CAAC;QACF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,6BAA6B,CACjC,cAAsB,EACtB,QAAwB,EACxB,0BAA0E,EAAE;QAE5E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,6BAA6B,CACzE,cAAc,EACd,QAAQ,EACR,uBAAuB,CACxB,CAAC;QACF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;CACF;AA7JD,wCA6JC"}
+{"version":3,"file":"EnforcingEntityLoader.js","sourceRoot":"","sources":["../src/EnforcingEntityLoader.ts"],"names":[],"mappings":";;AAUA,0EAA4E;AAC5E,8EAA2E;AAC3E,mDAAkD;AAElD;;;;GAIG;AACH,MAAqB,qBAAqB;IAerB;IADnB,YACmB,YAOhB;QAPgB,iBAAY,GAAZ,YAAY,CAO5B;IACA,CAAC;IAEJ;;;;;;OAMG;IACH,KAAK,CAAC,gCAAgC,CACpC,SAAY,EACZ,WAA+C;QAE/C,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,gCAAgC,CACnF,SAAS,EACT,WAAW,CACZ,CAAC;QACF,OAAO,IAAA,aAAM,EAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,EAAE,CAC9C,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAC/C,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,yCAAyC,CAG7C,cAAiB,EACjB,oBAA6F;QAE7F,MAAM,6BAA6B,GACjC,MAAM,IAAI,CAAC,YAAY,CAAC,yCAAyC,CAC/D,cAAc,EACd,oBAAoB,CACrB,CAAC;QAEJ,OAAO,IAAI,+CAAsB,CAC/B,KAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE,EAAE;YACzF,OAAO;gBACL,IAAI,gDAAyB,CAAC,mBAAmB,CAAC;gBAClD,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;aAC/C,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,4BAA4B,CAChC,SAAY,EACZ,UAAmC;QAEnC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,4BAA4B,CACxE,SAAS,EACT,UAAU,CACX,CAAC;QACF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qCAAqC,CAGzC,cAAiB,EACjB,mBAAiF;QAEjF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,qCAAqC,CACjF,cAAc,EACd,mBAAmB,CACpB,CAAC;QACF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,wBAAwB,CAC5B,eAAkB,EAClB,UAAmC;QAEnC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,wBAAwB,CACnE,eAAe,EACf,UAAU,CACX,CAAC;QACF,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,iCAAiC,CAGrC,cAAiB,EACjB,mBAAiF;QAEjF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iCAAiC,CAC5E,cAAc,EACd,mBAAmB,CACpB,CAAC;QACF,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CAAC,EAAqB;QACvC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC/D,OAAO,YAAY,CAAC,YAAY,EAAE,CAAC;IACrC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qBAAqB,CAAC,EAAqB;QAC/C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACvE,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,kBAAkB,CACtB,GAAiC;QAEjC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACtE,OAAO,IAAA,aAAM,EAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAClE,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,0BAA0B,CAC9B,GAAiC;QAEjC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAC;QAC9E,OAAO,IAAA,aAAM,EAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,IAAI,CAAC,CAAC;IAC3E,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,wCAAwC,CAC5C,qBAA2D,EAC3D,uBAC6D;QAE7D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,wCAAwC,CACnF,qBAAqB,EACrB,uBAAuB,CACxB,CAAC;QACF,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,uCAAuC,CAC3C,qBAA2D,EAC3D,0BAA4D,EAAE;QAE9D,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uCAAuC,CACnF,qBAAqB,EACrB,uBAAuB,CACxB,CAAC;QACF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,KAAK,CAAC,6BAA6B,CACjC,cAAsB,EACtB,QAAwB,EACxB,0BAA0E,EAAE;QAE5E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,6BAA6B,CACzE,cAAc,EACd,QAAQ,EACR,uBAAuB,CACxB,CAAC;QACF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;CACF;AAnSD,wCAmSC"}

package/build/EnforcingEntityUpdater.d.ts

@@ -6,9 +6,9 @@ import ViewerContext from './ViewerContext';
  * Enforcing entity updater. All updates
  * through this updater will throw if authorization is not successful.
  */
-export default class EnforcingEntityUpdater<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields>, TSelectedFields extends keyof TFields> {
+export default class EnforcingEntityUpdater<TFields extends Record<string, any>, TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>, TSelectedFields extends keyof TFields> {
     private readonly entityUpdater;
-    constructor(entityUpdater: AuthorizationResultBasedUpdateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>);
+    constructor(entityUpdater: AuthorizationResultBasedUpdateMutator<TFields, TIDField, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>);
     /**
      * Set the value for entity field.
      * @param fieldName - entity field being updated

package/build/Entity.d.ts

@@ -1,9 +1,10 @@
+import { AuthorizationResultBasedCreateMutator, AuthorizationResultBasedDeleteMutator, AuthorizationResultBasedUpdateMutator } from './AuthorizationResultBasedEntityMutator';
+import EnforcingEntityCreator from './EnforcingEntityCreator';
+import EnforcingEntityDeleter from './EnforcingEntityDeleter';
+import EnforcingEntityUpdater from './EnforcingEntityUpdater';
 import { EntityCompanionDefinition } from './EntityCompanionProvider';
-import EntityCreator from './EntityCreator';
-import EntityDeleter from './EntityDeleter';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
-import EntityUpdater from './EntityUpdater';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
 /**
@@ -24,36 +25,57 @@ import ViewerContext from './ViewerContext';
  * All concrete entity implementations should extend this class and provide their
  * own EntityCompanionDefinition.
  */
-export default abstract class Entity<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TSelectedFields extends keyof TFields = keyof TFields> extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields> {
+export default abstract class Entity<TFields extends Record<string, any>, TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>, TViewerContext extends ViewerContext, TSelectedFields extends keyof TFields = keyof TFields> extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields> {
     /**
      * Vend mutator for creating a new entity in given query context.
      * @param viewerContext - viewer context of creating user
      * @param queryContext - query context in which to perform the create
      * @returns mutator for creating an entity
      */
-    static creator<TMFields extends object, TMID extends NonNullable<TMFields[TMSelectedFields]>, TMViewerContext extends ViewerContext, TMViewerContext2 extends TMViewerContext, TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>, TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity, TMSelectedFields>, TMSelectedFields extends keyof TMFields = keyof TMFields>(this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>, viewerContext: TMViewerContext2, queryContext?: EntityQueryContext): EntityCreator<TMFields, TMID, TMViewerContext, TMViewerContext2, TMEntity, TMPrivacyPolicy, TMSelectedFields>;
+    static creator<TMFields extends object, TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>, TMViewerContext extends ViewerContext, TMViewerContext2 extends TMViewerContext, TMEntity extends Entity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>, TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMIDField, TMViewerContext, TMEntity, TMSelectedFields>, TMSelectedFields extends keyof TMFields = keyof TMFields>(this: IEntityClass<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>, viewerContext: TMViewerContext2, queryContext?: EntityQueryContext): EnforcingEntityCreator<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>;
+    /**
+     * Vend mutator for creating a new entity in given query context.
+     * @param viewerContext - viewer context of creating user
+     * @param queryContext - query context in which to perform the create
+     * @returns mutator for creating an entity
+     */
+    static creatorWithAuthorizationResults<TMFields extends object, TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>, TMViewerContext extends ViewerContext, TMViewerContext2 extends TMViewerContext, TMEntity extends Entity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>, TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMIDField, TMViewerContext, TMEntity, TMSelectedFields>, TMSelectedFields extends keyof TMFields = keyof TMFields>(this: IEntityClass<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>, viewerContext: TMViewerContext2, queryContext?: EntityQueryContext): AuthorizationResultBasedCreateMutator<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>;
+    /**
+     * Vend mutator for updating an existing entity in given query context.
+     * @param existingEntity - entity to update
+     * @param queryContext - query context in which to perform the update
+     * @returns mutator for updating existingEntity
+     */
+    static updater<TMFields extends object, TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>, TMViewerContext extends ViewerContext, TMEntity extends Entity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>, TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMIDField, TMViewerContext, TMEntity, TMSelectedFields>, TMSelectedFields extends keyof TMFields = keyof TMFields>(this: IEntityClass<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>, existingEntity: TMEntity, queryContext?: EntityQueryContext): EnforcingEntityUpdater<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>;
     /**
      * Vend mutator for updating an existing entity in given query context.
      * @param existingEntity - entity to update
      * @param queryContext - query context in which to perform the update
      * @returns mutator for updating existingEntity
      */
-    static updater<TMFields extends object, TMID extends NonNullable<TMFields[TMSelectedFields]>, TMViewerContext extends ViewerContext, TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>, TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity, TMSelectedFields>, TMSelectedFields extends keyof TMFields = keyof TMFields>(this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>, existingEntity: TMEntity, queryContext?: EntityQueryContext): EntityUpdater<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>;
+    static updaterWithAuthorizationResults<TMFields extends object, TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>, TMViewerContext extends ViewerContext, TMEntity extends Entity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>, TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMIDField, TMViewerContext, TMEntity, TMSelectedFields>, TMSelectedFields extends keyof TMFields = keyof TMFields>(this: IEntityClass<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>, existingEntity: TMEntity, queryContext?: EntityQueryContext): AuthorizationResultBasedUpdateMutator<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>;
+    /**
+     * Vend mutator for deleting an existing entity in given query context.
+     * @param existingEntity - entity to delete
+     * @param queryContext - query context in which to perform the delete
+     * @returns mutator for deleting existingEntity
+     */
+    static deleter<TMFields extends object, TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>, TMViewerContext extends ViewerContext, TMEntity extends Entity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>, TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMIDField, TMViewerContext, TMEntity, TMSelectedFields>, TMSelectedFields extends keyof TMFields = keyof TMFields>(this: IEntityClass<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>, existingEntity: TMEntity, queryContext?: EntityQueryContext): EnforcingEntityDeleter<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>;
     /**
      * Vend mutator for deleting an existing entity in given query context.
      * @param existingEntity - entity to delete
      * @param queryContext - query context in which to perform the delete
      * @returns mutator for deleting existingEntity
      */
-    static deleter<TMFields extends object, TMID extends NonNullable<TMFields[TMSelectedFields]>, TMViewerContext extends ViewerContext, TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>, TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity, TMSelectedFields>, TMSelectedFields extends keyof TMFields = keyof TMFields>(this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>, existingEntity: TMEntity, queryContext?: EntityQueryContext): EntityDeleter<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>;
+    static deleterWithAuthorizationResults<TMFields extends object, TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>, TMViewerContext extends ViewerContext, TMEntity extends Entity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>, TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMIDField, TMViewerContext, TMEntity, TMSelectedFields>, TMSelectedFields extends keyof TMFields = keyof TMFields>(this: IEntityClass<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>, existingEntity: TMEntity, queryContext?: EntityQueryContext): AuthorizationResultBasedDeleteMutator<TMFields, TMIDField, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields>;
 }
 /**
  * An interface to pass in constructor (class) of an Entity as a function argument.
  */
-export interface IEntityClass<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields>, TSelectedFields extends keyof TFields = keyof TFields> {
+export interface IEntityClass<TFields extends Record<string, any>, TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>, TSelectedFields extends keyof TFields = keyof TFields> {
     new (constructorParam: {
         viewerContext: TViewerContext;
-        id: TID;
+        id: TFields[TIDField];
         databaseFields: Readonly<TFields>;
         selectedFields: Readonly<Pick<TFields, TSelectedFields>>;
     }): TEntity;
@@ -62,5 +84,5 @@ export interface IEntityClass<TFields extends object, TID extends NonNullable<TF
      *
      * Memoized by the entity framework.
      */
-    defineCompanionDefinition(): EntityCompanionDefinition<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;
+    defineCompanionDefinition(): EntityCompanionDefinition<TFields, TIDField, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;
 }

package/build/Entity.js

@@ -36,7 +36,19 @@ class Entity extends ReadonlyEntity_1.default {
         .getViewerScopedEntityCompanionForClass(this)
         .getQueryContextProvider()
         .getQueryContext()) {
-        return new EntityCreator_1.default(viewerContext, queryContext, this);
+        return new EntityCreator_1.default(viewerContext, queryContext, this).enforcing();
+    }
+    /**
+     * Vend mutator for creating a new entity in given query context.
+     * @param viewerContext - viewer context of creating user
+     * @param queryContext - query context in which to perform the create
+     * @returns mutator for creating an entity
+     */
+    static creatorWithAuthorizationResults(viewerContext, queryContext = viewerContext
+        .getViewerScopedEntityCompanionForClass(this)
+        .getQueryContextProvider()
+        .getQueryContext()) {
+        return new EntityCreator_1.default(viewerContext, queryContext, this).withAuthorizationResults();
     }
     /**
      * Vend mutator for updating an existing entity in given query context.
@@ -49,7 +61,20 @@ class Entity extends ReadonlyEntity_1.default {
         .getViewerScopedEntityCompanionForClass(this)
         .getQueryContextProvider()
         .getQueryContext()) {
-        return new EntityUpdater_1.default(existingEntity, queryContext, this);
+        return new EntityUpdater_1.default(existingEntity, queryContext, this).enforcing();
+    }
+    /**
+     * Vend mutator for updating an existing entity in given query context.
+     * @param existingEntity - entity to update
+     * @param queryContext - query context in which to perform the update
+     * @returns mutator for updating existingEntity
+     */
+    static updaterWithAuthorizationResults(existingEntity, queryContext = existingEntity
+        .getViewerContext()
+        .getViewerScopedEntityCompanionForClass(this)
+        .getQueryContextProvider()
+        .getQueryContext()) {
+        return new EntityUpdater_1.default(existingEntity, queryContext, this).withAuthorizationResults();
     }
     /**
      * Vend mutator for deleting an existing entity in given query context.
@@ -62,7 +87,20 @@ class Entity extends ReadonlyEntity_1.default {
         .getViewerScopedEntityCompanionForClass(this)
         .getQueryContextProvider()
         .getQueryContext()) {
-        return new EntityDeleter_1.default(existingEntity, queryContext, this);
+        return new EntityDeleter_1.default(existingEntity, queryContext, this).enforcing();
+    }
+    /**
+     * Vend mutator for deleting an existing entity in given query context.
+     * @param existingEntity - entity to delete
+     * @param queryContext - query context in which to perform the delete
+     * @returns mutator for deleting existingEntity
+     */
+    static deleterWithAuthorizationResults(existingEntity, queryContext = existingEntity
+        .getViewerContext()
+        .getViewerScopedEntityCompanionForClass(this)
+        .getQueryContextProvider()
+        .getQueryContext()) {
+        return new EntityDeleter_1.default(existingEntity, queryContext, this).withAuthorizationResults();
     }
 }
 exports.default = Entity;

package/build/Entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../src/Entity.ts"],"names":[],"mappings":";;;;;AACA,oEAA4C;AAC5C,oEAA4C;AAG5C,oEAA4C;AAC5C,sEAA8C;AAG9C;;;;;;;;;;;;;;;;;GAiBG;AACH,MAA8B,MAK5B,SAAQ,wBAA6D;IACrE;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAuBZ,aAA+B,EAC/B,eAAmC,aAAa;SAC7C,sCAAsC,CAAC,IAAI,CAAC;SAC5C,uBAAuB,EAAE;SACzB,eAAe,EAAE;QAUpB,OAAO,IAAI,uBAAa,CAAC,aAAa,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAsBZ,cAAwB,EACxB,eAAmC,cAAc;SAC9C,gBAAgB,EAAE;SAClB,sCAAsC,CAAC,IAAI,CAAC;SAC5C,uBAAuB,EAAE;SACzB,eAAe,EAAE;QAEpB,OAAO,IAAI,uBAAa,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAsBZ,cAAwB,EACxB,eAAmC,cAAc;SAC9C,gBAAgB,EAAE;SAClB,sCAAsC,CAAC,IAAI,CAAC;SAC5C,uBAAuB,EAAE;SACzB,eAAe,EAAE;QAEpB,OAAO,IAAI,uBAAa,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;CACF;AA/HD,yBA+HC"}
+{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../src/Entity.ts"],"names":[],"mappings":";;;;;AASA,oEAA4C;AAC5C,oEAA4C;AAG5C,oEAA4C;AAC5C,sEAA8C;AAG9C;;;;;;;;;;;;;;;;;GAiBG;AACH,MAA8B,MAK5B,SAAQ,wBAAkE;IAC1E;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAuBZ,aAA+B,EAC/B,eAAmC,aAAa;SAC7C,sCAAsC,CAAC,IAAI,CAAC;SAC5C,uBAAuB,EAAE;SACzB,eAAe,EAAE;QASpB,OAAO,IAAI,uBAAa,CAAC,aAAa,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IAC1E,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,+BAA+B,CAuBpC,aAA+B,EAC/B,eAAmC,aAAa;SAC7C,sCAAsC,CAAC,IAAI,CAAC;SAC5C,uBAAuB,EAAE;SACzB,eAAe,EAAE;QASpB,OAAO,IAAI,uBAAa,CAAC,aAAa,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,wBAAwB,EAAE,CAAC;IACzF,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAsBZ,cAAwB,EACxB,eAAmC,cAAc;SAC9C,gBAAgB,EAAE;SAClB,sCAAsC,CAAC,IAAI,CAAC;SAC5C,uBAAuB,EAAE;SACzB,eAAe,EAAE;QASpB,OAAO,IAAI,uBAAa,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IAC3E,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,+BAA+B,CAsBpC,cAAwB,EACxB,eAAmC,cAAc;SAC9C,gBAAgB,EAAE;SAClB,sCAAsC,CAAC,IAAI,CAAC;SAC5C,uBAAuB,EAAE;SACzB,eAAe,EAAE;QASpB,OAAO,IAAI,uBAAa,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,wBAAwB,EAAE,CAAC;IAC1F,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAsBZ,cAAwB,EACxB,eAAmC,cAAc;SAC9C,gBAAgB,EAAE;SAClB,sCAAsC,CAAC,IAAI,CAAC;SAC5C,uBAAuB,EAAE;SACzB,eAAe,EAAE;QASpB,OAAO,IAAI,uBAAa,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IAC3E,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,+BAA+B,CAsBpC,cAAwB,EACxB,eAAmC,cAAc;SAC9C,gBAAgB,EAAE;SAClB,sCAAsC,CAAC,IAAI,CAAC;SAC5C,uBAAuB,EAAE;SACzB,eAAe,EAAE;QASpB,OAAO,IAAI,uBAAa,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,wBAAwB,EAAE,CAAC;IAC1F,CAAC;CACF;AAnRD,yBAmRC"}

package/build/EntityAssociationLoader.d.ts

@@ -8,7 +8,7 @@ import ViewerContext from './ViewerContext';
  * associated with an entity. In relational databases, these entities are often referenced
  * by foreign keys.
  */
-export default class EntityAssociationLoader<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields> {
+export default class EntityAssociationLoader<TFields extends Record<string, any>, TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields> {
     private readonly entity;
     private readonly queryContext;
     constructor(entity: TEntity, queryContext?: EntityQueryContext);
@@ -17,11 +17,11 @@ export default class EntityAssociationLoader<TFields extends object, TID extends
      * guaranteed to be the values of successful results (or null for some loader methods),
      * and will throw otherwise.
      */
-    enforcing(): EnforcingEntityAssociationLoader<TFields, TID, TViewerContext, TEntity, TSelectedFields>;
+    enforcing(): EnforcingEntityAssociationLoader<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>;
     /**
      * Authorization-result-based entity loader. All loads through this
      * loader are results, where an unsuccessful result
      * means an authorization error or entity construction error occurred. Other errors are thrown.
      */
-    withAuthorizationResults(): AuthorizationResultBasedEntityAssociationLoader<TFields, TID, TViewerContext, TEntity, TSelectedFields>;
+    withAuthorizationResults(): AuthorizationResultBasedEntityAssociationLoader<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>;
 }