jax-hono 1.0.20 → 1.0.21

package/plugins/mongoose/schema.ts

@@ -1,30 +1,30 @@
-import { Schema, type SchemaDefinitionProperty } from 'mongoose';
-import dayjs from 'dayjs';
-
-export const date = (format = 'YYYY-MM-DD HH:mm:ss'): SchemaDefinitionProperty<Date> =>
-  ({
-    type: Date,
-    get: (value?: Date) => (value ? dayjs(value).format(format) : value)
-  }) as SchemaDefinitionProperty<Date>;
-
-export const dateWithDefault = (
-  defaultValue: DateConstructor | (() => Date | number | string),
-  format = 'YYYY-MM-DD HH:mm:ss'
-): SchemaDefinitionProperty<Date> =>
-  ({
-    type: Date,
-    get: (value?: Date) => (value ? dayjs(value).format(format) : value),
-    default: defaultValue
-  }) as SchemaDefinitionProperty<Date>;
-
-export function rankSetter(value: unknown) {
-  return value !== '' && value !== undefined && value !== null ? Number(value) : null;
-}
-
-
-export const rankedFields = {
-  rank: { type: Number, set: (value: string) => (value != '' ? Number(value) : null) }, // 序号
-  isTop: { type: Boolean, default: false }, // 是否置顶，序号设置后自动置顶
-  // rank: { type: Number, set: rankSetter },
-  // isTop: { type: Boolean, default: false }
-};
+import { Schema, type SchemaDefinitionProperty } from 'mongoose';
+import dayjs from 'dayjs';
+
+export const date = (format = 'YYYY-MM-DD HH:mm:ss'): SchemaDefinitionProperty<Date> =>
+  ({
+    type: Date,
+    get: (value?: Date) => (value ? dayjs(value).format(format) : value)
+  }) as SchemaDefinitionProperty<Date>;
+
+export const dateWithDefault = (
+  defaultValue: DateConstructor | (() => Date | number | string),
+  format = 'YYYY-MM-DD HH:mm:ss'
+): SchemaDefinitionProperty<Date> =>
+  ({
+    type: Date,
+    get: (value?: Date) => (value ? dayjs(value).format(format) : value),
+    default: defaultValue
+  }) as SchemaDefinitionProperty<Date>;
+
+export function rankSetter(value: unknown) {
+  return value !== '' && value !== undefined && value !== null ? Number(value) : null;
+}
+
+
+export const rankedFields = {
+  rank: { type: Number, set: (value: string) => (value != '' ? Number(value) : null) }, // 序号
+  isTop: { type: Boolean, default: false }, // 是否置顶，序号设置后自动置顶
+  // rank: { type: Number, set: rankSetter },
+  // isTop: { type: Boolean, default: false }
+};

package/plugins/session/index.ts

@@ -1,86 +1,86 @@
-import { useSession, useSessionStorage } from '@hono/session';
-import type { Session, SessionData, SessionOptions, Storage } from '@hono/session';
-import type { Context } from 'hono';
-import { definePlugin } from '../define';
-
-export type JaxSessionData = SessionData;
-
-export type SessionStorageFactory<Data extends SessionData = JaxSessionData> = (
-  c: Context
-) => Storage<Data>;
-
-export type SessionPluginOptions<Data extends SessionData = JaxSessionData> =
-  SessionOptions<Data> & {
-    /**
-     * Optional backing storage. When omitted, @hono/session keeps session data
-     * inside the encrypted cookie.
-     */
-    storage?: Storage<Data> | SessionStorageFactory<Data>;
-  };
-
-declare module 'hono' {
-  interface ContextVariableMap {
-    session: Session<JaxSessionData>;
-    sessionStorage?: Storage<JaxSessionData>;
-  }
-}
-
-const DEFAULT_SESSION_DURATION = {
-  // 会话的有效时间以秒为单位。超过该时间后，会话将失效，需要重新认证才能继续使用。
-  absolute: 60 * 60 * 24 * 7 // 7天
-};
-
-const DEFAULT_SESSION_OPTIONS: SessionPluginOptions = {
-  secret: 'jax-session',
-  duration: DEFAULT_SESSION_DURATION
-};
-
-function isSessionPluginOptions(options: unknown): options is SessionPluginOptions {
-  return Boolean(options && typeof options === 'object' && !Array.isArray(options));
-}
-
-function resolveSessionOptions(config: unknown, options: unknown): SessionPluginOptions {
-  const configOptions = readConfigSessionOptions(config);
-  const pluginOptions = isSessionPluginOptions(options) ? options : {};
-  const duration: NonNullable<SessionPluginOptions['duration']> = {
-    absolute: DEFAULT_SESSION_DURATION.absolute,
-    ...configOptions.duration,
-    ...pluginOptions.duration
-  };
-  const { storage, ...sessionOptions } = {
-    ...DEFAULT_SESSION_OPTIONS,
-    ...configOptions,
-    ...pluginOptions,
-    duration
-  };
-
-  return {
-    ...sessionOptions,
-    storage
-  };
-}
-
-function readConfigSessionOptions(config: unknown): SessionPluginOptions {
-  if (!config || typeof config !== 'object' || Array.isArray(config)) {
-    return {};
-  }
-
-  const session = (config as { session?: unknown }).session;
-
-  return isSessionPluginOptions(session) ? session : {};
-}
-
-export default definePlugin({
-  setup(ctx, options) {
-    const { storage, ...sessionOptions } = resolveSessionOptions(ctx.config, options);
-
-    if (storage) {
-      ctx.app.use(useSessionStorage(storage));
-    }
-
-    ctx.app.use(useSession(sessionOptions));
-  }
-});
-
-export type { Session, SessionData, SessionOptions, Storage };
-export { useSession, useSessionStorage };
+import { useSession, useSessionStorage } from '@hono/session';
+import type { Session, SessionData, SessionOptions, Storage } from '@hono/session';
+import type { Context } from 'hono';
+import { definePlugin } from '../define';
+
+export type JaxSessionData = SessionData;
+
+export type SessionStorageFactory<Data extends SessionData = JaxSessionData> = (
+  c: Context
+) => Storage<Data>;
+
+export type SessionPluginOptions<Data extends SessionData = JaxSessionData> =
+  SessionOptions<Data> & {
+    /**
+     * Optional backing storage. When omitted, @hono/session keeps session data
+     * inside the encrypted cookie.
+     */
+    storage?: Storage<Data> | SessionStorageFactory<Data>;
+  };
+
+declare module 'hono' {
+  interface ContextVariableMap {
+    session: Session<JaxSessionData>;
+    sessionStorage?: Storage<JaxSessionData>;
+  }
+}
+
+const DEFAULT_SESSION_DURATION = {
+  // 会话的有效时间以秒为单位。超过该时间后，会话将失效，需要重新认证才能继续使用。
+  absolute: 60 * 60 * 24 * 7 // 7天
+};
+
+const DEFAULT_SESSION_OPTIONS: SessionPluginOptions = {
+  secret: 'jax-session',
+  duration: DEFAULT_SESSION_DURATION
+};
+
+function isSessionPluginOptions(options: unknown): options is SessionPluginOptions {
+  return Boolean(options && typeof options === 'object' && !Array.isArray(options));
+}
+
+function resolveSessionOptions(config: unknown, options: unknown): SessionPluginOptions {
+  const configOptions = readConfigSessionOptions(config);
+  const pluginOptions = isSessionPluginOptions(options) ? options : {};
+  const duration: NonNullable<SessionPluginOptions['duration']> = {
+    absolute: DEFAULT_SESSION_DURATION.absolute,
+    ...configOptions.duration,
+    ...pluginOptions.duration
+  };
+  const { storage, ...sessionOptions } = {
+    ...DEFAULT_SESSION_OPTIONS,
+    ...configOptions,
+    ...pluginOptions,
+    duration
+  };
+
+  return {
+    ...sessionOptions,
+    storage
+  };
+}
+
+function readConfigSessionOptions(config: unknown): SessionPluginOptions {
+  if (!config || typeof config !== 'object' || Array.isArray(config)) {
+    return {};
+  }
+
+  const session = (config as { session?: unknown }).session;
+
+  return isSessionPluginOptions(session) ? session : {};
+}
+
+export default definePlugin({
+  setup(ctx, options) {
+    const { storage, ...sessionOptions } = resolveSessionOptions(ctx.config, options);
+
+    if (storage) {
+      ctx.app.use(useSessionStorage(storage));
+    }
+
+    ctx.app.use(useSession(sessionOptions));
+  }
+});
+
+export type { Session, SessionData, SessionOptions, Storage };
+export { useSession, useSessionStorage };

package/setup.ts

@@ -1,105 +1,105 @@
-import { generateConfig } from "./build/generate-config";
-import { generateRegistry } from "./build/generate-registry";
-import { existsSync } from "node:fs";
-import { readFile, writeFile } from "node:fs/promises";
-import { cwd } from "node:process";
-import { dirname, relative, resolve } from "node:path";
-
-function toImportSpecifier(fromDir: string, targetPath: string) {
-  const relativePath = relative(fromDir, targetPath).replaceAll("\\", "/");
-
-  return relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
-}
-
-function escapeRegExp(value: string) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function createGeneratedEntrySource(source: string, generatedImportPath: string) {
-  const generatedPattern = escapeRegExp(generatedImportPath);
-  const sideEffectGeneratedImport = new RegExp(
-    `^\\s*import\\s+["']${generatedPattern}(?:/index(?:\\.ts)?)?["'];?\\r?\\n`,
-    "m",
-  );
-  const withoutSideEffectImport = source.replace(sideEffectGeneratedImport, "");
-  const jaxImport = /from\s+["']jax-hono["']/;
-
-  if (jaxImport.test(withoutSideEffectImport)) {
-    return withoutSideEffectImport.replace(jaxImport, `from "${generatedImportPath}"`);
-  }
-
-  const generatedImport = new RegExp(`from\\s+["']${generatedPattern}(?:/index(?:\\.ts)?)?["']`);
-
-  if (generatedImport.test(withoutSideEffectImport)) {
-    return withoutSideEffectImport;
-  }
-
-  throw new Error('Entry file must import from "jax-hono" so setup can switch it to the generated Jax entry.');
-}
-
-export function setupJax() {
-  generateConfig();
-  generateRegistry();
-}
-
-async function runCommand(command: string[]) {
-  const [cmd, ...args] = command;
-  const proc = Bun.spawn([cmd, ...args], {
-    cwd: cwd(),
-    stdin: "inherit",
-    stdout: "inherit",
-    stderr: "inherit",
-  });
-
-  return await proc.exited;
-}
-
-export async function setupJaxBuild(entryFile: string, command: string[] = []) {
-  setupJax();
-
-  const projectDir = cwd();
-  const entry = resolve(projectDir, entryFile);
-  const generatedEntry = resolve(projectDir, ".jax-hono", "index.ts");
-
-  if (!existsSync(generatedEntry)) {
-    throw new Error(".jax-hono/index.ts was not generated. Check setup output.");
-  }
-
-  const importPath = toImportSpecifier(dirname(entry), generatedEntry).replace(/\/index\.ts$/, "");
-  const source = await readFile(entry, "utf8");
-  const nextSource = createGeneratedEntrySource(source, importPath);
-
-  if (command.length === 0) {
-    console.log(`Jax generated entry is ready for ${relative(projectDir, entry)}.`);
-    return;
-  }
-
-  if (nextSource !== source) {
-    await writeFile(entry, nextSource);
-  }
-
-  try {
-    return await runCommand(command);
-  } finally {
-    if (nextSource !== source) {
-      await writeFile(entry, source);
-    }
-  }
-}
-
-if (import.meta.main) {
-  const args = Bun.argv.slice(2);
-  const entryFile = args[0];
-  const commandArgs = args.slice(1);
-  const command = commandArgs[0] === "--" ? commandArgs.slice(1) : commandArgs;
-
-  if (entryFile) {
-    const exitCode = await setupJaxBuild(entryFile, command);
-
-    if (typeof exitCode === "number") {
-      process.exit(exitCode);
-    }
-  } else {
-    setupJax();
-  }
-}
+import { generateConfig } from "./build/generate-config";
+import { generateRegistry } from "./build/generate-registry";
+import { existsSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import { cwd } from "node:process";
+import { dirname, relative, resolve } from "node:path";
+
+function toImportSpecifier(fromDir: string, targetPath: string) {
+  const relativePath = relative(fromDir, targetPath).replaceAll("\\", "/");
+
+  return relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
+}
+
+function escapeRegExp(value: string) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+function createGeneratedEntrySource(source: string, generatedImportPath: string) {
+  const generatedPattern = escapeRegExp(generatedImportPath);
+  const sideEffectGeneratedImport = new RegExp(
+    `^\\s*import\\s+["']${generatedPattern}(?:/index(?:\\.ts)?)?["'];?\\r?\\n`,
+    "m",
+  );
+  const withoutSideEffectImport = source.replace(sideEffectGeneratedImport, "");
+  const jaxImport = /from\s+["']jax-hono["']/;
+
+  if (jaxImport.test(withoutSideEffectImport)) {
+    return withoutSideEffectImport.replace(jaxImport, `from "${generatedImportPath}"`);
+  }
+
+  const generatedImport = new RegExp(`from\\s+["']${generatedPattern}(?:/index(?:\\.ts)?)?["']`);
+
+  if (generatedImport.test(withoutSideEffectImport)) {
+    return withoutSideEffectImport;
+  }
+
+  throw new Error('Entry file must import from "jax-hono" so setup can switch it to the generated Jax entry.');
+}
+
+export function setupJax() {
+  generateConfig();
+  generateRegistry();
+}
+
+async function runCommand(command: string[]) {
+  const [cmd, ...args] = command;
+  const proc = Bun.spawn([cmd, ...args], {
+    cwd: cwd(),
+    stdin: "inherit",
+    stdout: "inherit",
+    stderr: "inherit",
+  });
+
+  return await proc.exited;
+}
+
+export async function setupJaxBuild(entryFile: string, command: string[] = []) {
+  setupJax();
+
+  const projectDir = cwd();
+  const entry = resolve(projectDir, entryFile);
+  const generatedEntry = resolve(projectDir, ".jax-hono", "index.ts");
+
+  if (!existsSync(generatedEntry)) {
+    throw new Error(".jax-hono/index.ts was not generated. Check setup output.");
+  }
+
+  const importPath = toImportSpecifier(dirname(entry), generatedEntry).replace(/\/index\.ts$/, "");
+  const source = await readFile(entry, "utf8");
+  const nextSource = createGeneratedEntrySource(source, importPath);
+
+  if (command.length === 0) {
+    console.log(`Jax generated entry is ready for ${relative(projectDir, entry)}.`);
+    return;
+  }
+
+  if (nextSource !== source) {
+    await writeFile(entry, nextSource);
+  }
+
+  try {
+    return await runCommand(command);
+  } finally {
+    if (nextSource !== source) {
+      await writeFile(entry, source);
+    }
+  }
+}
+
+if (import.meta.main) {
+  const args = Bun.argv.slice(2);
+  const entryFile = args[0];
+  const commandArgs = args.slice(1);
+  const command = commandArgs[0] === "--" ? commandArgs.slice(1) : commandArgs;
+
+  if (entryFile) {
+    const exitCode = await setupJaxBuild(entryFile, command);
+
+    if (typeof exitCode === "number") {
+      process.exit(exitCode);
+    }
+  } else {
+    setupJax();
+  }
+}

package/types/config.ts

@@ -1,9 +1,9 @@
-import type { SessionPluginOptions } from '../plugins/session';
-
-export type JaxConfig = {
-  rootDir: string;
-  port: number;
-  env: string;
-
-  session?: SessionPluginOptions;
-};
+import type { SessionPluginOptions } from '../plugins/session';
+
+export type JaxConfig = {
+  rootDir: string;
+  port: number;
+  env: string;
+
+  session?: SessionPluginOptions;
+};

package/types/context.ts

@@ -1,9 +1,9 @@
-import type { GeneratedModels, GeneratedServices } from '../core/generated';
-
-export type JaxState = Record<string, unknown>;
-
-export type JaxContextVariables = {
-  model: GeneratedModels;
-  service: GeneratedServices;
-  state: JaxState;
-};
+import type { GeneratedModels, GeneratedServices } from '../core/generated';
+
+export type JaxState = Record<string, unknown>;
+
+export type JaxContextVariables = {
+  model: GeneratedModels;
+  service: GeneratedServices;
+  state: JaxState;
+};

package/types/index.ts

@@ -1,2 +1,2 @@
-export * from './context';
-export type { JaxConfig } from './config';
+export * from './context';
+export type { JaxConfig } from './config';

package/utils/array.ts

@@ -1,7 +1,7 @@
-export function arrayFrom<T>(value: T | T[] | null | undefined): T[] {
-  if (value === null || value === undefined || value === '') {
-    return [];
-  }
-
-  return Array.isArray(value) ? value : [value];
-}
+export function arrayFrom<T>(value: T | T[] | null | undefined): T[] {
+  if (value === null || value === undefined || value === '') {
+    return [];
+  }
+
+  return Array.isArray(value) ? value : [value];
+}

package/utils/async.ts

@@ -1,47 +1,47 @@
-import pLimit from "p-limit";
-
-export { pLimit };
-
-export type QueueErrorHandler<T, R> = (
-  error: unknown,
-  item: T,
-  index: number,
-) => Promise<R | T> | R | T;
-
-export interface QueueOptions<T, R> {
-  concurrency?: number;
-  continueOnError?: boolean;
-  onError?: QueueErrorHandler<T, R>;
-}
-
-export async function queue<T, R>(
-  data: readonly T[],
-  fn: (item: T, index: number) => Promise<R> | R,
-  options: number | QueueOptions<T, R> = {},
-) {
-  const config =
-    typeof options === "number" ? { concurrency: options } : options;
-  const concurrency = config.concurrency ?? 50;
-  const continueOnError = config.continueOnError ?? true;
-  const limit = pLimit(concurrency);
-
-  const input = data.map((item, index) => {
-    return limit(async () => {
-      try {
-        return await fn(item, index);
-      } catch (error) {
-        if (!continueOnError) {
-          throw error;
-        }
-
-        console.error("[queue] task failed:", error);
-
-        return config.onError ? config.onError(error, item, index) : item;
-      }
-    });
-  });
-
-  const result = await Promise.all(input);
-
-  return result;
-}
+import pLimit from "p-limit";
+
+export { pLimit };
+
+export type QueueErrorHandler<T, R> = (
+  error: unknown,
+  item: T,
+  index: number,
+) => Promise<R | T> | R | T;
+
+export interface QueueOptions<T, R> {
+  concurrency?: number;
+  continueOnError?: boolean;
+  onError?: QueueErrorHandler<T, R>;
+}
+
+export async function queue<T, R>(
+  data: readonly T[],
+  fn: (item: T, index: number) => Promise<R> | R,
+  options: number | QueueOptions<T, R> = {},
+) {
+  const config =
+    typeof options === "number" ? { concurrency: options } : options;
+  const concurrency = config.concurrency ?? 50;
+  const continueOnError = config.continueOnError ?? true;
+  const limit = pLimit(concurrency);
+
+  const input = data.map((item, index) => {
+    return limit(async () => {
+      try {
+        return await fn(item, index);
+      } catch (error) {
+        if (!continueOnError) {
+          throw error;
+        }
+
+        console.error("[queue] task failed:", error);
+
+        return config.onError ? config.onError(error, item, index) : item;
+      }
+    });
+  });
+
+  const result = await Promise.all(input);
+
+  return result;
+}

package/utils/crypto.ts

@@ -1,9 +1,9 @@
-import { createHash, randomBytes } from 'node:crypto';
-
-export function md5(value: string) {
-  return createHash('md5').update(value).digest('hex');
-}
-
+import { createHash, randomBytes } from 'node:crypto';
+
+export function md5(value: string) {
+  return createHash('md5').update(value).digest('hex');
+}
+
 export function createToken(byteLength = 24) {
   return randomBytes(byteLength).toString('hex');
 }