transit-kit 0.2.1 → 0.3.0

package/README.md

@@ -1 +1,4 @@
-# declarative-server
+# transit-kit
+
+[![CI](https://github.com/D4rkr34lm/transit-kit/actions/workflows/ci.yml/badge.svg)](https://github.com/D4rkr34lm/transit-kit/actions/workflows/ci.yml)
+[![Coverage Status](https://coveralls.io/repos/github/D4rkr34lm/transit-kit/badge.svg?branch=main)](https://coveralls.io/github/D4rkr34lm/transit-kit?branch=main)

package/dist/cli/generateOpenApi.d.ts

@@ -1,2 +1,11 @@
+import { HttpMethod } from "../server/constants/HttpMethods";
+import { ApiEndpointDefinition } from "../server/handlers/api/EndpointDefinition";
+import { GenericResponseSchemaMap } from "../server/handlers/api/responses";
+import { ZodType } from "zod";
 import { OpenAPIV3 } from "openapi-types";
+declare function translateToOpenAPIPathItem(definition: ApiEndpointDefinition<string, HttpMethod, ZodType | undefined, ZodType | undefined, GenericResponseSchemaMap>): [string, OpenAPIV3.PathItemObject];
 export declare function generateOpenApiDoc(targetPath: string): Promise<OpenAPIV3.Document<{}>>;
+export declare const __TEST_EXPORTS: {
+    translateToOpenAPIPathItem: typeof translateToOpenAPIPathItem;
+};
+export {};

package/dist/cli/generateOpenApi.js

@@ -128,3 +128,6 @@ export async function generateOpenApiDoc(targetPath) {
         throw new Error("The specified module does not export a valid server instance.");
     }
 }
+export const __TEST_EXPORTS = {
+    translateToOpenAPIPathItem,
+};

package/dist/cli/generateOpenApi.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cli/generateOpenApi.spec.js

@@ -0,0 +1,65 @@
+import { describe, expect, it } from "vitest";
+import z from "zod";
+import { createApiEndpointHandler } from "../server";
+import { __TEST_EXPORTS } from "./generateOpenApi";
+const { translateToOpenAPIPathItem } = __TEST_EXPORTS;
+describe("translateToOpenAPIPathItem", () => {
+    it("should translate endpoint definitions to OpenAPI path items", () => {
+        const { definition } = createApiEndpointHandler({
+            method: "get",
+            path: "/users/:id",
+            meta: {
+                name: "getUser",
+                description: "Retrieve a user by ID",
+                group: "User",
+            },
+            responseSchemas: {
+                200: {
+                    dataType: "application/json",
+                    dataSchema: z.string(),
+                },
+            },
+        }, async (req) => {
+            return {
+                code: 200,
+                dataType: "application/json",
+                json: req.params.id,
+            };
+        });
+        const [path, pathItem] = translateToOpenAPIPathItem(definition);
+        const expectedPath = "/users/{id}";
+        const expectedSchema = {
+            $schema: "https://json-schema.org/draft/2020-12/schema",
+            type: "string",
+        };
+        const expectedPathItem = {
+            get: {
+                operationId: "getUser",
+                summary: "Retrieve a user by ID",
+                tags: ["User"],
+                description: "Retrieve a user by ID",
+                parameters: [
+                    {
+                        description: "Path parameter :id",
+                        name: "id",
+                        in: "path",
+                        required: true,
+                        schema: { type: "string" },
+                    },
+                ],
+                responses: {
+                    "200": {
+                        description: "Response for status code 200",
+                        content: {
+                            "application/json": {
+                                schema: expectedSchema,
+                            },
+                        },
+                    },
+                },
+            },
+        };
+        expect(path).toBe(expectedPath);
+        expect(pathItem).toEqual(expectedPathItem);
+    });
+});

package/dist/server/handlers/api/ApiEndpoint.d.ts

@@ -0,0 +1,9 @@
+import z from "zod";
+import { HttpMethod } from "../../constants/HttpMethods";
+import { ApiEndpointDefinition } from "./EndpointDefinition";
+import { HandlerForDefinition } from "./HandlerFromDefinition";
+import { GenericResponseSchemaMap } from "./responses";
+export interface ApiEndpoint<Path extends string = string, Method extends HttpMethod = HttpMethod, RequestBody extends z.ZodType | undefined = undefined | z.ZodType, Query extends z.ZodType | undefined = undefined | z.ZodType, ResponseMap extends GenericResponseSchemaMap = GenericResponseSchemaMap, Handler extends HandlerForDefinition<Path, RequestBody, Query, ResponseMap> = HandlerForDefinition<Path, RequestBody, Query, ResponseMap>> {
+    definition: ApiEndpointDefinition<Path, Method, RequestBody, Query, ResponseMap>;
+    handler: Handler;
+}

package/dist/server/handlers/api/ApiEndpoint.js

@@ -0,0 +1 @@
+export {};

package/dist/server/handlers/api/EndpointDefinition.d.ts

@@ -6,7 +6,7 @@ export interface ApiEndpointMeta {
     group: string;
     description: string;
 }
-export type ApiEndpointDefinition<Path extends string, Method extends HttpMethod, RequestBody extends z.ZodType | undefined, Query extends z.ZodType | undefined, ResponseMap extends GenericResponseSchemaMap> = {
+export type ApiEndpointDefinition<Path extends string = string, Method extends HttpMethod = HttpMethod, RequestBody extends z.ZodType | undefined = z.ZodType | undefined, Query extends z.ZodType | undefined = z.ZodType | undefined, ResponseMap extends GenericResponseSchemaMap = GenericResponseSchemaMap> = {
     meta: ApiEndpointMeta;
     path: Path;
     method: Method;

package/dist/server/handlers/api/HandlerFromDefinition.d.ts

@@ -4,8 +4,8 @@ import { Prettify } from "../../utils/types";
 import { ApiEndpointHandler } from "./EndpointHandler";
 import { ExtractPathParams } from "./PathParameters";
 import { EmptyResponse, EmptyResponseSchema } from "./responses/emptyResponse";
-import { GenericResponseSchemaMap } from "./responses/index";
+import { GenericResponse, GenericResponseSchemaMap } from "./responses/index";
 import { JsonResponseSchema, JsonResponseSchemaToResponseType } from "./responses/jsonResponse";
-export type HandlerForDefinition<Path extends string, RequestBody extends z.ZodType | undefined, Query extends z.ZodType | undefined, ResponsesMap extends GenericResponseSchemaMap> = ApiEndpointHandler<ExtractPathParams<Path>, RequestBody extends undefined ? undefined : z.infer<RequestBody>, Query extends undefined ? undefined : z.infer<Query>, Prettify<{
-    [K in keyof ResponsesMap]: K extends HttpStatusCode ? ResponsesMap[K] extends JsonResponseSchema ? JsonResponseSchemaToResponseType<K, ResponsesMap[K]> : ResponsesMap[K] extends EmptyResponseSchema ? EmptyResponse<K> : never : never;
-}[keyof ResponsesMap]>>;
+export type HandlerForDefinition<Path extends string, RequestBody extends z.ZodType | undefined, Query extends z.ZodType | undefined, ResponsesMap extends GenericResponseSchemaMap> = ApiEndpointHandler<ExtractPathParams<Path>, RequestBody extends undefined ? undefined : z.infer<RequestBody>, Query extends undefined ? undefined : z.infer<Query>, Exclude<Prettify<{
+    [K in keyof ResponsesMap]: K extends HttpStatusCode ? ResponsesMap[K] extends JsonResponseSchema ? JsonResponseSchemaToResponseType<K, ResponsesMap[K]> : ResponsesMap[K] extends EmptyResponseSchema ? EmptyResponse<K> : ResponsesMap[K] extends undefined ? never : GenericResponse : never;
+}[keyof ResponsesMap]>, undefined>>;

package/dist/server/handlers/api/createApiHandler.d.ts

@@ -1,11 +1,19 @@
 import z from "zod";
 import { HttpMethod } from "../../constants/HttpMethods";
+import { Prettify } from "../../utils/types";
 import { ApiEndpointDefinition } from "./EndpointDefinition";
 import { ApiEndpointHandler } from "./EndpointHandler";
 import { HandlerForDefinition } from "./HandlerFromDefinition";
 import { GenericResponse, GenericResponseSchemaMap } from "./responses";
-export declare function createApiEndpointHandler<const ResponsesMap extends GenericResponseSchemaMap, const Path extends string, const Method extends HttpMethod, const RequestBody extends z.ZodType | undefined = undefined, const Query extends z.ZodType | undefined = undefined>(definition: ApiEndpointDefinition<Path, Method, RequestBody, Query, ResponsesMap>, handler: HandlerForDefinition<Path, RequestBody, Query, ResponsesMap>): {
-    definition: ApiEndpointDefinition<Path, Method, RequestBody, Query, ResponsesMap>;
+export declare function createApiEndpointHandler<const ResponsesMap extends GenericResponseSchemaMap, const Path extends string, const Method extends HttpMethod, const RequestBody extends z.ZodType | undefined = undefined, const Query extends z.ZodType | undefined = undefined>(definition: Prettify<ApiEndpointDefinition<Path, Method, RequestBody, Query, ResponsesMap>>, handler: HandlerForDefinition<Path, RequestBody, Query, ResponsesMap>): {
+    definition: {
+        meta: import("./EndpointDefinition").ApiEndpointMeta;
+        path: Path;
+        method: Method;
+        requestBodySchema?: RequestBody | undefined;
+        querySchema?: Query | undefined;
+        responseSchemas: ResponsesMap;
+    };
     handler: HandlerForDefinition<Path, RequestBody, Query, ResponsesMap>;
 };
-export declare function buildApiEndpointHandler(handler: ApiEndpointHandler<Record<string, string>, unknown, unknown, GenericResponse>): import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+export declare function buildApiEndpointHandler<Handler extends ApiEndpointHandler<Record<string, string>, unknown, unknown, GenericResponse>>(handler: Handler): import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;

package/dist/server/handlers/api/createApiHandler.spec.js

@@ -2,6 +2,7 @@ import { describe, it } from "vitest";
 import { createServer } from "../../server";
 import { createApiEndpointHandler } from "./createApiHandler";
 import testRequest from "supertest";
+import z from "zod";
 describe("createApiHandler", () => {
     it("can create an API handler", () => {
         const endpoint = createApiEndpointHandler({
@@ -12,6 +13,7 @@ describe("createApiHandler", () => {
             },
             method: "get",
             path: "/test",
+            requestBodySchema: z.string(),
             responseSchemas: {
                 200: {},
             },
@@ -24,8 +26,8 @@ describe("createApiHandler", () => {
             inDevMode: true,
             port: 3000,
             logger: false,
-            endpoints: [endpoint],
         });
+        server.registerApiEndpoint(endpoint);
         testRequest(server.expressApp).get("/test").expect(200);
     });
 });

package/dist/server/server.d.ts

@@ -1,23 +1,20 @@
 import { Application } from "express";
-import z from "zod";
-import { HttpMethod } from "./constants/HttpMethods";
 import { ApiEndpointDefinition } from "./handlers/api/EndpointDefinition";
-import { ApiEndpointHandler } from "./handlers/api/EndpointHandler";
-import { GenericResponse, GenericResponseSchemaMap } from "./handlers/api/responses";
+import { HandlerForDefinition } from "./handlers/api/HandlerFromDefinition";
 import { Logger } from "./utils/logging";
 export interface ServerConfig {
     inDevMode: boolean;
     port: number;
     logger: Logger | boolean;
-    endpoints: Array<{
-        handler: ApiEndpointHandler<Record<string, string>, any, any, GenericResponse>;
-        definition: ApiEndpointDefinition<string, HttpMethod, z.ZodType | undefined, z.ZodType | undefined, GenericResponseSchemaMap>;
-    }>;
 }
 export interface Server {
     expressApp: Application;
     logger: Logger | boolean;
-    endpointDefinitions: ApiEndpointDefinition<string, HttpMethod, z.ZodType | undefined, z.ZodType | undefined, GenericResponseSchemaMap>[];
+    endpointDefinitions: ApiEndpointDefinition[];
+    registerApiEndpoint<Definition extends ApiEndpointDefinition>({ definition, handler, }: {
+        definition: Definition;
+        handler: HandlerForDefinition<Definition["path"], Definition["requestBodySchema"], Definition["querySchema"], Definition["responseSchemas"]>;
+    }): void;
     start: () => void;
 }
 export declare function createServer(config: ServerConfig): Server;

package/dist/server/server.js

@@ -5,20 +5,21 @@ import { buildRequestLogger, buildResponseLogger } from "./middleware/logging";
 import { buildBodyValidatorMiddleware, buildQueryValidatorMiddleware, } from "./middleware/validation";
 import { NoOpLogger } from "./utils/logging";
 import { hasNoValue, hasValue } from "./utils/typeGuards";
-function registerApiEndpoint(expressApp, endpointDefinition, endpointHandler) {
+function registerApiEndpoint(expressApp, endpoint) {
+    const { definition, handler } = endpoint;
     const handlerStack = [
-        hasValue(endpointDefinition.querySchema)
-            ? buildQueryValidatorMiddleware(endpointDefinition.querySchema)
+        hasValue(definition.querySchema)
+            ? buildQueryValidatorMiddleware(definition.querySchema)
             : null,
-        hasValue(endpointDefinition.requestBodySchema)
-            ? buildBodyValidatorMiddleware(endpointDefinition.requestBodySchema)
+        hasValue(definition.requestBodySchema)
+            ? buildBodyValidatorMiddleware(definition.requestBodySchema)
             : null,
-        buildApiEndpointHandler(endpointHandler),
+        buildApiEndpointHandler(handler),
     ].filter(hasValue);
-    expressApp[endpointDefinition.method](endpointDefinition.path, handlerStack);
+    expressApp[definition.method](definition.path, handlerStack);
 }
 export function createServer(config) {
-    const { port, inDevMode, endpoints } = config;
+    const { port, inDevMode } = config;
     const logger = config.logger === true
         ? console
         : config.logger === false || hasNoValue(config.logger)
@@ -30,14 +31,14 @@ export function createServer(config) {
     app.use(cookieParser());
     app.use(buildRequestLogger(logger, inDevMode));
     app.use(buildResponseLogger(logger, inDevMode));
-    endpoints.forEach(({ definition, handler }) => {
-        registerApiEndpoint(app, definition, handler);
-    });
     return {
         expressApp: app,
         logger: logger,
-        endpointDefinitions: endpoints.map((e) => e.definition),
-        start: () => {
+        endpointDefinitions: [],
+        registerApiEndpoint(endpoint) {
+            registerApiEndpoint(app, endpoint);
+        },
+        start() {
             app.listen(port);
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "transit-kit",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "A declarative TypeScript framework for building type-safe Express.js APIs with automatic OpenAPI generation",
   "keywords": [
     "express",
@@ -28,9 +28,9 @@
   ],
   "exports": {
     "./server": {
+      "types": "./dist/server/server.d.ts",
       "import": "./dist/server/index.js",
-      "require": "./dist/server/index.js",
-      "types": "./dist/server/server.d.ts"
+      "require": "./dist/server/index.js"
     }
   },
   "bin": "./dist/cli/cli.js",