@furystack/rest-service 12.3.5 → 14.0.0

package/esm/authenticate.spec.js

@@ -1,58 +1,66 @@
 import { IdentityContext } from '@furystack/core';
-import { Injector } from '@furystack/inject';
-import { usingAsync } from '@furystack/utils';
+import { createInjector } from '@furystack/inject';
+import { EventHub, usingAsync } from '@furystack/utils';
 import { describe, expect, it, vi } from 'vitest';
 import { Authenticate } from './authenticate.js';
-import { HttpUserContext } from './http-user-context.js';
+import { HttpUserContext as HttpUserContextToken } from './http-user-context.js';
 import { EmptyResult } from './request-action-implementation.js';
+const makeHttpUserContextStub = (providers) => Object.assign(new EventHub(), {
+    authentication: { authenticationProviders: providers },
+});
 describe('Authenticate', () => {
     const response = {};
     const request = { url: 'http://google.com' };
-    it('Should return 401 without WWW-Authenticate header when no basic-auth provider is registered', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            const isAuthenticatedAction = vi.fn(async () => false);
-            i.setExplicitInstance({ isAuthenticated: isAuthenticatedAction, getCurrentUser: async () => Promise.reject(new Error(':(')) }, IdentityContext);
-            i.setExplicitInstance({
-                authentication: { authenticationProviders: [] },
-            }, HttpUserContext);
-            const exampleAuthenticatedAction = vi.fn(async () => EmptyResult());
-            const authorized = Authenticate()(exampleAuthenticatedAction);
+    it('returns 401 without WWW-Authenticate when no basic-auth provider is registered', async () => {
+        await usingAsync(createInjector(), async (i) => {
+            const isAuthenticated = vi.fn(async () => false);
+            i.bind(IdentityContext, () => ({
+                isAuthenticated,
+                getCurrentUser: () => Promise.reject(new Error(':(')),
+                isAuthorized: () => Promise.resolve(false),
+            }));
+            i.bind(HttpUserContextToken, () => makeHttpUserContextStub([]));
+            const exampleAction = vi.fn(async () => EmptyResult());
+            const authorized = Authenticate()(exampleAction);
             const result = await authorized({ injector: i, request, response });
             expect(result.statusCode).toBe(401);
             expect(result.chunk).toEqual({ error: 'unauthorized' });
             expect(result.headers).toEqual({ 'Content-Type': 'application/json' });
-            expect(exampleAuthenticatedAction).not.toBeCalled();
+            expect(exampleAction).not.toHaveBeenCalled();
         });
     });
-    it('Should return 401 with WWW-Authenticate: Basic header when basic-auth provider is registered', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            const isAuthenticatedAction = vi.fn(async () => false);
-            i.setExplicitInstance({ isAuthenticated: isAuthenticatedAction, getCurrentUser: async () => Promise.reject(new Error(':(')) }, IdentityContext);
-            i.setExplicitInstance({
-                authentication: {
-                    authenticationProviders: [{ name: 'basic-auth', authenticate: async () => null }],
-                },
-            }, HttpUserContext);
-            const exampleAuthenticatedAction = vi.fn(async () => EmptyResult());
-            const authorized = Authenticate()(exampleAuthenticatedAction);
+    it('returns 401 with WWW-Authenticate: Basic when a basic-auth provider is registered', async () => {
+        await usingAsync(createInjector(), async (i) => {
+            const isAuthenticated = vi.fn(async () => false);
+            i.bind(IdentityContext, () => ({
+                isAuthenticated,
+                getCurrentUser: () => Promise.reject(new Error(':(')),
+                isAuthorized: () => Promise.resolve(false),
+            }));
+            i.bind(HttpUserContextToken, () => makeHttpUserContextStub([{ name: 'basic-auth' }]));
+            const exampleAction = vi.fn(async () => EmptyResult());
+            const authorized = Authenticate()(exampleAction);
             const result = await authorized({ injector: i, request, response });
             expect(result.statusCode).toBe(401);
             expect(result.chunk).toEqual({ error: 'unauthorized' });
             expect(result.headers).toEqual({ 'Content-Type': 'application/json', 'WWW-Authenticate': 'Basic' });
-            expect(exampleAuthenticatedAction).not.toBeCalled();
+            expect(exampleAction).not.toHaveBeenCalled();
         });
     });
-    it('Should exec the original action if authorized', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            const isAuthenticatedAction = vi.fn(async () => true);
-            i.setExplicitInstance({ isAuthenticated: isAuthenticatedAction, getCurrentUser: async () => Promise.reject(new Error(':(')) }, IdentityContext);
-            const exampleAuthenticatedAction = vi.fn(async () => EmptyResult());
-            const authorized = Authenticate()(exampleAuthenticatedAction);
-            const params = { injector: i, body: undefined, query: undefined, request, response };
+    it('invokes the wrapped action when the caller is authenticated', async () => {
+        await usingAsync(createInjector(), async (i) => {
+            i.bind(IdentityContext, () => ({
+                isAuthenticated: () => Promise.resolve(true),
+                getCurrentUser: () => Promise.reject(new Error(':(')),
+                isAuthorized: () => Promise.resolve(true),
+            }));
+            const exampleAction = vi.fn(async () => EmptyResult());
+            const authorized = Authenticate()(exampleAction);
+            const params = { injector: i, request, response };
             const result = await authorized(params);
             expect(result.statusCode).toBe(200);
             expect(result.chunk).toBe(undefined);
-            expect(exampleAuthenticatedAction).toBeCalledWith(params);
+            expect(exampleAction).toHaveBeenCalledWith(params);
         });
     });
 });

package/esm/authenticate.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"authenticate.spec.js","sourceRoot":"","sources":["../src/authenticate.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAA;AAEhE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,QAAQ,GAAG,EAA2B,CAAA;IAC5C,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAqB,CAAA;IAE/D,EAAE,CAAC,6FAA6F,EAAE,KAAK,IAAI,EAAE;QAC3G,MAAM,UAAU,CAAC,IAAI,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,qBAAqB,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,CAAA;YAEtD,CAAC,CAAC,mBAAmB,CACnB,EAAE,eAAe,EAAE,qBAAqB,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EACvG,eAAe,CAChB,CAAA;YAED,CAAC,CAAC,mBAAmB,CACnB;gBACE,cAAc,EAAE,EAAE,uBAAuB,EAAE,EAAE,EAAE;aAChD,EACD,eAAe,CAChB,CAAA;YACD,MAAM,0BAA0B,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAA;YACnE,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC,0BAA0B,CAAC,CAAA;YAE7D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;YACnE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAA;YACvD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAA;YACtE,MAAM,CAAC,0BAA0B,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;QACrD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8FAA8F,EAAE,KAAK,IAAI,EAAE;QAC5G,MAAM,UAAU,CAAC,IAAI,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,qBAAqB,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,CAAA;YAEtD,CAAC,CAAC,mBAAmB,CACnB,EAAE,eAAe,EAAE,qBAAqB,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EACvG,eAAe,CAChB,CAAA;YAED,CAAC,CAAC,mBAAmB,CACnB;gBACE,cAAc,EAAE;oBACd,uBAAuB,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;iBAClF;aACF,EACD,eAAe,CAChB,CAAA;YACD,MAAM,0BAA0B,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAA;YACnE,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC,0BAA0B,CAAC,CAAA;YAE7D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;YACnE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAA;YACvD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC,CAAA;YACnG,MAAM,CAAC,0BAA0B,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;QACrD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,UAAU,CAAC,IAAI,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,qBAAqB,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,CAAA;YACrD,CAAC,CAAC,mBAAmB,CACnB,EAAE,eAAe,EAAE,qBAAqB,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EACvG,eAAe,CAChB,CAAA;YACD,MAAM,0BAA0B,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAA;YACnE,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC,0BAA0B,CAAC,CAAA;YAC7D,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAA;YACpF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,CAAA;YACvC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACpC,MAAM,CAAC,0BAA0B,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAC3D,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"authenticate.spec.js","sourceRoot":"","sources":["../src/authenticate.spec.ts"],"names":[],"mappings":"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"}

package/esm/authorize.spec.js

@@ -1,5 +1,5 @@
 import { AuthorizationError, IdentityContext } from '@furystack/core';
-import { Injector } from '@furystack/inject';
+import { createInjector } from '@furystack/inject';
 import { usingAsync } from '@furystack/utils';
 import { describe, expect, it, vi } from 'vitest';
 import { Authorize } from './authorize.js';
@@ -7,43 +7,48 @@ import { EmptyResult } from './request-action-implementation.js';
 describe('Authorize', () => {
     const response = {};
     const request = { url: 'http://google.com' };
-    it('Should return 403 when failed to get current user', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            const isAuthorizedAction = vi.fn(async () => false);
-            i.setExplicitInstance({ isAuthorized: isAuthorizedAction, getCurrentUser: () => Promise.reject(new Error(':(')) }, IdentityContext);
-            const exampleAuthorizedAction = vi.fn(async () => EmptyResult());
-            const authorized = Authorize('Role1')(exampleAuthorizedAction);
+    it('throws AuthorizationError when the current user cannot be resolved', async () => {
+        await usingAsync(createInjector(), async (i) => {
+            const isAuthorized = vi.fn(async () => false);
+            i.bind(IdentityContext, () => ({
+                isAuthorized,
+                getCurrentUser: () => Promise.reject(new Error(':(')),
+                isAuthenticated: () => Promise.resolve(false),
+            }));
+            const exampleAction = vi.fn(async () => EmptyResult());
+            const authorized = Authorize('Role1')(exampleAction);
             await expect(() => authorized({ injector: i, request, response })).rejects.toThrow(AuthorizationError);
-            expect(exampleAuthorizedAction).not.toBeCalled();
+            expect(exampleAction).not.toHaveBeenCalled();
         });
     });
-    it('Should return 403 if the current user does not have the role', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            const isAuthorizedAction = vi.fn(async () => false);
-            i.setExplicitInstance({
-                isAuthorized: isAuthorizedAction,
-                getCurrentUser: async () => Promise.resolve({ username: 'a', roles: ['Role1'] }),
-            }, IdentityContext);
-            const exampleAuthorizedAction = vi.fn(async () => EmptyResult());
-            const authorized = Authorize('Role2')(exampleAuthorizedAction);
+    it('throws AuthorizationError when the current user does not have the required role', async () => {
+        await usingAsync(createInjector(), async (i) => {
+            const isAuthorized = vi.fn(async () => false);
+            i.bind(IdentityContext, () => ({
+                isAuthorized,
+                getCurrentUser: () => Promise.resolve({ username: 'a', roles: ['Role1'] }),
+                isAuthenticated: () => Promise.resolve(true),
+            }));
+            const exampleAction = vi.fn(async () => EmptyResult());
+            const authorized = Authorize('Role2')(exampleAction);
             await expect(() => authorized({ injector: i, request, response })).rejects.toThrow(AuthorizationError);
-            expect(exampleAuthorizedAction).not.toBeCalled();
+            expect(exampleAction).not.toHaveBeenCalled();
         });
     });
-    it('Should exec the original action if authorized', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            const isAuthorizedAction = vi.fn(async () => true);
-            i.setExplicitInstance({
-                isAuthorized: isAuthorizedAction,
-                getCurrentUser: async () => Promise.resolve({ username: 'a', roles: ['Role1'] }),
-            }, IdentityContext);
-            const exampleAuthorizedAction = vi.fn(async () => EmptyResult());
-            const authorized = Authorize('Role1')(exampleAuthorizedAction);
-            const params = { injector: i, body: undefined, query: undefined, request, response };
+    it('invokes the wrapped action when the current user holds the required role', async () => {
+        await usingAsync(createInjector(), async (i) => {
+            i.bind(IdentityContext, () => ({
+                isAuthorized: () => Promise.resolve(true),
+                getCurrentUser: () => Promise.resolve({ username: 'a', roles: ['Role1'] }),
+                isAuthenticated: () => Promise.resolve(true),
+            }));
+            const exampleAction = vi.fn(async () => EmptyResult());
+            const authorized = Authorize('Role1')(exampleAction);
+            const params = { injector: i, request, response };
             const result = await authorized(params);
             expect(result.statusCode).toBe(200);
             expect(result.chunk).toBe(undefined);
-            expect(exampleAuthorizedAction).toBeCalledWith(params);
+            expect(exampleAction).toHaveBeenCalledWith(params);
         });
     });
 });

package/esm/authorize.spec.js.map

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

package/esm/endpoint-generators/create-delete-endpoint.d.ts

@@ -1,15 +1,10 @@
-import type { Constructable } from '@furystack/inject';
+import type { DataSetToken } from '@furystack/repository';
 import type { DeleteEndpoint } from '@furystack/rest';
-import type { RequestAction } from '../request-action-implementation.js';
+import { type RequestAction } from '../request-action-implementation.js';
 /**
- * Creates a DELETE endpoint for removing entities
- * @param options The options for endpoint creation
- * @param options.model The Model class
- * @param options.primaryKey The field used as primary key on the model
- * @returns a boolean that indicates the success
+ * Creates a DELETE endpoint that removes the entity identified by the URL's
+ * `:id` parameter. Returns `204 No Content` once the removal has been
+ * persisted to the underlying store.
  */
-export declare const createDeleteEndpoint: <T extends object, TPrimaryKey extends keyof T>(options: {
-    model: Constructable<T>;
-    primaryKey: TPrimaryKey;
-}) => RequestAction<DeleteEndpoint<T, TPrimaryKey>>;
+export declare const createDeleteEndpoint: <T extends object, TPrimaryKey extends keyof T>(dataSet: DataSetToken<T, TPrimaryKey>) => RequestAction<DeleteEndpoint<T, TPrimaryKey>>;
 //# sourceMappingURL=create-delete-endpoint.d.ts.map

package/esm/endpoint-generators/create-delete-endpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-delete-endpoint.d.ts","sourceRoot":"","sources":["../../src/endpoint-generators/create-delete-endpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAIxE;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,EAAE,WAAW,SAAS,MAAM,CAAC,EAAE,SAAS;IAC3F,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACvB,UAAU,EAAE,WAAW,CAAA;CACxB,kDAQA,CAAA"}
+{"version":3,"file":"create-delete-endpoint.d.ts","sourceRoot":"","sources":["../../src/endpoint-generators/create-delete-endpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAc,KAAK,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAEpF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,EAAE,WAAW,SAAS,MAAM,CAAC,EAChF,SAAS,YAAY,CAAC,CAAC,EAAE,WAAW,CAAC,KACpC,aAAa,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,CAAC,CAO9C,CAAA"}

package/esm/endpoint-generators/create-delete-endpoint.js

@@ -1,19 +1,15 @@
 import { JsonResult } from '../request-action-implementation.js';
-import { getRepository } from '@furystack/repository';
 /**
- * Creates a DELETE endpoint for removing entities
- * @param options The options for endpoint creation
- * @param options.model The Model class
- * @param options.primaryKey The field used as primary key on the model
- * @returns a boolean that indicates the success
+ * Creates a DELETE endpoint that removes the entity identified by the URL's
+ * `:id` parameter. Returns `204 No Content` once the removal has been
+ * persisted to the underlying store.
  */
-export const createDeleteEndpoint = (options) => {
-    const endpoint = async ({ injector, getUrlParams }) => {
+export const createDeleteEndpoint = (dataSet) => {
+    return async ({ injector, getUrlParams }) => {
         const { id } = getUrlParams();
-        const dataSet = getRepository(injector).getDataSetFor(options.model, options.primaryKey);
-        await dataSet.remove(injector, id);
+        const ds = injector.get(dataSet);
+        await ds.remove(injector, id);
         return JsonResult({}, 204);
     };
-    return endpoint;
 };
 //# sourceMappingURL=create-delete-endpoint.js.map

package/esm/endpoint-generators/create-delete-endpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-delete-endpoint.js","sourceRoot":"","sources":["../../src/endpoint-generators/create-delete-endpoint.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAErD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAgD,OAGnF,EAAE,EAAE;IACH,MAAM,QAAQ,GAAkD,KAAK,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;QACnG,MAAM,EAAE,EAAE,EAAE,GAAG,YAAY,EAAE,CAAA;QAC7B,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QACxF,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAClC,OAAO,UAAU,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAC5B,CAAC,CAAA;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}
+{"version":3,"file":"create-delete-endpoint.js","sourceRoot":"","sources":["../../src/endpoint-generators/create-delete-endpoint.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAsB,MAAM,qCAAqC,CAAA;AAEpF;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAAqC,EACU,EAAE;IACjD,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;QAC1C,MAAM,EAAE,EAAE,EAAE,GAAG,YAAY,EAAE,CAAA;QAC7B,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAChC,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAC7B,OAAO,UAAU,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAC5B,CAAC,CAAA;AACH,CAAC,CAAA"}

package/esm/endpoint-generators/create-delete-endpoint.spec.js

@@ -1,35 +1,28 @@
+import { getPort } from '@furystack/core/port-generator';
+import { createInjector } from '@furystack/inject';
 import { usingAsync } from '@furystack/utils';
-import { Injector } from '@furystack/inject';
-import { createDeleteEndpoint } from './create-delete-endpoint.js';
-import { MockClass, setupContext } from './utils.js';
+import { describe, expect, it } from 'vitest';
 import { useRestService } from '../helpers.js';
-import { getDataSetFor } from '@furystack/repository';
-import { describe, it, expect } from 'vitest';
-import { getPort } from '@furystack/core/port-generator';
+import { createDeleteEndpoint } from './create-delete-endpoint.js';
+import { MockDataSet, setupContext } from './utils.js';
 describe('createDeleteEndpoint', () => {
-    it('Should delete the entity and report the success', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            const port = getPort();
+    it('deletes the entity and responds 204', async () => {
+        await usingAsync(createInjector(), async (i) => {
             setupContext(i);
+            const port = getPort();
             await useRestService({
                 injector: i,
                 root: '/api',
                 port,
-                api: {
-                    DELETE: {
-                        '/:id': createDeleteEndpoint({ model: MockClass, primaryKey: 'id' }),
-                    },
-                },
+                api: { DELETE: { '/:id': createDeleteEndpoint(MockDataSet) } },
             });
-            await getDataSetFor(i, MockClass, 'id').add(i, { id: 'mock', value: 'mock' });
-            const countBeforeDelete = await getDataSetFor(i, MockClass, 'id').count(i);
-            expect(countBeforeDelete).toBe(1);
+            const dataSet = i.get(MockDataSet);
+            await dataSet.add(i, { id: 'mock', value: 'mock' });
+            expect(await dataSet.count(i)).toBe(1);
             const response = await fetch(`http://127.0.0.1:${port}/api/mock`, { method: 'DELETE' });
             expect(response.status).toBe(204);
-            const txt = await response.text();
-            expect(txt).toBe('');
-            const countAfterDelete = await getDataSetFor(i, MockClass, 'id').count(i);
-            expect(countAfterDelete).toBe(0);
+            expect(await response.text()).toBe('');
+            expect(await dataSet.count(i)).toBe(0);
         });
     });
 });

package/esm/endpoint-generators/create-delete-endpoint.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-delete-endpoint.spec.js","sourceRoot":"","sources":["../../src/endpoint-generators/create-delete-endpoint.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAExD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,UAAU,CAAC,IAAI,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,YAAY,CAAC,CAAC,CAAC,CAAA;YACf,MAAM,cAAc,CAA0D;gBAC5E,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,MAAM;gBACZ,IAAI;gBACJ,GAAG,EAAE;oBACH,MAAM,EAAE;wBACN,MAAM,EAAE,oBAAoB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;qBACrE;iBACF;aACF,CAAC,CAAA;YACF,MAAM,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;YAE7E,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAC1E,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAEjC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;YACvF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACjC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACjC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAEpB,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACzE,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"create-delete-endpoint.spec.js","sourceRoot":"","sources":["../../src/endpoint-generators/create-delete-endpoint.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEtD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAC7C,YAAY,CAAC,CAAC,CAAC,CAAA;YACf,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,MAAM,cAAc,CAA0D;gBAC5E,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,MAAM;gBACZ,IAAI;gBACJ,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,oBAAoB,CAAC,WAAW,CAAC,EAAE,EAAE;aAC/D,CAAC,CAAA;YACF,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YAClC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;YACnD,MAAM,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAEtC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;YACvF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACjC,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACtC,MAAM,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACxC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/esm/endpoint-generators/create-get-collection-endpoint.d.ts

@@ -1,15 +1,15 @@
-import type { Constructable } from '@furystack/inject';
+import type { DataSetToken } from '@furystack/repository';
 import type { GetCollectionEndpoint } from '@furystack/rest';
-import type { RequestAction } from '../request-action-implementation.js';
+import { type RequestAction } from '../request-action-implementation.js';
 /**
- * Creates a GetCollection endpoint for the given model. The model should have a Repository DataSet
- * @param options The options for endpoint creation
- * @param options.model The Model class
- * @param options.primaryKey The field used as primary key on the model
- * @returns The created endpoint
+ * Creates a GetCollection endpoint backed by the DataSet resolved from the
+ * provided {@link DataSetToken}. The token carries the entity model and
+ * primary key, so callers no longer need to pass them separately.
+ *
+ * @example
+ * ```ts
+ * const endpoint = createGetCollectionEndpoint(UserDataSet)
+ * ```
  */
-export declare const createGetCollectionEndpoint: <T, TPrimaryKey extends keyof T>(options: {
-    model: Constructable<T>;
-    primaryKey: TPrimaryKey;
-}) => RequestAction<GetCollectionEndpoint<T>>;
+export declare const createGetCollectionEndpoint: <T, TPrimaryKey extends keyof T>(dataSet: DataSetToken<T, TPrimaryKey>) => RequestAction<GetCollectionEndpoint<T>>;
 //# sourceMappingURL=create-get-collection-endpoint.d.ts.map

package/esm/endpoint-generators/create-get-collection-endpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-get-collection-endpoint.d.ts","sourceRoot":"","sources":["../../src/endpoint-generators/create-get-collection-endpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAIxE;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,GAAI,CAAC,EAAE,WAAW,SAAS,MAAM,CAAC,EAAE,SAAS;IACnF,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACvB,UAAU,EAAE,WAAW,CAAA;CACxB,4CAWA,CAAA"}
+{"version":3,"file":"create-get-collection-endpoint.d.ts","sourceRoot":"","sources":["../../src/endpoint-generators/create-get-collection-endpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,EAAc,KAAK,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAEpF;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GAAI,CAAC,EAAE,WAAW,SAAS,MAAM,CAAC,EACxE,SAAS,YAAY,CAAC,CAAC,EAAE,WAAW,CAAC,KACpC,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,CASxC,CAAA"}

package/esm/endpoint-generators/create-get-collection-endpoint.js

@@ -1,21 +1,22 @@
 import { JsonResult } from '../request-action-implementation.js';
-import { getRepository } from '@furystack/repository';
 /**
- * Creates a GetCollection endpoint for the given model. The model should have a Repository DataSet
- * @param options The options for endpoint creation
- * @param options.model The Model class
- * @param options.primaryKey The field used as primary key on the model
- * @returns The created endpoint
+ * Creates a GetCollection endpoint backed by the DataSet resolved from the
+ * provided {@link DataSetToken}. The token carries the entity model and
+ * primary key, so callers no longer need to pass them separately.
+ *
+ * @example
+ * ```ts
+ * const endpoint = createGetCollectionEndpoint(UserDataSet)
+ * ```
  */
-export const createGetCollectionEndpoint = (options) => {
-    const endpoint = async ({ injector, getQuery }) => {
+export const createGetCollectionEndpoint = (dataSet) => {
+    return async ({ injector, getQuery }) => {
         const { findOptions } = getQuery();
-        const dataSet = getRepository(injector).getDataSetFor(options.model, options.primaryKey);
-        const entriesPromise = dataSet.find(injector, findOptions || {});
-        const countPromise = dataSet.count(injector, findOptions?.filter);
+        const ds = injector.get(dataSet);
+        const entriesPromise = ds.find(injector, findOptions || {});
+        const countPromise = ds.count(injector, findOptions?.filter);
         const [entries, count] = await Promise.all([entriesPromise, countPromise]);
         return JsonResult({ entries, count });
     };
-    return endpoint;
 };
 //# sourceMappingURL=create-get-collection-endpoint.js.map

package/esm/endpoint-generators/create-get-collection-endpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-get-collection-endpoint.js","sourceRoot":"","sources":["../../src/endpoint-generators/create-get-collection-endpoint.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAErD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAiC,OAG3E,EAAE,EAAE;IACH,MAAM,QAAQ,GAA4C,KAAK,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE;QACzF,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,EAAE,CAAA;QAClC,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QACxF,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,IAAI,EAAE,CAAC,CAAA;QAChE,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;QACjE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAA;QAE1E,OAAO,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;IACvC,CAAC,CAAA;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}
+{"version":3,"file":"create-get-collection-endpoint.js","sourceRoot":"","sources":["../../src/endpoint-generators/create-get-collection-endpoint.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAsB,MAAM,qCAAqC,CAAA;AAEpF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,OAAqC,EACI,EAAE;IAC3C,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE;QACtC,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,EAAE,CAAA;QAClC,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAChC,MAAM,cAAc,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,IAAI,EAAE,CAAC,CAAA;QAC3D,MAAM,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;QAC5D,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAA;QAC1E,OAAO,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;IACvC,CAAC,CAAA;AACH,CAAC,CAAA"}