new type system

experimental/typeSystem.ts

@@ -0,0 +1,115 @@
+// Basic types
+
+// Options
+type Options = {
+  queryOptions: QueryOptions;
+  resolveMap: ResolveMap<any>;
+  branchMap: BranchMap<any>;
+};
+type QueryOptions = {
+  unique?: true;
+  name: string;
+} | {
+  only?: string[];
+} | {};
+
+type ResolveMap<T> = {
+  [K in keyof T]: Morphism<
+    {
+      type: "morphism";
+      branch: undefined;
+
+    }
+  >;
+};
+
+type BranchMap<T> = {
+    [K in keyof T]: Morphism<
+      {
+        type: "morphism";
+        branch: boolean | undefined;
+      }
+    >;
+  };
+
+
+// Map
+
+type typeMorphism = "response" | "request" | "morphism" | "base";
+
+type HasPath<P extends Map> = P extends { hasPath: true }
+  ? { readonly path: string }
+  : {};
+
+type HasType<P extends Map> = P extends { type: typeMorphism }
+  ? P extends { typeNotNeeded: true } ? {}
+  : P extends { type: "morphism" } ? {}
+  : { readonly type: P["type"] }
+  : {};
+
+type ExtraKeys<P extends Map> = HasPath<P> & HasType<P>;
+
+type Map = {
+  hasPath?: boolean;
+  typeNotNeeded?: boolean;
+  type?: typeMorphism;
+  branch?: boolean;
+  isAPetition?: boolean;
+  mutable?: true;
+  specificReturnType?: boolean;
+  returnType?: unknown;
+};
+
+type Morphism<
+  MO extends Map = Map,
+  OP extends Options = Options,
+  R = any,
+> =
+   {
+    readonly active?: MO["isAPetition"] extends true ? boolean : never;
+    readonly isUsing?: MO["isAPetition"] extends true ? string[] : never;
+    readonly query?: OP['queryOptions'];
+    readonly branch?: OP["branchMap"];
+    readonly resolve?: OP["resolveMap"];
+    readonly r?: MO["type"] extends "response"
+      ? (r: Request) => Promise<Response> | Response
+      : never;
+    readonly f: {
+      (
+        ctx: Ctx<
+        OP['queryOptions']
+        >,
+      ): MO["specificReturnType"] extends true ? MO["returnType"]
+        : MO["type"] extends "response" ? Response | Promise<Response>
+        : MO["type"] extends "request" ? Response | Promise<Response>
+        : MO["type"] extends "base" ? BodyInit | Promise<BodyInit> | null
+        : R;
+    };
+  }
+  & ExtraKeys<MO>;
+
+interface Ctx<
+    QueryType = any
+> {
+  //resolve: { [V in keyof R]: Awaited<ReturnType<R[V]["f"]>> };
+  query: QueryType
+}
+
+
+
+
+
+const ff = < 
+a  extends { type: "morphism"}, 
+B extends  > ( d : Morphism<a,B>) =>  ''
+
+
+
+ff({
+    query: {
+        unique: true,
+        name: 'ji'
+    },
+    // This type should be string
+    f: s => s.query
+})

src/composer/throws.ts

@@ -1,35 +1,30 @@
-const genericError =  new Response(null, {
-    status: 500
-  })
-
-  const throwable = (f: (r:Request) => Response ) => (r:Request) => {
-
-    try {
-      return f(r)
-    }catch(e){
-
-      if( e instanceof Response ){
-        return e
-      }
-
-      return genericError.clone()
+const genericError = new Response(null, {
+  status: 500,
+});
+
+const throwable = (f: (r: Request) => Response) => (r: Request) => {
+  try {
+    return f(r);
+  } catch (e) {
+    if (e instanceof Response) {
+      return e;
     }
+
+    return genericError.clone();
   }
-
-  const asyncThrowable = (f: (r:Request) => Promise<Response> ) => async (r:Request) => {
-
+};
+
+const asyncThrowable =
+  (f: (r: Request) => Promise<Response>) => async (r: Request) => {
     try {
-      return await f(r)
-    }catch(e){
-
-      if( e instanceof Response ){
-        return e
+      return await f(r);
+    } catch (e) {
+      if (e instanceof Response) {
+        return e;
       }
-  
-      return genericError.clone()
+
+      return genericError.clone();
     }
-  }
+  };
 
-  export {
-    throwable , asyncThrowable
-  }
+export { asyncThrowable, throwable };

src/staticFiles/staticFileTools.ts

@@ -13,17 +13,13 @@ export default {
   join: (base: string) => (target: string): string =>
     base.endsWith("/") ? base + target : base + "/" + target,
 
-  // Checks 
+  // Checks
   mimeForm: (f: fileServerPetition<any>) =>
-    "mime" in f && f.mime === false
-      ? []
-      : f.extra
-        // Creates a map of mime and overwrites the extra keys if already exist
-      ? [... f.extra.reduce( ( map , v) =>  ( 
-        map.set(v[0], v[1]),
-        map
-      ) ,  new Map<string,string>(mime))]
-
+    "mime" in f && f.mime === false ? [] : f.extra
+      // Creates a map of mime and overwrites the extra keys if already exist
+      ? [...f.extra.reduce((map, v) => (
+        map.set(v[0], v[1]), map
+      ), new Map<string, string>(mime))]
       : mime,
 
   getMime: (mimes: [string, string][]) => (ext: string): string =>
@@ -48,7 +44,6 @@ export default {
               x.path.includes(y)
             ),
           ),
-
       ) as Petition[]
       : petitions,
 

test/staticFile/mime.test.ts

@@ -29,7 +29,7 @@ test(
         type: "fileServer",
         path: "./",
         name: "/hello/",
-      }).find( val => val[0] === '.ts'),
+      }).find((val) => val[0] === ".ts"),
       [".ts", "video/mp2t"],
     );
     assertEquals(
@@ -38,7 +38,7 @@ test(
         path: "./",
         name: "/hello/",
         extra: [[".ts", "hello/hello"]],
-      }).find( val => val[0] === '.ts'),
+      }).find((val) => val[0] === ".ts"),
       [".ts", "hello/hello"],
     );
   },