shokupan 0.4.4 → 0.5.0

package/README.md

@@ -31,16 +31,15 @@ Shokupan is designed to make building APIs delightful again. With zero-config de
 > Bun and TypeScript are recommended for Shokupan, though it also supports Node.js and standard JavaScript.
 
 ```typescript
-import { Shokupan } from 'shokupan';
+import { Shokupan, ScalarPlugin } from 'shokupan';
+const app = new Shokupan();
 
-const app = new Shokupan({
-    port: 3000,
-    development: true
-});
+app.get('/', (ctx) => ({ message: 'Hello, World!' }));
+app.get('/hello', (ctx) => "world");
 
-app.get('/', (ctx) => {
-    return { message: 'Hello, World!' };
-});
+app.mount('/scalar', new ScalarPlugin({
+    enableStaticAnalysis: true
+}));
 
 app.listen();
 ```

package/dist/analysis/openapi-analyzer.d.ts

@@ -130,10 +130,6 @@ export declare class OpenAPIAnalyzer {
      * Generate OpenAPI specification
      */
     generateOpenAPISpec(): any;
-    /**
-     * Convert a type string to an OpenAPI schema
-     */
-    private typeToSchema;
 }
 /**
  * Analyze a directory and generate OpenAPI spec

package/dist/cli.cjs

@@ -4,7 +4,7 @@ const p = require("@clack/prompts");
 const fs = require("node:fs");
 const path = require("node:path");
 const promises = require("node:timers/promises");
-const openapiAnalyzer = require("./openapi-analyzer-D9YB3IkV.cjs");
+const openapiAnalyzer = require("./openapi-analyzer-z-7AoFRC.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {

package/dist/cli.js

@@ -3,7 +3,7 @@ import * as p from "@clack/prompts";
 import fs from "node:fs";
 import path from "node:path";
 import { setTimeout } from "node:timers/promises";
-import { analyzeDirectory } from "./openapi-analyzer-BtIaHIfe.js";
+import { analyzeDirectory } from "./openapi-analyzer-D7y6Qa38.js";
 const templates = {
   controller: (name) => `import { Controller, Get, Ctx } from 'shokupan';
 import { ShokupanContext } from 'shokupan';

package/dist/context.d.ts

@@ -20,7 +20,7 @@ export interface DebugCollector {
 }
 export declare class ShokupanContext<State extends Record<string, any> = Record<string, any>> {
     readonly request: ShokupanRequest<any>;
-    readonly server?: Server<any>;
+    readonly server?: Server;
     readonly app?: Shokupan;
     readonly signal?: AbortSignal;
     private _url;
@@ -31,7 +31,7 @@ export declare class ShokupanContext<State extends Record<string, any> = Record<
     _debug?: DebugCollector;
     _finalResponse?: Response;
     _rawBody?: string | ArrayBuffer | Uint8Array;
-    constructor(request: ShokupanRequest<any>, server?: Server<any>, state?: State, app?: Shokupan, signal?: AbortSignal, // Optional as it might not be provided in tests or simple creates
+    constructor(request: ShokupanRequest<any>, server?: Server, state?: State, app?: Shokupan, signal?: AbortSignal, // Optional as it might not be provided in tests or simple creates
     enableMiddlewareTracking?: boolean);
     get url(): URL;
     /**
@@ -53,7 +53,7 @@ export declare class ShokupanContext<State extends Record<string, any> = Record<
     /**
      * Client IP address
      */
-    get ip(): any;
+    get ip(): Bun.SocketAddress;
     /**
      * Request hostname (e.g. "localhost")
      */

package/dist/index.cjs

@@ -16,7 +16,7 @@ const Ajv = require("ajv");
 const addFormats = require("ajv-formats");
 const classTransformer = require("class-transformer");
 const classValidator = require("class-validator");
-const openapiAnalyzer = require("./openapi-analyzer-D9YB3IkV.cjs");
+const openapiAnalyzer = require("./openapi-analyzer-z-7AoFRC.cjs");
 const crypto = require("crypto");
 const events = require("events");
 function _interopNamespaceDefault(e) {
@@ -879,7 +879,7 @@ async function generateOpenApi(rootRouter, options = {}) {
   const defaultTagName = options.defaultTag || "Application";
   let astRoutes = [];
   try {
-    const { OpenAPIAnalyzer } = await Promise.resolve().then(() => require("./openapi-analyzer-D9YB3IkV.cjs"));
+    const { OpenAPIAnalyzer } = await Promise.resolve().then(() => require("./openapi-analyzer-z-7AoFRC.cjs"));
     const analyzer = new OpenAPIAnalyzer(process.cwd());
     const { applications } = await analyzer.analyze();
     const appMap = /* @__PURE__ */ new Map();
@@ -2092,34 +2092,36 @@ class ShokupanRouter {
         if (ctx.app?.applicationConfig.enableMiddlewareTracking) {
           const duration = performance.now() - startTime;
           const config = ctx.app.applicationConfig;
-          try {
-            const timestamp = Date.now();
-            const key = `${timestamp}-${handler.name || "anonymous"}-${Math.random().toString(36).substring(7)}`;
-            await datastore.set("middleware_tracking", key, {
-              name: handler.name || "anonymous",
-              path: ctx.path,
-              timestamp,
-              duration,
-              file,
-              line,
-              error: error ? String(error) : void 0,
-              metadata: {
-                isBuiltin: handler.isBuiltin,
-                pluginName: handler.pluginName
+          Promise.resolve().then(async () => {
+            try {
+              const timestamp = Date.now();
+              const key = `${timestamp}-${handler.name || "anonymous"}-${Math.random().toString(36).substring(7)}`;
+              await datastore.set("middleware_tracking", key, {
+                name: handler.name || "anonymous",
+                path: ctx.path,
+                timestamp,
+                duration,
+                file,
+                line,
+                error: error ? String(error) : void 0,
+                metadata: {
+                  isBuiltin: handler.isBuiltin,
+                  pluginName: handler.pluginName
+                }
+              });
+              const ttl = config.middlewareTrackingTTL ?? 864e5;
+              const maxCapacity = config.middlewareTrackingMaxCapacity ?? 1e4;
+              const cutoff = Date.now() - ttl;
+              await datastore.query(`DELETE middleware_tracking WHERE timestamp < ${cutoff}`);
+              const results = await datastore.query("SELECT count() FROM middleware_tracking GROUP ALL");
+              if (results && results[0] && results[0].count > maxCapacity) {
+                const toDelete = results[0].count - maxCapacity;
+                await datastore.query(`DELETE middleware_tracking ORDER BY timestamp ASC LIMIT ${toDelete}`);
               }
-            });
-            const ttl = config.middlewareTrackingTTL ?? 864e5;
-            const maxCapacity = config.middlewareTrackingMaxCapacity ?? 1e4;
-            const cutoff = Date.now() - ttl;
-            await datastore.query(`DELETE middleware_tracking WHERE timestamp < ${cutoff}`);
-            const results = await datastore.query("SELECT count() FROM middleware_tracking GROUP ALL");
-            if (results && results[0] && results[0].count > maxCapacity) {
-              const toDelete = results[0].count - maxCapacity;
-              await datastore.query(`DELETE middleware_tracking ORDER BY timestamp ASC LIMIT ${toDelete}`);
+            } catch (datastoreError) {
+              console.error("Failed to store middleware tracking:", datastoreError);
             }
-          } catch (datastoreError) {
-            console.error("Failed to store middleware tracking:", datastoreError);
-          }
+          });
         }
       }
     };
@@ -2472,7 +2474,7 @@ class Shokupan extends ShokupanRouter {
       factory = createHttpServer();
     }
     const server = factory ? await factory(serveOptions) : Bun.serve(serveOptions);
-    console.log(`Shokupan server listening on http://${server.hostname}:${server.port}`);
+    console.log(`Shokupan server listening on http://${serveOptions.hostname}:${serveOptions.port}`);
     return server;
   }
   [$dispatch](req) {
@@ -3278,8 +3280,8 @@ function validate(config) {
       body = await safelyGetBody(ctx);
       dataToValidate.body = body;
     }
-    if (ctx.app?.applicationConfig.hooks?.beforeValidate) {
-      await ctx.app.applicationConfig.hooks.beforeValidate(ctx, dataToValidate);
+    if (ctx.app?.hasHook("beforeValidate")) {
+      await ctx.app.executeHook("beforeValidate", ctx, dataToValidate);
     }
     if (validators.params) {
       ctx.params = await validators.params(ctx.params);
@@ -3304,12 +3306,12 @@ function validate(config) {
       });
       ctx.body = validBody;
     }
-    if (ctx.app?.applicationConfig.hooks?.afterValidate) {
+    if (ctx.app?.hasHook("afterValidate")) {
       const validatedData = { ...dataToValidate };
       if (config.params) validatedData.params = ctx.params;
       if (config.query) validatedData.query = validQuery;
       if (config.body) validatedData.body = validBody;
-      await ctx.app.applicationConfig.hooks.afterValidate(ctx, validatedData);
+      await ctx.app?.executeHook("afterValidate", ctx, validatedData);
     }
     return next();
   };
@@ -3473,7 +3475,8 @@ function enableOpenApiValidation(app) {
 }
 const eta = new eta$2.Eta();
 class ScalarPlugin extends ShokupanRouter {
-  constructor(pluginOptions) {
+  constructor(pluginOptions = {}) {
+    pluginOptions.config ??= {};
     super();
     this.pluginOptions = pluginOptions;
     this.init();
@@ -3492,8 +3495,7 @@ class ScalarPlugin extends ShokupanRouter {
 
                 <body>
                     <div id="app"></div>
-
-                    <script src="<%= it.path %>scalar.js"><\/script>
+                    <script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference"><\/script>
                     <script>
                         Scalar.createApiReference('#app', [{ ...<%~ JSON.stringify(it.config.baseDocument) %>,
                             url: "<%= it.path %>openapi.json",
@@ -3504,9 +3506,6 @@ class ScalarPlugin extends ShokupanRouter {
 
                 </html>`, { path: path2, config: this.pluginOptions }));
     });
-    this.get("/scalar.js", (ctx) => {
-      return ctx.file(__dirname + "/../../node_modules/@scalar/api-reference/dist/browser/standalone.js");
-    });
     this.get("/openapi.json", async (ctx) => {
       let spec;
       if (this.root.openApiSpec) {