jax-hono 1.0.20 → 1.0.21

package/helpers/config.ts

@@ -1,23 +1,23 @@
-import type { JaxConfig } from '../types/config';
-
-type PlainConfig = Record<string, unknown>;
-
-export type PluginConfigItem =
-  | false
-  | {
-      enable?: boolean;
-      package?: string;
-      options?: unknown;
-    };
-
-export type PluginConfig = Record<string, PluginConfigItem>;
-
-export function defineConfig<TProjectConfig extends PlainConfig = PlainConfig>(
-  config: Partial<JaxConfig & TProjectConfig>
-) {
-  return config;
-}
-
-export function definePluginConfig<TPluginConfig extends PluginConfig>(config: TPluginConfig) {
-  return config;
-}
+import type { JaxConfig } from '../types/config';
+
+type PlainConfig = Record<string, unknown>;
+
+export type PluginConfigItem =
+  | false
+  | {
+      enable?: boolean;
+      package?: string;
+      options?: unknown;
+    };
+
+export type PluginConfig = Record<string, PluginConfigItem>;
+
+export function defineConfig<TProjectConfig extends PlainConfig = PlainConfig>(
+  config: Partial<JaxConfig & TProjectConfig>
+) {
+  return config;
+}
+
+export function definePluginConfig<TPluginConfig extends PluginConfig>(config: TPluginConfig) {
+  return config;
+}

package/helpers/crud.ts

@@ -1,27 +1,27 @@
-import { normalizeRoutePath } from './route';
-import type { Handler, Hono } from 'hono';
-
-export type JaxCrudController = {
-  index: Handler;
-  show: Handler;
-  create: Handler;
-  update: Handler;
-  destroy: Handler;
-};
-
-export function registerCrudRoutes<TApp extends Hono>(
-  app: TApp,
-  path: string,
-  controller: JaxCrudController
-): TApp {
-  const basePath = normalizeRoutePath(path);
-  const detailPath = basePath === '/' ? '/:id' : `${basePath}/:id`;
-
-  app.get(basePath, controller.index);
-  app.get(detailPath, controller.show);
-  app.post(basePath, controller.create);
-  app.put(detailPath, controller.update);
-  app.delete(detailPath, controller.destroy);
-
-  return app;
-}
+import { normalizeRoutePath } from './route';
+import type { Handler, Hono } from 'hono';
+
+export type JaxCrudController = {
+  index: Handler;
+  show: Handler;
+  create: Handler;
+  update: Handler;
+  destroy: Handler;
+};
+
+export function registerCrudRoutes<TApp extends Hono>(
+  app: TApp,
+  path: string,
+  controller: JaxCrudController
+): TApp {
+  const basePath = normalizeRoutePath(path);
+  const detailPath = basePath === '/' ? '/:id' : `${basePath}/:id`;
+
+  app.get(basePath, controller.index);
+  app.get(detailPath, controller.show);
+  app.post(basePath, controller.create);
+  app.put(detailPath, controller.update);
+  app.delete(detailPath, controller.destroy);
+
+  return app;
+}

package/helpers/index.ts

@@ -1,4 +1,4 @@
-export * from "./route";
-export * from "./config";
-export * from "./crud";
-export * from "../plugins/define";
+export * from "./route";
+export * from "./config";
+export * from "./crud";
+export * from "../plugins/define";

package/helpers/route.ts

@@ -1,7 +1,7 @@
-export function normalizeRoutePath(path: string) {
-  if (!path || path === '/') {
-    return '/';
-  }
-
-  return `/${path.replace(/^\/+|\/+$/g, '')}`;
-}
+export function normalizeRoutePath(path: string) {
+  if (!path || path === '/') {
+    return '/';
+  }
+
+  return `/${path.replace(/^\/+|\/+$/g, '')}`;
+}

package/index.ts

@@ -1,121 +1,121 @@
-import { Hono } from 'hono';
-import './core/hono';
-import './middleware/api-response';
-import { createHono, createApi } from './core/hono';
-import { registerCrudRoutes } from './helpers/crud';
-import type { Config } from './config';
-import type * as AppModule from './core/app';
-import {
-  requireGeneratedModule,
-  type GeneratedControllers,
-  type GeneratedModels,
-  type GeneratedServices,
-} from './core/generated';
-
-type AppRuntimeModule = typeof AppModule;
-type Controllers = GeneratedControllers;
-type Models = GeneratedModels;
-type CreateServices = (deps: unknown) => GeneratedServices;
-
-let appRuntimeModule: AppRuntimeModule | undefined;
-let controllersModule: { controllers: Controllers } | undefined;
-let modelsModule: { models: Models } | undefined;
-let servicesModule: { createServices: CreateServices } | undefined;
-let configModule: { default: Config } | undefined;
-
-function getAppRuntimeModule() {
-  appRuntimeModule ??= require('./core/app') as AppRuntimeModule;
-
-  return appRuntimeModule;
-}
-
-function getControllers() {
-  controllersModule ??= requireGeneratedModule('controllers.generated.ts') as {
-    controllers: Controllers;
-  };
-
-  return controllersModule.controllers;
-}
-
-function getModels() {
-  modelsModule ??= requireGeneratedModule('models.generated.ts') as { models: Models };
-
-  return modelsModule.models;
-}
-
-function getCreateServices() {
-  servicesModule ??= requireGeneratedModule('services.generated.ts') as {
-    createServices: CreateServices;
-  };
-
-  return servicesModule.createServices;
-}
-
-function getConfig() {
-  configModule ??= require('./config') as { default: Config };
-
-  return configModule.default;
-}
-
-export { createHono, createApi, registerCrudRoutes };
-export { defineConfig, definePluginConfig } from './helpers/config';
-export { definePlugin } from './plugins/define';
-export type { AppContext, AppPlugin } from './core/app';
-export type { Config, JaxConfig } from './config';
-export { ApiController } from './core/api-controller';
-export { Controller } from './core/controller';
-export { Service } from './core/service';
-export type { ServiceContext } from './core/service';
-export { defineCron } from './core/cron';
-export type { CronJob, CronRunContext, CronSchedule } from './core/cron';
-export type Services = GeneratedServices;
-export type { ApiFailResponse, ApiResponse, ApiSuccessResponse } from './middleware/api-response';
-
-export function createApp() {
-  return getAppRuntimeModule().createApp({
-    models: getModels(),
-    createServices: getCreateServices()
-  });
-}
-
-export const controllers = new Proxy({} as Controllers, {
-  get(_target, property, receiver) {
-    return Reflect.get(getControllers(), property, receiver);
-  },
-  has(_target, property) {
-    return property in getControllers();
-  },
-  ownKeys() {
-    return Reflect.ownKeys(getControllers());
-  },
-  getOwnPropertyDescriptor(_target, property) {
-    return Object.getOwnPropertyDescriptor(getControllers(), property);
-  }
-});
-
-export const models = new Proxy({} as Models, {
-  get(_target, property, receiver) {
-    return Reflect.get(getModels(), property, receiver);
-  }
-});
-
-export const createServices: CreateServices = ((deps: unknown) => {
-  return getCreateServices()(deps);
-}) as CreateServices;
-
-export const config = new Proxy({} as Config, {
-  get(_target, property, receiver) {
-    return Reflect.get(getConfig(), property, receiver);
-  },
-  has(_target, property) {
-    return property in getConfig();
-  },
-  ownKeys() {
-    return Reflect.ownKeys(getConfig());
-  },
-  getOwnPropertyDescriptor(_target, property) {
-    return Object.getOwnPropertyDescriptor(getConfig(), property);
-  }
-});
-
-export { Hono };
+import { Hono } from 'hono';
+import './core/hono';
+import './middleware/api-response';
+import { createHono, createApi } from './core/hono';
+import { registerCrudRoutes } from './helpers/crud';
+import type { Config } from './config';
+import type * as AppModule from './core/app';
+import {
+  requireGeneratedModule,
+  type GeneratedControllers,
+  type GeneratedModels,
+  type GeneratedServices,
+} from './core/generated';
+
+type AppRuntimeModule = typeof AppModule;
+type Controllers = GeneratedControllers;
+type Models = GeneratedModels;
+type CreateServices = (deps: unknown) => GeneratedServices;
+
+let appRuntimeModule: AppRuntimeModule | undefined;
+let controllersModule: { controllers: Controllers } | undefined;
+let modelsModule: { models: Models } | undefined;
+let servicesModule: { createServices: CreateServices } | undefined;
+let configModule: { default: Config } | undefined;
+
+function getAppRuntimeModule() {
+  appRuntimeModule ??= require('./core/app') as AppRuntimeModule;
+
+  return appRuntimeModule;
+}
+
+function getControllers() {
+  controllersModule ??= requireGeneratedModule('controllers.generated.ts') as {
+    controllers: Controllers;
+  };
+
+  return controllersModule.controllers;
+}
+
+function getModels() {
+  modelsModule ??= requireGeneratedModule('models.generated.ts') as { models: Models };
+
+  return modelsModule.models;
+}
+
+function getCreateServices() {
+  servicesModule ??= requireGeneratedModule('services.generated.ts') as {
+    createServices: CreateServices;
+  };
+
+  return servicesModule.createServices;
+}
+
+function getConfig() {
+  configModule ??= require('./config') as { default: Config };
+
+  return configModule.default;
+}
+
+export { createHono, createApi, registerCrudRoutes };
+export { defineConfig, definePluginConfig } from './helpers/config';
+export { definePlugin } from './plugins/define';
+export type { AppContext, AppPlugin } from './core/app';
+export type { Config, JaxConfig } from './config';
+export { ApiController } from './core/api-controller';
+export { Controller } from './core/controller';
+export { Service } from './core/service';
+export type { ServiceContext } from './core/service';
+export { defineCron } from './core/cron';
+export type { CronJob, CronRunContext, CronSchedule } from './core/cron';
+export type Services = GeneratedServices;
+export type { ApiFailResponse, ApiResponse, ApiSuccessResponse } from './middleware/api-response';
+
+export function createApp() {
+  return getAppRuntimeModule().createApp({
+    models: getModels(),
+    createServices: getCreateServices()
+  });
+}
+
+export const controllers = new Proxy({} as Controllers, {
+  get(_target, property, receiver) {
+    return Reflect.get(getControllers(), property, receiver);
+  },
+  has(_target, property) {
+    return property in getControllers();
+  },
+  ownKeys() {
+    return Reflect.ownKeys(getControllers());
+  },
+  getOwnPropertyDescriptor(_target, property) {
+    return Object.getOwnPropertyDescriptor(getControllers(), property);
+  }
+});
+
+export const models = new Proxy({} as Models, {
+  get(_target, property, receiver) {
+    return Reflect.get(getModels(), property, receiver);
+  }
+});
+
+export const createServices: CreateServices = ((deps: unknown) => {
+  return getCreateServices()(deps);
+}) as CreateServices;
+
+export const config = new Proxy({} as Config, {
+  get(_target, property, receiver) {
+    return Reflect.get(getConfig(), property, receiver);
+  },
+  has(_target, property) {
+    return property in getConfig();
+  },
+  ownKeys() {
+    return Reflect.ownKeys(getConfig());
+  },
+  getOwnPropertyDescriptor(_target, property) {
+    return Object.getOwnPropertyDescriptor(getConfig(), property);
+  }
+});
+
+export { Hono };

package/middleware/api-response.ts

@@ -1,44 +1,44 @@
-import type { Context, MiddlewareHandler } from 'hono';
-
-export type ApiSuccessResponse<T = unknown> = {
-  code: 0;
-  msg: string;
-  data?: T;
-};
-
-export type ApiFailResponse = {
-  code: 1;
-  msg: string;
-};
-
-export type ApiResponse<T = unknown> = ApiSuccessResponse<T> | ApiFailResponse;
-
-export function ok<T>(c: Context, data?: T, msg = 'success'): Response {
-  return c.json<ApiSuccessResponse<T>>({
-    code: 0,
-    msg,
-    data
-  });
-}
-
-export function fail(c: Context, msg: string): Response {
-  return c.json<ApiFailResponse>({
-    code: 1,
-    msg
-  });
-}
-
-declare module 'hono' {
-  interface Context {
-    ok: <T>(data?: T, msg?: string) => Response;
-    fail: (msg: string) => Response;
-  }
-}
-
-export const apiResponse: MiddlewareHandler = async (c, next) => {
-  // 把统一响应方法挂到 Hono Context 上，业务接口直接使用 c.ok / c.fail。
-  c.ok = <T>(data?: T, msg = 'success') => ok(c, data, msg);
-  c.fail = (msg: string) => fail(c, msg);
-
-  await next();
-};
+import type { Context, MiddlewareHandler } from 'hono';
+
+export type ApiSuccessResponse<T = unknown> = {
+  code: 0;
+  msg: string;
+  data?: T;
+};
+
+export type ApiFailResponse = {
+  code: 1;
+  msg: string;
+};
+
+export type ApiResponse<T = unknown> = ApiSuccessResponse<T> | ApiFailResponse;
+
+export function ok<T>(c: Context, data?: T, msg = 'success'): Response {
+  return c.json<ApiSuccessResponse<T>>({
+    code: 0,
+    msg,
+    data
+  });
+}
+
+export function fail(c: Context, msg: string): Response {
+  return c.json<ApiFailResponse>({
+    code: 1,
+    msg
+  });
+}
+
+declare module 'hono' {
+  interface Context {
+    ok: <T>(data?: T, msg?: string) => Response;
+    fail: (msg: string) => Response;
+  }
+}
+
+export const apiResponse: MiddlewareHandler = async (c, next) => {
+  // 把统一响应方法挂到 Hono Context 上，业务接口直接使用 c.ok / c.fail。
+  c.ok = <T>(data?: T, msg = 'success') => ok(c, data, msg);
+  c.fail = (msg: string) => fail(c, msg);
+
+  await next();
+};

package/middleware/jwt.ts

@@ -1,90 +1,90 @@
-import config from "../config";
-import jwt from "jsonwebtoken";
-import type { Context, MiddlewareHandler, Next } from "hono";
-
-type JwtAuthOptions<
-  TPayload extends Record<string, any> = Record<string, any>,
-> = {
-  secretSuffix: string;
-  stateKey: string;
-  validate?: (payload: TPayload, c: Context) => boolean | Promise<boolean>;
-  resolveState?: (payload: TPayload, c: Context) => unknown | Promise<unknown>;
-};
-
-function createJwtAuth<
-  TPayload extends Record<string, any> = Record<string, any>,
->(options: JwtAuthOptions<TPayload>): MiddlewareHandler {
-  return async (c, next) => {
-    const session = c.var.session;
-    const sessionData = await session.get();
-
-    if (sessionData && sessionData[options.stateKey]) {
-      c.state[options.stateKey] = sessionData[options.stateKey];
-      await next();
-      return;
-    }
-
-    // const session = c.get('session');
-    // const sessionData = session.get(options.stateKey);
-
-    // if (sessionData) {
-    //   c.state[options.stateKey] = sessionData;
-    //   await next();
-    // }
-
-    const token = getAuthorizationToken(c);
-
-    if (!token) {
-      return c.json({ code: 401, msg: "请先登录" });
-    }
-
-    try {
-      const payload = jwt.verify(
-        token,
-        (config as any).jwt.secret + options.secretSuffix,
-      ) as TPayload;
-      const valid = options.validate
-        ? await options.validate(payload, c)
-        : true;
-
-      if (!valid) {
-        return c.json({ code: 401, msg: "请重新登录" });
-      }
-
-      const stateValue = options.resolveState
-        ? await options.resolveState(payload, c)
-        : payload;
-
-      if (!stateValue) {
-        return c.json({ code: 401, msg: "请重新登录" });
-      }
-
-      c.state[options.stateKey] = stateValue;
-
-      await next();
-    } catch {
-      return c.json({ code: 401, msg: "请重新登录" });
-    }
-  };
-}
-
-function createOptionalAuth(auth: MiddlewareHandler): MiddlewareHandler {
-  return async (c, next) => {
-    if (!c.req.header("authorization")) {
-      await next();
-      return;
-    }
-
-    return auth(c, next as Next);
-  };
-}
-
-function getAuthorizationToken(c: Context) {
-  const authorization = c.req.header("authorization") ?? "";
-
-  return authorization.startsWith("Bearer ")
-    ? authorization.slice("Bearer ".length)
-    : authorization;
-}
-
-export { createJwtAuth, createOptionalAuth, getAuthorizationToken };
+import config from "../config";
+import jwt from "jsonwebtoken";
+import type { Context, MiddlewareHandler, Next } from "hono";
+
+type JwtAuthOptions<
+  TPayload extends Record<string, any> = Record<string, any>,
+> = {
+  secretSuffix: string;
+  stateKey: string;
+  validate?: (payload: TPayload, c: Context) => boolean | Promise<boolean>;
+  resolveState?: (payload: TPayload, c: Context) => unknown | Promise<unknown>;
+};
+
+function createJwtAuth<
+  TPayload extends Record<string, any> = Record<string, any>,
+>(options: JwtAuthOptions<TPayload>): MiddlewareHandler {
+  return async (c, next) => {
+    const session = c.var.session;
+    const sessionData = await session.get();
+
+    if (sessionData && sessionData[options.stateKey]) {
+      c.state[options.stateKey] = sessionData[options.stateKey];
+      await next();
+      return;
+    }
+
+    // const session = c.get('session');
+    // const sessionData = session.get(options.stateKey);
+
+    // if (sessionData) {
+    //   c.state[options.stateKey] = sessionData;
+    //   await next();
+    // }
+
+    const token = getAuthorizationToken(c);
+
+    if (!token) {
+      return c.json({ code: 401, msg: "请先登录" });
+    }
+
+    try {
+      const payload = jwt.verify(
+        token,
+        (config as any).jwt.secret + options.secretSuffix,
+      ) as TPayload;
+      const valid = options.validate
+        ? await options.validate(payload, c)
+        : true;
+
+      if (!valid) {
+        return c.json({ code: 401, msg: "请重新登录" });
+      }
+
+      const stateValue = options.resolveState
+        ? await options.resolveState(payload, c)
+        : payload;
+
+      if (!stateValue) {
+        return c.json({ code: 401, msg: "请重新登录" });
+      }
+
+      c.state[options.stateKey] = stateValue;
+
+      await next();
+    } catch {
+      return c.json({ code: 401, msg: "请重新登录" });
+    }
+  };
+}
+
+function createOptionalAuth(auth: MiddlewareHandler): MiddlewareHandler {
+  return async (c, next) => {
+    if (!c.req.header("authorization")) {
+      await next();
+      return;
+    }
+
+    return auth(c, next as Next);
+  };
+}
+
+function getAuthorizationToken(c: Context) {
+  const authorization = c.req.header("authorization") ?? "";
+
+  return authorization.startsWith("Bearer ")
+    ? authorization.slice("Bearer ".length)
+    : authorization;
+}
+
+export { createJwtAuth, createOptionalAuth, getAuthorizationToken };

package/middleware/request-log.ts

@@ -1,3 +1,3 @@
-import { logger } from 'hono/logger';
-
-export const requestLog = logger();
+import { logger } from 'hono/logger';
+
+export const requestLog = logger();