From cbb18d516db7f3cbd1046b8536da7c630ce1558d Mon Sep 17 00:00:00 2001
From: ton1c <sembl1@ya.ru>
Date: Tue, 4 Feb 2025 15:03:39 +0300
Subject: [PATCH] working on api validator interface

---
 shared/utils/api.ts       | 33 ++++++++++++++++++++++-----------
 shared/utils/result.ts    | 13 +++++++++++--
 shared/utils/validator.ts |  4 ++--
 test1.ts                  |  2 +-
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/shared/utils/api.ts b/shared/utils/api.ts
index e4a1069..26f3669 100644
--- a/shared/utils/api.ts
+++ b/shared/utils/api.ts
@@ -1,7 +1,14 @@
-import { Result } from "@shared/utils/result.ts";
-import { Schema } from "@shared/utils/validator.ts";
+import { type Result } from "@shared/utils/result.ts";
+import { type InferSchema, Schema } from "@shared/utils/validator.ts";
 
-class ApiRoute<
+export type ExtractRouteParams<T extends string> = T extends string
+    ? T extends `${infer _Start}:${infer Param}/${infer Rest}`
+        ? Param | ExtractRouteParams<Rest>
+    : T extends `${infer _Start}:${infer Param}` ? Param
+    : never
+    : never;
+
+class ClientApi<
     Path extends string,
     ReqSchema extends Schema<any>,
     ResSchema extends Schema<any>,
@@ -12,12 +19,16 @@ class ApiRoute<
         public readonly resSchema: ResSchema,
     ) {
     }
-}
 
-export type ExtractRouteParams<T extends string> = T extends string
-    ? T extends `${infer _Start}:${infer Param}/${infer Rest}`
-        ? Param | ExtractRouteParams<Rest>
-    : T extends `${infer _Start}:${infer Param}` ? Param
-    : T extends `${infer _Start}*` ? "restOfThePath"
-    : never
-    : never;
+    makeRequest(
+        reqBody: InferSchemaType<ReqSchema>,
+        params?: ExtractRouteParams<Path>,
+    ) {
+        const pathWithParams = this.path.split("/").map((segment) => {
+            if (segment.startsWith(":")) {
+                return params[segment.slice(1)];
+            }
+            return segment;
+        });
+    }
+}
diff --git a/shared/utils/result.ts b/shared/utils/result.ts
index 1b92f63..313ac50 100644
--- a/shared/utils/result.ts
+++ b/shared/utils/result.ts
@@ -20,7 +20,9 @@ interface IResult<T, E> {
     mapErr<U>(fn: (err: E) => U): Result<T, U>;
     mapErrAsync<U>(fn: (err: E) => Promise<U>): ResultAsync<T, U>;
     andThen<U, F>(fn: (value: T) => Result<U, F>): Result<U, E | F>;
-    andThenAsync<U, F>(fn: (value: T) => ResultAsync<U, F>): ResultAsync<U, F>;
+    andThenAsync<U, F>(
+        fn: (value: T) => ResultAsync<U, F>,
+    ): ResultAsync<U, E | F>;
     flatten(): FlattenResult<Result<T, E>>;
     flattenOption<U>(errFn: () => U): Result<UnwrapOption<T>, U | E>;
     flattenOptionOr<D = UnwrapOption<T>>(
@@ -119,7 +121,9 @@ export class Ok<T, E> implements IResult<T, E> {
         return fn(this.value) as Result<U, E | F>;
     }
 
-    andThenAsync<U, F>(fn: (value: T) => ResultAsync<U, F>): ResultAsync<U, F> {
+    andThenAsync<U, F>(
+        fn: (value: T) => ResultAsync<U, F>,
+    ): ResultAsync<U, E | F> {
         return fn(this.value);
     }
 
@@ -254,6 +258,11 @@ export class Err<T, E> implements IResult<T, E> {
     andThen<U, F>(fn: (value: T) => Result<U, F>): Result<U, E | F> {
         return new Err<U, E | F>(this.error);
     }
+    andThenAsync<U, F>(
+        fn: (value: T) => ResultAsync<U, F>,
+    ): ResultAsync<U, E | F> {
+        return new Err<U, E | F>(this.error).toAsync();
+    }
     flatten(): FlattenResult<Result<T, E>> {
         return flattenResult(this);
     }
diff --git a/shared/utils/validator.ts b/shared/utils/validator.ts
index f71d154..594f8ed 100644
--- a/shared/utils/validator.ts
+++ b/shared/utils/validator.ts
@@ -641,8 +641,6 @@ class NeverSchema extends BaseSchema<never> {
     }
 }
 
-type InferSchemaType<S> = S extends Schema<infer T> ? T : never;
-
 class ObjectSchema<S extends Record<string, Schema<any>>>
     extends BaseSchema<{ [K in keyof S]: InferSchemaType<S[K]> }> {
     private strictMode: boolean = false;
@@ -1205,3 +1203,5 @@ export const z = {
         schema: T,
     ) => new OptionSchema<T>(schema),
 };
+
+export type InferSchemaType<S> = S extends Schema<infer T> ? T : never;
diff --git a/test1.ts b/test1.ts
index e9f9f75..dae100e 100644
--- a/test1.ts
+++ b/test1.ts
@@ -345,7 +345,7 @@ if (res.isErr()) {
 }
 
 // Utility Types
-type InferSchema<S> = S extends Schema<infer T> ? T : never;
+export type InferSchema<S> = S extends Schema<infer T> ? T : never;
 type InferSchemaUnion<S extends Schema<any>[]> = S[number] extends
     Schema<infer U> ? U : never;
 type NestedArray<T> = T | NestedArray<T>[];