feat: add entity write validation

2026-11-14 09:58:09 -10:00 · 2020-06-23 20:43:20 -07:00
234 changed files with 10084 additions and 28650 deletions
@@ -1,8 +0,0 @@
-{
-  "directory": "./src",
-  "location": "top",
-  "exclude": ["tests__", "testfixtures"],
-  "singleQuotes": true,
-  "exportDefault": true,
-  "delete": true
-}
@@ -9,9 +9,7 @@
  ],
  "rules": {
    "no-restricted-imports": ["error",{ "paths": [".", "..", "../.."] }],
-    "tsdoc/syntax": "warn",
-    "no-console": "warn",
-    "handle-callback-err": "off"
+    "tsdoc/syntax": "warn"
  },
  "overrides": [
    {
@@ -3,17 +3,21 @@ name: docs
 on:
  push:
    branches:
-      - main
+      - master

 jobs:
  deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
        with:
-          cache: yarn
-          node-version-file: package.json
+          node-version: 10.x
+      - name: Cache Node.js modules
+        uses: actions/cache@v1
+        with:
+          path: ${{ github.workspace }}/node_modules
+          key: ${{ runner.OS }}-node_modules-${{ hashFiles('yarn.lock') }}
      - run: yarn --frozen-lockfile
      - run: yarn typedoc
      - name: Deploy
@@ -2,20 +2,22 @@ name: tests

 on:
  push:
-    branches: [ main ]
+    branches: [ master ]
  pull_request:

 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v1
      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-    - uses: actions/setup-node@v4
+        node-version: 10.x
+    - name: Cache Node.js modules
+      uses: actions/cache@v1
      with:
-        cache: yarn
-        node-version-file: package.json
+        path: ${{ github.workspace }}/node_modules
+        key: ${{ runner.OS }}-node_modules-${{ hashFiles('yarn.lock') }}
    - run: yarn --frozen-lockfile
    - run: yarn lint -- -- --max-warnings=0
    - run: yarn test -- -- --coverage
@@ -23,19 +23,12 @@ node_modules/
 .yarn-integrity

 # yarn v2
+
 .yarn/cache
 .yarn/unplugged
 .yarn/build-state.yml
 .pnp.*

-# [yarn](https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored)
-**/.yarn/*
-!**/.yarn/plugins
-!**/.yarn/releases
-!**/.yarn/sdks
-!**/.yarn/versions
-**/.pnp.*
-
 # Entity-specific ignores

 build/
@@ -1,572 +1,6 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.37.0](https://github.com/expo/entity/compare/v0.36.0...v0.37.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* update barrels ([#241](https://github.com/expo/entity/issues/241)) ([8c5f81b](https://github.com/expo/entity/commit/8c5f81bcca107e9b7bbea5f0ab41b0105057806e))
-
-
-
-
-
-# [0.36.0](https://github.com/expo/entity/compare/v0.35.0...v0.36.0) (2024-06-12)
-
-### Breaking Changes
-
-* make using non-enforcing entity loader explicit ([#238](https://github.com/expo/entity/issues/238)) ([2edc7af](https://github.com/expo/entity/commit/2edc7af7e20c362688ff2ee674fa2245205d6de4))
-
-### Bug Fixes
-
-* always reload entity after update since cascading changes may have changed it since commit ([#233](https://github.com/expo/entity/issues/233)) ([7c3c985](https://github.com/expo/entity/commit/7c3c9854a4dd91d4b73ebdb18bdeadea8b63f4c7))
-* constrain entity fields type to string-keyed object ([#235](https://github.com/expo/entity/issues/235)) ([7e2cea1](https://github.com/expo/entity/commit/7e2cea16973a0ae1917f867cd25d6ef7c8eaecef))
-* disallow keys of JS Object prototype for safety ([#236](https://github.com/expo/entity/issues/236)) ([05726d4](https://github.com/expo/entity/commit/05726d45fa9b91a6b25ddbc9c7e3e097b02097ca))
-
-
-### Features
-
-* Add global mutation trigger field to EntityCompanionProvider ([#215](https://github.com/expo/entity/issues/215)) ([6569486](https://github.com/expo/entity/commit/6569486ecddf2fd33c626f634c761e06636b1730))
-* add previousValue to privacy policy context for updates ([#232](https://github.com/expo/entity/issues/232)) ([af495a9](https://github.com/expo/entity/commit/af495a9a856a5042f00cfd150348e415139cb85e))
-* Add StrictEnumField with better validation ([#222](https://github.com/expo/entity/issues/222)) ([8753252](https://github.com/expo/entity/commit/87532525d090b3a67f1cedd95ac990f7dcb3ab5d))
-* make canViewerDeleteAsync recursive ([#224](https://github.com/expo/entity/issues/224)) ([60fc9a4](https://github.com/expo/entity/commit/60fc9a4c4b587b866f2f5a1b3bd22145bc77e6e9))
-* Use uuid v7 in stub database adapter ([#234](https://github.com/expo/entity/issues/234)) ([1e8ea64](https://github.com/expo/entity/commit/1e8ea64017430a2ce5ea197678bd78713ad77ecd))
-* move entity loader utils into their own object ([#239](https://github.com/expo/entity/issues/239))([93905be](https://github.com/expo/entity/commit/93905be81cf74c5626ca19358794261c17223f95))
-
-
-
-
-# [0.35.0](https://github.com/expo/entity/compare/v0.34.0...v0.35.0) (2024-04-11)
-
-
-### Bug Fixes
-
-* Revert: require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([1bdfbd6](https://github.com/expo/entity/commit/1bdfbd6b562d1200e4029df0533b5adb2d917831))
-
-
-
-
-
-# [0.34.0](https://github.com/expo/entity/compare/v0.33.0...v0.34.0) (2024-04-11)
-
-
-### Features
-
-* Allow UUIDv6/7/8 in UUIDField validation ([#221](https://github.com/expo/entity/issues/221)) ([cc6f3dc](https://github.com/expo/entity/commit/cc6f3dc1e677382eec220723c37b5b883d980372))
-* require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([8b0b31f](https://github.com/expo/entity/commit/8b0b31fdde5bd565aa527719003ef283a45f55cc))
-
-
-
-
-
-# [0.33.0](https://github.com/expo/entity/compare/v0.32.0...v0.33.0) (2023-10-06)
-
-
-### Features
-
-* add loadManyByIDsNullableAsync loader method ([#214](https://github.com/expo/entity/issues/214)) ([aad94ac](https://github.com/expo/entity/commit/aad94aca479ac07cc7f76b5e1a122ff85a2d1542))
-
-
-
-
-
-# [0.32.0](https://github.com/expo/entity/compare/v0.31.1...v0.32.0) (2023-06-10)
-
-
-### Bug Fixes
-
-* remove unused field from redis configuration ([#213](https://github.com/expo/entity/issues/213)) ([503a2fb](https://github.com/expo/entity/commit/503a2fb6a8d57f6a09f6da99daf5ab92fc3e7945))
-
-
-### Features
-
-* add ability to specify knex transaction config ([#207](https://github.com/expo/entity/issues/207)) ([2069a0d](https://github.com/expo/entity/commit/2069a0d9fd1d8f7d090a71a90a758b2429ea5dd3))
-* entity companion definition static thunk ([#210](https://github.com/expo/entity/issues/210)) ([4b18010](https://github.com/expo/entity/commit/4b18010d42be50ef329f428b08330e21bf676586))
-
-
-
-
-
-
-# [0.31.1](https://github.com/expo/entity/compare/v0.31.0...v0.31.1) (2023-03-06)
-
-### Features
-* add loadFirstByFieldEqualityConjunction, a convenience method ([#206](https://github.com/expo/entity/pull/206)) ([1934216](https://github.com/expo/entity/commit/1934216b70572cf2b9693e0f14939f49b90427dd))
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package root
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package root
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-
-### Features
-
-* add example of redis mget batching using @expo/batcher ([#199](https://github.com/expo/entity/issues/199)) ([684f91b](https://github.com/expo/entity/commit/684f91b1f270851dbe331df2e2620664eea17266))
-* change redis cache adapter to use redis-like interface ([#200](https://github.com/expo/entity/issues/200)) ([e381f5b](https://github.com/expo/entity/commit/e381f5b2acfc17dcade2cf6e8506fa1c1c255e73))
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-
-### Features
-
-* add BigIntField ([#193](https://github.com/expo/entity/issues/193)) ([acbad82](https://github.com/expo/entity/commit/acbad826a37bb5a054b4dcf9be91d11aa5f7f29a))
-* nested transactions ([#194](https://github.com/expo/entity/issues/194)) ([a77b914](https://github.com/expo/entity/commit/a77b914ad6dc018d1e309c9caf4971088a553ecf))
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-
-### Features
-
-* add orderByRaw to loadManyByRawWhereClauseAsync ([#185](https://github.com/expo/entity/issues/185)) ([2817d78](https://github.com/expo/entity/commit/2817d78392dfecd0093111c24d581bdf01dba06d))
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-
-### Features
-
-* recache to higher cache levels when loading from a composed cache ([#182](https://github.com/expo/entity/pull/182))
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-
-### Bug Fixes
-
-* fix workflow branch specification ([#179](https://github.com/expo/entity/issues/179)) ([25d14bf](https://github.com/expo/entity/commit/25d14bf8c1688524ad488aa2b63221393a4f0b05))
-
-
-### Features
-
-* add EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY ([#178](https://github.com/expo/entity/issues/178)) ([a0c35dd](https://github.com/expo/entity/commit/a0c35ddd7bca05d0c3f41dcf48e16d058918231c))
-* update ioredis to v5, make it a devDependency of the cache packages ([#172](https://github.com/expo/entity/issues/172)) ([9fcfbf7](https://github.com/expo/entity/commit/9fcfbf746a61554cefedf7fb0f1a3a9056b58ffe))
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-
-### Bug Fixes
-
-* lock lru-cache to v6.0.0 ([#170](https://github.com/expo/entity/issues/170)) ([293868b](https://github.com/expo/entity/commit/293868b1a73df9f749216af68b1ae94ac22ac2b9))
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-
-### Bug Fixes
-
-* lru-cache yarn workspace version resolution ([#168](https://github.com/expo/entity/issues/168)) ([e76ca8c](https://github.com/expo/entity/commit/e76ca8c2f72da84aa372a64ef1898ade220ed0a8))
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-
-### Bug Fixes
-
-* add composed cache to index ([#166](https://github.com/expo/entity/issues/166)) ([5c82edc](https://github.com/expo/entity/commit/5c82edcd9f26854878d29950a05852e117bbd723))
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
-* privacy policy evaluation context ([#162](https://github.com/expo/entity/issues/162)) ([3a81a4c](https://github.com/expo/entity/commit/3a81a4c059e2e995eb800e35e76b3d432c22b23f))
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-
-### Features
-
-* add local memory cache package  ([#158](https://github.com/expo/entity/issues/158)) ([85d3575](https://github.com/expo/entity/commit/85d35752fa0919a62efb776a762a6829e83ca7af))
-
-### Chores
-
-* Refactor cachers to use an abstract class and interface  ([#157](https://github.com/expo/entity/pull/157))
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-### Breaking changes
-
-* Move data transforming responsibilities to the CacheAdapter instead of the ReadThroughEntityCache. Affects any classes extending the EntityCacheAdapter and relying on the transformation behavior of the ReadThroughEntityCache. ([#153](https://github.com/expo/entity/pull/153))
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-
-### Features
-
-* Upgrade knex to 1.x in `@expo/entity-database-adapter-knex` ([#150](https://github.com/expo/entity/issues/150)) ([e1b0ee5](https://github.com/expo/entity/commit/e1b0ee528175646239d88aa71ffce73983eeb52f))
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-
-### Features
-
-* add pre-commit callbacks on EntityQueryContext ([#147](https://github.com/expo/entity/issues/147)) ([f1d9847](https://github.com/expo/entity/commit/f1d9847210f5775de964509e44ce493e44482b21))
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-
-### Bug Fixes
-
-* separate post-commit invalidation callbacks from trigger and user callbacks ([#144](https://github.com/expo/entity/issues/144)) ([efa131e](https://github.com/expo/entity/commit/efa131ef29532accf0e51b6d867ffe15a27b4c90))
-
-
-### Features
-
-* add cascading deletion info ([#145](https://github.com/expo/entity/issues/145)) ([3727191](https://github.com/expo/entity/commit/372719176742d3ead6b7cbca29cb66b09b3fe09c))
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-
-### Features
-
-* add authorization metrics ([#142](https://github.com/expo/entity/issues/142)) ([7cf54d8](https://github.com/expo/entity/commit/7cf54d83c52e104159a3e2e675cdda2d29afe204))
-* add IP support ([#138](https://github.com/expo/entity/issues/138)) ([1405a91](https://github.com/expo/entity/commit/1405a9126ee3a56c3e2a38bf3b697283744f5b5d))
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* expose describeFieldTestCase for use in other packages ([#139](https://github.com/expo/entity/issues/139)) ([1220477](https://github.com/expo/entity/commit/1220477aa331349b482ad015b44f76fa2bda7b90))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-* use better QueryContext types for transactional triggers and validators ([#136](https://github.com/expo/entity/issues/136)) ([5c7efe1](https://github.com/expo/entity/commit/5c7efe1678424ff907687e9327175bdc2538c3e0))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-
-### Features
-
-* Add IntField and FloatField, deprecate NumberField ([#131](https://github.com/expo/entity/issues/131)) ([2f2d963](https://github.com/expo/entity/commit/2f2d963cf92c6575d78f8eeca344a4aadcc9b8d9))
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-
-### Features
-
-* allow null field values in loadManyByFieldEqualityConjunctionAsync ([#130](https://github.com/expo/entity/issues/130)) ([2f37dc6](https://github.com/expo/entity/commit/2f37dc6a37d368b12b3c8375e04f0777fd448797))
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Bug Fixes
-
-* upgrade ioredis, knex, and pg ([#125](https://github.com/expo/entity/issues/125)) ([7c43edf](https://github.com/expo/entity/commit/7c43edf3de37e8af13e2a99bd44f03f54803d9b9))
-* upgrade some other packages to fix dependabot alerts ([#126](https://github.com/expo/entity/issues/126)) ([226bffe](https://github.com/expo/entity/commit/226bffe0a95d7b8a3e9e9d46aebdb0edf1eeec1a))
-* use column name instead of field name for redis cache key ([#124](https://github.com/expo/entity/issues/124)) ([d78f452](https://github.com/expo/entity/commit/d78f452bb3ac5527069813a03f5b2264375bd8ab))
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-
-### Bug Fixes
-
-* typescript typedef of EntityMutationInfo ([#121](https://github.com/expo/entity/issues/121)) ([8e8f0dc](https://github.com/expo/entity/commit/8e8f0dc8636e343e29a6012d155e4111477a8989))
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-
-### Bug Fixes
-
-* mutation validator and trigger cyclic import structure ([#118](https://github.com/expo/entity/issues/118)) ([b11dbc0](https://github.com/expo/entity/commit/b11dbc087ba5ad13c748032698dd73279b7960b0))
-
-
-### Features
-
-* add mutation type to validator and trigger execute functions ([#119](https://github.com/expo/entity/issues/119)) ([ef40fa5](https://github.com/expo/entity/commit/ef40fa5e9cdf53e25e78a9423c698e6d1c9737af))
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-
-### Bug Fixes
-
-* allow undefined value for all fields ([#114](https://github.com/expo/entity/issues/114)) ([022e0e9](https://github.com/expo/entity/commit/022e0e9b88a5e84e0c1bc6c8810c850beb05f0cf))
-
-
-### Features
-
-* add basic field type runtime validators ([#113](https://github.com/expo/entity/issues/113)) ([6c4d4b0](https://github.com/expo/entity/commit/6c4d4b03b5404dd776a12c5eb6f0af77a8c964f8))
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* move runInTransaction to ViewerContext ([#108](https://github.com/expo/entity/issues/108)) ([b7309e1](https://github.com/expo/entity/commit/b7309e18a2dd780b64cd306d566de1f12bf8df3a))
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-### Features
-
-* better typing on filterMap for use with predicates ([#106](https://github.com/expo/entity/issues/106)) ([01b3bfe](https://github.com/expo/entity/commit/01b3bfef7c6da55e7d89d8cccb52a0050187aee8))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Bug Fixes
-
-* add type generic default in test utils ([#104](https://github.com/expo/entity/issues/104)) ([fe2917e](https://github.com/expo/entity/commit/fe2917e6b5af808f166aa354d476e168c41e6d21))
-* maps utils invariants for collections containing undefined values ([#103](https://github.com/expo/entity/issues/103)) ([29c1a43](https://github.com/expo/entity/commit/29c1a434ab6cd8d30e9f0e7c742065c8d46d8d8a))
-* remove any cast from EntityLoader ([#100](https://github.com/expo/entity/issues/100)) ([b8e07f9](https://github.com/expo/entity/commit/b8e07f9ddc4077768980c000d61f5ddcc824e2e3))
-
-
-### Features
-
-* better cache adapter error handling ([#102](https://github.com/expo/entity/issues/102)) ([15546aa](https://github.com/expo/entity/commit/15546aad97734ab9ac67f1c012485f096a0e94f1))
-* better database adapter error handling ([#101](https://github.com/expo/entity/issues/101)) ([5208aee](https://github.com/expo/entity/commit/5208aeedb0192f0460ba3d575770a04175f5c3aa))
-
-
-
-
-
-# [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)
-
-
-### Bug Fixes
-
-* fix null handling in load paths (try 2) ([#96](https://github.com/expo/entity/issues/96)) ([d960329](https://github.com/expo/entity/commit/d9603298e0cc5c3c2b0cca959876e9195555fb57))
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure again ([#93](https://github.com/expo/entity/issues/93)) ([012c05d](https://github.com/expo/entity/commit/012c05d62d2ecd559eb331c6ca358052bfe66dc8))
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure ([#89](https://github.com/expo/entity/issues/89)) ([cca8fc1](https://github.com/expo/entity/commit/cca8fc19870057ebc7033081b59fab4a142fbf1a))
-
-
-### Features
-
-* add ability to invalidate an entity manually ([#91](https://github.com/expo/entity/issues/91)) ([d1a6f13](https://github.com/expo/entity/commit/d1a6f1339648942f12b3fb605eb329aefe5cdd63))
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package root
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-
-### Features
-
-* add entityClassName to metrics adapter events ([#83](https://github.com/expo/entity/issues/83)) ([f4cdc01](https://github.com/expo/entity/commit/f4cdc01c6cb8868c24ce3da2274f0901687e05bd))
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-
-### Bug Fixes
-
-* correct type of runInTransactionAsync ([#81](https://github.com/expo/entity/issues/81)) ([f98f7d1](https://github.com/expo/entity/commit/f98f7d14b6149a496a7a3e97dd63d89b2842cc26))
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* fix incorrect loader types for field selecitons ([#72](https://github.com/expo/entity/issues/72)) ([cd2df8d](https://github.com/expo/entity/commit/cd2df8da4b81bcd4769e950d3124c18886df2816))
-* fix index export for EntityMutationTrigger and EntityMutationValidator ([#73](https://github.com/expo/entity/issues/73)) ([7e829f3](https://github.com/expo/entity/commit/7e829f30fde0bd343cb8a584ccda5530cf61ec33))
-* move cache invalidation to after transaction commit ([#77](https://github.com/expo/entity/issues/77)) ([dbc3c81](https://github.com/expo/entity/commit/dbc3c81b359a668b5134189ce6de49b5893bb5e7))
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
-
-
-
-
-
-# [0.6.0](https://github.com/expo/entity/compare/v0.5.2...v0.6.0) (2020-07-23)
-
-
-### Bug Fixes
-
-* ensure transitive deletion triggers are run for CASCADE_DELETE_INVALIDATE_CACHE ([#66](https://github.com/expo/entity/issues/66)) ([5744c51](https://github.com/expo/entity/commit/5744c51e6b3178bd9f229f3f465b683bb4474c8a))
-* separate out EntityMutationValidator ([#68](https://github.com/expo/entity/issues/68)) ([547a1ef](https://github.com/expo/entity/commit/547a1efcecd17cc085702d1a3e9888ce5b644b13))
-* update setField to correct typing ([#62](https://github.com/expo/entity/issues/62)) ([7a77afc](https://github.com/expo/entity/commit/7a77afc83ea732c9b062a5d6865eff9d3131d015))
-
-
-### Features
-
-* entity mutation validators ([#67](https://github.com/expo/entity/issues/67)) ([fc4377d](https://github.com/expo/entity/commit/fc4377d8839da07417b88afc138f73556383d896))
-* mutation triggers ([#65](https://github.com/expo/entity/issues/65)) ([fd6060c](https://github.com/expo/entity/commit/fd6060cc844f60635b3ce4c400c4877f2df8fa44))
-
-
-
-
-
-## [0.5.2](https://github.com/expo/entity/compare/v0.5.1...v0.5.2) (2020-07-02)
-
-
-### Bug Fixes
-
-* fix stub cache key generation for global cache ([#59](https://github.com/expo/entity/issues/59)) ([7c180e8](https://github.com/expo/entity/commit/7c180e84d9a8cdfd9380fac0eab2d02a96ec18f3))
-
-
-
-
-
-## [0.5.1](https://github.com/expo/entity/compare/v0.5.0...v0.5.1) (2020-07-01)
-
-
-### Bug Fixes
-
-* correct some typing issues and exports ([#57](https://github.com/expo/entity/issues/57)) ([e91cfba](https://github.com/expo/entity/commit/e91cfba99321c2c4da2078aafd8627cbf0ceca50))
-
-
-
-
-
-# 0.5.0 (2020-07-01)
-
-
-### Bug Fixes
-
-* support number ID field generation in StubDatabaseAdapter ([#43](https://github.com/expo/entity/issues/43)) ([60cc0fb](https://github.com/expo/entity/commit/60cc0fbda460c3ada1f5244a2780f90382fe3ebd))
-* upgrade Apollo server for security advisory ([#38](https://github.com/expo/entity/issues/38)) ([d25c1e1](https://github.com/expo/entity/commit/d25c1e142d52385725593f4f155d1795697ab490))
-
-
-### Features
-
-* add two fan out methods to association loader ([#52](https://github.com/expo/entity/issues/52)) ([89cfb3d](https://github.com/expo/entity/commit/89cfb3d5a01d4da90f64acc52ae1b839ba348a35))
-* support entity fields subset of db fields ([#49](https://github.com/expo/entity/issues/49)) ([4e40b2e](https://github.com/expo/entity/commit/4e40b2e521407e521d236978ec3b3b56db3990be))
-
-
-# 0.4.0 (2020-06-03)
+# Changelog

+## v0.4.0 (2020-06-03)

 * All Packages
  * Documentation Improvements
@@ -582,11 +16,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * `@expo/entity-example`
  * Initial Version

-# 0.3.0 (2020-04-28)
+## v0.3.0 (2020-04-28)

 * `@expo/entity`
  * Initial Version
 * `@expo/entity-cache-adapter-redis`
  * Initial Version
 * `@expo/entity-database-adapter-knex`
-  * Initial Version
+  * Initial Version
@@ -4,7 +4,7 @@ Entity is a privacy-aware data layer for defining, caching, and authorizing acce

 [![tests](https://github.com/expo/entity/workflows/tests/badge.svg)](https://github.com/expo/entity/actions?query=workflow%3Atests)
 [![docs](https://github.com/expo/entity/workflows/docs/badge.svg)](https://expo.github.io/entity/)
-[![codecov](https://codecov.io/gh/expo/entity/graph/badge.svg?token=4cFAAdINbk)](https://codecov.io/gh/expo/entity)
+[![codecov](https://codecov.io/gh/expo/entity/branch/master/graph/badge.svg)](https://codecov.io/gh/expo/entity)
 [![npm](https://img.shields.io/npm/v/@expo/entity)](https://www.npmjs.com/package/@expo/entity)
 [![NPM](https://img.shields.io/npm/l/@expo/entity)](https://www.npmjs.com/package/@expo/entity)

@@ -78,13 +78,6 @@ Entity is not limited in where it can or should be used, but was designed for us

 Note: The entity framework instance should not be shared across multiple requests since it contains a unique memoized [Dataloader](https://github.com/graphql/dataloader#class-dataloader). A long-lived instance is prone to data synchronization issues, especially when the application is scaled horizontally and multiple shared caches would exist for the same data.

-## Releasing
-
-To release a new version:
-1. `git checkout main`
-1. `yarn lerna publish [patch|minor|major] -- --conventional-commits`
-1. In GitHub release interface, create a new release from the tag, copy changelog changes to release description.
-
 ## License

 The Entity source code is made available under the [MIT license](LICENSE).
@@ -1,4 +0,0 @@
-codecov:
-  branch: main
-ignore:
-  - "packages/entity-example"
@@ -4,5 +4,5 @@
  ],
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "0.37.0"
+  "version": "0.4.0"
 }
@@ -1,14 +1,11 @@
 {
  "name": "root",
  "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
+  "workspaces": ["packages/*"],
  "scripts": {
    "tsc": "lerna run tsc",
    "clean": "lerna run clean",
    "lint": "lerna run lint",
-    "lint-fix": "lerna run lint-fix",
    "test": "lerna run test",
    "integration": "./resources/run-with-docker lerna run integration-no-setup",
    "prepublish": "lerna link && lerna run clean",
@@ -16,42 +13,34 @@
    "barrelsby": "lerna run barrelsby"
  },
  "devDependencies": {
-    "@expo/batcher": "^1.0.0",
    "@expo/entity": "file:packages/entity",
-    "@expo/results": "^1.0.0",
-    "@types/invariant": "^2.2.37",
-    "@types/jest": "^29.5.12",
-    "@types/jsbn": "^1.2.29",
-    "@types/lru-cache": "^5.1.1",
-    "@types/node": "^20.14.1",
-    "@types/uuid": "^8.3.0",
-    "barrelsby": "^2.8.1",
-    "eslint": "^8.56.0",
-    "eslint-config-universe": "^13.0.0",
-    "eslint-plugin-tsdoc": "^0.3.0",
-    "ioredis": "^5.4.1",
-    "jest": "^29.7.0",
-    "lerna": "^5.4.0",
-    "lru-cache": "^6.0.0",
-    "nullthrows": "^1.1.1",
-    "pg": "8.12.0",
-    "prettier": "^3.3.0",
-    "ts-jest": "^29.1.4",
-    "ts-mockito": "^2.6.1",
-    "typedoc": "^0.25.13",
-    "typescript": "^5.4.5",
-    "uuid": "^8.3.0"
+    "@expo/results": "^0.3.0",
+    "@types/invariant": "^2.2.32",
+    "@types/ioredis": "^4.14.9",
+    "@types/jest": "^25.2.1",
+    "@types/lodash": "^4.14.150",
+    "@types/node": "^13.13.4",
+    "@types/uuid": "^7.0.3",
+    "@typescript-eslint/eslint-plugin": "^2.30.0",
+    "@typescript-eslint/parser": "^2.30.0",
+    "barrelsby": "^2.2.0",
+    "eslint": "^6.8.0",
+    "eslint-config-universe": "^3.0.0",
+    "eslint-plugin-tsdoc": "^0.2.4",
+    "jest": "^24.9.0",
+    "lerna": "^3.20.2",
+    "pg": "^8.0.3",
+    "prettier": "^2.0.5",
+    "ts-jest": "~24.2.0",
+    "ts-mockito": "^2.5.0",
+    "typedoc": "^0.17.6",
+    "typedoc-plugin-lerna-packages": "^0.3.0",
+    "typescript": "^3.9.2",
+    "uuid": "^7.0.3"
  },
  "dependencies": {
    "@expo/entity": "file:packages/entity",
-    "@expo/entity-cache-adapter-local-memory": "file:packages/entity-cache-adapter-local-memory",
    "@expo/entity-cache-adapter-redis": "file:packages/entity-cache-adapter-redis",
-    "@expo/entity-database-adapter-knex": "file:packages/entity-database-adapter-knex",
-    "@expo/entity-ip-address-field": "file:packages/entity-ip-address-field",
-    "@expo/entity-secondary-cache-local-memory": "file:packages/entity-secondary-cache-local-memory",
-    "@expo/entity-secondary-cache-redis": "file:packages/entity-secondary-cache-redis"
-  },
-  "volta": {
-    "node": "20.14.0"
+    "@expo/entity-database-adapter-knex": "file:packages/entity-database-adapter-knex"
  }
 }
@@ -1,171 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.37.0](https://github.com/expo/entity/compare/v0.36.0...v0.37.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* update barrels ([#241](https://github.com/expo/entity/issues/241)) ([8c5f81b](https://github.com/expo/entity/commit/8c5f81bcca107e9b7bbea5f0ab41b0105057806e))
-
-
-
-
-
-# [0.36.0](https://github.com/expo/entity/compare/v0.35.0...v0.36.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* constrain entity fields type to string-keyed object ([#235](https://github.com/expo/entity/issues/235)) ([7e2cea1](https://github.com/expo/entity/commit/7e2cea16973a0ae1917f867cd25d6ef7c8eaecef))
-
-
-
-
-
-# [0.35.0](https://github.com/expo/entity/compare/v0.34.0...v0.35.0) (2024-04-11)
-
-
-### Bug Fixes
-
-* Revert: require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([1bdfbd6](https://github.com/expo/entity/commit/1bdfbd6b562d1200e4029df0533b5adb2d917831))
-
-
-
-
-
-# [0.34.0](https://github.com/expo/entity/compare/v0.33.0...v0.34.0) (2024-04-11)
-
-
-### Features
-
-* require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([8b0b31f](https://github.com/expo/entity/commit/8b0b31fdde5bd565aa527719003ef283a45f55cc))
-
-
-
-
-
-# [0.33.0](https://github.com/expo/entity/compare/v0.32.0...v0.33.0) (2023-10-06)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.32.0](https://github.com/expo/entity/compare/v0.31.1...v0.32.0) (2023-06-10)
-
-
-### Features
-
-* entity companion definition static thunk ([#210](https://github.com/expo/entity/issues/210)) ([4b18010](https://github.com/expo/entity/commit/4b18010d42be50ef329f428b08330e21bf676586))
-
-
-
-
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-
-### Bug Fixes
-
-* lock lru-cache to v6.0.0 ([#170](https://github.com/expo/entity/issues/170)) ([293868b](https://github.com/expo/entity/commit/293868b1a73df9f749216af68b1ae94ac22ac2b9))
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-
-### Bug Fixes
-
-* lru-cache yarn workspace version resolution ([#168](https://github.com/expo/entity/issues/168)) ([e76ca8c](https://github.com/expo/entity/commit/e76ca8c2f72da84aa372a64ef1898ade220ed0a8))
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-
-### Features
-
-* add local memory cache package  ([#158](https://github.com/expo/entity/issues/158)) ([85d3575](https://github.com/expo/entity/commit/85d35752fa0919a62efb776a762a6829e83ca7af))
@@ -1,49 +0,0 @@
-# `@expo/entity-cache-adapter-local-memory`
-
-Cross-request [LRU](https://github.com/isaacs/node-lru-cache) cache adapter for `@expo/entity`. Use
-this cache with caution - it is nonstandard. The cache is shared between requests in the node process.
-
-Note: This uses version 6.0.0 of `node-lru-cache` since it the most tuned version for our use case (low TTL + LRU). Upgrading
-to 7.x will cause high memory usage for the entity cache adapter use case since it allocates fixed-size data structures up front to tune for the non-TTL use case: https://github.com/isaacs/node-lru-cache/issues/208.
-
-[Documentation](https://expo.github.io/entity/modules/_expo_cache_adapter_local_memory.html)
-
-## Why NOT use this cache
-
-Because this is an in-memory cache, cross-machine invalidation is not possible. Do not use this cache
-if you have the following use cases:
-
- The objects stored are mutable
- Reading a stale object from the cache is not acceptable in your application
- Cross-machine invalidation is not possible
-
-## Typical use cases
-
-If your application sees many requests fetching the same objects, you can save a trip to your cache
-cluster and backing datastore by using this in-memory cache. Here are some good use cases:
-
- The objects stored are mostly immutable, and reading a stale object for a short TTL is acceptable
- You have a low TTL setting in your cache
-
-## Usage
-
-During `EntityCompanionProvider` instantiation:
-
-```typescript
-export const createDefaultEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    {
-      ...
-    },
-    {
-      ['local-memory']: {
-        cacheAdapterProvider: new LocalMemoryCacheAdapterProvider.getProvider(),
-      },
-    }
-  );
-};
-
-```
@@ -1,38 +0,0 @@
-{
-  "name": "@expo/entity-cache-adapter-local-memory",
-  "version": "0.37.0",
-  "description": "Cross-request local memory cache adapter for @expo/entity",
-  "files": [
-    "build",
-    "src"
-  ],
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "tsc": "tsc",
-    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js",
-    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "barrelsby --config ../../.barrelsby.json"
-  },
-  "engines": {
-    "node": ">=16"
-  },
-  "keywords": [
-    "entity"
-  ],
-  "author": "Expo",
-  "license": "MIT",
-  "peerDependencies": {
-    "@expo/entity": "*"
-  },
-  "dependencies": {
-    "lru-cache": "^6.0.0"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.37.0"
-  }
-}
@@ -1,105 +0,0 @@
-import {
-  CacheLoadResult,
-  CacheStatus,
-  EntityConfiguration,
-  IEntityGenericCacher,
-} from '@expo/entity';
-import invariant from 'invariant';
-import LRUCache from 'lru-cache';
-
-// Sentinel value we store in local memory to negatively cache a database miss.
-// The sentinel value is distinct from any (positively) cached value.
-export const DOES_NOT_EXIST_LOCAL_MEMORY_CACHE = Symbol('doesNotExist');
-type LocalMemoryCacheValue<TFields> = Readonly<TFields> | typeof DOES_NOT_EXIST_LOCAL_MEMORY_CACHE;
-export type LocalMemoryCache<TFields> = LRUCache<string, LocalMemoryCacheValue<TFields>>;
-
-export default class GenericLocalMemoryCacher<TFields extends Record<string, any>>
-  implements IEntityGenericCacher<TFields>
-{
-  constructor(
-    private readonly entityConfiguration: EntityConfiguration<TFields>,
-    private readonly localMemoryCache: LocalMemoryCache<TFields>,
-  ) {}
-
-  static createLRUCache<TFields>(
-    options: { maxSize?: number; ttlSeconds?: number } = {},
-  ): LocalMemoryCache<TFields> {
-    const DEFAULT_LRU_CACHE_MAX_AGE_SECONDS = 10;
-    const DEFAULT_LRU_CACHE_SIZE = 10000;
-    const maxAgeSeconds = options.ttlSeconds ?? DEFAULT_LRU_CACHE_MAX_AGE_SECONDS;
-    return new LRUCache<string, LocalMemoryCacheValue<TFields>>({
-      max: options.maxSize ?? DEFAULT_LRU_CACHE_SIZE,
-      length: (value) => (value === DOES_NOT_EXIST_LOCAL_MEMORY_CACHE ? 0 : 1),
-      maxAge: maxAgeSeconds * 1000, // convert to ms
-    });
-  }
-
-  static createNoOpCache<TFields>(): LocalMemoryCache<TFields> {
-    return new LRUCache<string, LocalMemoryCacheValue<TFields>>({
-      max: 0,
-      maxAge: -1,
-    });
-  }
-
-  public async loadManyAsync(
-    keys: readonly string[],
-  ): Promise<ReadonlyMap<string, CacheLoadResult<TFields>>> {
-    const cacheResults = new Map<string, CacheLoadResult<TFields>>();
-    for (const key of keys) {
-      const cacheResult = this.localMemoryCache.get(key);
-      if (cacheResult === DOES_NOT_EXIST_LOCAL_MEMORY_CACHE) {
-        cacheResults.set(key, {
-          status: CacheStatus.NEGATIVE,
-        });
-      } else if (cacheResult) {
-        cacheResults.set(key, {
-          status: CacheStatus.HIT,
-          item: cacheResult as unknown as TFields,
-        });
-      } else {
-        cacheResults.set(key, {
-          status: CacheStatus.MISS,
-        });
-      }
-    }
-    return cacheResults;
-  }
-
-  public async cacheManyAsync(objectMap: ReadonlyMap<string, Readonly<TFields>>): Promise<void> {
-    for (const [key, item] of objectMap) {
-      this.localMemoryCache.set(key, item);
-    }
-  }
-
-  public async cacheDBMissesAsync(keys: readonly string[]): Promise<void> {
-    for (const key of keys) {
-      this.localMemoryCache.set(key, DOES_NOT_EXIST_LOCAL_MEMORY_CACHE);
-    }
-  }
-
-  public async invalidateManyAsync(keys: readonly string[]): Promise<void> {
-    for (const key of keys) {
-      this.localMemoryCache.del(key);
-    }
-  }
-
-  public makeCacheKey<N extends keyof TFields>(
-    fieldName: N,
-    fieldValue: NonNullable<TFields[N]>,
-  ): string {
-    const columnName = this.entityConfiguration.entityToDBFieldsKeyMapping.get(fieldName);
-    invariant(columnName, `database field mapping missing for ${String(fieldName)}`);
-    const parts = [
-      this.entityConfiguration.tableName,
-      `${this.entityConfiguration.cacheKeyVersion}`,
-      columnName,
-      String(fieldValue),
-    ];
-
-    const delimiter = ':';
-    const escapedParts = parts.map((part) =>
-      part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
-    );
-    return escapedParts.join(delimiter);
-  }
-}
@@ -1,52 +0,0 @@
-import {
-  computeIfAbsent,
-  IEntityCacheAdapter,
-  EntityConfiguration,
-  GenericEntityCacheAdapter,
-  IEntityCacheAdapterProvider,
-} from '@expo/entity';
-
-import GenericLocalMemoryCacher, { LocalMemoryCache } from './GenericLocalMemoryCacher';
-
-/**
- * Vends local memory cache adapters. An instance of this class may be shared across requests to
- * share the local memory cache.
- */
-export default class LocalMemoryCacheAdapterProvider implements IEntityCacheAdapterProvider {
-  /**
-   * @returns a no-op local memory cache adapter provider, or one that doesn't cache locally.
-   */
-  static createNoOpProvider(): IEntityCacheAdapterProvider {
-    return new LocalMemoryCacheAdapterProvider(<TFields>() =>
-      GenericLocalMemoryCacher.createNoOpCache<TFields>(),
-    );
-  }
-
-  /**
-   * @returns a local memory cache adapter provider configured with the supplied options.
-   */
-  static createProviderWithOptions(
-    options: { maxSize?: number; ttlSeconds?: number } = {},
-  ): IEntityCacheAdapterProvider {
-    return new LocalMemoryCacheAdapterProvider(<TFields>() =>
-      GenericLocalMemoryCacher.createLRUCache<TFields>(options),
-    );
-  }
-
-  private localMemoryCacheAdapterMap = new Map<string, GenericEntityCacheAdapter<any>>();
-
-  private constructor(
-    private readonly localMemoryCacheCreator: <TFields>() => LocalMemoryCache<TFields>,
-  ) {}
-
-  public getCacheAdapter<TFields extends Record<string, any>>(
-    entityConfiguration: EntityConfiguration<TFields>,
-  ): IEntityCacheAdapter<TFields> {
-    return computeIfAbsent(this.localMemoryCacheAdapterMap, entityConfiguration.tableName, () => {
-      const localMemoryCache = this.localMemoryCacheCreator<TFields>();
-      return new GenericEntityCacheAdapter(
-        new GenericLocalMemoryCacher(entityConfiguration, localMemoryCache),
-      );
-    });
-  }
-}
@@ -1,150 +0,0 @@
-import {
-  CacheAdapterFlavor,
-  CacheAdapterFlavorDefinition,
-  CacheStatus,
-  ViewerContext,
-} from '@expo/entity';
-import { v4 as uuidv4 } from 'uuid';
-
-import GenericLocalMemoryCacher from '../GenericLocalMemoryCacher';
-import LocalMemoryCacheAdapterProvider from '../LocalMemoryCacheAdapterProvider';
-import LocalMemoryTestEntity from '../testfixtures/LocalMemoryTestEntity';
-import {
-  createLocalMemoryTestEntityCompanionProvider,
-  createNoOpLocalMemoryIntegrationTestEntityCompanionProvider,
-} from '../testfixtures/createLocalMemoryTestEntityCompanionProvider';
-
-describe(GenericLocalMemoryCacher, () => {
-  it('has correct caching behavior', async () => {
-    const entityCompanionProvider = createLocalMemoryTestEntityCompanionProvider();
-    const viewerContext = new ViewerContext(entityCompanionProvider);
-    const genericCacher =
-      viewerContext.entityCompanionProvider.getCompanionForEntity(LocalMemoryTestEntity)[
-        'tableDataCoordinator'
-      ]['cacheAdapter']['genericCacher'];
-    const cacheKeyMaker = genericCacher['makeCacheKey'].bind(genericCacher);
-
-    const date = new Date();
-    const entity1Created = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-
-    // loading an entity should put it in cache
-    const entity1 = await LocalMemoryTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    const localMemoryCacheAdapterProvider = (
-      entityCompanionProvider['cacheAdapterFlavors'] as ReadonlyMap<
-        CacheAdapterFlavor,
-        CacheAdapterFlavorDefinition
-      >
-    ).get('local-memory')!.cacheAdapterProvider as LocalMemoryCacheAdapterProvider;
-    const entitySpecificGenericCacher = localMemoryCacheAdapterProvider[
-      'localMemoryCacheAdapterMap'
-    ].get(
-      viewerContext.entityCompanionProvider.getCompanionForEntity(LocalMemoryTestEntity)
-        .entityCompanionDefinition.entityConfiguration.tableName,
-    )!['genericCacher'];
-    const cachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', entity1.getID()),
-    ]);
-    const cachedValue = cachedResult.get(cacheKeyMaker('id', entity1.getID()))!;
-    expect(cachedValue).toMatchObject({
-      status: CacheStatus.HIT,
-      item: {
-        id: entity1.getID(),
-        name: 'blah',
-        dateField: date,
-      },
-    });
-
-    // simulate non existent db fetch, should write negative result ('') to cache
-    const nonExistentId = uuidv4();
-
-    const entityNonExistentResult = await LocalMemoryTestEntity.loader(viewerContext)
-      .withAuthorizationResults()
-      .loadByIDAsync(nonExistentId);
-    expect(entityNonExistentResult.ok).toBe(false);
-
-    const nonExistentCachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', nonExistentId),
-    ]);
-    expect(nonExistentCachedResult.get(cacheKeyMaker('id', nonExistentId))).toMatchObject({
-      status: CacheStatus.NEGATIVE,
-    });
-
-    // load again through entities framework to ensure it reads negative result
-    const entityNonExistentResult2 = await LocalMemoryTestEntity.loader(viewerContext)
-      .withAuthorizationResults()
-      .loadByIDAsync(nonExistentId);
-    expect(entityNonExistentResult2.ok).toBe(false);
-
-    // invalidate from cache to ensure it invalidates correctly
-    await LocalMemoryTestEntity.loader(viewerContext)
-      .utils()
-      .invalidateFieldsAsync(entity1.getAllFields());
-    const cachedResultMiss = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', entity1.getID()),
-    ]);
-    const cachedValueMiss = cachedResultMiss.get(cacheKeyMaker('id', entity1.getID()));
-    expect(cachedValueMiss).toMatchObject({ status: CacheStatus.MISS });
-  });
-
-  it('respects the parameters of a noop cache', async () => {
-    const entityCompanionProvider = createNoOpLocalMemoryIntegrationTestEntityCompanionProvider();
-    const viewerContext = new ViewerContext(entityCompanionProvider);
-    const genericCacher =
-      viewerContext.entityCompanionProvider.getCompanionForEntity(LocalMemoryTestEntity)[
-        'tableDataCoordinator'
-      ]['cacheAdapter']['genericCacher'];
-    const cacheKeyMaker = genericCacher['makeCacheKey'].bind(genericCacher);
-
-    const date = new Date();
-    const entity1Created = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-
-    // loading an entity will try to put it in cache but it's a noop cache, so it should be a miss
-    const entity1 = await LocalMemoryTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    const localMemoryCacheAdapterProvider = (
-      entityCompanionProvider['cacheAdapterFlavors'] as ReadonlyMap<
-        CacheAdapterFlavor,
-        CacheAdapterFlavorDefinition
-      >
-    ).get('local-memory')!.cacheAdapterProvider as LocalMemoryCacheAdapterProvider;
-    const entitySpecificGenericCacher = localMemoryCacheAdapterProvider[
-      'localMemoryCacheAdapterMap'
-    ].get(
-      viewerContext.entityCompanionProvider.getCompanionForEntity(LocalMemoryTestEntity)
-        .entityCompanionDefinition.entityConfiguration.tableName,
-    )!['genericCacher'];
-    const cachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', entity1.getID()),
-    ]);
-    const cachedValue = cachedResult.get(cacheKeyMaker('id', entity1.getID()))!;
-    expect(cachedValue).toMatchObject({
-      status: CacheStatus.MISS,
-    });
-
-    // a non existent db fetch should try to write negative result ('') but it's a noop cache, so it should be a miss
-    const nonExistentId = uuidv4();
-
-    const entityNonExistentResult = await LocalMemoryTestEntity.loader(viewerContext)
-      .withAuthorizationResults()
-      .loadByIDAsync(nonExistentId);
-    expect(entityNonExistentResult.ok).toBe(false);
-
-    const nonExistentCachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', nonExistentId),
-    ]);
-    expect(nonExistentCachedResult.get(cacheKeyMaker('id', nonExistentId))).toMatchObject({
-      status: CacheStatus.MISS,
-    });
-  });
-});
@@ -1,148 +0,0 @@
-import {
-  CacheStatus,
-  UUIDField,
-  EntityConfiguration,
-  GenericEntityCacheAdapter,
-} from '@expo/entity';
-
-import GenericLocalMemoryCacher, {
-  DOES_NOT_EXIST_LOCAL_MEMORY_CACHE,
-} from '../GenericLocalMemoryCacher';
-
-type BlahFields = {
-  id: string;
-};
-
-const entityConfiguration = new EntityConfiguration<BlahFields>({
-  idField: 'id',
-  tableName: 'blah',
-  schema: {
-    id: new UUIDField({ columnName: 'id', cache: true }),
-  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'local-memory',
-});
-
-describe(GenericLocalMemoryCacher, () => {
-  describe(GenericLocalMemoryCacher.createLRUCache, () => {
-    it('creates a cache with default options', () => {
-      const cache = GenericLocalMemoryCacher.createLRUCache();
-      expect(cache.max).toBe(10000);
-      expect(cache.maxAge).toBe(10000);
-    });
-
-    it('respects specified options', () => {
-      const cache = GenericLocalMemoryCacher.createLRUCache({
-        ttlSeconds: 3,
-        maxSize: 10,
-      });
-      expect(cache.max).toBe(10);
-      expect(cache.maxAge).toBe(3000);
-    });
-  });
-
-  describe(GenericLocalMemoryCacher.createNoOpCache, () => {
-    it('creates a no-op cache', () => {
-      const cache = GenericLocalMemoryCacher.createNoOpCache<{ hello: 'world' }>();
-      cache.set('a', { hello: 'world' });
-      expect(cache.get('a')).toBeUndefined();
-    });
-  });
-});
-
-describe('Use within GenericEntityCacheAdapter', () => {
-  describe('loadManyAsync', () => {
-    it('returns appropriate cache results', async () => {
-      const cacheAdapter = new GenericEntityCacheAdapter(
-        new GenericLocalMemoryCacher(
-          entityConfiguration,
-          GenericLocalMemoryCacher.createLRUCache(),
-        ),
-      );
-
-      const cacheHits = new Map<string, Readonly<BlahFields>>([['test-id-1', { id: 'test-id-1' }]]);
-      await cacheAdapter.cacheManyAsync('id', cacheHits);
-      await cacheAdapter.cacheDBMissesAsync('id', ['test-id-2']);
-
-      const results = await cacheAdapter.loadManyAsync('id', [
-        'test-id-1',
-        'test-id-2',
-        'test-id-3',
-      ]);
-
-      expect(results.get('test-id-1')).toMatchObject({
-        status: CacheStatus.HIT,
-        item: { id: 'test-id-1' },
-      });
-      expect(results.get('test-id-2')).toMatchObject({ status: CacheStatus.NEGATIVE });
-      expect(results.get('test-id-3')).toMatchObject({ status: CacheStatus.MISS });
-      expect(results.size).toBe(3);
-    });
-
-    it('returns empty map when passed empty array of fieldValues', async () => {
-      const cacheAdapter = new GenericEntityCacheAdapter(
-        new GenericLocalMemoryCacher(
-          entityConfiguration,
-          GenericLocalMemoryCacher.createLRUCache(),
-        ),
-      );
-      const results = await cacheAdapter.loadManyAsync('id', []);
-      expect(results).toEqual(new Map());
-    });
-  });
-
-  describe('cacheManyAsync', () => {
-    it('correctly caches all objects', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
-
-      const localMemoryCacher = new GenericLocalMemoryCacher(entityConfiguration, localMemoryCache);
-      const cacheAdapter = new GenericEntityCacheAdapter(localMemoryCacher);
-      await cacheAdapter.cacheManyAsync('id', new Map([['test-id-1', { id: 'test-id-1' }]]));
-
-      const cacheKey = localMemoryCacher['makeCacheKey']('id', 'test-id-1');
-      expect(localMemoryCache.get(cacheKey)).toMatchObject({
-        id: 'test-id-1',
-      });
-    });
-  });
-
-  describe('cacheDBMissesAsync', () => {
-    it('correctly caches misses', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
-
-      const localMemoryCacher = new GenericLocalMemoryCacher(entityConfiguration, localMemoryCache);
-      const cacheAdapter = new GenericEntityCacheAdapter(localMemoryCacher);
-      await cacheAdapter.cacheDBMissesAsync('id', ['test-id-1']);
-
-      const cacheKey = localMemoryCacher['makeCacheKey']('id', 'test-id-1');
-      expect(localMemoryCache.get(cacheKey)).toEqual(DOES_NOT_EXIST_LOCAL_MEMORY_CACHE);
-    });
-  });
-
-  describe('invalidateManyAsync', () => {
-    it('invalidates correctly', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
-
-      const cacheAdapter = new GenericEntityCacheAdapter(
-        new GenericLocalMemoryCacher(entityConfiguration, localMemoryCache),
-      );
-      await cacheAdapter.cacheManyAsync('id', new Map([['test-id-1', { id: 'test-id-1' }]]));
-      await cacheAdapter.cacheDBMissesAsync('id', ['test-id-2']);
-      await cacheAdapter.invalidateManyAsync('id', ['test-id-1', 'test-id-2']);
-
-      const results = await cacheAdapter.loadManyAsync('id', ['test-id-1', 'test-id-2']);
-      expect(results.get('test-id-1')).toMatchObject({ status: CacheStatus.MISS });
-      expect(results.get('test-id-2')).toMatchObject({ status: CacheStatus.MISS });
-    });
-
-    it('returns when passed empty array of fieldValues', async () => {
-      const cacheAdapter = new GenericEntityCacheAdapter(
-        new GenericLocalMemoryCacher(
-          entityConfiguration,
-          GenericLocalMemoryCacher.createLRUCache<BlahFields>({}),
-        ),
-      );
-      await cacheAdapter.invalidateManyAsync('id', []);
-    });
-  });
-});
@@ -1,9 +0,0 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @module @expo/entity-cache-adapter-local-memory
- */
-
-export { default as GenericLocalMemoryCacher } from './GenericLocalMemoryCacher';
-export * from './GenericLocalMemoryCacher';
-export { default as LocalMemoryCacheAdapterProvider } from './LocalMemoryCacheAdapterProvider';
@@ -1,98 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  DateField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-} from '@expo/entity';
-
-export type LocalMemoryTestEntityFields = {
-  id: string;
-  name: string;
-  dateField: Date | null;
-};
-
-export default class LocalMemoryTestEntity extends Entity<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    LocalMemoryTestEntityFields,
-    string,
-    ViewerContext,
-    LocalMemoryTestEntity,
-    LocalMemoryTestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: LocalMemoryTestEntity,
-      entityConfiguration: localMemoryTestEntityConfiguration,
-      privacyPolicyClass: LocalMemoryTestEntityPrivacyPolicy,
-    };
-  }
-}
-
-export class LocalMemoryTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext,
-  LocalMemoryTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-}
-
-export const localMemoryTestEntityConfiguration =
-  new EntityConfiguration<LocalMemoryTestEntityFields>({
-    idField: 'id',
-    tableName: 'local_memory_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      name: new StringField({
-        columnName: 'name',
-        cache: true,
-      }),
-      dateField: new DateField({
-        columnName: 'date_field',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'local-memory',
-  });
@@ -1,48 +0,0 @@
-import {
-  NoOpEntityMetricsAdapter,
-  IEntityMetricsAdapter,
-  EntityCompanionProvider,
-  StubQueryContextProvider,
-  StubDatabaseAdapterProvider,
-} from '@expo/entity';
-
-import LocalMemoryCacheAdapterProvider from '../LocalMemoryCacheAdapterProvider';
-
-export const createLocalMemoryTestEntityCompanionProvider = (
-  localMemoryOptions: { maxSize?: number; ttlSeconds?: number } = {},
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter(),
-): EntityCompanionProvider => {
-  const localMemoryCacheAdapterProvider =
-    localMemoryOptions.maxSize === 0 && localMemoryOptions.ttlSeconds === 0
-      ? LocalMemoryCacheAdapterProvider.createNoOpProvider()
-      : LocalMemoryCacheAdapterProvider.createProviderWithOptions(localMemoryOptions);
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new StubDatabaseAdapterProvider(),
-          queryContextProvider: StubQueryContextProvider,
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'local-memory',
-        {
-          cacheAdapterProvider: localMemoryCacheAdapterProvider,
-        },
-      ],
-    ]),
-  );
-};
-
-export const createNoOpLocalMemoryIntegrationTestEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter(),
-): EntityCompanionProvider => {
-  return createLocalMemoryTestEntityCompanionProvider(
-    { maxSize: 0, ttlSeconds: 0 },
-    metricsAdapter,
-  );
-};
@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "build",
-  },
-  "include": ["src"]
-}
@@ -1,399 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.37.0](https://github.com/expo/entity/compare/v0.36.0...v0.37.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* update barrels ([#241](https://github.com/expo/entity/issues/241)) ([8c5f81b](https://github.com/expo/entity/commit/8c5f81bcca107e9b7bbea5f0ab41b0105057806e))
-
-
-
-
-
-# [0.36.0](https://github.com/expo/entity/compare/v0.35.0...v0.36.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* constrain entity fields type to string-keyed object ([#235](https://github.com/expo/entity/issues/235)) ([7e2cea1](https://github.com/expo/entity/commit/7e2cea16973a0ae1917f867cd25d6ef7c8eaecef))
-
-
-
-
-
-# [0.35.0](https://github.com/expo/entity/compare/v0.34.0...v0.35.0) (2024-04-11)
-
-
-### Bug Fixes
-
-* Revert: require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([1bdfbd6](https://github.com/expo/entity/commit/1bdfbd6b562d1200e4029df0533b5adb2d917831))
-
-
-
-
-
-# [0.34.0](https://github.com/expo/entity/compare/v0.33.0...v0.34.0) (2024-04-11)
-
-
-### Features
-
-* require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([8b0b31f](https://github.com/expo/entity/commit/8b0b31fdde5bd565aa527719003ef283a45f55cc))
-
-
-
-
-
-# [0.33.0](https://github.com/expo/entity/compare/v0.32.0...v0.33.0) (2023-10-06)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.32.0](https://github.com/expo/entity/compare/v0.31.1...v0.32.0) (2023-06-10)
-
-
-### Bug Fixes
-
-* remove unused field from redis configuration ([#213](https://github.com/expo/entity/issues/213)) ([503a2fb](https://github.com/expo/entity/commit/503a2fb6a8d57f6a09f6da99daf5ab92fc3e7945))
-
-
-### Features
-
-* entity companion definition static thunk ([#210](https://github.com/expo/entity/issues/210)) ([4b18010](https://github.com/expo/entity/commit/4b18010d42be50ef329f428b08330e21bf676586))
-
-
-
-
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-
-### Features
-
-* add example of redis mget batching using @expo/batcher ([#199](https://github.com/expo/entity/issues/199)) ([684f91b](https://github.com/expo/entity/commit/684f91b1f270851dbe331df2e2620664eea17266))
-* change redis cache adapter to use redis-like interface ([#200](https://github.com/expo/entity/issues/200)) ([e381f5b](https://github.com/expo/entity/commit/e381f5b2acfc17dcade2cf6e8506fa1c1c255e73))
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-
-### Features
-
-* update ioredis to v5, make it a devDependency of the cache packages ([#172](https://github.com/expo/entity/issues/172)) ([9fcfbf7](https://github.com/expo/entity/commit/9fcfbf746a61554cefedf7fb0f1a3a9056b58ffe))
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-### Chores
-
-* Refactor cachers to use an abstract class and interface  ([#157](https://github.com/expo/entity/pull/157)) 
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-### Chores
-
-* Move data transforming responsibilities to the CacheAdapter instead of the ReadThroughEntityCache. ([#153](https://github.com/expo/entity/pull/153))
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Bug Fixes
-
-* upgrade ioredis, knex, and pg ([#125](https://github.com/expo/entity/issues/125)) ([7c43edf](https://github.com/expo/entity/commit/7c43edf3de37e8af13e2a99bd44f03f54803d9b9))
-* use column name instead of field name for redis cache key ([#124](https://github.com/expo/entity/issues/124)) ([d78f452](https://github.com/expo/entity/commit/d78f452bb3ac5527069813a03f5b2264375bd8ab))
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Features
-
-* better cache adapter error handling ([#102](https://github.com/expo/entity/issues/102)) ([15546aa](https://github.com/expo/entity/commit/15546aad97734ab9ac67f1c012485f096a0e94f1))
-
-
-
-
-
-# [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
-
-
-
-
-
-# [0.6.0](https://github.com/expo/entity/compare/v0.5.2...v0.6.0) (2020-07-23)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.5.2](https://github.com/expo/entity/compare/v0.5.1...v0.5.2) (2020-07-02)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.5.1](https://github.com/expo/entity/compare/v0.5.0...v0.5.1) (2020-07-01)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# 0.5.0 (2020-07-01)
-
-
-### Features
-
-* support entity fields subset of db fields ([#49](https://github.com/expo/entity/issues/49)) ([4e40b2e](https://github.com/expo/entity/commit/4e40b2e521407e521d236978ec3b3b56db3990be))
@@ -11,8 +11,8 @@ During `EntityCompanionProvider` instantiation:
 ```typescript
 import Redis from 'ioredis';

-const genericRedisCacherContext = {
-  redisClient: new Redis(new URL(process.env['REDIS_URL']!).toString()),
+const redisCacheAdapterContext = {
+  redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
  makeKeyFn(...parts: string[]): string {
    const delimiter = ':';
    const escapedParts = parts.map((part) =>
@@ -21,6 +21,7 @@ const genericRedisCacherContext = {
    return escapedParts.join(delimiter);
  },
  cacheKeyPrefix: 'ent-',
+  cacheKeyVersion: 1,
  ttlSecondsPositive: 86400, // 1 day
  ttlSecondsNegative: 600, // 10 minutes
 };
@@ -34,8 +35,8 @@ export const createDefaultEntityCompanionProvider = (
      ...
    },
    {
-      ['redis']: {
-        cacheAdapterProvider: new RedisCacheAdapterProvider(genericRedisCacheContext),
+      [CacheAdapterFlavor.REDIS]: {
+        cacheAdapterProvider: new RedisCacheAdapterProvider(redisCacheAdapterContext),
      },
    }
  );
@@ -1,6 +1,6 @@
 {
  "name": "@expo/entity-cache-adapter-redis",
-  "version": "0.37.0",
+  "version": "0.4.0",
  "description": "Redis cache adapter for @expo/entity",
  "files": [
    "build",
@@ -11,15 +11,14 @@
  "scripts": {
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js",
+    "lint": "eslint src --ext '.ts'",
+    "test": "jest --rootDir --config ../../resources/jest.config.js",
    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "barrelsby --config ../../.barrelsby.json"
+    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir --runInBand --passWithNoTests",
+    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete"
  },
  "engines": {
-    "node": ">=16"
+    "node": ">=8"
  },
  "keywords": [
    "entity"
@@ -27,11 +26,12 @@
  "author": "Expo",
  "license": "MIT",
  "peerDependencies": {
-    "@expo/entity": "*",
-    "ioredis": ">=5"
+    "@expo/entity": "*"
+  },
+  "dependencies": {
+    "ioredis": "^4.16.1"
  },
  "devDependencies": {
-    "@expo/entity": "^0.37.0",
-    "ioredis": "^5.2.5"
+    "@expo/entity": "^0.4.0"
  }
 }
@@ -1,164 +0,0 @@
-import {
-  CacheLoadResult,
-  CacheStatus,
-  EntityConfiguration,
-  transformCacheObjectToFields,
-  transformFieldsToCacheObject,
-  IEntityGenericCacher,
-} from '@expo/entity';
-import invariant from 'invariant';
-
-import { redisTransformerMap } from './RedisCommon';
-import wrapNativeRedisCallAsync from './errors/wrapNativeRedisCallAsync';
-
-// Sentinel value we store in Redis to negatively cache a database miss.
-// The sentinel value is distinct from any (positively) cached value.
-const DOES_NOT_EXIST_REDIS = '';
-
-export interface IRedisTransaction {
-  set(key: string, value: string, secondsToken: 'EX', seconds: number): this;
-  exec(): Promise<any>;
-}
-
-export interface IRedis {
-  mget(...args: [...keys: string[]]): Promise<(string | null)[]>;
-  multi(): IRedisTransaction;
-  del(...args: [...keys: string[]]): Promise<any>;
-}
-
-export interface GenericRedisCacheContext {
-  /**
-   * Instance of ioredis.Redis
-   */
-  redisClient: IRedis;
-
-  /**
-   * Create a key string for key parts (cache key prefix, versions, entity name, etc).
-   * Most commonly a simple `parts.join(':')`. See integration test for example.
-   */
-  makeKeyFn: (...parts: string[]) => string;
-
-  /**
-   * Prefix prepended to all entity cache keys. Useful for adding a short, human-readable
-   * distintion for entity keys, e.g. `ent-`
-   */
-  cacheKeyPrefix: string;
-
-  /**
-   * TTL for caching database hits. Successive entity loads within this TTL
-   * will be read from cache (unless invalidated).
-   */
-  ttlSecondsPositive: number;
-
-  /**
-   * TTL for negatively caching database misses. Successive entity loads within
-   * this TTL will be assumed not present in the database (unless invalidated).
-   */
-  ttlSecondsNegative: number;
-}
-
-export default class GenericRedisCacher<TFields extends Record<string, any>>
-  implements IEntityGenericCacher<TFields>
-{
-  constructor(
-    private readonly context: GenericRedisCacheContext,
-    private readonly entityConfiguration: EntityConfiguration<TFields>,
-  ) {}
-
-  public async loadManyAsync(
-    keys: readonly string[],
-  ): Promise<ReadonlyMap<string, CacheLoadResult<TFields>>> {
-    if (keys.length === 0) {
-      return new Map();
-    }
-
-    const redisResults = await wrapNativeRedisCallAsync(() =>
-      this.context.redisClient.mget(...keys),
-    );
-
-    const results = new Map<string, CacheLoadResult<TFields>>();
-    for (let i = 0; i < keys.length; i++) {
-      const key = keys[i]!;
-      const redisResult = redisResults[i];
-
-      if (redisResult === DOES_NOT_EXIST_REDIS) {
-        results.set(key, {
-          status: CacheStatus.NEGATIVE,
-        });
-      } else if (redisResult) {
-        results.set(key, {
-          status: CacheStatus.HIT,
-          item: transformCacheObjectToFields(
-            this.entityConfiguration,
-            redisTransformerMap,
-            JSON.parse(redisResult),
-          ),
-        });
-      } else {
-        results.set(key, {
-          status: CacheStatus.MISS,
-        });
-      }
-    }
-    return results;
-  }
-
-  public async cacheManyAsync(objectMap: ReadonlyMap<string, Readonly<TFields>>): Promise<void> {
-    if (objectMap.size === 0) {
-      return;
-    }
-
-    let redisTransaction = this.context.redisClient.multi();
-    objectMap.forEach((object, key) => {
-      redisTransaction = redisTransaction.set(
-        key,
-        JSON.stringify(
-          transformFieldsToCacheObject(this.entityConfiguration, redisTransformerMap, object),
-        ),
-        'EX',
-        this.context.ttlSecondsPositive,
-      );
-    });
-    await wrapNativeRedisCallAsync(() => redisTransaction.exec());
-  }
-
-  public async cacheDBMissesAsync(keys: readonly string[]): Promise<void> {
-    if (keys.length === 0) {
-      return;
-    }
-
-    let redisTransaction = this.context.redisClient.multi();
-    keys.forEach((key) => {
-      redisTransaction = redisTransaction.set(
-        key,
-        DOES_NOT_EXIST_REDIS,
-        'EX',
-        this.context.ttlSecondsNegative,
-      );
-    });
-    await wrapNativeRedisCallAsync(() => redisTransaction.exec());
-  }
-
-  public async invalidateManyAsync(keys: readonly string[]): Promise<void> {
-    if (keys.length === 0) {
-      return;
-    }
-
-    await wrapNativeRedisCallAsync(() => this.context.redisClient.del(...keys));
-  }
-
-  public makeCacheKey<N extends keyof TFields>(
-    fieldName: N,
-    fieldValue: NonNullable<TFields[N]>,
-  ): string {
-    const columnName = this.entityConfiguration.entityToDBFieldsKeyMapping.get(fieldName);
-    invariant(columnName, `database field mapping missing for ${String(fieldName)}`);
-    return this.context.makeKeyFn(
-      this.context.cacheKeyPrefix,
-      this.entityConfiguration.tableName,
-      `v2.${this.entityConfiguration.cacheKeyVersion}`,
-      columnName,
-      String(fieldValue),
-    );
-  }
-}
@@ -0,0 +1,165 @@
+import {
+  EntityCacheAdapter,
+  EntityConfiguration,
+  FieldTransformerMap,
+  CacheLoadResult,
+  CacheStatus,
+} from '@expo/entity';
+import { Redis } from 'ioredis';
+
+import { redisTransformerMap } from './RedisCommon';
+
+// Sentinel value we store in Redis to negatively cache a database miss.
+// The sentinel value is distinct from any (positively) cached value.
+const DOES_NOT_EXIST_REDIS = '';
+
+export interface RedisCacheAdapterContext {
+  /**
+   * Instance of ioredis.Redis
+   */
+  redisClient: Redis;
+
+  /**
+   * Create a key string for key parts (cache key prefix, versions, entity name, etc).
+   * Most commonly a simple `parts.join(':')`. See integration test for example.
+   */
+  makeKeyFn: (...parts: string[]) => string;
+
+  /**
+   * Global cache version for the entity framework. Bumping this version will
+   * invalidate the cache for all entities at once.
+   */
+  cacheKeyVersion: number;
+
+  /**
+   * Prefix prepended to all entity cache keys. Useful for adding a short, human-readable
+   * distintion for entity keys, e.g. `ent-`
+   */
+  cacheKeyPrefix: string;
+
+  /**
+   * TTL for caching database hits. Successive entity loads within this TTL
+   * will be read from cache (unless invalidated).
+   */
+  ttlSecondsPositive: number;
+
+  /**
+   * TTL for negatively caching database misses. Successive entity loads within
+   * this TTL will be assumed not present in the database (unless invalidated).
+   */
+  ttlSecondsNegative: number;
+}
+
+export default class RedisCacheAdapter<TFields> extends EntityCacheAdapter<TFields> {
+  constructor(
+    entityConfiguration: EntityConfiguration<TFields>,
+    private readonly context: RedisCacheAdapterContext
+  ) {
+    super(entityConfiguration);
+  }
+
+  public getFieldTransformerMap(): FieldTransformerMap {
+    return redisTransformerMap;
+  }
+
+  public async loadManyAsync<N extends keyof TFields>(
+    fieldName: N,
+    fieldValues: readonly NonNullable<TFields[N]>[]
+  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, CacheLoadResult>> {
+    if (fieldValues.length === 0) {
+      return new Map();
+    }
+
+    const redisKeys = fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue));
+    const redisResults = await this.context.redisClient.mget(...redisKeys);
+
+    const results = new Map<NonNullable<TFields[N]>, CacheLoadResult>();
+    for (let i = 0; i < fieldValues.length; i++) {
+      const fieldValue = fieldValues[i];
+      const redisResult = redisResults[i];
+
+      if (redisResult === DOES_NOT_EXIST_REDIS) {
+        results.set(fieldValue, {
+          status: CacheStatus.NEGATIVE,
+        });
+      } else if (redisResult) {
+        results.set(fieldValue, {
+          status: CacheStatus.HIT,
+          item: JSON.parse(redisResult),
+        });
+      } else {
+        results.set(fieldValue, {
+          status: CacheStatus.MISS,
+        });
+      }
+    }
+    return results;
+  }
+
+  public async cacheManyAsync<N extends keyof TFields>(
+    fieldName: N,
+    objectMap: ReadonlyMap<NonNullable<TFields[N]>, object>
+  ): Promise<void> {
+    if (objectMap.size === 0) {
+      return;
+    }
+
+    let redisTransaction = this.context.redisClient.multi();
+    objectMap.forEach((object, fieldValue) => {
+      const redisKey = this.makeCacheKey(fieldName, fieldValue);
+      redisTransaction = redisTransaction.set(
+        redisKey,
+        JSON.stringify(object),
+        'EX',
+        this.context.ttlSecondsPositive
+      );
+    });
+    await redisTransaction.exec();
+  }
+
+  public async cacheDBMissesAsync<N extends keyof TFields>(
+    fieldName: N,
+    fieldValues: readonly NonNullable<TFields[N]>[]
+  ): Promise<void> {
+    if (fieldValues.length === 0) {
+      return;
+    }
+
+    let redisTransaction = this.context.redisClient.multi();
+    fieldValues.forEach((fieldValue) => {
+      const redisKey = this.makeCacheKey(fieldName, fieldValue);
+      redisTransaction = redisTransaction.set(
+        redisKey,
+        DOES_NOT_EXIST_REDIS,
+        'EX',
+        this.context.ttlSecondsNegative
+      );
+    });
+    await redisTransaction.exec();
+  }
+
+  public async invalidateManyAsync<N extends keyof TFields>(
+    fieldName: N,
+    fieldValues: readonly NonNullable<TFields[N]>[]
+  ): Promise<void> {
+    if (fieldValues.length === 0) {
+      return;
+    }
+
+    const redisKeys = fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue));
+    await this.context.redisClient.del(...redisKeys);
+  }
+
+  private makeCacheKey<N extends keyof TFields>(
+    fieldName: N,
+    fieldValue: NonNullable<TFields[N]>
+  ): string {
+    return this.context.makeKeyFn(
+      this.context.cacheKeyPrefix,
+      this.entityConfiguration.tableName,
+      `v${this.entityConfiguration.cacheKeyVersion}`,
+      fieldName as string,
+      String(fieldValue)
+    );
+  }
+}
@@ -1,18 +1,13 @@
-import {
-  IEntityCacheAdapterProvider,
-  EntityConfiguration,
-  IEntityCacheAdapter,
-  GenericEntityCacheAdapter,
-} from '@expo/entity';
+import { IEntityCacheAdapterProvider, EntityConfiguration, EntityCacheAdapter } from '@expo/entity';

-import GenericRedisCacher, { GenericRedisCacheContext } from './GenericRedisCacher';
+import RedisCacheAdapter, { RedisCacheAdapterContext } from './RedisCacheAdapter';

 export default class RedisCacheAdapterProvider implements IEntityCacheAdapterProvider {
-  constructor(private readonly context: GenericRedisCacheContext) {}
+  constructor(private readonly context: RedisCacheAdapterContext) {}

-  getCacheAdapter<TFields extends Record<string, any>>(
-    entityConfiguration: EntityConfiguration<TFields>,
-  ): IEntityCacheAdapter<TFields> {
-    return new GenericEntityCacheAdapter(new GenericRedisCacher(this.context, entityConfiguration));
+  getCacheAdapter<TFields>(
+    entityConfiguration: EntityConfiguration<TFields>
+  ): EntityCacheAdapter<TFields> {
+    return new RedisCacheAdapter(entityConfiguration, this.context);
  }
 }
@@ -1,168 +0,0 @@
-import { Batcher } from '@expo/batcher';
-import { ViewerContext, zipToMap } from '@expo/entity';
-import invariant from 'invariant';
-import Redis from 'ioredis';
-import nullthrows from 'nullthrows';
-import { URL } from 'url';
-import { v4 as uuidv4 } from 'uuid';
-
-import GenericRedisCacher, {
-  IRedis,
-  IRedisTransaction,
-  GenericRedisCacheContext,
-} from '../GenericRedisCacher';
-import RedisTestEntity from '../testfixtures/RedisTestEntity';
-import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
-
-class BatchedRedis implements IRedis {
-  private readonly mgetBatcher = new Batcher<string[], (string | null)[]>(
-    this.batchMgetAsync.bind(this),
-    {
-      maxBatchInterval: 0,
-    },
-  );
-
-  constructor(private readonly redis: Redis) {}
-
-  private async batchMgetAsync(keySets: string[][]): Promise<(string | null)[][]> {
-    // ordered distinct keys to fetch
-    const allKeysToFetch = [...new Set(keySets.flat())];
-
-    // fetch the distinct keys
-    const allResults = await this.redis.mget(...allKeysToFetch);
-
-    // put them into a map for fast lookup
-    const keysToResults = zipToMap(allKeysToFetch, allResults);
-
-    // re-associate them with original key sets
-    return keySets.map((keySet) =>
-      keySet.map((key) => {
-        const result = keysToResults.get(key);
-        invariant(result !== undefined, 'result should not be undefined');
-        return result;
-      }),
-    );
-  }
-
-  async mget(...args: string[]): Promise<(string | null)[]> {
-    return await this.mgetBatcher.batchAsync(args);
-  }
-
-  multi(): IRedisTransaction {
-    return this.redis.multi();
-  }
-
-  async del(...args: string[]): Promise<void> {
-    await this.redis.del(...args);
-  }
-}
-
-describe(GenericRedisCacher, () => {
-  const redis = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  const redisClient = new BatchedRedis(redis);
-
-  let genericRedisCacheContext: GenericRedisCacheContext;
-
-  beforeAll(() => {
-    genericRedisCacheContext = {
-      redisClient,
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await redis.flushdb();
-  });
-
-  afterAll(async () => {
-    redis.disconnect();
-  });
-
-  it('has correct caching behavior', async () => {
-    // simulate two requests
-    const viewerContext = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-
-    const mgetSpy = jest.spyOn(redis, 'mget');
-
-    const genericCacher =
-      viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity)[
-        'tableDataCoordinator'
-      ]['cacheAdapter']['genericCacher'];
-    const cacheKeyMaker = genericCacher['makeCacheKey'].bind(genericCacher);
-
-    const entity1Created = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .enforceCreateAsync();
-
-    // loading an entity should put it in cache. load by multiple requests and multiple fields in same tick to ensure batch works
-    mgetSpy.mockClear();
-    const viewerContext1 = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const viewerContext2 = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const viewerContext3 = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const [entity1, entity2, entity3] = await Promise.all([
-      RedisTestEntity.loader(viewerContext1).enforcing().loadByIDAsync(entity1Created.getID()),
-      RedisTestEntity.loader(viewerContext2).enforcing().loadByIDAsync(entity1Created.getID()),
-      RedisTestEntity.loader(viewerContext3)
-        .enforcing()
-        .loadByFieldEqualingAsync('name', entity1Created.getField('name')),
-    ]);
-
-    expect(mgetSpy).toHaveBeenCalledTimes(1);
-    expect(mgetSpy.mock.calls[0]).toHaveLength(2); // should dedupe the first two loads
-    expect(entity1.getID()).toEqual(entity2.getID());
-    expect(entity2.getID()).toEqual(nullthrows(entity3).getID());
-
-    const cacheKeyEntity1 = cacheKeyMaker('id', entity1Created.getID());
-    const cachedJSON = await redis.get(cacheKeyEntity1);
-    const cachedValue = JSON.parse(cachedJSON!);
-    expect(cachedValue).toMatchObject({
-      id: entity1.getID(),
-      name: 'blah',
-    });
-
-    const cacheKeyEntity1NameField = cacheKeyMaker('name', entity1Created.getField('name'));
-    await RedisTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByFieldEqualingAsync('name', entity1Created.getField('name'));
-    await expect(redis.get(cacheKeyEntity1NameField)).resolves.toEqual(cachedJSON);
-
-    // simulate non existent db fetch, should write negative result ('') to cache
-    const nonExistentId = uuidv4();
-    const entityNonExistentResult = await RedisTestEntity.loader(viewerContext)
-      .withAuthorizationResults()
-      .loadByIDAsync(nonExistentId);
-    expect(entityNonExistentResult.ok).toBe(false);
-    const cacheKeyNonExistent = cacheKeyMaker('id', nonExistentId);
-    const nonExistentCachedValue = await redis.get(cacheKeyNonExistent);
-    expect(nonExistentCachedValue).toEqual('');
-    // load again through entities framework to ensure it reads negative result
-    const entityNonExistentResult2 = await RedisTestEntity.loader(viewerContext)
-      .withAuthorizationResults()
-      .loadByIDAsync(nonExistentId);
-    expect(entityNonExistentResult2.ok).toBe(false);
-
-    // invalidate from cache to ensure it invalidates correctly in both caches
-    await RedisTestEntity.loader(viewerContext)
-      .utils()
-      .invalidateFieldsAsync(entity1.getAllFields());
-    await expect(redis.get(cacheKeyEntity1)).resolves.toBeNull();
-    await expect(redis.get(cacheKeyEntity1NameField)).resolves.toBeNull();
-  });
-});
@@ -1,140 +0,0 @@
-import { ViewerContext } from '@expo/entity';
-import { enforceAsyncResult } from '@expo/results';
-import Redis from 'ioredis';
-import { URL } from 'url';
-import { v4 as uuidv4 } from 'uuid';
-
-import GenericRedisCacher, { GenericRedisCacheContext } from '../GenericRedisCacher';
-import RedisTestEntity from '../testfixtures/RedisTestEntity';
-import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
-
-class TestViewerContext extends ViewerContext {}
-
-describe(GenericRedisCacher, () => {
-  let genericRedisCacheContext: GenericRedisCacheContext;
-
-  beforeAll(() => {
-    genericRedisCacheContext = {
-      redisClient: new Redis(new URL(process.env['REDIS_URL']!).toString()),
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await (genericRedisCacheContext.redisClient as Redis).flushdb();
-  });
-  afterAll(async () => {
-    (genericRedisCacheContext.redisClient as Redis).disconnect();
-  });
-
-  it('has correct caching behavior', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const genericCacher =
-      viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity)[
-        'tableDataCoordinator'
-      ]['cacheAdapter']['genericCacher'];
-    const cacheKeyMaker = genericCacher['makeCacheKey'].bind(genericCacher);
-
-    const entity1Created = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .enforceCreateAsync();
-
-    // loading an entity should put it in cache
-    const entity1 = await RedisTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    const cachedJSON = await (genericRedisCacheContext.redisClient as Redis).get(
-      cacheKeyMaker('id', entity1.getID()),
-    );
-    const cachedValue = JSON.parse(cachedJSON!);
-    expect(cachedValue).toMatchObject({
-      id: entity1.getID(),
-      name: 'blah',
-    });
-
-    // simulate non existent db fetch, should write negative result ('') to cache
-    const nonExistentId = uuidv4();
-
-    const entityNonExistentResult = await RedisTestEntity.loader(viewerContext)
-      .withAuthorizationResults()
-      .loadByIDAsync(nonExistentId);
-    expect(entityNonExistentResult.ok).toBe(false);
-
-    const nonExistentCachedValue = await (genericRedisCacheContext.redisClient as Redis).get(
-      cacheKeyMaker('id', nonExistentId),
-    );
-    expect(nonExistentCachedValue).toEqual('');
-
-    // load again through entities framework to ensure it reads negative result
-    const entityNonExistentResult2 = await RedisTestEntity.loader(viewerContext)
-      .withAuthorizationResults()
-      .loadByIDAsync(nonExistentId);
-    expect(entityNonExistentResult2.ok).toBe(false);
-
-    // invalidate from cache to ensure it invalidates correctly
-    await RedisTestEntity.loader(viewerContext)
-      .utils()
-      .invalidateFieldsAsync(entity1.getAllFields());
-    const cachedValueNull = await (genericRedisCacheContext.redisClient as Redis).get(
-      cacheKeyMaker('id', entity1.getID()),
-    );
-    expect(cachedValueNull).toBe(null);
-  });
-
-  it('caches and restores date fields', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const date = new Date();
-    const entity1 = await enforceAsyncResult(
-      RedisTestEntity.creator(viewerContext).setField('dateField', date).createAsync(),
-    );
-    expect(entity1.getField('dateField')).toEqual(date);
-
-    const entity2 = await RedisTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1.getID());
-    expect(entity2.getField('dateField')).toEqual(date);
-
-    // simulate new request
-    const vc2 = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const entity3 = await RedisTestEntity.loader(vc2).enforcing().loadByIDAsync(entity1.getID());
-    expect(entity3.getField('dateField')).toEqual(date);
-  });
-
-  it('caches and restores empty string field keys', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const entity1 = await enforceAsyncResult(
-      RedisTestEntity.creator(viewerContext).setField('name', '').createAsync(),
-    );
-    const entity2 = await RedisTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByFieldEqualingAsync('name', '');
-    expect(entity2?.getID()).toEqual(entity1.getID());
-
-    // simulate new request
-    const vc2 = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const entity3 = await RedisTestEntity.loader(vc2)
-      .enforcing()
-      .loadByFieldEqualingAsync('name', '');
-    expect(entity3?.getID()).toEqual(entity1.getID());
-  });
-});
@@ -1,111 +0,0 @@
-import { CacheStatus, ViewerContext } from '@expo/entity';
-import Redis from 'ioredis';
-import { URL } from 'url';
-
-import GenericRedisCacher, { GenericRedisCacheContext } from '../GenericRedisCacher';
-import RedisTestEntity, {
-  redisTestEntityConfiguration,
-  RedisTestEntityFields,
-} from '../testfixtures/RedisTestEntity';
-import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
-
-class TestViewerContext extends ViewerContext {}
-
-describe(GenericRedisCacher, () => {
-  let genericRedisCacheContext: GenericRedisCacheContext;
-
-  beforeAll(() => {
-    genericRedisCacheContext = {
-      redisClient: new Redis(new URL(process.env['REDIS_URL']!).toString()),
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await (genericRedisCacheContext.redisClient as Redis).flushdb();
-  });
-  afterAll(async () => {
-    (genericRedisCacheContext.redisClient as Redis).disconnect();
-  });
-
-  it('has correct caching and loading behavior', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const genericRedisCacher = new GenericRedisCacher(
-      genericRedisCacheContext,
-      redisTestEntityConfiguration,
-    );
-    const date = new Date();
-    const entity1Created = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-    const testKey = `test-id-key-${entity1Created.getID()}`;
-    const objectMap = new Map<string, Readonly<RedisTestEntityFields>>([
-      [testKey, entity1Created.getAllFields()],
-    ]);
-    await genericRedisCacher.cacheManyAsync(objectMap);
-
-    const cachedJSON = await (genericRedisCacheContext.redisClient as Redis).get(testKey);
-    const cachedValue = JSON.parse(cachedJSON!);
-    expect(cachedValue).toMatchObject({
-      id: entity1Created.getID(),
-      dateField: date.toISOString(),
-    });
-
-    const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
-    const cacheLoadResult = loadedObjectMap.get(testKey)!;
-    expect(cacheLoadResult).toMatchObject({
-      status: CacheStatus.HIT,
-      item: entity1Created.getAllFields(),
-    });
-    expect(loadedObjectMap.size).toBe(1);
-  });
-  it('has correct negative caching behaviour', async () => {
-    const genericRedisCacher = new GenericRedisCacher(
-      genericRedisCacheContext,
-      redisTestEntityConfiguration,
-    );
-
-    const testKey = `test-id-key-non-existent-id`;
-    await genericRedisCacher.cacheDBMissesAsync([testKey]);
-    const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
-    const cacheLoadResult = loadedObjectMap.get(testKey)!;
-    expect(cacheLoadResult.status).toBe(CacheStatus.NEGATIVE);
-  });
-  it('has correct invalidation behaviour', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-    const genericRedisCacher = new GenericRedisCacher(
-      genericRedisCacheContext,
-      redisTestEntityConfiguration,
-    );
-    const date = new Date();
-    const entity1Created = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-    const testKey = `test-id-key-${entity1Created.getID()}`;
-    const objectMap = new Map<string, Readonly<RedisTestEntityFields>>([
-      [testKey, entity1Created.getAllFields()],
-    ]);
-    await genericRedisCacher.cacheManyAsync(objectMap);
-
-    await genericRedisCacher.invalidateManyAsync([testKey]);
-
-    const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
-    const cacheLoadResult = loadedObjectMap.get(testKey)!;
-    expect(cacheLoadResult.status).toBe(CacheStatus.MISS);
-  });
-});
@@ -0,0 +1,107 @@
+import { ViewerContext } from '@expo/entity';
+import { enforceAsyncResult } from '@expo/results';
+import Redis from 'ioredis';
+import { URL } from 'url';
+import { v4 as uuidv4 } from 'uuid';
+
+import RedisCacheAdapter, { RedisCacheAdapterContext } from '../RedisCacheAdapter';
+import RedisTestEntity from '../testfixtures/RedisTestEntity';
+import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
+
+class TestViewerContext extends ViewerContext {}
+
+describe(RedisCacheAdapter, () => {
+  let redisCacheAdapterContext: RedisCacheAdapterContext;
+
+  beforeAll(() => {
+    redisCacheAdapterContext = {
+      redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
+      makeKeyFn(...parts: string[]): string {
+        const delimiter = ':';
+        const escapedParts = parts.map((part) =>
+          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`)
+        );
+        return escapedParts.join(delimiter);
+      },
+      cacheKeyPrefix: 'test-',
+      cacheKeyVersion: 1,
+      ttlSecondsPositive: 86400, // 1 day
+      ttlSecondsNegative: 600, // 10 minutes
+    };
+  });
+
+  beforeEach(async () => {
+    await redisCacheAdapterContext.redisClient.flushdb();
+  });
+  afterAll(async () => {
+    redisCacheAdapterContext.redisClient.disconnect();
+  });
+
+  it('has correct caching behavior', async () => {
+    const vc1 = new TestViewerContext(
+      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+    );
+    const cacheAdapter = vc1.entityCompanionProvider.getCompanionForEntity(
+      RedisTestEntity,
+      RedisTestEntity.getCompanionDefinition()
+    )['cacheAdapter'];
+    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
+
+    // creating an entity should put it in cache (loader loads it after creation)
+    const entity1 = await enforceAsyncResult(
+      RedisTestEntity.creator(vc1).setField('name', 'blah').createAsync()
+    );
+
+    const cachedJSON = await redisCacheAdapterContext.redisClient.get(
+      cacheKeyMaker('id', entity1.getID())
+    );
+    const cachedValue = JSON.parse(cachedJSON!);
+    expect(cachedValue).toMatchObject({
+      id: entity1.getID(),
+      name: 'blah',
+    });
+
+    // simulate non existent db fetch, should write negative result ('') to cache
+    const nonExistentId = uuidv4();
+
+    const entityNonExistentResult = await RedisTestEntity.loader(vc1).loadByIDAsync(nonExistentId);
+    expect(entityNonExistentResult.ok).toBe(false);
+
+    const nonExistentCachedValue = await redisCacheAdapterContext.redisClient.get(
+      cacheKeyMaker('id', nonExistentId)
+    );
+    expect(nonExistentCachedValue).toEqual('');
+
+    // load again through entities framework to ensure it reads negative result
+    const entityNonExistentResult2 = await RedisTestEntity.loader(vc1).loadByIDAsync(nonExistentId);
+    expect(entityNonExistentResult2.ok).toBe(false);
+
+    // invalidate from cache to ensure it invalidates correctly
+    await RedisTestEntity.loader(vc1).invalidateFieldsAsync(entity1.getAllFields());
+    const cachedValueNull = await redisCacheAdapterContext.redisClient.get(
+      cacheKeyMaker('id', entity1.getID())
+    );
+    expect(cachedValueNull).toBe(null);
+  });
+
+  it('caches and restores date fields', async () => {
+    const vc1 = new TestViewerContext(
+      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+    );
+    const date = new Date();
+    const entity1 = await enforceAsyncResult(
+      RedisTestEntity.creator(vc1).setField('dateField', date).createAsync()
+    );
+    expect(entity1.getField('dateField')).toEqual(date);
+
+    const entity2 = await RedisTestEntity.loader(vc1).enforcing().loadByIDAsync(entity1.getID());
+    expect(entity2.getField('dateField')).toEqual(date);
+
+    // simulate new request
+    const vc2 = new TestViewerContext(
+      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+    );
+    const entity3 = await RedisTestEntity.loader(vc2).enforcing().loadByIDAsync(entity1.getID());
+    expect(entity3.getField('dateField')).toEqual(date);
+  });
+});
@@ -1,46 +0,0 @@
-import { EntityCacheAdapterTransientError, ViewerContext } from '@expo/entity';
-import Redis from 'ioredis';
-import { URL } from 'url';
-
-import GenericRedisCacher, { GenericRedisCacheContext } from '../GenericRedisCacher';
-import RedisTestEntity from '../testfixtures/RedisTestEntity';
-import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
-
-class TestViewerContext extends ViewerContext {}
-
-describe(GenericRedisCacher, () => {
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  let genericRedisCacheContext: GenericRedisCacheContext;
-
-  beforeAll(() => {
-    genericRedisCacheContext = {
-      redisClient,
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await redisClient.flushdb();
-  });
-
-  it('throws when redis is disconnected', async () => {
-    redisClient.disconnect();
-
-    const vc1 = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
-    );
-
-    await expect(
-      RedisTestEntity.creator(vc1).setField('name', 'blah').enforceCreateAsync(),
-    ).rejects.toThrow(EntityCacheAdapterTransientError);
-  });
-});
@@ -1,193 +0,0 @@
-import { CacheStatus, UUIDField, EntityConfiguration } from '@expo/entity';
-import { Redis, Pipeline } from 'ioredis';
-import { mock, when, instance, anything, verify } from 'ts-mockito';
-
-import GenericRedisCacher from '../GenericRedisCacher';
-
-type BlahFields = {
-  id: string;
-};
-
-const entityConfiguration = new EntityConfiguration<BlahFields>({
-  idField: 'id',
-  tableName: 'blah',
-  schema: {
-    id: new UUIDField({ columnName: 'id', cache: true }),
-  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
-});
-
-describe(GenericRedisCacher, () => {
-  describe('loadManyAsync', () => {
-    it('returns appropriate cache results', async () => {
-      const redisResults = new Map();
-
-      const mockRedisClient = mock<Redis>();
-
-      // need to have one anything() for each element of spread, in this case 3
-      when(mockRedisClient.mget(anything(), anything(), anything())).thenCall(async (...keys) =>
-        keys.map((k) => redisResults.get(k) ?? null),
-      );
-
-      const genericCacher = new GenericRedisCacher(
-        {
-          redisClient: instance(mockRedisClient),
-          makeKeyFn: (...parts) => parts.join(':'),
-          cacheKeyPrefix: 'hello-',
-          ttlSecondsPositive: 1,
-          ttlSecondsNegative: 2,
-        },
-        entityConfiguration,
-      );
-
-      const cacheKeyWat = genericCacher['makeCacheKey']('id', 'wat');
-      const cacheKeyWho = genericCacher['makeCacheKey']('id', 'who');
-      const cacheKeyWhy = genericCacher['makeCacheKey']('id', 'why');
-
-      redisResults.set(cacheKeyWat, JSON.stringify({ id: 'wat' }));
-      redisResults.set(cacheKeyWho, '');
-
-      const results = await genericCacher.loadManyAsync([cacheKeyWat, cacheKeyWho, cacheKeyWhy]);
-
-      expect(results.get(cacheKeyWat)).toMatchObject({
-        status: CacheStatus.HIT,
-        item: { id: 'wat' },
-      });
-      expect(results.get(cacheKeyWho)).toMatchObject({ status: CacheStatus.NEGATIVE });
-      expect(results.get(cacheKeyWhy)).toMatchObject({ status: CacheStatus.MISS });
-      expect(results.size).toBe(3);
-    });
-
-    it('returns empty map when passed empty array of fieldValues', async () => {
-      const genericCacher = new GenericRedisCacher(
-        {
-          redisClient: instance(mock<Redis>()),
-          makeKeyFn: (...parts) => parts.join(':'),
-          cacheKeyPrefix: 'hello-',
-          ttlSecondsPositive: 1,
-          ttlSecondsNegative: 2,
-        },
-        entityConfiguration,
-      );
-      const results = await genericCacher.loadManyAsync([]);
-      expect(results).toEqual(new Map());
-    });
-  });
-
-  describe('cacheManyAsync', () => {
-    it('correctly caches all objects', async () => {
-      const redisResults = new Map();
-
-      const mockPipeline = mock<Pipeline>();
-      when(mockPipeline.set(anything(), anything(), anything(), anything())).thenCall(
-        (key, value, code, ttl) => {
-          redisResults.set(key, { value, code, ttl });
-          return pipeline;
-        },
-      );
-      when(mockPipeline.exec()).thenResolve({} as any);
-      const pipeline = instance(mockPipeline);
-
-      const mockRedisClient = mock<Redis>();
-      when(mockRedisClient.multi()).thenReturn(pipeline);
-
-      const genericCacher = new GenericRedisCacher(
-        {
-          redisClient: instance(mockRedisClient),
-          makeKeyFn: (...parts) => parts.join(':'),
-          cacheKeyPrefix: 'hello-',
-          ttlSecondsPositive: 1,
-          ttlSecondsNegative: 2,
-        },
-        entityConfiguration,
-      );
-
-      const cacheKey = genericCacher['makeCacheKey']('id', 'wat');
-
-      await genericCacher.cacheManyAsync(new Map([[cacheKey, { id: 'wat' }]]));
-
-      expect(redisResults.get(cacheKey)).toMatchObject({
-        value: JSON.stringify({ id: 'wat' }),
-        code: 'EX',
-        ttl: 1,
-      });
-    });
-  });
-
-  describe('cacheDBMissesAsync', () => {
-    it('correctly caches misses', async () => {
-      const redisResults = new Map();
-      const mockPipeline = mock<Pipeline>();
-      when(mockPipeline.set(anything(), anything(), anything(), anything())).thenCall(
-        (key, value, code, ttl) => {
-          redisResults.set(key, { value, code, ttl });
-          return pipeline;
-        },
-      );
-      when(mockPipeline.exec()).thenResolve({} as any);
-      const pipeline = instance(mockPipeline);
-
-      const mockRedisClient = mock<Redis>();
-      when(mockRedisClient.multi()).thenReturn(pipeline);
-
-      const genericCacher = new GenericRedisCacher(
-        {
-          redisClient: instance(mockRedisClient),
-          makeKeyFn: (...parts) => parts.join(':'),
-          cacheKeyPrefix: 'hello-',
-          ttlSecondsPositive: 1,
-          ttlSecondsNegative: 2,
-        },
-        entityConfiguration,
-      );
-
-      const cacheKey = genericCacher['makeCacheKey']('id', 'wat');
-
-      await genericCacher.cacheDBMissesAsync([cacheKey]);
-
-      expect(redisResults.get(cacheKey)).toMatchObject({
-        value: '',
-        code: 'EX',
-        ttl: 2,
-      });
-    });
-  });
-
-  describe('invalidateManyAsync', () => {
-    it('invalidates correctly', async () => {
-      const mockRedisClient = mock<Redis>();
-      when(mockRedisClient.del()).thenResolve(1);
-
-      const genericCacher = new GenericRedisCacher(
-        {
-          redisClient: instance(mockRedisClient),
-          makeKeyFn: (...parts) => parts.join(':'),
-          cacheKeyPrefix: 'hello-',
-          ttlSecondsPositive: 1,
-          ttlSecondsNegative: 2,
-        },
-        entityConfiguration,
-      );
-      const cacheKey = genericCacher['makeCacheKey']('id', 'wat');
-
-      await genericCacher.invalidateManyAsync([cacheKey]);
-
-      verify(mockRedisClient.del(cacheKey)).once();
-    });
-
-    it('returns when passed empty array of fieldValues', async () => {
-      const genericCacher = new GenericRedisCacher(
-        {
-          redisClient: instance(mock<Redis>()),
-          makeKeyFn: (...parts) => parts.join(':'),
-          cacheKeyPrefix: 'hello-',
-          ttlSecondsPositive: 1,
-          ttlSecondsNegative: 2,
-        },
-        entityConfiguration,
-      );
-      await genericCacher.invalidateManyAsync([]);
-    });
-  });
-});
@@ -0,0 +1,167 @@
+import { CacheStatus, UUIDField, EntityConfiguration } from '@expo/entity';
+import { Redis, Pipeline } from 'ioredis';
+import { mock, when, instance, anything, verify } from 'ts-mockito';
+
+import RedisCacheAdapter from '../RedisCacheAdapter';
+
+type BlahFields = {
+  id: string;
+};
+
+const entityConfiguration = new EntityConfiguration<BlahFields>({
+  idField: 'id',
+  tableName: 'blah',
+  schema: {
+    id: new UUIDField({ columnName: 'id', cache: true }),
+  },
+});
+
+describe(RedisCacheAdapter, () => {
+  describe('loadManyAsync', () => {
+    it('returns appropriate cache results', async () => {
+      const redisResults = new Map();
+
+      const mockRedisClient = mock<Redis>();
+
+      // need to have one anything() for each element of spread, in this case 3
+      when(mockRedisClient.mget(anything(), anything(), anything())).thenCall(async (...keys) =>
+        keys.map((k) => redisResults.get(k) ?? null)
+      );
+
+      const cacheAdapter = new RedisCacheAdapter(entityConfiguration, {
+        redisClient: instance(mockRedisClient),
+        makeKeyFn: (...parts) => parts.join(':'),
+        cacheKeyVersion: 1,
+        cacheKeyPrefix: 'hello-',
+        ttlSecondsPositive: 1,
+        ttlSecondsNegative: 2,
+      });
+
+      redisResults.set(cacheAdapter['makeCacheKey']('id', 'wat'), JSON.stringify({ id: 'wat' }));
+      redisResults.set(cacheAdapter['makeCacheKey']('id', 'who'), '');
+
+      const results = await cacheAdapter.loadManyAsync('id', ['wat', 'who', 'why']);
+
+      expect(results.get('wat')).toMatchObject({ status: CacheStatus.HIT, item: { id: 'wat' } });
+      expect(results.get('who')).toMatchObject({ status: CacheStatus.NEGATIVE });
+      expect(results.get('why')).toMatchObject({ status: CacheStatus.MISS });
+      expect(results.size).toBe(3);
+    });
+
+    it('returns empty map when passed empty array of fieldValues', async () => {
+      const cacheAdapter = new RedisCacheAdapter(entityConfiguration, {
+        redisClient: instance(mock<Redis>()),
+        makeKeyFn: (...parts) => parts.join(':'),
+        cacheKeyVersion: 1,
+        cacheKeyPrefix: 'hello-',
+        ttlSecondsPositive: 1,
+        ttlSecondsNegative: 2,
+      });
+      const results = await cacheAdapter.loadManyAsync('id', []);
+      expect(results).toEqual(new Map());
+    });
+  });
+
+  describe('cacheManyAsync', () => {
+    it('correctly caches all objects', async () => {
+      const redisResults = new Map();
+
+      const mockPipeline = mock<Pipeline>();
+      when(mockPipeline.set(anything(), anything(), anything(), anything())).thenCall(
+        (key, value, code, ttl) => {
+          redisResults.set(key, { value, code, ttl });
+          return pipeline;
+        }
+      );
+      when(mockPipeline.exec()).thenResolve({} as any);
+      const pipeline = instance(mockPipeline);
+
+      const mockRedisClient = mock<Redis>();
+      when(mockRedisClient.multi()).thenReturn(pipeline);
+
+      const cacheAdapter = new RedisCacheAdapter(entityConfiguration, {
+        redisClient: instance(mockRedisClient),
+        makeKeyFn: (...parts) => parts.join(':'),
+        cacheKeyVersion: 1,
+        cacheKeyPrefix: 'hello-',
+        ttlSecondsPositive: 1,
+        ttlSecondsNegative: 2,
+      });
+      await cacheAdapter.cacheManyAsync('id', new Map([['wat', { id: 'wat' }]]));
+
+      const cacheKey = cacheAdapter['makeCacheKey']('id', 'wat');
+      expect(redisResults.get(cacheKey)).toMatchObject({
+        value: JSON.stringify({ id: 'wat' }),
+        code: 'EX',
+        ttl: 1,
+      });
+    });
+  });
+
+  describe('cacheDBMissesAsync', () => {
+    it('correctly caches misses', async () => {
+      const redisResults = new Map();
+      const mockPipeline = mock<Pipeline>();
+      when(mockPipeline.set(anything(), anything(), anything(), anything())).thenCall(
+        (key, value, code, ttl) => {
+          redisResults.set(key, { value, code, ttl });
+          return pipeline;
+        }
+      );
+      when(mockPipeline.exec()).thenResolve({} as any);
+      const pipeline = instance(mockPipeline);
+
+      const mockRedisClient = mock<Redis>();
+      when(mockRedisClient.multi()).thenReturn(pipeline);
+
+      const cacheAdapter = new RedisCacheAdapter(entityConfiguration, {
+        redisClient: instance(mockRedisClient),
+        makeKeyFn: (...parts) => parts.join(':'),
+        cacheKeyVersion: 1,
+        cacheKeyPrefix: 'hello-',
+        ttlSecondsPositive: 1,
+        ttlSecondsNegative: 2,
+      });
+      await cacheAdapter.cacheDBMissesAsync('id', ['wat']);
+
+      const cacheKey = cacheAdapter['makeCacheKey']('id', 'wat');
+      expect(redisResults.get(cacheKey)).toMatchObject({
+        value: '',
+        code: 'EX',
+        ttl: 2,
+      });
+    });
+  });
+
+  describe('invalidateManyAsync', () => {
+    it('invalidates correctly', async () => {
+      const mockRedisClient = mock<Redis>();
+      when(mockRedisClient.del()).thenResolve(1);
+
+      const cacheAdapter = new RedisCacheAdapter(entityConfiguration, {
+        redisClient: instance(mockRedisClient),
+        makeKeyFn: (...parts) => parts.join(':'),
+        cacheKeyVersion: 1,
+        cacheKeyPrefix: 'hello-',
+        ttlSecondsPositive: 1,
+        ttlSecondsNegative: 2,
+      });
+      await cacheAdapter.invalidateManyAsync('id', ['wat']);
+
+      const cacheKey = cacheAdapter['makeCacheKey']('id', 'wat');
+      verify(mockRedisClient.del(cacheKey)).once();
+    });
+
+    it('returns when passed empty array of fieldValues', async () => {
+      const cacheAdapter = new RedisCacheAdapter(entityConfiguration, {
+        redisClient: instance(mock<Redis>()),
+        makeKeyFn: (...parts) => parts.join(':'),
+        cacheKeyVersion: 1,
+        cacheKeyPrefix: 'hello-',
+        ttlSecondsPositive: 1,
+        ttlSecondsNegative: 2,
+      });
+      await cacheAdapter.invalidateManyAsync('id', []);
+    });
+  });
+});
@@ -1,39 +0,0 @@
-import { EntityCacheAdapterTransientError } from '@expo/entity';
-
-import wrapNativeRedisCallAsync from '../wrapNativeRedisCallAsync';
-
-describe(wrapNativeRedisCallAsync, () => {
-  it('rethrows literals', async () => {
-    const throwingFn = async (): Promise<void> => {
-      // eslint-disable-next-line no-throw-literal,@typescript-eslint/no-throw-literal
-      throw 'hello';
-    };
-
-    let capturedThrownThing: any;
-    try {
-      await wrapNativeRedisCallAsync(throwingFn);
-    } catch (e) {
-      capturedThrownThing = e;
-    }
-    expect(capturedThrownThing).not.toBeInstanceOf(Error);
-    expect(capturedThrownThing).toEqual('hello');
-  });
-
-  it('wraps errors with stacks', async () => {
-    const throwingFn = async (): Promise<void> => {
-      const e = new Error('hello');
-      e.stack = 'world';
-      throw e;
-    };
-
-    let capturedThrownThing: any;
-    try {
-      await wrapNativeRedisCallAsync(throwingFn);
-    } catch (e) {
-      capturedThrownThing = e;
-    }
-    expect(capturedThrownThing).toBeInstanceOf(EntityCacheAdapterTransientError);
-    expect(capturedThrownThing.message).toEqual('hello');
-    expect(capturedThrownThing.stack).toEqual('world');
-  });
-});
@@ -1,17 +0,0 @@
-import { EntityCacheAdapterTransientError } from '@expo/entity';
-
-export default async function wrapNativeRedisCallAsync<T>(fn: () => Promise<T>): Promise<T> {
-  try {
-    return await fn();
-  } catch (e) {
-    if (!(e instanceof Error)) {
-      throw e;
-    }
-
-    const error = new EntityCacheAdapterTransientError(e.message, e);
-    if (e.stack) {
-      error.stack = e.stack;
-    }
-    throw error;
-  }
-}
@@ -1,11 +1,8 @@
-/* eslint-disable tsdoc/syntax */
 /**
- * @packageDocumentation
- * @module @expo/entity-cache-adapter-redis
+ * Automatically generated by barrelsby.
 */

-export { default as GenericRedisCacher } from './GenericRedisCacher';
-export * from './GenericRedisCacher';
+export { default as RedisCacheAdapter } from './RedisCacheAdapter';
+export * from './RedisCacheAdapter';
 export { default as RedisCacheAdapterProvider } from './RedisCacheAdapterProvider';
 export * from './RedisCommon';
-export { default as wrapNativeRedisCallAsync } from './errors/wrapNativeRedisCallAsync';
@@ -6,6 +6,8 @@ import {
  DateField,
  StringField,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  EntityCompanionDefinition,
  Entity,
 } from '@expo/entity';
@@ -17,28 +19,24 @@ export type RedisTestEntityFields = {
 };

 export default class RedisTestEntity extends Entity<RedisTestEntityFields, string, ViewerContext> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
+  static getCompanionDefinition(): EntityCompanionDefinition<
    RedisTestEntityFields,
    string,
    ViewerContext,
    RedisTestEntity,
    RedisTestEntityPrivacyPolicy
  > {
-    return {
-      entityClass: RedisTestEntity,
-      entityConfiguration: redisTestEntityConfiguration,
-      privacyPolicyClass: RedisTestEntityPrivacyPolicy,
-    };
+    return redisTestEntityCompanionDefinition;
  }
 }

-export class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
+class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
  RedisTestEntityFields,
  string,
  ViewerContext,
  RedisTestEntity
 > {
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AlwaysAllowPrivacyPolicyRule<
      RedisTestEntityFields,
      string,
@@ -46,7 +44,7 @@ export class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      RedisTestEntity
    >(),
  ];
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<
      RedisTestEntityFields,
      string,
@@ -54,7 +52,7 @@ export class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      RedisTestEntity
    >(),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AlwaysAllowPrivacyPolicyRule<
      RedisTestEntityFields,
      string,
@@ -62,7 +60,7 @@ export class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      RedisTestEntity
    >(),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AlwaysAllowPrivacyPolicyRule<
      RedisTestEntityFields,
      string,
@@ -82,12 +80,17 @@ export const redisTestEntityConfiguration = new EntityConfiguration<RedisTestEnt
    }),
    name: new StringField({
      columnName: 'name',
-      cache: true,
    }),
    dateField: new DateField({
      columnName: 'date_field',
    }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
 });
+
+const redisTestEntityCompanionDefinition = {
+  entityClass: RedisTestEntity,
+  entityConfiguration: redisTestEntityConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
+  privacyPolicyClass: RedisTestEntityPrivacyPolicy,
+};
@@ -2,38 +2,31 @@ import {
  NoOpEntityMetricsAdapter,
  IEntityMetricsAdapter,
  EntityCompanionProvider,
+  CacheAdapterFlavor,
+  DatabaseAdapterFlavor,
  StubQueryContextProvider,
  StubDatabaseAdapterProvider,
 } from '@expo/entity';

-import { GenericRedisCacheContext } from '../GenericRedisCacher';
+import { RedisCacheAdapterContext } from '../RedisCacheAdapter';
 import RedisCacheAdapterProvider from '../RedisCacheAdapterProvider';

-// share across all in calls in test to simulate postgres
-const adapterProvider = new StubDatabaseAdapterProvider();
-
 export const createRedisIntegrationTestEntityCompanionProvider = (
-  genericRedisCacheContext: GenericRedisCacheContext,
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter(),
+  redisCacheAdapterContext: RedisCacheAdapterContext,
+  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
 ): EntityCompanionProvider => {
  return new EntityCompanionProvider(
    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider,
-          queryContextProvider: StubQueryContextProvider,
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'redis',
-        {
-          cacheAdapterProvider: new RedisCacheAdapterProvider(genericRedisCacheContext),
-        },
-      ],
-    ]),
+    {
+      [DatabaseAdapterFlavor.POSTGRES]: {
+        adapterProvider: new StubDatabaseAdapterProvider(),
+        queryContextProvider: StubQueryContextProvider,
+      },
+    },
+    {
+      [CacheAdapterFlavor.REDIS]: {
+        cacheAdapterProvider: new RedisCacheAdapterProvider(redisCacheAdapterContext),
+      },
+    }
  );
 };
@@ -1,431 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.37.0](https://github.com/expo/entity/compare/v0.36.0...v0.37.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* update barrels ([#241](https://github.com/expo/entity/issues/241)) ([8c5f81b](https://github.com/expo/entity/commit/8c5f81bcca107e9b7bbea5f0ab41b0105057806e))
-
-
-
-
-
-# [0.36.0](https://github.com/expo/entity/compare/v0.35.0...v0.36.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* constrain entity fields type to string-keyed object ([#235](https://github.com/expo/entity/issues/235)) ([7e2cea1](https://github.com/expo/entity/commit/7e2cea16973a0ae1917f867cd25d6ef7c8eaecef))
-
-
-
-
-
-# [0.35.0](https://github.com/expo/entity/compare/v0.34.0...v0.35.0) (2024-04-11)
-
-
-### Bug Fixes
-
-* Revert: require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([1bdfbd6](https://github.com/expo/entity/commit/1bdfbd6b562d1200e4029df0533b5adb2d917831))
-
-
-
-
-
-# [0.34.0](https://github.com/expo/entity/compare/v0.33.0...v0.34.0) (2024-04-11)
-
-
-### Features
-
-* require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([8b0b31f](https://github.com/expo/entity/commit/8b0b31fdde5bd565aa527719003ef283a45f55cc))
-
-
-
-
-
-# [0.33.0](https://github.com/expo/entity/compare/v0.32.0...v0.33.0) (2023-10-06)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.32.0](https://github.com/expo/entity/compare/v0.31.1...v0.32.0) (2023-06-10)
-
-
-### Features
-
-* add ability to specify knex transaction config ([#207](https://github.com/expo/entity/issues/207)) ([2069a0d](https://github.com/expo/entity/commit/2069a0d9fd1d8f7d090a71a90a758b2429ea5dd3))
-* entity companion definition static thunk ([#210](https://github.com/expo/entity/issues/210)) ([4b18010](https://github.com/expo/entity/commit/4b18010d42be50ef329f428b08330e21bf676586))
-
-
-
-
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-
-### Features
-
-* add BigIntField ([#193](https://github.com/expo/entity/issues/193)) ([acbad82](https://github.com/expo/entity/commit/acbad826a37bb5a054b4dcf9be91d11aa5f7f29a))
-* nested transactions ([#194](https://github.com/expo/entity/issues/194)) ([a77b914](https://github.com/expo/entity/commit/a77b914ad6dc018d1e309c9caf4971088a553ecf))
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-
-### Features
-
-* add orderByRaw to loadManyByRawWhereClauseAsync ([#185](https://github.com/expo/entity/issues/185)) ([2817d78](https://github.com/expo/entity/commit/2817d78392dfecd0093111c24d581bdf01dba06d))
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-
-### Features
-
-* Upgrade knex to 1.x in `@expo/entity-database-adapter-knex` ([#150](https://github.com/expo/entity/issues/150)) ([e1b0ee5](https://github.com/expo/entity/commit/e1b0ee528175646239d88aa71ffce73983eeb52f))
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-
-### Features
-
-* add pre-commit callbacks on EntityQueryContext ([#147](https://github.com/expo/entity/issues/147)) ([f1d9847](https://github.com/expo/entity/commit/f1d9847210f5775de964509e44ce493e44482b21))
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-
-### Features
-
-* add cascading deletion info ([#145](https://github.com/expo/entity/issues/145)) ([3727191](https://github.com/expo/entity/commit/372719176742d3ead6b7cbca29cb66b09b3fe09c))
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-
-### Features
-
-* Add IntField and FloatField, deprecate NumberField ([#131](https://github.com/expo/entity/issues/131)) ([2f2d963](https://github.com/expo/entity/commit/2f2d963cf92c6575d78f8eeca344a4aadcc9b8d9))
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-
-### Features
-
-* allow null field values in loadManyByFieldEqualityConjunctionAsync ([#130](https://github.com/expo/entity/issues/130)) ([2f37dc6](https://github.com/expo/entity/commit/2f37dc6a37d368b12b3c8375e04f0777fd448797))
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Bug Fixes
-
-* upgrade ioredis, knex, and pg ([#125](https://github.com/expo/entity/issues/125)) ([7c43edf](https://github.com/expo/entity/commit/7c43edf3de37e8af13e2a99bd44f03f54803d9b9))
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-
-### Bug Fixes
-
-* typescript typedef of EntityMutationInfo ([#121](https://github.com/expo/entity/issues/121)) ([8e8f0dc](https://github.com/expo/entity/commit/8e8f0dc8636e343e29a6012d155e4111477a8989))
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-
-### Bug Fixes
-
-* mutation validator and trigger cyclic import structure ([#118](https://github.com/expo/entity/issues/118)) ([b11dbc0](https://github.com/expo/entity/commit/b11dbc087ba5ad13c748032698dd73279b7960b0))
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-
-### Features
-
-* add basic field type runtime validators ([#113](https://github.com/expo/entity/issues/113)) ([6c4d4b0](https://github.com/expo/entity/commit/6c4d4b03b5404dd776a12c5eb6f0af77a8c964f8))
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* move runInTransaction to ViewerContext ([#108](https://github.com/expo/entity/issues/108)) ([b7309e1](https://github.com/expo/entity/commit/b7309e18a2dd780b64cd306d566de1f12bf8df3a))
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Features
-
-* better cache adapter error handling ([#102](https://github.com/expo/entity/issues/102)) ([15546aa](https://github.com/expo/entity/commit/15546aad97734ab9ac67f1c012485f096a0e94f1))
-* better database adapter error handling ([#101](https://github.com/expo/entity/issues/101)) ([5208aee](https://github.com/expo/entity/commit/5208aeedb0192f0460ba3d575770a04175f5c3aa))
-
-
-
-
-
-# [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* fix index export for EntityMutationTrigger and EntityMutationValidator ([#73](https://github.com/expo/entity/issues/73)) ([7e829f3](https://github.com/expo/entity/commit/7e829f30fde0bd343cb8a584ccda5530cf61ec33))
-* move cache invalidation to after transaction commit ([#77](https://github.com/expo/entity/issues/77)) ([dbc3c81](https://github.com/expo/entity/commit/dbc3c81b359a668b5134189ce6de49b5893bb5e7))
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
-
-
-
-
-
-# [0.6.0](https://github.com/expo/entity/compare/v0.5.2...v0.6.0) (2020-07-23)
-
-
-### Bug Fixes
-
-* separate out EntityMutationValidator ([#68](https://github.com/expo/entity/issues/68)) ([547a1ef](https://github.com/expo/entity/commit/547a1efcecd17cc085702d1a3e9888ce5b644b13))
-
-
-### Features
-
-* entity mutation validators ([#67](https://github.com/expo/entity/issues/67)) ([fc4377d](https://github.com/expo/entity/commit/fc4377d8839da07417b88afc138f73556383d896))
-* mutation triggers ([#65](https://github.com/expo/entity/issues/65)) ([fd6060c](https://github.com/expo/entity/commit/fd6060cc844f60635b3ce4c400c4877f2df8fa44))
-
-
-
-
-
-## [0.5.2](https://github.com/expo/entity/compare/v0.5.1...v0.5.2) (2020-07-02)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.5.1](https://github.com/expo/entity/compare/v0.5.0...v0.5.1) (2020-07-01)
-
-
-### Bug Fixes
-
-* correct some typing issues and exports ([#57](https://github.com/expo/entity/issues/57)) ([e91cfba](https://github.com/expo/entity/commit/e91cfba99321c2c4da2078aafd8627cbf0ceca50))
-
-
-
-
-
-# 0.5.0 (2020-07-01)
-
-
-### Features
-
-* support entity fields subset of db fields ([#49](https://github.com/expo/entity/issues/49)) ([4e40b2e](https://github.com/expo/entity/commit/4e40b2e521407e521d236978ec3b3b56db3990be))
@@ -9,16 +9,16 @@
 During `EntityCompanionProvider` instantiation:

 ```typescript
-import { knex, Knex } from 'knex';
+import Knex from 'knex';

-const knexInstance = knex({
+const knexInstance = Knex({
  client: 'pg',
  connection: {
-    user: process.env['PGUSER'],
-    password: process.env['PGPASSWORD'],
-    host: process.env['PGHOST'],
-    port: parseInt(nullthrows(process.env['PGPORT']), 10),
-    database: process.env['PGDATABASE'],
+    user: process.env.PGUSER,
+    password: process.env.PGPASSWORD,
+    host: process.env.PGHOST,
+    port: parseInt(process.env.PGPORT!, 10),
+    database: process.env.PGDATABASE,
  },
 });

@@ -29,7 +29,7 @@ export const createDefaultEntityCompanionProvider = (
    metricsAdapter,
    {
      // add the knex database adapter flavor
-      ['postgres']: {
+      [DatabaseAdapterFlavor.POSTGRES]: {
        adapter: PostgresEntityDatabaseAdapter,
        queryContextProvider: new PostgresEntityQueryContextProvider(knexInstance),
      },
@@ -1,6 +1,6 @@
 {
  "name": "@expo/entity-database-adapter-knex",
-  "version": "0.37.0",
+  "version": "0.4.0",
  "description": "Knex database adapter for @expo/entity",
  "files": [
    "build",
@@ -11,15 +11,14 @@
  "scripts": {
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js --passWithNoTests",
+    "lint": "eslint src --ext '.ts'",
+    "test": "jest --rootDir --config ../../resources/jest.config.js --passWithNoTests",
    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "barrelsby --config ../../.barrelsby.json"
+    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir --runInBand --passWithNoTests",
+    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete"
  },
  "engines": {
-    "node": ">=16"
+    "node": ">=8"
  },
  "keywords": [
    "entity"
@@ -30,10 +29,9 @@
    "@expo/entity": "*"
  },
  "dependencies": {
-    "knex": "^3.1.0"
+    "knex": "^0.20.11"
  },
  "devDependencies": {
-    "@expo/entity": "^0.37.0",
-    "pg": "8.12.0"
+    "@expo/entity": "^0.4.0"
  }
 }
@@ -1,29 +0,0 @@
-import { EntityFieldDefinition } from '@expo/entity';
-
-/**
- * EntityFieldDefinition for a Postres column with a JS JSON array type.
- */
-export class JSONArrayField extends EntityFieldDefinition<any[]> {
-  protected validateInputValueInternal(value: any[]): boolean {
-    return Array.isArray(value);
-  }
-}
-
-/**
- * EntityFieldDefinition for a Postgres column that may be a JS JSON array type.
- * Does not do any validation.
- */
-export class MaybeJSONArrayField extends EntityFieldDefinition<any | any[]> {
-  protected validateInputValueInternal(_value: any): boolean {
-    return true;
-  }
-}
-
-/**
- * EntityFieldDefinition for a Postgres BIGINT column.
- */
-export class BigIntField extends EntityFieldDefinition<string> {
-  protected validateInputValueInternal(value: string): boolean {
-    return typeof value === 'string';
-  }
-}
@@ -2,19 +2,15 @@ import {
  EntityDatabaseAdapter,
  FieldTransformerMap,
  FieldTransformer,
+  JSONArrayField,
+  MaybeJSONArrayField,
  TableQuerySelectionModifiers,
  TableFieldSingleValueEqualityCondition,
  TableFieldMultiValueEqualityCondition,
-  TableQuerySelectionModifiersWithOrderByRaw,
 } from '@expo/entity';
-import { Knex } from 'knex';
+import Knex from 'knex';

-import { JSONArrayField, MaybeJSONArrayField } from './EntityFields';
-import wrapNativePostgresCallAsync from './errors/wrapNativePostgresCallAsync';
-
-export default class PostgresEntityDatabaseAdapter<
-  TFields extends Record<string, any>,
-> extends EntityDatabaseAdapter<TFields> {
+export default class PostgresEntityDatabaseAdapter<TFields> extends EntityDatabaseAdapter<TFields> {
  protected getFieldTransformerMap(): FieldTransformerMap {
    return new Map<string, FieldTransformer<any>>([
      [
@@ -45,33 +41,17 @@ export default class PostgresEntityDatabaseAdapter<
    queryInterface: Knex,
    tableName: string,
    tableField: string,
-    tableValues: readonly any[],
+    tableValues: readonly any[]
  ): Promise<object[]> {
-    return await wrapNativePostgresCallAsync(() =>
-      queryInterface
-        .select()
-        .from(tableName)
-        .whereRaw('?? = ANY(?)', [tableField, tableValues as any[]]),
-    );
-  }
-
-  private applyQueryModifiersToQueryOrderByRaw(
-    query: Knex.QueryBuilder,
-    querySelectionModifiers: TableQuerySelectionModifiersWithOrderByRaw,
-  ): Knex.QueryBuilder {
-    let ret = this.applyQueryModifiersToQuery(query, querySelectionModifiers);
-
-    const { orderByRaw } = querySelectionModifiers;
-    if (orderByRaw !== undefined) {
-      ret = ret.orderByRaw(orderByRaw);
-    }
-
-    return ret;
+    return await queryInterface
+      .select()
+      .from(tableName)
+      .whereRaw('?? = ANY(?)', [tableField, tableValues as any[]]);
  }

  private applyQueryModifiersToQuery(
    query: Knex.QueryBuilder,
-    querySelectionModifiers: TableQuerySelectionModifiers,
+    querySelectionModifiers: TableQuerySelectionModifiers
  ): Knex.QueryBuilder {
    const { orderBy, offset, limit } = querySelectionModifiers;

@@ -99,45 +79,26 @@ export default class PostgresEntityDatabaseAdapter<
    tableName: string,
    tableFieldSingleValueEqualityOperands: TableFieldSingleValueEqualityCondition[],
    tableFieldMultiValueEqualityOperands: TableFieldMultiValueEqualityCondition[],
-    querySelectionModifiers: TableQuerySelectionModifiers,
+    querySelectionModifiers: TableQuerySelectionModifiers
  ): Promise<object[]> {
    let query = queryInterface.select().from(tableName);

    if (tableFieldSingleValueEqualityOperands.length > 0) {
      const whereObject: { [key: string]: any } = {};
-      const nonNullTableFieldSingleValueEqualityOperands =
-        tableFieldSingleValueEqualityOperands.filter(({ tableValue }) => tableValue !== null);
-      const nullTableFieldSingleValueEqualityOperands =
-        tableFieldSingleValueEqualityOperands.filter(({ tableValue }) => tableValue === null);
-
-      if (nonNullTableFieldSingleValueEqualityOperands.length > 0) {
-        for (const { tableField, tableValue } of nonNullTableFieldSingleValueEqualityOperands) {
-          whereObject[tableField] = tableValue;
-        }
-        query = query.where(whereObject);
-      }
-      if (nullTableFieldSingleValueEqualityOperands.length > 0) {
-        for (const { tableField } of nullTableFieldSingleValueEqualityOperands) {
-          query = query.whereNull(tableField);
-        }
+      for (const { tableField, tableValue } of tableFieldSingleValueEqualityOperands) {
+        whereObject[tableField] = tableValue;
      }
+      query = query.where(whereObject);
    }

    if (tableFieldMultiValueEqualityOperands.length > 0) {
      for (const { tableField, tableValues } of tableFieldMultiValueEqualityOperands) {
-        const nonNullTableValues = tableValues.filter((tableValue) => tableValue !== null);
-        query = query.where((builder) => {
-          builder.whereRaw('?? = ANY(?)', [tableField, [...nonNullTableValues]]);
-          // there was at least one null, allow null in this equality clause
-          if (nonNullTableValues.length !== tableValues.length) {
-            builder.orWhereNull(tableField);
-          }
-        });
+        query = query.whereRaw('?? = ANY(?)', [tableField, tableValues]);
      }
    }

    query = this.applyQueryModifiersToQuery(query, querySelectionModifiers);
-    return await wrapNativePostgresCallAsync(() => query);
+    return await query;
  }

  protected async fetchManyByRawWhereClauseInternalAsync(
@@ -145,24 +106,22 @@ export default class PostgresEntityDatabaseAdapter<
    tableName: string,
    rawWhereClause: string,
    bindings: object | any[],
-    querySelectionModifiers: TableQuerySelectionModifiersWithOrderByRaw,
+    querySelectionModifiers: TableQuerySelectionModifiers
  ): Promise<object[]> {
    let query = queryInterface
      .select()
      .from(tableName)
      .whereRaw(rawWhereClause, bindings as any);
-    query = this.applyQueryModifiersToQueryOrderByRaw(query, querySelectionModifiers);
-    return await wrapNativePostgresCallAsync(() => query);
+    query = this.applyQueryModifiersToQuery(query, querySelectionModifiers);
+    return await query;
  }

  protected async insertInternalAsync(
    queryInterface: Knex,
    tableName: string,
-    object: object,
+    object: object
  ): Promise<object[]> {
-    return await wrapNativePostgresCallAsync(() =>
-      queryInterface.insert(object).into(tableName).returning('*'),
-    );
+    return await queryInterface.insert(object).into(tableName).returning('*');
  }

  protected async updateInternalAsync(
@@ -170,21 +129,21 @@ export default class PostgresEntityDatabaseAdapter<
    tableName: string,
    tableIdField: string,
    id: any,
-    object: object,
+    object: object
  ): Promise<object[]> {
-    return await wrapNativePostgresCallAsync(() =>
-      queryInterface.update(object).into(tableName).where(tableIdField, id).returning('*'),
-    );
+    return await queryInterface
+      .update(object)
+      .into(tableName)
+      .where(tableIdField, id)
+      .returning('*');
  }

  protected async deleteInternalAsync(
    queryInterface: Knex,
    tableName: string,
    tableIdField: string,
-    id: any,
+    id: any
  ): Promise<number> {
-    return await wrapNativePostgresCallAsync(() =>
-      queryInterface.into(tableName).where(tableIdField, id).del(),
-    );
+    return await queryInterface.into(tableName).where(tableIdField, id).del();
  }
 }
@@ -7,10 +7,9 @@ import {
 import PostgresEntityDatabaseAdapter from './PostgresEntityDatabaseAdapter';

 export default class PostgresEntityDatabaseAdapterProvider
-  implements IEntityDatabaseAdapterProvider
-{
-  getDatabaseAdapter<TFields extends Record<string, any>>(
-    entityConfiguration: EntityConfiguration<TFields>,
+  implements IEntityDatabaseAdapterProvider {
+  getDatabaseAdapter<TFields>(
+    entityConfiguration: EntityConfiguration<TFields>
  ): EntityDatabaseAdapter<TFields> {
    return new PostgresEntityDatabaseAdapter(entityConfiguration);
  }
@@ -1,60 +1,25 @@
 import {
-  EntityQueryContextProvider,
-  TransactionConfig,
-  TransactionIsolationLevel,
+  IEntityQueryContextProvider,
+  EntityNonTransactionalQueryContext,
+  EntityTransactionalQueryContext,
 } from '@expo/entity';
-import { Knex } from 'knex';
+import Knex from 'knex';

 /**
 * Query context provider for knex (postgres).
 */
-export default class PostgresEntityQueryContextProvider extends EntityQueryContextProvider {
-  constructor(private readonly knexInstance: Knex) {
-    super();
+export default class PostgresEntityQueryContextProvider implements IEntityQueryContextProvider {
+  constructor(private readonly knexInstance: Knex) {}
+
+  getRegularEntityQueryContext(): EntityNonTransactionalQueryContext {
+    return new EntityNonTransactionalQueryContext(this.knexInstance);
  }

-  protected getQueryInterface(): any {
-    return this.knexInstance;
-  }
-
-  protected createTransactionRunner<T>(
-    transactionConfig?: TransactionConfig,
-  ): (transactionScope: (trx: any) => Promise<T>) => Promise<T> {
-    return (transactionScope) =>
-      this.knexInstance.transaction(
-        transactionScope,
-        transactionConfig
-          ? PostgresEntityQueryContextProvider.convertTransactionConfig(transactionConfig)
-          : undefined,
-      );
-  }
-
-  protected createNestedTransactionRunner<T>(
-    outerQueryInterface: any,
-  ): (transactionScope: (queryInterface: any) => Promise<T>) => Promise<T> {
-    return (transactionScope) => (outerQueryInterface as Knex).transaction(transactionScope);
-  }
-
-  private static convertTransactionConfig(
-    transactionConfig: TransactionConfig,
-  ): Knex.TransactionConfig {
-    const convertIsolationLevel = (
-      isolationLevel: TransactionIsolationLevel,
-    ): Knex.IsolationLevels => {
-      switch (isolationLevel) {
-        case TransactionIsolationLevel.READ_COMMITTED:
-          return 'read committed';
-        case TransactionIsolationLevel.REPEATABLE_READ:
-          return 'repeatable read';
-        case TransactionIsolationLevel.SERIALIZABLE:
-          return 'serializable';
-      }
-    };
-
-    return {
-      ...(transactionConfig.isolationLevel
-        ? { isolationLevel: convertIsolationLevel(transactionConfig.isolationLevel) }
-        : {}),
-    };
+  async runInTransactionAsync<T>(
+    transactionScope: (queryContext: EntityTransactionalQueryContext) => Promise<T>
+  ): Promise<T> {
+    return await this.knexInstance.transaction(async (trx) => {
+      return await transactionScope(new EntityTransactionalQueryContext(trx));
+    });
  }
 }
@@ -1,31 +1,27 @@
 import {
  OrderByOrdering,
  createUnitTestEntityCompanionProvider,
+  enforceResultsAsync,
  ViewerContext,
-  TransactionIsolationLevel,
 } from '@expo/entity';
 import { enforceAsyncResult } from '@expo/results';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
-import { setTimeout } from 'timers/promises';
+import Knex from 'knex';

 import PostgresTestEntity from '../testfixtures/PostgresTestEntity';
-import PostgresTriggerTestEntity from '../testfixtures/PostgresTriggerTestEntity';
-import PostgresValidatorTestEntity from '../testfixtures/PostgresValidatorTestEntity';
 import { createKnexIntegrationTestEntityCompanionProvider } from '../testfixtures/createKnexIntegrationTestEntityCompanionProvider';

 describe('postgres entity integration', () => {
  let knexInstance: Knex;

  beforeAll(() => {
-    knexInstance = knex({
+    knexInstance = Knex({
      client: 'pg',
      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
+        user: process.env.PGUSER,
+        password: process.env.PGPASSWORD,
        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
+        port: parseInt(process.env.PGPORT!, 10),
+        database: process.env.PGDATABASE,
      },
    });
  });
@@ -36,13 +32,13 @@ describe('postgres entity integration', () => {

  afterAll(async () => {
    await PostgresTestEntity.dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
+    knexInstance.destroy();
  });

  it('supports parallel partial updates', async () => {
    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
    const entity = await enforceAsyncResult(
-      PostgresTestEntity.creator(vc).setField('name', 'hello').createAsync(),
+      PostgresTestEntity.creator(vc).setField('name', 'hello').createAsync()
    );

    // update two different fields at the same time (from the same entity)
@@ -69,7 +65,7 @@ describe('postgres entity integration', () => {
    it('throws knex error upon empty update', async () => {
      const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
      const entity = await enforceAsyncResult(
-        PostgresTestEntity.creator(vc).setField('name', 'hello').createAsync(),
+        PostgresTestEntity.creator(vc).setField('name', 'hello').createAsync()
      );
      await expect(PostgresTestEntity.updater(entity).updateAsync()).rejects.toThrow();
    });
@@ -77,7 +73,7 @@ describe('postgres entity integration', () => {
    it('throws error upon empty update for stub database adapter to match behavior', async () => {
      const vc = new ViewerContext(createUnitTestEntityCompanionProvider());
      const entity = await enforceAsyncResult(
-        PostgresTestEntity.creator(vc).setField('name', 'hello').createAsync(),
+        PostgresTestEntity.creator(vc).setField('name', 'hello').createAsync()
      );
      await expect(PostgresTestEntity.updater(entity).updateAsync()).rejects.toThrow();
    });
@@ -88,89 +84,28 @@ describe('postgres entity integration', () => {

    // put one in the DB
    const firstEntity = await enforceAsyncResult(
-      PostgresTestEntity.creator(vc1).setField('name', 'hello').createAsync(),
+      PostgresTestEntity.creator(vc1).setField('name', 'hello').createAsync()
    );

-    await PostgresTestEntity.loader(vc1).enforcing().loadByIDAsync(firstEntity.getID());
+    await enforceAsyncResult(PostgresTestEntity.loader(vc1).loadByIDAsync(firstEntity.getID()));

    const errorToThrow = new Error('Intentional error');

    await expect(
-      vc1.runInTransactionForDatabaseAdaptorFlavorAsync(
-        'postgres',
-        async (queryContext) => {
-          // put another in the DB that will be rolled back due to error thrown
-          await enforceAsyncResult(
-            PostgresTestEntity.creator(vc1, queryContext).setField('name', 'hello').createAsync(),
-          );
+      PostgresTestEntity.runInTransactionAsync(vc1, async (queryContext) => {
+        // put another in the DB that will be rolled back due to error thrown
+        await enforceAsyncResult(
+          PostgresTestEntity.creator(vc1, queryContext).setField('name', 'hello').createAsync()
+        );

-          throw errorToThrow;
-        },
-        {}, // test empty transaction config
-      ),
+        throw errorToThrow;
+      })
    ).rejects.toEqual(errorToThrow);

-    const entities = await PostgresTestEntity.loader(vc1)
-      .enforcing()
-      .loadManyByFieldEqualingAsync('name', 'hello');
-    expect(entities).toHaveLength(1);
-  });
-
-  describe('isolation levels', () => {
-    test.each(Object.values(TransactionIsolationLevel))(
-      'isolation level: %p',
-      async (isolationLevel: TransactionIsolationLevel) => {
-        const vc1 = new ViewerContext(
-          createKnexIntegrationTestEntityCompanionProvider(knexInstance),
-        );
-
-        const firstEntity = await enforceAsyncResult(
-          PostgresTestEntity.creator(vc1).setField('name', 'hello').createAsync(),
-        );
-
-        const loadAndUpdateAsync = async (
-          newName: string,
-          delay: number,
-        ): Promise<{ error?: Error }> => {
-          try {
-            await vc1.runInTransactionForDatabaseAdaptorFlavorAsync(
-              'postgres',
-              async (queryContext) => {
-                const entity = await PostgresTestEntity.loader(vc1, queryContext)
-                  .enforcing()
-                  .loadByIDAsync(firstEntity.getID());
-                await setTimeout(delay);
-                await PostgresTestEntity.updater(entity, queryContext)
-                  .setField('name', entity.getField('name') + ',' + newName)
-                  .enforceUpdateAsync();
-              },
-              { isolationLevel },
-            );
-            return {};
-          } catch (e) {
-            return { error: e as Error };
-          }
-        };
-
-        // do some parallel updates to trigger serializable error in at least some of them
-        const results = await Promise.all([
-          loadAndUpdateAsync('hello2', 0),
-          loadAndUpdateAsync('hello3', 100),
-          loadAndUpdateAsync('hello4', 200),
-          loadAndUpdateAsync('hello5', 300),
-        ]);
-
-        if (isolationLevel === TransactionIsolationLevel.READ_COMMITTED) {
-          // read committed seems executes the transactions and doesn't produce a consistent result, but doesn't throw
-          expect(results.filter((r) => !!r.error).length > 0).toBe(false);
-        } else {
-          // all other isolation levels throw since they're doing nonrepeatable reads
-          expect(results.filter((r) => (r.error as any)?.cause?.code === '40001').length > 0).toBe(
-            true,
-          );
-        }
-      },
+    const entities = await enforceResultsAsync(
+      PostgresTestEntity.loader(vc1).loadManyByFieldEqualingAsync('name', 'hello')
    );
+    expect(entities).toHaveLength(1);
  });

  describe('JSON fields', () => {
@@ -181,7 +116,7 @@ describe('postgres entity integration', () => {
        PostgresTestEntity.creator(vc1)
          .setField('stringArray', ['hello', 'world'])
          .setField('jsonArrayField', ['hello', 'world'])
-          .createAsync(),
+          .createAsync()
      );

      expect(entity.getField('stringArray')).toEqual(['hello', 'world']);
@@ -194,7 +129,7 @@ describe('postgres entity integration', () => {
      const entity = await enforceAsyncResult(
        PostgresTestEntity.creator(vc1)
          .setField('jsonObjectField', { hello: 'world' })
-          .createAsync(),
+          .createAsync()
      );

      expect(entity.getField('jsonObjectField')).toEqual({ hello: 'world' });
@@ -206,12 +141,12 @@ describe('postgres entity integration', () => {
      const entity1 = await enforceAsyncResult(
        PostgresTestEntity.creator(vc1)
          .setField('maybeJsonArrayField', ['hello', 'world'])
-          .createAsync(),
+          .createAsync()
      );
      const entity2 = await enforceAsyncResult(
        PostgresTestEntity.creator(vc1)
          .setField('maybeJsonArrayField', { hello: 'world' })
-          .createAsync(),
+          .createAsync()
      );

      expect(entity1.getField('maybeJsonArrayField')).toEqual(['hello', 'world']);
@@ -219,27 +154,6 @@ describe('postgres entity integration', () => {
    });
  });

-  describe('BIGINT fields', () => {
-    it('supports BIGINT fields', async () => {
-      const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-      let entity = await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1).setField('bigintField', '72057594037928038').createAsync(),
-      );
-      expect(entity.getField('bigintField')).toEqual('72057594037928038');
-
-      entity = await enforceAsyncResult(
-        PostgresTestEntity.updater(entity).setField('bigintField', '10').updateAsync(),
-      );
-      expect(entity.getField('bigintField')).toEqual('10');
-
-      entity = await enforceAsyncResult(
-        PostgresTestEntity.updater(entity).setField('bigintField', '-10').updateAsync(),
-      );
-      expect(entity.getField('bigintField')).toEqual('-10');
-    });
-  });
-
  describe('conjunction field equality loading', () => {
    it('supports single fieldValue and multiple fieldValues', async () => {
      const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
@@ -249,7 +163,7 @@ describe('postgres entity integration', () => {
          .setField('name', 'hello')
          .setField('hasACat', false)
          .setField('hasADog', true)
-          .createAsync(),
+          .createAsync()
      );

      await enforceAsyncResult(
@@ -257,7 +171,7 @@ describe('postgres entity integration', () => {
          .setField('name', 'world')
          .setField('hasACat', false)
          .setField('hasADog', true)
-          .createAsync(),
+          .createAsync()
      );

      await enforceAsyncResult(
@@ -265,7 +179,7 @@ describe('postgres entity integration', () => {
          .setField('name', 'wat')
          .setField('hasACat', false)
          .setField('hasADog', false)
-          .createAsync(),
+          .createAsync()
      );

      const results = await PostgresTestEntity.loader(vc1)
@@ -315,59 +229,6 @@ describe('postgres entity integration', () => {
      expect(results).toHaveLength(2);
      expect(results.map((e) => e.getField('name'))).toEqual(['b', 'a']);
    });
-
-    it('supports null field values', async () => {
-      const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-      await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1)
-          .setField('name', 'a')
-          .setField('hasADog', true)
-          .createAsync(),
-      );
-      await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1)
-          .setField('name', 'b')
-          .setField('hasADog', true)
-          .createAsync(),
-      );
-      await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1)
-          .setField('name', null)
-          .setField('hasADog', true)
-          .createAsync(),
-      );
-      await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1)
-          .setField('name', null)
-          .setField('hasADog', false)
-          .createAsync(),
-      );
-
-      const results = await PostgresTestEntity.loader(vc1)
-        .enforcing()
-        .loadManyByFieldEqualityConjunctionAsync([{ fieldName: 'name', fieldValue: null }]);
-      expect(results).toHaveLength(2);
-      expect(results[0]!.getField('name')).toBeNull();
-
-      const results2 = await PostgresTestEntity.loader(vc1)
-        .enforcing()
-        .loadManyByFieldEqualityConjunctionAsync(
-          [
-            { fieldName: 'name', fieldValues: ['a', null] },
-            { fieldName: 'hasADog', fieldValue: true },
-          ],
-          {
-            orderBy: [
-              {
-                fieldName: 'name',
-                order: OrderByOrdering.DESCENDING,
-              },
-            ],
-          },
-        );
-      expect(results2).toHaveLength(2);
-      expect(results2.map((e) => e.getField('name'))).toEqual([null, 'a']);
-    });
  });

  describe('raw where clause loading', () => {
@@ -378,7 +239,7 @@ describe('postgres entity integration', () => {
          .setField('name', 'hello')
          .setField('hasACat', false)
          .setField('hasADog', true)
-          .createAsync(),
+          .createAsync()
      );

      const results = await PostgresTestEntity.loader(vc1)
@@ -395,13 +256,13 @@ describe('postgres entity integration', () => {
          .setField('name', 'hello')
          .setField('hasACat', false)
          .setField('hasADog', true)
-          .createAsync(),
+          .createAsync()
      );

      await expect(
        PostgresTestEntity.loader(vc1)
          .enforcing()
-          .loadManyByRawWhereClauseAsync('invalid_column = ?', ['hello']),
+          .loadManyByRawWhereClauseAsync('invalid_column = ?', ['hello'])
      ).rejects.toThrow();
    });

@@ -412,21 +273,21 @@ describe('postgres entity integration', () => {
        PostgresTestEntity.creator(vc1)
          .setField('name', 'a')
          .setField('hasADog', true)
-          .createAsync(),
+          .createAsync()
      );

      await enforceAsyncResult(
        PostgresTestEntity.creator(vc1)
          .setField('name', 'b')
          .setField('hasADog', true)
-          .createAsync(),
+          .createAsync()
      );

      await enforceAsyncResult(
        PostgresTestEntity.creator(vc1)
          .setField('name', 'c')
          .setField('hasADog', true)
-          .createAsync(),
+          .createAsync()
      );

      const results = await PostgresTestEntity.loader(vc1)
@@ -462,291 +323,6 @@ describe('postgres entity integration', () => {

      expect(resultsMultipleOrderBy).toHaveLength(3);
      expect(resultsMultipleOrderBy.map((e) => e.getField('name'))).toEqual(['c', 'b', 'a']);
-
-      const resultsOrderByRaw = await PostgresTestEntity.loader(vc1)
-        .enforcing()
-        .loadManyByRawWhereClauseAsync('has_a_dog = ?', [true], {
-          orderByRaw: 'has_a_dog ASC, name DESC',
-        });
-
-      expect(resultsOrderByRaw).toHaveLength(3);
-      expect(resultsOrderByRaw.map((e) => e.getField('name'))).toEqual(['c', 'b', 'a']);
-    });
-  });
-
-  describe('trigger transaction behavior', () => {
-    describe('create', () => {
-      it('rolls back transaction when trigger throws except afterCommit', async () => {
-        const vc1 = new ViewerContext(
-          createKnexIntegrationTestEntityCompanionProvider(knexInstance),
-        );
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1)
-            .setField('name', 'beforeCreate')
-            .enforceCreateAsync(),
-        ).rejects.toThrowError('name cannot have value beforeCreate');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeCreate'),
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1)
-            .setField('name', 'afterCreate')
-            .enforceCreateAsync(),
-        ).rejects.toThrowError('name cannot have value afterCreate');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterCreate'),
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1).setField('name', 'beforeAll').enforceCreateAsync(),
-        ).rejects.toThrowError('name cannot have value beforeAll');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeAll'),
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1).setField('name', 'afterAll').enforceCreateAsync(),
-        ).rejects.toThrowError('name cannot have value afterAll');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterAll'),
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1)
-            .setField('name', 'afterCommit')
-            .enforceCreateAsync(),
-        ).rejects.toThrowError('name cannot have value afterCommit');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterCommit'),
-        ).resolves.not.toBeNull();
-      });
-    });
-
-    describe('update', () => {
-      it('rolls back transaction when trigger throws except afterCommit', async () => {
-        const vc1 = new ViewerContext(
-          createKnexIntegrationTestEntityCompanionProvider(knexInstance),
-        );
-
-        const entity = await PostgresTriggerTestEntity.creator(vc1)
-          .setField('name', 'blah')
-          .enforceCreateAsync();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'beforeUpdate')
-            .enforceUpdateAsync(),
-        ).rejects.toThrowError('name cannot have value beforeUpdate');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeUpdate'),
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'afterUpdate')
-            .enforceUpdateAsync(),
-        ).rejects.toThrowError('name cannot have value afterUpdate');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterUpdate'),
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'beforeAll')
-            .enforceUpdateAsync(),
-        ).rejects.toThrowError('name cannot have value beforeAll');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeAll'),
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'afterAll')
-            .enforceUpdateAsync(),
-        ).rejects.toThrowError('name cannot have value afterAll');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterAll'),
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'afterCommit')
-            .enforceUpdateAsync(),
-        ).rejects.toThrowError('name cannot have value afterCommit');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterCommit'),
-        ).resolves.not.toBeNull();
-      });
-    });
-
-    describe('delete', () => {
-      it('rolls back transaction when trigger throws except afterCommit', async () => {
-        const vc1 = new ViewerContext(
-          createKnexIntegrationTestEntityCompanionProvider(knexInstance),
-        );
-
-        const entityBeforeDelete = await PostgresTriggerTestEntity.creator(vc1)
-          .setField('name', 'beforeDelete')
-          .enforceCreateAsync();
-        await expect(
-          PostgresTriggerTestEntity.enforceDeleteAsync(entityBeforeDelete),
-        ).rejects.toThrowError('name cannot have value beforeDelete');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeDelete'),
-        ).resolves.not.toBeNull();
-
-        const entityAfterDelete = await PostgresTriggerTestEntity.creator(vc1)
-          .setField('name', 'afterDelete')
-          .enforceCreateAsync();
-        await expect(
-          PostgresTriggerTestEntity.enforceDeleteAsync(entityAfterDelete),
-        ).rejects.toThrowError('name cannot have value afterDelete');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterDelete'),
-        ).resolves.not.toBeNull();
-      });
-    });
-    describe('validation transaction behavior', () => {
-      describe('create', () => {
-        it('rolls back transaction when trigger throws ', async () => {
-          const vc1 = new ViewerContext(
-            createKnexIntegrationTestEntityCompanionProvider(knexInstance),
-          );
-
-          await expect(
-            PostgresValidatorTestEntity.creator(vc1)
-              .setField('name', 'beforeCreateAndBeforeUpdate')
-              .enforceCreateAsync(),
-          ).rejects.toThrowError('name cannot have value beforeCreateAndBeforeUpdate');
-          await expect(
-            PostgresValidatorTestEntity.loader(vc1)
-              .enforcing()
-              .loadByFieldEqualingAsync('name', 'beforeCreateAndBeforeUpdate'),
-          ).resolves.toBeNull();
-        });
-      });
-      describe('update', () => {
-        it('rolls back transaction when trigger throws ', async () => {
-          const vc1 = new ViewerContext(
-            createKnexIntegrationTestEntityCompanionProvider(knexInstance),
-          );
-
-          const entity = await PostgresValidatorTestEntity.creator(vc1)
-            .setField('name', 'blah')
-            .enforceCreateAsync();
-
-          await expect(
-            PostgresValidatorTestEntity.updater(entity)
-              .setField('name', 'beforeCreateAndBeforeUpdate')
-              .enforceUpdateAsync(),
-          ).rejects.toThrowError('name cannot have value beforeCreateAndBeforeUpdate');
-          await expect(
-            PostgresValidatorTestEntity.loader(vc1)
-              .enforcing()
-              .loadByFieldEqualingAsync('name', 'beforeCreateAndBeforeUpdate'),
-          ).resolves.toBeNull();
-        });
-      });
-      describe('delete', () => {
-        it('validation should not run on a delete mutation', async () => {
-          const vc1 = new ViewerContext(
-            createKnexIntegrationTestEntityCompanionProvider(knexInstance),
-          );
-
-          const entityToDelete = await PostgresValidatorTestEntity.creator(vc1)
-            .setField('name', 'shouldBeDeleted')
-            .enforceCreateAsync();
-          await PostgresValidatorTestEntity.enforceDeleteAsync(entityToDelete);
-          await expect(
-            PostgresValidatorTestEntity.loader(vc1)
-              .enforcing()
-              .loadByFieldEqualingAsync('name', 'shouldBeDeleted'),
-          ).resolves.toBeNull();
-        });
-      });
-    });
-  });
-
-  describe('queryContext callback behavior', () => {
-    it('calls callbacks correctly', async () => {
-      const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-      let preCommitCallCount = 0;
-      let preCommitInnerCallCount = 0;
-      let postCommitCallCount = 0;
-
-      await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-        queryContext.appendPostCommitCallback(async () => {
-          postCommitCallCount++;
-        });
-        queryContext.appendPreCommitCallback(async () => {
-          preCommitCallCount++;
-        }, 0);
-
-        await queryContext.runInNestedTransactionAsync(async (innerQueryContext) => {
-          innerQueryContext.appendPostCommitCallback(async () => {
-            postCommitCallCount++;
-          });
-          innerQueryContext.appendPreCommitCallback(async () => {
-            preCommitInnerCallCount++;
-          }, 0);
-        });
-
-        // this one throws so its post commit shouldn't execute
-        try {
-          await queryContext.runInNestedTransactionAsync(async (innerQueryContext) => {
-            innerQueryContext.appendPostCommitCallback(async () => {
-              postCommitCallCount++;
-            });
-            innerQueryContext.appendPreCommitCallback(async () => {
-              preCommitInnerCallCount++;
-              throw Error('wat');
-            }, 0);
-          });
-        } catch {}
-      });
-
-      await expect(
-        vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-          queryContext.appendPostCommitCallback(async () => {
-            postCommitCallCount++;
-          });
-          queryContext.appendPreCommitCallback(async () => {
-            preCommitCallCount++;
-            throw Error('wat');
-          }, 0);
-        }),
-      ).rejects.toThrowError('wat');
-
-      expect(preCommitCallCount).toBe(2);
-      expect(preCommitInnerCallCount).toBe(2);
-      expect(postCommitCallCount).toBe(2);
    });
  });
 });
@@ -1,101 +0,0 @@
-import { ViewerContext } from '@expo/entity';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
-
-import PostgresEntityQueryContextProvider from '../PostgresEntityQueryContextProvider';
-import PostgresUniqueTestEntity from '../testfixtures/PostgresUniqueTestEntity';
-import { createKnexIntegrationTestEntityCompanionProvider } from '../testfixtures/createKnexIntegrationTestEntityCompanionProvider';
-
-describe(PostgresEntityQueryContextProvider, () => {
-  let knexInstance: Knex;
-
-  beforeAll(() => {
-    knexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-    });
-  });
-
-  beforeEach(async () => {
-    await PostgresUniqueTestEntity.createOrTruncatePostgresTable(knexInstance);
-  });
-
-  afterAll(async () => {
-    await PostgresUniqueTestEntity.dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
-  });
-
-  it('supports nested transactions', async () => {
-    const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-    await PostgresUniqueTestEntity.creator(vc1).setField('name', 'unique').enforceCreateAsync();
-
-    const id = (
-      await PostgresUniqueTestEntity.creator(vc1).setField('name', 'wat').enforceCreateAsync()
-    ).getID();
-
-    await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-      const entity = await PostgresUniqueTestEntity.loader(vc1, queryContext)
-        .enforcing()
-        .loadByIDAsync(id);
-      await PostgresUniqueTestEntity.updater(entity, queryContext)
-        .setField('name', 'wat2')
-        .enforceUpdateAsync();
-
-      // ensure the outer transaction is not aborted due to postgres error in inner transaction,
-      // in this case the error triggered is a unique constraint violation
-      try {
-        await queryContext.runInNestedTransactionAsync(async (innerQueryContext) => {
-          const entity = await PostgresUniqueTestEntity.loader(vc1, innerQueryContext)
-            .enforcing()
-            .loadByIDAsync(id);
-          await PostgresUniqueTestEntity.updater(entity, innerQueryContext)
-            .setField('name', 'unique')
-            .enforceUpdateAsync();
-        });
-      } catch {}
-
-      const entity2 = await PostgresUniqueTestEntity.loader(vc1, queryContext)
-        .enforcing()
-        .loadByIDAsync(id);
-      await PostgresUniqueTestEntity.updater(entity2, queryContext)
-        .setField('name', 'wat3')
-        .enforceUpdateAsync();
-    });
-
-    const entityLoaded = await PostgresUniqueTestEntity.loader(vc1).enforcing().loadByIDAsync(id);
-    expect(entityLoaded.getField('name')).toEqual('wat3');
-  });
-
-  it('supports multi-nested transactions', async () => {
-    const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-    const id = (
-      await PostgresUniqueTestEntity.creator(vc1).setField('name', 'wat').enforceCreateAsync()
-    ).getID();
-
-    await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-      await queryContext.runInNestedTransactionAsync(async (innerQueryContext) => {
-        await innerQueryContext.runInNestedTransactionAsync(async (innerQueryContex2) => {
-          await innerQueryContex2.runInNestedTransactionAsync(async (innerQueryContex3) => {
-            const entity = await PostgresUniqueTestEntity.loader(vc1, innerQueryContex3)
-              .enforcing()
-              .loadByIDAsync(id);
-            await PostgresUniqueTestEntity.updater(entity, innerQueryContex3)
-              .setField('name', 'wat3')
-              .enforceUpdateAsync();
-          });
-        });
-      });
-    });
-
-    const entityLoaded = await PostgresUniqueTestEntity.loader(vc1).enforcing().loadByIDAsync(id);
-    expect(entityLoaded.getField('name')).toEqual('wat3');
-  });
-});
@@ -1,7 +1,6 @@
 import { ViewerContext } from '@expo/entity';
 import { enforceAsyncResult } from '@expo/results';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
+import Knex from 'knex';

 import InvalidTestEntity from '../testfixtures/InvalidTestEntity';
 import { createKnexIntegrationTestEntityCompanionProvider } from '../testfixtures/createKnexIntegrationTestEntityCompanionProvider';
@@ -10,14 +9,14 @@ describe('postgres entity integration', () => {
  let knexInstance: Knex;

  beforeAll(() => {
-    knexInstance = knex({
+    knexInstance = Knex({
      client: 'pg',
      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
+        user: process.env.PGUSER,
+        password: process.env.PGPASSWORD,
        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
+        port: parseInt(process.env.PGPORT!, 10),
+        database: process.env.PGDATABASE,
      },
    });
  });
@@ -28,47 +27,50 @@ describe('postgres entity integration', () => {

  afterAll(async () => {
    await InvalidTestEntity.dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
+    knexInstance.destroy();
  });

  describe('invalid operation result counts', () => {
    it('throws after deletion of multiple rows or no rows', async () => {
      const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
      const entity1 = await enforceAsyncResult(
-        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'hello').createAsync(),
+        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'hello').createAsync()
      );
      await enforceAsyncResult(
-        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'world').createAsync(),
+        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'world').createAsync()
      );

      await expect(InvalidTestEntity.deleteAsync(entity1)).rejects.toThrowError(
-        'Excessive deletions from database adapter delete',
+        'Excessive deletions from database adapter delete'
+      );
+      await expect(InvalidTestEntity.deleteAsync(entity1)).rejects.toThrowError(
+        'No deletions from database adapter delete'
      );
    });

    it('throws after update of multiple rows', async () => {
      const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
      const entity1 = await enforceAsyncResult(
-        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'hello').createAsync(),
+        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'hello').createAsync()
      );
      await enforceAsyncResult(
-        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'world').createAsync(),
+        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'world').createAsync()
      );

      await expect(
-        InvalidTestEntity.updater(entity1).setField('name', 'blah').enforceUpdateAsync(),
+        InvalidTestEntity.updater(entity1).setField('name', 'blah').enforceUpdateAsync()
      ).rejects.toThrowError('Excessive results from database adapter update');
    });

    it('throws after update of no rows', async () => {
      const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
      const entity1 = await enforceAsyncResult(
-        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'hello').createAsync(),
+        InvalidTestEntity.creator(vc).setField('id', 1).setField('name', 'hello').createAsync()
      );
      await InvalidTestEntity.deleteAsync(entity1);

      await expect(
-        InvalidTestEntity.updater(entity1).setField('name', 'blah').enforceUpdateAsync(),
+        InvalidTestEntity.updater(entity1).setField('name', 'blah').enforceUpdateAsync()
      ).rejects.toThrowError('Empty results from database adapter update');
    });
  });
@@ -1,171 +0,0 @@
-import {
-  ViewerContext,
-  EntityDatabaseAdapterCheckConstraintError,
-  EntityDatabaseAdapterExclusionConstraintError,
-  EntityDatabaseAdapterForeignKeyConstraintError,
-  EntityDatabaseAdapterNotNullConstraintError,
-  EntityDatabaseAdapterTransientError,
-  EntityDatabaseAdapterUniqueConstraintError,
-  EntityDatabaseAdapterUnknownError,
-} from '@expo/entity';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
-
-import ErrorsTestEntity from '../testfixtures/ErrorsTestEntity';
-import { createKnexIntegrationTestEntityCompanionProvider } from '../testfixtures/createKnexIntegrationTestEntityCompanionProvider';
-
-describe('postgres errors', () => {
-  let knexInstance: Knex;
-
-  beforeAll(() => {
-    knexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-    });
-  });
-
-  beforeEach(async () => {
-    await ErrorsTestEntity.createOrTruncatePostgresTable(knexInstance);
-  });
-
-  afterAll(async () => {
-    await ErrorsTestEntity.dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
-  });
-
-  it('throws EntityDatabaseAdapterTransientError on Knex timeout', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await ErrorsTestEntity.creator(vc)
-      .setField('id', 1)
-      .setField('fieldNonNull', 'hello')
-      .enforceCreateAsync();
-
-    const shortTimeoutKnexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-      acquireConnectionTimeout: 1,
-    });
-    const vc2 = new ViewerContext(
-      createKnexIntegrationTestEntityCompanionProvider(shortTimeoutKnexInstance),
-    );
-    await expect(ErrorsTestEntity.loader(vc2).enforcing().loadByIDAsync(1)).rejects.toThrow(
-      EntityDatabaseAdapterTransientError,
-    );
-    await shortTimeoutKnexInstance.destroy();
-  });
-
-  it('throws EntityDatabaseAdapterNotNullConstraintError when not null is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', null as any)
-        .enforceCreateAsync(),
-    ).rejects.toThrow(EntityDatabaseAdapterNotNullConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterForeignKeyConstraintError when foreign key is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('fieldForeignKey', 2)
-        .enforceCreateAsync(),
-    ).rejects.toThrow(EntityDatabaseAdapterForeignKeyConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterUniqueConstraintError when primary key unique constraint is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-    await ErrorsTestEntity.creator(vc)
-      .setField('id', 1)
-      .setField('fieldNonNull', 'hello')
-      .enforceCreateAsync();
-
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .enforceCreateAsync(),
-    ).rejects.toThrow(EntityDatabaseAdapterUniqueConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterUniqueConstraintError when unique constraint is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await ErrorsTestEntity.creator(vc)
-      .setField('id', 2)
-      .setField('fieldNonNull', 'hello')
-      .setField('fieldUnique', 'hello')
-      .enforceCreateAsync();
-
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('fieldUnique', 'hello')
-        .enforceCreateAsync(),
-    ).rejects.toThrow(EntityDatabaseAdapterUniqueConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterCheckConstraintError when check constraint is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('checkLessThan5', 2)
-        .enforceCreateAsync(),
-    ).resolves.toBeTruthy();
-
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 2)
-        .setField('fieldNonNull', 'hello')
-        .setField('checkLessThan5', 10)
-        .enforceCreateAsync(),
-    ).rejects.toThrow(EntityDatabaseAdapterCheckConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterExclusionConstraintError when exclusion constraint is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('fieldExclusion', 'what')
-        .enforceCreateAsync(),
-    ).resolves.toBeTruthy();
-
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 2)
-        .setField('fieldNonNull', 'hello')
-        .setField('fieldExclusion', 'what')
-        .enforceCreateAsync(),
-    ).rejects.toThrow(EntityDatabaseAdapterExclusionConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterUnknownError otherwise', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('nonExistentColumn', 'what')
-        .enforceCreateAsync(),
-    ).rejects.toThrow(EntityDatabaseAdapterUnknownError);
-  });
-});
@@ -1,19 +0,0 @@
-import { describeFieldTestCase } from '@expo/entity';
-
-import { BigIntField, JSONArrayField, MaybeJSONArrayField } from '../EntityFields';
-
-describeFieldTestCase(
-  new JSONArrayField({ columnName: 'wat' }),
-  [[[1, 2]] as any, [['hello']] as any],
-  [1, 'hello'],
-);
-describeFieldTestCase(
-  new MaybeJSONArrayField({ columnName: 'wat' }),
-  [1, 'hello', [['hello']]],
-  [],
-);
-describeFieldTestCase(
-  new BigIntField({ columnName: 'wat' }),
-  ['123457682149816498126412896', '123', '-1', '-124147812641876482716841'],
-  [1, false, -1, 1e6, {}],
-);
@@ -1,19 +0,0 @@
-import wrapNativePostgresCallAsync from '../wrapNativePostgresCallAsync';
-
-describe(wrapNativePostgresCallAsync, () => {
-  it('rethrows literals', async () => {
-    const throwingFn = async (): Promise<void> => {
-      // eslint-disable-next-line no-throw-literal,@typescript-eslint/no-throw-literal
-      throw 'hello';
-    };
-
-    let capturedThrownThing: any;
-    try {
-      await wrapNativePostgresCallAsync(throwingFn);
-    } catch (e) {
-      capturedThrownThing = e;
-    }
-    expect(capturedThrownThing).not.toBeInstanceOf(Error);
-    expect(capturedThrownThing).toEqual('hello');
-  });
-});
@@ -1,55 +0,0 @@
-import {
-  EntityDatabaseAdapterError,
-  EntityDatabaseAdapterCheckConstraintError,
-  EntityDatabaseAdapterExclusionConstraintError,
-  EntityDatabaseAdapterForeignKeyConstraintError,
-  EntityDatabaseAdapterNotNullConstraintError,
-  EntityDatabaseAdapterTransientError,
-  EntityDatabaseAdapterUniqueConstraintError,
-  EntityDatabaseAdapterUnknownError,
-} from '@expo/entity';
-import { knex } from 'knex';
-
-function wrapNativePostgresError(
-  error: Error & { code?: string },
-): EntityDatabaseAdapterError & Error {
-  const ret = translatePostgresError(error);
-  if (error.stack) {
-    ret.stack = error.stack;
-  }
-  return ret;
-}
-
-function translatePostgresError(
-  error: Error & { code?: string },
-): EntityDatabaseAdapterError & Error {
-  if (error instanceof knex.KnexTimeoutError) {
-    return new EntityDatabaseAdapterTransientError(error.message, error);
-  }
-
-  switch (error.code) {
-    case '23502':
-      return new EntityDatabaseAdapterNotNullConstraintError(error.message, error);
-    case '23503':
-      return new EntityDatabaseAdapterForeignKeyConstraintError(error.message, error);
-    case '23505':
-      return new EntityDatabaseAdapterUniqueConstraintError(error.message, error);
-    case '23514':
-      return new EntityDatabaseAdapterCheckConstraintError(error.message, error);
-    case '23P01':
-      return new EntityDatabaseAdapterExclusionConstraintError(error.message, error);
-    default:
-      return new EntityDatabaseAdapterUnknownError(error.message, error);
-  }
-}
-
-export default async function wrapNativePostgresCallAsync<T>(fn: () => Promise<T>): Promise<T> {
-  try {
-    return await fn();
-  } catch (e) {
-    if (!(e instanceof Error)) {
-      throw e;
-    }
-    throw wrapNativePostgresError(e);
-  }
-}
@@ -1,11 +1,2 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @module @expo/entity-database-adapter-knex
- */
-
-export * from './EntityFields';
 export { default as PostgresEntityDatabaseAdapter } from './PostgresEntityDatabaseAdapter';
-export { default as PostgresEntityDatabaseAdapterProvider } from './PostgresEntityDatabaseAdapterProvider';
 export { default as PostgresEntityQueryContextProvider } from './PostgresEntityQueryContextProvider';
-export { default as wrapNativePostgresCallAsync } from './errors/wrapNativePostgresCallAsync';
@@ -1,174 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-  IntField,
-} from '@expo/entity';
-import { Knex } from 'knex';
-
-type ErrorsTestEntityFields = {
-  id: number;
-  fieldNonNull: string;
-  fieldForeignKey: number | null;
-  fieldUnique: string | null;
-  checkLessThan5: number | null;
-  fieldExclusion: string | null;
-  nonExistentColumn: string | null;
-};
-
-const foreignTableName = 'foreign_table';
-
-export default class ErrorsTestEntity extends Entity<
-  ErrorsTestEntityFields,
-  number,
-  ViewerContext
-> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    ErrorsTestEntityFields,
-    number,
-    ViewerContext,
-    ErrorsTestEntity,
-    ErrorsTestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: ErrorsTestEntity,
-      entityConfiguration: ErrorsTestEntityConfiguration,
-      privacyPolicyClass: ErrorsTestEntityPrivacyPolicy,
-    };
-  }
-
-  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
-    await knex.raw('CREATE EXTENSION IF NOT EXISTS "btree_gist"'); // for gist exclusion on varchar
-
-    const tableName = 'postgres_test_entities';
-    const hasForeignTable = await knex.schema.hasTable(foreignTableName);
-    if (!hasForeignTable) {
-      await knex.schema.createTable(foreignTableName, (table) => {
-        table.integer('id').primary();
-      });
-    }
-
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (!hasTable) {
-      await knex.schema.createTable(tableName, (table) => {
-        table.integer('id').primary();
-        table.string('field_non_null').notNullable();
-        table.integer('field_foreign_key').references(`${foreignTableName}.id`);
-        table.string('field_unique').unique();
-        table.integer('check_less_than_5');
-        table.string('field_exclusion');
-      });
-
-      await knex.raw(
-        `
-        ALTER TABLE :tableName:
-        ADD CONSTRAINT check_less_than_5_check_constraint
-        CHECK (check_less_than_5 IS NULL OR check_less_than_5 < 5);`,
-        {
-          tableName,
-        },
-      );
-
-      await knex.raw(
-        `
-        ALTER TABLE :tableName:
-        ADD CONSTRAINT field_exclusion_exclusion_constraint
-        EXCLUDE USING gist (field_exclusion WITH =);
-        `,
-        {
-          tableName,
-        },
-      );
-    }
-
-    await knex(tableName).delete();
-    await knex(foreignTableName).delete();
-  }
-
-  public static async dropPostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (hasTable) {
-      await knex.schema.dropTable(tableName);
-    }
-
-    const hasForeignTable = await knex.schema.hasTable(foreignTableName);
-    if (hasForeignTable) {
-      await knex.schema.dropTable(foreignTableName);
-    }
-  }
-}
-
-class ErrorsTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  ErrorsTestEntityFields,
-  number,
-  ViewerContext,
-  ErrorsTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      ErrorsTestEntityFields,
-      number,
-      ViewerContext,
-      ErrorsTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      ErrorsTestEntityFields,
-      number,
-      ViewerContext,
-      ErrorsTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      ErrorsTestEntityFields,
-      number,
-      ViewerContext,
-      ErrorsTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      ErrorsTestEntityFields,
-      number,
-      ViewerContext,
-      ErrorsTestEntity
-    >(),
-  ];
-}
-
-export const ErrorsTestEntityConfiguration = new EntityConfiguration<ErrorsTestEntityFields>({
-  idField: 'id',
-  tableName: 'postgres_test_entities',
-  schema: {
-    id: new IntField({
-      columnName: 'id',
-    }),
-    fieldNonNull: new StringField({
-      columnName: 'field_non_null',
-    }),
-    fieldForeignKey: new IntField({
-      columnName: 'field_foreign_key',
-    }),
-    fieldUnique: new StringField({
-      columnName: 'field_unique',
-    }),
-    checkLessThan5: new IntField({
-      columnName: 'check_less_than_5',
-    }),
-    fieldExclusion: new StringField({
-      columnName: 'field_exclusion',
-    }),
-    nonExistentColumn: new StringField({
-      columnName: 'non_existent_column',
-    }),
-  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
-});
@@ -4,11 +4,13 @@ import {
  ViewerContext,
  StringField,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  EntityCompanionDefinition,
  Entity,
-  IntField,
+  NumberField,
 } from '@expo/entity';
-import { Knex } from 'knex';
+import Knex from 'knex';

 type InvalidTestEntityFields = {
  id: number;
@@ -20,22 +22,18 @@ export default class InvalidTestEntity extends Entity<
  number,
  ViewerContext
 > {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
+  static getCompanionDefinition(): EntityCompanionDefinition<
    InvalidTestEntityFields,
    number,
    ViewerContext,
    InvalidTestEntity,
    InvalidTestEntityPrivacyPolicy
  > {
-    return {
-      entityClass: InvalidTestEntity,
-      entityConfiguration: invalidTestEntityConfiguration,
-      privacyPolicyClass: InvalidTestEntityPrivacyPolicy,
-    };
+    return invalidTestEntityCompanionDefinition;
  }

  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
+    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
    const hasTable = await knex.schema.hasTable(tableName);
    if (!hasTable) {
      await knex.schema.createTable(tableName, (table) => {
@@ -47,7 +45,7 @@ export default class InvalidTestEntity extends Entity<
  }

  public static async dropPostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
+    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
    const hasTable = await knex.schema.hasTable(tableName);
    if (hasTable) {
      await knex.schema.dropTable(tableName);
@@ -61,7 +59,7 @@ class InvalidTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
  ViewerContext,
  InvalidTestEntity
 > {
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AlwaysAllowPrivacyPolicyRule<
      InvalidTestEntityFields,
      number,
@@ -69,7 +67,7 @@ class InvalidTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      InvalidTestEntity
    >(),
  ];
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<
      InvalidTestEntityFields,
      number,
@@ -77,7 +75,7 @@ class InvalidTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      InvalidTestEntity
    >(),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AlwaysAllowPrivacyPolicyRule<
      InvalidTestEntityFields,
      number,
@@ -85,7 +83,7 @@ class InvalidTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      InvalidTestEntity
    >(),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AlwaysAllowPrivacyPolicyRule<
      InvalidTestEntityFields,
      number,
@@ -99,13 +97,19 @@ export const invalidTestEntityConfiguration = new EntityConfiguration<InvalidTes
  idField: 'id',
  tableName: 'postgres_test_entities',
  schema: {
-    id: new IntField({
+    id: new NumberField({
      columnName: 'id',
    }),
    name: new StringField({
      columnName: 'name',
    }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
 });
+
+const invalidTestEntityCompanionDefinition = {
+  entityClass: InvalidTestEntity,
+  entityConfiguration: invalidTestEntityConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
+  privacyPolicyClass: InvalidTestEntityPrivacyPolicy,
+};
@@ -6,15 +6,17 @@ import {
  StringField,
  BooleanField,
  StringArrayField,
+  JSONArrayField,
  JSONObjectField,
  DateField,
+  MaybeJSONArrayField,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  EntityCompanionDefinition,
  Entity,
 } from '@expo/entity';
-import { Knex } from 'knex';
-
-import { BigIntField, JSONArrayField, MaybeJSONArrayField } from '../EntityFields';
+import Knex from 'knex';

 type PostgresTestEntityFields = {
  id: string;
@@ -28,7 +30,6 @@ type PostgresTestEntityFields = {
  } | null;
  dateField: Date | null;
  maybeJsonArrayField: string[] | { hello: string } | null;
-  bigintField: string | null;
 };

 export default class PostgresTestEntity extends Entity<
@@ -36,26 +37,24 @@ export default class PostgresTestEntity extends Entity<
  string,
  ViewerContext
 > {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
+  static getCompanionDefinition(): EntityCompanionDefinition<
    PostgresTestEntityFields,
    string,
    ViewerContext,
    PostgresTestEntity,
    PostgresTestEntityPrivacyPolicy
  > {
-    return {
-      entityClass: PostgresTestEntity,
-      entityConfiguration: postgresTestEntityConfiguration,
-      privacyPolicyClass: PostgresTestEntityPrivacyPolicy,
-    };
+    return postgresTestEntityCompanionDefinition;
  }

  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
+    await knex.raw('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"'); // for uuid_generate_v4()
+
+    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
    const hasTable = await knex.schema.hasTable(tableName);
    if (!hasTable) {
      await knex.schema.createTable(tableName, (table) => {
-        table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
+        table.uuid('id').defaultTo(knex.raw('uuid_generate_v4()')).primary();
        table.string('name');
        table.boolean('has_a_dog');
        table.boolean('has_a_cat');
@@ -64,14 +63,13 @@ export default class PostgresTestEntity extends Entity<
        table.jsonb('json_object_field');
        table.dateTime('date_field', { useTz: true });
        table.jsonb('maybe_json_array_field');
-        table.bigint('bigint_field');
      });
    }
    await knex.into(tableName).truncate();
  }

  public static async dropPostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
+    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
    const hasTable = await knex.schema.hasTable(tableName);
    if (hasTable) {
      await knex.schema.dropTable(tableName);
@@ -85,7 +83,7 @@ class PostgresTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
  ViewerContext,
  PostgresTestEntity
 > {
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTestEntityFields,
      string,
@@ -93,7 +91,7 @@ class PostgresTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresTestEntity
    >(),
  ];
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTestEntityFields,
      string,
@@ -101,7 +99,7 @@ class PostgresTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresTestEntity
    >(),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTestEntityFields,
      string,
@@ -109,7 +107,7 @@ class PostgresTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresTestEntity
    >(),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTestEntityFields,
      string,
@@ -151,10 +149,13 @@ export const postgresTestEntityConfiguration = new EntityConfiguration<PostgresT
    maybeJsonArrayField: new MaybeJSONArrayField({
      columnName: 'maybe_json_array_field',
    }),
-    bigintField: new BigIntField({
-      columnName: 'bigint_field',
-    }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
 });
+
+const postgresTestEntityCompanionDefinition = {
+  entityClass: PostgresTestEntity,
+  entityConfiguration: postgresTestEntityConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
+  privacyPolicyClass: PostgresTestEntityPrivacyPolicy,
+};
@@ -1,181 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-  EntityMutationTrigger,
-  EntityQueryContext,
-  EntityNonTransactionalMutationTrigger,
-  EntityTriggerMutationInfo,
-} from '@expo/entity';
-import { Knex } from 'knex';
-
-type PostgresTriggerTestEntityFields = {
-  id: string;
-  name: string | null;
-};
-
-export default class PostgresTriggerTestEntity extends Entity<
-  PostgresTriggerTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    PostgresTriggerTestEntityFields,
-    string,
-    ViewerContext,
-    PostgresTriggerTestEntity,
-    PostgresTriggerTestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: PostgresTriggerTestEntity,
-      entityConfiguration: postgresTestEntityConfiguration,
-      privacyPolicyClass: PostgresTriggerTestEntityPrivacyPolicy,
-      mutationTriggers: {
-        beforeCreate: [new ThrowConditionallyTrigger('name', 'beforeCreate')],
-        afterCreate: [new ThrowConditionallyTrigger('name', 'afterCreate')],
-        beforeUpdate: [new ThrowConditionallyTrigger('name', 'beforeUpdate')],
-        afterUpdate: [new ThrowConditionallyTrigger('name', 'afterUpdate')],
-        beforeDelete: [new ThrowConditionallyTrigger('name', 'beforeDelete')],
-        afterDelete: [new ThrowConditionallyTrigger('name', 'afterDelete')],
-        beforeAll: [new ThrowConditionallyTrigger('name', 'beforeAll')],
-        afterAll: [new ThrowConditionallyTrigger('name', 'afterAll')],
-        afterCommit: [new ThrowConditionallyNonTransactionalTrigger('name', 'afterCommit')],
-      },
-    };
-  }
-
-  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (!hasTable) {
-      await knex.schema.createTable(tableName, (table) => {
-        table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-        table.string('name');
-      });
-    }
-    await knex.into(tableName).truncate();
-  }
-
-  public static async dropPostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (hasTable) {
-      await knex.schema.dropTable(tableName);
-    }
-  }
-}
-
-class PostgresTriggerTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  PostgresTriggerTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresTriggerTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >(),
-  ];
-}
-
-class ThrowConditionallyTrigger extends EntityMutationTrigger<
-  PostgresTriggerTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresTriggerTestEntity
-> {
-  constructor(
-    private fieldName: keyof PostgresTriggerTestEntityFields,
-    private badValue: string,
-  ) {
-    super();
-  }
-
-  async executeAsync(
-    _viewerContext: ViewerContext,
-    _queryContext: EntityQueryContext,
-    entity: PostgresTriggerTestEntity,
-    _mutationInfo: EntityTriggerMutationInfo<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >,
-  ): Promise<void> {
-    if (entity.getField(this.fieldName) === this.badValue) {
-      throw new Error(`${this.fieldName} cannot have value ${this.badValue}`);
-    }
-  }
-}
-
-class ThrowConditionallyNonTransactionalTrigger extends EntityNonTransactionalMutationTrigger<
-  PostgresTriggerTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresTriggerTestEntity
-> {
-  constructor(
-    private fieldName: keyof PostgresTriggerTestEntityFields,
-    private badValue: string,
-  ) {
-    super();
-  }
-
-  async executeAsync(
-    _viewerContext: ViewerContext,
-    entity: PostgresTriggerTestEntity,
-  ): Promise<void> {
-    if (entity.getField(this.fieldName) === this.badValue) {
-      throw new Error(`${this.fieldName} cannot have value ${this.badValue}`);
-    }
-  }
-}
-
-export const postgresTestEntityConfiguration =
-  new EntityConfiguration<PostgresTriggerTestEntityFields>({
-    idField: 'id',
-    tableName: 'postgres_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      name: new StringField({
-        columnName: 'name',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  });
@@ -1,113 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-} from '@expo/entity';
-import { Knex } from 'knex';
-
-type PostgresUniqueTestEntityFields = {
-  id: string;
-  name: string | null;
-};
-
-export default class PostgresUniqueTestEntity extends Entity<
-  PostgresUniqueTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    PostgresUniqueTestEntityFields,
-    string,
-    ViewerContext,
-    PostgresUniqueTestEntity,
-    PostgresUniqueTestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: PostgresUniqueTestEntity,
-      entityConfiguration: postgresTestEntityConfiguration,
-      privacyPolicyClass: PostgresUniqueTestEntityPrivacyPolicy,
-    };
-  }
-
-  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (!hasTable) {
-      await knex.schema.createTable(tableName, (table) => {
-        table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-        table.string('name').unique();
-      });
-    }
-    await knex.into(tableName).truncate();
-  }
-
-  public static async dropPostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (hasTable) {
-      await knex.schema.dropTable(tableName);
-    }
-  }
-}
-
-class PostgresUniqueTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  PostgresUniqueTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresUniqueTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresUniqueTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresUniqueTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresUniqueTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresUniqueTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresUniqueTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresUniqueTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresUniqueTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresUniqueTestEntity
-    >(),
-  ];
-}
-
-export const postgresTestEntityConfiguration =
-  new EntityConfiguration<PostgresUniqueTestEntityFields>({
-    idField: 'id',
-    tableName: 'postgres_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      name: new StringField({
-        columnName: 'name',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  });
@@ -1,147 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-  EntityMutationTrigger,
-  EntityQueryContext,
-  EntityValidatorMutationInfo,
-} from '@expo/entity';
-import { Knex } from 'knex';
-
-type PostgresValidatorTestEntityFields = {
-  id: string;
-  name: string | null;
-};
-
-export default class PostgresValidatorTestEntity extends Entity<
-  PostgresValidatorTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    PostgresValidatorTestEntityFields,
-    string,
-    ViewerContext,
-    PostgresValidatorTestEntity,
-    PostgresValidatorTestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: PostgresValidatorTestEntity,
-      entityConfiguration: postgresTestEntityConfiguration,
-      privacyPolicyClass: PostgresValidatorTestEntityPrivacyPolicy,
-      mutationValidators: [new ThrowConditionallyTrigger('name', 'beforeCreateAndBeforeUpdate')],
-    };
-  }
-
-  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (!hasTable) {
-      await knex.schema.createTable(tableName, (table) => {
-        table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-        table.string('name');
-      });
-    }
-    await knex.into(tableName).truncate();
-  }
-
-  public static async dropPostgresTable(knex: Knex): Promise<void> {
-    const tableName = 'postgres_test_entities';
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (hasTable) {
-      await knex.schema.dropTable(tableName);
-    }
-  }
-}
-
-class PostgresValidatorTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  PostgresValidatorTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresValidatorTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >(),
-  ];
-}
-
-class ThrowConditionallyTrigger extends EntityMutationTrigger<
-  PostgresValidatorTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresValidatorTestEntity
-> {
-  constructor(
-    private fieldName: keyof PostgresValidatorTestEntityFields,
-    private badValue: string,
-  ) {
-    super();
-  }
-
-  async executeAsync(
-    _viewerContext: ViewerContext,
-    _queryContext: EntityQueryContext,
-    entity: PostgresValidatorTestEntity,
-    _mutationInfo: EntityValidatorMutationInfo<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >,
-  ): Promise<void> {
-    if (entity.getField(this.fieldName) === this.badValue) {
-      throw new Error(`${this.fieldName} cannot have value ${this.badValue}`);
-    }
-  }
-}
-
-export const postgresTestEntityConfiguration =
-  new EntityConfiguration<PostgresValidatorTestEntityFields>({
-    idField: 'id',
-    tableName: 'postgres_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      name: new StringField({
-        columnName: 'name',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  });
@@ -2,35 +2,31 @@ import {
  NoOpEntityMetricsAdapter,
  IEntityMetricsAdapter,
  EntityCompanionProvider,
-  InMemoryFullCacheStubCacheAdapterProvider,
+  CacheAdapterFlavor,
+  DatabaseAdapterFlavor,
+  NoCacheStubCacheAdapterProvider,
 } from '@expo/entity';
-import { Knex } from 'knex';
+import Knex from 'knex';

 import PostgresEntityDatabaseAdapterProvider from '../PostgresEntityDatabaseAdapterProvider';
 import PostgresEntityQueryContextProvider from '../PostgresEntityQueryContextProvider';

 export const createKnexIntegrationTestEntityCompanionProvider = (
  knex: Knex,
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter(),
+  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
 ): EntityCompanionProvider => {
  return new EntityCompanionProvider(
    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new PostgresEntityDatabaseAdapterProvider(),
-          queryContextProvider: new PostgresEntityQueryContextProvider(knex),
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'redis',
-        {
-          cacheAdapterProvider: new InMemoryFullCacheStubCacheAdapterProvider(),
-        },
-      ],
-    ]),
+    {
+      [DatabaseAdapterFlavor.POSTGRES]: {
+        adapterProvider: new PostgresEntityDatabaseAdapterProvider(),
+        queryContextProvider: new PostgresEntityQueryContextProvider(knex),
+      },
+    },
+    {
+      [CacheAdapterFlavor.REDIS]: {
+        cacheAdapterProvider: new NoCacheStubCacheAdapterProvider(),
+      },
+    }
  );
 };
@@ -1,399 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.37.0](https://github.com/expo/entity/compare/v0.36.0...v0.37.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* update barrels ([#241](https://github.com/expo/entity/issues/241)) ([8c5f81b](https://github.com/expo/entity/commit/8c5f81bcca107e9b7bbea5f0ab41b0105057806e))
-
-
-
-
-
-# [0.36.0](https://github.com/expo/entity/compare/v0.35.0...v0.36.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* constrain entity fields type to string-keyed object ([#235](https://github.com/expo/entity/issues/235)) ([7e2cea1](https://github.com/expo/entity/commit/7e2cea16973a0ae1917f867cd25d6ef7c8eaecef))
-
-
-### Features
-
-* add previousValue to privacy policy context for updates ([#232](https://github.com/expo/entity/issues/232)) ([af495a9](https://github.com/expo/entity/commit/af495a9a856a5042f00cfd150348e415139cb85e))
-
-
-
-
-
-# [0.35.0](https://github.com/expo/entity/compare/v0.34.0...v0.35.0) (2024-04-11)
-
-
-### Bug Fixes
-
-* Revert: require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([1bdfbd6](https://github.com/expo/entity/commit/1bdfbd6b562d1200e4029df0533b5adb2d917831))
-
-
-
-
-
-# [0.34.0](https://github.com/expo/entity/compare/v0.33.0...v0.34.0) (2024-04-11)
-
-
-### Features
-
-* require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([8b0b31f](https://github.com/expo/entity/commit/8b0b31fdde5bd565aa527719003ef283a45f55cc))
-
-
-
-
-
-# [0.33.0](https://github.com/expo/entity/compare/v0.32.0...v0.33.0) (2023-10-06)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.32.0](https://github.com/expo/entity/compare/v0.31.1...v0.32.0) (2023-06-10)
-
-
-### Features
-
-* add ability to specify knex transaction config ([#207](https://github.com/expo/entity/issues/207)) ([2069a0d](https://github.com/expo/entity/commit/2069a0d9fd1d8f7d090a71a90a758b2429ea5dd3))
-* entity companion definition static thunk ([#210](https://github.com/expo/entity/issues/210)) ([4b18010](https://github.com/expo/entity/commit/4b18010d42be50ef329f428b08330e21bf676586))
-
-
-
-
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-
-### Features
-
-* nested transactions ([#194](https://github.com/expo/entity/issues/194)) ([a77b914](https://github.com/expo/entity/commit/a77b914ad6dc018d1e309c9caf4971088a553ecf))
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* privacy policy evaluation context ([#162](https://github.com/expo/entity/issues/162)) ([3a81a4c](https://github.com/expo/entity/commit/3a81a4c059e2e995eb800e35e76b3d432c22b23f))
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-
-### Features
-
-* add basic field type runtime validators ([#113](https://github.com/expo/entity/issues/113)) ([6c4d4b0](https://github.com/expo/entity/commit/6c4d4b03b5404dd776a12c5eb6f0af77a8c964f8))
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Bug Fixes
-
-* remove any cast from EntityLoader ([#100](https://github.com/expo/entity/issues/100)) ([b8e07f9](https://github.com/expo/entity/commit/b8e07f9ddc4077768980c000d61f5ddcc824e2e3))
-
-
-
-
-
-# [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* move cache invalidation to after transaction commit ([#77](https://github.com/expo/entity/issues/77)) ([dbc3c81](https://github.com/expo/entity/commit/dbc3c81b359a668b5134189ce6de49b5893bb5e7))
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
-
-
-
-
-
-# [0.6.0](https://github.com/expo/entity/compare/v0.5.2...v0.6.0) (2020-07-23)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.5.2](https://github.com/expo/entity/compare/v0.5.1...v0.5.2) (2020-07-02)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.5.1](https://github.com/expo/entity/compare/v0.5.0...v0.5.1) (2020-07-01)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# 0.5.0 (2020-07-01)
-
-
-### Bug Fixes
-
-* upgrade Apollo server for security advisory ([#38](https://github.com/expo/entity/issues/38)) ([d25c1e1](https://github.com/expo/entity/commit/d25c1e142d52385725593f4f155d1795697ab490))
-
-
-### Features
-
-* support entity fields subset of db fields ([#49](https://github.com/expo/entity/issues/49)) ([4e40b2e](https://github.com/expo/entity/commit/4e40b2e521407e521d236978ec3b3b56db3990be))
@@ -1,21 +1,20 @@
 {
  "name": "@expo/entity-example",
  "private": true,
-  "version": "0.37.0",
+  "version": "0.4.0",
  "description": "An example integration of the @expo/entity framework",
  "scripts": {
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js",
+    "lint": "eslint src --ext '.ts'",
+    "test": "jest --rootDir --config ../../resources/jest.config.js",
    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "",
+    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir --runInBand --passWithNoTests",
+    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete",
    "start": "tsnd --transpile-only --inspect --respawn --no-notify --async-stack-traces --throw-deprecation -- src/index.ts"
  },
  "engines": {
-    "node": ">=16"
+    "node": ">=8"
  },
  "keywords": [
    "entity"
@@ -23,22 +22,18 @@
  "author": "Expo",
  "license": "MIT",
  "dependencies": {
-    "@apollo/server": "^4.7.3",
-    "@as-integrations/koa": "^1.1.1",
-    "@expo/entity": "^0.37.0",
-    "@koa/cors": "^4.0.0",
-    "@koa/router": "^12.0.0",
-    "graphql": "^16.6.0",
-    "koa": "^2.14.2",
-    "koa-bodyparser": "^4.4.0"
+    "@expo/entity": "^0.4.0",
+    "apollo-server-koa": "^2.14.2",
+    "graphql": "^15.0.0",
+    "koa": "^2.11.0",
+    "koa-body": "^4.1.1",
+    "koa-router": "^8.0.8"
  },
  "devDependencies": {
-    "@types/koa": "^2.13.6",
-    "@types/koa-bodyparser": "^4.3.10",
-    "@types/koa__cors": "^4.0.0",
-    "@types/koa__router": "^12.0.0",
-    "@types/supertest": "^2.0.10",
+    "@types/koa": "^2.11.3",
+    "@types/koa-router": "^7.4.0",
+    "@types/supertest": "^2.0.9",
    "supertest": "^4.0.2",
-    "ts-node-dev": "^1.0.0-pre.60"
+    "ts-node-dev": "^1.0.0-pre.44"
  }
 }
@@ -1,5 +1,4 @@
 import { createUnitTestEntityCompanionProvider } from '@expo/entity';
-import { v4 as uuidv4 } from 'uuid';

 import NoteEntity from '../entities/NoteEntity';
 import { UserViewerContext } from '../viewerContexts';
@@ -7,18 +6,17 @@ import { UserViewerContext } from '../viewerContexts';
 describe(NoteEntity, () => {
  test('demonstrate usage of business logic test utilities', async () => {
    const companionProvider = createUnitTestEntityCompanionProvider();
-    const userId = uuidv4();
-    const viewerContext = new UserViewerContext(companionProvider, userId);
+    const viewerContext = new UserViewerContext(companionProvider, '4');

    const createdEntityResult = await NoteEntity.creator(viewerContext)
-      .setField('userID', userId)
+      .setField('userID', '4')
      .setField('body', 'image')
      .setField('title', 'page')
      .createAsync();
    expect(createdEntityResult.ok).toBe(true);

    const createdEntityResultImpersonate = await NoteEntity.creator(viewerContext)
-      .setField('userID', uuidv4()) // a different user
+      .setField('userID', '5')
      .setField('body', 'image')
      .setField('title', 'page')
      .createAsync();
@@ -1,23 +1,20 @@
 import http from 'http';
 import request from 'supertest';
-import { v4 as uuidv4 } from 'uuid';

-import createAppAsync from '../app';
+import app from '../app';

 describe('graphql', () => {
  it('allows CRUD of user notes', async () => {
-    const app = await createAppAsync();
    const server = request(http.createServer(app.callback()));

-    const userId = uuidv4();
-    const responseEmpty = await server.post('/graphql').set('totally-secure-user-id', userId).send({
+    const responseEmpty = await server.post('/graphql').set('totally-secure-user-id', '4').send({
      query: `query { me { notes { id } } }`,
    });
    expect(responseEmpty.body.data.me.notes).toEqual([]);

    const createResponse1 = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($note: NoteInput!) { addNote(note: $note) { id, title, body } }`,
        variables: {
@@ -34,7 +31,7 @@ describe('graphql', () => {

    const createResponse2 = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($note: NoteInput!) { addNote(note: $note) { id, title, body } }`,
        variables: {
@@ -45,17 +42,14 @@ describe('graphql', () => {
        },
      });

-    const responseLength2 = await server
-      .post('/graphql')
-      .set('totally-secure-user-id', userId)
-      .send({
-        query: `query { me { notes { id } } }`,
-      });
+    const responseLength2 = await server.post('/graphql').set('totally-secure-user-id', '4').send({
+      query: `query { me { notes { id } } }`,
+    });
    expect(responseLength2.body.data.me.notes).toHaveLength(2);

    const responseGetSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `query($id: ID!) { noteByID(id: $id) { id, title, body } }`,
        variables: {
@@ -70,7 +64,7 @@ describe('graphql', () => {

    const responseUpdateSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($id: ID!, $note: NoteInput!) { updateNote(id: $id, note: $note) { id, title, body } }`,
        variables: {
@@ -90,7 +84,7 @@ describe('graphql', () => {

    const responseDeleteSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($id: ID!) { deleteNote(id: $id) { id, title, body } }`,
        variables: {
@@ -108,17 +102,13 @@ describe('graphql', () => {
      body: 'boarding',
    });

-    const responseLength1 = await server
-      .post('/graphql')
-      .set('totally-secure-user-id', userId)
-      .send({
-        query: `query { me { notes { id } } }`,
-      });
+    const responseLength1 = await server.post('/graphql').set('totally-secure-user-id', '4').send({
+      query: `query { me { notes { id } } }`,
+    });
    expect(responseLength1.body.data.me.notes).toHaveLength(1);
  });

  it('disallows anonymous note creation', async () => {
-    const app = await createAppAsync();
    const server = request(http.createServer(app.callback()));
    const createResponse1 = await server.post('/graphql').send({
      query: `mutation($note: NoteInput!) { addNote(note: $note) { id, title, body } }`,
@@ -135,14 +125,11 @@ describe('graphql', () => {
  });

  it('disallows cross-user note impersonation', async () => {
-    const app = await createAppAsync();
    const server = request(http.createServer(app.callback()));

-    const userId = uuidv4();
-    const userId2 = uuidv4();
    const createResponse1 = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($note: NoteInput!) { addNote(note: $note) { id, title, body } }`,
        variables: {
@@ -156,7 +143,7 @@ describe('graphql', () => {
    // notes are public
    const responseGetSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId2)
+      .set('totally-secure-user-id', '5')
      .send({
        query: `query($id: ID!) { noteByID(id: $id) { id, title, body } }`,
        variables: {
@@ -172,7 +159,7 @@ describe('graphql', () => {
    // but can only be updated by the owner
    const responseUpdateSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId2)
+      .set('totally-secure-user-id', '5')
      .send({
        query: `mutation($id: ID!, $note: NoteInput!) { updateNote(id: $id, note: $note) { id, title, body } }`,
        variables: {
@@ -1,92 +1,73 @@
 import http from 'http';
 import request from 'supertest';
-import { v4 as uuidv4 } from 'uuid';

-import createAppAsync from '../app';
+import app from '../app';

 describe('notesRouter', () => {
  it('returns empty array for logged-out', async () => {
-    const app = await createAppAsync();
    const response = await request(http.createServer(app.callback())).get('/notes/').send();
    expect(response.body.notes).toEqual([]);
  });

  it('allows CRUD of user notes', async () => {
-    const app = await createAppAsync();
    const server = request(http.createServer(app.callback()));
-
-    const userId = uuidv4();
-
-    const responseEmpty = await server.get('/notes/').set('totally-secure-user-id', userId).send();
+    const responseEmpty = await server.get('/notes/').set('totally-secure-user-id', '4').send();
    expect(responseEmpty.body.notes).toEqual([]);

-    const createResponse1 = await server
-      .post('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send({
-        title: 'track',
-        body: 'language',
-      });
+    const createResponse1 = await server.post('/notes/').set('totally-secure-user-id', '4').send({
+      title: 'track',
+      body: 'language',
+    });
    expect(createResponse1.body.note).toMatchObject({
-      userID: userId,
+      userID: '4',
      title: 'track',
      body: 'language',
    });

-    const createResponse2 = await server
-      .post('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send({
-        title: 'nine',
-        body: 'lotion',
-      });
+    const createResponse2 = await server.post('/notes/').set('totally-secure-user-id', '4').send({
+      title: 'nine',
+      body: 'lotion',
+    });

-    const responseLength2 = await server
-      .get('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send();
+    const responseLength2 = await server.get('/notes/').set('totally-secure-user-id', '4').send();
    expect(responseLength2.body.notes).toHaveLength(2);

    const responseGetSingle = await server
      .get(`/notes/${createResponse2.body.note.id}`)
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send();
    expect(responseGetSingle.body.note).toMatchObject({
      id: createResponse2.body.note.id,
-      userID: userId,
+      userID: '4',
      title: 'nine',
      body: 'lotion',
    });

    const responseUpdateSingle = await server
      .put(`/notes/${createResponse2.body.note.id}`)
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        title: 'wave',
        body: 'boarding',
      });
    expect(responseUpdateSingle.body.note).toMatchObject({
      id: responseGetSingle.body.note.id,
-      userID: userId,
+      userID: '4',
      title: 'wave',
      body: 'boarding',
    });

    const responseDeleteSingle = await server
      .delete(`/notes/${createResponse2.body.note.id}`)
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send();
    expect(responseDeleteSingle.body.status).toEqual('ok');

-    const responseLength1 = await server
-      .get('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send();
+    const responseLength1 = await server.get('/notes/').set('totally-secure-user-id', '4').send();
    expect(responseLength1.body.notes).toHaveLength(1);
  });

  it('disallows anonymous note creation', async () => {
-    const app = await createAppAsync();
    const server = request(http.createServer(app.callback()));
    const createResponse1 = await server.post('/notes/').send({
      title: 'track',
@@ -97,30 +78,24 @@ describe('notesRouter', () => {
  });

  it('disallows cross-user note impersonation', async () => {
-    const app = await createAppAsync();
    const server = request(http.createServer(app.callback()));
-    const userId = uuidv4();
-    const userId2 = uuidv4();
-    const createResponse1 = await server
-      .post('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send({
-        title: 'track',
-        body: 'language',
-      });
+    const createResponse1 = await server.post('/notes/').set('totally-secure-user-id', '4').send({
+      title: 'track',
+      body: 'language',
+    });
    expect(createResponse1.ok).toBe(true);

    // notes are public
    const responseGetSingleOtherUser = await server
      .get(`/notes/${createResponse1.body.note.id}`)
-      .set('totally-secure-user-id', userId2)
+      .set('totally-secure-user-id', '5')
      .send();
    expect(responseGetSingleOtherUser.ok).toBe(true);

    // but can only be updated by the owner
    const responseUpdateSingle = await server
      .put(`/notes/${createResponse1.body.note.id}`)
-      .set('totally-secure-user-id', userId2)
+      .set('totally-secure-user-id', '5')
      .send({
        title: 'wave',
        body: 'boarding',
@@ -15,8 +15,8 @@ import { v4 as uuidv4 } from 'uuid';
 const dbObjects: Readonly<{ [key: string]: any }>[] = [];

 export class InMemoryDatabaseAdapterProvider implements IEntityDatabaseAdapterProvider {
-  getDatabaseAdapter<TFields extends Record<string, any>>(
-    entityConfiguration: EntityConfiguration<TFields>,
+  getDatabaseAdapter<TFields>(
+    entityConfiguration: EntityConfiguration<TFields>
  ): EntityDatabaseAdapter<TFields> {
    return new InMemoryDatabaseAdapter(entityConfiguration);
  }
@@ -26,7 +26,7 @@ export class InMemoryDatabaseAdapterProvider implements IEntityDatabaseAdapterPr
 * In-memory database adapter for entity for the purposes of this example. Normally `@expo/entity-database-adapter-knex`
 * or another production adapter would be used. Very similar to StubDatabaseAdapter but shared in a way more akin to a normal database.
 */
-class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatabaseAdapter<T> {
+class InMemoryDatabaseAdapter<T> extends EntityDatabaseAdapter<T> {
  protected getFieldTransformerMap(): FieldTransformerMap {
    return new Map();
  }
@@ -35,13 +35,13 @@ class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatab
    _queryInterface: any,
    _tableName: string,
    tableField: string,
-    tableValues: readonly any[],
+    tableValues: readonly any[]
  ): Promise<object[]> {
    return tableValues.reduce((acc, fieldValue) => {
      return acc.concat(
        dbObjects.filter((obj) => {
          return obj[tableField] === fieldValue;
-        }),
+        })
      );
    }, []);
  }
@@ -52,13 +52,13 @@ class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatab
      order: OrderByOrdering;
    }[],
    objectA: { [key: string]: any },
-    objectB: { [key: string]: any },
+    objectB: { [key: string]: any }
  ): 0 | 1 | -1 {
    if (orderBys.length === 0) {
      return 0;
    }

-    const currentOrderBy = orderBys[0]!;
+    const currentOrderBy = orderBys[0];
    const aField = objectA[currentOrderBy.columnName];
    const bField = objectB[currentOrderBy.columnName];
    switch (currentOrderBy.order) {
@@ -66,14 +66,14 @@ class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatab
        return aField > bField
          ? -1
          : aField < bField
-            ? 1
-            : this.compareByOrderBys(orderBys.slice(1), objectA, objectB);
+          ? 1
+          : this.compareByOrderBys(orderBys.slice(1), objectA, objectB);
      case OrderByOrdering.ASCENDING:
        return bField > aField
          ? -1
          : bField < aField
-            ? 1
-            : this.compareByOrderBys(orderBys.slice(1), objectA, objectB);
+          ? 1
+          : this.compareByOrderBys(orderBys.slice(1), objectA, objectB);
    }
  }

@@ -82,7 +82,7 @@ class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatab
    _tableName: string,
    tableFieldSingleValueEqualityOperands: TableFieldSingleValueEqualityCondition[],
    tableFieldMultiValueEqualityOperands: TableFieldMultiValueEqualityCondition[],
-    querySelectionModifiers: TableQuerySelectionModifiers,
+    querySelectionModifiers: TableQuerySelectionModifiers
  ): Promise<object[]> {
    let filteredObjects = dbObjects;
    for (const { tableField, tableValue } of tableFieldSingleValueEqualityOperands) {
@@ -96,7 +96,7 @@ class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatab
    const orderBy = querySelectionModifiers.orderBy;
    if (orderBy !== undefined) {
      filteredObjects = filteredObjects.sort((a, b) =>
-        InMemoryDatabaseAdapter.compareByOrderBys(orderBy, a, b),
+        InMemoryDatabaseAdapter.compareByOrderBys(orderBy, a, b)
      );
    }

@@ -118,7 +118,7 @@ class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatab
    _tableName: string,
    _rawWhereClause: string,
    _bindings: object | any[],
-    _querySelectionModifiers: TableQuerySelectionModifiers,
+    _querySelectionModifiers: TableQuerySelectionModifiers
  ): Promise<object[]> {
    throw new Error('Raw WHERE clauses not supported for InMemoryDatabaseAdapter');
  }
@@ -126,12 +126,12 @@ class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatab
  protected async insertInternalAsync(
    _queryInterface: any,
    _tableName: string,
-    object: object,
+    object: object
  ): Promise<object[]> {
    const configurationPrivate = this['entityConfiguration'] as EntityConfiguration<T>;
    const idField = getDatabaseFieldForEntityField(
      configurationPrivate,
-      configurationPrivate.idField,
+      configurationPrivate.idField
    );
    const objectToInsert = {
      [idField]: uuidv4(),
@@ -146,7 +146,7 @@ class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatab
    _tableName: string,
    tableIdField: string,
    id: any,
-    object: object,
+    object: object
  ): Promise<object[]> {
    // SQL does not support empty updates, mirror behavior here for better test simulation
    if (Object.keys(object).length === 0) {
@@ -161,14 +161,14 @@ class InMemoryDatabaseAdapter<T extends Record<string, any>> extends EntityDatab
      ...dbObjects[objectIndex],
      ...object,
    };
-    return [dbObjects[objectIndex]!];
+    return [dbObjects[objectIndex]];
  }

  protected async deleteInternalAsync(
    _queryInterface: any,
    _tableName: string,
    tableIdField: string,
-    id: any,
+    id: any
  ): Promise<number> {
    const objectIndex = dbObjects.findIndex((obj) => {
      return obj[tableIdField] === id;
@@ -1,19 +1,18 @@
-import { EntityQueryContextProvider, TransactionConfig } from '@expo/entity';
+import {
+  IEntityQueryContextProvider,
+  EntityQueryContext,
+  EntityNonTransactionalQueryContext,
+  EntityTransactionalQueryContext,
+} from '@expo/entity';

-export default class InMemoryQueryContextProvider extends EntityQueryContextProvider {
-  protected getQueryInterface(): any {
-    return {};
+export default class InMemoryQueryContextProvider implements IEntityQueryContextProvider {
+  getRegularEntityQueryContext(): EntityQueryContext {
+    return new EntityNonTransactionalQueryContext({});
  }

-  protected createTransactionRunner<T>(
-    _transactionConfig?: TransactionConfig,
-  ): (transactionScope: (queryInterface: any) => Promise<T>) => Promise<T> {
-    return (transactionScope) => Promise.resolve(transactionScope({}));
-  }
-
-  protected createNestedTransactionRunner<T>(
-    _outerQueryInterface: any,
-  ): (transactionScope: (queryInterface: any) => Promise<T>) => Promise<T> {
-    return (transactionScope) => Promise.resolve(transactionScope({}));
+  async runInTransactionAsync<T>(
+    transactionScope: (queryContext: EntityQueryContext) => Promise<T>
+  ): Promise<T> {
+    return await transactionScope(new EntityTransactionalQueryContext({}));
  }
 }
@@ -1,10 +1,8 @@
-import { ApolloServer } from '@apollo/server';
-import { koaMiddleware } from '@as-integrations/koa';
 import { EntityCompanionProvider } from '@expo/entity';
-import cors from '@koa/cors';
-import Router from '@koa/router';
+import { ApolloServer } from 'apollo-server-koa';
 import Koa from 'koa';
-import bodyParser from 'koa-bodyparser';
+import koaBody from 'koa-body';
+import KoaRouter from 'koa-router';

 import { entityCompanionMiddleware, viewerContextMiddleware } from './middleware';
 import notesRouter from './routers/notesRouter';
@@ -23,40 +21,31 @@ export type ExampleState = {
  entityCompanionProvider: EntityCompanionProvider; // entityCompanionMiddleware
 };

-export default async function createAppAsync(): Promise<Koa<ExampleState, ExampleContext>> {
-  const app = new Koa<ExampleState, ExampleContext>();
+const app = new Koa();

-  // initialze the entity framework for each request
-  app.use(entityCompanionMiddleware);
+// body parsing for POST/PUT requests
+app.use(koaBody());

-  // generate a viewer context for each request
-  app.use(viewerContextMiddleware);
+// initialze the entity framework for each request
+app.use(entityCompanionMiddleware);

-  app.use(cors());
+// generate a viewer context for each request
+app.use(viewerContextMiddleware);

-  // body parsing for POST/PUT requests
-  app.use(bodyParser());
+// serve routes that make use of the viewer context
+const router = new KoaRouter<ExampleState>();
+router.use(notesRouter.routes());
+app.use(router.routes()).use(router.allowedMethods());

-  // serve routes that make use of the viewer context
-  const router = new Router<ExampleState, ExampleContext>();
+const server = new ApolloServer({
+  typeDefs,
+  resolvers,
+  context: ({ ctx }) => {
+    return {
+      viewerContext: ctx.state.viewerContext,
+    };
+  },
+});
+app.use(server.getMiddleware({ cors: false, disableHealthCheck: true, bodyParserConfig: false }));

-  // normal API routes
-  router.use(notesRouter.routes());
-
-  // GraphQL routes
-  const server = new ApolloServer({
-    typeDefs,
-    resolvers,
-  });
-  await server.start();
-  router.post(
-    '/graphql',
-    koaMiddleware(server, {
-      context: async ({ ctx }) => ({ viewerContext: (ctx as ExampleContext).state.viewerContext }),
-    }),
-  );
-
-  app.use(router.routes()).use(router.allowedMethods());
-
-  return app;
-}
+export default app;
@@ -3,6 +3,8 @@ import {
  NoOpEntityMetricsAdapter,
  EntityCompanionProvider,
  InMemoryFullCacheStubCacheAdapterProvider,
+  CacheAdapterFlavor,
+  DatabaseAdapterFlavor,
 } from '@expo/entity';

 import { InMemoryDatabaseAdapterProvider } from './adapters/InMemoryDatabaseAdapter';
@@ -15,30 +17,24 @@ import InMemoryQueryContextProvider from './adapters/InMemoryQueryContextProvide
 * One EntityCompanionProvider should be created per-request.
 */
 export const createEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter(),
+  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
 ): EntityCompanionProvider => {
  return new EntityCompanionProvider(
    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        // An in-memory DB is used for demonstration purposes, but generally this would be
-        // instantiated with PostgresEntityDatabaseAdapter and PostgresEntityQueryContextProvider
-        {
-          adapterProvider: new InMemoryDatabaseAdapterProvider(),
-          queryContextProvider: new InMemoryQueryContextProvider(),
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'redis',
-        // An in-memory cache is used for demonstration purposes, but generally this would be
-        // instantiated with a RedisCacheAdapterProvider
-        {
-          cacheAdapterProvider: new InMemoryFullCacheStubCacheAdapterProvider(),
-        },
-      ],
-    ]),
+    {
+      // An in-memory DB is used for demonstration purposes, but generally this would be
+      // instantiated with PostgresEntityDatabaseAdapter and PostgresEntityQueryContextProvider
+      [DatabaseAdapterFlavor.POSTGRES]: {
+        adapterProvider: new InMemoryDatabaseAdapterProvider(),
+        queryContextProvider: new InMemoryQueryContextProvider(),
+      },
+    },
+    {
+      // An in-memory cache is used for demonstration purposes, but generally this would be
+      // instantiated with a RedisCacheAdapterProvider
+      [CacheAdapterFlavor.REDIS]: {
+        cacheAdapterProvider: new InMemoryFullCacheStubCacheAdapterProvider(),
+      },
+    }
  );
 };
@@ -3,7 +3,6 @@ import {
  ReadonlyEntity,
  EntityQueryContext,
  RuleEvaluationResult,
-  EntityPrivacyPolicyEvaluationContext,
 } from '@expo/entity';

 import { ExampleViewerContext } from '../viewerContexts';
@@ -23,10 +22,9 @@ import { ExampleViewerContext } from '../viewerContexts';
 * Otherwise, it defers to the next rule in the policy.
 */
 export default class AllowIfUserOwnerPrivacyRule<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
-  TEntity extends ReadonlyEntity<TFields, TID, ExampleViewerContext>,
-  TSelectedFields extends keyof TFields = keyof TFields,
+  TFields,
+  TID,
+  TEntity extends ReadonlyEntity<TFields, TID, ExampleViewerContext>
 > extends PrivacyPolicyRule<TFields, TID, ExampleViewerContext, TEntity> {
  constructor(private readonly entityOwnerField: keyof TFields) {
    super();
@@ -35,14 +33,7 @@ export default class AllowIfUserOwnerPrivacyRule<
  async evaluateAsync(
    viewerContext: ExampleViewerContext,
    _queryContext: EntityQueryContext,
-    _evaluationContext: EntityPrivacyPolicyEvaluationContext<
-      TFields,
-      TID,
-      ExampleViewerContext,
-      TEntity,
-      TSelectedFields
-    >,
-    entity: TEntity,
+    entity: TEntity
  ): Promise<RuleEvaluationResult> {
    if (viewerContext.isUserViewerContext()) {
      if (String(entity.getField(this.entityOwnerField)) === viewerContext.userID) {
@@ -3,11 +3,13 @@ import {
  EntityCompanionDefinition,
  EntityConfiguration,
  UUIDField,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  StringField,
 } from '@expo/entity';

-import NotePrivacyPolicy from './NotePrivacyPolicy';
 import { ExampleViewerContext } from '../viewerContexts';
+import NotePrivacyPolicy from './NotePrivacyPolicy';

 export interface NoteFields {
  id: string;
@@ -20,41 +22,43 @@ export interface NoteFields {
 * A simple entity representing a "notes" table/collection. Each note has an owner, title, and body.
 */
 export default class NoteEntity extends Entity<NoteFields, string, ExampleViewerContext> {
-  /**
-   * The companion provides configuration instructions to the Entity framework for this type
-   * of entity. In some languages, this would be representable as "abstract" static members
-   * of the class itself, but TypeScript disallows static generic and abstract methods.
-   */
-  static defineCompanionDefinition(): EntityCompanionDefinition<
+  static getCompanionDefinition(): EntityCompanionDefinition<
    NoteFields,
    string,
    ExampleViewerContext,
    NoteEntity,
    NotePrivacyPolicy
  > {
-    return {
-      entityClass: NoteEntity,
-      entityConfiguration: new EntityConfiguration<NoteFields>({
-        idField: 'id',
-        tableName: 'notes',
-        schema: {
-          id: new UUIDField({
-            columnName: 'id',
-          }),
-          userID: new UUIDField({
-            columnName: 'user_id',
-          }),
-          title: new StringField({
-            columnName: 'title',
-          }),
-          body: new StringField({
-            columnName: 'body',
-          }),
-        },
-        databaseAdapterFlavor: 'postgres',
-        cacheAdapterFlavor: 'redis',
-      }),
-      privacyPolicyClass: NotePrivacyPolicy,
-    };
+    return noteEntityCompanion;
  }
 }
+
+/**
+ * The companion provides configuration instructions to the Entity framework for this type
+ * of entity. In some languages, this would be representable as "abstract" static members
+ * of the class itself, but TypeScript disallows static generic and abstract methods.
+ */
+export const noteEntityCompanion = {
+  entityClass: NoteEntity,
+  entityConfiguration: new EntityConfiguration<NoteFields>({
+    idField: 'id',
+    tableName: 'notes',
+    schema: {
+      id: new UUIDField({
+        columnName: 'id',
+      }),
+      userID: new UUIDField({
+        columnName: 'user_id',
+      }),
+      title: new StringField({
+        columnName: 'title',
+      }),
+      body: new StringField({
+        columnName: 'body',
+      }),
+    },
+  }),
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
+  privacyPolicyClass: NotePrivacyPolicy,
+};
@@ -1,8 +1,8 @@
 import { EntityPrivacyPolicy, AlwaysAllowPrivacyPolicyRule } from '@expo/entity';

+import { ExampleViewerContext } from '../viewerContexts';
 import AllowIfUserOwnerPrivacyRule from './AllowIfUserOwnerPrivacyRule';
 import NoteEntity, { NoteFields } from './NoteEntity';
-import { ExampleViewerContext } from '../viewerContexts';

 /**
 * For purposes of this demonstration, notes are considered public and can only be mutated by the owner.
@@ -13,16 +13,16 @@ export default class NotePrivacyPolicy extends EntityPrivacyPolicy<
  ExampleViewerContext,
  NoteEntity
 > {
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<NoteFields, string, ExampleViewerContext, NoteEntity>(),
  ];
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AllowIfUserOwnerPrivacyRule<NoteFields, string, NoteEntity>('userID'),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AllowIfUserOwnerPrivacyRule<NoteFields, string, NoteEntity>('userID'),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AllowIfUserOwnerPrivacyRule<NoteFields, string, NoteEntity>('userID'),
  ];
 }
@@ -1,8 +1,3 @@
-import createAppAsync from './app';
+import app from './app';

-async function main(): Promise<void> {
-  const app = await createAppAsync();
-  app.listen(3000);
-}
-
-main();
+app.listen(3000);
@@ -1,4 +1,4 @@
-import Router from '@koa/router';
+import KoaRouter from 'koa-router';

 import { ExampleState, ExampleContext } from '../app';
 import NoteEntity from '../entities/NoteEntity';
@@ -11,11 +11,11 @@ import NoteEntity from '../entities/NoteEntity';
 * PUT /notes/:id - update a note
 * DELETE /notes/:id - delete a note
 */
-const router = new Router<ExampleState, ExampleContext>({
+const router = new KoaRouter<ExampleState>({
  prefix: '/notes',
 });

-router.get('/', async (ctx) => {
+router.get('/', async (ctx: ExampleContext) => {
  const viewerContext = ctx.state.viewerContext;
  let notes: readonly NoteEntity[] = [];
  if (viewerContext.isUserViewerContext()) {
@@ -28,14 +28,11 @@ router.get('/', async (ctx) => {
  };
 });

-router.get('/:id', async (ctx) => {
+router.get('/:id', async (ctx: ExampleContext) => {
  const viewerContext = ctx.state.viewerContext;
-  const noteResult = await NoteEntity.loader(viewerContext)
-    .withAuthorizationResults()
-    .loadByIDAsync(ctx.params['id']!);
+  const noteResult = await NoteEntity.loader(viewerContext).loadByIDAsync(ctx.params.id);
  if (!noteResult.ok) {
    ctx.throw(403, noteResult.reason);
-    return;
  }

  ctx.body = {
@@ -43,17 +40,16 @@ router.get('/:id', async (ctx) => {
  };
 });

-router.post('/', async (ctx) => {
+router.post('/', async (ctx: ExampleContext) => {
  const viewerContext = ctx.state.viewerContext;
  if (!viewerContext.isUserViewerContext()) {
    // Only logged-in users can create notes. Technically this
    // would be handled by the privacy policy (it would fail)
    // but we throw here for better type safety.
    ctx.throw(403);
-    return;
  }

-  const { title, body } = ctx.request.body as any;
+  const { title, body } = ctx.request.body;

  const createResult = await NoteEntity.creator(viewerContext)
    .setField('userID', viewerContext.userID)
@@ -62,7 +58,6 @@ router.post('/', async (ctx) => {
    .createAsync();
  if (!createResult.ok) {
    ctx.throw(403, createResult.reason);
-    return;
  }

  ctx.body = {
@@ -70,16 +65,13 @@ router.post('/', async (ctx) => {
  };
 });

-router.put('/:id', async (ctx) => {
+router.put('/:id', async (ctx: ExampleContext) => {
  const viewerContext = ctx.state.viewerContext;
-  const { title, body } = ctx.request.body as any;
+  const { title, body } = ctx.request.body;

-  const noteLoadResult = await NoteEntity.loader(viewerContext)
-    .withAuthorizationResults()
-    .loadByIDAsync(ctx.params['id']!);
+  const noteLoadResult = await NoteEntity.loader(viewerContext).loadByIDAsync(ctx.params.id);
  if (!noteLoadResult.ok) {
    ctx.throw(403, noteLoadResult.reason);
-    return;
  }

  const noteUpdateResult = await NoteEntity.updater(noteLoadResult.value)
@@ -88,7 +80,6 @@ router.put('/:id', async (ctx) => {
    .updateAsync();
  if (!noteUpdateResult.ok) {
    ctx.throw(403, noteUpdateResult.reason);
-    return;
  }

  ctx.body = {
@@ -96,21 +87,17 @@ router.put('/:id', async (ctx) => {
  };
 });

-router.delete('/:id', async (ctx) => {
+router.delete('/:id', async (ctx: ExampleContext) => {
  const viewerContext = ctx.state.viewerContext;

-  const noteLoadResult = await NoteEntity.loader(viewerContext)
-    .withAuthorizationResults()
-    .loadByIDAsync(ctx.params['id']!);
+  const noteLoadResult = await NoteEntity.loader(viewerContext).loadByIDAsync(ctx.params.id);
  if (!noteLoadResult.ok) {
    ctx.throw(403, noteLoadResult.reason);
-    return;
  }

  const noteDeleteResult = await NoteEntity.deleteAsync(noteLoadResult.value);
  if (!noteDeleteResult.ok) {
    ctx.throw(403, noteDeleteResult.reason);
-    return;
  }

  ctx.body = {
@@ -1,4 +1,4 @@
-import { IResolvers, IObjectTypeResolver } from '@graphql-tools/utils';
+import { gql, IResolvers, IResolverObject } from 'apollo-server-koa';

 import NoteEntity from './entities/NoteEntity';
 import { ExampleViewerContext } from './viewerContexts';
@@ -7,7 +7,7 @@ type GraphqlContext = {
  viewerContext: ExampleViewerContext;
 };

-export const typeDefs = `#graphql
+export const typeDefs = gql`
  type User {
    id: ID!
    notes: [Note]!
@@ -48,7 +48,7 @@ export const resolvers: IResolvers<any, GraphqlContext> = {
    async noteByID(_root, args, { viewerContext }) {
      return await NoteEntity.loader(viewerContext).enforcing().loadByIDAsync(args.id);
    },
-  } as IObjectTypeResolver<any, GraphqlContext>,
+  } as IResolverObject<any, GraphqlContext>,

  User: {
    id: (root) => root,
@@ -57,14 +57,14 @@ export const resolvers: IResolvers<any, GraphqlContext> = {
        .enforcing()
        .loadManyByFieldEqualingAsync('userID', root);
    },
-  } as IObjectTypeResolver<string, GraphqlContext>,
+  } as IResolverObject<string, GraphqlContext>,

  Note: {
    id: (root) => root.getID(),
    title: (root) => root.getField('title'),
    body: (root) => root.getField('body'),
    user: (root) => root.getField('userID'),
-  } as IObjectTypeResolver<NoteEntity, GraphqlContext>,
+  } as IResolverObject<NoteEntity, GraphqlContext>,

  Mutation: {
    async addNote(_root, args, { viewerContext }) {
@@ -94,5 +94,5 @@ export const resolvers: IResolvers<any, GraphqlContext> = {
      await NoteEntity.enforceDeleteAsync(existingNote);
      return existingNote;
    },
-  } as IObjectTypeResolver<any, GraphqlContext>,
+  } as IResolverObject<any, GraphqlContext>,
 };
@@ -17,10 +17,7 @@ export abstract class ExampleViewerContext extends ViewerContext {
 * Represents a logged-in user.
 */
 export class UserViewerContext extends ExampleViewerContext {
-  constructor(
-    entityCompanionProvider: EntityCompanionProvider,
-    public userID: string,
-  ) {
+  constructor(entityCompanionProvider: EntityCompanionProvider, public userID: string) {
    super(entityCompanionProvider);
  }
 }
@@ -1,370 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.37.0](https://github.com/expo/entity/compare/v0.36.0...v0.37.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* update barrels ([#241](https://github.com/expo/entity/issues/241)) ([8c5f81b](https://github.com/expo/entity/commit/8c5f81bcca107e9b7bbea5f0ab41b0105057806e))
-
-
-
-
-
-# [0.36.0](https://github.com/expo/entity/compare/v0.35.0...v0.36.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* always reload entity after update since cascading changes may have changed it since commit ([#233](https://github.com/expo/entity/issues/233)) ([7c3c985](https://github.com/expo/entity/commit/7c3c9854a4dd91d4b73ebdb18bdeadea8b63f4c7))
-
-
-
-
-
-# [0.35.0](https://github.com/expo/entity/compare/v0.34.0...v0.35.0) (2024-04-11)
-
-
-### Bug Fixes
-
-* Revert: require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([1bdfbd6](https://github.com/expo/entity/commit/1bdfbd6b562d1200e4029df0533b5adb2d917831))
-
-
-
-
-
-# [0.34.0](https://github.com/expo/entity/compare/v0.33.0...v0.34.0) (2024-04-11)
-
-
-### Features
-
-* require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([8b0b31f](https://github.com/expo/entity/commit/8b0b31fdde5bd565aa527719003ef283a45f55cc))
-
-
-
-
-
-# [0.33.0](https://github.com/expo/entity/compare/v0.32.0...v0.33.0) (2023-10-06)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.32.0](https://github.com/expo/entity/compare/v0.31.1...v0.32.0) (2023-06-10)
-
-
-### Bug Fixes
-
-* remove unused field from redis configuration ([#213](https://github.com/expo/entity/issues/213)) ([503a2fb](https://github.com/expo/entity/commit/503a2fb6a8d57f6a09f6da99daf5ab92fc3e7945))
-
-
-### Features
-
-* entity companion definition static thunk ([#210](https://github.com/expo/entity/issues/210)) ([4b18010](https://github.com/expo/entity/commit/4b18010d42be50ef329f428b08330e21bf676586))
-
-
-
-
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-
-### Features
-
-* change redis cache adapter to use redis-like interface ([#200](https://github.com/expo/entity/issues/200)) ([e381f5b](https://github.com/expo/entity/commit/e381f5b2acfc17dcade2cf6e8506fa1c1c255e73))
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-
-### Features
-
-* add EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY ([#178](https://github.com/expo/entity/issues/178)) ([a0c35dd](https://github.com/expo/entity/commit/a0c35ddd7bca05d0c3f41dcf48e16d058918231c))
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Bug Fixes
-
-* upgrade ioredis, knex, and pg ([#125](https://github.com/expo/entity/issues/125)) ([7c43edf](https://github.com/expo/entity/commit/7c43edf3de37e8af13e2a99bd44f03f54803d9b9))
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-
-### Features
-
-* add basic field type runtime validators ([#113](https://github.com/expo/entity/issues/113)) ([6c4d4b0](https://github.com/expo/entity/commit/6c4d4b03b5404dd776a12c5eb6f0af77a8c964f8))
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* move runInTransaction to ViewerContext ([#108](https://github.com/expo/entity/issues/108)) ([b7309e1](https://github.com/expo/entity/commit/b7309e18a2dd780b64cd306d566de1f12bf8df3a))
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Bug Fixes
-
-* remove any cast from EntityLoader ([#100](https://github.com/expo/entity/issues/100)) ([b8e07f9](https://github.com/expo/entity/commit/b8e07f9ddc4077768980c000d61f5ddcc824e2e3))
-
-
-
-
-
-# [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure again ([#93](https://github.com/expo/entity/issues/93)) ([012c05d](https://github.com/expo/entity/commit/012c05d62d2ecd559eb331c6ca358052bfe66dc8))
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure ([#89](https://github.com/expo/entity/issues/89)) ([cca8fc1](https://github.com/expo/entity/commit/cca8fc19870057ebc7033081b59fab4a142fbf1a))
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* move cache invalidation to after transaction commit ([#77](https://github.com/expo/entity/issues/77)) ([dbc3c81](https://github.com/expo/entity/commit/dbc3c81b359a668b5134189ce6de49b5893bb5e7))
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
@@ -1,5 +0,0 @@
-# `@expo/entity-full-integration-tests`
-
-Full integration tests for testing combinations of database and cache adapters.
-
-[Documentation](https://expo.github.io/entity/modules/_expo_entity_full_integration_tests.html)
@@ -1,34 +0,0 @@
-{
-  "name": "@expo/entity-full-integration-tests",
-  "private": true,
-  "version": "0.37.0",
-  "description": "Full redis and knex integration tests for the entity framework",
-  "scripts": {
-    "tsc": "tsc",
-    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js --passWithNoTests",
-    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "barrelsby --config ../../.barrelsby.json"
-  },
-  "engines": {
-    "node": ">=16"
-  },
-  "keywords": [
-    "entity"
-  ],
-  "author": "Expo",
-  "license": "MIT",
-  "peerDependencies": {
-    "@expo/entity": "*",
-    "@expo/entity-cache-adapter-redis": "*",
-    "@expo/entity-database-adapter-knex": "*"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.37.0",
-    "@expo/entity-cache-adapter-redis": "^0.37.0",
-    "@expo/entity-database-adapter-knex": "^0.37.0"
-  }
-}
@@ -1,209 +0,0 @@
-import {
-  EntityPrivacyPolicy,
-  ViewerContext,
-  AlwaysAllowPrivacyPolicyRule,
-  Entity,
-  EntityCompanionDefinition,
-  EntityConfiguration,
-  UUIDField,
-  StringField,
-} from '@expo/entity';
-import { GenericRedisCacheContext } from '@expo/entity-cache-adapter-redis';
-import Redis from 'ioredis';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
-import { URL } from 'url';
-
-import { createFullIntegrationTestEntityCompanionProvider } from '../testfixtures/createFullIntegrationTestEntityCompanionProvider';
-
-interface TestFields {
-  id: string;
-  other_string: string;
-  third_string: string;
-}
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  TestFields,
-  string,
-  ViewerContext,
-  TestEntity
-> {
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-}
-
-class TestEntity extends Entity<TestFields, string, ViewerContext> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    TestFields,
-    string,
-    ViewerContext,
-    TestEntity,
-    TestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: TestEntity,
-      entityConfiguration: testEntityConfiguration,
-      privacyPolicyClass: TestEntityPrivacyPolicy,
-    };
-  }
-}
-
-const testEntityConfiguration = new EntityConfiguration<TestFields>({
-  idField: 'id',
-  tableName: 'testentities',
-  schema: {
-    id: new UUIDField({
-      columnName: 'id',
-      cache: true,
-    }),
-    other_string: new StringField({
-      columnName: 'other_string',
-      cache: true,
-    }),
-    third_string: new StringField({
-      columnName: 'third_string',
-    }),
-  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
-});
-
-async function createOrTruncatePostgresTables(knex: Knex): Promise<void> {
-  await knex.schema.createTable('testentities', (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-    table.string('other_string').notNullable();
-    table.string('third_string').notNullable();
-  });
-  await knex.into('testentities').truncate();
-}
-
-async function dropPostgresTable(knex: Knex): Promise<void> {
-  if (await knex.schema.hasTable('testentities')) {
-    await knex.schema.dropTable('testentities');
-  }
-}
-
-describe('Entity cache inconsistency', () => {
-  let knexInstance: Knex;
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  let genericRedisCacheContext: GenericRedisCacheContext;
-
-  beforeAll(() => {
-    knexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-    });
-    genericRedisCacheContext = {
-      redisClient,
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await createOrTruncatePostgresTables(knexInstance);
-    await redisClient.flushdb();
-  });
-
-  afterAll(async () => {
-    await dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
-    redisClient.disconnect();
-  });
-
-  test('lots of updates in long-ish running transactions', async () => {
-    const viewerContext = new ViewerContext(
-      createFullIntegrationTestEntityCompanionProvider(knexInstance, genericRedisCacheContext),
-    );
-
-    const entity1 = await TestEntity.creator(viewerContext)
-      .setField('other_string', 'hello')
-      .setField('third_string', 'initial')
-      .enforceCreateAsync();
-
-    // put entities in cache and dataloader
-    await TestEntity.loader(viewerContext).enforcing().loadByIDAsync(entity1.getID());
-    await TestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByFieldEqualingAsync('other_string', 'hello');
-
-    let openBarrier1: () => void;
-    const barrier1 = new Promise<void>((resolve) => {
-      openBarrier1 = resolve;
-    });
-
-    let openBarrier2: () => void;
-    const barrier2 = new Promise<void>((resolve) => {
-      openBarrier2 = resolve;
-    });
-
-    await Promise.all([
-      // do a load after the transaction below updates the entity but before transaction commits to ensure
-      // that the cache is cleared after the transaction commits rather than in the middle where the changes
-      // may not be visible by other requests (ViewerContexts) which would cache the incorrect
-      // value during the read-through cache.
-      (async () => {
-        await barrier1;
-
-        const viewerContextInternal = new ViewerContext(
-          createFullIntegrationTestEntityCompanionProvider(knexInstance, genericRedisCacheContext),
-        );
-        await TestEntity.loader(viewerContextInternal).enforcing().loadByIDAsync(entity1.getID());
-
-        openBarrier2!();
-      })(),
-      viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
-        'postgres',
-        async (queryContext) => {
-          await TestEntity.updater(entity1, queryContext)
-            .setField('third_string', 'updated')
-            .enforceUpdateAsync();
-
-          openBarrier1();
-
-          // wait for to ensure the transaction isn't committed until after load above occurs
-          await barrier2;
-        },
-      ),
-    ]);
-
-    // ensure cache consistency
-    const viewerContextLast = new ViewerContext(
-      createFullIntegrationTestEntityCompanionProvider(knexInstance, genericRedisCacheContext),
-    );
-
-    const loadedById = await TestEntity.loader(viewerContextLast)
-      .enforcing()
-      .loadByIDAsync(entity1.getID());
-    const loadedByField = await TestEntity.loader(viewerContextLast)
-      .enforcing()
-      .loadByFieldEqualingAsync('other_string', 'hello');
-
-    expect(loadedById.getField('third_string')).toEqual('updated');
-    expect(loadedByField!.getField('third_string')).toEqual('updated');
-  });
-});
@@ -1,107 +0,0 @@
-import { ViewerContext } from '@expo/entity';
-import { GenericRedisCacheContext } from '@expo/entity-cache-adapter-redis';
-import Redis from 'ioredis';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
-import { URL } from 'url';
-
-import ChildEntity from './entities/ChildEntity';
-import ParentEntity from './entities/ParentEntity';
-import { createFullIntegrationTestEntityCompanionProvider } from '../testfixtures/createFullIntegrationTestEntityCompanionProvider';
-
-async function createOrTruncatePostgresTables(knex: Knex): Promise<void> {
-  await knex.schema.createTable('parents', (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-  });
-  await knex.into('parents').truncate();
-
-  await knex.schema.createTable('children', (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-    table.uuid('parent_id').references('id').inTable('parents').onDelete('cascade').unique();
-  });
-  await knex.into('children').truncate();
-}
-
-async function dropPostgresTable(knex: Knex): Promise<void> {
-  if (await knex.schema.hasTable('children')) {
-    await knex.schema.dropTable('children');
-  }
-  if (await knex.schema.hasTable('parents')) {
-    await knex.schema.dropTable('parents');
-  }
-}
-
-describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
-  let knexInstance: Knex;
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  let genericRedisCacheContext: GenericRedisCacheContext;
-
-  beforeAll(() => {
-    knexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-    });
-    genericRedisCacheContext = {
-      redisClient,
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await createOrTruncatePostgresTables(knexInstance);
-    await redisClient.flushdb();
-  });
-
-  afterAll(async () => {
-    await dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
-    redisClient.disconnect();
-  });
-
-  describe('EntityEdgeDeletionBehavior.INVALIDATE_CACHE', () => {
-    it('invalidates the cache', async () => {
-      const viewerContext = new ViewerContext(
-        createFullIntegrationTestEntityCompanionProvider(knexInstance, genericRedisCacheContext),
-      );
-
-      const parent = await ParentEntity.creator(viewerContext).enforceCreateAsync();
-      const child = await ChildEntity.creator(viewerContext)
-        .setField('parent_id', parent.getID())
-        .enforceCreateAsync();
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
-      ).resolves.not.toBeNull();
-      await expect(
-        ChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', parent.getID()),
-      ).resolves.not.toBeNull();
-
-      await ParentEntity.enforceDeleteAsync(parent);
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
-      ).resolves.toBeNull();
-
-      await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
-      ).resolves.toBeNull();
-    });
-  });
-});
@@ -1,149 +0,0 @@
-import {
-  EntityPrivacyPolicy,
-  ViewerContext,
-  AlwaysAllowPrivacyPolicyRule,
-  Entity,
-  EntityCompanionDefinition,
-  EntityConfiguration,
-  UUIDField,
-} from '@expo/entity';
-import { GenericRedisCacheContext } from '@expo/entity-cache-adapter-redis';
-import Redis from 'ioredis';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
-import { URL } from 'url';
-import { v4 as uuidv4 } from 'uuid';
-
-import { createFullIntegrationTestEntityCompanionProvider } from '../testfixtures/createFullIntegrationTestEntityCompanionProvider';
-
-interface TestFields {
-  id: string;
-}
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  TestFields,
-  string,
-  ViewerContext,
-  TestEntity
-> {
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-}
-
-class TestEntity extends Entity<TestFields, string, ViewerContext> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    TestFields,
-    string,
-    ViewerContext,
-    TestEntity,
-    TestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: TestEntity,
-      entityConfiguration: testEntityConfiguration,
-      privacyPolicyClass: TestEntityPrivacyPolicy,
-    };
-  }
-}
-
-const testEntityConfiguration = new EntityConfiguration<TestFields>({
-  idField: 'id',
-  tableName: 'testentities',
-  schema: {
-    id: new UUIDField({
-      columnName: 'id',
-      cache: true,
-    }),
-  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
-});
-
-async function createOrTruncatePostgresTables(knex: Knex): Promise<void> {
-  await knex.schema.createTable('testentities', (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-  });
-  await knex.into('testentities').truncate();
-}
-
-async function dropPostgresTable(knex: Knex): Promise<void> {
-  if (await knex.schema.hasTable('testentities')) {
-    await knex.schema.dropTable('testentities');
-  }
-}
-
-describe('Entity integrity', () => {
-  let knexInstance: Knex;
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  let genericRedisCacheContext: GenericRedisCacheContext;
-
-  beforeAll(() => {
-    knexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-    });
-    genericRedisCacheContext = {
-      redisClient,
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await createOrTruncatePostgresTables(knexInstance);
-    await redisClient.flushdb();
-  });
-
-  afterAll(async () => {
-    await dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
-    redisClient.disconnect();
-  });
-
-  test('cannot update ID', async () => {
-    const viewerContext = new ViewerContext(
-      createFullIntegrationTestEntityCompanionProvider(knexInstance, genericRedisCacheContext),
-    );
-
-    const entity1 = await TestEntity.creator(viewerContext).enforceCreateAsync();
-
-    await expect(
-      TestEntity.updater(entity1).setField('id', uuidv4()).enforceUpdateAsync(),
-    ).rejects.toThrow('id field updates not supported: (entityClass = TestEntity)');
-
-    // ensure cache consistency
-    const viewerContextLast = new ViewerContext(
-      createFullIntegrationTestEntityCompanionProvider(knexInstance, genericRedisCacheContext),
-    );
-
-    const loadedById = await TestEntity.loader(viewerContextLast)
-      .enforcing()
-      .loadByIDAsync(entity1.getID());
-
-    expect(loadedById.getID()).toEqual(entity1.getID());
-  });
-});
@@ -1,259 +0,0 @@
-import {
-  EntityPrivacyPolicy,
-  ViewerContext,
-  AlwaysAllowPrivacyPolicyRule,
-  Entity,
-  EntityCompanionDefinition,
-  EntityConfiguration,
-  UUIDField,
-  EntityEdgeDeletionBehavior,
-} from '@expo/entity';
-import { GenericRedisCacheContext } from '@expo/entity-cache-adapter-redis';
-import Redis from 'ioredis';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
-import { URL } from 'url';
-import { v4 as uuidv4 } from 'uuid';
-
-import { createFullIntegrationTestEntityCompanionProvider } from '../testfixtures/createFullIntegrationTestEntityCompanionProvider';
-
-interface CategoryFields {
-  id: string;
-  parent_other_id: string;
-}
-
-interface OtherFields {
-  id: string;
-  parent_category_id: string;
-}
-
-class PrivacyPolicy extends EntityPrivacyPolicy<any, string, ViewerContext, any> {
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any>(),
-  ];
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any>(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any>(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any>(),
-  ];
-}
-
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-const makeEntityClasses = async (knex: Knex, edgeDeletionBehavior: EntityEdgeDeletionBehavior) => {
-  const categoriesTableName = uuidv4();
-  const othersTableName = uuidv4();
-
-  class CategoryEntity extends Entity<CategoryFields, string, ViewerContext> {
-    static defineCompanionDefinition(): EntityCompanionDefinition<
-      CategoryFields,
-      string,
-      ViewerContext,
-      CategoryEntity,
-      PrivacyPolicy
-    > {
-      return {
-        entityClass: CategoryEntity,
-        entityConfiguration: categoryEntityConfiguration,
-        privacyPolicyClass: PrivacyPolicy,
-      };
-    }
-  }
-
-  class OtherEntity extends Entity<OtherFields, string, ViewerContext> {
-    static defineCompanionDefinition(): EntityCompanionDefinition<
-      OtherFields,
-      string,
-      ViewerContext,
-      OtherEntity,
-      PrivacyPolicy
-    > {
-      return {
-        entityClass: OtherEntity,
-        entityConfiguration: otherEntityConfiguration,
-        privacyPolicyClass: PrivacyPolicy,
-      };
-    }
-  }
-
-  const categoryEntityConfiguration = new EntityConfiguration<CategoryFields>({
-    idField: 'id',
-    tableName: categoriesTableName,
-    inboundEdges: [OtherEntity],
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      parent_other_id: new UUIDField({
-        columnName: 'parent_other_id',
-        cache: true,
-        association: {
-          associatedEntityClass: OtherEntity,
-          edgeDeletionBehavior,
-        },
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  });
-
-  const otherEntityConfiguration = new EntityConfiguration<OtherFields>({
-    idField: 'id',
-    tableName: othersTableName,
-    inboundEdges: [CategoryEntity],
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      parent_category_id: new UUIDField({
-        columnName: 'parent_category_id',
-        cache: true,
-        association: {
-          associatedEntityClass: CategoryEntity,
-          edgeDeletionBehavior,
-        },
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  });
-
-  await knex.schema.createTable(categoriesTableName, (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-  });
-
-  await knex.schema.createTable(othersTableName, (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-    if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE_ONLY) {
-      table
-        .uuid('parent_category_id')
-        .references('id')
-        .inTable(categoriesTableName)
-        .unique()
-        .onDelete('cascade');
-    } else if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY) {
-      table
-        .uuid('parent_category_id')
-        .references('id')
-        .inTable(categoriesTableName)
-        .unique()
-        .onDelete('set null');
-    } else {
-      table.uuid('parent_category_id').unique();
-    }
-  });
-
-  await knex.schema.alterTable(categoriesTableName, (table) => {
-    if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE_ONLY) {
-      table
-        .uuid('parent_other_id')
-        .references('id')
-        .inTable(othersTableName)
-        .unique()
-        .onDelete('cascade');
-    } else if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY) {
-      table
-        .uuid('parent_other_id')
-        .references('id')
-        .inTable(othersTableName)
-        .unique()
-        .onDelete('set null');
-    } else {
-      table.uuid('parent_other_id').unique();
-    }
-  });
-
-  return { CategoryEntity, OtherEntity };
-};
-describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
-  let knexInstance: Knex;
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  let genericRedisCacheContext: GenericRedisCacheContext;
-
-  beforeAll(() => {
-    knexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-    });
-    genericRedisCacheContext = {
-      redisClient,
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  afterAll(async () => {
-    await knexInstance.destroy();
-    redisClient.disconnect();
-  });
-
-  it.each([
-    EntityEdgeDeletionBehavior.CASCADE_DELETE,
-    EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE_ONLY,
-    EntityEdgeDeletionBehavior.SET_NULL,
-    EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY,
-  ])('behavior: %p', async (edgeDeletionBehavior) => {
-    const { CategoryEntity, OtherEntity } = await makeEntityClasses(
-      knexInstance,
-      edgeDeletionBehavior,
-    );
-
-    const viewerContext = new ViewerContext(
-      createFullIntegrationTestEntityCompanionProvider(knexInstance, genericRedisCacheContext),
-    );
-
-    const category1 = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
-    const other1 = await OtherEntity.creator(viewerContext)
-      .setField('parent_category_id', category1.getID())
-      .enforceCreateAsync();
-    await CategoryEntity.updater(category1)
-      .setField('parent_other_id', other1.getID())
-      .enforceUpdateAsync();
-
-    await CategoryEntity.enforceDeleteAsync(category1);
-
-    if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.SET_NULL) {
-      await expect(
-        CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(category1.getID()),
-      ).resolves.toBeNull();
-      const otherLoaded = await OtherEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(other1.getID());
-      expect(otherLoaded?.getField('parent_category_id')).toBeNull();
-    } else if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY) {
-      await expect(
-        CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(category1.getID()),
-      ).resolves.toBeNull();
-      const otherLoaded = await OtherEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(other1.getID());
-      expect(otherLoaded?.getField('parent_category_id')).toBeNull();
-    } else {
-      await expect(
-        CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(category1.getID()),
-      ).resolves.toBeNull();
-      await expect(
-        OtherEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(other1.getID()),
-      ).resolves.toBeNull();
-    }
-  });
-});
@@ -1,67 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  Entity,
-  EntityCompanionDefinition,
-  EntityConfiguration,
-  EntityEdgeDeletionBehavior,
-  EntityPrivacyPolicy,
-  UUIDField,
-  ViewerContext,
-} from '@expo/entity';
-
-import ParentEntity from './ParentEntity';
-
-interface ChildFields {
-  id: string;
-  parent_id: string;
-}
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<any, string, ViewerContext, any, any> {
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-}
-
-export default class ChildEntity extends Entity<ChildFields, string, ViewerContext> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    ChildFields,
-    string,
-    ViewerContext,
-    ChildEntity,
-    TestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: ChildEntity,
-      entityConfiguration: new EntityConfiguration<ChildFields>({
-        idField: 'id',
-        tableName: 'children',
-        schema: {
-          id: new UUIDField({
-            columnName: 'id',
-            cache: true,
-          }),
-          parent_id: new UUIDField({
-            columnName: 'parent_id',
-            cache: true,
-            association: {
-              associatedEntityClass: ParentEntity,
-              edgeDeletionBehavior: EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE_ONLY,
-            },
-          }),
-        },
-        databaseAdapterFlavor: 'postgres',
-        cacheAdapterFlavor: 'redis',
-      }),
-      privacyPolicyClass: TestEntityPrivacyPolicy,
-    };
-  }
-}
@@ -1,58 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  Entity,
-  EntityCompanionDefinition,
-  EntityConfiguration,
-  EntityPrivacyPolicy,
-  UUIDField,
-  ViewerContext,
-} from '@expo/entity';
-
-import ChildEntity from './ChildEntity';
-
-interface ParentFields {
-  id: string;
-}
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<any, string, ViewerContext, any, any> {
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-}
-
-export default class ParentEntity extends Entity<ParentFields, string, ViewerContext> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    ParentFields,
-    string,
-    ViewerContext,
-    ParentEntity,
-    TestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: ParentEntity,
-      entityConfiguration: new EntityConfiguration<ParentFields>({
-        idField: 'id',
-        tableName: 'parents',
-        inboundEdges: [ChildEntity],
-        schema: {
-          id: new UUIDField({
-            columnName: 'id',
-            cache: true,
-          }),
-        },
-        databaseAdapterFlavor: 'postgres',
-        cacheAdapterFlavor: 'redis',
-      }),
-      privacyPolicyClass: TestEntityPrivacyPolicy,
-    };
-  }
-}
@@ -1,41 +0,0 @@
-import {
-  NoOpEntityMetricsAdapter,
-  IEntityMetricsAdapter,
-  EntityCompanionProvider,
-} from '@expo/entity';
-import {
-  GenericRedisCacheContext,
-  RedisCacheAdapterProvider,
-} from '@expo/entity-cache-adapter-redis';
-import {
-  PostgresEntityDatabaseAdapterProvider,
-  PostgresEntityQueryContextProvider,
-} from '@expo/entity-database-adapter-knex';
-import { Knex } from 'knex';
-
-export const createFullIntegrationTestEntityCompanionProvider = (
-  knex: Knex,
-  genericRedisCacheContext: GenericRedisCacheContext,
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter(),
-): EntityCompanionProvider => {
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new PostgresEntityDatabaseAdapterProvider(),
-          queryContextProvider: new PostgresEntityQueryContextProvider(knex),
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'redis',
-        {
-          cacheAdapterProvider: new RedisCacheAdapterProvider(genericRedisCacheContext),
-        },
-      ],
-    ]),
-  );
-};
@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "noEmit": true,
-  },
-  "include": ["src"]
-}
@@ -1,202 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.37.0](https://github.com/expo/entity/compare/v0.36.0...v0.37.0) (2024-06-12)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.36.0](https://github.com/expo/entity/compare/v0.35.0...v0.36.0) (2024-06-12)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.35.0](https://github.com/expo/entity/compare/v0.34.0...v0.35.0) (2024-04-11)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.34.0](https://github.com/expo/entity/compare/v0.33.0...v0.34.0) (2024-04-11)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.33.0](https://github.com/expo/entity/compare/v0.32.0...v0.33.0) (2023-10-06)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.32.0](https://github.com/expo/entity/compare/v0.31.1...v0.32.0) (2023-06-10)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-
-### Features
-
-* add IP support ([#138](https://github.com/expo/entity/issues/138)) ([1405a91](https://github.com/expo/entity/commit/1405a9126ee3a56c3e2a38bf3b697283744f5b5d))
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* lands @expo/entity-ip-address-field ([#138](https://github.com/expo/entity/pull/138))
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* expose describeFieldTestCase for use in other packages ([#139](https://github.com/expo/entity/issues/139)) ([1220477](https://github.com/expo/entity/commit/1220477aa331349b482ad015b44f76fa2bda7b90))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-* use better QueryContext types for transactional triggers and validators ([#136](https://github.com/expo/entity/issues/136)) ([5c7efe1](https://github.com/expo/entity/commit/5c7efe1678424ff907687e9327175bdc2538c3e0))
@@ -1,3 +0,0 @@
-# @expo/entity-ip-address-field
-
-A package containing the IP address EntityField definitions for @expo/entity. Supports addresses with either IPv4 or IPv6 syntax.
@@ -1,37 +0,0 @@
-{
-  "name": "@expo/entity-ip-address-field",
-  "version": "0.37.0",
-  "description": "IP address EntityField definitions for @expo/entity",
-  "files": [
-    "build",
-    "src"
-  ],
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "tsc": "tsc",
-    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js",
-    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --delete"
-  },
-  "engines": {
-    "node": ">=16"
-  },
-  "keywords": [
-    "entity"
-  ],
-  "author": "Expo",
-  "license": "MIT",
-  "dependencies": {
-    "ip-address": "^8.1.0"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.37.0",
-    "@types/jsbn": "^1.2.29"
-  },
-  "peerDependencies": {
-    "@expo/entity": "*"
-  }
-}
@@ -1,8 +0,0 @@
-import { EntityFieldDefinition } from '@expo/entity';
-import { Address4, Address6 } from 'ip-address';
-
-export class IPAddressField extends EntityFieldDefinition<string> {
-  protected validateInputValueInternal(value: string): boolean {
-    return Address4.isValid(value) || Address6.isValid(value);
-  }
-}
@@ -1,16 +0,0 @@
-import { describeFieldTestCase } from '@expo/entity';
-
-import { IPAddressField } from '../EntityFields';
-
-describeFieldTestCase(
-  new IPAddressField({ columnName: 'wat' }),
-  [
-    '192.168.1.1',
-    '198.24.10.0/24',
-    '10.0.0.0',
-    '0:1:2:3:4:5:6:7',
-    '1:2:3:4:5:6:7:8/64',
-    'fedc:ba98:7654:3210:fedc:ba98:7654:3210',
-  ],
-  ['', 'abs', '0.0.0.x/0', '123.21.23', '1:2:3:4:5:6', '198.10/8'],
-);
@@ -1,7 +0,0 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @module @expo/entity-ip-address-field
- */
-
-export * from './EntityFields';
@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "build",
-  },
-  "include": ["src"]
-}
@@ -1,154 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.37.0](https://github.com/expo/entity/compare/v0.36.0...v0.37.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* update barrels ([#241](https://github.com/expo/entity/issues/241)) ([8c5f81b](https://github.com/expo/entity/commit/8c5f81bcca107e9b7bbea5f0ab41b0105057806e))
-
-
-
-
-
-# [0.36.0](https://github.com/expo/entity/compare/v0.35.0...v0.36.0) (2024-06-12)
-
-
-### Bug Fixes
-
-* constrain entity fields type to string-keyed object ([#235](https://github.com/expo/entity/issues/235)) ([7e2cea1](https://github.com/expo/entity/commit/7e2cea16973a0ae1917f867cd25d6ef7c8eaecef))
-
-
-
-
-
-# [0.35.0](https://github.com/expo/entity/compare/v0.34.0...v0.35.0) (2024-04-11)
-
-
-### Bug Fixes
-
-* Revert: require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([1bdfbd6](https://github.com/expo/entity/commit/1bdfbd6b562d1200e4029df0533b5adb2d917831))
-
-
-
-
-
-# [0.34.0](https://github.com/expo/entity/compare/v0.33.0...v0.34.0) (2024-04-11)
-
-
-### Features
-
-* require explicit query context specification ([#219](https://github.com/expo/entity/issues/219)) ([8b0b31f](https://github.com/expo/entity/commit/8b0b31fdde5bd565aa527719003ef283a45f55cc))
-
-
-
-
-
-# [0.33.0](https://github.com/expo/entity/compare/v0.32.0...v0.33.0) (2023-10-06)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.32.0](https://github.com/expo/entity/compare/v0.31.1...v0.32.0) (2023-06-10)
-
-
-### Features
-
-* entity companion definition static thunk ([#210](https://github.com/expo/entity/issues/210)) ([4b18010](https://github.com/expo/entity/commit/4b18010d42be50ef329f428b08330e21bf676586))
-
-
-
-
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
@@ -1,24 +0,0 @@
-# `@expo/entity-secondary-cache-local-memory`
-
-Cross-request [LRU](https://github.com/isaacs/node-lru-cache) secondary cache for `@expo/entity`. Use
-this cache with caution - it is nonstandard. The cache is shared between requests in the node process.
-
-[Documentation](https://expo.github.io/entity/modules/_expo_secondary_cache_local_memory.html)
-
-## Usage
-
-1. Create a concrete implementation of abstract class `EntitySecondaryCacheLoader`, in this example `TestEntitySecondaryCacheLoader`. The underlying data can come from anywhere, but an entity is constructed from the data and then authorized for the viewer.
-2. Create an instance of your `EntitySecondaryCacheLoader`, passing in a `LocalMemorySecondaryEntityCache`.
-    ```typescript
-    const secondaryCacheLoader = new TestSecondaryLocalMemoryCacheLoader(
-      new LocalMemorySecondaryEntityCache(
-        GenericLocalMemoryCacher.createLRUCache<LocalMemoryTestEntityFields>({})
-      ),
-      LocalMemoryTestEntity.loader(viewerContext)
-    );
-    ```
-3. Load entities through it:
-    ```typescript
-    const loadParams = { id: createdEntity.getID() };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    ```
@@ -1,38 +0,0 @@
-{
-  "name": "@expo/entity-secondary-cache-local-memory",
-  "version": "0.37.0",
-  "description": "Local memory secondary cache for @expo/entity",
-  "files": [
-    "build",
-    "src"
-  ],
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "tsc": "tsc",
-    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js --passWithNoTests",
-    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "barrelsby --config ../../.barrelsby.json"
-  },
-  "engines": {
-    "node": ">=16"
-  },
-  "keywords": [
-    "entity"
-  ],
-  "author": "Expo",
-  "license": "MIT",
-  "peerDependencies": {
-    "@expo/entity": "*",
-    "@expo/entity-cache-adapter-local-memory": "*"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.37.0",
-    "@expo/entity-cache-adapter-local-memory": "^0.37.0",
-    "nullthrows": "^1.1.1"
-  }
-}
@@ -1,26 +0,0 @@
-import { EntityConfiguration, GenericSecondaryEntityCache } from '@expo/entity';
-import {
-  GenericLocalMemoryCacher,
-  LocalMemoryCache,
-} from '@expo/entity-cache-adapter-local-memory';
-
-/**
- * A local memory GenericSecondaryEntityCache.
- *
- * @remarks
- *
- * TLoadParams must be JSON stringifyable.
- */
-export default class LocalMemorySecondaryEntityCache<
-  TFields extends Record<string, any>,
-  TLoadParams,
-> extends GenericSecondaryEntityCache<TFields, TLoadParams> {
-  constructor(
-    entityConfiguration: EntityConfiguration<TFields>,
-    localMemoryCache: LocalMemoryCache<TFields>,
-  ) {
-    super(new GenericLocalMemoryCacher(entityConfiguration, localMemoryCache), (params) =>
-      JSON.stringify(params),
-    );
-  }
-}
@@ -1,228 +0,0 @@
-import {
-  EntitySecondaryCacheLoader,
-  mapMapAsync,
-  ViewerContext,
-  NoOpEntityMetricsAdapter,
-  IEntityMetricsAdapter,
-  EntityCompanionProvider,
-  StubQueryContextProvider,
-  StubDatabaseAdapterProvider,
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-} from '@expo/entity';
-import {
-  GenericLocalMemoryCacher,
-  LocalMemoryCacheAdapterProvider,
-} from '@expo/entity-cache-adapter-local-memory';
-import nullthrows from 'nullthrows';
-
-import LocalMemorySecondaryEntityCache from '../LocalMemorySecondaryEntityCache';
-
-export type LocalMemoryTestEntityFields = {
-  id: string;
-  name: string;
-};
-
-export default class LocalMemoryTestEntity extends Entity<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static defineCompanionDefinition(): EntityCompanionDefinition<
-    LocalMemoryTestEntityFields,
-    string,
-    ViewerContext,
-    LocalMemoryTestEntity,
-    LocalMemoryTestEntityPrivacyPolicy
-  > {
-    return {
-      entityClass: LocalMemoryTestEntity,
-      entityConfiguration: localMemoryTestEntityConfiguration,
-      privacyPolicyClass: LocalMemoryTestEntityPrivacyPolicy,
-    };
-  }
-}
-
-export class LocalMemoryTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext,
-  LocalMemoryTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-}
-
-export const localMemoryTestEntityConfiguration =
-  new EntityConfiguration<LocalMemoryTestEntityFields>({
-    idField: 'id',
-    tableName: 'local_memory_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-      }),
-      name: new StringField({
-        columnName: 'name',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'local-memory',
-  });
-
-export const createTestEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter(),
-): EntityCompanionProvider => {
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new StubDatabaseAdapterProvider(),
-          queryContextProvider: StubQueryContextProvider,
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'local-memory',
-        {
-          cacheAdapterProvider: LocalMemoryCacheAdapterProvider.createProviderWithOptions(),
-        },
-      ],
-    ]),
-  );
-};
-
-class TestViewerContext extends ViewerContext {}
-
-type TestLoadParams = { id: string };
-
-const FAKE_ID = 'fake';
-
-class TestSecondaryLocalMemoryCacheLoader extends EntitySecondaryCacheLoader<
-  TestLoadParams,
-  LocalMemoryTestEntityFields,
-  string,
-  TestViewerContext,
-  LocalMemoryTestEntity,
-  LocalMemoryTestEntityPrivacyPolicy
-> {
-  public databaseLoadCount = 0;
-
-  protected async fetchObjectsFromDatabaseAsync(
-    loadParamsArray: readonly Readonly<TestLoadParams>[],
-  ): Promise<ReadonlyMap<Readonly<TestLoadParams>, Readonly<LocalMemoryTestEntityFields> | null>> {
-    this.databaseLoadCount += loadParamsArray.length;
-
-    const emptyMap = new Map(loadParamsArray.map((p) => [p, null]));
-    return await mapMapAsync(emptyMap, async (_value, loadParams) => {
-      if (loadParams.id === FAKE_ID) {
-        return null;
-      }
-      return nullthrows(
-        (
-          await this.entityLoader
-            .enforcing()
-            .loadManyByFieldEqualityConjunctionAsync([
-              { fieldName: 'id', fieldValue: loadParams.id },
-            ])
-        )[0],
-      ).getAllFields();
-    });
-  }
-}
-
-describe(LocalMemorySecondaryEntityCache, () => {
-  it('Loads through secondary loader, caches, and invalidates', async () => {
-    const viewerContext = new TestViewerContext(createTestEntityCompanionProvider());
-
-    const createdEntity = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'wat')
-      .enforceCreateAsync();
-
-    const secondaryCacheLoader = new TestSecondaryLocalMemoryCacheLoader(
-      new LocalMemorySecondaryEntityCache(
-        localMemoryTestEntityConfiguration,
-        GenericLocalMemoryCacher.createLRUCache<LocalMemoryTestEntityFields>({}),
-      ),
-      LocalMemoryTestEntity.loader(viewerContext),
-    );
-
-    const loadParams = { id: createdEntity.getID() };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID(),
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(1);
-
-    const results2 = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results2.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID(),
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(1);
-
-    await secondaryCacheLoader.invalidateManyAsync([loadParams]);
-
-    const results3 = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results3.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID(),
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(2);
-  });
-
-  it('correctly handles uncached and unfetchable load params', async () => {
-    const viewerContext = new TestViewerContext(createTestEntityCompanionProvider());
-
-    const secondaryCacheLoader = new TestSecondaryLocalMemoryCacheLoader(
-      new LocalMemorySecondaryEntityCache(
-        localMemoryTestEntityConfiguration,
-        GenericLocalMemoryCacher.createLRUCache<LocalMemoryTestEntityFields>({}),
-      ),
-      LocalMemoryTestEntity.loader(viewerContext),
-    );
-
-    const loadParams = { id: FAKE_ID };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(results.size).toBe(1);
-    expect(results.get(loadParams)).toBe(null);
-  });
-});