@furystack/rest-service 7.0.12 → 7.0.13

package/esm/validate.integration.spec.js

@@ -0,0 +1,211 @@
+import { Injector } from '@furystack/inject';
+import { createClient, ResponseError } from '@furystack/rest-client-fetch';
+import { usingAsync } from '@furystack/utils';
+import { JsonResult } from './request-action-implementation.js';
+import { Validate } from './validate.js';
+import schema from './validate.integration.spec.schema.json' assert { type: 'json' };
+import { useRestService } from './helpers.js';
+import { describe, it, expect } from 'vitest';
+// To recreate: yarn ts-json-schema-generator -f tsconfig.json --no-type-check -p packages/rest-service/src/validate.integration.schema.ts -o packages/rest-service/src/validate.integration.spec.schema.json
+const createValidateApi = async () => {
+    const injector = new Injector();
+    const port = Math.round(Math.random() * 1000) + 10000;
+    useRestService({
+        injector,
+        api: {
+            GET: {
+                '/validate-query': Validate({
+                    schema,
+                    schemaName: 'ValidateQuery',
+                })(async ({ getQuery }) => JsonResult({ ...getQuery() })),
+                '/validate-url/:id': Validate({
+                    schema,
+                    schemaName: 'ValidateUrl',
+                })(async ({ getUrlParams }) => JsonResult({ ...getUrlParams() })),
+                '/validate-headers': Validate({
+                    schema,
+                    schemaName: 'ValidateHeaders',
+                })(async ({ headers }) => JsonResult({ ...headers })),
+                '/mock': undefined,
+                '/mock/:id': undefined, // ToDo: Generator and test
+            },
+            POST: {
+                '/validate-body': Validate({
+                    schema,
+                    schemaName: 'ValidateBody',
+                })(async ({ getBody }) => {
+                    const body = await getBody();
+                    return JsonResult({ ...body });
+                }),
+                '/mock': undefined, // ToDo: Generator and test
+            },
+            PATCH: {
+                '/mock/:id': undefined, // ToDo: Generator and test
+            },
+            DELETE: {
+                '/mock/:id': undefined, // ToDo: Generator and test
+            },
+        },
+        port,
+        root: '/api',
+    });
+    const client = createClient({
+        endpointUrl: `http://localhost:${port}/api`,
+    });
+    return {
+        dispose: injector.dispose.bind(injector),
+        client,
+    };
+};
+describe('Validation integration tests', () => {
+    describe('Validation errors', () => {
+        it('Should validate query', async () => {
+            await usingAsync(await createValidateApi(), async ({ client }) => {
+                expect.assertions(5);
+                try {
+                    await client({
+                        method: 'GET',
+                        action: '/validate-query',
+                        query: undefined,
+                    });
+                }
+                catch (error) {
+                    if (error instanceof ResponseError) {
+                        expect(error.message).toBe('Bad Request');
+                        expect(error.response?.status).toBe(400);
+                        const responseJson = await error.response.json();
+                        expect(responseJson.errors[0].params.missingProperty).toEqual('foo');
+                        expect(responseJson.errors[1].params.missingProperty).toEqual('bar');
+                        expect(responseJson.errors[2].params.missingProperty).toEqual('baz');
+                    }
+                }
+            });
+        });
+        it('Should validate url', async () => {
+            await usingAsync(await createValidateApi(), async ({ client }) => {
+                expect.assertions(4);
+                try {
+                    await client({
+                        method: 'GET',
+                        action: '/validate-url/:id',
+                        url: undefined,
+                    });
+                }
+                catch (error) {
+                    if (error instanceof ResponseError) {
+                        expect(error.message).toBe('Bad Request');
+                        expect(error.response?.status).toBe(400);
+                        const responseJson = await error.response.json();
+                        expect(responseJson.errors[0].params.type).toEqual('number');
+                        expect(responseJson.errors[0].instancePath).toEqual('/url/id');
+                    }
+                }
+            });
+        });
+        it('Should validate headers', async () => {
+            await usingAsync(await createValidateApi(), async ({ client }) => {
+                expect.assertions(3);
+                try {
+                    await client({
+                        method: 'GET',
+                        action: '/validate-headers',
+                        headers: undefined,
+                    });
+                }
+                catch (error) {
+                    if (error instanceof ResponseError) {
+                        expect(error.message).toBe('Bad Request');
+                        expect(error.response?.status).toBe(400);
+                        const responseJson = await error.response.json();
+                        expect(responseJson.errors.find((e) => e.keyword === 'required' && e.message.includes('foo'))).toBeDefined();
+                    }
+                }
+            });
+        });
+        it('Should validate body', async () => {
+            await usingAsync(await createValidateApi(), async ({ client }) => {
+                expect.assertions(3);
+                try {
+                    await client({
+                        method: 'POST',
+                        action: '/validate-body',
+                        body: undefined,
+                    });
+                }
+                catch (error) {
+                    if (error instanceof ResponseError) {
+                        expect(error.message).toBe('Bad Request');
+                        expect(error.response?.status).toBe(400);
+                        const responseJson = await error.response.json();
+                        expect(responseJson.errors[0].params.missingProperty).toEqual('body');
+                    }
+                }
+            });
+        });
+    });
+    describe('Validation Success', () => {
+        it('Should validate query', async () => {
+            await usingAsync(await createValidateApi(), async ({ client }) => {
+                const result = await client({
+                    method: 'GET',
+                    action: '/validate-query',
+                    query: {
+                        foo: 'foo',
+                        bar: 2,
+                        baz: false,
+                    },
+                });
+                expect(result.response.status).toBe(200);
+                expect(result.result.foo).toBe('foo');
+                expect(result.result.bar).toBe(2);
+                expect(result.result.baz).toBe(false);
+            });
+        });
+        it('Should validate url', async () => {
+            await usingAsync(await createValidateApi(), async ({ client }) => {
+                const result = await client({
+                    method: 'GET',
+                    action: '/validate-url/:id',
+                    url: { id: 3 },
+                });
+                expect(result.response.status).toBe(200);
+                expect(result.result.id).toBe(3);
+            });
+        });
+        it('Should validate headers', async () => {
+            await usingAsync(await createValidateApi(), async ({ client }) => {
+                const result = await client({
+                    method: 'GET',
+                    action: '/validate-headers',
+                    headers: {
+                        foo: 'foo',
+                        bar: 42,
+                        baz: true,
+                    },
+                });
+                expect(result.response.status).toBe(200);
+                expect(result.result.foo).toBe('foo');
+                expect(result.result.bar).toBe(42);
+                expect(result.result.baz).toBe(true);
+            });
+        });
+        it('Should validate body', async () => {
+            await usingAsync(await createValidateApi(), async ({ client }) => {
+                const result = await client({
+                    method: 'POST',
+                    action: '/validate-body',
+                    body: {
+                        foo: 'foo',
+                        bar: 42,
+                        baz: true,
+                    },
+                });
+                expect(result.response.status).toBe(200);
+                expect(result.result.foo).toBe('foo');
+                expect(result.result.bar).toBe(42);
+                expect(result.result.baz).toBe(true);
+            });
+        });
+    });
+});
+//# sourceMappingURL=validate.integration.spec.js.map

package/esm/validate.integration.spec.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@furystack/rest-service",
-  "version": "7.0.12",
+  "version": "7.0.13",
   "description": "Repository implementation for FuryStack",
   "type": "module",
   "scripts": {
@@ -37,22 +37,22 @@
   },
   "homepage": "https://github.com/furystack/furystack",
   "dependencies": {
-    "@furystack/core": "^12.0.10",
-    "@furystack/inject": "^8.1.0",
-    "@furystack/repository": "^7.0.10",
-    "@furystack/rest": "^5.0.11",
-    "@furystack/security": "^3.0.10",
-    "@furystack/utils": "^4.0.9",
+    "@furystack/core": "^12.0.11",
+    "@furystack/inject": "^8.1.1",
+    "@furystack/repository": "^7.0.11",
+    "@furystack/rest": "^5.0.12",
+    "@furystack/security": "^3.0.11",
+    "@furystack/utils": "^4.0.10",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "path-to-regexp": "^6.2.1",
     "semaphore-async-await": "^1.5.1"
   },
   "devDependencies": {
-    "@furystack/rest-client-fetch": "^5.0.11",
-    "@types/node": "^20.5.6",
+    "@furystack/rest-client-fetch": "^5.0.12",
+    "@types/node": "^20.8.10",
     "typescript": "^5.2.2",
-    "vitest": "^0.34.3"
+    "vitest": "^0.34.6"
   },
   "gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
 }

package/src/actions/error-action.spec.ts

@@ -1,6 +1,6 @@
 import { Injector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { ErrorAction } from './error-action'
+import { ErrorAction } from './error-action.js'
 import type { IncomingMessage } from 'http'
 import { RequestError } from '@furystack/rest'
 import { AuthorizationError } from '@furystack/core'

package/src/actions/get-current-user.spec.ts

@@ -1,6 +1,6 @@
 import { Injector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { GetCurrentUser } from './get-current-user'
+import { GetCurrentUser } from './get-current-user.js'
 import type { IncomingMessage, ServerResponse } from 'http'
 import { IdentityContext } from '@furystack/core'
 import { describe, it, expect } from 'vitest'

package/src/actions/is-authenticated.spec.ts

@@ -1,6 +1,6 @@
 import { Injector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { IsAuthenticated } from './is-authenticated'
+import { IsAuthenticated } from './is-authenticated.js'
 import type { IncomingMessage, ServerResponse } from 'http'
 import { IdentityContext } from '@furystack/core'
 import { describe, it, expect } from 'vitest'

package/src/actions/login-action.spec.ts

@@ -1,8 +1,8 @@
 import type { IncomingMessage, ServerResponse } from 'http'
 import { Injector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { LoginAction } from './login'
-import { HttpUserContext } from '../http-user-context'
+import { LoginAction } from './login.js'
+import { HttpUserContext } from '../http-user-context.js'
 import { describe, it, expect, vi } from 'vitest'
 
 describe('LoginAction', () => {

package/src/actions/logout-action.spec.ts

@@ -1,7 +1,7 @@
 import { Injector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { HttpUserContext } from '../http-user-context'
-import { LogoutAction } from './logout'
+import { HttpUserContext } from '../http-user-context.js'
+import { LogoutAction } from './logout.js'
 import type { IncomingMessage, ServerResponse } from 'http'
 import { describe, it, expect, vi } from 'vitest'
 

package/src/actions/not-found-action.spec.ts

@@ -1,6 +1,6 @@
 import { Injector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { NotFoundAction } from './not-found-action'
+import { NotFoundAction } from './not-found-action.js'
 import type { IncomingMessage, ServerResponse } from 'http'
 import { describe, it, expect } from 'vitest'
 

package/src/add-cors-header.spec.ts

@@ -1,5 +1,5 @@
 import type { IncomingMessage, ServerResponse } from 'http'
-import { Utils } from './utils'
+import { Utils } from './utils.js'
 import { describe, it, expect, vi } from 'vitest'
 
 describe('AddCorsHeaders', () => {

package/src/authenticate.spec.ts

@@ -1,11 +1,11 @@
 import type { IncomingMessage } from 'http'
 import { Injector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { HttpUserContext } from './http-user-context'
-import { Authenticate } from './authenticate'
+import { HttpUserContext } from './http-user-context.js'
+import { Authenticate } from './authenticate.js'
 import type { ServerResponse } from 'http'
 import { IdentityContext } from '@furystack/core'
-import { EmptyResult } from './request-action-implementation'
+import { EmptyResult } from './request-action-implementation.js'
 import { describe, it, expect, vi } from 'vitest'
 
 describe('Authenticate', () => {

package/src/authorize.spec.ts

@@ -3,9 +3,9 @@ import { Injector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
 import type { User } from '@furystack/core'
 import { IdentityContext } from '@furystack/core'
-import { Authorize } from './authorize'
+import { Authorize } from './authorize.js'
 import type { ServerResponse } from 'http'
-import { EmptyResult } from './request-action-implementation'
+import { EmptyResult } from './request-action-implementation.js'
 import { describe, it, expect, vi } from 'vitest'
 
 describe('Authorize', () => {

package/src/endpoint-generators/create-delete-endpoint.spec.ts

@@ -1,9 +1,9 @@
 import { usingAsync } from '@furystack/utils'
 import { Injector } from '@furystack/inject'
 import type { DeleteEndpoint } from '@furystack/rest'
-import { createDeleteEndpoint } from './create-delete-endpoint'
-import { MockClass, setupContext } from './utils'
-import { useRestService } from '../helpers'
+import { createDeleteEndpoint } from './create-delete-endpoint.js'
+import { MockClass, setupContext } from './utils.js'
+import { useRestService } from '../helpers.js'
 import { getDataSetFor } from '@furystack/repository'
 import { describe, it, expect } from 'vitest'
 

package/src/endpoint-generators/create-get-collection-endpoint.spec.ts

@@ -1,12 +1,12 @@
 import { usingAsync } from '@furystack/utils'
 import { Injector } from '@furystack/inject'
-import { MockClass, setupContext } from './utils'
-import { createGetCollectionEndpoint } from './create-get-collection-endpoint'
+import { MockClass, setupContext } from './utils.js'
+import { createGetCollectionEndpoint } from './create-get-collection-endpoint.js'
 import type { GetCollectionEndpoint, GetCollectionResult } from '@furystack/rest'
 import { serializeToQueryString } from '@furystack/rest'
 import type { FindOptions } from '@furystack/core'
 import { getDataSetFor, getRepository } from '@furystack/repository'
-import { useRestService } from '../helpers'
+import { useRestService } from '../helpers.js'
 import { describe, it, expect } from 'vitest'
 
 const addMockEntities = async (i: Injector) =>

package/src/endpoint-generators/create-get-entity-endpoint.spec.ts

@@ -2,10 +2,10 @@ import { usingAsync } from '@furystack/utils'
 import { Injector } from '@furystack/inject'
 import type { GetEntityEndpoint } from '@furystack/rest'
 import { serializeToQueryString } from '@furystack/rest'
-import { MockClass, setupContext } from './utils'
-import { createGetEntityEndpoint } from './create-get-entity-endpoint'
+import { MockClass, setupContext } from './utils.js'
+import { createGetEntityEndpoint } from './create-get-entity-endpoint.js'
 import { getDataSetFor } from '@furystack/repository'
-import { useRestService } from '../helpers'
+import { useRestService } from '../helpers.js'
 import { describe, it, expect } from 'vitest'
 
 describe('createGetEntityEndpoint', () => {

package/src/endpoint-generators/create-patch-endpoint.spec.ts

@@ -1,10 +1,10 @@
 import { usingAsync } from '@furystack/utils'
 import { Injector } from '@furystack/inject'
 import type { PatchEndpoint } from '@furystack/rest'
-import { createPatchEndpoint } from './create-patch-endpoint'
-import { MockClass, setupContext } from './utils'
+import { createPatchEndpoint } from './create-patch-endpoint.js'
+import { MockClass, setupContext } from './utils.js'
 import { getDataSetFor } from '@furystack/repository'
-import { useRestService } from '../helpers'
+import { useRestService } from '../helpers.js'
 import { describe, it, expect } from 'vitest'
 
 describe('createPatchEndpoint', () => {

package/src/endpoint-generators/create-post-endpoint.spec.ts

@@ -1,9 +1,9 @@
 import { usingAsync } from '@furystack/utils'
 import { Injector } from '@furystack/inject'
 import type { PostEndpoint } from '@furystack/rest'
-import { createPostEndpoint } from './create-post-endpoint'
-import { MockClass, setupContext } from './utils'
-import { useRestService } from '../helpers'
+import { createPostEndpoint } from './create-post-endpoint.js'
+import { MockClass, setupContext } from './utils.js'
+import { useRestService } from '../helpers.js'
 import { getDataSetFor } from '@furystack/repository'
 import { describe, it, expect } from 'vitest'
 

package/src/helpers.spec.ts

@@ -1,9 +1,9 @@
 import { Injector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { ApiManager } from './api-manager'
-import { HttpAuthenticationSettings } from './http-authentication-settings'
-import { useHttpAuthentication, useRestService, useStaticFiles } from './helpers'
-import { StaticServerManager } from './static-server-manager'
+import { ApiManager } from './api-manager.js'
+import { HttpAuthenticationSettings } from './http-authentication-settings.js'
+import { useHttpAuthentication, useRestService, useStaticFiles } from './helpers.js'
+import { StaticServerManager } from './static-server-manager.js'
 import { describe, it, expect } from 'vitest'
 
 describe('Injector extensions', () => {

package/src/http-user-context.spec.ts

@@ -2,10 +2,10 @@ import type { IncomingMessage, ServerResponse } from 'http'
 import { usingAsync } from '@furystack/utils'
 import { Injector } from '@furystack/inject'
 import { User, StoreManager, InMemoryStore, addStore } from '@furystack/core'
-import { DefaultSession } from './models/default-session'
-import { HttpUserContext } from './http-user-context'
+import { DefaultSession } from './models/default-session.js'
+import { HttpUserContext } from './http-user-context.js'
 import { PasswordAuthenticator, PasswordCredential, UnauthenticatedError } from '@furystack/security'
-import { useHttpAuthentication } from './helpers'
+import { useHttpAuthentication } from './helpers.js'
 import { describe, it, expect, vi } from 'vitest'
 
 export const prepareInjector = async (i: Injector) => {

package/src/mime-types.spec.ts

@@ -1,4 +1,4 @@
-import { getMimeForFile } from './mime-types'
+import { getMimeForFile } from './mime-types.js'
 import { describe, it, expect } from 'vitest'
 describe('MIME Types', () => {
   it('Should return a default fallback', () => {

package/src/rest-service.integration.spec.ts

@@ -1,12 +1,12 @@
 import { Injector } from '@furystack/inject'
 import './helpers'
 import { usingAsync, PathHelper } from '@furystack/utils'
-import { GetCurrentUser, IsAuthenticated, LoginAction, LogoutAction } from './actions'
+import { GetCurrentUser, IsAuthenticated, LoginAction, LogoutAction } from './actions/index.js'
 import type { RestApi } from '@furystack/rest'
 import { User, InMemoryStore, addStore } from '@furystack/core'
-import { DefaultSession } from './models/default-session'
-import { JsonResult } from './request-action-implementation'
-import { useHttpAuthentication, useRestService } from './helpers'
+import { DefaultSession } from './models/default-session.js'
+import { JsonResult } from './request-action-implementation.js'
+import { useHttpAuthentication, useRestService } from './helpers.js'
 import { describe, it, expect } from 'vitest'
 import { serializeValue } from '@furystack/rest'
 

package/src/rest.integration.test.ts

@@ -2,9 +2,8 @@ import { Injector } from '@furystack/inject'
 import type { RestApi } from '@furystack/rest'
 import { createClient } from '@furystack/rest-client-fetch'
 import { usingAsync } from '@furystack/utils'
-import { JsonResult } from './request-action-implementation'
-import './helpers'
-import { useRestService } from './helpers'
+import { JsonResult } from './request-action-implementation.js'
+import { useRestService } from './helpers.js'
 import { describe, it, expect } from 'vitest'
 
 export interface EchoApi extends RestApi {

package/src/schema-validator/schema-validator.test.ts

@@ -1,7 +1,7 @@
-import { SchemaValidator } from './schema-validator'
-import type { BodyParameters, Language } from './validate-examples'
-import { exampleSchema } from './validate-examples'
-import { SchemaValidationError } from './schema-validation-error'
+import { SchemaValidator } from './schema-validator.js'
+import type { BodyParameters, Language } from './validate-examples.js'
+import { exampleSchema } from './validate-examples.js'
+import { SchemaValidationError } from './schema-validation-error.js'
 import { describe, it, expect } from 'vitest'
 
 describe('ValidateSchema', () => {

package/src/server-response-extensions.spec.ts

@@ -1,7 +1,7 @@
 import { Socket } from 'net'
 import { IncomingMessage, ServerResponse } from 'http'
 import './server-response-extensions'
-import { BypassResult, JsonResult, PlainTextResult } from './request-action-implementation'
+import { BypassResult, JsonResult, PlainTextResult } from './request-action-implementation.js'
 import { describe, it, expect, vi } from 'vitest'
 
 describe('ServerResponse extensions', () => {

package/src/static-server-manager.spec.ts

@@ -1,7 +1,7 @@
 import { Injector } from '@furystack/inject'
 import { sleepAsync, usingAsync } from '@furystack/utils'
-import { ServerManager } from './server-manager'
-import { StaticServerManager } from './static-server-manager'
+import { ServerManager } from './server-manager.js'
+import { StaticServerManager } from './static-server-manager.js'
 import { describe, it, expect, vi } from 'vitest'
 
 /**

package/src/validate.integration.spec.ts

@@ -1,15 +1,12 @@
 import { Injector } from '@furystack/inject'
 import { createClient, ResponseError } from '@furystack/rest-client-fetch'
 import { usingAsync } from '@furystack/utils'
-import { JsonResult } from './request-action-implementation'
-import { Validate } from './validate'
-import './helpers'
-
+import { JsonResult } from './request-action-implementation.js'
+import { Validate } from './validate.js'
 import schema from './validate.integration.spec.schema.json' assert { type: 'json' }
-import type { ValidationApi } from './validate.integration.schema'
-import { useRestService } from './helpers'
+import type { ValidationApi } from './validate.integration.schema.js'
+import { useRestService } from './helpers.js'
 import { describe, it, expect } from 'vitest'
-import { assert } from 'console'
 
 // To recreate: yarn ts-json-schema-generator -f tsconfig.json --no-type-check -p packages/rest-service/src/validate.integration.schema.ts -o packages/rest-service/src/validate.integration.spec.schema.json