@expo/entity 0.31.1 → 0.32.0

package/build/__tests__/ReadonlyEntity-test.js

@@ -18,7 +18,12 @@ describe(ReadonlyEntity_1.default, () => {
             const data = {
                 id: 'what',
             };
-            const testEntity = new SimpleTestEntity_1.default(viewerContext, data);
+            const testEntity = new SimpleTestEntity_1.default({
+                viewerContext,
+                id: 'what',
+                databaseFields: data,
+                selectedFields: data,
+            });
             expect(testEntity.getID()).toEqual('what');
         });
     });
@@ -28,18 +33,37 @@ describe(ReadonlyEntity_1.default, () => {
             const data = {
                 id: 'what',
             };
-            const testEntity = new SimpleTestEntity_1.default(viewerContext, data);
+            const testEntity = new SimpleTestEntity_1.default({
+                viewerContext,
+                id: 'what',
+                databaseFields: data,
+                selectedFields: data,
+            });
             expect(testEntity.toString()).toEqual('SimpleTestEntity[what]');
         });
     });
     describe('getUniqueIdentifier', () => {
         it('returns a different value for two different entities of the same type', () => {
             const viewerContext = (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)(ViewerContext_1.default));
-            const testEntity = new SimpleTestEntity_1.default(viewerContext, {
+            const testEntity = new SimpleTestEntity_1.default({
+                viewerContext,
                 id: '1',
+                databaseFields: {
+                    id: '1',
+                },
+                selectedFields: {
+                    id: '1',
+                },
             });
-            const testEntity2 = new SimpleTestEntity_1.default(viewerContext, {
+            const testEntity2 = new SimpleTestEntity_1.default({
+                viewerContext,
                 id: '2',
+                databaseFields: {
+                    id: '2',
+                },
+                selectedFields: {
+                    id: '2',
+                },
             });
             expect(testEntity.getUniqueIdentifier()).not.toEqual(testEntity2.getUniqueIdentifier());
         });
@@ -47,21 +71,42 @@ describe(ReadonlyEntity_1.default, () => {
             const viewerContext = (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)(ViewerContext_1.default));
             const viewerContext2 = (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)(ViewerContext_1.default));
             const data = { id: '1' };
-            const testEntity = new SimpleTestEntity_1.default(viewerContext, data);
-            const testEntity2 = new SimpleTestEntity_1.default(viewerContext2, data);
+            const testEntity = new SimpleTestEntity_1.default({
+                viewerContext,
+                id: '1',
+                databaseFields: data,
+                selectedFields: data,
+            });
+            const testEntity2 = new SimpleTestEntity_1.default({
+                viewerContext: viewerContext2,
+                id: '1',
+                databaseFields: data,
+                selectedFields: data,
+            });
             expect(testEntity.getUniqueIdentifier()).toEqual(testEntity2.getUniqueIdentifier());
         });
         it('returns a different value for different entities even if same ID', () => {
             const viewerContext = (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)(ViewerContext_1.default));
             const data = { id: '1' };
-            const testEntity = new SimpleTestEntity_1.default(viewerContext, data);
-            const testEntity2 = new TestEntity_1.default(viewerContext, {
+            const testEntity = new SimpleTestEntity_1.default({
+                viewerContext,
+                id: 'what',
+                databaseFields: data,
+                selectedFields: data,
+            });
+            const data2 = {
                 customIdField: '1',
                 testIndexedField: '2',
                 stringField: '3',
                 intField: 4,
                 dateField: new Date(),
                 nullableField: null,
+            };
+            const testEntity2 = new TestEntity_1.default({
+                viewerContext,
+                id: '1',
+                databaseFields: data2,
+                selectedFields: data2,
             });
             expect(testEntity.getUniqueIdentifier()).not.toEqual(testEntity2.getUniqueIdentifier());
         });
@@ -70,15 +115,26 @@ describe(ReadonlyEntity_1.default, () => {
         const viewerContext = (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)(ViewerContext_1.default));
         const dataWithoutID = {};
         expect(() => {
-            new SimpleTestEntity_1.default(viewerContext, dataWithoutID); // eslint-disable-line no-new
+            // eslint-disable-next-line no-new
+            new SimpleTestEntity_1.default({
+                viewerContext,
+                id: undefined,
+                databaseFields: dataWithoutID,
+                selectedFields: dataWithoutID,
+            });
         }).toThrow();
     });
-    it('returns correct viewerContext from instantiation', () => {
+    it('returns correct viewerCo}ntext from instantiation', () => {
         const viewerContext = (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)(ViewerContext_1.default));
         const data = {
             id: 'what',
         };
-        const testEntity = new SimpleTestEntity_1.default(viewerContext, data);
+        const testEntity = new SimpleTestEntity_1.default({
+            viewerContext,
+            id: 'what',
+            databaseFields: data,
+            selectedFields: data,
+        });
         expect(testEntity.getViewerContext()).toBe(viewerContext);
     });
     it('returns correct data for field getters', () => {
@@ -86,7 +142,12 @@ describe(ReadonlyEntity_1.default, () => {
         const data = {
             id: 'what',
         };
-        const testEntity = new SimpleTestEntity_1.default(viewerContext, data);
+        const testEntity = new SimpleTestEntity_1.default({
+            viewerContext,
+            id: 'what',
+            databaseFields: data,
+            selectedFields: data,
+        });
         expect(testEntity.getField('id')).toEqual('what');
         expect(testEntity.getAllFields()).toEqual(data);
     });
@@ -97,7 +158,12 @@ describe(ReadonlyEntity_1.default, () => {
             const data = {
                 id: 'what',
             };
-            const testEntity = new SimpleTestEntity_1.default(viewerContext, data);
+            const testEntity = new SimpleTestEntity_1.default({
+                viewerContext,
+                id: 'what',
+                databaseFields: data,
+                selectedFields: data,
+            });
             expect(testEntity.associationLoader()).toBeInstanceOf(EntityAssociationLoader_1.default);
         });
     });

package/build/__tests__/ReadonlyEntity-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReadonlyEntity-test.js","sourceRoot":"","sources":["../../src/__tests__/ReadonlyEntity-test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ReadonlyEntity-test.js","sourceRoot":"","sources":["../../src/__tests__/ReadonlyEntity-test.ts"],"names":[],"mappings":";;;;;AAAA,2CAA4C;AAE5C,yFAAiE;AACjE,mEAA2C;AAC3C,uEAA+C;AAC/C,qEAA6C;AAC7C,wFAAgE;AAChE,4EAAoD;AACpD,kHAA+G;AAE/G,QAAQ,CAAC,wBAAc,EAAE,GAAG,EAAE;IAC5B,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACrB,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;YAC/B,MAAM,aAAa,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;YACpD,MAAM,IAAI,GAAG;gBACX,EAAE,EAAE,MAAM;aACX,CAAC;YACF,MAAM,UAAU,GAAG,IAAI,0BAAgB,CAAC;gBACtC,aAAa;gBACb,EAAE,EAAE,MAAM;gBACV,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;YACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;YAC/B,MAAM,aAAa,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;YACpD,MAAM,IAAI,GAAG;gBACX,EAAE,EAAE,MAAM;aACX,CAAC;YACF,MAAM,UAAU,GAAG,IAAI,0BAAgB,CAAC;gBACtC,aAAa;gBACb,EAAE,EAAE,MAAM;gBACV,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;YACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;YAC/E,MAAM,aAAa,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;YACpD,MAAM,UAAU,GAAG,IAAI,0BAAgB,CAAC;gBACtC,aAAa;gBACb,EAAE,EAAE,GAAG;gBACP,cAAc,EAAE;oBACd,EAAE,EAAE,GAAG;iBACR;gBACD,cAAc,EAAE;oBACd,EAAE,EAAE,GAAG;iBACR;aACF,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,0BAAgB,CAAC;gBACvC,aAAa;gBACb,EAAE,EAAE,GAAG;gBACP,cAAc,EAAE;oBACd,EAAE,EAAE,GAAG;iBACR;gBACD,cAAc,EAAE;oBACd,EAAE,EAAE,GAAG;iBACR;aACF,CAAC,CAAC;YACH,MAAM,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAC1F,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;YACjE,MAAM,aAAa,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;YACpD,MAAM,cAAc,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,IAAI,0BAAgB,CAAC;gBACtC,aAAa;gBACb,EAAE,EAAE,GAAG;gBACP,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,0BAAgB,CAAC;gBACvC,aAAa,EAAE,cAAc;gBAC7B,EAAE,EAAE,GAAG;gBACP,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;YACH,MAAM,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;YAC1E,MAAM,aAAa,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;YACpD,MAAM,IAAI,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,IAAI,0BAAgB,CAAC;gBACtC,aAAa;gBACb,EAAE,EAAE,MAAM;gBACV,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;YACH,MAAM,KAAK,GAAG;gBACZ,aAAa,EAAE,GAAG;gBAClB,gBAAgB,EAAE,GAAG;gBACrB,WAAW,EAAE,GAAG;gBAChB,QAAQ,EAAE,CAAC;gBACX,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,aAAa,EAAE,IAAI;aACpB,CAAC;YACF,MAAM,WAAW,GAAG,IAAI,oBAAU,CAAC;gBACjC,aAAa;gBACb,EAAE,EAAE,GAAG;gBACP,cAAc,EAAE,KAAK;gBACrB,cAAc,EAAE,KAAK;aACtB,CAAC,CAAC;YACH,MAAM,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAC1F,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,aAAa,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;QACpD,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,EAAE;YACV,kCAAkC;YAClC,IAAI,0BAAgB,CAAC;gBACnB,aAAa;gBACb,EAAE,EAAE,SAAgB;gBACpB,cAAc,EAAE,aAAoB;gBACpC,cAAc,EAAE,aAAoB;aACrC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,aAAa,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG;YACX,EAAE,EAAE,MAAM;SACX,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,0BAAgB,CAAC;YACtC,aAAa;YACb,EAAE,EAAE,MAAM;YACV,cAAc,EAAE,IAAI;YACpB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,MAAM,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,aAAa,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG;YACX,EAAE,EAAE,MAAM;SACX,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,0BAAgB,CAAC;YACtC,aAAa;YACb,EAAE,EAAE,MAAM;YACV,cAAc,EAAE,IAAI;YACpB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,iBAAiB,GAAG,IAAA,6EAAqC,GAAE,CAAC;YAClE,MAAM,aAAa,GAAG,IAAI,uBAAa,CAAC,iBAAiB,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAG;gBACX,EAAE,EAAE,MAAM;aACX,CAAC;YACF,MAAM,UAAU,GAAG,IAAI,0BAAgB,CAAC;gBACtC,aAAa;gBACb,EAAE,EAAE,MAAM;gBACV,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;YACH,MAAM,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC,cAAc,CAAC,iCAAuB,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YAC1C,MAAM,iBAAiB,GAAG,IAAA,6EAAqC,GAAE,CAAC;YAClE,MAAM,aAAa,GAAG,IAAI,uBAAa,CAAC,iBAAiB,CAAC,CAAC;YAC3D,MAAM,CAAC,0BAAgB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC,sBAAY,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/__tests__/ViewerScopedEntityCompanionProvider-test.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -31,13 +8,13 @@ const EntityCompanionProvider_1 = __importDefault(require("../EntityCompanionPro
 const ViewerContext_1 = __importDefault(require("../ViewerContext"));
 const ViewerScopedEntityCompanion_1 = __importDefault(require("../ViewerScopedEntityCompanion"));
 const ViewerScopedEntityCompanionProvider_1 = __importDefault(require("../ViewerScopedEntityCompanionProvider"));
-const TestEntity_1 = __importStar(require("../testfixtures/TestEntity"));
+const TestEntity_1 = __importDefault(require("../testfixtures/TestEntity"));
 describe(ViewerScopedEntityCompanionProvider_1.default, () => {
     it('returns viewer scoped entity companion', () => {
         const vc = (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)(ViewerContext_1.default));
         const entityCompanionProvider = (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)(EntityCompanionProvider_1.default));
         const viewerScopedEntityCompanionProvider = new ViewerScopedEntityCompanionProvider_1.default(entityCompanionProvider, vc);
-        expect(viewerScopedEntityCompanionProvider.getViewerScopedCompanionForEntity(TestEntity_1.default, TestEntity_1.testEntityCompanion)).toBeInstanceOf(ViewerScopedEntityCompanion_1.default);
+        expect(viewerScopedEntityCompanionProvider.getViewerScopedCompanionForEntity(TestEntity_1.default)).toBeInstanceOf(ViewerScopedEntityCompanion_1.default);
     });
 });
 //# sourceMappingURL=ViewerScopedEntityCompanionProvider-test.js.map

package/build/__tests__/ViewerScopedEntityCompanionProvider-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"ViewerScopedEntityCompanionProvider-test.js","sourceRoot":"","sources":["../../src/__tests__/ViewerScopedEntityCompanionProvider-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAE5C,yFAAiE;AACjE,qEAA6C;AAC7C,iGAAyE;AACzE,iHAAyF;AACzF,yEAA6E;AAE7E,QAAQ,CAAC,6CAAmC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,EAAE,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;QACzC,MAAM,uBAAuB,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,iCAAuB,CAAC,CAAC,CAAC;QACxE,MAAM,mCAAmC,GAAG,IAAI,6CAAmC,CACjF,uBAAuB,EACvB,EAAE,CACH,CAAC;QACF,MAAM,CACJ,mCAAmC,CAAC,iCAAiC,CACnE,oBAAU,EACV,gCAAmB,CACpB,CACF,CAAC,cAAc,CAAC,qCAA2B,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ViewerScopedEntityCompanionProvider-test.js","sourceRoot":"","sources":["../../src/__tests__/ViewerScopedEntityCompanionProvider-test.ts"],"names":[],"mappings":";;;;;AAAA,2CAA4C;AAE5C,yFAAiE;AACjE,qEAA6C;AAC7C,iGAAyE;AACzE,iHAAyF;AACzF,4EAAoD;AAEpD,QAAQ,CAAC,6CAAmC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,EAAE,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,uBAAa,CAAC,CAAC,CAAC;QACzC,MAAM,uBAAuB,GAAG,IAAA,qBAAQ,EAAC,IAAA,iBAAI,EAAC,iCAAuB,CAAC,CAAC,CAAC;QACxE,MAAM,mCAAmC,GAAG,IAAI,6CAAmC,CACjF,uBAAuB,EACvB,EAAE,CACH,CAAC;QACF,MAAM,CACJ,mCAAmC,CAAC,iCAAiC,CAAC,oBAAU,CAAC,CAClF,CAAC,cAAc,CAAC,qCAA2B,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/__tests__/cases/TwoEntitySameTableDisjointRows-test.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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"));
@@ -92,37 +91,35 @@ class TestEntityPrivacyPolicy extends EntityPrivacyPolicy_1.default {
     }
 }
 class OneTestEntity extends Entity_1.default {
-    constructor(viewerContext, rawFields) {
-        if (rawFields.entity_type !== EntityType.ONE) {
+    constructor(constructorParams) {
+        if (constructorParams.selectedFields.entity_type !== EntityType.ONE) {
             throw new Error('OneTestEntity must be instantiated with one data');
         }
-        super(viewerContext, rawFields);
+        super(constructorParams);
     }
-    static getCompanionDefinition() {
-        return oneTestEntityCompanion;
+    static defineCompanionDefinition() {
+        return {
+            entityClass: OneTestEntity,
+            entityConfiguration: testEntityConfiguration,
+            privacyPolicyClass: TestEntityPrivacyPolicy,
+            entitySelectedFields: ['id', 'entity_type', 'common_other_field'],
+        };
     }
 }
 class TwoTestEntity extends Entity_1.default {
-    constructor(viewerContext, rawFields) {
-        if (rawFields.entity_type !== EntityType.TWO) {
+    constructor(constructorParams) {
+        if (constructorParams.selectedFields.entity_type !== EntityType.TWO) {
             throw new Error('TwoTestEntity must be instantiated with two data');
         }
-        super(viewerContext, rawFields);
+        super(constructorParams);
     }
-    static getCompanionDefinition() {
-        return twoTestEntityCompanion;
+    static defineCompanionDefinition() {
+        return {
+            entityClass: TwoTestEntity,
+            entityConfiguration: testEntityConfiguration,
+            privacyPolicyClass: TestEntityPrivacyPolicy,
+            entitySelectedFields: ['id', 'other_field', 'common_other_field', 'entity_type'],
+        };
     }
 }
-const oneTestEntityCompanion = new EntityCompanionProvider_1.EntityCompanionDefinition({
-    entityClass: OneTestEntity,
-    entityConfiguration: testEntityConfiguration,
-    privacyPolicyClass: TestEntityPrivacyPolicy,
-    entitySelectedFields: ['id', 'entity_type', 'common_other_field'],
-});
-const twoTestEntityCompanion = new EntityCompanionProvider_1.EntityCompanionDefinition({
-    entityClass: TwoTestEntity,
-    entityConfiguration: testEntityConfiguration,
-    privacyPolicyClass: TestEntityPrivacyPolicy,
-    entitySelectedFields: ['id', 'other_field', 'common_other_field', 'entity_type'],
-});
 //# sourceMappingURL=TwoEntitySameTableDisjointRows-test.js.map

package/build/__tests__/cases/TwoEntitySameTableDisjointRows-test.js.map

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

package/build/__tests__/cases/TwoEntitySameTableOverlappingRows-test.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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"));
@@ -50,7 +49,7 @@ describe('Two entities backed by the same table', () => {
         const loadedEntity = await TwoTestEntity.loader(viewerContext)
             .enforcing()
             .loadByFieldEqualingAsync('other_field', 'huh');
-        expect(loadedEntity === null || loadedEntity === void 0 ? void 0 : loadedEntity.getAllFields()).toMatchObject({
+        expect(loadedEntity?.getAllFields()).toMatchObject({
             id: entity.getID(),
             fake_field: 'hello',
             other_field: 'huh',
@@ -62,7 +61,7 @@ describe('Two entities backed by the same table', () => {
         const loaded2 = await TwoTestEntity.loader(viewerContext)
             .enforcing()
             .loadByFieldEqualingAsync('other_field', 'huh');
-        expect(loaded2 === null || loaded2 === void 0 ? void 0 : loaded2.getAllFields()).toMatchObject({
+        expect(loaded2?.getAllFields()).toMatchObject({
             id: entity.getID(),
             fake_field: 'world',
             other_field: 'huh',
@@ -70,7 +69,7 @@ describe('Two entities backed by the same table', () => {
         const loaded22 = await TwoTestEntity.loader(viewerContext)
             .enforcing()
             .loadByFieldEqualingAsync('fake_field', 'world');
-        expect(loaded22 === null || loaded22 === void 0 ? void 0 : loaded22.getAllFields()).toMatchObject({
+        expect(loaded22?.getAllFields()).toMatchObject({
             id: entity.getID(),
             fake_field: 'world',
             other_field: 'huh',
@@ -115,25 +114,23 @@ class TestEntityPrivacyPolicy extends EntityPrivacyPolicy_1.default {
     }
 }
 class OneTestEntity extends Entity_1.default {
-    static getCompanionDefinition() {
-        return oneTestEntityCompanion;
+    static defineCompanionDefinition() {
+        return {
+            entityClass: OneTestEntity,
+            entityConfiguration: testEntityConfiguration,
+            privacyPolicyClass: TestEntityPrivacyPolicy,
+            entitySelectedFields: ['id', 'fake_field'],
+        };
     }
 }
 class TwoTestEntity extends Entity_1.default {
-    static getCompanionDefinition() {
-        return twoTestEntityCompanion;
+    static defineCompanionDefinition() {
+        return {
+            entityClass: TwoTestEntity,
+            entityConfiguration: testEntityConfiguration,
+            privacyPolicyClass: TestEntityPrivacyPolicy,
+            entitySelectedFields: ['id', 'other_field', 'fake_field'],
+        };
     }
 }
-const oneTestEntityCompanion = new EntityCompanionProvider_1.EntityCompanionDefinition({
-    entityClass: OneTestEntity,
-    entityConfiguration: testEntityConfiguration,
-    privacyPolicyClass: TestEntityPrivacyPolicy,
-    entitySelectedFields: ['id', 'fake_field'],
-});
-const twoTestEntityCompanion = new EntityCompanionProvider_1.EntityCompanionDefinition({
-    entityClass: TwoTestEntity,
-    entityConfiguration: testEntityConfiguration,
-    privacyPolicyClass: TestEntityPrivacyPolicy,
-    entitySelectedFields: ['id', 'other_field', 'fake_field'],
-});
 //# sourceMappingURL=TwoEntitySameTableOverlappingRows-test.js.map

package/build/__tests__/cases/TwoEntitySameTableOverlappingRows-test.js.map

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

package/build/errors/EntityError.js

@@ -10,7 +10,7 @@ var EntityErrorState;
     EntityErrorState[EntityErrorState["UNKNOWN"] = 0] = "UNKNOWN";
     EntityErrorState[EntityErrorState["TRANSIENT"] = 1] = "TRANSIENT";
     EntityErrorState[EntityErrorState["PERMANENT"] = 2] = "PERMANENT";
-})(EntityErrorState = exports.EntityErrorState || (exports.EntityErrorState = {}));
+})(EntityErrorState || (exports.EntityErrorState = EntityErrorState = {}));
 var EntityErrorCode;
 (function (EntityErrorCode) {
     EntityErrorCode["ERR_ENTITY_NOT_AUTHORIZED"] = "ERR_ENTITY_NOT_AUTHORIZED";
@@ -24,7 +24,7 @@ var EntityErrorCode;
     EntityErrorCode["ERR_ENTITY_DATABASE_ADAPTER_NOT_NULL_CONSTRAINT"] = "ERR_ENTITY_DATABASE_ADAPTER_NOT_NULL_CONSTRAINT";
     EntityErrorCode["ERR_ENTITY_DATABASE_ADAPTER_UNIQUE_CONSTRAINT"] = "ERR_ENTITY_DATABASE_ADAPTER_UNIQUE_CONSTRAINT";
     EntityErrorCode["ERR_ENTITY_CACHE_ADAPTER_TRANSIENT"] = "ERR_ENTITY_CACHE_ADAPTER_TRANSIENT";
-})(EntityErrorCode = exports.EntityErrorCode || (exports.EntityErrorCode = {}));
+})(EntityErrorCode || (exports.EntityErrorCode = EntityErrorCode = {}));
 class EntityError extends es6_error_1.default {
     constructor(message, cause) {
         super(message);

package/build/errors/EntityError.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityError.js","sourceRoot":"","sources":["../../src/errors/EntityError.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAiC;AAEjC,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,6DAAO,CAAA;IACP,iEAAS,CAAA;IACT,iEAAS,CAAA;AACX,CAAC,EAJW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAI3B;AAED,IAAY,eAYX;AAZD,WAAY,eAAe;IACzB,0EAAuD,CAAA;IACvD,gEAA6C,CAAA;IAC7C,oFAAiE,CAAA;IACjE,kGAA+E,CAAA;IAC/E,8FAA2E,CAAA;IAC3E,gHAA6F,CAAA;IAC7F,wHAAqG,CAAA;IACrG,4HAAyG,CAAA;IACzG,sHAAmG,CAAA;IACnG,kHAA+F,CAAA;IAC/F,4FAAyE,CAAA;AAC3E,CAAC,EAZW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAY1B;AAED,MAA8B,WAAY,SAAQ,mBAAQ;IAIxD,YAAY,OAAe,EAAkB,KAAa;QACxD,KAAK,CAAC,OAAO,CAAC,CAAC;QAD4B,UAAK,GAAL,KAAK,CAAQ;IAE1D,CAAC;CACF;AAPD,8BAOC"}
+{"version":3,"file":"EntityError.js","sourceRoot":"","sources":["../../src/errors/EntityError.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAiC;AAEjC,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,6DAAO,CAAA;IACP,iEAAS,CAAA;IACT,iEAAS,CAAA;AACX,CAAC,EAJW,gBAAgB,gCAAhB,gBAAgB,QAI3B;AAED,IAAY,eAYX;AAZD,WAAY,eAAe;IACzB,0EAAuD,CAAA;IACvD,gEAA6C,CAAA;IAC7C,oFAAiE,CAAA;IACjE,kGAA+E,CAAA;IAC/E,8FAA2E,CAAA;IAC3E,gHAA6F,CAAA;IAC7F,wHAAqG,CAAA;IACrG,4HAAyG,CAAA;IACzG,sHAAmG,CAAA;IACnG,kHAA+F,CAAA;IAC/F,4FAAyE,CAAA;AAC3E,CAAC,EAZW,eAAe,+BAAf,eAAe,QAY1B;AAED,MAA8B,WAAY,SAAQ,mBAAQ;IAIxD,YAAY,OAAe,EAAkB,KAAa;QACxD,KAAK,CAAC,OAAO,CAAC,CAAC;QAD4B,UAAK,GAAL,KAAK,CAAQ;IAE1D,CAAC;CACF;AAPD,8BAOC"}

package/build/errors/EntityInvalidFieldValueError.d.ts

@@ -1,9 +1,9 @@
+import EntityError, { EntityErrorCode, EntityErrorState } from './EntityError';
 import { IEntityClass } from '../Entity';
 import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
 import ReadonlyEntity from '../ReadonlyEntity';
 import ViewerContext from '../ViewerContext';
-import EntityError, { EntityErrorCode, EntityErrorState } from './EntityError';
-export default class EntityInvalidFieldValueError<TFields, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields>, N extends keyof TFields, TSelectedFields extends keyof TFields = keyof TFields> extends EntityError {
+export default class EntityInvalidFieldValueError<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>, N extends keyof TFields, TSelectedFields extends keyof TFields = keyof TFields> extends EntityError {
     readonly state = EntityErrorState.PERMANENT;
     readonly code = EntityErrorCode.ERR_ENTITY_INVALID_FIELD_VALUE;
     constructor(entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>, fieldName: N, fieldValue?: TFields[N]);

package/build/errors/EntityInvalidFieldValueError.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityInvalidFieldValueError.js","sourceRoot":"","sources":["../../src/errors/EntityInvalidFieldValueError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,6DAA+E;AAE/E,MAAqB,4BAcnB,SAAQ,qBAAW;IAInB,YACE,WAOC,EACD,SAAY,EACZ,UAAuB;QAEvB,KAAK,CAAC,2BAA2B,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,SAAS,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC;QAf9E,UAAK,GAAG,8BAAgB,CAAC,SAAS,CAAC;QACnC,SAAI,GAAG,6BAAe,CAAC,8BAA8B,CAAC;IAetE,CAAC;CACF;AAhCD,+CAgCC"}
+{"version":3,"file":"EntityInvalidFieldValueError.js","sourceRoot":"","sources":["../../src/errors/EntityInvalidFieldValueError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA+E;AAM/E,MAAqB,4BAcnB,SAAQ,qBAAW;IAInB,YACE,WAOC,EACD,SAAY,EACZ,UAAuB;QAEvB,KAAK,CAAC,2BAA2B,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,SAAS,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC;QAf9E,UAAK,GAAG,8BAAgB,CAAC,SAAS,CAAC;QACnC,SAAI,GAAG,6BAAe,CAAC,8BAA8B,CAAC;IAetE,CAAC;CACF;AAhCD,+CAgCC"}

package/build/errors/EntityNotAuthorizedError.d.ts

@@ -1,8 +1,8 @@
+import EntityError, { EntityErrorCode, EntityErrorState } from './EntityError';
 import { EntityAuthorizationAction } from '../EntityPrivacyPolicy';
 import ReadonlyEntity from '../ReadonlyEntity';
 import ViewerContext from '../ViewerContext';
-import EntityError, { EntityErrorCode, EntityErrorState } from './EntityError';
-export default class EntityNotAuthorizedError<TFields, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields = keyof TFields> extends EntityError {
+export default class EntityNotAuthorizedError<TFields extends object, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TSelectedFields extends keyof TFields = keyof TFields> extends EntityError {
     readonly state = EntityErrorState.PERMANENT;
     readonly code = EntityErrorCode.ERR_ENTITY_NOT_AUTHORIZED;
     readonly entityClassName: string;

package/build/errors/EntityNotAuthorizedError.js

@@ -23,8 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const EntityPrivacyPolicy_1 = require("../EntityPrivacyPolicy");
 const EntityError_1 = __importStar(require("./EntityError"));
+const EntityPrivacyPolicy_1 = require("../EntityPrivacyPolicy");
 class EntityNotAuthorizedError extends EntityError_1.default {
     constructor(entity, viewerContext, action, ruleIndex) {
         super(`Entity not authorized: ${entity} (viewer = ${viewerContext}, action = ${EntityPrivacyPolicy_1.EntityAuthorizationAction[action]}, ruleIndex = ${ruleIndex})`);

package/build/errors/EntityNotAuthorizedError.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityNotAuthorizedError.js","sourceRoot":"","sources":["../../src/errors/EntityNotAuthorizedError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAmE;AAGnE,6DAA+E;AAE/E,MAAqB,wBAMnB,SAAQ,qBAAW;IAMnB,YACE,MAAe,EACf,aAA6B,EAC7B,MAAiC,EACjC,SAAiB;QAEjB,KAAK,CACH,0BAA0B,MAAM,cAAc,aAAa,cAAc,+CAAyB,CAAC,MAAM,CAAC,iBAAiB,SAAS,GAAG,CACxI,CAAC;QAbY,UAAK,GAAG,8BAAgB,CAAC,SAAS,CAAC;QACnC,SAAI,GAAG,6BAAe,CAAC,yBAAyB,CAAC;QAa/D,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;IACjD,CAAC;CACF;AAvBD,2CAuBC"}
+{"version":3,"file":"EntityNotAuthorizedError.js","sourceRoot":"","sources":["../../src/errors/EntityNotAuthorizedError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA+E;AAC/E,gEAAmE;AAInE,MAAqB,wBAMnB,SAAQ,qBAAW;IAMnB,YACE,MAAe,EACf,aAA6B,EAC7B,MAAiC,EACjC,SAAiB;QAEjB,KAAK,CACH,0BAA0B,MAAM,cAAc,aAAa,cAAc,+CAAyB,CAAC,MAAM,CAAC,iBAAiB,SAAS,GAAG,CACxI,CAAC;QAbY,UAAK,GAAG,8BAAgB,CAAC,SAAS,CAAC;QACnC,SAAI,GAAG,6BAAe,CAAC,yBAAyB,CAAC;QAa/D,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;IACjD,CAAC;CACF;AAvBD,2CAuBC"}

package/build/errors/EntityNotFoundError.d.ts

@@ -1,9 +1,9 @@
+import EntityError, { EntityErrorCode, EntityErrorState } from './EntityError';
 import { IEntityClass } from '../Entity';
 import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
 import ReadonlyEntity from '../ReadonlyEntity';
 import ViewerContext from '../ViewerContext';
-import EntityError, { EntityErrorCode, EntityErrorState } from './EntityError';
-export default class EntityNotFoundError<TFields, TID extends NonNullable<TFields[TSelectedFields]>, TViewerContext extends ViewerContext, TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>, TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields>, N extends keyof TFields, TSelectedFields extends keyof TFields = keyof TFields> extends EntityError {
+export default class EntityNotFoundError<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>, N extends keyof TFields, TSelectedFields extends keyof TFields = keyof TFields> extends EntityError {
     readonly state = EntityErrorState.PERMANENT;
     readonly code = EntityErrorCode.ERR_ENTITY_NOT_FOUND;
     constructor(entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields>, fieldName: N, fieldValue: TFields[N]);

package/build/errors/EntityNotFoundError.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityNotFoundError.js","sourceRoot":"","sources":["../../src/errors/EntityNotFoundError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,6DAA+E;AAE/E,MAAqB,mBAcnB,SAAQ,qBAAW;IAInB,YACE,WAOC,EACD,SAAY,EACZ,UAAsB;QAEtB,KAAK,CAAC,qBAAqB,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,SAAS,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC;QAfxE,UAAK,GAAG,8BAAgB,CAAC,SAAS,CAAC;QACnC,SAAI,GAAG,6BAAe,CAAC,oBAAoB,CAAC;IAe5D,CAAC;CACF;AAhCD,sCAgCC"}
+{"version":3,"file":"EntityNotFoundError.js","sourceRoot":"","sources":["../../src/errors/EntityNotFoundError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA+E;AAM/E,MAAqB,mBAcnB,SAAQ,qBAAW;IAInB,YACE,WAOC,EACD,SAAY,EACZ,UAAsB;QAEtB,KAAK,CAAC,qBAAqB,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,SAAS,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC;QAfxE,UAAK,GAAG,8BAAgB,CAAC,SAAS,CAAC;QACnC,SAAI,GAAG,6BAAe,CAAC,oBAAoB,CAAC;IAe5D,CAAC;CACF;AAhCD,sCAgCC"}

package/build/index.d.ts

@@ -10,7 +10,8 @@ export { default as Entity } from './Entity';
 export * from './Entity';
 export { default as EntityAssociationLoader } from './EntityAssociationLoader';
 export * from './EntityAssociationLoader';
-export { default as EntityCacheAdapter } from './EntityCacheAdapter';
+export { default as IEntityCacheAdapter } from './IEntityCacheAdapter';
+export { default as GenericEntityCacheAdapter } from './GenericEntityCacheAdapter';
 export { default as EntityCompanion } from './EntityCompanion';
 export * from './EntityCompanion';
 export { default as EntityCompanionProvider } from './EntityCompanionProvider';

package/build/index.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StubQueryContextProvider = exports.StubDatabaseAdapterProvider = exports.StubDatabaseAdapter = exports.describeFieldTestCase = exports.PrivacyPolicyRule = exports.AlwaysSkipPrivacyPolicyRule = exports.AlwaysDenyPrivacyPolicyRule = exports.AlwaysAllowPrivacyPolicyRule = exports.NoOpEntityMetricsAdapter = exports.ReadThroughEntityCache = exports.EntityDataManager = exports.ViewerScopedEntityMutatorFactory = exports.ViewerScopedEntityLoaderFactory = exports.ViewerScopedEntityCompanionProvider = exports.ViewerScopedEntityCompanion = exports.ViewerContext = exports.ReadonlyEntity = exports.EntityQueryContextProvider = exports.EntityPrivacyPolicy = exports.EntityMutatorFactory = exports.EntityMutationValidator = exports.EntitySecondaryCacheLoader = exports.EntityLoaderFactory = exports.EntityLoader = exports.EntityNotFoundError = exports.EntityNotAuthorizedError = exports.EntityError = exports.EntityCacheAdapterError = exports.EntityDatabaseAdapterError = exports.EntityDatabaseAdapter = exports.EntityConfiguration = exports.EntityCompanionProvider = exports.EntityCompanion = exports.EntityCacheAdapter = exports.EntityAssociationLoader = exports.Entity = exports.EnforcingEntityLoader = exports.GenericSecondaryEntityCache = exports.ComposedSecondaryEntityCache = exports.ComposedEntityCacheAdapter = void 0;
+exports.StubQueryContextProvider = exports.StubDatabaseAdapterProvider = exports.StubDatabaseAdapter = exports.describeFieldTestCase = exports.PrivacyPolicyRule = exports.AlwaysSkipPrivacyPolicyRule = exports.AlwaysDenyPrivacyPolicyRule = exports.AlwaysAllowPrivacyPolicyRule = exports.NoOpEntityMetricsAdapter = exports.ReadThroughEntityCache = exports.EntityDataManager = exports.ViewerScopedEntityMutatorFactory = exports.ViewerScopedEntityLoaderFactory = exports.ViewerScopedEntityCompanionProvider = exports.ViewerScopedEntityCompanion = exports.ViewerContext = exports.ReadonlyEntity = exports.EntityQueryContextProvider = exports.EntityPrivacyPolicy = exports.EntityMutatorFactory = exports.EntityMutationValidator = exports.EntitySecondaryCacheLoader = exports.EntityLoaderFactory = exports.EntityLoader = exports.EntityNotFoundError = exports.EntityNotAuthorizedError = exports.EntityError = exports.EntityCacheAdapterError = exports.EntityDatabaseAdapterError = exports.EntityDatabaseAdapter = exports.EntityConfiguration = exports.EntityCompanionProvider = exports.EntityCompanion = exports.GenericEntityCacheAdapter = exports.EntityAssociationLoader = exports.Entity = exports.EnforcingEntityLoader = exports.GenericSecondaryEntityCache = exports.ComposedSecondaryEntityCache = exports.ComposedEntityCacheAdapter = void 0;
 var ComposedEntityCacheAdapter_1 = require("./ComposedEntityCacheAdapter");
 Object.defineProperty(exports, "ComposedEntityCacheAdapter", { enumerable: true, get: function () { return __importDefault(ComposedEntityCacheAdapter_1).default; } });
 var ComposedSecondaryEntityCache_1 = require("./ComposedSecondaryEntityCache");
@@ -37,8 +37,8 @@ __exportStar(require("./Entity"), exports);
 var EntityAssociationLoader_1 = require("./EntityAssociationLoader");
 Object.defineProperty(exports, "EntityAssociationLoader", { enumerable: true, get: function () { return __importDefault(EntityAssociationLoader_1).default; } });
 __exportStar(require("./EntityAssociationLoader"), exports);
-var EntityCacheAdapter_1 = require("./EntityCacheAdapter");
-Object.defineProperty(exports, "EntityCacheAdapter", { enumerable: true, get: function () { return __importDefault(EntityCacheAdapter_1).default; } });
+var GenericEntityCacheAdapter_1 = require("./GenericEntityCacheAdapter");
+Object.defineProperty(exports, "GenericEntityCacheAdapter", { enumerable: true, get: function () { return __importDefault(GenericEntityCacheAdapter_1).default; } });
 var EntityCompanion_1 = require("./EntityCompanion");
 Object.defineProperty(exports, "EntityCompanion", { enumerable: true, get: function () { return __importDefault(EntityCompanion_1).default; } });
 __exportStar(require("./EntityCompanion"), exports);

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC;;;GAGG;;;;;;;;;;;;;;;;;;;;AAEH,2EAAqF;AAA5E,yJAAA,OAAO,OAA8B;AAC9C,+EAAyF;AAAhF,6JAAA,OAAO,OAAgC;AAChD,6EAAuF;AAA9E,2JAAA,OAAO,OAA+B;AAC/C,iEAA2E;AAAlE,+IAAA,OAAO,OAAyB;AACzC,mCAA6C;AAApC,iHAAA,OAAO,OAAU;AAC1B,2CAAyB;AACzB,qEAA+E;AAAtE,mJAAA,OAAO,OAA2B;AAC3C,4DAA0C;AAC1C,2DAAqE;AAA5D,yIAAA,OAAO,OAAsB;AACtC,qDAA+D;AAAtD,mIAAA,OAAO,OAAmB;AACnC,oDAAkC;AAClC,qEAA+E;AAAtE,mJAAA,OAAO,OAA2B;AAC3C,4DAA0C;AAC1C,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,iEAA2E;AAAlE,+IAAA,OAAO,OAAyB;AACzC,0DAAwC;AACxC,kFAA4F;AAAnF,yJAAA,OAAO,OAA8B;AAC9C,sEAAoD;AACpD,4EAAsF;AAA7E,mJAAA,OAAO,OAA2B;AAC3C,mEAAiD;AACjD,uDAAqC;AACrC,oDAA8D;AAArD,2HAAA,OAAO,OAAe;AAC/B,8EAAwF;AAA/E,qJAAA,OAAO,OAA4B;AAC5C,oEAA8E;AAArE,2IAAA,OAAO,OAAuB;AACvC,iDAA+B;AAC/B,0DAAwC;AACxC,+CAAyD;AAAhD,6HAAA,OAAO,OAAgB;AAChC,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,2EAAqF;AAA5E,yJAAA,OAAO,OAA8B;AAC9C,+DAA6C;AAC7C,kDAAgC;AAChC,qEAA+E;AAAtE,mJAAA,OAAO,OAA2B;AAC3C,uDAAqC;AACrC,uEAAqD;AAErD,+DAAyE;AAAhE,6IAAA,OAAO,OAAwB;AACxC,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,wDAAsC;AACtC,uDAAqC;AAGrC,2EAAqF;AAA5E,yJAAA,OAAO,OAA8B;AAE9C,mDAA6D;AAApD,iIAAA,OAAO,OAAkB;AAClC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,6EAAuF;AAA9E,2JAAA,OAAO,OAA+B;AAC/C,6FAAuG;AAA9F,2KAAA,OAAO,OAAuC;AACvD,qFAA+F;AAAtF,mKAAA,OAAO,OAAmC;AACnD,uFAAiG;AAAxF,qKAAA,OAAO,OAAoC;AACpD,gDAA8B;AAC9B,kEAA4E;AAAnE,uIAAA,OAAO,OAAqB;AACrC,4EAA0D;AAC1D,4EAAsF;AAA7E,iJAAA,OAAO,OAA0B;AAC1C,oEAAkD;AAClD,+DAA6C;AAE7C,kEAAgD;AAChD,+EAAyF;AAAhF,qJAAA,OAAO,OAA4B;AAC5C,qFAA+F;AAAtF,6JAAA,OAAO,OAAgC;AAChD,mFAA6F;AAApF,2JAAA,OAAO,OAA+B;AAC/C,mFAA6F;AAApF,2JAAA,OAAO,OAA+B;AAC/C,+DAAyE;AAAhE,uIAAA,OAAO,OAAqB;AACrC,4DAA0C;AAC1C,6EAA2D;AAC3D,mEAAiD;AACjD,+EAAyF;AAAhF,+IAAA,OAAO,OAAyB;AACzC,2EAAqF;AAA5E,2IAAA,OAAO,OAAuB;AACvC,2FAAqG;AAA5F,2JAAA,OAAO,OAA+B;AAC/C,qFAA+F;AAAtF,qJAAA,OAAO,OAA4B;AAC5C,wFAAsE;AACtE,2DAAyC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC;;;GAGG;;;;;;;;;;;;;;;;;;;;AAEH,2EAAqF;AAA5E,yJAAA,OAAO,OAA8B;AAC9C,+EAAyF;AAAhF,6JAAA,OAAO,OAAgC;AAChD,6EAAuF;AAA9E,2JAAA,OAAO,OAA+B;AAC/C,iEAA2E;AAAlE,+IAAA,OAAO,OAAyB;AACzC,mCAA6C;AAApC,iHAAA,OAAO,OAAU;AAC1B,2CAAyB;AACzB,qEAA+E;AAAtE,mJAAA,OAAO,OAA2B;AAC3C,4DAA0C;AAE1C,yEAAmF;AAA1E,uJAAA,OAAO,OAA6B;AAC7C,qDAA+D;AAAtD,mIAAA,OAAO,OAAmB;AACnC,oDAAkC;AAClC,qEAA+E;AAAtE,mJAAA,OAAO,OAA2B;AAC3C,4DAA0C;AAC1C,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,iEAA2E;AAAlE,+IAAA,OAAO,OAAyB;AACzC,0DAAwC;AACxC,kFAA4F;AAAnF,yJAAA,OAAO,OAA8B;AAC9C,sEAAoD;AACpD,4EAAsF;AAA7E,mJAAA,OAAO,OAA2B;AAC3C,mEAAiD;AACjD,uDAAqC;AACrC,oDAA8D;AAArD,2HAAA,OAAO,OAAe;AAC/B,8EAAwF;AAA/E,qJAAA,OAAO,OAA4B;AAC5C,oEAA8E;AAArE,2IAAA,OAAO,OAAuB;AACvC,iDAA+B;AAC/B,0DAAwC;AACxC,+CAAyD;AAAhD,6HAAA,OAAO,OAAgB;AAChC,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,2EAAqF;AAA5E,yJAAA,OAAO,OAA8B;AAC9C,+DAA6C;AAC7C,kDAAgC;AAChC,qEAA+E;AAAtE,mJAAA,OAAO,OAA2B;AAC3C,uDAAqC;AACrC,uEAAqD;AAErD,+DAAyE;AAAhE,6IAAA,OAAO,OAAwB;AACxC,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,wDAAsC;AACtC,uDAAqC;AAGrC,2EAAqF;AAA5E,yJAAA,OAAO,OAA8B;AAE9C,mDAA6D;AAApD,iIAAA,OAAO,OAAkB;AAClC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,6EAAuF;AAA9E,2JAAA,OAAO,OAA+B;AAC/C,6FAAuG;AAA9F,2KAAA,OAAO,OAAuC;AACvD,qFAA+F;AAAtF,mKAAA,OAAO,OAAmC;AACnD,uFAAiG;AAAxF,qKAAA,OAAO,OAAoC;AACpD,gDAA8B;AAC9B,kEAA4E;AAAnE,uIAAA,OAAO,OAAqB;AACrC,4EAA0D;AAC1D,4EAAsF;AAA7E,iJAAA,OAAO,OAA0B;AAC1C,oEAAkD;AAClD,+DAA6C;AAE7C,kEAAgD;AAChD,+EAAyF;AAAhF,qJAAA,OAAO,OAA4B;AAC5C,qFAA+F;AAAtF,6JAAA,OAAO,OAAgC;AAChD,mFAA6F;AAApF,2JAAA,OAAO,OAA+B;AAC/C,mFAA6F;AAApF,2JAAA,OAAO,OAA+B;AAC/C,+DAAyE;AAAhE,uIAAA,OAAO,OAAqB;AACrC,4DAA0C;AAC1C,6EAA2D;AAC3D,mEAAiD;AACjD,+EAAyF;AAAhF,+IAAA,OAAO,OAAyB;AACzC,2EAAqF;AAA5E,2IAAA,OAAO,OAAuB;AACvC,2FAAqG;AAA5F,2JAAA,OAAO,OAA+B;AAC/C,qFAA+F;AAAtF,qJAAA,OAAO,OAA4B;AAC5C,wFAAsE;AACtE,2DAAyC"}

package/build/internal/EntityDataManager.d.ts

@@ -1,8 +1,8 @@
+import ReadThroughEntityCache from './ReadThroughEntityCache';
 import EntityDatabaseAdapter, { FieldEqualityCondition, QuerySelectionModifiers, QuerySelectionModifiersWithOrderByRaw } from '../EntityDatabaseAdapter';
 import { EntityQueryContext } from '../EntityQueryContext';
 import EntityQueryContextProvider from '../EntityQueryContextProvider';
 import IEntityMetricsAdapter from '../metrics/IEntityMetricsAdapter';
-import ReadThroughEntityCache from './ReadThroughEntityCache';
 /**
  * A data manager is responsible for orchestrating multiple sources of entity
  * data including local caches, EntityCacheAdapter, and EntityDatabaseAdapter.

package/build/internal/EntityDataManager.js

@@ -27,7 +27,7 @@ class EntityDataManager {
         return (0, maps_1.computeIfAbsent)(this.fieldDataLoaders, fieldName, () => {
             return new dataloader_1.default(async (fieldValues) => {
                 const objectMap = await this.loadManyForDataLoaderByFieldEqualingAsync(fieldName, fieldValues);
-                return fieldValues.map((fv) => { var _a; return (_a = objectMap.get(fv)) !== null && _a !== void 0 ? _a : []; });
+                return fieldValues.map((fv) => objectMap.get(fv) ?? []);
             });
         });
     }

package/build/internal/EntityDataManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityDataManager.js","sourceRoot":"","sources":["../../src/internal/EntityDataManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EntityDataManager.js","sourceRoot":"","sources":["../../src/internal/EntityDataManager.ts"],"names":[],"mappings":";;;;;AAAA,4DAAoC;AAUpC,gDAAiD;AACjD,sEAGuC;AACvC,4EAG0C;AAC1C,oDAAsE;AAEtE;;;;;GAKG;AACH,MAAqB,iBAAiB;IAMpC,YACmB,eAA+C,EAC/C,WAA4C,EAC5C,oBAAgD,EAChD,cAAqC,EACrC,eAAuB;QAJvB,oBAAe,GAAf,eAAe,CAAgC;QAC/C,gBAAW,GAAX,WAAW,CAAiC;QAC5C,yBAAoB,GAApB,oBAAoB,CAA4B;QAChD,mBAAc,GAAd,cAAc,CAAuB;QACrC,oBAAe,GAAf,eAAe,CAAQ;QAVzB,qBAAgB,GAG7B,IAAI,GAAG,EAAE,CAAC;IAQX,CAAC;IAEI,8BAA8B,CACpC,SAAY;QAEZ,OAAO,IAAA,sBAAe,EAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,EAAE,GAAG,EAAE;YAC5D,OAAO,IAAI,oBAAU,CACnB,KAAK,EACH,WAA+C,EACL,EAAE;gBAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,yCAAyC,CACpE,SAAS,EACT,WAAW,CACZ,CAAC;gBACF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1D,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,yCAAyC,CACrD,SAAY,EACZ,WAA+C;QAE/C,IAAI,CAAC,cAAc,CAAC,6BAA6B,CAAC;YAChD,IAAI,EAAE,mDAA2B,CAAC,KAAK;YACvC,eAAe,EAAE,WAAW,CAAC,MAAM;YACnC,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAC,CAAC;QACH,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAChD,SAAS,EACT,WAAW,EACX,KAAK,EAAE,aAAa,EAAE,EAAE;YACtB,IAAI,CAAC,cAAc,CAAC,6BAA6B,CAAC;gBAChD,IAAI,EAAE,mDAA2B,CAAC,QAAQ;gBAC1C,eAAe,EAAE,WAAW,CAAC,MAAM;gBACnC,eAAe,EAAE,IAAI,CAAC,eAAe;aACtC,CAAC,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CACnD,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,EAC3C,SAAS,EACT,aAAa,CACd,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,4BAA4B,CAChC,YAAgC,EAChC,SAAY,EACZ,WAA+C;QAE/C,OAAO,MAAM,IAAA,gDAA2B,EACtC,IAAI,CAAC,cAAc,EACnB,6CAAqB,CAAC,SAAS,EAC/B,IAAI,CAAC,eAAe,CACrB,CAAC,IAAI,CAAC,oCAAoC,CAAC,YAAY,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IACrF,CAAC;IAEO,KAAK,CAAC,oCAAoC,CAChD,YAAgC,EAChC,SAAY,EACZ,WAA+C;QAE/C,MAAM,yBAAyB,GAAG,WAAW,CAAC,SAAS,CACrD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CACjD,CAAC;QACF,IAAI,yBAAyB,IAAI,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CACb,iBAAiB,IAAI,CAAC,eAAe,KAAK,MAAM,CAAC,SAAS,CAAC,MACzD,WAAW,CAAC,yBAAyB,CACvC,GAAG,CACJ,CAAC;SACH;QAED,gFAAgF;QAChF,IAAI,YAAY,CAAC,eAAe,EAAE,EAAE;YAClC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,YAAY,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;SAC7F;QAED,IAAI,CAAC,cAAc,CAAC,6BAA6B,CAAC;YAChD,IAAI,EAAE,mDAA2B,CAAC,UAAU;YAC5C,eAAe,EAAE,WAAW,CAAC,MAAM;YACnC,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAA,6BAAe,EAAC,OAAO,CAAC,CAAC;QAClD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;YACzB,MAAM,KAAK,CAAC;SACb;QAED,OAAO,IAAA,eAAQ,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,uCAAuC,CAC3C,YAAgC,EAChC,qBAA2D,EAC3D,uBAAyD;QAEzD,OAAO,MAAM,IAAA,6CAAwB,EACnC,IAAI,CAAC,cAAc,EACnB,6CAAqB,CAAC,8BAA8B,EACpD,IAAI,CAAC,eAAe,CACrB,CACC,IAAI,CAAC,eAAe,CAAC,wCAAwC,CAC3D,YAAY,EACZ,qBAAqB,EACrB,uBAAuB,CACxB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,6BAA6B,CACjC,YAAgC,EAChC,cAAsB,EACtB,QAAwB,EACxB,uBAAuE;QAEvE,OAAO,MAAM,IAAA,6CAAwB,EACnC,IAAI,CAAC,cAAc,EACnB,6CAAqB,CAAC,aAAa,EACnC,IAAI,CAAC,eAAe,CACrB,CACC,IAAI,CAAC,eAAe,CAAC,8BAA8B,CACjD,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,uBAAuB,CACxB,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,kCAAkC,CAC9C,SAAY,EACZ,WAA+C;QAE/C,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACnE,MAAM,UAAU,GAAG,IAAI,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC;QAClE,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IACpE,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,2BAA2B,CAAC,YAA+B;QAC/D,6CAA6C;QAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAsB,CAAC;QAC5D,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,SAAwB,EAAE,EAAE;YAC1C,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,MAAM,IAAI,CAAC,kCAAkC,CAAC,SAAS,EAAE;oBACvD,KAA4C;iBAC7C,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AAxMD,oCAwMC"}