@expo/entity 0.39.0 → 0.41.0

package/build/EntityAssociationLoader.d.ts

@@ -1,6 +1,5 @@
-import { Result } from '@expo/results';
-import { IEntityClass } from './Entity';
-import EntityPrivacyPolicy from './EntityPrivacyPolicy';
+import AuthorizationResultBasedEntityAssociationLoader from './AuthorizationResultBasedEntityAssociationLoader';
+import EnforcingEntityAssociationLoader from './EnforcingEntityAssociationLoader';
 import { EntityQueryContext } from './EntityQueryContext';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
@@ -11,96 +10,18 @@ import ViewerContext from './ViewerContext';
  */
 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> {
     private readonly entity;
-    constructor(entity: TEntity);
+    private readonly queryContext;
+    constructor(entity: TEntity, queryContext?: EntityQueryContext);
     /**
-     * Load an associated entity identified by a field value of this entity. In a relational database,
-     * the field in this entity is a foreign key to the ID of the associated entity.
-     * @param fieldIdentifyingAssociatedEntity - field of this entity containing the ID of the associated entity
-     * @param associatedEntityClass - class of the associated entity
-     * @param queryContext - query context in which to perform the load
+     * Enforcing entity association loader. All loads through this loader are
+     * guaranteed to be the values of successful results (or null for some loader methods),
+     * and will throw otherwise.
      */
-    loadAssociatedEntityAsync<TIdentifyingField extends keyof Pick<TFields, TSelectedFields>, TAssociatedFields extends object, TAssociatedID extends NonNullable<TAssociatedFields[TAssociatedSelectedFields]>, TAssociatedEntity extends ReadonlyEntity<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedSelectedFields>, TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedSelectedFields>, TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields>(fieldIdentifyingAssociatedEntity: TIdentifyingField, associatedEntityClass: IEntityClass<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedPrivacyPolicy, TAssociatedSelectedFields>, queryContext?: EntityQueryContext): Promise<Result<null extends TFields[TIdentifyingField] ? TAssociatedEntity | null : TAssociatedEntity>>;
+    enforcing(): EnforcingEntityAssociationLoader<TFields, TID, TViewerContext, TEntity, TSelectedFields>;
     /**
-     * Load many entities associated with this entity, often referred to as entites belonging
-     * to this entity. In a relational database, the field in the foreign entity is a
-     * foreign key to the ID of this entity. Also commonly referred to as a has many relationship,
-     * where this entity has many associated entities.
-     * @param associatedEntityClass - class of the associated entities
-     * @param associatedEntityFieldContainingThisID - field of associated entity which contains the ID of this entity
-     * @param queryContext - query context in which to perform the load
+     * 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.
      */
-    loadManyAssociatedEntitiesAsync<TAssociatedFields extends object, TAssociatedID extends NonNullable<TAssociatedFields[TAssociatedSelectedFields]>, TAssociatedEntity extends ReadonlyEntity<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedSelectedFields>, TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedSelectedFields>, TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields>(associatedEntityClass: IEntityClass<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedPrivacyPolicy, TAssociatedSelectedFields>, associatedEntityFieldContainingThisID: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>, queryContext?: EntityQueryContext): Promise<readonly Result<TAssociatedEntity>[]>;
-    /**
-     * Load an associated entity identified by a field value of this entity. In a relational database,
-     * the field in this entity is a foreign key to a unique field of the associated entity.
-     * @param fieldIdentifyingAssociatedEntity - field of this entity containing the value with which to look up associated entity
-     * @param associatedEntityClass - class of the associated entity
-     * @param associatedEntityLookupByField - field of associated entity with which to look up the associated entity
-     * @param queryContext - query context in which to perform the load
-     */
-    loadAssociatedEntityByFieldEqualingAsync<TAssociatedFields extends object, TAssociatedID extends NonNullable<TAssociatedFields[TAssociatedSelectedFields]>, TAssociatedEntity extends ReadonlyEntity<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedSelectedFields>, TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedSelectedFields>, TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields>(fieldIdentifyingAssociatedEntity: keyof Pick<TFields, TSelectedFields>, associatedEntityClass: IEntityClass<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedPrivacyPolicy, TAssociatedSelectedFields>, associatedEntityLookupByField: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>, queryContext?: EntityQueryContext): Promise<Result<TAssociatedEntity> | null>;
-    /**
-     * Load many associated entities identified by a field value of this entity. In a relational database,
-     * the field in this entity refers to a field of the associated entity.
-     * @param fieldIdentifyingAssociatedEntity - field of this entity containing the value with which to look up associated entities
-     * @param associatedEntityClass - class of the associated entities
-     * @param associatedEntityLookupByField - field of associated entities with which to look up the associated entities
-     * @param queryContext - query context in which to perform the load
-     */
-    loadManyAssociatedEntitiesByFieldEqualingAsync<TAssociatedFields extends object, TAssociatedID extends NonNullable<TAssociatedFields[TAssociatedSelectedFields]>, TAssociatedEntity extends ReadonlyEntity<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedSelectedFields>, TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedSelectedFields>, TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields>(fieldIdentifyingAssociatedEntity: keyof Pick<TFields, TSelectedFields>, associatedEntityClass: IEntityClass<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedPrivacyPolicy, TAssociatedSelectedFields>, associatedEntityLookupByField: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>, queryContext?: EntityQueryContext): Promise<readonly Result<TAssociatedEntity>[]>;
-    /**
-     * Load an associated entity by folding a sequence of EntityLoadThroughDirective. At each
-     * fold step, load an associated entity identified by a field value of the current fold value.
-     * @param loadDirectives - associated entity load directives instructing each step of the fold
-     * @param queryContext - query context in which to perform the loads
-     */
-    loadAssociatedEntityThroughAsync<TFields2 extends object, TID2 extends NonNullable<TFields2[TSelectedFields2]>, TEntity2 extends ReadonlyEntity<TFields2, TID2, TViewerContext, TSelectedFields2>, TPrivacyPolicy2 extends EntityPrivacyPolicy<TFields2, TID2, TViewerContext, TEntity2, TSelectedFields2>, TSelectedFields2 extends keyof TFields2 = keyof TFields2>(loadDirectives: [
-        EntityLoadThroughDirective<TViewerContext, TFields, TFields2, TID2, TEntity2, TPrivacyPolicy2, TSelectedFields, TSelectedFields2>
-    ], queryContext?: EntityQueryContext): Promise<Result<TEntity2> | null>;
-    /**
-     * Load an associated entity by folding a sequence of EntityLoadThroughDirective. At each
-     * fold step, load an associated entity identified by a field value of the current fold value.
-     * @param loadDirectives - associated entity load directives instructing each step of the fold
-     * @param queryContext - query context in which to perform the loads
-     */
-    loadAssociatedEntityThroughAsync<TFields2 extends object, TID2 extends NonNullable<TFields2[TSelectedFields2]>, TEntity2 extends ReadonlyEntity<TFields2, TID2, TViewerContext, TSelectedFields2>, TPrivacyPolicy2 extends EntityPrivacyPolicy<TFields2, TID2, TViewerContext, TEntity2, TSelectedFields2>, TFields3 extends object, TID3 extends NonNullable<TFields3[TSelectedFields3]>, TEntity3 extends ReadonlyEntity<TFields3, TID3, TViewerContext, TSelectedFields3>, TPrivacyPolicy3 extends EntityPrivacyPolicy<TFields3, TID3, TViewerContext, TEntity3, TSelectedFields3>, TSelectedFields2 extends keyof TFields2 = keyof TFields2, TSelectedFields3 extends keyof TFields3 = keyof TFields3>(loadDirectives: [
-        EntityLoadThroughDirective<TViewerContext, TFields, TFields2, TID2, TEntity2, TPrivacyPolicy2, TSelectedFields, TSelectedFields2>,
-        EntityLoadThroughDirective<TViewerContext, TFields2, TFields3, TID3, TEntity3, TPrivacyPolicy3, TSelectedFields2, TSelectedFields3>
-    ], queryContext?: EntityQueryContext): Promise<Result<TEntity3> | null>;
-    /**
-     * Load an associated entity by folding a sequence of EntityLoadThroughDirective. At each
-     * fold step, load an associated entity identified by a field value of the current fold value.
-     * @param loadDirectives - associated entity load directives instructing each step of the fold
-     * @param queryContext - query context in which to perform the loads
-     */
-    loadAssociatedEntityThroughAsync<TFields2 extends object, TID2 extends NonNullable<TFields2[TSelectedFields2]>, TEntity2 extends ReadonlyEntity<TFields2, TID2, TViewerContext, TSelectedFields2>, TPrivacyPolicy2 extends EntityPrivacyPolicy<TFields2, TID2, TViewerContext, TEntity2, TSelectedFields2>, TFields3 extends object, TID3 extends NonNullable<TFields3[TSelectedFields3]>, TEntity3 extends ReadonlyEntity<TFields3, TID3, TViewerContext, TSelectedFields3>, TPrivacyPolicy3 extends EntityPrivacyPolicy<TFields3, TID3, TViewerContext, TEntity3, TSelectedFields3>, TFields4 extends object, TID4 extends NonNullable<TFields4[TSelectedFields4]>, TEntity4 extends ReadonlyEntity<TFields4, TID4, TViewerContext, TSelectedFields4>, TPrivacyPolicy4 extends EntityPrivacyPolicy<TFields4, TID4, TViewerContext, TEntity4, TSelectedFields4>, TSelectedFields2 extends keyof TFields2 = keyof TFields2, TSelectedFields3 extends keyof TFields3 = keyof TFields3, TSelectedFields4 extends keyof TFields4 = keyof TFields4>(loadDirectives: [
-        EntityLoadThroughDirective<TViewerContext, TFields, TFields2, TID2, TEntity2, TPrivacyPolicy2, TSelectedFields, TSelectedFields2>,
-        EntityLoadThroughDirective<TViewerContext, TFields2, TFields3, TID3, TEntity3, TPrivacyPolicy3, TSelectedFields2, TSelectedFields3>,
-        EntityLoadThroughDirective<TViewerContext, TFields3, TFields4, TID4, TEntity4, TPrivacyPolicy4, TSelectedFields3, TSelectedFields4>
-    ], queryContext?: EntityQueryContext): Promise<Result<TEntity4> | null>;
-    /**
-     * Load an associated entity by folding a sequence of EntityLoadThroughDirective. At each
-     * fold step, load an associated entity identified by a field value of the current fold value.
-     * @param loadDirectives - associated entity load directives instructing each step of the fold
-     * @param queryContext - query context in which to perform the loads
-     */
-    loadAssociatedEntityThroughAsync(loadDirectives: EntityLoadThroughDirective<TViewerContext, any, any, any, any, any, any, any>[], queryContext?: EntityQueryContext): Promise<Result<ReadonlyEntity<any, any, any, any>> | null>;
-}
-/**
- * Instruction for each step of a load-associated-through method.
- */
-export interface EntityLoadThroughDirective<TViewerContext extends ViewerContext, TFields, TAssociatedFields extends object, TAssociatedID extends NonNullable<TAssociatedFields[TAssociatedSelectedFields]>, TAssociatedEntity extends ReadonlyEntity<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedSelectedFields>, TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedSelectedFields>, TSelectedFields extends keyof TFields = keyof TFields, TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields> {
-    /**
-     * Class of entity to load at this step.
-     */
-    associatedEntityClass: IEntityClass<TAssociatedFields, TAssociatedID, TViewerContext, TAssociatedEntity, TAssociatedPrivacyPolicy, TAssociatedSelectedFields>;
-    /**
-     * Field of the current entity with which to load an instance of associatedEntityClass.
-     */
-    fieldIdentifyingAssociatedEntity: keyof Pick<TFields, TSelectedFields>;
-    /**
-     * Field by which to load the instance of associatedEntityClass. If not provided, the
-     * associatedEntityClass instance is fetched by its ID.
-     */
-    associatedEntityLookupByField?: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>;
+    withAuthorizationResults(): AuthorizationResultBasedEntityAssociationLoader<TFields, TID, TViewerContext, TEntity, TSelectedFields>;
 }

package/build/EntityAssociationLoader.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const results_1 = require("@expo/results");
+const AuthorizationResultBasedEntityAssociationLoader_1 = __importDefault(require("./AuthorizationResultBasedEntityAssociationLoader"));
+const EnforcingEntityAssociationLoader_1 = __importDefault(require("./EnforcingEntityAssociationLoader"));
 /**
  * An association loader is a set of convenience methods for loading entities
  * associated with an entity. In relational databases, these entities are often referenced
@@ -8,140 +12,30 @@ const results_1 = require("@expo/results");
  */
 class EntityAssociationLoader {
     entity;
-    constructor(entity) {
-        this.entity = entity;
-    }
-    /**
-     * Load an associated entity identified by a field value of this entity. In a relational database,
-     * the field in this entity is a foreign key to the ID of the associated entity.
-     * @param fieldIdentifyingAssociatedEntity - field of this entity containing the ID of the associated entity
-     * @param associatedEntityClass - class of the associated entity
-     * @param queryContext - query context in which to perform the load
-     */
-    async loadAssociatedEntityAsync(fieldIdentifyingAssociatedEntity, associatedEntityClass, queryContext = this.entity
-        .getViewerContext()
-        .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-        .getQueryContextProvider()
-        .getQueryContext()) {
-        const associatedEntityID = this.entity.getField(fieldIdentifyingAssociatedEntity);
-        if (!associatedEntityID) {
-            return (0, results_1.result)(null);
-        }
-        const loader = this.entity
-            .getViewerContext()
-            .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-            .getLoaderFactory()
-            .forLoad(queryContext, { previousValue: null, cascadingDeleteCause: null });
-        return (await loader
-            .withAuthorizationResults()
-            .loadByIDAsync(associatedEntityID));
-    }
-    /**
-     * Load many entities associated with this entity, often referred to as entites belonging
-     * to this entity. In a relational database, the field in the foreign entity is a
-     * foreign key to the ID of this entity. Also commonly referred to as a has many relationship,
-     * where this entity has many associated entities.
-     * @param associatedEntityClass - class of the associated entities
-     * @param associatedEntityFieldContainingThisID - field of associated entity which contains the ID of this entity
-     * @param queryContext - query context in which to perform the load
-     */
-    async loadManyAssociatedEntitiesAsync(associatedEntityClass, associatedEntityFieldContainingThisID, queryContext = this.entity
+    queryContext;
+    constructor(entity, queryContext = entity
         .getViewerContext()
-        .getViewerScopedEntityCompanionForClass(associatedEntityClass)
+        .getViewerScopedEntityCompanionForClass(entity.constructor)
         .getQueryContextProvider()
         .getQueryContext()) {
-        const thisID = this.entity.getID();
-        const loader = this.entity
-            .getViewerContext()
-            .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-            .getLoaderFactory()
-            .forLoad(queryContext, { previousValue: null, cascadingDeleteCause: null });
-        return await loader
-            .withAuthorizationResults()
-            .loadManyByFieldEqualingAsync(associatedEntityFieldContainingThisID, thisID);
+        this.entity = entity;
+        this.queryContext = queryContext;
     }
     /**
-     * Load an associated entity identified by a field value of this entity. In a relational database,
-     * the field in this entity is a foreign key to a unique field of the associated entity.
-     * @param fieldIdentifyingAssociatedEntity - field of this entity containing the value with which to look up associated entity
-     * @param associatedEntityClass - class of the associated entity
-     * @param associatedEntityLookupByField - field of associated entity with which to look up the associated entity
-     * @param queryContext - query context in which to perform the load
+     * Enforcing entity association loader. All loads through this loader are
+     * guaranteed to be the values of successful results (or null for some loader methods),
+     * and will throw otherwise.
      */
-    async loadAssociatedEntityByFieldEqualingAsync(fieldIdentifyingAssociatedEntity, associatedEntityClass, associatedEntityLookupByField, queryContext = this.entity
-        .getViewerContext()
-        .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-        .getQueryContextProvider()
-        .getQueryContext()) {
-        const associatedFieldValue = this.entity.getField(fieldIdentifyingAssociatedEntity);
-        if (!associatedFieldValue) {
-            return null;
-        }
-        const loader = this.entity
-            .getViewerContext()
-            .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-            .getLoaderFactory()
-            .forLoad(queryContext, { previousValue: null, cascadingDeleteCause: null });
-        return await loader
-            .withAuthorizationResults()
-            .loadByFieldEqualingAsync(associatedEntityLookupByField, associatedFieldValue);
+    enforcing() {
+        return new EnforcingEntityAssociationLoader_1.default(this.withAuthorizationResults());
     }
     /**
-     * Load many associated entities identified by a field value of this entity. In a relational database,
-     * the field in this entity refers to a field of the associated entity.
-     * @param fieldIdentifyingAssociatedEntity - field of this entity containing the value with which to look up associated entities
-     * @param associatedEntityClass - class of the associated entities
-     * @param associatedEntityLookupByField - field of associated entities with which to look up the associated entities
-     * @param queryContext - query context in which to perform the load
+     * 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.
      */
-    async loadManyAssociatedEntitiesByFieldEqualingAsync(fieldIdentifyingAssociatedEntity, associatedEntityClass, associatedEntityLookupByField, queryContext = this.entity
-        .getViewerContext()
-        .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-        .getQueryContextProvider()
-        .getQueryContext()) {
-        const associatedFieldValue = this.entity.getField(fieldIdentifyingAssociatedEntity);
-        if (!associatedFieldValue) {
-            return [];
-        }
-        const loader = this.entity
-            .getViewerContext()
-            .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-            .getLoaderFactory()
-            .forLoad(queryContext, { previousValue: null, cascadingDeleteCause: null });
-        return await loader
-            .withAuthorizationResults()
-            .loadManyByFieldEqualingAsync(associatedEntityLookupByField, associatedFieldValue);
-    }
-    async loadAssociatedEntityThroughAsync(loadDirectives, queryContext) {
-        let currentEntity = this.entity;
-        for (const loadDirective of loadDirectives) {
-            const { associatedEntityClass, fieldIdentifyingAssociatedEntity, associatedEntityLookupByField, } = loadDirective;
-            let associatedEntityResult;
-            if (associatedEntityLookupByField) {
-                associatedEntityResult = await currentEntity
-                    .associationLoader()
-                    .loadAssociatedEntityByFieldEqualingAsync(fieldIdentifyingAssociatedEntity, associatedEntityClass, associatedEntityLookupByField, queryContext);
-            }
-            else {
-                const associatedEntityResultLocal = await currentEntity
-                    .associationLoader()
-                    .loadAssociatedEntityAsync(fieldIdentifyingAssociatedEntity, associatedEntityClass, queryContext);
-                if (associatedEntityResultLocal.ok && associatedEntityResultLocal.value === null) {
-                    associatedEntityResult = null;
-                }
-                else {
-                    associatedEntityResult = associatedEntityResultLocal;
-                }
-            }
-            if (!associatedEntityResult) {
-                return null;
-            }
-            if (!associatedEntityResult.ok) {
-                return (0, results_1.result)(associatedEntityResult.reason);
-            }
-            currentEntity = associatedEntityResult.value;
-        }
-        return (0, results_1.result)(currentEntity);
+    withAuthorizationResults() {
+        return new AuthorizationResultBasedEntityAssociationLoader_1.default(this.entity, this.queryContext);
     }
 }
 exports.default = EntityAssociationLoader;

package/build/EntityAssociationLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityAssociationLoader.js","sourceRoot":"","sources":["../src/EntityAssociationLoader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EntityAssociationLoader.js","sourceRoot":"","sources":["../src/EntityAssociationLoader.ts"],"names":[],"mappings":";;;;;AAAA,wIAAgH;AAChH,0GAAkF;AAMlF;;;;GAIG;AACH,MAAqB,uBAAuB;IAQvB;IACA;IAFnB,YACmB,MAAe,EACf,eAAmC,MAAM;SACvD,gBAAgB,EAAE;SAClB,sCAAsC,CACrC,MAAM,CAAC,WAON,CACF;SACA,uBAAuB,EAAE;SACzB,eAAe,EAAE;QAdH,WAAM,GAAN,MAAM,CAAS;QACf,iBAAY,GAAZ,YAAY,CAaT;IACnB,CAAC;IAEJ;;;;OAIG;IACH,SAAS;QAOP,OAAO,IAAI,0CAAgC,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED;;;;OAIG;IACH,wBAAwB;QAOtB,OAAO,IAAI,yDAA+C,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7F,CAAC;CACF;AAtDD,0CAsDC"}

package/build/EntityCreator.d.ts

@@ -0,0 +1,27 @@
+import { AuthorizationResultBasedCreateMutator } from './AuthorizationResultBasedEntityMutator';
+import EnforcingEntityCreator from './EnforcingEntityCreator';
+import { IEntityClass } from './Entity';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
+import { EntityQueryContext } from './EntityQueryContext';
+import ReadonlyEntity from './ReadonlyEntity';
+import ViewerContext from './ViewerContext';
+/**
+ * The primary interface for creating entities.
+ */
+export default class EntityCreator<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TViewerContext2 extends TViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields>, TSelectedFields extends keyof TFields> {
+    private readonly viewerContext;
+    private readonly queryContext;
+    private readonly entityClass;
+    constructor(viewerContext: TViewerContext2, queryContext: EntityQueryContext, entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>);
+    /**
+     * Enforcing entity creator. All creates through this creator are
+     * guaranteed to be successful and will throw otherwise.
+     */
+    enforcing(): EnforcingEntityCreator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;
+    /**
+     * Authorization-result-based entity creator. All creates through this
+     * creator are results, where an unsuccessful result means an authorization
+     * error or entity construction error occurred. Other errors are thrown.
+     */
+    withAuthorizationResults(): AuthorizationResultBasedCreateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;
+}

package/build/EntityCreator.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const EnforcingEntityCreator_1 = __importDefault(require("./EnforcingEntityCreator"));
+/**
+ * The primary interface for creating entities.
+ */
+class EntityCreator {
+    viewerContext;
+    queryContext;
+    entityClass;
+    constructor(viewerContext, queryContext, entityClass) {
+        this.viewerContext = viewerContext;
+        this.queryContext = queryContext;
+        this.entityClass = entityClass;
+    }
+    /**
+     * Enforcing entity creator. All creates through this creator are
+     * guaranteed to be successful and will throw otherwise.
+     */
+    enforcing() {
+        return new EnforcingEntityCreator_1.default(this.withAuthorizationResults());
+    }
+    /**
+     * Authorization-result-based entity creator. All creates through this
+     * creator are results, where an unsuccessful result means an authorization
+     * error or entity construction error occurred. Other errors are thrown.
+     */
+    withAuthorizationResults() {
+        return this.viewerContext
+            .getViewerScopedEntityCompanionForClass(this.entityClass)
+            .getMutatorFactory()
+            .forCreate(this.queryContext);
+    }
+}
+exports.default = EntityCreator;
+//# sourceMappingURL=EntityCreator.js.map

package/build/EntityCreator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityCreator.js","sourceRoot":"","sources":["../src/EntityCreator.ts"],"names":[],"mappings":";;;;;AACA,sFAA8D;AAO9D;;GAEG;AACH,MAAqB,aAAa;IAgBb;IACA;IACA;IAHnB,YACmB,aAA8B,EAC9B,YAAgC,EAChC,WAOhB;QATgB,kBAAa,GAAb,aAAa,CAAiB;QAC9B,iBAAY,GAAZ,YAAY,CAAoB;QAChC,gBAAW,GAAX,WAAW,CAO3B;IACA,CAAC;IAEJ;;;OAGG;IACH,SAAS;QAQP,OAAO,IAAI,gCAAsB,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACrE,CAAC;IAED;;;;OAIG;IACH,wBAAwB;QAQtB,OAAO,IAAI,CAAC,aAAa;aACtB,sCAAsC,CAAC,IAAI,CAAC,WAAW,CAAC;aACxD,iBAAiB,EAAE;aACnB,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;CACF;AA7DD,gCA6DC"}

package/build/EntityDeleter.d.ts

@@ -0,0 +1,27 @@
+import { AuthorizationResultBasedDeleteMutator } from './AuthorizationResultBasedEntityMutator';
+import EnforcingEntityDeleter from './EnforcingEntityDeleter';
+import { IEntityClass } from './Entity';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
+import { EntityQueryContext } from './EntityQueryContext';
+import ReadonlyEntity from './ReadonlyEntity';
+import ViewerContext from './ViewerContext';
+/**
+ * The primary interface for deleting entities.
+ */
+export default class EntityDeleter<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> {
+    private readonly existingEntity;
+    private readonly queryContext;
+    private readonly entityClass;
+    constructor(existingEntity: TEntity, queryContext: EntityQueryContext, entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>);
+    /**
+     * Enforcing entity deleter. All deletes through this deleter are
+     * guaranteed to be successful and will throw otherwise.
+     */
+    enforcing(): EnforcingEntityDeleter<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;
+    /**
+     * Authorization-result-based entity deleter. All deletes through this
+     * deleter are results, where an unsuccessful result means an authorization
+     * error or entity construction error occurred. Other errors are thrown.
+     */
+    withAuthorizationResults(): AuthorizationResultBasedDeleteMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;
+}

package/build/EntityDeleter.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 });
+const EnforcingEntityDeleter_1 = __importDefault(require("./EnforcingEntityDeleter"));
+/**
+ * The primary interface for deleting entities.
+ */
+class EntityDeleter {
+    existingEntity;
+    queryContext;
+    entityClass;
+    constructor(existingEntity, queryContext, entityClass) {
+        this.existingEntity = existingEntity;
+        this.queryContext = queryContext;
+        this.entityClass = entityClass;
+    }
+    /**
+     * Enforcing entity deleter. All deletes through this deleter are
+     * guaranteed to be successful and will throw otherwise.
+     */
+    enforcing() {
+        return new EnforcingEntityDeleter_1.default(this.withAuthorizationResults());
+    }
+    /**
+     * Authorization-result-based entity deleter. All deletes through this
+     * deleter are results, where an unsuccessful result means an authorization
+     * error or entity construction error occurred. Other errors are thrown.
+     */
+    withAuthorizationResults() {
+        return this.existingEntity
+            .getViewerContext()
+            .getViewerScopedEntityCompanionForClass(this.entityClass)
+            .getMutatorFactory()
+            .forDelete(this.existingEntity, this.queryContext);
+    }
+}
+exports.default = EntityDeleter;
+//# sourceMappingURL=EntityDeleter.js.map

package/build/EntityDeleter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityDeleter.js","sourceRoot":"","sources":["../src/EntityDeleter.ts"],"names":[],"mappings":";;;;;AACA,sFAA8D;AAO9D;;GAEG;AACH,MAAqB,aAAa;IAeb;IACA;IACA;IAHnB,YACmB,cAAuB,EACvB,YAAgC,EAChC,WAOhB;QATgB,mBAAc,GAAd,cAAc,CAAS;QACvB,iBAAY,GAAZ,YAAY,CAAoB;QAChC,gBAAW,GAAX,WAAW,CAO3B;IACA,CAAC;IAEJ;;;OAGG;IACH,SAAS;QAQP,OAAO,IAAI,gCAAsB,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACrE,CAAC;IAED;;;;OAIG;IACH,wBAAwB;QAQtB,OAAO,IAAI,CAAC,cAAc;aACvB,gBAAgB,EAAE;aAClB,sCAAsC,CAAC,IAAI,CAAC,WAAW,CAAC;aACxD,iBAAiB,EAAE;aACnB,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACvD,CAAC;CACF;AA7DD,gCA6DC"}

package/build/EntityLoader.d.ts

@@ -1,30 +1,20 @@
 import AuthorizationResultBasedEntityLoader from './AuthorizationResultBasedEntityLoader';
 import EnforcingEntityLoader from './EnforcingEntityLoader';
 import { IEntityClass } from './Entity';
-import EntityConfiguration from './EntityConfiguration';
 import EntityLoaderUtils from './EntityLoaderUtils';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
-import EntityDataManager from './internal/EntityDataManager';
-import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
 /**
  * The primary interface for loading entities. All normal loads are batched,
  * cached, and authorized against the entity's EntityPrivacyPolicy.
  */
-export default class EntityLoader<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 EntityLoader<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TViewerContext2 extends TViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields>, TSelectedFields extends keyof TFields> {
     private readonly viewerContext;
     private readonly queryContext;
-    private readonly privacyPolicyEvaluationContext;
-    private readonly entityConfiguration;
     private readonly entityClass;
-    private readonly entitySelectedFields;
-    private readonly privacyPolicy;
-    private readonly dataManager;
-    protected readonly metricsAdapter: IEntityMetricsAdapter;
-    private readonly utilsPrivate;
-    constructor(viewerContext: TViewerContext, queryContext: EntityQueryContext, privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext<TFields, TID, TViewerContext, TEntity, TSelectedFields>, entityConfiguration: EntityConfiguration<TFields>, entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>, entitySelectedFields: TSelectedFields[] | undefined, privacyPolicy: TPrivacyPolicy, dataManager: EntityDataManager<TFields>, metricsAdapter: IEntityMetricsAdapter);
+    constructor(viewerContext: TViewerContext2, queryContext: EntityQueryContext, entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>);
     /**
      * Enforcing entity loader. All loads through this loader are
      * guaranteed to be the values of successful results (or null for some loader methods),
@@ -33,7 +23,7 @@ export default class EntityLoader<TFields extends object, TID extends NonNullabl
     enforcing(): EnforcingEntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;
     /**
      * Authorization-result-based entity loader. All loads through this
-     * loader are are results (or null for some loader methods), where an unsuccessful result
+     * loader are results (or null for some loader methods), where an unsuccessful result
      * means an authorization error or entity construction error occurred. Other errors are thrown.
      */
     withAuthorizationResults(): AuthorizationResultBasedEntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;

package/build/EntityLoader.js

@@ -3,9 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const AuthorizationResultBasedEntityLoader_1 = __importDefault(require("./AuthorizationResultBasedEntityLoader"));
 const EnforcingEntityLoader_1 = __importDefault(require("./EnforcingEntityLoader"));
-const EntityLoaderUtils_1 = __importDefault(require("./EntityLoaderUtils"));
 /**
  * The primary interface for loading entities. All normal loads are batched,
  * cached, and authorized against the entity's EntityPrivacyPolicy.
@@ -13,25 +11,11 @@ const EntityLoaderUtils_1 = __importDefault(require("./EntityLoaderUtils"));
 class EntityLoader {
     viewerContext;
     queryContext;
-    privacyPolicyEvaluationContext;
-    entityConfiguration;
     entityClass;
-    entitySelectedFields;
-    privacyPolicy;
-    dataManager;
-    metricsAdapter;
-    utilsPrivate;
-    constructor(viewerContext, queryContext, privacyPolicyEvaluationContext, entityConfiguration, entityClass, entitySelectedFields, privacyPolicy, dataManager, metricsAdapter) {
+    constructor(viewerContext, queryContext, entityClass) {
         this.viewerContext = viewerContext;
         this.queryContext = queryContext;
-        this.privacyPolicyEvaluationContext = privacyPolicyEvaluationContext;
-        this.entityConfiguration = entityConfiguration;
         this.entityClass = entityClass;
-        this.entitySelectedFields = entitySelectedFields;
-        this.privacyPolicy = privacyPolicy;
-        this.dataManager = dataManager;
-        this.metricsAdapter = metricsAdapter;
-        this.utilsPrivate = new EntityLoaderUtils_1.default(this.viewerContext, this.queryContext, this.privacyPolicyEvaluationContext, this.entityConfiguration, this.entityClass, this.entitySelectedFields, this.privacyPolicy, this.dataManager, this.metricsAdapter);
     }
     /**
      * Enforcing entity loader. All loads through this loader are
@@ -43,18 +27,21 @@ class EntityLoader {
     }
     /**
      * Authorization-result-based entity loader. All loads through this
-     * loader are are results (or null for some loader methods), where an unsuccessful result
+     * loader are results (or null for some loader methods), where an unsuccessful result
      * means an authorization error or entity construction error occurred. Other errors are thrown.
      */
     withAuthorizationResults() {
-        return new AuthorizationResultBasedEntityLoader_1.default(this.queryContext, this.entityConfiguration, this.entityClass, this.dataManager, this.metricsAdapter, this.utilsPrivate);
+        return this.viewerContext
+            .getViewerScopedEntityCompanionForClass(this.entityClass)
+            .getLoaderFactory()
+            .forLoad(this.queryContext, { previousValue: null, cascadingDeleteCause: null });
     }
     /**
      * Entity loader utilities for things like cache invalidation, entity construction, and authorization.
      * Calling into these should only be necessary in rare cases.
      */
     utils() {
-        return this.utilsPrivate;
+        return this.withAuthorizationResults().utils;
     }
 }
 exports.default = EntityLoader;

package/build/EntityLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityLoader.js","sourceRoot":"","sources":["../src/EntityLoader.ts"],"names":[],"mappings":";;;;;AAAA,kHAA0F;AAC1F,oFAA4D;AAG5D,4EAAoD;AAQpD;;;GAGG;AACH,MAAqB,YAAY;IAwBZ;IACA;IACA;IAOA;IACA;IAQA;IACA;IACA;IACE;IA/BJ,YAAY,CAO3B;IAEF,YACmB,aAA6B,EAC7B,YAAgC,EAChC,8BAMhB,EACgB,mBAAiD,EACjD,WAOhB,EACgB,oBAAmD,EACnD,aAA6B,EAC7B,WAAuC,EACrC,cAAqC;QArBvC,kBAAa,GAAb,aAAa,CAAgB;QAC7B,iBAAY,GAAZ,YAAY,CAAoB;QAChC,mCAA8B,GAA9B,8BAA8B,CAM9C;QACgB,wBAAmB,GAAnB,mBAAmB,CAA8B;QACjD,gBAAW,GAAX,WAAW,CAO3B;QACgB,yBAAoB,GAApB,oBAAoB,CAA+B;QACnD,kBAAa,GAAb,aAAa,CAAgB;QAC7B,gBAAW,GAAX,WAAW,CAA4B;QACrC,mBAAc,GAAd,cAAc,CAAuB;QAExD,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAiB,CACvC,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,8BAA8B,EACnC,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,cAAc,CACpB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,SAAS;QAQP,OAAO,IAAI,+BAAqB,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACpE,CAAC;IAED;;;;OAIG;IACH,wBAAwB;QAQtB,OAAO,IAAI,8CAAoC,CAC7C,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,YAAY,CAClB,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,KAAK;QAQV,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AAjHD,+BAiHC"}
+{"version":3,"file":"EntityLoader.js","sourceRoot":"","sources":["../src/EntityLoader.ts"],"names":[],"mappings":";;;;;AACA,oFAA4D;AAQ5D;;;GAGG;AACH,MAAqB,YAAY;IAgBZ;IACA;IACA;IAHnB,YACmB,aAA8B,EAC9B,YAAgC,EAChC,WAOhB;QATgB,kBAAa,GAAb,aAAa,CAAiB;QAC9B,iBAAY,GAAZ,YAAY,CAAoB;QAChC,gBAAW,GAAX,WAAW,CAO3B;IACA,CAAC;IAEJ;;;;OAIG;IACH,SAAS;QAQP,OAAO,IAAI,+BAAqB,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACpE,CAAC;IAED;;;;OAIG;IACH,wBAAwB;QAQtB,OAAO,IAAI,CAAC,aAAa;aACtB,sCAAsC,CAAC,IAAI,CAAC,WAAW,CAAC;aACxD,gBAAgB,EAAE;aAClB,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,CAAC;IAED;;;OAGG;IACI,KAAK;QAQV,OAAO,IAAI,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC;IAC/C,CAAC;CACF;AA7ED,+BA6EC"}

package/build/EntityLoaderFactory.d.ts

@@ -1,5 +1,5 @@
+import AuthorizationResultBasedEntityLoader from './AuthorizationResultBasedEntityLoader';
 import EntityCompanion from './EntityCompanion';
-import EntityLoader from './EntityLoader';
 import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
 import ReadonlyEntity from './ReadonlyEntity';
@@ -19,5 +19,5 @@ export default class EntityLoaderFactory<TFields extends object, TID extends Non
      * @param viewerContext - viewer context of loading user
      * @param queryContext - query context in which to perform the load
      */
-    forLoad(viewerContext: TViewerContext, queryContext: EntityQueryContext, privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext<TFields, TID, TViewerContext, TEntity, TSelectedFields>): EntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;
+    forLoad(viewerContext: TViewerContext, queryContext: EntityQueryContext, privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext<TFields, TID, TViewerContext, TEntity, TSelectedFields>): AuthorizationResultBasedEntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>;
 }

package/build/EntityLoaderFactory.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const EntityLoader_1 = __importDefault(require("./EntityLoader"));
+const AuthorizationResultBasedEntityLoader_1 = __importDefault(require("./AuthorizationResultBasedEntityLoader"));
+const EntityLoaderUtils_1 = __importDefault(require("./EntityLoaderUtils"));
 /**
  * The primary entry point for loading entities.
  */
@@ -22,7 +23,8 @@ class EntityLoaderFactory {
      * @param queryContext - query context in which to perform the load
      */
     forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext) {
-        return new EntityLoader_1.default(viewerContext, queryContext, privacyPolicyEvaluationContext, this.entityCompanion.entityCompanionDefinition.entityConfiguration, this.entityCompanion.entityCompanionDefinition.entityClass, this.entityCompanion.entityCompanionDefinition.entitySelectedFields, this.entityCompanion.privacyPolicy, this.dataManager, this.metricsAdapter);
+        const utils = new EntityLoaderUtils_1.default(viewerContext, queryContext, privacyPolicyEvaluationContext, this.entityCompanion.entityCompanionDefinition.entityConfiguration, this.entityCompanion.entityCompanionDefinition.entityClass, this.entityCompanion.entityCompanionDefinition.entitySelectedFields, this.entityCompanion.privacyPolicy, this.dataManager, this.metricsAdapter);
+        return new AuthorizationResultBasedEntityLoader_1.default(queryContext, this.entityCompanion.entityCompanionDefinition.entityConfiguration, this.entityCompanion.entityCompanionDefinition.entityClass, this.dataManager, this.metricsAdapter, utils);
     }
 }
 exports.default = EntityLoaderFactory;

package/build/EntityLoaderFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityLoaderFactory.js","sourceRoot":"","sources":["../src/EntityLoaderFactory.ts"],"names":[],"mappings":";;;;;AACA,kEAA0C;AAQ1C;;GAEG;AACH,MAAqB,mBAAmB;IAenB;IAQA;IACE;IAVrB,YACmB,eAOhB,EACgB,WAAuC,EACrC,cAAqC;QATvC,oBAAe,GAAf,eAAe,CAO/B;QACgB,gBAAW,GAAX,WAAW,CAA4B;QACrC,mBAAc,GAAd,cAAc,CAAuB;IACvD,CAAC;IAEJ;;;;OAIG;IACH,OAAO,CACL,aAA6B,EAC7B,YAAgC,EAChC,8BAMC;QAED,OAAO,IAAI,sBAAY,CACrB,aAAa,EACb,YAAY,EACZ,8BAA8B,EAC9B,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,mBAAmB,EAClE,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,WAAW,EAC1D,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,oBAAoB,EACnE,IAAI,CAAC,eAAe,CAAC,aAAa,EAClC,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,cAAc,CACpB,CAAC;IACJ,CAAC;CACF;AAvDD,sCAuDC"}
+{"version":3,"file":"EntityLoaderFactory.js","sourceRoot":"","sources":["../src/EntityLoaderFactory.ts"],"names":[],"mappings":";;;;;AAAA,kHAA0F;AAE1F,4EAAoD;AAQpD;;GAEG;AACH,MAAqB,mBAAmB;IAenB;IAQA;IACE;IAVrB,YACmB,eAOhB,EACgB,WAAuC,EACrC,cAAqC;QATvC,oBAAe,GAAf,eAAe,CAO/B;QACgB,gBAAW,GAAX,WAAW,CAA4B;QACrC,mBAAc,GAAd,cAAc,CAAuB;IACvD,CAAC;IAEJ;;;;OAIG;IACH,OAAO,CACL,aAA6B,EAC7B,YAAgC,EAChC,8BAMC;QASD,MAAM,KAAK,GAAG,IAAI,2BAAiB,CACjC,aAAa,EACb,YAAY,EACZ,8BAA8B,EAC9B,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,mBAAmB,EAClE,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,WAAW,EAC1D,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,oBAAoB,EACnE,IAAI,CAAC,eAAe,CAAC,aAAa,EAClC,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,cAAc,CACpB,CAAC;QAEF,OAAO,IAAI,8CAAoC,CAC7C,YAAY,EACZ,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,mBAAmB,EAClE,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,WAAW,EAC1D,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,cAAc,EACnB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AAvED,sCAuEC"}