gemi 0.4.12 → 0.4.13

package/dist/app/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../app/App.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAU3C,OAAO,EAAE,aAAa,EAA2B,MAAM,OAAO,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,UAAU,SAAS;IACjB,UAAU,EAAE,UAAU,UAAU,CAAC;IACjC,SAAS,EAAE,UAAU,SAAS,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAC;IACzD,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,UAAU,MAAM,CAAC;CAC1B;AAED,qBAAa,GAAG;IACd,OAAO,CAAC,YAAY,CAKlB;IACF,OAAO,CAAC,cAAc,CAGf;IACP,OAAO,CAAC,aAAa,CASd;IACP,OAAO,CAAC,aAAa,CAAgC;IAC9C,IAAI,SAAS;IACpB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,aAAa,CAAgB;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAM;IAC7D,UAAU,SAAK;IACtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,SAAS;IAW7B,OAAO,CAAC,OAAO;IAkCR,gBAAgB;IAIhB,eAAe,CAAC,MAAM,EAAE,YAAY;YAI7B,eAAe;IAqC7B,OAAO,CAAC,aAAa;IAmCf,gBAAgB,CAAC,GAAG,EAAE,OAAO;IAwF7B,iBAAiB,CAAC,GAAG,EAAE,OAAO;IAmL9B,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAY5C,OAAO,CAAC,sBAAsB,CAGtB;IACR,OAAO,CAAC,mBAAmB,CAEzB;IACF,OAAO,CAAC,oBAAoB,CAM1B;IAEF,SAAS;sBAdH,eAAe,WACV,MAAM,GAAG,MAAM;mBAES,eAAe;oBAI5C,eAAe,QACb,MAAM,UACJ,MAAM;MASd;CACH"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../app/App.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAU3C,OAAO,EAAE,aAAa,EAA2B,MAAM,OAAO,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAInC,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,UAAU,SAAS;IACjB,UAAU,EAAE,UAAU,UAAU,CAAC;IACjC,SAAS,EAAE,UAAU,SAAS,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAC;IACzD,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,UAAU,MAAM,CAAC;CAC1B;AAED,qBAAa,GAAG;IACd,OAAO,CAAC,YAAY,CAKlB;IACF,OAAO,CAAC,cAAc,CAGf;IACP,OAAO,CAAC,aAAa,CASd;IACP,OAAO,CAAC,aAAa,CAAgC;IAC9C,IAAI,SAAS;IACpB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,aAAa,CAAgB;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAM;IAC7D,UAAU,SAAK;IACtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,SAAS;IAW7B,OAAO,CAAC,OAAO;IAkCR,gBAAgB;IAIhB,eAAe,CAAC,MAAM,EAAE,YAAY;YAI7B,eAAe;IAqC7B,OAAO,CAAC,aAAa;IAmCf,gBAAgB,CAAC,GAAG,EAAE,OAAO;IAyF7B,iBAAiB,CAAC,GAAG,EAAE,OAAO;IAmL9B,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAY5C,OAAO,CAAC,sBAAsB,CAGtB;IACR,OAAO,CAAC,mBAAmB,CAEzB;IACF,OAAO,CAAC,oBAAoB,CAM1B;IAEF,SAAS;sBAdH,eAAe,WACV,MAAM,GAAG,MAAM;mBAES,eAAe;oBAI5C,eAAe,QACb,MAAM,UACJ,MAAM;MASd;CACH"}

package/dist/app/createFlatApiRoutes.d.ts

@@ -1,8 +1,10 @@
 import { Middleware } from "../http";
-import { ApiRouteChildren, ApiRouteExec } from "../http/ApiRouter";
+import { ApiRoutes } from "../http/ApiRouter";
 import { RouterMiddleware } from "../http/Router";
-export declare function createFlatApiRoutes(routes: ApiRouteChildren): Record<string, Record<string, {
+type ApiRouteExec = any;
+export declare function createFlatApiRoutes(routes: ApiRoutes): Record<string, Record<string, {
     exec: ApiRouteExec;
     middleware: (string | (new () => Middleware) | RouterMiddleware)[];
 }>>;
+export {};
 //# sourceMappingURL=createFlatApiRoutes.d.ts.map

package/dist/app/createFlatApiRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createFlatApiRoutes.d.ts","sourceRoot":"","sources":["../../app/createFlatApiRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,gBAAgB;UAM9C,YAAY;gBACN,CAAC,MAAM,GAAG,CAAC,UAAU,UAAU,CAAC,GAAG,gBAAgB,CAAC,EAAE;IAoDzE"}
+{"version":3,"file":"createFlatApiRoutes.d.ts","sourceRoot":"","sources":["../../app/createFlatApiRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAgB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,KAAK,YAAY,GAAG,GAAG,CAAC;AAExB,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS;UAMvC,YAAY;gBACN,CAAC,MAAM,GAAG,CAAC,UAAU,UAAU,CAAC,GAAG,gBAAgB,CAAC,EAAE;IAyDzE"}

package/dist/app/index.js

@@ -491,11 +491,148 @@ var require_dist = __commonJS((exports) => {
 
 // http/Controller.ts
 class Controller {
-  app;
   requests = {};
   static kind = "controller";
-  constructor(app) {
-    this.app = app;
+  constructor() {
+  }
+}
+// internal/isConstructor.ts
+function isConstructor(value) {
+  return typeof value === "function" && value.prototype !== undefined;
+}
+
+// http/ApiRouter.ts
+var isController = function(candidate) {
+  return isConstructor(candidate);
+};
+
+class RouteHandler {
+  method;
+  handler;
+  methodName;
+  middlewares = [];
+  constructor(method, handler, methodName) {
+    this.method = method;
+    this.handler = handler;
+    this.methodName = methodName;
+  }
+  run(req) {
+    let httpRequest = req;
+    if (isController(this.handler)) {
+      const controller = new this.handler;
+      const handler = controller[this.methodName].bind(controller);
+      httpRequest = controller.requests[this.methodName] ? new controller.requests[this.methodName](req.rawRequest, req.params) : httpRequest;
+      return handler(httpRequest);
+    } else {
+      return this.handler(req);
+    }
+  }
+  middleware(middlewareList) {
+    this.middlewares = middlewareList;
+    return this;
+  }
+}
+
+class ApiRouter {
+  routes = {};
+  middlewares = [];
+  middleware(_req) {
+  }
+  get(handler, methodName) {
+    return new RouteHandler("GET", handler, methodName);
+  }
+  post(handler, methodName) {
+    return new RouteHandler("POST", handler, methodName);
+  }
+  put(handler, methodName) {
+    return new RouteHandler("PUT", handler, methodName);
+  }
+  patch(handler, methodName) {
+    return new RouteHandler("PATCH", handler, methodName);
+  }
+  delete(handler, methodName) {
+    return new RouteHandler("DELETE", handler, methodName);
+  }
+}
+// http/ViewRouter.ts
+class ViewRouter {
+  routes = {};
+  middlewares = [];
+  middleware(req) {
+  }
+  layout(viewPath, handler, children) {
+    function prepare(middlewares = []) {
+      let _children = children ?? {};
+      if (handler && handler.constructor === Object) {
+        _children = handler;
+      }
+      return {
+        exec: async (req, params, app) => {
+          let _handler = () => Promise.resolve({
+            data: { [viewPath]: {} },
+            headers: {},
+            head: {}
+          });
+          if (typeof handler === "function") {
+            _handler = handler;
+          }
+          if (Array.isArray(handler)) {
+            const [controller, methodName] = handler;
+            const instance = new controller(app);
+            _handler = instance[methodName].bind(instance);
+          }
+          const data = await _handler(req, params);
+          return { [viewPath]: data };
+        },
+        children: _children,
+        viewPath,
+        middlewares,
+        kind: "layout"
+      };
+    }
+    return {
+      prepare,
+      middleware: (middlewares) => ({
+        prepare: () => prepare(middlewares)
+      })
+    };
+  }
+  view(viewPath, handler, children) {
+    function prepare(middlewares = []) {
+      let _children = children ?? {};
+      if (handler && handler.constructor === Object) {
+        _children = handler;
+      }
+      return {
+        exec: async (req, params, app) => {
+          let _handler = () => Promise.resolve({
+            data: { [viewPath]: {} },
+            headers: {},
+            head: {}
+          });
+          if (typeof handler === "function") {
+            _handler = handler;
+          }
+          if (Array.isArray(handler)) {
+            const [controller, methodName] = handler;
+            const instance = new controller(app);
+            _handler = instance[methodName].bind(instance);
+          }
+          const data = await _handler(req, params);
+          return { [viewPath]: data };
+        },
+        children: _children,
+        viewPath,
+        middlewares,
+        kind: "view"
+      };
+    }
+    return {
+      prepare,
+      middleware: (middlewares) => ({
+        prepare: () => prepare(middlewares)
+      })
+    };
   }
 }
 // http/Error.ts
@@ -555,7 +692,6 @@ class ValidationError extends RequestBreakerError {
     };
   }
 }
-
 // http/HttpRequest.ts
 var validate = function(ruleName) {
   const [rule, param] = ruleName.split(":");
@@ -593,12 +729,22 @@ var validate = function(ruleName) {
   }
 };
 
-class Input extends Map {
-  constructor() {
-    super();
+class Input {
+  data;
+  constructor(data) {
+    this.data = data;
+  }
+  get(key) {
+    return this.data[key];
+  }
+  set(key, value) {
+    this.data[key] = value;
+  }
+  has(key) {
+    return this.data[key] !== undefined;
   }
   toJSON() {
-    return Object.fromEntries(this);
+    return this.data;
   }
 }
 
@@ -606,8 +752,10 @@ class HttpRequest {
   rawRequest;
   headers;
   cookies;
-  schema = {};
-  constructor(req) {
+  schema;
+  params;
+  constructor(req, params) {
+    this.params = params;
     this.rawRequest = req;
     this.headers = req.headers;
     const cookie = this.rawRequest.headers.get("Cookie");
@@ -622,7 +770,7 @@ class HttpRequest {
     this.cookies = cookies;
   }
   async parseBody() {
-    const inputMap = new Input;
+    const inputMap = new Input({});
     if (this.rawRequest.headers.get("Content-Type") === "application/json") {
       const body = await this.rawRequest.json();
       for (const [key, value] of Object.entries(body)) {
@@ -702,152 +850,6 @@ class HttpRequest {
     throw "not implemented";
   }
 }
-
-// http/ApiRouter.ts
-var isController = function(controller) {
-  return "kind" in controller && controller.kind === "controller";
-};
-
-class ApiRouter {
-  routes = {};
-  middlewares = [];
-  constructor() {
-  }
-  middleware(_req) {
-  }
-  handleRequest(controller, methodName) {
-    return (method) => {
-      const prepare = (middleware = []) => {
-        return {
-          middleware,
-          method,
-          exec: async (req, params, app) => {
-            let handler = (_req, params2) => Promise.resolve({});
-            let httpRequest = new HttpRequest(req.rawRequest);
-            if (isController(controller)) {
-              const controllerInstance = new controller(app);
-              const Req = controllerInstance.requests[methodName] ?? HttpRequest;
-              httpRequest = new Req(req.rawRequest);
-              handler = controllerInstance[methodName].bind(controllerInstance);
-            } else if (typeof controller === "function") {
-              handler = (req2) => controller(req2);
-            }
-            return await handler(httpRequest, params);
-          }
-        };
-      };
-      return {
-        prepare,
-        middleware: (middlware) => {
-          return {
-            prepare: () => prepare(middlware)
-          };
-        }
-      };
-    };
-  }
-  get(controller, methodName) {
-    const handler = this.handleRequest(controller, methodName);
-    return handler("get");
-  }
-  post(controller, methodName) {
-    const handler = this.handleRequest(controller, methodName);
-    return handler("post");
-  }
-  put(controller, methodName) {
-    const handler = this.handleRequest(controller, methodName);
-    return handler("put");
-  }
-  delete(controller, methodName) {
-    const handler = this.handleRequest(controller, methodName);
-    return handler("delete");
-  }
-  patch(controller, methodName) {
-    const handler = this.handleRequest(controller, methodName);
-    return handler("patch");
-  }
-}
-// http/ViewRouter.ts
-class ViewRouter {
-  routes = {};
-  middlewares = [];
-  middleware(req) {
-  }
-  layout(viewPath, handler, children) {
-    function prepare(middlewares = []) {
-      let _children = children ?? {};
-      if (handler && handler.constructor === Object) {
-        _children = handler;
-      }
-      return {
-        exec: async (req, params, app) => {
-          let _handler = () => Promise.resolve({
-            data: { [viewPath]: {} },
-            headers: {},
-            head: {}
-          });
-          if (typeof handler === "function") {
-            _handler = handler;
-          }
-          if (Array.isArray(handler)) {
-            const [controller, methodName] = handler;
-            const instance = new controller(app);
-            _handler = instance[methodName].bind(instance);
-          }
-          const data = await _handler(req, params);
-          return { [viewPath]: data };
-        },
-        children: _children,
-        viewPath,
-        middlewares,
-        kind: "layout"
-      };
-    }
-    return {
-      prepare,
-      middleware: (middlewares) => ({
-        prepare: () => prepare(middlewares)
-      })
-    };
-  }
-  view(viewPath, handler, children) {
-    function prepare(middlewares = []) {
-      let _children = children ?? {};
-      if (handler && handler.constructor === Object) {
-        _children = handler;
-      }
-      return {
-        exec: async (req, params, app) => {
-          let _handler = () => Promise.resolve({
-            data: { [viewPath]: {} },
-            headers: {},
-            head: {}
-          });
-          if (typeof handler === "function") {
-            _handler = handler;
-          }
-          if (Array.isArray(handler)) {
-            const [controller, methodName] = handler;
-            const instance = new controller(app);
-            _handler = instance[methodName].bind(instance);
-          }
-          const data = await _handler(req, params);
-          return { [viewPath]: data };
-        },
-        children: _children,
-        viewPath,
-        middlewares,
-        kind: "view"
-      };
-    }
-    return {
-      prepare,
-      middleware: (middlewares) => ({
-        prepare: () => prepare(middlewares)
-      })
-    };
-  }
-}
 // http/Middleware.ts
 class Middleware {
   async run(_req, ctx) {
@@ -1791,29 +1793,34 @@ function createRouteManifest(routes) {
 // app/createFlatApiRoutes.ts
 function createFlatApiRoutes(routes) {
   const flatApiRoutes = {};
-  for (const [rootPath, apiConfigOrApiRouter] of Object.entries(routes)) {
-    if ("prepare" in apiConfigOrApiRouter) {
+  for (const [rootPath, apiRouteHandlerOrApiRouter] of Object.entries(routes)) {
+    if (apiRouteHandlerOrApiRouter instanceof RouteHandler) {
+      const routeHandler = apiRouteHandlerOrApiRouter;
       if (!flatApiRoutes[rootPath]) {
         flatApiRoutes[rootPath] = {};
       }
-      const { exec, method, middleware } = apiConfigOrApiRouter.prepare();
+      const method = routeHandler.method;
+      const middleware = routeHandler.middlewares;
+      const exec = routeHandler.run.bind(routeHandler);
       flatApiRoutes[rootPath][method] = {
         exec,
         middleware: [...middleware]
       };
-    } else if (Array.isArray(apiConfigOrApiRouter)) {
-      for (const apiConfig of apiConfigOrApiRouter) {
+    } else if (Array.isArray(apiRouteHandlerOrApiRouter)) {
+      for (const routeHandler of apiRouteHandlerOrApiRouter) {
         if (!flatApiRoutes[rootPath]) {
           flatApiRoutes[rootPath] = {};
         }
-        const { exec, method, middleware } = apiConfig.prepare();
+        const method = routeHandler.method;
+        const middleware = routeHandler.middlewares;
+        const exec = routeHandler.run;
         flatApiRoutes[rootPath][method] = {
           exec,
           middleware
         };
       }
     } else {
-      const router = new apiConfigOrApiRouter;
+      const router = new apiRouteHandlerOrApiRouter;
       const result = createFlatApiRoutes(router.routes);
       for (const [path, handlers] of Object.entries(result)) {
         const subPath = path === "/" ? "" : path;
@@ -1841,13 +1848,6 @@ function createFlatApiRoutes(routes) {
 // app/App.ts
 import {renderToReadableStream} from "react-dom/server.browser";
 import {createElement, Fragment} from "react";
-
-// internal/isConstructor.ts
-function isConstructor(value) {
-  return typeof value === "function" && value.prototype !== undefined;
-}
-
-// app/App.ts
 class App {
   renderParams = {
     styles: [],
@@ -1931,7 +1931,7 @@ class App {
     const reqWithMiddlewares = this.runMiddleware(middlewares);
     const reqCtx = new Map;
     const data = await requestContext.run(reqCtx, async () => {
-      await reqWithMiddlewares(new HttpRequest(req), reqCtx);
+      await reqWithMiddlewares(new HttpRequest(req, params), reqCtx);
       return await Promise.all(handlers.map((fn) => fn(req, params, this)));
     });
     return {
@@ -1972,15 +1972,15 @@ class App {
       const pattern = new me({ pathname: path });
       if (pattern.test({ pathname: apiPath })) {
         const params = pattern.exec({ pathname: apiPath })?.pathname.groups;
-        if (!handler[req.method.toLowerCase()]) {
+        if (!handler[req.method]) {
           return new Response(JSON.stringify({ error: { message: "Not found" } }));
         }
-        const exec = handler[req.method.toLowerCase()].exec;
-        const middlewares = handler[req.method.toLowerCase()].middleware;
+        const exec = handler[req.method].exec;
+        const middlewares = handler[req.method].middleware;
         const reqWithMiddlewares = this.runMiddleware(middlewares);
         const reqCtx = new Map;
         return await requestContext.run(reqCtx, async () => {
-          const httpRequest = new HttpRequest(req);
+          const httpRequest = new HttpRequest(req, params);
           let handler2 = exec ? () => exec(httpRequest, params, this) : () => Promise.resolve({});
           try {
             await reqWithMiddlewares(httpRequest, reqCtx);
@@ -2058,7 +2058,7 @@ class App {
       const reqWithMiddlewares = this.runMiddleware(middlewares);
       const reqCtx = new Map;
       const data2 = await requestContext.run(reqCtx, async () => {
-        await reqWithMiddlewares(new HttpRequest(req), reqCtx);
+        await reqWithMiddlewares(new HttpRequest(req, params2), reqCtx);
         return await Promise.all(handlers.map((fn) => fn(req, params2, this)));
       });
       pageData = {