@furystack/repository 5.0.34 → 6.0.0

package/dist/repository.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"repository.spec.js","sourceRoot":"","sources":["../src/repository.spec.ts"],"names":[],"mappings":";;AAAA,8CAA4C;AAC5C,4CAAwC;AACxC,gCAA6B;AAC7B,0CAA+C;AAC/C,yCAAoC;AAEpC,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,IAAA,aAAK,EAAC,IAAI,iBAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE;YAC1B,MAAM,YAAY;aAEjB;YACD,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,oBAAa,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,CAC9G,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAC/C,CAAA;YAED,MAAM,OAAO,GAAG,CAAC,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;YACnD,MAAM,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,kBAAO,CAAC,CAAA;QACzC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"repository.spec.js","sourceRoot":"","sources":["../src/repository.spec.ts"],"names":[],"mappings":";;AAAA,8CAA4C;AAC5C,4CAAwC;AACxC,uCAAwD;AACxD,0CAAyD;AACzD,yCAAoC;AAEpC,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,IAAA,aAAK,EAAC,IAAI,iBAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE;YAC1B,MAAM,YAAY;aAEjB;YACD,IAAA,eAAQ,EAAC,CAAC,EAAE,IAAI,oBAAa,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;YACzE,IAAA,uBAAa,EAAC,CAAC,CAAC,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YAEtD,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,CAAA;YACpD,MAAM,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,kBAAO,CAAC,CAAA;QACzC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@furystack/repository",
-  "version": "5.0.34",
+  "version": "6.0.0",
   "description": "Repository implementation for FuryStack",
   "main": "dist/index.js",
   "files": [
     "dist",
+    "types",
     "src"
   ],
   "repository": {
@@ -28,15 +29,15 @@
   },
   "homepage": "https://github.com/furystack/furystack",
   "dependencies": {
-    "@furystack/core": "^10.4.10",
-    "@furystack/inject": "^5.0.7",
-    "@furystack/logging": "^2.0.91",
-    "@furystack/utils": "^2.1.0",
-    "tslib": "^2.3.1"
+    "@furystack/core": "^11.0.0",
+    "@furystack/inject": "^6.0.0",
+    "@furystack/logging": "^3.0.0",
+    "@furystack/utils": "^3.0.0",
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@types/jest": "^27.4.1"
   },
-  "typings": "./dist/index.d.ts",
+  "typings": "./types/index.d.ts",
   "gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
 }

package/src/dataset.spec.ts

@@ -1,9 +1,9 @@
 import { Injector } from '@furystack/inject'
 import { using, usingAsync } from '@furystack/utils'
-import { InMemoryStore, WithOptionalId } from '@furystack/core'
+import { InMemoryStore, WithOptionalId, addStore } from '@furystack/core'
 import { Repository } from './repository'
 import { AuthorizationResult, DataSetSettings } from './data-set-setting'
-import './injector-extension'
+import { getDataSetFor, getRepository } from './helpers'
 
 class TestClass {
   public id = 1
@@ -14,37 +14,37 @@ describe('DataSet', () => {
   describe('Construction', () => {
     it('can be retrieved from an extension method with class', () => {
       using(new Injector(), (i) => {
-        i.setupStores((stores) =>
-          stores.addStore(
-            new InMemoryStore({
-              model: TestClass,
-              primaryKey: 'id',
-            }),
-          ),
-        ).setupRepository((r) => r.createDataSet(TestClass, 'id'))
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        addStore(
+          i,
+          new InMemoryStore({
+            model: TestClass,
+            primaryKey: 'id',
+          }),
+        )
+        getRepository(i).createDataSet(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         expect(dataSet.settings.physicalStore.model).toBe(TestClass)
       })
     })
 
     it('can be retrieved from an extension method with string', () => {
       using(new Injector(), (i) => {
-        i.setupStores((stores) =>
-          stores.addStore(
-            new InMemoryStore({
-              model: TestClass,
-              primaryKey: 'id',
-            }),
-          ),
-        ).setupRepository((r) => r.createDataSet(TestClass, 'id'))
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        addStore(
+          i,
+          new InMemoryStore({
+            model: TestClass,
+            primaryKey: 'id',
+          }),
+        )
+        getRepository(i).createDataSet(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         expect(dataSet.settings.physicalStore.model).toBe(TestClass)
       })
     })
 
     it('Should throw if dataset is not registered through extension', () => {
       using(new Injector(), (i) => {
-        expect(() => i.getDataSetFor(TestClass, 'id')).toThrowError('')
+        expect(() => getDataSetFor(i, TestClass, 'id')).toThrowError('')
       })
     })
 
@@ -59,11 +59,11 @@ describe('DataSet', () => {
     describe('Add', () => {
       it('should add an entity if no settings are provided', async () => {
         await usingAsync(new Injector(), async (i) => {
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id'))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+
+          getRepository(i).createDataSet(TestClass, 'id')
 
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           const result = await dataSet.get(i, 1)
           expect(result && result.value).toBe('asd')
@@ -73,10 +73,10 @@ describe('DataSet', () => {
       it('should call the add async authorizer and add the entity on pass', async () => {
         await usingAsync(new Injector(), async (i) => {
           const authorizeAdd = jest.fn(async () => ({ isAllowed: true } as AuthorizationResult))
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeAdd }))
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+
+          getRepository(i).createDataSet(TestClass, 'id', { authorizeAdd })
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           expect(authorizeAdd).toBeCalled()
           const added = await dataSet.get(i, 1)
@@ -87,11 +87,11 @@ describe('DataSet', () => {
       it('should throw if the add authorizer returns a non-valid result and should not add a value to the store', async () => {
         await usingAsync(new Injector(), async (i) => {
           const authorizeAdd = jest.fn(async () => ({ isAllowed: false, message: '...' } as AuthorizationResult))
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeAdd }))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+
+          getRepository(i).createDataSet(TestClass, 'id', { authorizeAdd })
 
-          const dataSet = await i.getDataSetFor(TestClass, 'id')
+          const dataSet = await getDataSetFor(i, TestClass, 'id')
 
           try {
             await dataSet.add(i, { id: 1, value: 'asd' })
@@ -114,11 +114,10 @@ describe('DataSet', () => {
             }),
           ) as any
 
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { modifyOnAdd }))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id', { modifyOnAdd })
 
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           const result = await dataSet.get(i, 1)
           expect(modifyOnAdd).toBeCalled()
@@ -129,15 +128,17 @@ describe('DataSet', () => {
       it('should call the onEntityAdded callback if an entity has been added', async () => {
         await usingAsync(new Injector(), async (i) => {
           expect.assertions(1)
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', {}))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
 
-          i.getDataSetFor(TestClass, 'id').onEntityAdded.subscribe(({ entity }) => {
-            expect(entity.value).toBe('asd')
-          })
+          getRepository(i).createDataSet(TestClass, 'id', {})
+
+          getRepository(i)
+            .getDataSetFor(TestClass, 'id')
+            .onEntityAdded.subscribe(({ entity }) => {
+              expect(entity.value).toBe('asd')
+            })
 
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
         })
       })
@@ -146,11 +147,10 @@ describe('DataSet', () => {
     describe('Update', () => {
       it('should update an entity if no settings are provided', async () => {
         await usingAsync(new Injector(), async (i) => {
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id'))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id')
 
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           await dataSet.update(i, 1, { id: 1, value: 'asd2' })
           const result = await dataSet.get(i, 1)
@@ -161,10 +161,9 @@ describe('DataSet', () => {
       it('should call the authorizeUpdate authorizer and add the entity on pass', async () => {
         await usingAsync(new Injector(), async (i) => {
           const authorizeUpdate = jest.fn(async () => ({ isAllowed: true } as AuthorizationResult))
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeUpdate }))
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id', { authorizeUpdate })
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           await dataSet.update(i, 1, { id: 1, value: 'asd2' })
           expect(authorizeUpdate).toBeCalled()
@@ -178,11 +177,10 @@ describe('DataSet', () => {
           const authorizeUpdateEntity = jest.fn(
             async () => ({ isAllowed: false, message: '...' } as AuthorizationResult),
           )
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeUpdateEntity }))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id', { authorizeUpdateEntity })
 
-          const dataSet = await i.getDataSetFor(TestClass, 'id')
+          const dataSet = await getDataSetFor(i, TestClass, 'id')
 
           try {
             await dataSet.add(i, { id: 1, value: 'asd' })
@@ -199,10 +197,9 @@ describe('DataSet', () => {
       it('should call the authorizeUpdateEntity authorizer and add the entity on pass', async () => {
         await usingAsync(new Injector(), async (i) => {
           const authorizeUpdateEntity = jest.fn(async () => ({ isAllowed: true } as AuthorizationResult))
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeUpdateEntity }))
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id', { authorizeUpdateEntity })
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           await dataSet.update(i, 1, { id: 1, value: 'asd2' })
           expect(authorizeUpdateEntity).toBeCalled()
@@ -214,11 +211,10 @@ describe('DataSet', () => {
       it('should throw if the authorizeUpdate returns a non-valid result and should not update a value to the store', async () => {
         await usingAsync(new Injector(), async (i) => {
           const authorizeUpdate = jest.fn(async () => ({ isAllowed: false, message: '...' } as AuthorizationResult))
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeUpdate }))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id', { authorizeUpdate })
 
-          const dataSet = await i.getDataSetFor(TestClass, 'id')
+          const dataSet = await getDataSetFor(i, TestClass, 'id')
 
           try {
             await dataSet.add(i, { id: 1, value: 'asd' })
@@ -240,11 +236,10 @@ describe('DataSet', () => {
             value: options.entity.value?.toUpperCase(),
           }))
 
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { modifyOnUpdate }))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id', { modifyOnUpdate })
 
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           await dataSet.update(i, 1, { id: 1, value: 'asd2' })
           const result = await dataSet.get(i, 1)
@@ -256,15 +251,16 @@ describe('DataSet', () => {
       it('should publish to the onEntityUpdated observable if an entity has been updated', async () => {
         await usingAsync(new Injector(), async (i) => {
           expect.assertions(1)
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id'))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id')
 
-          i.getDataSetFor(TestClass, 'id').onEntityUpdated.subscribe(({ change }) => {
-            expect(change).toEqual({ id: 1, value: 'asd2' })
-          })
+          getRepository(i)
+            .getDataSetFor(TestClass, 'id')
+            .onEntityUpdated.subscribe(({ change }) => {
+              expect(change).toEqual({ id: 1, value: 'asd2' })
+            })
 
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           await dataSet.update(i, 1, { id: 1, value: 'asd2' })
         })
@@ -274,11 +270,10 @@ describe('DataSet', () => {
     describe('Count', () => {
       it('should return the count if no settings are provided', async () => {
         await usingAsync(new Injector(), async (i) => {
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id'))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id')
 
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           const result = await dataSet.count(i)
           expect(result).toBe(1)
@@ -288,11 +283,10 @@ describe('DataSet', () => {
       it('should return the count if authorizeGet returns valid result', async () => {
         await usingAsync(new Injector(), async (i) => {
           const authorizeGet = jest.fn(async () => ({ isAllowed: true, message: '' }))
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeGet }))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id', { authorizeGet })
 
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           const result = await dataSet.count(i)
           expect(result).toBe(1)
@@ -302,11 +296,10 @@ describe('DataSet', () => {
       it('should throw if authorizeGet returns invalid result', async () => {
         await usingAsync(new Injector(), async (i) => {
           const authorizeGet = jest.fn(async () => ({ isAllowed: false, message: ':(' }))
-          i.setupStores((stores) =>
-            stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-          ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeGet }))
+          addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+          getRepository(i).createDataSet(TestClass, 'id', { authorizeGet })
 
-          const dataSet = i.getDataSetFor(TestClass, 'id')
+          const dataSet = getDataSetFor(i, TestClass, 'id')
           await dataSet.add(i, { id: 1, value: 'asd' })
           try {
             await dataSet.count(i)
@@ -322,11 +315,10 @@ describe('DataSet', () => {
   describe('filter', () => {
     it('should return the unfiltered result if no settings are provided', async () => {
       await usingAsync(new Injector(), async (i) => {
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id'))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id')
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         const result = await dataSet.find(i, {})
         expect(result.length).toBe(1)
@@ -336,11 +328,10 @@ describe('DataSet', () => {
     it('should return the unfiltered result if authorizeGet returns valid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authorizeGet = jest.fn(async () => ({ isAllowed: true, message: '' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeGet }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authorizeGet })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         const result = await dataSet.find(i, {})
         expect(result.length).toBe(1)
@@ -350,11 +341,10 @@ describe('DataSet', () => {
     it('should throw if authorizeGet returns invalid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authorizeGet = jest.fn(async () => ({ isAllowed: false, message: ':(' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeGet }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authorizeGet })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         try {
           await dataSet.find(i, {})
@@ -369,11 +359,10 @@ describe('DataSet', () => {
   describe('get', () => {
     it('should return the entity if no settings are provided', async () => {
       await usingAsync(new Injector(), async (i) => {
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id'))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id')
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         const result = await dataSet.get(i, 1)
         expect(result && result.id).toBe(1)
@@ -383,11 +372,10 @@ describe('DataSet', () => {
     it('should return the entity if authorizeGet returns valid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authorizeGet = jest.fn(async () => ({ isAllowed: true, message: '' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeGet }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authorizeGet })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         const result = await dataSet.get(i, 1)
         expect(result && result.id).toBe(1)
@@ -397,11 +385,10 @@ describe('DataSet', () => {
     it('should throw if authorizeGet returns invalid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authorizeGet = jest.fn(async () => ({ isAllowed: false, message: ':(' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeGet }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authorizeGet })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         try {
           await dataSet.get(i, 1)
@@ -415,11 +402,10 @@ describe('DataSet', () => {
     it('should return the entity if authorizeGetEntity returns valid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authorizeGetEntity = jest.fn(async () => ({ isAllowed: true, message: '' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeGetEntity }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authorizeGetEntity })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         const result = await dataSet.get(i, 1)
         expect(result && result.id).toBe(1)
@@ -429,11 +415,10 @@ describe('DataSet', () => {
     it('should throw if authorizeGetEntity returns invalid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authorizeGetEntity = jest.fn(async () => ({ isAllowed: false, message: ':(' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeGetEntity }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authorizeGetEntity })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         try {
           await dataSet.get(i, 1)
@@ -447,11 +432,10 @@ describe('DataSet', () => {
   describe('remove', () => {
     it('should remove the entity if no settings are provided', async () => {
       await usingAsync(new Injector(), async (i) => {
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id'))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id')
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         await dataSet.remove(i, 1)
         const countValue = await dataSet.count(i)
@@ -462,11 +446,10 @@ describe('DataSet', () => {
     it('should remove the entity if authorizeRemove returns valid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authorizeRemove = jest.fn(async () => ({ isAllowed: true, message: '' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeRemove }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authorizeRemove })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         await dataSet.remove(i, 1)
         const count = await dataSet.count(i)
@@ -477,11 +460,10 @@ describe('DataSet', () => {
     it('should throw if authorizeRemove returns invalid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authorizeRemove = jest.fn(async () => ({ isAllowed: false, message: ':(' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authorizeRemove }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authorizeRemove })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         try {
           await dataSet.remove(i, 1)
@@ -497,11 +479,10 @@ describe('DataSet', () => {
     it('should remove the entity if authroizeRemoveEntity returns valid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authroizeRemoveEntity = jest.fn(async () => ({ isAllowed: true, message: '' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authroizeRemoveEntity }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authroizeRemoveEntity })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         await dataSet.remove(i, 1)
         const count = await dataSet.count(i)
@@ -512,11 +493,10 @@ describe('DataSet', () => {
     it('should throw if authroizeRemoveEntity returns invalid result', async () => {
       await usingAsync(new Injector(), async (i) => {
         const authroizeRemoveEntity = jest.fn(async () => ({ isAllowed: false, message: ':(' }))
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id', { authroizeRemoveEntity }))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id', { authroizeRemoveEntity })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         try {
           await dataSet.remove(i, 1)
@@ -531,15 +511,16 @@ describe('DataSet', () => {
     it('should publish to the onEntityRemoved observable if an entity has been removed', async () => {
       await usingAsync(new Injector(), async (i) => {
         expect.assertions(1)
-        i.setupStores((stores) =>
-          stores.addStore(new InMemoryStore({ model: TestClass, primaryKey: 'id' })),
-        ).setupRepository((repo) => repo.createDataSet(TestClass, 'id'))
+        addStore(i, new InMemoryStore({ model: TestClass, primaryKey: 'id' }))
+        getRepository(i).createDataSet(TestClass, 'id')
 
-        i.getDataSetFor(TestClass, 'id').onEntityRemoved.subscribe(({ key }) => {
-          expect(key).toEqual(1)
-        })
+        getRepository(i)
+          .getDataSetFor(TestClass, 'id')
+          .onEntityRemoved.subscribe(({ key }) => {
+            expect(key).toEqual(1)
+          })
 
-        const dataSet = i.getDataSetFor(TestClass, 'id')
+        const dataSet = getDataSetFor(i, TestClass, 'id')
         await dataSet.add(i, { id: 1, value: 'asd' })
         await dataSet.remove(i, 1)
       })

package/src/helpers.ts

@@ -0,0 +1,24 @@
+import { Constructable } from '@furystack/inject'
+import { Injector } from '@furystack/inject'
+import { Repository } from './repository'
+
+/**
+ * Returns a Repository on an injector
+ *
+ * @param injector The Injector instance
+ * @returns The Repository instance
+ */
+export const getRepository = (injector: Injector) => injector.getInstance(Repository)
+
+/**
+ *
+ * @param injector The Injector instance
+ * @param model The Model
+ * @param primaryKey The Primary Key field
+ * @returns A Repository DataSet for a specific model
+ */
+export const getDataSetFor = <T, TPrimaryKey extends keyof T>(
+  injector: Injector,
+  model: Constructable<T>,
+  primaryKey: TPrimaryKey,
+) => injector.getInstance(Repository).getDataSetFor(model, primaryKey)

package/src/index.ts

@@ -1,4 +1,4 @@
 export * from './repository'
 export * from './data-set'
 export * from './data-set-setting'
-import './injector-extension'
+export * from './helpers'

package/src/repository.spec.ts

@@ -1,7 +1,7 @@
 import { Injector } from '@furystack/inject'
 import { using } from '@furystack/utils'
-import './injector-extension'
-import { InMemoryStore } from '@furystack/core'
+import { getDataSetFor, getRepository } from './helpers'
+import { addStore, InMemoryStore } from '@furystack/core'
 import { DataSet } from './data-set'
 
 describe('Repository', () => {
@@ -10,11 +10,10 @@ describe('Repository', () => {
       class ExampleClass {
         id!: number
       }
-      i.setupStores((sm) => sm.addStore(new InMemoryStore({ model: ExampleClass, primaryKey: 'id' }))).setupRepository(
-        (r) => r.createDataSet(ExampleClass, 'id', {}),
-      )
+      addStore(i, new InMemoryStore({ model: ExampleClass, primaryKey: 'id' }))
+      getRepository(i).createDataSet(ExampleClass, 'id', {})
 
-      const dataSet = i.getDataSetFor(ExampleClass, 'id')
+      const dataSet = getDataSetFor(i, ExampleClass, 'id')
       expect(dataSet).toBeInstanceOf(DataSet)
     })
   })