pushing broken pipe

mimiMonads · Oct 30, 2024 · 7b84eef · 7b84eef
1 parent 3d12ddf
commit 7b84eef
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 37 deletions.
diff --git a/src/components/nativePlugins/session.ts b/src/components/nativePlugins/session.ts
@@ -1,7 +1,7 @@
 import * as plugins from "../../exportable/plugin.ts";
 import { f as cookieParser } from "../cookies/mainCookies.ts";
 import type { Petition } from "../../morphism.ts";
-import type { CyclePlugin } from "../../options.ts";
+
 
 interface InnerElement {
   lastUsed: {
@@ -124,7 +124,7 @@ const session = <
   tolerance?: number;
   autoDeleteTolerance?: number;
   injectMap?: Map<string, R>;
-}): CyclePlugin<{ isFunction: false; return: SessionType<T> }> => {
+}) => {
   // Declaring  map
   const sym = Symbol("session");
   const map = opt?.injectMap ?? new Map<string, R>();
@@ -148,7 +148,7 @@ const session = <
     f: (ctx) => {
       return mapper<T, R>(map)()(opt?.tolerance ?? 300000)(ctx.getPetition());
     },
-  }) as unknown as CyclePlugin<{ isFunction: false; return: SessionType<T> }>;
+  });
 };
 
 export { session };
diff --git a/src/exportable/plugin.ts b/src/exportable/plugin.ts
@@ -7,7 +7,6 @@ import type {
 } from "../morphism.ts";
 import checkerTools from "../composer/checkPetition/checkTools.ts";
 import {
-  type CyclePlugin,
   type FunRouterOptions,
   globalOptions,
 } from "../options.ts";

diff --git a/src/morphism.ts b/src/morphism.ts
@@ -1113,32 +1113,24 @@ export type CryptoOptions = {
   };
 } | {};
 
-export type StaticFilePlugin<
-  TP extends "response" | "request" | undefined,
-> = {
-  checker: (path: string) => boolean;
-  type?: TP;
+type StaticFileOptions = {
+  path: () => string
+  thisOptions: () => fileServerPetition<any> 
+  globalOptions: () => FunRouterOptions<any>
+}
+type StaticFilePlugin <> = {
+  type?: 'add'
   async?: boolean;
-} & StaticFilePluginExtensions<TP>;
+  checker?: (ctx: StaticFileOptions) => boolean;
+  f: (options: {
+    root: string;
+    path: string;
+    o?: FunRouterOptions<any>;
+    relativeName: string;
+  }) => (req: Request) => Response
+} 
+
 
-export type StaticFilePluginExtensions<
-  TP extends "response" | "request" | undefined,
-> = TP extends "request" ? {
-    f: (options: {
-      root: string;
-      path: string;
-      o?: FunRouterOptions<any>;
-      relativeName: string;
-    }) => ReturnType<ReturnType<typeof petitions.custom>>;
-  }
-  : {
-    r: (options: {
-      root: string;
-      path: string;
-      o?: FunRouterOptions<any>;
-      relativeName: string;
-    }) => ReturnType<ReturnType<typeof petitions.response>>;
-  };
 
 /**
  * Object for raw response static.
@@ -1151,7 +1143,7 @@ export type fileServerPetition<
   path: string;
   mime?: MI;
   extra?: MI extends true ? [string, string][] : never;
-  template?: StaticFilePlugin<any>[];
+  template?: StaticFilePlugin[];
   removeExtensionOf?: defaultMime[];
   slashIs?: string;
 };

diff --git a/test/staticFile/main.test.ts b/test/staticFile/main.test.ts
@@ -1,7 +1,8 @@
 import { assertEquals } from "@std/assert";
 import { test } from "@cross/test";
 import main from "../../src/staticFiles/staticFileMain.ts";
-import { type fileServerPetition, petitions } from "../../src/morphism.ts";
+import { type fileServerPetition } from "../../src/morphism.ts";
+
 
 test(
   "static file checking logo",
@@ -68,13 +69,11 @@ test(
         name: "/hello/nested",
         mime: false,
         template: [{
-          checker: (s) => s.includes(".png"),
-          type: "response",
-          r: (options) =>
-            petitions.response()({
-              path: options.relativeName.slice(0, -4),
-              r: () => new Response(""),
-            }),
+          checker: (s) => s.path().includes(".png"),
+          type: 'add',
+          f: (options) =>
+              () => new Response(options.relativeName.slice(0, -4)),
+
         }],
       } as fileServerPetition<false>)
         .some((x) => x.path === "/hello/nested/logo"),