Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24afc42de9 | ||
|
|
6383aade98 | ||
|
|
d12877f846 |
Generated
+203
-162
File diff suppressed because it is too large
Load Diff
+19
-8
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "shrimp-server",
|
"name": "shrimp-server",
|
||||||
"version": "0.7.0",
|
"version": "0.7.3",
|
||||||
"description": "Shrimp 框架后端 — 声明式字段驱动的 Node.js 管理后台框架(Express + Mongoose + JWT)",
|
"description": "Shrimp 框架后端 — 声明式字段驱动的 Node.js 管理后台框架(Express + Mongoose + JWT)",
|
||||||
"main": "dist/main/index.js",
|
"main": "dist/main/index.js",
|
||||||
"types": "dist/main/index.d.ts",
|
"types": "dist/main/index.d.ts",
|
||||||
@@ -24,21 +24,29 @@
|
|||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
|
"bcrypt": "^5 || ^6",
|
||||||
"express": "^4 || ^5",
|
"express": "^4 || ^5",
|
||||||
"mongoose": "^6 || ^7 || ^8",
|
|
||||||
"jsonwebtoken": "^8 || ^9",
|
"jsonwebtoken": "^8 || ^9",
|
||||||
"bcrypt": "^5 || ^6"
|
"mongoose": "^6 || ^7 || ^8"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
"express": { "optional": true },
|
"express": {
|
||||||
"mongoose": { "optional": true },
|
"optional": true
|
||||||
"jsonwebtoken": { "optional": true },
|
},
|
||||||
"bcrypt": { "optional": true }
|
"mongoose": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"jsonwebtoken": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"bcrypt": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@types/bcrypt": "^5.0.0",
|
||||||
"@types/express": "^4.17.21",
|
"@types/express": "^4.17.21",
|
||||||
"@types/jsonwebtoken": "^9.0.0",
|
"@types/jsonwebtoken": "^9.0.0",
|
||||||
"@types/bcrypt": "^5.0.0",
|
|
||||||
"@types/node": "^20.0.0",
|
"@types/node": "^20.0.0",
|
||||||
"bcrypt": "^5.1.1",
|
"bcrypt": "^5.1.1",
|
||||||
"express": "^4.19.0",
|
"express": "^4.19.0",
|
||||||
@@ -47,5 +55,8 @@
|
|||||||
"tsx": "^4.7.0",
|
"tsx": "^4.7.0",
|
||||||
"typescript": "^5.3.0",
|
"typescript": "^5.3.0",
|
||||||
"vitest": "^1.4.0"
|
"vitest": "^1.4.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"shrimp-server": "git+http://git.zeromvc.com/wc24/shrimp-server.git#v0.7.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -151,8 +151,7 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|||||||
result[field.key] = await handler.reqFilter(result[field.key], field, result)
|
result[field.key] = await handler.reqFilter(result[field.key], field, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
const fieldErr = await this.validateField(field, result[field.key], result)
|
await this.validateNode(field, result[field.key], [field.key], result)
|
||||||
if (fieldErr) throw new ShrimpError(fieldErr)
|
|
||||||
|
|
||||||
if (handler?.validate && result[field.key] !== undefined) {
|
if (handler?.validate && result[field.key] !== undefined) {
|
||||||
const err = await handler.validate(result[field.key], field, result)
|
const err = await handler.validate(result[field.key], field, result)
|
||||||
@@ -181,8 +180,7 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|||||||
result[field.key] = await handler.reqFilter(result[field.key], field, result)
|
result[field.key] = await handler.reqFilter(result[field.key], field, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
const fieldErr = await this.validateField(field, result[field.key], result)
|
await this.validateNode(field, result[field.key], [field.key], result)
|
||||||
if (fieldErr) throw new ShrimpError(fieldErr)
|
|
||||||
|
|
||||||
if (handler?.validate) {
|
if (handler?.validate) {
|
||||||
const err = await handler.validate(result[field.key], field, result)
|
const err = await handler.validate(result[field.key], field, result)
|
||||||
@@ -192,6 +190,39 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 递归校验:本节点 validateField,出错即抛(带 path);再下钻复合(tab/object/array)子节点。第一版 fail-fast */
|
||||||
|
private async validateNode(field: IFieldConfig, value: any, path: (string | number)[], rootItem: Record<string, any>): Promise<void> {
|
||||||
|
const err = await this.validateField(field, value, rootItem)
|
||||||
|
if (err) throw new ShrimpError(this.errWithPath(err, path))
|
||||||
|
for (const child of this.childrenOf(field, value)) {
|
||||||
|
await this.validateNode(child.field, child.value, [...path, child.key], rootItem)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 复合类型吐出子 (字段, 值) 对:tab 选中分支的 fields / object 的 fields / array 每个元素套 item。叶子或空 → [] */
|
||||||
|
private childrenOf(field: IFieldConfig, value: any): { key: string | number; field: IFieldConfig; value: any }[] {
|
||||||
|
if (value == null || typeof value !== "object") return []
|
||||||
|
if (field.type === ShrimpFieldTypes.Tab && Array.isArray(field.tabs)) {
|
||||||
|
const branch = field.tabs.find(t => t.key === value.type)
|
||||||
|
return branch ? branch.fields.map(f => ({ key: f.key, field: f, value: value[f.key] })) : []
|
||||||
|
}
|
||||||
|
if (field.type === ShrimpFieldTypes.Object && Array.isArray(field.fields)) {
|
||||||
|
return field.fields.map(f => ({ key: f.key, field: f, value: value[f.key] }))
|
||||||
|
}
|
||||||
|
if (field.type === ShrimpFieldTypes.Array && field.item && Array.isArray(value)) {
|
||||||
|
return value.map((el, i) => ({ key: i as number, field: field.item!, value: el }))
|
||||||
|
}
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 嵌套字段出错时把 path 缀进 message(顶层不缀,已有字段名),让用户知道是哪个嵌套位置 */
|
||||||
|
private errWithPath(err: ILabel, path: (string | number)[]): ILabel {
|
||||||
|
if (path.length <= 1 || typeof err !== "object" || err === null) return err
|
||||||
|
const e = err as any
|
||||||
|
const tag = `[${path.join(".")}]`
|
||||||
|
return { ...e, params: { ...e.params, field: e.params?.field != null ? `${e.params.field} ${tag}` : tag } }
|
||||||
|
}
|
||||||
|
|
||||||
private async processResItem(item: Record<string, any>): Promise<Record<string, any>> {
|
private async processResItem(item: Record<string, any>): Promise<Record<string, any>> {
|
||||||
const result = { ...item }
|
const result = { ...item }
|
||||||
for (const field of this.fields) {
|
for (const field of this.fields) {
|
||||||
@@ -268,7 +299,8 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|||||||
}
|
}
|
||||||
|
|
||||||
private filterHidden(item: any): any {
|
private filterHidden(item: any): any {
|
||||||
return this.excludeKeys(item, this.fields.filter(f => f.hidden).map(f => f.key))
|
// __v 是 mongoose 版本键,前端无用,统一剥掉(连同 hidden 字段)
|
||||||
|
return this.excludeKeys(item, ["__v", ...this.fields.filter(f => f.hidden).map(f => f.key)])
|
||||||
}
|
}
|
||||||
|
|
||||||
private buildQuery(query?: IPageQuery & any): IShrimpQuery {
|
private buildQuery(query?: IPageQuery & any): IShrimpQuery {
|
||||||
|
|||||||
@@ -107,10 +107,11 @@ export class MongoShrimpCrud<T> implements ShrimpCrud<T> {
|
|||||||
return await this.model.findById(id).lean() as T | null
|
return await this.model.findById(id).lean() as T | null
|
||||||
}
|
}
|
||||||
async add(item: Omit<T, '_id'>): Promise<T> {
|
async add(item: Omit<T, '_id'>): Promise<T> {
|
||||||
return await this.model.create(item)
|
const doc = await this.model.create(item)
|
||||||
|
return doc.toObject() as T // 转普通对象,否则下游 {...item} 展开的是 mongoose Document 内部($__/_doc/$isNew)
|
||||||
}
|
}
|
||||||
async edit(id: string, item: Partial<T>): Promise<T | null> {
|
async edit(id: string, item: Partial<T>): Promise<T | null> {
|
||||||
return await this.model.findByIdAndUpdate(id, item, { new: true })
|
return await this.model.findByIdAndUpdate(id, item, { new: true }).lean() as T | null
|
||||||
}
|
}
|
||||||
async delete(id: string): Promise<boolean> {
|
async delete(id: string): Promise<boolean> {
|
||||||
const result = await this.model.findByIdAndDelete(id)
|
const result = await this.model.findByIdAndDelete(id)
|
||||||
|
|||||||
Reference in New Issue
Block a user