@shenghuabi/workflow 1.1.6 → 1.1.7

package/index.mjs

@@ -8,7 +8,7 @@ var __export = (target, all) => {
 import {
   computed as computed3,
   createInjector as createInjector2,
-  inject as inject9,
+  inject as inject8,
   InjectionToken as InjectionToken2,
   Injector as Injector3
 } from "static-injector";
@@ -506,16 +506,17 @@ import { defaultsDeep } from "es-toolkit/compat";
 var NodeRunnerBase = class {
   node = inject(CurrentNodeToken);
   callNode = inject(CurrentCallNodeToken, { optional: true }) ?? void 0;
-  context = inject(CurrentContextToken);
+  runnerContext = inject(CurrentContextToken);
   injector = inject(Injector);
   emitter = inject(WorkflowEmitter);
   abortSignal = inject(AbortSignalToken);
   inputs = inject(NodeInputsToken);
+  environmentContextData = inject(EnviromentParametersToken);
   async run() {
     throw new Error("待实现");
   }
   #modelConfig = inject(ModelOptionsToken, { optional: true }) ?? void 0;
-  context$$ = computed2(() => this.injector.get(NodeContextToken)());
+  nodeContextData$$ = computed2(() => this.injector.get(NodeContextToken)());
   mergeChatModel(input) {
     const chatService = this.injector.get(ChatServiceToken);
     let presetConfig = {};
@@ -862,16 +863,14 @@ var TEXT_NODE_DEFINE = v7.object({
 });
 
 // packages/workflow/inline/node/text/main/runner.ts
-import { inject as inject4 } from "static-injector";
 var TextareaRunner = class extends NodeRunnerBase {
-  environmentContext = inject4(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;
         }
@@ -925,12 +924,12 @@ var ITERATION_NODE_DEFINE = v8.pipe(
 );
 
 // packages/workflow/runner/workflow-runner.service.ts
-import { createInjector, inject as inject7, Injector as Injector2 } from "static-injector";
+import { createInjector, inject as inject6, Injector as Injector2 } from "static-injector";
 
 // packages/workflow/inline/node/input-params/main/runner.ts
-import { inject as inject5 } from "static-injector";
+import { inject as inject4 } from "static-injector";
 var InputParamsRunner = class extends NodeRunnerBase {
-  #env = inject5(EnviromentParametersToken);
+  #env = inject4(EnviromentParametersToken);
   async run() {
     const data = this.#env;
     return async (id) => {
@@ -946,9 +945,9 @@ var InputParamsRunner = class extends NodeRunnerBase {
 };
 
 // packages/workflow/inline/node/iteration/main/iteration-start.runner.ts
-import { inject as inject6 } from "static-injector";
+import { inject as inject5 } from "static-injector";
 var IterationStartRunner = class extends NodeRunnerBase {
-  #nodeParentMap = inject6(NodeParentMapToken);
+  #nodeParentMap = inject5(NodeParentMapToken);
   async run() {
     const data = this.#nodeParentMap.get(this.node.parentId);
     return async (id) => {
@@ -997,15 +996,15 @@ import * as v9 from "valibot";
 import { deepClone } from "@cyia/util";
 import { deepEqual } from "fast-equals";
 var WorkflowRunnerContext = class {
-  #injector = inject7(Injector2);
-  data = inject7(CurrentWorkflowToken);
-  parent = inject7(ParentContextToken);
+  #injector = inject6(Injector2);
+  data = inject6(CurrentWorkflowToken);
+  parent = inject6(ParentContextToken);
   #callCache = /* @__PURE__ */ new Map();
   #outputCache = /* @__PURE__ */ new Map();
-  inputs = inject7(InputsToken);
-  #plugin = inject7(WorkflowPluginService);
-  #emitter = inject7(WorkflowEmitter);
-  #inlineNode = inject7(InlineNodeService);
+  inputs = inject6(InputsToken);
+  #plugin = inject6(WorkflowPluginService);
+  #emitter = inject6(WorkflowEmitter);
+  #inlineNode = inject6(InlineNodeService);
   async #getNodeRunner(type) {
     return this.#inlineNode.getNodeRunner(type) ?? ItemRunnerObject[type] ?? await this.#plugin.getNodeRunner(type);
   }
@@ -1057,7 +1056,7 @@ var WorkflowRunnerContext = class {
       parent: this.#injector
     }).get(define);
   }
-  #abort = inject7(AbortSignalToken);
+  #abort = inject6(AbortSignalToken);
   async #runItem(node, callNode, input) {
     try {
       if (this.#abort?.aborted) {
@@ -1174,7 +1173,7 @@ var WorkflowRunnerContext = class {
   }
 };
 var WorkflowRunnerService = class {
-  #injector = inject7(Injector2);
+  #injector = inject6(Injector2);
   /** 自己使用
    * @internal
    */
@@ -1218,9 +1217,9 @@ var WorkflowRunnerService = class {
 
 // packages/workflow/inline/node/iteration/main/runner.ts
 import { isIterable } from "@cyia/util";
-import { inject as inject8 } from "static-injector";
+import { inject as inject7 } from "static-injector";
 var IterationRunner = class extends NodeRunnerBase {
-  #nodeParentMap = inject8(NodeParentMapToken);
+  #nodeParentMap = inject7(NodeParentMapToken);
   async run() {
     const inputs = this.inputs;
     const value = inputs.list;
@@ -1236,7 +1235,7 @@ var IterationRunner = class extends NodeRunnerBase {
           await this.injector.get(WorkflowRunnerService).createContext(
             //迭代只有一个子流
             this.node.subFlowList[0].flow,
-            this.context,
+            this.runnerContext,
             this.injector
           ).run()
         );
@@ -1457,9 +1456,9 @@ var WorkflowPreParser = class {
    * 所有独立块都是找到独立节点后终止
    */
   #nodeGroup = new NodeGroup();
-  #data = inject9(WorkflowDataToken);
-  #plugin = inject9(WorkflowPluginService);
-  #inlineNodeService = inject9(InlineNodeService);
+  #data = inject8(WorkflowDataToken);
+  #plugin = inject8(WorkflowPluginService);
+  #inlineNodeService = inject8(InlineNodeService);
   #fullBlockObject$$ = computed3(
     () => ({
       ...this.#inlineNodeService.conditionNodeList(),
@@ -1559,8 +1558,8 @@ var WorkflowPreParser = class {
   }
 };
 var WorkflowParserService = class {
-  #injector = inject9(Injector3);
-  #inlineNode = inject9(InlineNodeService);
+  #injector = inject8(Injector3);
+  #inlineNode = inject8(InlineNodeService);
   constructor() {
     this.#inlineNode.register(index_node_exports);
   }
@@ -1599,14 +1598,14 @@ var WorkflowParserService = class {
 };
 
 // packages/workflow/workflow-exec.service.ts
-import { inject as inject11 } from "static-injector";
+import { inject as inject10 } from "static-injector";
 import { Subject } from "rxjs";
 
 // packages/workflow/preset/context-build.service.ts
-import { inject as inject10 } from "static-injector";
+import { inject as inject9 } from "static-injector";
 var ContextBuildService = class {
-  template = inject10(TemplateFormatService);
-  parser = inject10(WorkflowParserService);
+  template = inject9(TemplateFormatService);
+  parser = inject9(WorkflowParserService);
   createWorkflow(input) {
     const result = this.template.parse(
       input.template.flatMap(
@@ -1641,8 +1640,8 @@ var ContextBuildService = class {
 
 // packages/workflow/workflow-exec.service.ts
 var WorkflowExecService = class {
-  #parser = inject11(WorkflowParserService);
-  #runner = inject11(WorkflowRunnerService);
+  #parser = inject10(WorkflowParserService);
+  #runner = inject10(WorkflowRunnerService);
   parse(data) {
     return this.#parser.parse(data);
   }
@@ -1676,7 +1675,7 @@ var WorkflowExecService = class {
       throw error;
     }
   }
-  #contextBuild = inject11(ContextBuildService);
+  #contextBuild = inject10(ContextBuildService);
   async agentChat(input, fn, abort) {
     const workflow = this.#contextBuild.createWorkflow(input);
     const subject = new Subject();
@@ -1700,15 +1699,15 @@ var WorkflowExecService = class {
 };
 
 // packages/workflow/workflow-select.service.ts
-import { computed as computed4, inject as inject13 } from "static-injector";
+import { computed as computed4, inject as inject12 } from "static-injector";
 import { createNormalizeVfs, path as path2 } from "@cyia/vfs2";
 
 // packages/workflow/workflow-file.service.ts
-import { inject as inject12 } from "static-injector";
+import { inject as inject11 } from "static-injector";
 import { path } from "@cyia/vfs2";
 import { RawFile } from "@cyia/bundle-file";
 var WorkflowFileService = class {
-  #config = inject12(WorkflowConfigToken);
+  #config = inject11(WorkflowConfigToken);
   #fileMap = /* @__PURE__ */ new Map();
   getFile(filePath) {
     const nFilePath = path.normalize(filePath);
@@ -1742,8 +1741,8 @@ var WorkflowFileService = class {
 
 // packages/workflow/workflow-select.service.ts
 var WorkflowSelectService = class {
-  #fileService = inject13(WorkflowFileService);
-  #config = inject13(WorkflowConfigToken);
+  #fileService = inject12(WorkflowFileService);
+  #config = inject12(WorkflowConfigToken);
   #vfs = computed4(
     () => createNormalizeVfs({
       dir: this.#config().dir