Merge pull request #131 from ty-ras/issue/129-proper-context-for-endp…

…oint-creation-result #129 Application builder should return endpoint w…
ty-ras · Feb 14, 2024 · f234279 · f234279
2 parents ef1e6ab + 26f7849
commit f234279
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/endpoint-spec/package.json b/endpoint-spec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ty-ras/endpoint-spec",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": {
     "name": "Stanislav Muhametsin",
     "email": "346799+stazz@users.noreply.github.com",

diff --git a/endpoint-spec/src/__test__/endpoint-validation.ts b/endpoint-spec/src/__test__/endpoint-validation.ts
@@ -11,7 +11,9 @@ import type * as mp from "./missing-parts";
 
 export const validateEndpoint = async (
   c: ExecutionContext,
-  endpoint: ep.AppEndpoint<mp.ServerContext, mp.DefaultStateInfo>,
+  endpoint:
+    | ep.AppEndpoint<never, mp.DefaultStateInfo>
+    | ep.AppEndpoint<mp.ServerContext, mp.DefaultStateInfo>,
   getInstanceData: () => ReadonlyArray<unknown>,
   prefix = "/api/something",
   processFlattenedHandlerInfo: (info: Array<unknown>) => Array<unknown> = (
@@ -32,12 +34,19 @@ export const validateEndpoint = async (
 ) => {
   c.truthy(endpoint, "Given endpoint must be of given type");
 
-  const { handler, url } = endpoint.getRegExpAndHandler("");
+  const finalized = endpoint.getRegExpAndHandler("") as ep.FinalizedAppEndpoint<
+    mp.ServerContext | never,
+    mp.DefaultStateInfo
+  >;
+  const { handler, url } = finalized;
   c.deepEqual(
     url.source,
     `${ep.escapeRegExp(prefix).replaceAll("/", "\\/")}\\/(?<urlParam>[^/]+)`,
   );
-  const methodOK = handler(
+  const methodOK: ep.AppEndpointHandlerGetterResult<
+    mp.ServerContext | never,
+    mp.DefaultStateInfo
+  > = handler(
     method,
     // 2nd argument is not used by these endpoints, only by the ones produced by endpoint-prefix library
     {},
@@ -68,7 +77,7 @@ export const validateEndpoint = async (
       ]),
     );
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const args: ep.AppEndpointHandlerFunctionArgs<mp.ServerContext> =
+    const args: ep.AppEndpointHandlerFunctionArgs<mp.ServerContext | never> =
       processHandlerArgs({
         context: { req: "req", res: "res" },
         state: {

diff --git a/endpoint-spec/src/api.types/app.types.ts b/endpoint-spec/src/api.types/app.types.ts
@@ -90,7 +90,7 @@ export interface ApplicationBuilderGeneric<
     ...endpoints: [EndpointCreationArg, ...Array<EndpointCreationArg>]
   ) => EndpointsCreationResult<
     TMetadataProviders,
-    TServerContextPossible,
+    TServerContextArg,
     dataBE.MaterializeStateInfo<
       TStateHKT,
       dataBE.MaterializeStateSpecBase<TStateHKT>