Adding fileServer to plugins

fun.ts

@@ -13,11 +13,11 @@ import type { fileServerPetition, Petition } from "./src/morphism.ts";
 type vixeny = (
   o?: FunRouterOptions<any>,
 ) => (
-  routes: (Petition | fileServerPetition)[],
+  routes: (Petition | fileServerPetition<any>)[],
 ) => (r: Request) => Promise<Response> | Response;
 
 export default ((o?: FunRouterOptions<any>) =>
-(routes: (Petition | fileServerPetition)[]) =>
+(routes: (Petition | fileServerPetition<any>)[]) =>
   ((re) =>
     ((map) =>
       ((s) => (r: Request): Promise<Response> | Response => map[s(r)](r))(

src/composer/mainComposer.ts

@@ -9,7 +9,7 @@ import type { fileServerPetition, Petition } from "../morphism.ts";
 
 export default (
   o?: FunRouterOptions<any>,
-): (routes: (Petition | fileServerPetition)[]) => RouteTypes[] =>
+): (routes: (Petition | fileServerPetition<any>)[]) => RouteTypes[] =>
 (ar) =>
   ar
     .filter(

src/exportable/plugin.ts

@@ -1,6 +1,6 @@
 //TODO: add
 import composerTools from "../composer/composerTools.ts";
-import type { Petition, StaticFilePlugin } from "../morphism.ts";
+import type { Petition, StaticFilePlugin, fileServerPetition } from "../morphism.ts";
 import checkerTools from "../composer/checkPetition/checkTools.ts";
 import {
   type CyclePlugin,
@@ -110,6 +110,7 @@ export default {
    * only the relevant context elements are included
    */
   isUsing: composerTools.isUsing,
+  fileServer: <MI extends true | false > (s:fileServerPetition<MI>):fileServerPetition<MI> => s,
   staticFilePlugin: <
     TP extends "response" | "request" | undefined,
     O extends StaticFilePlugin<TP>,

src/morphism.ts

@@ -1019,24 +1019,15 @@ export type StaticFilePluginExtensions<
 /**
  * Object for raw response static.
  */
-export type fileServerPetition =
-  & ({
-    type: "fileServer";
-    name: string;
-    path: string;
-  } | {
-    type: "fileServer";
-    name: string;
-    path: string;
-    mime?: true;
-    extra: [string, string][];
-  } | {
+export type fileServerPetition <
+  MI extends true | false
+> =
+  {
     type: "fileServer";
     name: string;
     path: string;
-    mime: false;
-  })
-  & {
+    mime?: MI;
+    extra?: MI extends true  ? [string, string][] : never;
     template?: StaticFilePlugin<any>[];
     removeExtensionOf?: defaultMime[];
     slashIs?: string;

src/staticFiles/composedPaths.ts

@@ -3,7 +3,7 @@ import staticFileTools from "./staticFileTools.ts";
 
 //TODO: make it more readable 🙏
 
-export default (f: fileServerPetition) =>
+export default (f: fileServerPetition<any>) =>
 (name: string) =>
 (root: string) =>
 (paths: string[]) =>

src/staticFiles/staticFileMain.ts

@@ -2,7 +2,7 @@ import type { fileServerPetition } from "../morphism.ts";
 import composedPaths from "./composedPaths.ts";
 import staticFileTools from "./staticFileTools.ts";
 
-export default (maybeOfFiles?: string[]) => (f: fileServerPetition) =>
+export default (maybeOfFiles?: string[]) => (f: fileServerPetition<any>) =>
   staticFileTools.removeExtension(f)(
     composedPaths(f)(staticFileTools.rectify(f.path))(
       staticFileTools.rectify(f.name),

src/staticFiles/staticFileTools.ts

@@ -11,17 +11,17 @@ export default {
   join: (base: string) => (target: string): string =>
     base.endsWith("/") ? base + target : base + "/" + target,
 
-  mimeForm: (f: fileServerPetition) =>
+  mimeForm: (f: fileServerPetition<any>) =>
     "mime" in f && f.mime === false
       ? []
       : "extra" in f
-      ? mime.concat(f.extra)
+      ? mime.concat(f.extra as [string,string][]) 
       : mime,
 
   getMime: (mimes: [string, string][]) => (ext: string): string =>
     (mimes.find((x) => x[0] === ext) || [".txt", "text/html"])[1],
 
-  removeExtension: (f: fileServerPetition) => (petitions: Petition[]) =>
+  removeExtension: (f: fileServerPetition<any>) => (petitions: Petition[]) =>
     f.removeExtensionOf && Array.isArray(f.removeExtensionOf)
       ? petitions.map(
         (x) =>

test/staticFile/main.test.ts

@@ -1,7 +1,7 @@
 import { assertEquals } from "@std/assert";
 import { test } from "@cross/test";
 import main from "../../src/staticFiles/staticFileMain.ts";
-import { petitions } from "../../src/morphism.ts";
+import { petitions, type fileServerPetition } from "../../src/morphism.ts";
 
 test(
   "static file checking logo",
@@ -76,7 +76,7 @@ test(
               r: () => new Response(""),
             }),
         }],
-      })
+      } as fileServerPetition<false>)
         .some((x) => x.path === "/hello/nested/logo"),
       true,
     ),