@shenghuabi/workflow 1.1.6 → 1.1.7

package/index.js

@@ -73,7 +73,7 @@ __export(workflow_exports, {
 module.exports = __toCommonJS(workflow_exports);
 
 // packages/workflow/workflow-parser.service.ts
-var import_static_injector12 = require("static-injector");
+var import_static_injector11 = require("static-injector");
 var import_graphology = __toESM(require("graphology"), 1);
 var import_react = require("@xyflow/react");
 
@@ -560,16 +560,17 @@ var import_compat = require("es-toolkit/compat");
 var NodeRunnerBase = class {
   node = (0, import_static_injector3.inject)(CurrentNodeToken);
   callNode = (0, import_static_injector3.inject)(CurrentCallNodeToken, { optional: true }) ?? void 0;
-  context = (0, import_static_injector3.inject)(CurrentContextToken);
+  runnerContext = (0, import_static_injector3.inject)(CurrentContextToken);
   injector = (0, import_static_injector3.inject)(import_static_injector3.Injector);
   emitter = (0, import_static_injector3.inject)(WorkflowEmitter);
   abortSignal = (0, import_static_injector3.inject)(AbortSignalToken);
   inputs = (0, import_static_injector3.inject)(NodeInputsToken);
+  environmentContextData = (0, import_static_injector3.inject)(EnviromentParametersToken);
   async run() {
     throw new Error("待实现");
   }
   #modelConfig = (0, import_static_injector3.inject)(ModelOptionsToken, { optional: true }) ?? void 0;
-  context$$ = (0, import_static_injector3.computed)(() => this.injector.get(NodeContextToken)());
+  nodeContextData$$ = (0, import_static_injector3.computed)(() => this.injector.get(NodeContextToken)());
   mergeChatModel(input) {
     const chatService = this.injector.get(ChatServiceToken);
     let presetConfig = {};
@@ -916,16 +917,14 @@ var TEXT_NODE_DEFINE = v7.object({
 });
 
 // packages/workflow/inline/node/text/main/runner.ts
-var import_static_injector7 = require("static-injector");
 var TextareaRunner = class extends NodeRunnerBase {
-  environmentContext = (0, import_static_injector7.inject)(EnviromentParametersToken);
   async run() {
     return async () => {
       let metadataList;
-      const context = await this.context$$();
+      const context = await this.nodeContextData$$();
       const value = serializeLexicalTextarea(this.inputs.value, {
         context,
-        environmentContext: this.environmentContext,
+        environmentContext: this.environmentContextData,
         onMetadata(metadata) {
           metadataList = metadata;
         }
@@ -979,12 +978,12 @@ var ITERATION_NODE_DEFINE = v8.pipe(
 );
 
 // packages/workflow/runner/workflow-runner.service.ts
-var import_static_injector10 = require("static-injector");
+var import_static_injector9 = require("static-injector");
 
 // packages/workflow/inline/node/input-params/main/runner.ts
-var import_static_injector8 = require("static-injector");
+var import_static_injector7 = require("static-injector");
 var InputParamsRunner = class extends NodeRunnerBase {
-  #env = (0, import_static_injector8.inject)(EnviromentParametersToken);
+  #env = (0, import_static_injector7.inject)(EnviromentParametersToken);
   async run() {
     const data = this.#env;
     return async (id) => {
@@ -1000,9 +999,9 @@ var InputParamsRunner = class extends NodeRunnerBase {
 };
 
 // packages/workflow/inline/node/iteration/main/iteration-start.runner.ts
-var import_static_injector9 = require("static-injector");
+var import_static_injector8 = require("static-injector");
 var IterationStartRunner = class extends NodeRunnerBase {
-  #nodeParentMap = (0, import_static_injector9.inject)(NodeParentMapToken);
+  #nodeParentMap = (0, import_static_injector8.inject)(NodeParentMapToken);
   async run() {
     const data = this.#nodeParentMap.get(this.node.parentId);
     return async (id) => {
@@ -1051,15 +1050,15 @@ var v9 = __toESM(require("valibot"), 1);
 var import_util4 = require("@cyia/util");
 var import_fast_equals = require("fast-equals");
 var WorkflowRunnerContext = class {
-  #injector = (0, import_static_injector10.inject)(import_static_injector10.Injector);
-  data = (0, import_static_injector10.inject)(CurrentWorkflowToken);
-  parent = (0, import_static_injector10.inject)(ParentContextToken);
+  #injector = (0, import_static_injector9.inject)(import_static_injector9.Injector);
+  data = (0, import_static_injector9.inject)(CurrentWorkflowToken);
+  parent = (0, import_static_injector9.inject)(ParentContextToken);
   #callCache = /* @__PURE__ */ new Map();
   #outputCache = /* @__PURE__ */ new Map();
-  inputs = (0, import_static_injector10.inject)(InputsToken);
-  #plugin = (0, import_static_injector10.inject)(WorkflowPluginService);
-  #emitter = (0, import_static_injector10.inject)(WorkflowEmitter);
-  #inlineNode = (0, import_static_injector10.inject)(InlineNodeService);
+  inputs = (0, import_static_injector9.inject)(InputsToken);
+  #plugin = (0, import_static_injector9.inject)(WorkflowPluginService);
+  #emitter = (0, import_static_injector9.inject)(WorkflowEmitter);
+  #inlineNode = (0, import_static_injector9.inject)(InlineNodeService);
   async #getNodeRunner(type) {
     return this.#inlineNode.getNodeRunner(type) ?? ItemRunnerObject[type] ?? await this.#plugin.getNodeRunner(type);
   }
@@ -1097,7 +1096,7 @@ var WorkflowRunnerContext = class {
   // 当前node 调用 node context
   async #createNodeRunner(item, inputParams, contextFactory, callNode) {
     const define = await this.#getNodeRunner(item.type);
-    return (0, import_static_injector10.createInjector)({
+    return (0, import_static_injector9.createInjector)({
       providers: [
         define,
         { provide: CurrentNodeToken, useValue: item },
@@ -1111,7 +1110,7 @@ var WorkflowRunnerContext = class {
       parent: this.#injector
     }).get(define);
   }
-  #abort = (0, import_static_injector10.inject)(AbortSignalToken);
+  #abort = (0, import_static_injector9.inject)(AbortSignalToken);
   async #runItem(node, callNode, input) {
     try {
       if (this.#abort?.aborted) {
@@ -1228,12 +1227,12 @@ var WorkflowRunnerContext = class {
   }
 };
 var WorkflowRunnerService = class {
-  #injector = (0, import_static_injector10.inject)(import_static_injector10.Injector);
+  #injector = (0, import_static_injector9.inject)(import_static_injector9.Injector);
   /** 自己使用
    * @internal
    */
   createContext(data, parent, parentInjector) {
-    return (0, import_static_injector10.createInjector)({
+    return (0, import_static_injector9.createInjector)({
       providers: [
         WorkflowRunnerContext,
         { provide: CurrentWorkflowToken, useValue: data },
@@ -1248,7 +1247,7 @@ var WorkflowRunnerService = class {
   }
   /** 入口 */
   run(wofkflowData, input, ob, signal2, providers) {
-    const injector = (0, import_static_injector10.createInjector)({
+    const injector = (0, import_static_injector9.createInjector)({
       providers: [
         WorkflowEmitter,
         { provide: AbortSignalToken, useValue: signal2 },
@@ -1272,9 +1271,9 @@ var WorkflowRunnerService = class {
 
 // packages/workflow/inline/node/iteration/main/runner.ts
 var import_util5 = require("@cyia/util");
-var import_static_injector11 = require("static-injector");
+var import_static_injector10 = require("static-injector");
 var IterationRunner = class extends NodeRunnerBase {
-  #nodeParentMap = (0, import_static_injector11.inject)(NodeParentMapToken);
+  #nodeParentMap = (0, import_static_injector10.inject)(NodeParentMapToken);
   async run() {
     const inputs = this.inputs;
     const value = inputs.list;
@@ -1290,7 +1289,7 @@ var IterationRunner = class extends NodeRunnerBase {
           await this.injector.get(WorkflowRunnerService).createContext(
             //迭代只有一个子流
             this.node.subFlowList[0].flow,
-            this.context,
+            this.runnerContext,
             this.injector
           ).run()
         );
@@ -1498,7 +1497,7 @@ var NodeGroup = class {
     return this.#group.get(type) || [];
   }
 };
-var WorkflowDataToken = new import_static_injector12.InjectionToken(
+var WorkflowDataToken = new import_static_injector11.InjectionToken(
   "WorkflowData"
 );
 var WorkflowPreParser = class {
@@ -1511,17 +1510,17 @@ var WorkflowPreParser = class {
    * 所有独立块都是找到独立节点后终止
    */
   #nodeGroup = new NodeGroup();
-  #data = (0, import_static_injector12.inject)(WorkflowDataToken);
-  #plugin = (0, import_static_injector12.inject)(WorkflowPluginService);
-  #inlineNodeService = (0, import_static_injector12.inject)(InlineNodeService);
-  #fullBlockObject$$ = (0, import_static_injector12.computed)(
+  #data = (0, import_static_injector11.inject)(WorkflowDataToken);
+  #plugin = (0, import_static_injector11.inject)(WorkflowPluginService);
+  #inlineNodeService = (0, import_static_injector11.inject)(InlineNodeService);
+  #fullBlockObject$$ = (0, import_static_injector11.computed)(
     () => ({
       ...this.#inlineNodeService.conditionNodeList(),
       ...this.#plugin.conditionNodeList$$(),
       ["iteration" /* iteration */]: true
     })
   );
-  #conditionBlockObject$$ = (0, import_static_injector12.computed)(
+  #conditionBlockObject$$ = (0, import_static_injector11.computed)(
     () => ({
       ...this.#inlineNodeService.conditionNodeList(),
       ...this.#plugin.conditionNodeList$$()
@@ -1613,8 +1612,8 @@ var WorkflowPreParser = class {
   }
 };
 var WorkflowParserService = class {
-  #injector = (0, import_static_injector12.inject)(import_static_injector12.Injector);
-  #inlineNode = (0, import_static_injector12.inject)(InlineNodeService);
+  #injector = (0, import_static_injector11.inject)(import_static_injector11.Injector);
+  #inlineNode = (0, import_static_injector11.inject)(InlineNodeService);
   constructor() {
     this.#inlineNode.register(index_node_exports);
   }
@@ -1627,7 +1626,7 @@ var WorkflowParserService = class {
    *
    */
   parse(data) {
-    const injector = (0, import_static_injector12.createInjector)({
+    const injector = (0, import_static_injector11.createInjector)({
       providers: [
         WorkflowPreParser,
         { provide: WorkflowDataToken, useValue: data }
@@ -1653,14 +1652,14 @@ var WorkflowParserService = class {
 };
 
 // packages/workflow/workflow-exec.service.ts
-var import_static_injector14 = require("static-injector");
+var import_static_injector13 = require("static-injector");
 var import_rxjs3 = require("rxjs");
 
 // packages/workflow/preset/context-build.service.ts
-var import_static_injector13 = require("static-injector");
+var import_static_injector12 = require("static-injector");
 var ContextBuildService = class {
-  template = (0, import_static_injector13.inject)(TemplateFormatService);
-  parser = (0, import_static_injector13.inject)(WorkflowParserService);
+  template = (0, import_static_injector12.inject)(TemplateFormatService);
+  parser = (0, import_static_injector12.inject)(WorkflowParserService);
   createWorkflow(input) {
     const result = this.template.parse(
       input.template.flatMap(
@@ -1695,8 +1694,8 @@ var ContextBuildService = class {
 
 // packages/workflow/workflow-exec.service.ts
 var WorkflowExecService = class {
-  #parser = (0, import_static_injector14.inject)(WorkflowParserService);
-  #runner = (0, import_static_injector14.inject)(WorkflowRunnerService);
+  #parser = (0, import_static_injector13.inject)(WorkflowParserService);
+  #runner = (0, import_static_injector13.inject)(WorkflowRunnerService);
   parse(data) {
     return this.#parser.parse(data);
   }
@@ -1730,7 +1729,7 @@ var WorkflowExecService = class {
       throw error;
     }
   }
-  #contextBuild = (0, import_static_injector14.inject)(ContextBuildService);
+  #contextBuild = (0, import_static_injector13.inject)(ContextBuildService);
   async agentChat(input, fn, abort) {
     const workflow = this.#contextBuild.createWorkflow(input);
     const subject = new import_rxjs3.Subject();
@@ -1754,15 +1753,15 @@ var WorkflowExecService = class {
 };
 
 // packages/workflow/workflow-select.service.ts
-var import_static_injector16 = require("static-injector");
+var import_static_injector15 = require("static-injector");
 var import_vfs22 = require("@cyia/vfs2");
 
 // packages/workflow/workflow-file.service.ts
-var import_static_injector15 = require("static-injector");
+var import_static_injector14 = require("static-injector");
 var import_vfs2 = require("@cyia/vfs2");
 var import_bundle_file = require("@cyia/bundle-file");
 var WorkflowFileService = class {
-  #config = (0, import_static_injector15.inject)(WorkflowConfigToken);
+  #config = (0, import_static_injector14.inject)(WorkflowConfigToken);
   #fileMap = /* @__PURE__ */ new Map();
   getFile(filePath) {
     const nFilePath = import_vfs2.path.normalize(filePath);
@@ -1796,9 +1795,9 @@ var WorkflowFileService = class {
 
 // packages/workflow/workflow-select.service.ts
 var WorkflowSelectService = class {
-  #fileService = (0, import_static_injector16.inject)(WorkflowFileService);
-  #config = (0, import_static_injector16.inject)(WorkflowConfigToken);
-  #vfs = (0, import_static_injector16.computed)(
+  #fileService = (0, import_static_injector15.inject)(WorkflowFileService);
+  #config = (0, import_static_injector15.inject)(WorkflowConfigToken);
+  #vfs = (0, import_static_injector15.computed)(
     () => (0, import_vfs22.createNormalizeVfs)({
       dir: this.#config().dir
     })