@agile-team/mach-report 2.6.1 → 2.8.0

package/dist/server.cjs

@@ -1 +1 @@
-"use strict";var V=Object.create;var q=Object.defineProperty;var z=Object.getOwnPropertyDescriptor;var J=Object.getOwnPropertyNames;var Q=Object.getPrototypeOf,_=Object.prototype.hasOwnProperty;var W=(t,e,a,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of J(e))!_.call(t,r)&&r!==a&&q(t,r,{get:()=>e[r],enumerable:!(n=z(e,r))||n.enumerable});return t};var L=(t,e,a)=>(a=t!=null?V(Q(t)):{},W(e||!t||!t.__esModule?q(a,"default",{value:t,enumerable:!0}):a,t));Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("./report-source-BbNkkBDy.cjs"),I=require("./report-params-CjWrjPl6.cjs"),C=require("./param-validation-CiTxFeZ8.cjs"),G=require("./validate-DfHPD8wX.cjs");class m extends Error{constructor(e,a,n){super(a),this.code=e,this.path=n,this.name="ReportRuntimeError"}}function x(t){if(!t?.aborted)return;if(t.reason instanceof m)throw t.reason;const e=new Error("报表执行已取消");throw e.name="AbortError",Object.defineProperty(e,"cause",{value:t.reason}),e}function b(t,e,a){if(!Number.isFinite(a)||a<0)throw new m("budget",`${e} 的执行统计无效`,`$.budget.${e}`);const n=t[e];if(n!==void 0&&a>n)throw new m("budget",`${e} 超出预算 ${n}（实际 ${a}）`,`$.budget.${e}`)}function U(t){for(const[e,a]of Object.entries(t)){if(a!==void 0&&(!Number.isFinite(a)||a<=0))throw new m("budget",`${e} 应为正有限数字`,`$.budget.${e}`);if(e!=="maxDurationMs"&&a!==void 0&&!Number.isSafeInteger(a))throw new m("budget",`${e} 应为正安全整数`,`$.budget.${e}`);if(e==="maxDurationMs"&&a!==void 0&&a>2147483647)throw new m("budget","maxDurationMs 不能超过 2147483647",`$.budget.${e}`)}}async function B(t,e,a){const n=new AbortController,r=()=>n.abort(t?.reason);t?.addEventListener("abort",r,{once:!0}),t?.aborted&&r();const s=Date.now(),u=e===void 0?void 0:setTimeout(()=>n.abort(new m("timeout",`报表执行超过 ${e}ms`)),e);let o;try{x(n.signal);const i=new Promise((w,f)=>{o=()=>{try{x(n.signal)}catch(v){f(v)}},n.signal.addEventListener("abort",o,{once:!0})}),p=await Promise.race([a(n.signal),i]);if(x(n.signal),e!==void 0&&Date.now()-s>e)throw new m("timeout",`报表执行超过 ${e}ms`);return p}finally{u!==void 0&&clearTimeout(u),o&&n.signal.removeEventListener("abort",o),t?.removeEventListener("abort",r)}}function M(t,e){if(e.length===0)throw new R.ReportSourceError("config","缺少报表 ID");return e.map(a=>{if(!Object.prototype.hasOwnProperty.call(t,a))throw new R.ReportSourceError("config",`未注册报表 ${a}`);return t[a]})}function j(t){return t.grid?.cells.reduce((e,a)=>e+a.reduce((n,r)=>n+(r?1+(r.children?.reduce((s,u)=>s+j(u),0)??0):0),0),0)??0}function X(t,e){return t.pages.reduce((a,n)=>a+n.components.reduce((r,s)=>{if(s.kind!=="list")return r+j(s);const u=e[s.dataset]?.length??0;return r+s.columns.length*(u+(s.headerGrid?.cells.length??1))},0),0)}function H(t,e=Object.keys(t)){return M(t,e).map((a,n)=>{const r=e[n],s=I.getReportParamDefs(t,[r]);return{id:r,params:JSON.parse(JSON.stringify(s)),paramsSchema:C.reportParamsJsonSchema(s),datasetsSchema:Object.fromEntries(Object.entries(a.dataSchema??{}).map(([u,o])=>[u,R.datasetJsonSchema(o)])),capabilities:{save:!!a.provider?.save,export:!!a.provider?.export,templates:!!a.provider?.templates}}})}function A(t,e){M(t,e.reportIds);const a=C.validateReportParams(I.getReportParamDefs(t,e.reportIds),e.params),n=e.reportIds.flatMap(s=>C.validateReportParams(I.getReportParamDefs(t,[s]),e.params).issues),r=new Map(n.map(s=>[JSON.stringify(s),s]));return{...a,ok:r.size===0,issues:[...r.values()]}}function K(t,e){const a=G.validateRenderPlan(t.plan);if(!a.ok)throw new R.ReportSourceError("validate",`执行器返回无效计划：${a.errors[0]?.path}`);const n=t.plan.pages.length,r=t.plan.pages.reduce((s,u)=>s+u.components.reduce((o,i)=>o+j(i),0),0);return b(e,"maxRows",t.stats.rows),b(e,"maxPages",n),b(e,"maxCells",r),{...t,stats:{...t.stats,pages:n,cells:r}}}function N(t,e){const a=A(t.reports,e);if(!a.ok)throw new C.ReportParamValidationError(a.issues)}function F(t=[]){return t.map(({code:e,message:a,severity:n,pageIndex:r,componentIndex:s})=>({code:e,message:a,severity:n,path:`$.pages.${r}.components.${s}`}))}function Y(t){const e={maxRows:1e5,maxPages:1e4,maxCells:2e6,maxOutputBytes:1e8,maxDurationMs:12e4,...t.budget};U(e);const a=async(r,s)=>{const u=Date.now();let o=0,i=0;const p=[],w={},f=Object.fromEntries(Object.entries(t.reports).map(([d,g])=>[d,{...g,pagination:{...t.pagination,...g.pagination,...s?{measurer:s}:{}},dataValidation:{...g.dataValidation,maxRows:Math.min(e.maxRows??1e5,g.dataValidation?.maxRows??1/0),maxCells:Math.min(e.maxCells??2e6,g.dataValidation?.maxCells??1/0)}}])),l=await R.createReportSource(f,{maxPages:e.maxPages,onDatasets:(d,g,P)=>{o+=Object.values(g).reduce(($,S)=>$+S.length,0),b(e,"maxRows",o),i+=X(P,g),b(e,"maxCells",i)}})({...r,params:r.params??{},onWarning:d=>p.push({code:"layout",message:d,severity:"warning"}),onQueryResult:(d,g)=>{Object.defineProperty(w,d,{value:{revision:g.revision,sourceToken:g.sourceToken},enumerable:!0,writable:!0}),p.push(...g.diagnostics??[])}}).catch(d=>{throw d instanceof R.ReportSourceError&&d.cause instanceof R.PaginatePageLimitError?new m("budget",d.cause.message,"$.budget.maxPages"):d});x(r.signal);const c=l.pages.reduce((d,g)=>d+g.components.reduce((P,$)=>P+j($),0),0);return b(e,"maxPages",l.pages.length),b(e,"maxCells",c),{plan:l,diagnostics:p,revisions:w,stats:{rows:o,pages:l.pages.length,cells:c,durationMs:Date.now()-u}}},n=async r=>{const s=Date.now();if(r.format!=="pdf"&&r.format!=="xlsx")throw new R.ReportSourceError("config","不支持的报表导出格式");const u=r.format==="pdf"?await import("@agile-team/mach-report/pdf"):void 0;x(r.signal);const o=r.pdf?.customFontFaces??(r.pdf?.customFontBytes?{regular:r.pdf.customFontBytes}:void 0),i=u&&o?u.createFontBytesMeasurer(o):void 0,p=await a(r,i);x(r.signal);let w;if(r.format==="pdf"){x(r.signal);const l=await u.renderPlanToPdf(p.plan,{...r.pdf,...i?{measurer:i}:{}});w=l.bytes,p.diagnostics.push(...F(l.diagnostics)),p.diagnostics.push(...l.fidelityWarnings.map(c=>({code:"pdf-fidelity",message:c,severity:"warning"})),...l.pageErrors.map(c=>({code:"pdf-page",message:c,severity:"error"}))),l.unsupportedTextCount&&p.diagnostics.push({code:"pdf-font",message:`${l.unsupportedTextCount} 段文本包含当前字体不支持的字符`,severity:"warning"})}else{const{renderPlanToXlsx:l}=await import("@agile-team/mach-report/xlsx");x(r.signal);const c=await l(p.plan,r.xlsx);w=new Uint8Array(c.buffer),p.diagnostics.push(...F(c.diagnostics)),p.diagnostics.push(...c.warnings.map(d=>({code:"xlsx-fidelity",message:d,severity:"warning"})))}x(r.signal),b(e,"maxOutputBytes",w.byteLength);const{plan:f,...v}=p;return{...v,bytes:w,format:r.format,contentType:r.format==="pdf"?"application/pdf":"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",stats:{...v.stats,durationMs:Date.now()-s,outputBytes:w.byteLength}}};return{describe:r=>H(t.reports,r),validate:r=>A(t.reports,r),prepare:r=>B(r.signal,e.maxDurationMs,async s=>{const{signal:u,...o}=r;N(t,o);const i=t.executor?await t.executor.prepare(o,s):await a({...o,signal:s});return K(i,e)}),export:r=>B(r.signal,e.maxDurationMs,async s=>{const{signal:u,...o}=r;if(N(t,o),o.format!=="pdf"&&o.format!=="xlsx")throw new R.ReportSourceError("config","不支持的报表导出格式");const i=t.executor?await t.executor.export(o,s):await n({...o,signal:s});return b(e,"maxRows",i.stats.rows),b(e,"maxPages",i.stats.pages),b(e,"maxCells",i.stats.cells),b(e,"maxOutputBytes",i.bytes.byteLength),{...i,stats:{...i.stats,outputBytes:i.bytes.byteLength}}})}}function Z(t={}){const e=t.concurrency??1,a=t.maxQueued??20;if(!Number.isSafeInteger(e)||e<1||!Number.isSafeInteger(a)||a<0)throw new m("budget","队列并发应为正整数，排队上限应为非负整数");const n=[],r=new Set,s=new Set;let u=!1,o=0;const i=()=>{for(;!u&&r.size<e&&n.length;)n.shift().start()};return{get active(){return r.size},get pending(){return n.length},enqueue:(w,f={})=>{if(u)throw new m("closed","任务队列已关闭");if(x(f.signal),r.size>=e&&n.length>=a)throw new m("queue-full","报表任务队列已满");const v=f.id??`report-${++o}`;if(s.has(v))throw new m("queue-full","任务 ID 正在执行或排队");const l=new AbortController;let c="queued",d,g,P;const $=new Promise((h,y)=>{g=h,P=y}),S=()=>{f.signal?.removeEventListener("abort",T),s.delete(v)},D=h=>{if(c!=="queued"&&c!=="running")return;const y=c==="queued";c="cancelled",l.abort(h);try{x(l.signal)}catch(O){P(O)}if(y){const O=n.indexOf(E);O>=0&&n.splice(O,1),S(),i()}},T=()=>D(f.signal?.reason),k=(h,y)=>{c==="running"&&(!Number.isFinite(h)||h<0||y!==void 0&&(!Number.isFinite(y)||y<h)||(d={completed:h,...y===void 0?{}:{total:y}}))},E={cancel:D,start:()=>{c==="queued"&&(c="running",r.add(E),Promise.resolve().then(()=>(x(l.signal),w({signal:l.signal,reportProgress:k}))).then(h=>{c==="running"&&(c="completed",g(h))},h=>{c==="running"&&(c="failed",P(h))}).finally(()=>{r.delete(E),S(),i()}))}};return s.add(v),f.signal?.addEventListener("abort",T,{once:!0}),f.signal?.aborted?D(f.signal.reason):r.size<e?E.start():n.push(E),{id:v,get status(){return c},get progress(){return d},result:$,cancel:D}},close:(w={})=>{u=!0;for(const f of[...n])f.cancel(new m("closed","任务队列已关闭"));if(w.cancelRunning)for(const f of r)f.cancel(new m("closed","任务队列已关闭"))}}}exports.ReportRuntimeError=m;exports.createReportRuntime=Y;exports.createReportTaskQueue=Z;
+"use strict";var Q=Object.create;var B=Object.defineProperty;var _=Object.getOwnPropertyDescriptor;var W=Object.getOwnPropertyNames;var G=Object.getPrototypeOf,U=Object.prototype.hasOwnProperty;var X=(r,e,n,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of W(e))!U.call(r,t)&&t!==n&&B(r,t,{get:()=>e[t],enumerable:!(a=_(e,t))||a.enumerable});return r};var N=(r,e,n)=>(n=r!=null?Q(G(r)):{},X(e||!r||!r.__esModule?B(n,"default",{value:r,enumerable:!0}):n,r));Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const P=require("./report-source-CCAvFE3t.cjs"),C=require("./report-params-CjWrjPl6.cjs"),T=require("./param-validation-CiTxFeZ8.cjs"),H=require("./validate-DfHPD8wX.cjs"),$=require("./task-events-DQ276fn2.cjs");class b extends Error{constructor(e,n,a){super(n),this.code=e,this.path=a,this.name="ReportRuntimeError"}}function x(r){if(!r?.aborted)return;if(r.reason instanceof b)throw r.reason;const e=new Error("报表执行已取消");throw e.name="AbortError",Object.defineProperty(e,"cause",{value:r.reason}),e}function y(r,e,n){if(!Number.isFinite(n)||n<0)throw new b("budget",`${e} 的执行统计无效`,`$.budget.${e}`);const a=r[e];if(a!==void 0&&n>a)throw new b("budget",`${e} 超出预算 ${a}（实际 ${n}）`,`$.budget.${e}`)}function K(r){for(const[e,n]of Object.entries(r)){if(n!==void 0&&(!Number.isFinite(n)||n<=0))throw new b("budget",`${e} 应为正有限数字`,`$.budget.${e}`);if(e!=="maxDurationMs"&&n!==void 0&&!Number.isSafeInteger(n))throw new b("budget",`${e} 应为正安全整数`,`$.budget.${e}`);if(e==="maxDurationMs"&&n!==void 0&&n>2147483647)throw new b("budget","maxDurationMs 不能超过 2147483647",`$.budget.${e}`)}}async function F(r,e,n){const a=new AbortController,t=()=>a.abort(r?.reason);r?.addEventListener("abort",t,{once:!0}),r?.aborted&&t();const s=Date.now(),d=e===void 0?void 0:setTimeout(()=>a.abort(new b("timeout",`报表执行超过 ${e}ms`)),e);let u;try{x(a.signal);const p=new Promise((w,i)=>{u=()=>{try{x(a.signal)}catch(g){i(g)}},a.signal.addEventListener("abort",u,{once:!0})}),c=await Promise.race([n(a.signal),p]);if(x(a.signal),e!==void 0&&Date.now()-s>e)throw new b("timeout",`报表执行超过 ${e}ms`);return c}finally{d!==void 0&&clearTimeout(d),u&&a.signal.removeEventListener("abort",u),r?.removeEventListener("abort",t)}}function V(r,e){if(e.length===0)throw new P.ReportSourceError("config","缺少报表 ID");return e.map(n=>{if(!Object.prototype.hasOwnProperty.call(r,n))throw new P.ReportSourceError("config",`未注册报表 ${n}`);return r[n]})}function D(r){return r.grid?.cells.reduce((e,n)=>e+n.reduce((a,t)=>a+(t?1+(t.children?.reduce((s,d)=>s+D(d),0)??0):0),0),0)??0}function Y(r,e){return r.pages.reduce((n,a)=>n+a.components.reduce((t,s)=>{if(s.kind!=="list")return t+D(s);const d=e[s.dataset]?.length??0;return t+s.columns.length*(d+(s.headerGrid?.cells.length??1))},0),0)}function Z(r,e=Object.keys(r)){return V(r,e).map((n,a)=>{const t=e[a],s=C.getReportParamDefs(r,[t]);return{id:t,params:JSON.parse(JSON.stringify(s)),paramsSchema:T.reportParamsJsonSchema(s),datasetsSchema:Object.fromEntries(Object.entries(n.dataSchema??{}).map(([d,u])=>[d,P.datasetJsonSchema(u)])),capabilities:{save:!!n.provider?.save,export:!!n.provider?.export,templates:!!n.provider?.templates}}})}function z(r,e){V(r,e.reportIds);const n=T.validateReportParams(C.getReportParamDefs(r,e.reportIds),e.params),a=e.reportIds.flatMap(s=>T.validateReportParams(C.getReportParamDefs(r,[s]),e.params).issues),t=new Map(a.map(s=>[JSON.stringify(s),s]));return{...n,ok:t.size===0,issues:[...t.values()]}}function ee(r,e){const n=H.validateRenderPlan(r.plan);if(!n.ok)throw new P.ReportSourceError("validate",`执行器返回无效计划：${n.errors[0]?.path}`);const a=r.plan.pages.length,t=r.plan.pages.reduce((s,d)=>s+d.components.reduce((u,p)=>u+D(p),0),0);return y(e,"maxRows",r.stats.rows),y(e,"maxPages",a),y(e,"maxCells",t),{...r,stats:{...r.stats,pages:a,cells:t}}}function M(r,e){const n=z(r.reports,e);if(!n.ok)throw new T.ReportParamValidationError(n.issues)}function A(r=[]){return r.map(({code:e,message:n,severity:a,pageIndex:t,componentIndex:s})=>({code:e,message:n,severity:a,path:`$.pages.${t}.components.${s}`}))}function te(r){const e={maxRows:1e5,maxPages:1e4,maxCells:2e6,maxOutputBytes:1e8,maxDurationMs:12e4,...r.budget};K(e);const n=async(t,s)=>{const d=Date.now();let u=0,p=0;const c=[],w={},i=Object.fromEntries(Object.entries(r.reports).map(([l,o])=>[l,{...o,pagination:{...r.pagination,...o.pagination,...s?{measurer:s}:{}},dataValidation:{...o.dataValidation,maxRows:Math.min(e.maxRows??1e5,o.dataValidation?.maxRows??1/0),maxCells:Math.min(e.maxCells??2e6,o.dataValidation?.maxCells??1/0)}}])),m=await P.createReportSource(i,{maxPages:e.maxPages,onDatasets:(l,o,h)=>{u+=Object.values(o).reduce((R,O)=>R+O.length,0),y(e,"maxRows",u),p+=Y(h,o),y(e,"maxCells",p)}})({...t,params:t.params??{},onWarning:l=>c.push({code:"layout",message:l,severity:"warning"}),onQueryResult:(l,o)=>{Object.defineProperty(w,l,{value:{revision:o.revision,sourceToken:o.sourceToken},enumerable:!0,writable:!0}),c.push(...o.diagnostics??[])}}).catch(l=>{throw l instanceof P.ReportSourceError&&l.cause instanceof P.PaginatePageLimitError?new b("budget",l.cause.message,"$.budget.maxPages"):l});x(t.signal);const f=m.pages.reduce((l,o)=>l+o.components.reduce((h,R)=>h+D(R),0),0);return y(e,"maxPages",m.pages.length),y(e,"maxCells",f),{plan:m,diagnostics:c,revisions:w,stats:{rows:u,pages:m.pages.length,cells:f,durationMs:Date.now()-d}}},a=async t=>{const s=Date.now();if(t.format!=="pdf"&&t.format!=="xlsx")throw new P.ReportSourceError("config","不支持的报表导出格式");const d=t.format==="pdf"?await import("@agile-team/mach-report/pdf"):void 0;x(t.signal);const u=t.pdf?.customFontFaces??(t.pdf?.customFontBytes?{regular:t.pdf.customFontBytes}:void 0),p=d&&u?d.createFontBytesMeasurer(u):void 0,c=await n(t,p);x(t.signal);const w=$.createReportTaskReporter(t),i=await w.run("encode",async()=>{let f;if(t.format==="pdf"){x(t.signal);const l=await d.renderPlanToPdf(c.plan,{...t.pdf,...p?{measurer:p}:{},fidelity:t.fidelity,signal:t.signal,onProgress:(o,h)=>w.progress("encode",o,h)});f=l.bytes,c.diagnostics.push(...A(l.diagnostics)),c.diagnostics.push(...l.fidelityWarnings.map(o=>({code:"pdf-fidelity",message:o,severity:"warning"})),...l.pageErrors.map(o=>({code:"pdf-page",message:o,severity:"error"}))),l.unsupportedTextCount&&c.diagnostics.push({code:"pdf-font",message:`${l.unsupportedTextCount} 段文本包含当前字体不支持的字符`,severity:"warning"})}else{const{renderPlanToXlsx:l}=await import("@agile-team/mach-report/xlsx");x(t.signal);const o=await l(c.plan,{...t.xlsx,fidelity:t.fidelity,signal:t.signal,onProgress:(h,R)=>w.progress("encode",h,R)});f=new Uint8Array(o.buffer),c.diagnostics.push(...A(o.diagnostics)),c.diagnostics.push(...o.warnings.map(h=>({code:"xlsx-fidelity",message:h,severity:"warning"})))}return x(t.signal),f});y(e,"maxOutputBytes",i.byteLength);const{plan:g,...m}=c;return{...m,bytes:i,format:t.format,contentType:t.format==="pdf"?"application/pdf":"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",stats:{...m.stats,durationMs:Date.now()-s,outputBytes:i.byteLength}}};return{describe:t=>Z(r.reports,t),validate:t=>z(r.reports,t),prepare:t=>F(t.signal,e.maxDurationMs,async s=>{const{signal:d,onEvent:u,...p}=t,c={...p,taskId:p.taskId??$.reportTaskId()},w=u?m=>$.notifyReportTaskEvent(u,m,s):void 0,i={...c,signal:s,onEvent:w};$.createReportTaskReporter(i).runSync("validate",()=>M(r,c));const g=r.executor?await r.executor.prepare(c,s,w):await n(i);return ee(g,e)}),export:t=>F(t.signal,e.maxDurationMs,async s=>{const{signal:d,onEvent:u,...p}=t,c={...p,taskId:p.taskId??$.reportTaskId()},w=u?m=>$.notifyReportTaskEvent(u,m,s):void 0,i={...c,signal:s,onEvent:w};if($.createReportTaskReporter(i).runSync("validate",()=>M(r,c)),c.format!=="pdf"&&c.format!=="xlsx")throw new P.ReportSourceError("config","不支持的报表导出格式");const g=r.executor?await r.executor.export(c,s,w):await a(i);return y(e,"maxRows",g.stats.rows),y(e,"maxPages",g.stats.pages),y(e,"maxCells",g.stats.cells),y(e,"maxOutputBytes",g.bytes.byteLength),{...g,stats:{...g.stats,outputBytes:g.bytes.byteLength}}})}}function re(r={}){const e=r.concurrency??1,n=r.maxQueued??20;if(!Number.isSafeInteger(e)||e<1||!Number.isSafeInteger(n)||n<0)throw new b("budget","队列并发应为正整数，排队上限应为非负整数");const a=[],t=new Set,s=new Set;let d=!1,u=0;const p=()=>{for(;!d&&t.size<e&&a.length;)a.shift().start()};return{get active(){return t.size},get pending(){return a.length},enqueue:(w,i={})=>{if(d)throw new b("closed","任务队列已关闭");if(x(i.signal),t.size>=e&&a.length>=n)throw new b("queue-full","报表任务队列已满");const g=i.id??`report-${++u}`;if(s.has(g))throw new b("queue-full","任务 ID 正在执行或排队");const m=new AbortController;let f="queued",l,o,h,R;const O=new Promise((v,E)=>{h=v,R=E}),j=()=>{i.signal?.removeEventListener("abort",q),s.delete(g)},k=v=>{if(f!=="queued"&&f!=="running")return;const E=f==="queued";f="cancelled",m.abort(v);try{x(m.signal)}catch(I){R(I)}if(E){const I=a.indexOf(S);I>=0&&a.splice(I,1),j(),p()}},q=()=>k(i.signal?.reason),L=(v,E)=>{f==="running"&&(!Number.isFinite(v)||v<0||E!==void 0&&(!Number.isFinite(E)||E<v)||(l={completed:v,...E===void 0?{}:{total:E}}))},J=v=>{f!=="running"||m.signal.aborted||(o={...v,taskId:g},v.completed!==void 0&&L(v.completed,v.total),$.notifyReportTaskEvent(i.onEvent,o,m.signal))},S={cancel:k,start:()=>{f==="queued"&&(f="running",t.add(S),Promise.resolve().then(()=>(x(m.signal),w({taskId:g,signal:m.signal,reportProgress:L,onEvent:J}))).then(v=>{f==="running"&&(f="completed",h(v))},v=>{f==="running"&&(f="failed",R(v))}).finally(()=>{t.delete(S),j(),p()}))}};return s.add(g),i.signal?.addEventListener("abort",q,{once:!0}),i.signal?.aborted?k(i.signal.reason):t.size<e?S.start():a.push(S),{id:g,get status(){return f},get progress(){return l},get event(){return o},result:O,cancel:k}},close:(w={})=>{d=!0;for(const i of[...a])i.cancel(new b("closed","任务队列已关闭"));if(w.cancelRunning)for(const i of t)i.cancel(new b("closed","任务队列已关闭"))}}}exports.ReportRuntimeError=b;exports.createReportRuntime=te;exports.createReportTaskQueue=re;

package/dist/server.d.cts

@@ -446,12 +446,14 @@ export declare class ReportRuntimeError extends Error {
 
 /** 可用 worker_threads/进程/RPC 实现；接收可序列化请求，signal 由桥接层映射为取消消息。 */
 export declare interface ReportRuntimeExecutor {
-    prepare(input: Omit<ReportRuntimeInput, "signal">, signal?: AbortSignal): Promise<PreparedReport>;
-    export(input: Omit<ReportRuntimeExportInput, "signal">, signal?: AbortSignal): Promise<ReportRuntimeExportResult>;
+    prepare(input: Omit<ReportRuntimeInput, "signal" | "onEvent">, signal?: AbortSignal, onEvent?: ReportTaskObserver): Promise<PreparedReport>;
+    export(input: Omit<ReportRuntimeExportInput, "signal" | "onEvent">, signal?: AbortSignal, onEvent?: ReportTaskObserver): Promise<ReportRuntimeExportResult>;
 }
 
 export declare interface ReportRuntimeExportInput extends ReportRuntimeInput {
     format: "pdf" | "xlsx";
+    /** strict 在编码前拒绝已识别的输出降级；默认保留诊断并继续。 */
+    fidelity?: "warn" | "strict";
     /** PDF 中文需宿主显式提供有授权的字体；不隐式下载字体或资源。 */
     pdf?: {
         customFontBytes?: Uint8Array | ArrayBuffer;
@@ -476,7 +478,7 @@ export declare interface ReportRuntimeExportResult extends Omit<PreparedReport,
     contentType: string;
 }
 
-export declare interface ReportRuntimeInput {
+export declare interface ReportRuntimeInput extends ReportTaskMonitoring {
     reportIds: string[];
     params?: Record<string, string>;
     signal?: AbortSignal;
@@ -520,6 +522,7 @@ declare interface ReportSaveResult {
 export declare interface ReportTask<T> {
     readonly id: string;
     readonly status: ReportTaskStatus;
+    readonly event: ReportTaskEvent | undefined;
     readonly progress: {
         completed: number;
         total?: number;
@@ -529,16 +532,38 @@ export declare interface ReportTask<T> {
 }
 
 export declare interface ReportTaskContext {
+    taskId: string;
     signal: AbortSignal;
+    onEvent: ReportTaskObserver;
     reportProgress(completed: number, total?: number): void;
 }
 
+/** 阶段事件只包含可序列化值；不表示估算百分比，也不包含业务数据。 */
+declare interface ReportTaskEvent {
+    taskId: string;
+    correlationId?: string;
+    stage: "query" | "validate" | "layout" | "encode";
+    status: "started" | "completed" | "failed";
+    reportId?: string;
+    completed?: number;
+    total?: number;
+}
+
+declare interface ReportTaskMonitoring {
+    taskId?: string;
+    correlationId?: string;
+    onEvent?: ReportTaskObserver;
+}
+
+declare type ReportTaskObserver = (event: ReportTaskEvent) => void;
+
 export declare interface ReportTaskQueue {
     readonly active: number;
     readonly pending: number;
     enqueue<T>(run: (context: ReportTaskContext) => T | Promise<T>, options?: {
         id?: string;
         signal?: AbortSignal;
+        onEvent?: ReportTaskObserver;
     }): ReportTask<T>;
     /** 关闭后拒绝新任务并取消排队任务；运行任务按参数发送取消信号。 */
     close(options?: {

package/dist/server.d.ts

@@ -446,12 +446,14 @@ export declare class ReportRuntimeError extends Error {
 
 /** 可用 worker_threads/进程/RPC 实现；接收可序列化请求，signal 由桥接层映射为取消消息。 */
 export declare interface ReportRuntimeExecutor {
-    prepare(input: Omit<ReportRuntimeInput, "signal">, signal?: AbortSignal): Promise<PreparedReport>;
-    export(input: Omit<ReportRuntimeExportInput, "signal">, signal?: AbortSignal): Promise<ReportRuntimeExportResult>;
+    prepare(input: Omit<ReportRuntimeInput, "signal" | "onEvent">, signal?: AbortSignal, onEvent?: ReportTaskObserver): Promise<PreparedReport>;
+    export(input: Omit<ReportRuntimeExportInput, "signal" | "onEvent">, signal?: AbortSignal, onEvent?: ReportTaskObserver): Promise<ReportRuntimeExportResult>;
 }
 
 export declare interface ReportRuntimeExportInput extends ReportRuntimeInput {
     format: "pdf" | "xlsx";
+    /** strict 在编码前拒绝已识别的输出降级；默认保留诊断并继续。 */
+    fidelity?: "warn" | "strict";
     /** PDF 中文需宿主显式提供有授权的字体；不隐式下载字体或资源。 */
     pdf?: {
         customFontBytes?: Uint8Array | ArrayBuffer;
@@ -476,7 +478,7 @@ export declare interface ReportRuntimeExportResult extends Omit<PreparedReport,
     contentType: string;
 }
 
-export declare interface ReportRuntimeInput {
+export declare interface ReportRuntimeInput extends ReportTaskMonitoring {
     reportIds: string[];
     params?: Record<string, string>;
     signal?: AbortSignal;
@@ -520,6 +522,7 @@ declare interface ReportSaveResult {
 export declare interface ReportTask<T> {
     readonly id: string;
     readonly status: ReportTaskStatus;
+    readonly event: ReportTaskEvent | undefined;
     readonly progress: {
         completed: number;
         total?: number;
@@ -529,16 +532,38 @@ export declare interface ReportTask<T> {
 }
 
 export declare interface ReportTaskContext {
+    taskId: string;
     signal: AbortSignal;
+    onEvent: ReportTaskObserver;
     reportProgress(completed: number, total?: number): void;
 }
 
+/** 阶段事件只包含可序列化值；不表示估算百分比，也不包含业务数据。 */
+declare interface ReportTaskEvent {
+    taskId: string;
+    correlationId?: string;
+    stage: "query" | "validate" | "layout" | "encode";
+    status: "started" | "completed" | "failed";
+    reportId?: string;
+    completed?: number;
+    total?: number;
+}
+
+declare interface ReportTaskMonitoring {
+    taskId?: string;
+    correlationId?: string;
+    onEvent?: ReportTaskObserver;
+}
+
+declare type ReportTaskObserver = (event: ReportTaskEvent) => void;
+
 export declare interface ReportTaskQueue {
     readonly active: number;
     readonly pending: number;
     enqueue<T>(run: (context: ReportTaskContext) => T | Promise<T>, options?: {
         id?: string;
         signal?: AbortSignal;
+        onEvent?: ReportTaskObserver;
     }): ReportTask<T>;
     /** 关闭后拒绝新任务并取消排队任务；运行任务按参数发送取消信号。 */
     close(options?: {

package/dist/server.js

@@ -1,173 +1,177 @@
-import { d as q, R as $, c as k, P as z } from "./report-source-B9bENO0F.js";
-import { g as I } from "./report-params-B_VCihAh.js";
-import { b as L, r as J, R as V } from "./param-validation-BWNjLcN0.js";
-import { c as _ } from "./validate-S6CgIm5d.js";
-class p extends Error {
-  constructor(e, a, s) {
-    super(a), this.code = e, this.path = s, this.name = "ReportRuntimeError";
+import { d as _, R as E, c as Q, P as W } from "./report-source-BXHNy_AD.js";
+import { g as k } from "./report-params-B_VCihAh.js";
+import { b as N, r as G, R as U } from "./param-validation-BWNjLcN0.js";
+import { c as X } from "./validate-S6CgIm5d.js";
+import { r as F, c as C, n as T } from "./task-events-Dpsvf_t2.js";
+class b extends Error {
+  constructor(e, n, s) {
+    super(n), this.code = e, this.path = s, this.name = "ReportRuntimeError";
   }
 }
-function x(r) {
+function y(r) {
   if (!r?.aborted) return;
-  if (r.reason instanceof p) throw r.reason;
+  if (r.reason instanceof b) throw r.reason;
   const e = new Error("报表执行已取消");
   throw e.name = "AbortError", Object.defineProperty(e, "cause", { value: r.reason }), e;
 }
-function b(r, e, a) {
-  if (!Number.isFinite(a) || a < 0) throw new p("budget", `${e} 的执行统计无效`, `$.budget.${e}`);
+function x(r, e, n) {
+  if (!Number.isFinite(n) || n < 0) throw new b("budget", `${e} 的执行统计无效`, `$.budget.${e}`);
   const s = r[e];
-  if (s !== void 0 && a > s) throw new p("budget", `${e} 超出预算 ${s}（实际 ${a}）`, `$.budget.${e}`);
+  if (s !== void 0 && n > s) throw new b("budget", `${e} 超出预算 ${s}（实际 ${n}）`, `$.budget.${e}`);
 }
-function Q(r) {
-  for (const [e, a] of Object.entries(r)) {
-    if (a !== void 0 && (!Number.isFinite(a) || a <= 0)) throw new p("budget", `${e} 应为正有限数字`, `$.budget.${e}`);
-    if (e !== "maxDurationMs" && a !== void 0 && !Number.isSafeInteger(a)) throw new p("budget", `${e} 应为正安全整数`, `$.budget.${e}`);
-    if (e === "maxDurationMs" && a !== void 0 && a > 2147483647) throw new p("budget", "maxDurationMs 不能超过 2147483647", `$.budget.${e}`);
+function H(r) {
+  for (const [e, n] of Object.entries(r)) {
+    if (n !== void 0 && (!Number.isFinite(n) || n <= 0)) throw new b("budget", `${e} 应为正有限数字`, `$.budget.${e}`);
+    if (e !== "maxDurationMs" && n !== void 0 && !Number.isSafeInteger(n)) throw new b("budget", `${e} 应为正安全整数`, `$.budget.${e}`);
+    if (e === "maxDurationMs" && n !== void 0 && n > 2147483647) throw new b("budget", "maxDurationMs 不能超过 2147483647", `$.budget.${e}`);
   }
 }
-async function B(r, e, a) {
+async function A(r, e, n) {
   const s = new AbortController(), t = () => s.abort(r?.reason);
   r?.addEventListener("abort", t, { once: !0 }), r?.aborted && t();
-  const n = Date.now(), l = e === void 0 ? void 0 : setTimeout(() => s.abort(new p("timeout", `报表执行超过 ${e}ms`)), e);
-  let o;
+  const a = Date.now(), u = e === void 0 ? void 0 : setTimeout(() => s.abort(new b("timeout", `报表执行超过 ${e}ms`)), e);
+  let d;
   try {
-    x(s.signal);
-    const i = new Promise((w, f) => {
-      o = () => {
+    y(s.signal);
+    const m = new Promise((w, i) => {
+      d = () => {
         try {
-          x(s.signal);
-        } catch (v) {
-          f(v);
+          y(s.signal);
+        } catch (g) {
+          i(g);
         }
-      }, s.signal.addEventListener("abort", o, { once: !0 });
-    }), m = await Promise.race([a(s.signal), i]);
-    if (x(s.signal), e !== void 0 && Date.now() - n > e) throw new p("timeout", `报表执行超过 ${e}ms`);
-    return m;
+      }, s.signal.addEventListener("abort", d, { once: !0 });
+    }), c = await Promise.race([n(s.signal), m]);
+    if (y(s.signal), e !== void 0 && Date.now() - a > e) throw new b("timeout", `报表执行超过 ${e}ms`);
+    return c;
   } finally {
-    l !== void 0 && clearTimeout(l), o && s.signal.removeEventListener("abort", o), r?.removeEventListener("abort", t);
+    u !== void 0 && clearTimeout(u), d && s.signal.removeEventListener("abort", d), r?.removeEventListener("abort", t);
   }
 }
-function F(r, e) {
-  if (e.length === 0) throw new $("config", "缺少报表 ID");
-  return e.map((a) => {
-    if (!Object.prototype.hasOwnProperty.call(r, a)) throw new $("config", `未注册报表 ${a}`);
-    return r[a];
+function z(r, e) {
+  if (e.length === 0) throw new E("config", "缺少报表 ID");
+  return e.map((n) => {
+    if (!Object.prototype.hasOwnProperty.call(r, n)) throw new E("config", `未注册报表 ${n}`);
+    return r[n];
   });
 }
-function S(r) {
-  return r.grid?.cells.reduce((e, a) => e + a.reduce((s, t) => s + (t ? 1 + (t.children?.reduce((n, l) => n + S(l), 0) ?? 0) : 0), 0), 0) ?? 0;
+function D(r) {
+  return r.grid?.cells.reduce((e, n) => e + n.reduce((s, t) => s + (t ? 1 + (t.children?.reduce((a, u) => a + D(u), 0) ?? 0) : 0), 0), 0) ?? 0;
 }
-function W(r, e) {
-  return r.pages.reduce((a, s) => a + s.components.reduce((t, n) => {
-    if (n.kind !== "list") return t + S(n);
-    const l = e[n.dataset]?.length ?? 0;
-    return t + n.columns.length * (l + (n.headerGrid?.cells.length ?? 1));
+function K(r, e) {
+  return r.pages.reduce((n, s) => n + s.components.reduce((t, a) => {
+    if (a.kind !== "list") return t + D(a);
+    const u = e[a.dataset]?.length ?? 0;
+    return t + a.columns.length * (u + (a.headerGrid?.cells.length ?? 1));
   }, 0), 0);
 }
-function G(r, e = Object.keys(r)) {
-  return F(r, e).map((a, s) => {
-    const t = e[s], n = I(r, [t]);
+function Y(r, e = Object.keys(r)) {
+  return z(r, e).map((n, s) => {
+    const t = e[s], a = k(r, [t]);
     return {
       id: t,
-      params: JSON.parse(JSON.stringify(n)),
-      paramsSchema: J(n),
-      datasetsSchema: Object.fromEntries(Object.entries(a.dataSchema ?? {}).map(([l, o]) => [l, q(o)])),
+      params: JSON.parse(JSON.stringify(a)),
+      paramsSchema: G(a),
+      datasetsSchema: Object.fromEntries(Object.entries(n.dataSchema ?? {}).map(([u, d]) => [u, _(d)])),
       capabilities: {
-        save: !!a.provider?.save,
-        export: !!a.provider?.export,
-        templates: !!a.provider?.templates
+        save: !!n.provider?.save,
+        export: !!n.provider?.export,
+        templates: !!n.provider?.templates
       }
     };
   });
 }
-function A(r, e) {
-  F(r, e.reportIds);
-  const a = L(I(r, e.reportIds), e.params), s = e.reportIds.flatMap((n) => L(I(r, [n]), e.params).issues), t = new Map(s.map((n) => [JSON.stringify(n), n]));
-  return { ...a, ok: t.size === 0, issues: [...t.values()] };
+function J(r, e) {
+  z(r, e.reportIds);
+  const n = N(k(r, e.reportIds), e.params), s = e.reportIds.flatMap((a) => N(k(r, [a]), e.params).issues), t = new Map(s.map((a) => [JSON.stringify(a), a]));
+  return { ...n, ok: t.size === 0, issues: [...t.values()] };
 }
-function U(r, e) {
-  const a = _(r.plan);
-  if (!a.ok) throw new $("validate", `执行器返回无效计划：${a.errors[0]?.path}`);
-  const s = r.plan.pages.length, t = r.plan.pages.reduce((n, l) => n + l.components.reduce((o, i) => o + S(i), 0), 0);
-  return b(e, "maxRows", r.stats.rows), b(e, "maxPages", s), b(e, "maxCells", t), { ...r, stats: { ...r.stats, pages: s, cells: t } };
+function Z(r, e) {
+  const n = X(r.plan);
+  if (!n.ok) throw new E("validate", `执行器返回无效计划：${n.errors[0]?.path}`);
+  const s = r.plan.pages.length, t = r.plan.pages.reduce((a, u) => a + u.components.reduce((d, m) => d + D(m), 0), 0);
+  return x(e, "maxRows", r.stats.rows), x(e, "maxPages", s), x(e, "maxCells", t), { ...r, stats: { ...r.stats, pages: s, cells: t } };
 }
-function N(r, e) {
-  const a = A(r.reports, e);
-  if (!a.ok) throw new V(a.issues);
+function M(r, e) {
+  const n = J(r.reports, e);
+  if (!n.ok) throw new U(n.issues);
 }
-function T(r = []) {
-  return r.map(({ code: e, message: a, severity: s, pageIndex: t, componentIndex: n }) => ({ code: e, message: a, severity: s, path: `$.pages.${t}.components.${n}` }));
+function q(r = []) {
+  return r.map(({ code: e, message: n, severity: s, pageIndex: t, componentIndex: a }) => ({ code: e, message: n, severity: s, path: `$.pages.${t}.components.${a}` }));
 }
-function Z(r) {
+function ae(r) {
   const e = { maxRows: 1e5, maxPages: 1e4, maxCells: 2e6, maxOutputBytes: 1e8, maxDurationMs: 12e4, ...r.budget };
-  Q(e);
-  const a = async (t, n) => {
-    const l = Date.now();
-    let o = 0, i = 0;
-    const m = [], w = {}, f = Object.fromEntries(Object.entries(r.reports).map(([d, g]) => [d, {
-      ...g,
-      pagination: { ...r.pagination, ...g.pagination, ...n ? { measurer: n } : {} },
+  H(e);
+  const n = async (t, a) => {
+    const u = Date.now();
+    let d = 0, m = 0;
+    const c = [], w = {}, i = Object.fromEntries(Object.entries(r.reports).map(([l, o]) => [l, {
+      ...o,
+      pagination: { ...r.pagination, ...o.pagination, ...a ? { measurer: a } : {} },
       dataValidation: {
-        ...g.dataValidation,
-        maxRows: Math.min(e.maxRows ?? 1e5, g.dataValidation?.maxRows ?? 1 / 0),
-        maxCells: Math.min(e.maxCells ?? 2e6, g.dataValidation?.maxCells ?? 1 / 0)
+        ...o.dataValidation,
+        maxRows: Math.min(e.maxRows ?? 1e5, o.dataValidation?.maxRows ?? 1 / 0),
+        maxCells: Math.min(e.maxCells ?? 2e6, o.dataValidation?.maxCells ?? 1 / 0)
       }
-    }])), u = await k(f, { maxPages: e.maxPages, onDatasets: (d, g, P) => {
-      o += Object.values(g).reduce((R, O) => R + O.length, 0), b(e, "maxRows", o), i += W(P, g), b(e, "maxCells", i);
-    } })({ ...t, params: t.params ?? {}, onWarning: (d) => m.push({ code: "layout", message: d, severity: "warning" }), onQueryResult: (d, g) => {
-      Object.defineProperty(w, d, { value: { revision: g.revision, sourceToken: g.sourceToken }, enumerable: !0, writable: !0 }), m.push(...g.diagnostics ?? []);
-    } }).catch((d) => {
-      throw d instanceof $ && d.cause instanceof z ? new p("budget", d.cause.message, "$.budget.maxPages") : d;
+    }])), p = await Q(i, { maxPages: e.maxPages, onDatasets: (l, o, v) => {
+      d += Object.values(o).reduce((P, S) => P + S.length, 0), x(e, "maxRows", d), m += K(v, o), x(e, "maxCells", m);
+    } })({ ...t, params: t.params ?? {}, onWarning: (l) => c.push({ code: "layout", message: l, severity: "warning" }), onQueryResult: (l, o) => {
+      Object.defineProperty(w, l, { value: { revision: o.revision, sourceToken: o.sourceToken }, enumerable: !0, writable: !0 }), c.push(...o.diagnostics ?? []);
+    } }).catch((l) => {
+      throw l instanceof E && l.cause instanceof W ? new b("budget", l.cause.message, "$.budget.maxPages") : l;
     });
-    x(t.signal);
-    const c = u.pages.reduce((d, g) => d + g.components.reduce((P, R) => P + S(R), 0), 0);
-    return b(e, "maxPages", u.pages.length), b(e, "maxCells", c), { plan: u, diagnostics: m, revisions: w, stats: { rows: o, pages: u.pages.length, cells: c, durationMs: Date.now() - l } };
+    y(t.signal);
+    const f = p.pages.reduce((l, o) => l + o.components.reduce((v, P) => v + D(P), 0), 0);
+    return x(e, "maxPages", p.pages.length), x(e, "maxCells", f), { plan: p, diagnostics: c, revisions: w, stats: { rows: d, pages: p.pages.length, cells: f, durationMs: Date.now() - u } };
   }, s = async (t) => {
-    const n = Date.now();
-    if (t.format !== "pdf" && t.format !== "xlsx") throw new $("config", "不支持的报表导出格式");
-    const l = t.format === "pdf" ? await import("@agile-team/mach-report/pdf") : void 0;
-    x(t.signal);
-    const o = t.pdf?.customFontFaces ?? (t.pdf?.customFontBytes ? { regular: t.pdf.customFontBytes } : void 0), i = l && o ? l.createFontBytesMeasurer(o) : void 0, m = await a(t, i);
-    x(t.signal);
-    let w;
-    if (t.format === "pdf") {
-      x(t.signal);
-      const u = await l.renderPlanToPdf(m.plan, { ...t.pdf, ...i ? { measurer: i } : {} });
-      w = u.bytes, m.diagnostics.push(...T(u.diagnostics)), m.diagnostics.push(...u.fidelityWarnings.map((c) => ({ code: "pdf-fidelity", message: c, severity: "warning" })), ...u.pageErrors.map((c) => ({ code: "pdf-page", message: c, severity: "error" }))), u.unsupportedTextCount && m.diagnostics.push({ code: "pdf-font", message: `${u.unsupportedTextCount} 段文本包含当前字体不支持的字符`, severity: "warning" });
-    } else {
-      const { renderPlanToXlsx: u } = await import("@agile-team/mach-report/xlsx");
-      x(t.signal);
-      const c = await u(m.plan, t.xlsx);
-      w = new Uint8Array(c.buffer), m.diagnostics.push(...T(c.diagnostics)), m.diagnostics.push(...c.warnings.map((d) => ({ code: "xlsx-fidelity", message: d, severity: "warning" })));
-    }
-    x(t.signal), b(e, "maxOutputBytes", w.byteLength);
-    const { plan: f, ...v } = m;
-    return { ...v, bytes: w, format: t.format, contentType: t.format === "pdf" ? "application/pdf" : "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", stats: { ...v.stats, durationMs: Date.now() - n, outputBytes: w.byteLength } };
+    const a = Date.now();
+    if (t.format !== "pdf" && t.format !== "xlsx") throw new E("config", "不支持的报表导出格式");
+    const u = t.format === "pdf" ? await import("@agile-team/mach-report/pdf") : void 0;
+    y(t.signal);
+    const d = t.pdf?.customFontFaces ?? (t.pdf?.customFontBytes ? { regular: t.pdf.customFontBytes } : void 0), m = u && d ? u.createFontBytesMeasurer(d) : void 0, c = await n(t, m);
+    y(t.signal);
+    const w = C(t), i = await w.run("encode", async () => {
+      let f;
+      if (t.format === "pdf") {
+        y(t.signal);
+        const l = await u.renderPlanToPdf(c.plan, { ...t.pdf, ...m ? { measurer: m } : {}, fidelity: t.fidelity, signal: t.signal, onProgress: (o, v) => w.progress("encode", o, v) });
+        f = l.bytes, c.diagnostics.push(...q(l.diagnostics)), c.diagnostics.push(...l.fidelityWarnings.map((o) => ({ code: "pdf-fidelity", message: o, severity: "warning" })), ...l.pageErrors.map((o) => ({ code: "pdf-page", message: o, severity: "error" }))), l.unsupportedTextCount && c.diagnostics.push({ code: "pdf-font", message: `${l.unsupportedTextCount} 段文本包含当前字体不支持的字符`, severity: "warning" });
+      } else {
+        const { renderPlanToXlsx: l } = await import("@agile-team/mach-report/xlsx");
+        y(t.signal);
+        const o = await l(c.plan, { ...t.xlsx, fidelity: t.fidelity, signal: t.signal, onProgress: (v, P) => w.progress("encode", v, P) });
+        f = new Uint8Array(o.buffer), c.diagnostics.push(...q(o.diagnostics)), c.diagnostics.push(...o.warnings.map((v) => ({ code: "xlsx-fidelity", message: v, severity: "warning" })));
+      }
+      return y(t.signal), f;
+    });
+    x(e, "maxOutputBytes", i.byteLength);
+    const { plan: g, ...p } = c;
+    return { ...p, bytes: i, format: t.format, contentType: t.format === "pdf" ? "application/pdf" : "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", stats: { ...p.stats, durationMs: Date.now() - a, outputBytes: i.byteLength } };
   };
   return {
-    describe: (t) => G(r.reports, t),
-    validate: (t) => A(r.reports, t),
-    prepare: (t) => B(t.signal, e.maxDurationMs, async (n) => {
-      const { signal: l, ...o } = t;
-      N(r, o);
-      const i = r.executor ? await r.executor.prepare(o, n) : await a({ ...o, signal: n });
-      return U(i, e);
+    describe: (t) => Y(r.reports, t),
+    validate: (t) => J(r.reports, t),
+    prepare: (t) => A(t.signal, e.maxDurationMs, async (a) => {
+      const { signal: u, onEvent: d, ...m } = t, c = { ...m, taskId: m.taskId ?? F() }, w = d ? (p) => T(d, p, a) : void 0, i = { ...c, signal: a, onEvent: w };
+      C(i).runSync("validate", () => M(r, c));
+      const g = r.executor ? await r.executor.prepare(c, a, w) : await n(i);
+      return Z(g, e);
     }),
-    export: (t) => B(t.signal, e.maxDurationMs, async (n) => {
-      const { signal: l, ...o } = t;
-      if (N(r, o), o.format !== "pdf" && o.format !== "xlsx") throw new $("config", "不支持的报表导出格式");
-      const i = r.executor ? await r.executor.export(o, n) : await s({ ...o, signal: n });
-      return b(e, "maxRows", i.stats.rows), b(e, "maxPages", i.stats.pages), b(e, "maxCells", i.stats.cells), b(e, "maxOutputBytes", i.bytes.byteLength), { ...i, stats: { ...i.stats, outputBytes: i.bytes.byteLength } };
+    export: (t) => A(t.signal, e.maxDurationMs, async (a) => {
+      const { signal: u, onEvent: d, ...m } = t, c = { ...m, taskId: m.taskId ?? F() }, w = d ? (p) => T(d, p, a) : void 0, i = { ...c, signal: a, onEvent: w };
+      if (C(i).runSync("validate", () => M(r, c)), c.format !== "pdf" && c.format !== "xlsx") throw new E("config", "不支持的报表导出格式");
+      const g = r.executor ? await r.executor.export(c, a, w) : await s(i);
+      return x(e, "maxRows", g.stats.rows), x(e, "maxPages", g.stats.pages), x(e, "maxCells", g.stats.cells), x(e, "maxOutputBytes", g.bytes.byteLength), { ...g, stats: { ...g.stats, outputBytes: g.bytes.byteLength } };
     })
   };
 }
-function ee(r = {}) {
-  const e = r.concurrency ?? 1, a = r.maxQueued ?? 20;
-  if (!Number.isSafeInteger(e) || e < 1 || !Number.isSafeInteger(a) || a < 0) throw new p("budget", "队列并发应为正整数，排队上限应为非负整数");
-  const s = [], t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set();
-  let l = !1, o = 0;
-  const i = () => {
-    for (; !l && t.size < e && s.length; ) s.shift().start();
+function oe(r = {}) {
+  const e = r.concurrency ?? 1, n = r.maxQueued ?? 20;
+  if (!Number.isSafeInteger(e) || e < 1 || !Number.isSafeInteger(n) || n < 0) throw new b("budget", "队列并发应为正整数，排队上限应为非负整数");
+  const s = [], t = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Set();
+  let u = !1, d = 0;
+  const m = () => {
+    for (; !u && t.size < e && s.length; ) s.shift().start();
   };
   return {
     get active() {
@@ -176,62 +180,66 @@ function ee(r = {}) {
     get pending() {
       return s.length;
     },
-    enqueue: (w, f = {}) => {
-      if (l) throw new p("closed", "任务队列已关闭");
-      if (x(f.signal), t.size >= e && s.length >= a) throw new p("queue-full", "报表任务队列已满");
-      const v = f.id ?? `report-${++o}`;
-      if (n.has(v)) throw new p("queue-full", "任务 ID 正在执行或排队");
-      const u = new AbortController();
-      let c = "queued", d, g, P;
-      const R = new Promise((h, y) => {
-        g = h, P = y;
-      }), O = () => {
-        f.signal?.removeEventListener("abort", j), n.delete(v);
-      }, D = (h) => {
-        if (c !== "queued" && c !== "running") return;
-        const y = c === "queued";
-        c = "cancelled", u.abort(h);
+    enqueue: (w, i = {}) => {
+      if (u) throw new b("closed", "任务队列已关闭");
+      if (y(i.signal), t.size >= e && s.length >= n) throw new b("queue-full", "报表任务队列已满");
+      const g = i.id ?? `report-${++d}`;
+      if (a.has(g)) throw new b("queue-full", "任务 ID 正在执行或排队");
+      const p = new AbortController();
+      let f = "queued", l, o, v, P;
+      const S = new Promise((h, R) => {
+        v = h, P = R;
+      }), j = () => {
+        i.signal?.removeEventListener("abort", L), a.delete(g);
+      }, I = (h) => {
+        if (f !== "queued" && f !== "running") return;
+        const R = f === "queued";
+        f = "cancelled", p.abort(h);
         try {
-          x(u.signal);
-        } catch (C) {
-          P(C);
+          y(p.signal);
+        } catch (O) {
+          P(O);
         }
-        if (y) {
-          const C = s.indexOf(E);
-          C >= 0 && s.splice(C, 1), O(), i();
+        if (R) {
+          const O = s.indexOf($);
+          O >= 0 && s.splice(O, 1), j(), m();
         }
-      }, j = () => D(f.signal?.reason), M = (h, y) => {
-        c === "running" && (!Number.isFinite(h) || h < 0 || y !== void 0 && (!Number.isFinite(y) || y < h) || (d = { completed: h, ...y === void 0 ? {} : { total: y } }));
-      }, E = {
-        cancel: D,
+      }, L = () => I(i.signal?.reason), B = (h, R) => {
+        f === "running" && (!Number.isFinite(h) || h < 0 || R !== void 0 && (!Number.isFinite(R) || R < h) || (l = { completed: h, ...R === void 0 ? {} : { total: R } }));
+      }, V = (h) => {
+        f !== "running" || p.signal.aborted || (o = { ...h, taskId: g }, h.completed !== void 0 && B(h.completed, h.total), T(i.onEvent, o, p.signal));
+      }, $ = {
+        cancel: I,
         start: () => {
-          c === "queued" && (c = "running", t.add(E), Promise.resolve().then(() => (x(u.signal), w({ signal: u.signal, reportProgress: M }))).then(
+          f === "queued" && (f = "running", t.add($), Promise.resolve().then(() => (y(p.signal), w({ taskId: g, signal: p.signal, reportProgress: B, onEvent: V }))).then(
             (h) => {
-              c === "running" && (c = "completed", g(h));
+              f === "running" && (f = "completed", v(h));
             },
             (h) => {
-              c === "running" && (c = "failed", P(h));
+              f === "running" && (f = "failed", P(h));
             }
           ).finally(() => {
-            t.delete(E), O(), i();
+            t.delete($), j(), m();
           }));
         }
       };
-      return n.add(v), f.signal?.addEventListener("abort", j, { once: !0 }), f.signal?.aborted ? D(f.signal.reason) : t.size < e ? E.start() : s.push(E), { id: v, get status() {
-        return c;
+      return a.add(g), i.signal?.addEventListener("abort", L, { once: !0 }), i.signal?.aborted ? I(i.signal.reason) : t.size < e ? $.start() : s.push($), { id: g, get status() {
+        return f;
       }, get progress() {
-        return d;
-      }, result: R, cancel: D };
+        return l;
+      }, get event() {
+        return o;
+      }, result: S, cancel: I };
     },
     close: (w = {}) => {
-      l = !0;
-      for (const f of [...s]) f.cancel(new p("closed", "任务队列已关闭"));
-      if (w.cancelRunning) for (const f of t) f.cancel(new p("closed", "任务队列已关闭"));
+      u = !0;
+      for (const i of [...s]) i.cancel(new b("closed", "任务队列已关闭"));
+      if (w.cancelRunning) for (const i of t) i.cancel(new b("closed", "任务队列已关闭"));
     }
   };
 }
 export {
-  p as ReportRuntimeError,
-  Z as createReportRuntime,
-  ee as createReportTaskQueue
+  b as ReportRuntimeError,
+  ae as createReportRuntime,
+  oe as createReportTaskQueue
 };