From 7fa68c8272edb9cabd4cccfce32cf5565e703433 Mon Sep 17 00:00:00 2001
From: mpppk <niboshiporipori@gmail.com>
Date: Wed, 3 Jul 2024 01:55:18 +0900
Subject: [PATCH] =?UTF-8?q?basePath=E3=81=ABpath=E3=81=8C=E5=90=AB?=
 =?UTF-8?q?=E3=81=BE=E3=82=8C=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=ABfetchT?=
 =?UTF-8?q?=E3=81=A7=E5=9E=8B=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA?=
 =?UTF-8?q?=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/url.t-test.ts  | 10 +++++++---
 src/common/url.ts         | 12 +++++++-----
 src/fetch/index.t-test.ts | 26 ++++++++++++++++++++++++++
 src/fetch/index.ts        | 16 +++++++---------
 4 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/common/url.t-test.ts b/src/common/url.t-test.ts
index 0f9170c..990c6d4 100644
--- a/src/common/url.t-test.ts
+++ b/src/common/url.t-test.ts
@@ -29,8 +29,13 @@ type ToUrlParamPatternTestCases = [
   Expect<Equal<ToUrlParamPattern<"/:a/b">, `/${string}/b`>>,
   Expect<Equal<ToUrlParamPattern<"/:a/:b">, `/${string}/${string}`>>,
   Expect<
-    // @ts-expect-error URL is not supported
-    Equal<ToUrlParamPattern<"https://example.com">, `"https://example.com}`>
+    Equal<ToUrlParamPattern<"https://example.com">, "https://example.com">
+  >,
+  Expect<
+    Equal<
+      ToUrlParamPattern<"https://example.com/:a">,
+      `https://example.com/${string}`
+    >
   >,
 ];
 
@@ -45,7 +50,6 @@ type ToUrlPatternTestCases = [
       `/users/${string}?key=value`
     >
   >,
-  // @ts-expect-error URL is not supported
   Expect<Equal<ToUrlPattern<"https://example.com">, "https://example.com">>,
 ];
 
diff --git a/src/common/url.ts b/src/common/url.ts
index d404915..c63fd37 100644
--- a/src/common/url.ts
+++ b/src/common/url.ts
@@ -29,11 +29,13 @@ export type UrlPrefixPattern = `${UrlPrefix}${string}`;
  * // => "/users/${string}"
  * ```
  */
-export type ToUrlParamPattern<T> = T extends `${infer O}:${infer R}`
-  ? R extends `${string}/${infer L}`
-    ? `${O}${string}/${ToUrlParamPattern<L>}`
-    : `${O}${string}`
-  : T;
+export type ToUrlParamPattern<T> = T extends `${infer O}://${infer R}`
+  ? `${O}://${ToUrlParamPattern<R>}`
+  : T extends `${infer O}:${infer R}`
+    ? R extends `${string}/${infer L}`
+      ? `${O}${string}/${ToUrlParamPattern<L>}`
+      : `${O}${string}`
+    : T;
 
 /**
  * Convert URL definition with query to acceptable URL pattern
diff --git a/src/fetch/index.t-test.ts b/src/fetch/index.t-test.ts
index 1d7d9bf..49e4e66 100644
--- a/src/fetch/index.t-test.ts
+++ b/src/fetch/index.t-test.ts
@@ -71,6 +71,12 @@ import JSONT from "../json";
       await f("/users");
     }
 
+    {
+      await f("/users?a=1", {
+        headers: { "Content-Type": "application/json" },
+      });
+    }
+
     {
       const res = await f("/users", {
         method: "post",
@@ -103,3 +109,23 @@ import JSONT from "../json";
     }
   })();
 }
+
+{
+  type Spec = DefineApiEndpoints<{
+    "/users": {
+      get: {
+        headers: { Cookie: `a=${string}` };
+        resBody: {
+          200: { prop: string };
+        };
+      };
+    };
+  }>;
+  (async () => {
+    const basePath = "https://example.com/api";
+    const f = fetch as FetchT<typeof basePath, Spec>;
+    await f(`${basePath}/users`, {
+      headers: { Cookie: "a=b" },
+    });
+  })();
+}
diff --git a/src/fetch/index.ts b/src/fetch/index.ts
index be528dd..320f169 100644
--- a/src/fetch/index.ts
+++ b/src/fetch/index.ts
@@ -5,12 +5,12 @@ import {
   MergeApiResponses,
   Method,
   NormalizePath,
+  ParseURL,
   Replace,
 } from "../common";
 import {
   MatchedPatterns,
   UrlPrefixPattern,
-  ParseURL,
   ToUrlParamPattern,
 } from "../common";
 import { TypedString } from "../json";
@@ -32,15 +32,13 @@ export interface RequestInitT<
 /**
  * FetchT is a type for window.fetch like function but more strict type information
  */
-type FetchT<Origin extends UrlPrefixPattern, E extends ApiEndpoints> = <
+type FetchT<UrlPrefix extends UrlPrefixPattern, E extends ApiEndpoints> = <
   Input extends
-    | `${ToUrlParamPattern<Origin>}${ToUrlParamPattern<keyof E & string>}`
-    | `${ToUrlParamPattern<Origin>}${ToUrlParamPattern<keyof E & string>}?${string}`,
-  InputPath extends Replace<
-    NormalizePath<ParseURL<Input>["path"]>,
-    ToUrlParamPattern<Origin>,
-    ""
-  >,
+    | `${ToUrlParamPattern<UrlPrefix>}${ToUrlParamPattern<keyof E & string>}`
+    | `${ToUrlParamPattern<UrlPrefix>}${ToUrlParamPattern<keyof E & string>}?${string}`,
+  InputPath extends ParseURL<
+    Replace<NormalizePath<Input>, NormalizePath<UrlPrefix>, "">
+  >["path"],
   CandidatePaths extends MatchedPatterns<InputPath, keyof E & string>,
   InputMethod extends CaseInsensitiveMethod = "get",
   M extends Method = Lowercase<InputMethod>,