@mldong/jeeflow 1.8.2 → 1.8.4

package/dist/engine.d.ts

@@ -31,6 +31,11 @@ export declare class EngineImpl implements Engine {
     constructor(repo: ProcessRepository, userProv?: UserProvider | undefined, idGen?: IDGenerator | undefined, exprEval?: ExpressionEvaluator | undefined);
     setExtensions(ext: EngineExtensions): void;
     setRegistry(reg: HandlerRegistry): void;
+    private interceptorCache;
+    /** 定义级拦截器解析（issue 34，对齐 Java 模型级 postInterceptors）：
+     *  流程定义顶层 postInterceptors 声明 → 按名从 interceptorRegistry 取（未声明该流程不触发）；
+     *  未声明 → 回落引擎级列表（向后兼容）。结果按 defineId 缓存。 */
+    private resolveInterceptors;
     private firePre;
     /** 表达式求值（v1.5.0，门面 highLight 决策分支过滤用） */
     evalExpr(expr: string, vars: Record<string, any>): Promise<any>;

package/dist/engine.js

@@ -28,12 +28,50 @@ export class EngineImpl {
         this.idGen = idGen;
         this.exprEval = exprEval;
     }
-    setExtensions(ext) { this.ext = ext; }
+    setExtensions(ext) {
+        this.ext = ext;
+        this.interceptorCache = new Map();
+    }
     setRegistry(reg) { this.registry = reg; }
+    interceptorCache = new Map();
+    /** 定义级拦截器解析（issue 34，对齐 Java 模型级 postInterceptors）：
+     *  流程定义顶层 postInterceptors 声明 → 按名从 interceptorRegistry 取（未声明该流程不触发）；
+     *  未声明 → 回落引擎级列表（向后兼容）。结果按 defineId 缓存。 */
+    async resolveInterceptors(inst) {
+        if (!this.ext)
+            return [];
+        const defineId = inst.defineId;
+        if (defineId == null)
+            return this.ext.interceptors ?? [];
+        const cached = this.interceptorCache.get(defineId);
+        if (cached)
+            return cached;
+        let list = this.ext.interceptors ?? [];
+        try {
+            const def = await this.repo.findDefineById(defineId);
+            if (def) {
+                const content = typeof def.content === 'string' ? def.content : new TextDecoder().decode(def.content);
+                const meta = JSON.parse(content);
+                const declared = String(meta.postInterceptors ?? '').trim();
+                if (declared) {
+                    list = [];
+                    for (const name of declared.split(',').map(n => n.trim())) {
+                        const ic = this.ext.interceptorRegistry?.[name];
+                        if (name && ic)
+                            list.push(ic);
+                    }
+                }
+            }
+        }
+        catch { /* 解析失败回落引擎级 */ }
+        this.interceptorCache.set(defineId, list);
+        return list;
+    }
     async firePre(node, inst) {
-        if (!this.ext?.interceptors)
+        if (!this.ext?.interceptors && !this.ext?.interceptorRegistry)
             return true;
-        for (const ic of this.ext.interceptors.sort((a, b) => a.order - b.order))
+        const list = await this.resolveInterceptors(inst);
+        for (const ic of [...list].sort((a, b) => a.order - b.order))
             if (!(await ic.preHandle(node, inst)))
                 return false;
         return true;
@@ -45,9 +83,9 @@ export class EngineImpl {
         return this.exprEval.eval(expr, vars);
     }
     async firePost(node, inst) {
-        if (!this.ext?.interceptors)
+        if (!this.ext?.interceptors && !this.ext?.interceptorRegistry)
             return;
-        for (const ic of this.ext.interceptors)
+        for (const ic of await this.resolveInterceptors(inst))
             await ic.postHandle(node, inst);
     }
     async fireEvent(evt) {

package/dist/extensions.d.ts

@@ -34,6 +34,8 @@ export interface ProcessEvent {
 export type ProcessEventListener = (event: ProcessEvent) => void | Promise<void>;
 export interface EngineExtensions {
     interceptors?: FlowInterceptor[];
+    /** 定义级拦截器注册表（issue 34）：名字 → 实例；流程定义顶层 postInterceptors 按名解析 */
+    interceptorRegistry?: Record<string, FlowInterceptor>;
     assignmentHandler?: AssignmentHandler;
     decisionHandler?: DecisionHandler;
     listeners?: ProcessEventListener[];

package/dist/facade.d.ts

@@ -7,7 +7,12 @@ export declare class JeeflowFacade {
     private readonly extRepo?;
     private userSearch?;
     private orgProv?;
+    private metaReader?;
     constructor(engine: EngineImpl, repo: ProcessRepository, extRepo?: ProcessExtRepository | undefined);
+    /** 注入业务数据读取器（issue 30）：需有 readByProcessInstance(tableName, processInstanceId) */
+    setMetaReader(reader: {
+        readByProcessInstance(tableName: string, processInstanceId: unknown): unknown;
+    }): this;
     setUserSearch(fn: UserSearch): this;
     setOrgProvider(orgProv: OrgUserProvider): this;
     flow(action: string, args?: Record<string, any>): Promise<Record<string, any>>;
@@ -23,6 +28,16 @@ export declare class JeeflowFacade {
     private designUpdate;
     /** 更新流程设计定义（设计稿保存，issues/08）：content 快照入库 + 同步基本信息 + 置未部署 */
     private designUpdateDefine;
+    /** 删除设计稿（issues/28：兼容 {ids} 批量与单 {id}） */
+    private designRemove;
+    /** 删除定义（issues/28：兼容 {ids} 批量与单 {id}） */
+    private defineRemove;
+    /** 启用/停用（issues/28：兼容 {ids, opType} 批量；opType/state 二选一） */
+    private defineUpAndDown;
+    /** 按类型分组列出流程设计（issue 30，对齐 Java issues/28）：不依赖框架字典 */
+    private designListByType;
+    /** 按流程实例回显业务数据（issue 30，对齐 Java issues/28）：metaReader 注入式，未注入清晰报错 */
+    private bizData;
     /** 重新部署流程定义（issues/08）：替换最新定义内容 + 置已部署（对齐 boot3 redeploy） */
     private designRedeploy;
     private designDetail;

package/dist/facade.js

@@ -19,11 +19,17 @@ export class JeeflowFacade {
     extRepo;
     userSearch;
     orgProv;
+    metaReader;
     constructor(engine, repo, extRepo) {
         this.engine = engine;
         this.repo = repo;
         this.extRepo = extRepo;
     }
+    /** 注入业务数据读取器（issue 30）：需有 readByProcessInstance(tableName, processInstanceId) */
+    setMetaReader(reader) {
+        this.metaReader = reader;
+        return this;
+    }
     // 注入用户搜索钩子（candidatePage 无模型候选时的用户分页搜索）
     setUserSearch(fn) {
         this.userSearch = fn;
@@ -60,9 +66,9 @@ export class JeeflowFacade {
             case 'processDefine/redeploy':
                 return this.redeploy(args);
             case 'processDefine/remove':
-                return this.repo.removeDefine(toId(args.id));
+                return this.defineRemove(args);
             case 'processDefine/upAndDown':
-                return this.repo.updateDefineState(toId(args.id), toInt(args.state));
+                return this.defineUpAndDown(args);
             case 'processInstance/page':
                 return this.instancePage(args);
             case 'processInstance/detail':
@@ -86,7 +92,11 @@ export class JeeflowFacade {
             case 'processDesign/updateDefine':
                 return this.designUpdateDefine(args);
             case 'processDesign/remove':
-                return this.ext().removeDesign(toId(args.id));
+                return this.designRemove(args);
+            case 'processDesign/listByType':
+                return this.designListByType(args);
+            case 'processInstance/bizData':
+                return this.bizData(args);
             case 'processSurrogate/page':
                 return this.surrogatePage(args);
             case 'processSurrogate/save':
@@ -292,9 +302,19 @@ export class JeeflowFacade {
         const design = await ext.findDesignById(designId);
         if (!design)
             throw new Error('流程设计不存在');
-        if (args.content == null)
-            throw new Error('content 缺失');
-        const content = toStr(args.content);
+        // issues/31：兼容 boot3 顶层 JSON（无 content 字段）——非保留字段序列化为内容快照
+        let content = args.content;
+        if (content == null) {
+            const copy = {};
+            for (const [k, v] of Object.entries(args)) {
+                if (k !== 'processDesignId' && k !== 'operator')
+                    copy[k] = v;
+            }
+            if (Object.keys(copy).length === 0)
+                throw new Error('content 缺失');
+            content = JSON.stringify(copy);
+        }
+        content = toStr(content);
         // 与最新一条相同则不重复入库（对齐 boot3 updateDefine）
         const hisList = await ext.listDesignHis(designId);
         if (hisList.length === 0 || toStr(hisList[0].content) !== content) {
@@ -319,6 +339,93 @@ export class JeeflowFacade {
         await ext.updateDesign(design);
         return {};
     }
+    /** 删除设计稿（issues/28：兼容 {ids} 批量与单 {id}） */
+    async designRemove(args) {
+        const ext = this.ext();
+        if (Array.isArray(args.ids)) {
+            for (const id of args.ids)
+                await ext.removeDesign(toId(id));
+        }
+        else {
+            await ext.removeDesign(toId(args.id));
+        }
+        return {};
+    }
+    /** 删除定义（issues/28：兼容 {ids} 批量与单 {id}） */
+    async defineRemove(args) {
+        if (Array.isArray(args.ids)) {
+            for (const id of args.ids)
+                await this.repo.removeDefine(toId(id));
+        }
+        else {
+            await this.repo.removeDefine(toId(args.id));
+        }
+        return {};
+    }
+    /** 启用/停用（issues/28：兼容 {ids, opType} 批量；opType/state 二选一） */
+    async defineUpAndDown(args) {
+        const state = toInt(args.opType ?? args.state);
+        if (Array.isArray(args.ids)) {
+            for (const id of args.ids)
+                await this.repo.updateDefineState(toId(id), state);
+        }
+        else {
+            await this.repo.updateDefineState(toId(args.id), state);
+        }
+        return {};
+    }
+    /** 按类型分组列出流程设计（issue 30，对齐 Java issues/28）：不依赖框架字典 */
+    async designListByType(args) {
+        const ext = this.ext();
+        const pageNum = args.pageNum != null ? toInt(args.pageNum) : 1;
+        const pageSize = args.pageSize != null ? toInt(args.pageSize) : 10000;
+        const [rows] = await ext.pageDesigns(pageNum, pageSize, []);
+        // 每 name 最新 define（version 最大）
+        const { rows: defRows } = await this.repo.pageDefines(1, 10000, []);
+        const latestByName = new Map();
+        for (const r of defRows) {
+            const prev = latestByName.get(r.name);
+            if (!prev || r.version > prev.version)
+                latestByName.set(r.name, r);
+        }
+        const groups = {};
+        for (const d of rows) {
+            const key = d.type || '';
+            (groups[key] ??= []).push({
+                processDesignId: d.id,
+                name: d.name,
+                displayName: d.displayName,
+                icon: d.icon,
+                remark: d.remark,
+                processDefineId: latestByName.get(d.name)?.id ?? null,
+                processDefineState: latestByName.get(d.name)?.state ?? null,
+                jsonObject: this.parseGraph((await ext.listDesignHis(d.id))[0]?.content ?? ''),
+            });
+        }
+        return groups;
+    }
+    /** 按流程实例回显业务数据（issue 30，对齐 Java issues/28）：metaReader 注入式，未注入清晰报错 */
+    async bizData(args) {
+        const instanceId = toId(args.processInstanceId ?? args.id);
+        const inst = await this.repo.findInstanceById(instanceId);
+        if (!inst)
+            throw new Error('流程实例不存在');
+        const def = await this.repo.findDefineById(inst.defineId);
+        if (!def)
+            throw new Error('流程定义不存在');
+        const content = typeof def.content === 'string' ? def.content : new TextDecoder().decode(def.content);
+        let tableName = null;
+        try {
+            const meta = JSON.parse(content);
+            tableName = String(meta.relTableName ?? '').trim() || String(meta.name ?? '').trim() || null;
+        }
+        catch { /* ignore */ }
+        if (!tableName)
+            throw new Error('流程定义未配置 relTableName');
+        if (!this.metaReader)
+            throw new Error('业务数据读取器未注册（facade.setMetaReader(MetaTableReader(...))，需引入 jeeflow.meta）');
+        return this.metaReader.readByProcessInstance(tableName, instanceId);
+    }
     /** 重新部署流程定义（issues/08）：替换最新定义内容 + 置已部署（对齐 boot3 redeploy） */
     async designRedeploy(args) {
         const ext = this.ext();

package/dist/index.d.ts

@@ -6,3 +6,6 @@ export * from './model.js';
 export type { ProcessRepository, UserProvider, OrgUserProvider, IDGenerator, ExpressionEvaluator } from './spi.js';
 export { SqliteDynamicTableWriter, PersistPostInterceptor, type DynamicTableWriter, type DefineLoader, } from './persist.js';
 export { registerBuiltinAssignments, OperatorAssignmentHandler, FormFieldAssigneeHandler, DeptLeaderAssignmentHandler, DeptMainLeaderAssignmentHandler, ApplicantDeptLeaderAssignmentHandler, ApplicantDeptMainLeaderAssignmentHandler, TaskRoleAssigneeHandler, HANDLER_OPERATOR_ASSIGNMENT, HANDLER_FORM_FIELD_ASSIGNEE, HANDLER_DEPT_LEADER, HANDLER_DEPT_MAIN_LEADER, HANDLER_APPLICANT_DEPT_LEADER, HANDLER_APPLICANT_DEPT_MAIN_LEADER, HANDLER_TASK_ROLE_ASSIGNEE, } from './builtin.js';
+export { JeeflowFacade } from './facade.js';
+export type { EngineExtensions, FlowInterceptor, ProcessEventListener, ProcessEvent, AssignmentHandler, DecisionHandler } from './extensions.js';
+export { JdbcProcessExtRepository } from './jdbc/ext.js';

package/dist/index.js

@@ -5,3 +5,6 @@ export { enumDict, enumDictKeys } from './metadata.js';
 export * from './model.js';
 export { SqliteDynamicTableWriter, PersistPostInterceptor, } from './persist.js';
 export { registerBuiltinAssignments, OperatorAssignmentHandler, FormFieldAssigneeHandler, DeptLeaderAssignmentHandler, DeptMainLeaderAssignmentHandler, ApplicantDeptLeaderAssignmentHandler, ApplicantDeptMainLeaderAssignmentHandler, TaskRoleAssigneeHandler, HANDLER_OPERATOR_ASSIGNMENT, HANDLER_FORM_FIELD_ASSIGNEE, HANDLER_DEPT_LEADER, HANDLER_DEPT_MAIN_LEADER, HANDLER_APPLICANT_DEPT_LEADER, HANDLER_APPLICANT_DEPT_MAIN_LEADER, HANDLER_TASK_ROLE_ASSIGNEE, } from './builtin.js';
+// issues/35：包导出面补齐——门面/扩展类型/扩展仓储（集成方组装完整引擎链）
+export { JeeflowFacade } from './facade.js';
+export { JdbcProcessExtRepository } from './jdbc/ext.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mldong/jeeflow",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "jeeflow workflow engine — Node.js / TypeScript implementation",
   "type": "module",
   "main": "./dist/index.js",
@@ -13,7 +13,8 @@
     "./memory": "./dist/memory.js",
     "./jdbc": "./dist/jdbc/index.js",
     "./mysql": "./dist/jdbc/mysql.js",
-    "./postgres": "./dist/jdbc/postgres.js"
+    "./postgres": "./dist/jdbc/postgres.js",
+    "./jdbc/ext": "./dist/jdbc/ext.js"
   },
   "scripts": {
     "build": "tsc",
@@ -44,4 +45,4 @@
     "LICENSE",
     "README.md"
   ]
-}
+}