@expo/entity 0.31.1 → 0.33.0

package/build/testfixtures/TestEntity.js

@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testEntityCompanion = exports.TestEntityPrivacyPolicy = exports.testEntityConfiguration = void 0;
+exports.TestEntityPrivacyPolicy = exports.testEntityConfiguration = void 0;
 const results_1 = require("@expo/results");
 const Entity_1 = __importDefault(require("../Entity"));
-const EntityCompanionProvider_1 = require("../EntityCompanionProvider");
 const EntityConfiguration_1 = __importDefault(require("../EntityConfiguration"));
 const EntityFields_1 = require("../EntityFields");
 const EntityPrivacyPolicy_1 = __importDefault(require("../EntityPrivacyPolicy"));
@@ -57,20 +56,30 @@ class TestEntityPrivacyPolicy extends EntityPrivacyPolicy_1.default {
 }
 exports.TestEntityPrivacyPolicy = TestEntityPrivacyPolicy;
 class TestEntity extends Entity_1.default {
-    static getCompanionDefinition() {
-        return exports.testEntityCompanion;
+    static defineCompanionDefinition() {
+        return {
+            entityClass: TestEntity,
+            entityConfiguration: exports.testEntityConfiguration,
+            privacyPolicyClass: TestEntityPrivacyPolicy,
+        };
     }
     getBlah() {
         return 'Hello World!';
     }
     static async hello(viewerContext, testValue) {
-        return (0, results_1.result)(new TestEntity(viewerContext, {
+        const fields = {
             customIdField: testValue,
             testIndexedField: 'hello',
             stringField: 'hello',
             intField: 1,
             dateField: new Date(),
             nullableField: null,
+        };
+        return (0, results_1.result)(new TestEntity({
+            viewerContext,
+            id: testValue,
+            databaseFields: fields,
+            selectedFields: fields,
         }));
     }
     static async returnError(_viewerContext) {
@@ -84,9 +93,4 @@ class TestEntity extends Entity_1.default {
     }
 }
 exports.default = TestEntity;
-exports.testEntityCompanion = new EntityCompanionProvider_1.EntityCompanionDefinition({
-    entityClass: TestEntity,
-    entityConfiguration: exports.testEntityConfiguration,
-    privacyPolicyClass: TestEntityPrivacyPolicy,
-});
 //# sourceMappingURL=TestEntity.js.map

package/build/testfixtures/TestEntity.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestEntity.js","sourceRoot":"","sources":["../../src/testfixtures/TestEntity.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA+C;AAE/C,uDAA+B;AAC/B,wEAAuE;AACvE,iFAAyD;AACzD,kDAA8E;AAC9E,iFAAyD;AAEzD,yGAAiF;AAWpE,QAAA,uBAAuB,GAAG,IAAI,6BAAmB,CAAa;IACzE,OAAO,EAAE,eAAe;IACxB,SAAS,EAAE,oCAAoC;IAC/C,MAAM,EAAE;QACN,aAAa,EAAE,IAAI,wBAAS,CAAC;YAC3B,UAAU,EAAE,WAAW;SACxB,CAAC;QACF,gBAAgB,EAAE,IAAI,0BAAW,CAAC;YAChC,UAAU,EAAE,YAAY;YACxB,KAAK,EAAE,IAAI;SACZ,CAAC;QACF,WAAW,EAAE,IAAI,0BAAW,CAAC;YAC3B,UAAU,EAAE,cAAc;SAC3B,CAAC;QACF,QAAQ,EAAE,IAAI,uBAAQ,CAAC;YACrB,UAAU,EAAE,cAAc;SAC3B,CAAC;QACF,SAAS,EAAE,IAAI,wBAAS,CAAC;YACvB,UAAU,EAAE,YAAY;SACzB,CAAC;QACF,aAAa,EAAE,IAAI,0BAAW,CAAC;YAC7B,UAAU,EAAE,gBAAgB;SAC7B,CAAC;KACH;IACD,qBAAqB,EAAE,UAAU;IACjC,kBAAkB,EAAE,OAAO;CAC5B,CAAC,CAAC;AAEH,MAAa,uBAAwB,SAAQ,6BAK5C;IALD;;QAM8B,cAAS,GAAG;YACtC,IAAI,sCAA4B,EAAiD;SAClF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAiD;SAClF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAiD;SAClF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAiD;SAClF,CAAC;IACJ,CAAC;CAAA;AAlBD,0DAkBC;AAED,MAAqB,UAAW,SAAQ,gBAAyC;IAC/E,MAAM,CAAC,sBAAsB;QAO3B,OAAO,2BAAmB,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,aAA4B,EAAE,SAAiB;QAChE,OAAO,IAAA,gBAAM,EACX,IAAI,UAAU,CAAC,aAAa,EAAE;YAC5B,aAAa,EAAE,SAAS;YACxB,gBAAgB,EAAE,OAAO;YACzB,WAAW,EAAE,OAAO;YACpB,QAAQ,EAAE,CAAC;YACX,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,aAAa,EAAE,IAAI;SACpB,CAAC,CACH,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,cAA6B;QACpD,OAAO,IAAA,gBAAM,EAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAA6B;QACnD,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,cAA6B,EAAE,SAAiB;QACrE,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAvCD,6BAuCC;AAEY,QAAA,mBAAmB,GAAG,IAAI,mDAAyB,CAAC;IAC/D,WAAW,EAAE,UAAU;IACvB,mBAAmB,EAAE,+BAAuB;IAC5C,kBAAkB,EAAE,uBAAuB;CAC5C,CAAC,CAAC"}
+{"version":3,"file":"TestEntity.js","sourceRoot":"","sources":["../../src/testfixtures/TestEntity.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA+C;AAE/C,uDAA+B;AAE/B,iFAAyD;AACzD,kDAA8E;AAC9E,iFAAyD;AAEzD,yGAAiF;AAWpE,QAAA,uBAAuB,GAAG,IAAI,6BAAmB,CAAa;IACzE,OAAO,EAAE,eAAe;IACxB,SAAS,EAAE,oCAAoC;IAC/C,MAAM,EAAE;QACN,aAAa,EAAE,IAAI,wBAAS,CAAC;YAC3B,UAAU,EAAE,WAAW;SACxB,CAAC;QACF,gBAAgB,EAAE,IAAI,0BAAW,CAAC;YAChC,UAAU,EAAE,YAAY;YACxB,KAAK,EAAE,IAAI;SACZ,CAAC;QACF,WAAW,EAAE,IAAI,0BAAW,CAAC;YAC3B,UAAU,EAAE,cAAc;SAC3B,CAAC;QACF,QAAQ,EAAE,IAAI,uBAAQ,CAAC;YACrB,UAAU,EAAE,cAAc;SAC3B,CAAC;QACF,SAAS,EAAE,IAAI,wBAAS,CAAC;YACvB,UAAU,EAAE,YAAY;SACzB,CAAC;QACF,aAAa,EAAE,IAAI,0BAAW,CAAC;YAC7B,UAAU,EAAE,gBAAgB;SAC7B,CAAC;KACH;IACD,qBAAqB,EAAE,UAAU;IACjC,kBAAkB,EAAE,OAAO;CAC5B,CAAC,CAAC;AAEH,MAAa,uBAAwB,SAAQ,6BAK5C;IALD;;QAM8B,cAAS,GAAG;YACtC,IAAI,sCAA4B,EAAiD;SAClF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAiD;SAClF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAiD;SAClF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAiD;SAClF,CAAC;IACJ,CAAC;CAAA;AAlBD,0DAkBC;AAED,MAAqB,UAAW,SAAQ,gBAAyC;IAC/E,MAAM,CAAC,yBAAyB;QAO9B,OAAO;YACL,WAAW,EAAE,UAAU;YACvB,mBAAmB,EAAE,+BAAuB;YAC5C,kBAAkB,EAAE,uBAAuB;SAC5C,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,aAA4B,EAAE,SAAiB;QAChE,MAAM,MAAM,GAAG;YACb,aAAa,EAAE,SAAS;YACxB,gBAAgB,EAAE,OAAO;YACzB,WAAW,EAAE,OAAO;YACpB,QAAQ,EAAE,CAAC;YACX,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,aAAa,EAAE,IAAI;SACpB,CAAC;QACF,OAAO,IAAA,gBAAM,EACX,IAAI,UAAU,CAAC;YACb,aAAa;YACb,EAAE,EAAE,SAAS;YACb,cAAc,EAAE,MAAM;YACtB,cAAc,EAAE,MAAM;SACvB,CAAC,CACH,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,cAA6B;QACpD,OAAO,IAAA,gBAAM,EAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAA6B;QACnD,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,cAA6B,EAAE,SAAiB;QACrE,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAjDD,6BAiDC"}

package/build/testfixtures/TestEntity2.d.ts

@@ -4,7 +4,7 @@ import EntityConfiguration from '../EntityConfiguration';
 import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
 import ViewerContext from '../ViewerContext';
 import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
-export declare type Test2Fields = {
+export type Test2Fields = {
     id: string;
     foreignKey: string;
 };
@@ -16,6 +16,5 @@ export declare class TestEntity2PrivacyPolicy extends EntityPrivacyPolicy<Test2F
     protected readonly deleteRules: AlwaysAllowPrivacyPolicyRule<Test2Fields, string, ViewerContext, TestEntity2, keyof Test2Fields>[];
 }
 export default class TestEntity2 extends Entity<Test2Fields, string, ViewerContext> {
-    static getCompanionDefinition(): EntityCompanionDefinition<Test2Fields, string, ViewerContext, TestEntity2, TestEntity2PrivacyPolicy>;
+    static defineCompanionDefinition(): EntityCompanionDefinition<Test2Fields, string, ViewerContext, TestEntity2, TestEntity2PrivacyPolicy>;
 }
-export declare const testEntity2Companion: EntityCompanionDefinition<Test2Fields, string, ViewerContext, TestEntity2, TestEntity2PrivacyPolicy, keyof Test2Fields>;

package/build/testfixtures/TestEntity2.js

@@ -3,9 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testEntity2Companion = exports.TestEntity2PrivacyPolicy = exports.testEntity2Configuration = void 0;
+exports.TestEntity2PrivacyPolicy = exports.testEntity2Configuration = void 0;
 const Entity_1 = __importDefault(require("../Entity"));
-const EntityCompanionProvider_1 = require("../EntityCompanionProvider");
 const EntityConfiguration_1 = __importDefault(require("../EntityConfiguration"));
 const EntityFields_1 = require("../EntityFields");
 const EntityPrivacyPolicy_1 = __importDefault(require("../EntityPrivacyPolicy"));
@@ -43,14 +42,13 @@ class TestEntity2PrivacyPolicy extends EntityPrivacyPolicy_1.default {
 }
 exports.TestEntity2PrivacyPolicy = TestEntity2PrivacyPolicy;
 class TestEntity2 extends Entity_1.default {
-    static getCompanionDefinition() {
-        return exports.testEntity2Companion;
+    static defineCompanionDefinition() {
+        return {
+            entityClass: TestEntity2,
+            entityConfiguration: exports.testEntity2Configuration,
+            privacyPolicyClass: TestEntity2PrivacyPolicy,
+        };
     }
 }
 exports.default = TestEntity2;
-exports.testEntity2Companion = new EntityCompanionProvider_1.EntityCompanionDefinition({
-    entityClass: TestEntity2,
-    entityConfiguration: exports.testEntity2Configuration,
-    privacyPolicyClass: TestEntity2PrivacyPolicy,
-});
 //# sourceMappingURL=TestEntity2.js.map

package/build/testfixtures/TestEntity2.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestEntity2.js","sourceRoot":"","sources":["../../src/testfixtures/TestEntity2.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,wEAAuE;AACvE,iFAAyD;AACzD,kDAA4C;AAC5C,iFAAyD;AAEzD,yGAAiF;AAOpE,QAAA,wBAAwB,GAAG,IAAI,6BAAmB,CAAc;IAC3E,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,sCAAsC;IACjD,MAAM,EAAE;QACN,EAAE,EAAE,IAAI,wBAAS,CAAC;YAChB,UAAU,EAAE,IAAI;SACjB,CAAC;QACF,UAAU,EAAE,IAAI,wBAAS,CAAC;YACxB,UAAU,EAAE,aAAa;SAC1B,CAAC;KACH;IACD,qBAAqB,EAAE,UAAU;IACjC,kBAAkB,EAAE,OAAO;CAC5B,CAAC,CAAC;AAEH,MAAa,wBAAyB,SAAQ,6BAK7C;IALD;;QAM8B,cAAS,GAAG;YACtC,IAAI,sCAA4B,EAAmD;SACpF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAmD;SACpF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAmD;SACpF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAmD;SACpF,CAAC;IACJ,CAAC;CAAA;AAlBD,4DAkBC;AAED,MAAqB,WAAY,SAAQ,gBAA0C;IACjF,MAAM,CAAC,sBAAsB;QAO3B,OAAO,4BAAoB,CAAC;IAC9B,CAAC;CACF;AAVD,8BAUC;AAEY,QAAA,oBAAoB,GAAG,IAAI,mDAAyB,CAAC;IAChE,WAAW,EAAE,WAAW;IACxB,mBAAmB,EAAE,gCAAwB;IAC7C,kBAAkB,EAAE,wBAAwB;CAC7C,CAAC,CAAC"}
+{"version":3,"file":"TestEntity2.js","sourceRoot":"","sources":["../../src/testfixtures/TestEntity2.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAE/B,iFAAyD;AACzD,kDAA4C;AAC5C,iFAAyD;AAEzD,yGAAiF;AAOpE,QAAA,wBAAwB,GAAG,IAAI,6BAAmB,CAAc;IAC3E,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,sCAAsC;IACjD,MAAM,EAAE;QACN,EAAE,EAAE,IAAI,wBAAS,CAAC;YAChB,UAAU,EAAE,IAAI;SACjB,CAAC;QACF,UAAU,EAAE,IAAI,wBAAS,CAAC;YACxB,UAAU,EAAE,aAAa;SAC1B,CAAC;KACH;IACD,qBAAqB,EAAE,UAAU;IACjC,kBAAkB,EAAE,OAAO;CAC5B,CAAC,CAAC;AAEH,MAAa,wBAAyB,SAAQ,6BAK7C;IALD;;QAM8B,cAAS,GAAG;YACtC,IAAI,sCAA4B,EAAmD;SACpF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAmD;SACpF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAmD;SACpF,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAAmD;SACpF,CAAC;IACJ,CAAC;CAAA;AAlBD,4DAkBC;AAED,MAAqB,WAAY,SAAQ,gBAA0C;IACjF,MAAM,CAAC,yBAAyB;QAO9B,OAAO;YACL,WAAW,EAAE,WAAW;YACxB,mBAAmB,EAAE,gCAAwB;YAC7C,kBAAkB,EAAE,wBAAwB;SAC7C,CAAC;IACJ,CAAC;CACF;AAdD,8BAcC"}

package/build/testfixtures/TestEntityNumberKey.d.ts

@@ -4,7 +4,7 @@ import EntityConfiguration from '../EntityConfiguration';
 import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
 import ViewerContext from '../ViewerContext';
 import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
-export declare type NumberKeyFields = {
+export type NumberKeyFields = {
     id: number;
 };
 export declare const numberKeyEntityConfiguration: EntityConfiguration<NumberKeyFields>;
@@ -15,6 +15,5 @@ export declare class NumberKeyPrivacyPolicy extends EntityPrivacyPolicy<NumberKe
     protected readonly deleteRules: AlwaysAllowPrivacyPolicyRule<NumberKeyFields, number, ViewerContext, NumberKeyEntity, "id">[];
 }
 export default class NumberKeyEntity extends Entity<NumberKeyFields, number, ViewerContext> {
-    static getCompanionDefinition(): EntityCompanionDefinition<NumberKeyFields, number, ViewerContext, NumberKeyEntity, NumberKeyPrivacyPolicy>;
+    static defineCompanionDefinition(): EntityCompanionDefinition<NumberKeyFields, number, ViewerContext, NumberKeyEntity, NumberKeyPrivacyPolicy>;
 }
-export declare const numberKeyEntityCompanion: EntityCompanionDefinition<NumberKeyFields, number, ViewerContext, NumberKeyEntity, NumberKeyPrivacyPolicy, "id">;

package/build/testfixtures/TestEntityNumberKey.js

@@ -3,9 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.numberKeyEntityCompanion = exports.NumberKeyPrivacyPolicy = exports.numberKeyEntityConfiguration = void 0;
+exports.NumberKeyPrivacyPolicy = exports.numberKeyEntityConfiguration = void 0;
 const Entity_1 = __importDefault(require("../Entity"));
-const EntityCompanionProvider_1 = require("../EntityCompanionProvider");
 const EntityConfiguration_1 = __importDefault(require("../EntityConfiguration"));
 const EntityFields_1 = require("../EntityFields");
 const EntityPrivacyPolicy_1 = __importDefault(require("../EntityPrivacyPolicy"));
@@ -40,14 +39,13 @@ class NumberKeyPrivacyPolicy extends EntityPrivacyPolicy_1.default {
 }
 exports.NumberKeyPrivacyPolicy = NumberKeyPrivacyPolicy;
 class NumberKeyEntity extends Entity_1.default {
-    static getCompanionDefinition() {
-        return exports.numberKeyEntityCompanion;
+    static defineCompanionDefinition() {
+        return {
+            entityClass: NumberKeyEntity,
+            entityConfiguration: exports.numberKeyEntityConfiguration,
+            privacyPolicyClass: NumberKeyPrivacyPolicy,
+        };
     }
 }
 exports.default = NumberKeyEntity;
-exports.numberKeyEntityCompanion = new EntityCompanionProvider_1.EntityCompanionDefinition({
-    entityClass: NumberKeyEntity,
-    entityConfiguration: exports.numberKeyEntityConfiguration,
-    privacyPolicyClass: NumberKeyPrivacyPolicy,
-});
 //# sourceMappingURL=TestEntityNumberKey.js.map

package/build/testfixtures/TestEntityNumberKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestEntityNumberKey.js","sourceRoot":"","sources":["../../src/testfixtures/TestEntityNumberKey.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,wEAAuE;AACvE,iFAAyD;AACzD,kDAA2C;AAC3C,iFAAyD;AAEzD,yGAAiF;AAMpE,QAAA,4BAA4B,GAAG,IAAI,6BAAmB,CAAkB;IACnF,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,2CAA2C;IACtD,MAAM,EAAE;QACN,EAAE,EAAE,IAAI,uBAAQ,CAAC;YACf,UAAU,EAAE,WAAW;SACxB,CAAC;KACH;IACD,qBAAqB,EAAE,UAAU;IACjC,kBAAkB,EAAE,OAAO;CAC5B,CAAC,CAAC;AAEH,MAAa,sBAAuB,SAAQ,6BAK3C;IALD;;QAM8B,cAAS,GAAG;YACtC,IAAI,sCAA4B,EAA2D;SAC5F,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAA2D;SAC5F,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAA2D;SAC5F,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAA2D;SAC5F,CAAC;IACJ,CAAC;CAAA;AAlBD,wDAkBC;AAED,MAAqB,eAAgB,SAAQ,gBAA8C;IACzF,MAAM,CAAC,sBAAsB;QAO3B,OAAO,gCAAwB,CAAC;IAClC,CAAC;CACF;AAVD,kCAUC;AAEY,QAAA,wBAAwB,GAAG,IAAI,mDAAyB,CAAC;IACpE,WAAW,EAAE,eAAe;IAC5B,mBAAmB,EAAE,oCAA4B;IACjD,kBAAkB,EAAE,sBAAsB;CAC3C,CAAC,CAAC"}
+{"version":3,"file":"TestEntityNumberKey.js","sourceRoot":"","sources":["../../src/testfixtures/TestEntityNumberKey.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAE/B,iFAAyD;AACzD,kDAA2C;AAC3C,iFAAyD;AAEzD,yGAAiF;AAMpE,QAAA,4BAA4B,GAAG,IAAI,6BAAmB,CAAkB;IACnF,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,2CAA2C;IACtD,MAAM,EAAE;QACN,EAAE,EAAE,IAAI,uBAAQ,CAAC;YACf,UAAU,EAAE,WAAW;SACxB,CAAC;KACH;IACD,qBAAqB,EAAE,UAAU;IACjC,kBAAkB,EAAE,OAAO;CAC5B,CAAC,CAAC;AAEH,MAAa,sBAAuB,SAAQ,6BAK3C;IALD;;QAM8B,cAAS,GAAG;YACtC,IAAI,sCAA4B,EAA2D;SAC5F,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAA2D;SAC5F,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAA2D;SAC5F,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,sCAA4B,EAA2D;SAC5F,CAAC;IACJ,CAAC;CAAA;AAlBD,wDAkBC;AAED,MAAqB,eAAgB,SAAQ,gBAA8C;IACzF,MAAM,CAAC,yBAAyB;QAO9B,OAAO;YACL,WAAW,EAAE,eAAe;YAC5B,mBAAmB,EAAE,oCAA4B;YACjD,kBAAkB,EAAE,sBAAsB;SAC3C,CAAC;IACJ,CAAC;CACF;AAdD,kCAcC"}

package/build/utils/testing/PrivacyPolicyRuleTestUtils.d.ts

@@ -3,17 +3,17 @@ import { EntityQueryContext } from '../../EntityQueryContext';
 import ReadonlyEntity from '../../ReadonlyEntity';
 import ViewerContext from '../../ViewerContext';
 import PrivacyPolicyRule from '../../rules/PrivacyPolicyRule';
-export interface Case<TFields, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields> {
+export interface Case<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields> {
     viewerContext: TViewerContext;
     queryContext: EntityQueryContext;
     evaluationContext: EntityPrivacyPolicyEvaluationContext;
     entity: TEntity;
 }
-export declare type CaseMap<TFields, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields> = Map<string, () => Promise<Case<TFields, TID, TViewerContext, TEntity, TSelectedFields>>>;
+export type CaseMap<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields> = Map<string, () => Promise<Case<TFields, TID, TViewerContext, TEntity, TSelectedFields>>>;
 /**
  * Useful for defining test cases that have async preconditions.
  */
-export declare const describePrivacyPolicyRuleWithAsyncTestCase: <TFields, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields = keyof TFields>(privacyPolicyRule: PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>, { allowCases, skipCases, denyCases, }: {
+export declare const describePrivacyPolicyRuleWithAsyncTestCase: <TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields = keyof TFields>(privacyPolicyRule: PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>, { allowCases, skipCases, denyCases, }: {
     allowCases?: CaseMap<TFields, TID, TViewerContext, TEntity, TSelectedFields>;
     skipCases?: CaseMap<TFields, TID, TViewerContext, TEntity, TSelectedFields>;
     denyCases?: CaseMap<TFields, TID, TViewerContext, TEntity, TSelectedFields>;
@@ -21,7 +21,7 @@ export declare const describePrivacyPolicyRuleWithAsyncTestCase: <TFields, TID e
 /**
  * For test simple privacy rules that don't have complex async preconditions.
  */
-export declare const describePrivacyPolicyRule: <TFields, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields = keyof TFields>(privacyPolicyRule: PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>, { allowCases, skipCases, denyCases, }: {
+export declare const describePrivacyPolicyRule: <TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields = keyof TFields>(privacyPolicyRule: PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>, { allowCases, skipCases, denyCases, }: {
     allowCases?: Case<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
     skipCases?: Case<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
     denyCases?: Case<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];

package/build/utils/testing/StubCacheAdapter.d.ts

@@ -1,11 +1,11 @@
-import EntityCacheAdapter from '../../EntityCacheAdapter';
 import EntityConfiguration from '../../EntityConfiguration';
+import IEntityCacheAdapter from '../../IEntityCacheAdapter';
 import IEntityCacheAdapterProvider from '../../IEntityCacheAdapterProvider';
 import { CacheLoadResult } from '../../internal/ReadThroughEntityCache';
 export declare class NoCacheStubCacheAdapterProvider implements IEntityCacheAdapterProvider {
-    getCacheAdapter<TFields>(entityConfiguration: EntityConfiguration<TFields>): EntityCacheAdapter<TFields>;
+    getCacheAdapter<TFields>(_entityConfiguration: EntityConfiguration<TFields>): IEntityCacheAdapter<TFields>;
 }
-export declare class NoCacheStubCacheAdapter<TFields> extends EntityCacheAdapter<TFields> {
+export declare class NoCacheStubCacheAdapter<TFields> implements IEntityCacheAdapter<TFields> {
     loadManyAsync<N extends keyof TFields>(_fieldName: N, fieldValues: readonly NonNullable<TFields[N]>[]): Promise<ReadonlyMap<NonNullable<TFields[N]>, CacheLoadResult<TFields>>>;
     cacheManyAsync<N extends keyof TFields>(_fieldName: N, _objectMap: ReadonlyMap<NonNullable<TFields[N]>, Readonly<TFields>>): Promise<void>;
     cacheDBMissesAsync<N extends keyof TFields>(_fieldName: N, _fieldValues: readonly NonNullable<TFields[N]>[]): Promise<void>;
@@ -13,9 +13,10 @@ export declare class NoCacheStubCacheAdapter<TFields> extends EntityCacheAdapter
 }
 export declare class InMemoryFullCacheStubCacheAdapterProvider implements IEntityCacheAdapterProvider {
     cache: Map<string, Readonly<object>>;
-    getCacheAdapter<TFields>(entityConfiguration: EntityConfiguration<TFields>): EntityCacheAdapter<TFields>;
+    getCacheAdapter<TFields>(entityConfiguration: EntityConfiguration<TFields>): IEntityCacheAdapter<TFields>;
 }
-export declare class InMemoryFullCacheStubCacheAdapter<TFields> extends EntityCacheAdapter<TFields> {
+export declare class InMemoryFullCacheStubCacheAdapter<TFields> implements IEntityCacheAdapter<TFields> {
+    private readonly entityConfiguration;
     readonly cache: Map<string, Readonly<TFields>>;
     constructor(entityConfiguration: EntityConfiguration<TFields>, cache: Map<string, Readonly<TFields>>);
     loadManyAsync<N extends keyof TFields>(fieldName: N, fieldValues: readonly NonNullable<TFields[N]>[]): Promise<ReadonlyMap<NonNullable<TFields[N]>, CacheLoadResult<TFields>>>;

package/build/utils/testing/StubCacheAdapter.js

@@ -5,15 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemoryFullCacheStubCacheAdapter = exports.InMemoryFullCacheStubCacheAdapterProvider = exports.NoCacheStubCacheAdapter = exports.NoCacheStubCacheAdapterProvider = void 0;
 const invariant_1 = __importDefault(require("invariant"));
-const EntityCacheAdapter_1 = __importDefault(require("../../EntityCacheAdapter"));
 const ReadThroughEntityCache_1 = require("../../internal/ReadThroughEntityCache");
 class NoCacheStubCacheAdapterProvider {
-    getCacheAdapter(entityConfiguration) {
-        return new NoCacheStubCacheAdapter(entityConfiguration);
+    getCacheAdapter(_entityConfiguration) {
+        return new NoCacheStubCacheAdapter();
     }
 }
 exports.NoCacheStubCacheAdapterProvider = NoCacheStubCacheAdapterProvider;
-class NoCacheStubCacheAdapter extends EntityCacheAdapter_1.default {
+class NoCacheStubCacheAdapter {
     async loadManyAsync(_fieldName, fieldValues) {
         return fieldValues.reduce((acc, v) => {
             acc.set(v, {
@@ -36,9 +35,9 @@ class InMemoryFullCacheStubCacheAdapterProvider {
     }
 }
 exports.InMemoryFullCacheStubCacheAdapterProvider = InMemoryFullCacheStubCacheAdapterProvider;
-class InMemoryFullCacheStubCacheAdapter extends EntityCacheAdapter_1.default {
+class InMemoryFullCacheStubCacheAdapter {
     constructor(entityConfiguration, cache) {
-        super(entityConfiguration);
+        this.entityConfiguration = entityConfiguration;
         this.cache = cache;
     }
     async loadManyAsync(fieldName, fieldValues) {

package/build/utils/testing/StubCacheAdapter.js.map

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

package/build/utils/testing/StubDatabaseAdapterProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"StubDatabaseAdapterProvider.js","sourceRoot":"","sources":["../../../src/utils/testing/StubDatabaseAdapterProvider.ts"],"names":[],"mappings":";;;;;AAGA,gFAAwD;AAExD,MAAqB,2BAA2B;IAAhD;QACmB,qBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IAOhD,CAAC;IALC,kBAAkB,CAChB,mBAAiD;QAEjD,OAAO,IAAI,6BAAmB,CAAC,mBAAmB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC7E,CAAC;CACF;AARD,8CAQC"}
+{"version":3,"file":"StubDatabaseAdapterProvider.js","sourceRoot":"","sources":["../../../src/utils/testing/StubDatabaseAdapterProvider.ts"],"names":[],"mappings":";;;;;AAAA,gFAAwD;AAKxD,MAAqB,2BAA2B;IAAhD;QACmB,qBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IAOhD,CAAC;IALC,kBAAkB,CAChB,mBAAiD;QAEjD,OAAO,IAAI,6BAAmB,CAAC,mBAAmB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC7E,CAAC;CACF;AARD,8CAQC"}

package/build/utils/testing/StubQueryContextProvider.d.ts

@@ -1,7 +1,8 @@
+import { TransactionConfig } from '../../EntityQueryContext';
 import EntityQueryContextProvider from '../../EntityQueryContextProvider';
 export declare class StubQueryContextProvider extends EntityQueryContextProvider {
     protected getQueryInterface(): any;
-    protected createTransactionRunner<T>(): (transactionScope: (queryInterface: any) => Promise<T>) => Promise<T>;
+    protected createTransactionRunner<T>(_transactionConfig?: TransactionConfig): (transactionScope: (queryInterface: any) => Promise<T>) => Promise<T>;
     protected createNestedTransactionRunner<T>(_outerQueryInterface: any): (transactionScope: (queryInterface: any) => Promise<T>) => Promise<T>;
 }
 declare const _default: StubQueryContextProvider;

package/build/utils/testing/StubQueryContextProvider.js

@@ -9,7 +9,7 @@ class StubQueryContextProvider extends EntityQueryContextProvider_1.default {
     getQueryInterface() {
         return {};
     }
-    createTransactionRunner() {
+    createTransactionRunner(_transactionConfig) {
         return (transactionScope) => Promise.resolve(transactionScope({}));
     }
     createNestedTransactionRunner(_outerQueryInterface) {

package/build/utils/testing/StubQueryContextProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"StubQueryContextProvider.js","sourceRoot":"","sources":["../../../src/utils/testing/StubQueryContextProvider.ts"],"names":[],"mappings":";;;;;;AAAA,kGAA0E;AAE1E,MAAa,wBAAyB,SAAQ,oCAA0B;IAC5D,iBAAiB;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAES,uBAAuB;QAG/B,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;IAES,6BAA6B,CACrC,oBAAyB;QAEzB,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;CACF;AAhBD,4DAgBC;AAED,kBAAe,IAAI,wBAAwB,EAAE,CAAC"}
+{"version":3,"file":"StubQueryContextProvider.js","sourceRoot":"","sources":["../../../src/utils/testing/StubQueryContextProvider.ts"],"names":[],"mappings":";;;;;;AACA,kGAA0E;AAE1E,MAAa,wBAAyB,SAAQ,oCAA0B;IAC5D,iBAAiB;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAES,uBAAuB,CAC/B,kBAAsC;QAEtC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;IAES,6BAA6B,CACrC,oBAAyB;QAEzB,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;CACF;AAhBD,4DAgBC;AAED,kBAAe,IAAI,wBAAwB,EAAE,CAAC"}

package/build/utils/testing/createUnitTestEntityCompanionProvider.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUnitTestEntityCompanionProvider = void 0;
-const EntityCompanionProvider_1 = __importDefault(require("../../EntityCompanionProvider"));
-const NoOpEntityMetricsAdapter_1 = __importDefault(require("../../metrics/NoOpEntityMetricsAdapter"));
 const StubCacheAdapter_1 = require("./StubCacheAdapter");
 const StubDatabaseAdapterProvider_1 = __importDefault(require("./StubDatabaseAdapterProvider"));
 const StubQueryContextProvider_1 = __importDefault(require("./StubQueryContextProvider"));
+const EntityCompanionProvider_1 = __importDefault(require("../../EntityCompanionProvider"));
+const NoOpEntityMetricsAdapter_1 = __importDefault(require("../../metrics/NoOpEntityMetricsAdapter"));
 /**
  * Entity companion provider for use in unit tests. All database and cache implementations
  * are replaced with in-memory simulations.

package/build/utils/testing/createUnitTestEntityCompanionProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"createUnitTestEntityCompanionProvider.js","sourceRoot":"","sources":["../../../src/utils/testing/createUnitTestEntityCompanionProvider.ts"],"names":[],"mappings":";;;;;;AAAA,4FAAoE;AAEpE,sGAA8E;AAC9E,yDAA+E;AAC/E,gGAAwE;AACxE,0FAAkE;AAElE;;;GAGG;AACI,MAAM,qCAAqC,GAAG,CACnD,iBAAwC,IAAI,kCAAwB,EAAE,EAC7C,EAAE;IAC3B,OAAO,IAAI,iCAAuB,CAChC,cAAc,EACd,IAAI,GAAG,CAAC;QACN;YACE,UAAU;YACV;gBACE,eAAe,EAAE,IAAI,qCAA2B,EAAE;gBAClD,oBAAoB,EAAE,kCAAwB;aAC/C;SACF;KACF,CAAC,EACF,IAAI,GAAG,CAAC;QACN;YACE,OAAO;YACP;gBACE,oBAAoB,EAAE,IAAI,4DAAyC,EAAE;aACtE;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,qCAAqC,yCAuBhD"}
+{"version":3,"file":"createUnitTestEntityCompanionProvider.js","sourceRoot":"","sources":["../../../src/utils/testing/createUnitTestEntityCompanionProvider.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA+E;AAC/E,gGAAwE;AACxE,0FAAkE;AAClE,4FAAoE;AAEpE,sGAA8E;AAE9E;;;GAGG;AACI,MAAM,qCAAqC,GAAG,CACnD,iBAAwC,IAAI,kCAAwB,EAAE,EAC7C,EAAE;IAC3B,OAAO,IAAI,iCAAuB,CAChC,cAAc,EACd,IAAI,GAAG,CAAC;QACN;YACE,UAAU;YACV;gBACE,eAAe,EAAE,IAAI,qCAA2B,EAAE;gBAClD,oBAAoB,EAAE,kCAAwB;aAC/C;SACF;KACF,CAAC,EACF,IAAI,GAAG,CAAC;QACN;YACE,OAAO;YACP;gBACE,oBAAoB,EAAE,IAAI,4DAAyC,EAAE;aACtE;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,qCAAqC,yCAuBhD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity",
-  "version": "0.31.1",
+  "version": "0.33.0",
   "description": "A privacy-first data model",
   "files": [
     "build",
@@ -19,7 +19,7 @@
     "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=16"
   },
   "keywords": [
     "entity"
@@ -33,5 +33,5 @@
     "invariant": "^2.2.4",
     "uuid": "^8.3.0"
   },
-  "gitHead": "83fe9cdea5b0cd69f38ac58eed12e96d5fa51d07"
+  "gitHead": "659e08386f2c5e33e9ac4c670fd832a62a2b6382"
 }

package/src/ComposedEntityCacheAdapter.ts

@@ -1,26 +1,19 @@
 import nullthrows from 'nullthrows';
 
-import EntityCacheAdapter from './EntityCacheAdapter';
-import EntityConfiguration from './EntityConfiguration';
+import IEntityCacheAdapter from './IEntityCacheAdapter';
 import { CacheStatus, CacheLoadResult } from './internal/ReadThroughEntityCache';
 
 /**
- * A EntityCacheAdapter that composes other EntityCacheAdapter instances.
+ * A IEntityCacheAdapter that composes other IEntityCacheAdapter instances.
  */
-export default class ComposedEntityCacheAdapter<TFields> extends EntityCacheAdapter<TFields> {
+export default class ComposedEntityCacheAdapter<TFields> implements IEntityCacheAdapter<TFields> {
   /**
-   * @param entityConfiguration - configuration for entity being loaded
    * @param cacheAdapters - list of cache adapters to compose in order of precedence.
    *                        Earlier cache adapters are read from first and written to (including invalidations) last.
    *                        Typically, caches closer to the application should be ordered before caches closer to the database.
    *                        A lower layer cache is closer to the database, while a higher layer cache is closer to the application.
    */
-  constructor(
-    entityConfiguration: EntityConfiguration<TFields>,
-    private readonly cacheAdapters: EntityCacheAdapter<TFields>[]
-  ) {
-    super(entityConfiguration);
-  }
+  constructor(private readonly cacheAdapters: IEntityCacheAdapter<TFields>[]) {}
 
   public async loadManyAsync<N extends keyof TFields>(
     fieldName: N,

package/src/EnforcingEntityLoader.ts

@@ -14,7 +14,7 @@ import { mapMap } from './utils/collections/maps';
  * if the loads are not successful.
  */
 export default class EnforcingEntityLoader<
-  TFields,
+  TFields extends object,
   TID extends NonNullable<TFields[TSelectedFields]>,
   TViewerContext extends ViewerContext,
   TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
@@ -114,6 +114,15 @@ export default class EnforcingEntityLoader<
     return mapMap(entityResults, (result) => result.enforceValue());
   }
 
+  /**
+   * 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
+   */
+  async loadManyByIDsNullableAsync(ids: readonly TID[]): Promise<ReadonlyMap<TID, TEntity | null>> {
+    const entityResults = await this.entityLoader.loadManyByIDsNullableAsync(ids);
+    return 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

package/src/Entity.ts

@@ -26,7 +26,7 @@ import ViewerContext from './ViewerContext';
  * own EntityCompanionDefinition.
  */
 export default abstract class Entity<
-  TFields,
+  TFields extends object,
   TID extends NonNullable<TFields[TSelectedFields]>,
   TViewerContext extends ViewerContext,
   TSelectedFields extends keyof TFields = keyof TFields
@@ -38,7 +38,7 @@ export default abstract class Entity<
    * @returns mutator for creating an entity
    */
   static creator<
-    TMFields,
+    TMFields extends object,
     TMID extends NonNullable<TMFields[TMSelectedFields]>,
     TMViewerContext extends ViewerContext,
     TMViewerContext2 extends TMViewerContext,
@@ -79,7 +79,7 @@ export default abstract class Entity<
    * @returns mutator for updating existingEntity
    */
   static updater<
-    TMFields,
+    TMFields extends object,
     TMID extends NonNullable<TMFields[TMSelectedFields]>,
     TMViewerContext extends ViewerContext,
     TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
@@ -120,7 +120,7 @@ export default abstract class Entity<
    * @param queryContext - query context in which to perform the delete
    */
   static deleteAsync<
-    TMFields,
+    TMFields extends object,
     TMID extends NonNullable<TMFields[TMSelectedFields]>,
     TMViewerContext extends ViewerContext,
     TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
@@ -162,7 +162,7 @@ export default abstract class Entity<
    * @param queryContext - query context in which to perform the delete
    */
   static enforceDeleteAsync<
-    TMFields,
+    TMFields extends object,
     TMID extends NonNullable<TMFields[TMSelectedFields]>,
     TMViewerContext extends ViewerContext,
     TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
@@ -215,7 +215,7 @@ export default abstract class Entity<
    * @param queryContext - query context in which to perform the check
    */
   static async canViewerUpdateAsync<
-    TMFields,
+    TMFields extends object,
     TMID extends NonNullable<TMFields[TMSelectedFields]>,
     TMViewerContext extends ViewerContext,
     TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
@@ -246,7 +246,7 @@ export default abstract class Entity<
     const companion = existingEntity
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(this);
-    const privacyPolicy = new (this.getCompanionDefinition().privacyPolicyClass)();
+    const privacyPolicy = companion.entityCompanion.privacyPolicy;
     const evaluationResult = await asyncResult(
       privacyPolicy.authorizeUpdateAsync(
         existingEntity.getViewerContext(),
@@ -269,7 +269,7 @@ export default abstract class Entity<
    * @param queryContext - query context in which to perform the check
    */
   static async canViewerDeleteAsync<
-    TMFields,
+    TMFields extends object,
     TMID extends NonNullable<TMFields[TMSelectedFields]>,
     TMViewerContext extends ViewerContext,
     TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
@@ -300,7 +300,7 @@ export default abstract class Entity<
     const companion = existingEntity
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(this);
-    const privacyPolicy = new (this.getCompanionDefinition().privacyPolicyClass)();
+    const privacyPolicy = companion.entityCompanion.privacyPolicy;
     const evaluationResult = await asyncResult(
       privacyPolicy.authorizeDeleteAsync(
         existingEntity.getViewerContext(),
@@ -318,7 +318,7 @@ export default abstract class Entity<
  * An interface to pass in constructor (class) of an Entity as a function argument.
  */
 export interface IEntityClass<
-  TFields,
+  TFields extends object,
   TID extends NonNullable<TFields[TSelectedFields]>,
   TViewerContext extends ViewerContext,
   TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
@@ -331,8 +331,19 @@ export interface IEntityClass<
   >,
   TSelectedFields extends keyof TFields = keyof TFields
 > {
-  new (viewerContext: TViewerContext, obj: Readonly<TFields>): TEntity;
-  getCompanionDefinition(): EntityCompanionDefinition<
+  new (constructorParam: {
+    viewerContext: TViewerContext;
+    id: TID;
+    databaseFields: Readonly<TFields>;
+    selectedFields: Readonly<Pick<TFields, TSelectedFields>>;
+  }): TEntity;
+
+  /**
+   * Returns a EntityCompanionDefinition for this entity.
+   *
+   * Memoized by the entity framework.
+   */
+  defineCompanionDefinition(): EntityCompanionDefinition<
     TFields,
     TID,
     TViewerContext,