Allow path variable in basePath

Author: mpppk

src/fetch/index.t-test.ts

@@ -1,4 +1,4 @@
-import { AsJsonApi, DefineApiEndpoints } from "../common";
+import { AsJsonApi, DefineApiEndpoints, ParseURL, Replace } from "../common";
 import FetchT from "./index";
 import JSONT from "../json";
 
@@ -138,3 +138,29 @@ import JSONT from "../json";
     });
   })();
 }
+
+{
+  type Spec = DefineApiEndpoints<{
+    "/packages/list": {
+      get: {
+        headers: { Cookie: `a=${string}` };
+        resBody: {
+          200: { prop: string };
+        };
+      };
+    };
+  }>;
+  (async () => {
+    const basePath = "/api/projects/:projectName/workflow";
+    const f = fetch as FetchT<typeof basePath, Spec>;
+    const res = await f(
+      `/api/projects/projectA/workflow/packages/list?state=true`,
+      {
+        headers: { Cookie: "a=b" },
+      },
+    );
+    if (res.ok) {
+      (await res.json()).prop;
+    }
+  })();
+}

src/fetch/index.ts

@@ -37,7 +37,7 @@ type FetchT<UrlPrefix extends UrlPrefixPattern, E extends ApiEndpoints> = <
     | `${ToUrlParamPattern<UrlPrefix>}${ToUrlParamPattern<keyof E & string>}`
     | `${ToUrlParamPattern<UrlPrefix>}${ToUrlParamPattern<keyof E & string>}?${string}`,
   InputPath extends NormalizePath<
-    ParseURL<Replace<Input, UrlPrefix, "">>["path"]
+    ParseURL<Replace<Input, ToUrlParamPattern<UrlPrefix>, "">>["path"]
   >,
   CandidatePaths extends MatchedPatterns<InputPath, keyof E & string>,
   InputMethod extends CaseInsensitiveMethod = "get",