jax-hono 1.0.11 → 1.0.13

package/build/generate-registry.ts

@@ -334,7 +334,7 @@ function generateModelsRegistry() {
 
   files.forEach((filePath) => {
     const source = readFileSync(filePath, 'utf8')
-    const exportedModels = [...source.matchAll(/\bexport\s+const\s+([a-zA-Z_$][a-zA-Z0-9_$]*Model)\b/g)]
+    const exportedModels = [...source.matchAll(/\bexport\s+const\s+([a-zA-Z_$][a-zA-Z0-9_$]*)\s*=\s*create(?:Loose)?Model\s*\(/g)]
       .map((match) => match[1])
       .sort((left, right) => left.localeCompare(right))
 
@@ -343,12 +343,19 @@ function generateModelsRegistry() {
     }
 
     const modelKey = source.match(/\bexport\s+const\s+modelKey\s*=\s*['"]([a-zA-Z_$][a-zA-Z0-9_$]*)['"]/)?.[1]
+    const fileModelName = toPascalCase(toModulePath(
+      filePath.includes(`${srcDir}/modules/`) ? 'modules' : basename(parse(filePath).dir),
+      filePath,
+      ['.model'],
+    ))
 
     imports.push(`import { ${exportedModels.join(', ')} } from '${toImportPath(filePath)}'`)
     entries.push(...exportedModels.map((name) => {
       const key = exportedModels.length === 1 && modelKey
         ? modelKey
-        : name.slice(0, -'Model'.length)
+        : name === `${fileModelName}Model`
+          ? fileModelName
+          : name
 
       return `  ${key}: ${name},`
     }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jax-hono",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Lightweight framework layer on top of Hono, built for Bun",
   "type": "module",
   "main": "./index.ts",

package/plugins/mongoose/model.ts

@@ -7,7 +7,7 @@ import mongoose, {
   type SchemaOptions,
 } from "mongoose";
 import config from "../../config";
-import { rankSetter } from "./schema";
+import { rankSetter, rankedFields } from "./schema";
 import dayjs from "dayjs";
 
 export { rankSetter };
@@ -154,17 +154,35 @@ export function applyDefaultSchemaOptions(schema: Schema) {
 }
 
 export function installRankHooks(schema: Schema) {
+  const fields: Record<string, unknown> = {};
+
+  if (!schema.path("rank")) {
+    fields.rank = rankedFields.rank;
+  }
+
+  if (!schema.path("isTop")) {
+    fields.isTop = rankedFields.isTop;
+  }
+
+  if (Object.keys(fields).length) {
+    schema.add(fields as any);
+  }
+
   if ((schema as any)[rankHooksInstalled]) {
     return;
   }
 
   (schema as any)[rankHooksInstalled] = true;
 
+  // 修改
   schema.pre(["updateOne", "findOneAndUpdate", "updateMany"], function () {
+    console.log('updateOne');
     normalizeRank(this.getUpdate());
   });
 
+  // 新增
   schema.pre("save", function () {
+    console.log('save');
     normalizeRank(this);
   });
 }
@@ -294,14 +312,11 @@ function walkTree(items: any[], depth: number, list: any[]) {
 }
 
 function normalizeRank(data: any) {
-  if (!data) {
-    return;
-  }
-
-  const target = data.$set ?? data;
-
-  if (target.rank !== undefined) {
-    target.rank = rankSetter(target.rank);
-    target.isTop = target.rank !== null;
+  if (data.rank != undefined) {
+    if (data.rank) {
+      data.isTop = true
+    } else {
+      data.isTop = false
+    }
   }
 }

package/plugins/mongoose/schema.ts

@@ -21,7 +21,10 @@ export function rankSetter(value: unknown) {
   return value !== '' && value !== undefined && value !== null ? Number(value) : null;
 }
 
+
 export const rankedFields = {
-  rank: { type: Number, set: rankSetter },
-  isTop: { type: Boolean, default: false }
+  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 }
 };