@loopstack/core 0.2.0 → 0.3.1

package/dist/modules/workflow-processor/services/pipeline-processor.service.js

@@ -16,18 +16,34 @@ const configuration_1 = require("../../configuration");
 const common_2 = require("../../common");
 const namespace_processor_service_1 = require("./namespace-processor.service");
 const workflow_processor_service_1 = require("./workflow-processor.service");
+const template_expression_evaluator_service_1 = require("./template-expression-evaluator.service");
+const zod_1 = require("zod");
+const SequenceItemSchema = zod_1.z
+    .object({
+    workflow: zod_1.z.string().optional(),
+    pipeline: zod_1.z.string().optional(),
+    condition: zod_1.z.boolean().optional(),
+})
+    .strict();
+const FactoryIteratorItemSchema = zod_1.z
+    .object({
+    label: zod_1.z.string(),
+    meta: zod_1.z.any(),
+})
+    .strict();
+const FactoryIteratorSourceSchema = zod_1.z.array(zod_1.z.record(zod_1.z.string(), zod_1.z.any()));
 let PipelineProcessorService = PipelineProcessorService_1 = class PipelineProcessorService {
     loopConfigService;
     namespaceProcessorService;
     contextService;
-    valueParserService;
+    templateExpressionEvaluatorService;
     workflowProcessor;
     logger = new common_1.Logger(PipelineProcessorService_1.name);
-    constructor(loopConfigService, namespaceProcessorService, contextService, valueParserService, workflowProcessor) {
+    constructor(loopConfigService, namespaceProcessorService, contextService, templateExpressionEvaluatorService, workflowProcessor) {
         this.loopConfigService = loopConfigService;
         this.namespaceProcessorService = namespaceProcessorService;
         this.contextService = contextService;
-        this.valueParserService = valueParserService;
+        this.templateExpressionEvaluatorService = templateExpressionEvaluatorService;
         this.workflowProcessor = workflowProcessor;
     }
     createIndex(ltreeIndex, increment = 1) {
@@ -35,18 +51,25 @@ let PipelineProcessorService = PipelineProcessorService_1 = class PipelineProces
         parts[parts.length - 1] += increment;
         return parts.map((part) => part.toString().padStart(4, '0')).join('.');
     }
-    async runSequenceType(sequenceConfig, context) {
-        const sequence = sequenceConfig.sequence;
+    async runSequenceType(configElement, context) {
+        const sequence = configElement.config.sequence;
         const index = `${context.index}.0`;
         let lastContext = this.contextService.create(context);
         for (let i = 0; i < sequence.length; i++) {
             const item = sequence[i];
-            const evaluatedItem = this.valueParserService.evalWithContext(item, { context: lastContext });
+            const evaluatedItem = this.templateExpressionEvaluatorService.parse(item, {
+                context: lastContext,
+            }, {
+                schema: SequenceItemSchema,
+                omitAliasVariables: true,
+                omitUseTemplates: true,
+                omitWorkflowData: true,
+            });
             if (evaluatedItem.condition === false) {
                 continue;
             }
             lastContext.index = this.createIndex(index, i + 1);
-            lastContext = await this.processPipelineItem(item, lastContext);
+            lastContext = await this.processPipelineItem(item, lastContext, configElement);
             if (lastContext.stop) {
                 break;
             }
@@ -61,84 +84,101 @@ let PipelineProcessorService = PipelineProcessorService_1 = class PipelineProces
         const contexts = [];
         for (let i = 0; i < items.length; i++) {
             const item = items[i];
-            const label = factory.iterator.label
-                ? this.valueParserService.evalWithContextAndItem(factory.iterator.label, {
-                    context,
-                    item,
-                    index: i + 1,
-                })
-                : item.toString();
-            const metadata = factory.iterator.meta
-                ? this.valueParserService.evalWithContextAndItem(factory.iterator.meta, {
-                    context,
-                    item,
-                    index: i + 1,
-                })
-                : undefined;
+            const parsedIterator = this.templateExpressionEvaluatorService.parse({
+                label: factory.iterator.label,
+                meta: factory.iterator.meta,
+            }, {
+                context,
+                item,
+                index: i + 1,
+            }, {
+                schema: FactoryIteratorItemSchema,
+                omitAliasVariables: true,
+                omitUseTemplates: true,
+                omitWorkflowData: true,
+            });
+            const label = parsedIterator.label ?? item;
+            const metadata = parsedIterator.meta;
             const localContext = await this.namespaceProcessorService.createNamespace(context, {
                 label,
                 meta: metadata,
             });
+            localContext.item = item;
             localContext.index = this.createIndex(index, i + 1);
             contexts.push(localContext);
         }
         return contexts;
     }
-    async runFactoryType(config, context) {
-        const items = this.valueParserService.evalWithContext(config.iterator.source, { context });
-        if (!Array.isArray(items)) {
-            throw new Error(`Iterator values in ${config.iterator.source} must be array, got ${typeof items}`);
-        }
-        const preparedChildContexts = await this.prepareAllContexts(context, config, items);
+    async runFactoryType(configElement, context) {
+        const items = this.templateExpressionEvaluatorService.parse(configElement.config.iterator.source, { context }, {
+            schema: FactoryIteratorSourceSchema,
+            omitAliasVariables: true,
+            omitUseTemplates: true,
+            omitWorkflowData: true,
+        });
+        const preparedChildContexts = await this.prepareAllContexts(context, configElement.config, items);
         await this.namespaceProcessorService.cleanupNamespace(context, preparedChildContexts);
-        for (const childContext of preparedChildContexts) {
-            const tmpContext = await this.processPipelineItem(config.factory, childContext);
-            if (tmpContext.stop) {
-                context.stop = true;
-                break;
+        let results = [];
+        if (configElement.config.parallel) {
+            const allItems = preparedChildContexts.map((childContext) => this.processPipelineItem(configElement.config.factory, childContext, configElement));
+            results = await Promise.all(allItems);
+        }
+        else {
+            for (const childContext of preparedChildContexts) {
+                const resultContext = await this.processPipelineItem(configElement.config.factory, childContext, configElement);
+                results.push(resultContext);
+                if (resultContext.error || resultContext.stop) {
+                    break;
+                }
             }
         }
+        if (results.some((childContext) => childContext.stop)) {
+            context.stop = true;
+        }
+        if (results.some((childContext) => childContext.error)) {
+            context.error = true;
+        }
         return context;
     }
-    async runPipelineType(pipelineConfig, context) {
-        if (pipelineConfig.namespace) {
-            context = await this.namespaceProcessorService.createNamespace(context, pipelineConfig.namespace);
+    async runPipelineType(configElement, context) {
+        if (configElement.config.namespace) {
+            context = await this.namespaceProcessorService.createNamespace(context, configElement.config.namespace);
         }
-        let updatedContext;
-        switch (pipelineConfig.type) {
+        let updatedContext = undefined;
+        switch (configElement.config.type) {
+            case 'root':
             case 'sequence':
-                updatedContext = await this.runSequenceType(pipelineConfig, context);
+                updatedContext = await this.runSequenceType(configElement, context);
                 break;
             case 'factory':
-                updatedContext = await this.runFactoryType(pipelineConfig, context);
+                updatedContext = await this.runFactoryType(configElement, context);
                 break;
         }
         if (updatedContext &&
             updatedContext.namespace.id === context.namespace.id) {
             return updatedContext;
         }
+        if (updatedContext?.error) {
+            context.error = true;
+        }
+        if (updatedContext?.stop) {
+            context.stop = true;
+        }
         return context;
     }
-    async processPipelineItem(item, context) {
+    async processPipelineItem(item, context, parentConfig) {
         const type = ['tool', 'pipeline', 'workflow'].find((key) => key in item);
         if (!type) {
-            console.log(item);
             throw new Error('Unknown pipeline item type.');
         }
         const itemName = item[type];
-        this.logger.debug(`Processing item: ${itemName}`);
-        if (!this.configExists(type, itemName)) {
-            throw new Error(`Workflow ${itemName} for factory type ${type} does not exist.`);
-        }
-        const config = this.loopConfigService.get(`${type}s`, itemName);
-        if (!config) {
-            throw new Error(`Pipeline config "${itemName}" for type ${type} not found.`);
-        }
+        const configElement = this.loopConfigService.resolveConfig(`${type}s`, itemName, context.includes);
+        this.contextService.addIncludes(context, configElement.importMap);
         switch (type) {
             case 'pipeline':
-                return this.runPipelineType(config, context);
+                return this.runPipelineType(configElement, context);
             case 'workflow':
-                return this.workflowProcessor.runStateMachineType(config, context);
+                return this.workflowProcessor.runStateMachineType(configElement, context);
         }
         throw new Error(`Pipeline type ${type} unknown.`);
     }
@@ -149,7 +189,7 @@ exports.PipelineProcessorService = PipelineProcessorService = PipelineProcessorS
     __metadata("design:paramtypes", [configuration_1.ConfigurationService,
         namespace_processor_service_1.NamespaceProcessorService,
         common_2.ContextService,
-        common_2.ValueParserService,
+        template_expression_evaluator_service_1.TemplateExpressionEvaluatorService,
         workflow_processor_service_1.WorkflowProcessorService])
 ], PipelineProcessorService);
 //# sourceMappingURL=pipeline-processor.service.js.map

package/dist/modules/workflow-processor/services/pipeline-processor.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline-processor.service.js","sourceRoot":"","sources":["../../../../src/modules/workflow-processor/services/pipeline-processor.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,uDAA2D;AAC3D,yCAAkE;AASlE,+EAA0E;AAC1E,6EAAwE;AAGjE,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IAGzB;IACA;IACA;IACA;IACA;IANO,MAAM,GAAG,IAAI,eAAM,CAAC,0BAAwB,CAAC,IAAI,CAAC,CAAC;IACpE,YACU,iBAAuC,EACvC,yBAAoD,EACpD,cAA8B,EAC9B,kBAAsC,EACtC,iBAA2C;QAJ3C,sBAAiB,GAAjB,iBAAiB,CAAsB;QACvC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,mBAAc,GAAd,cAAc,CAAgB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,sBAAiB,GAAjB,iBAAiB,CAA0B;IAClD,CAAC;IAEJ,WAAW,CAAC,UAAkB,EAAE,YAAoB,CAAC;QACnD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChD,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC;QACrC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,cAAoC,EACpC,OAAyB;QAEzB,MAAM,QAAQ,GAAuB,cAAc,CAAC,QAAQ,CAAC;QAG7D,MAAM,KAAK,GAAG,GAAG,OAAO,CAAC,KAAK,IAAI,CAAC;QAEnC,IAAI,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,MAAM,IAAI,GAAqB,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAG1D,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YAEnC,IAAI,aAAa,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;gBACtC,SAAS;YACX,CAAC;YAED,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YACnD,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAEhE,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;gBACrB,MAAM;YACR,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,YAAY,CAAC,IAAY,EAAE,IAAY;QACrC,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,OAAyB,EACzB,OAA4B,EAC5B,KAAe;QAGf,MAAM,KAAK,GAAG,GAAG,OAAO,CAAC,KAAK,IAAI,CAAC;QAEnC,MAAM,QAAQ,GAAuB,EAAE,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAEtB,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAClC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,CAC5C,OAAO,CAAC,QAAQ,CAAC,KAAK,EACtB;oBACE,OAAO;oBACP,IAAI;oBACJ,KAAK,EAAE,CAAC,GAAG,CAAC;iBACb,CACF;gBACH,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEpB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI;gBACpC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,CAC5C,OAAO,CAAC,QAAQ,CAAC,IAAI,EACrB;oBACE,OAAO;oBACP,IAAI;oBACJ,KAAK,EAAE,CAAC,GAAG,CAAC;iBACb,CACF;gBACH,CAAC,CAAC,SAAS,CAAC;YAGd,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,eAAe,CACvE,OAAO,EACP;gBACE,KAAK;gBACL,IAAI,EAAE,QAAQ;aACf,CACF,CAAC;YAGF,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YACpD,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,MAA2B,EAC3B,OAAyB;QAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,eAAe,CACnD,MAAM,CAAC,QAAQ,CAAC,MAAM,EACtB,EAAE,OAAO,EAAE,CACZ,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,sBAAsB,MAAM,CAAC,QAAQ,CAAC,MAAM,uBAAuB,OAAO,KAAK,EAAE,CAClF,CAAC;QACJ,CAAC;QAGD,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CACzD,OAAO,EACP,MAAM,EACN,KAAK,CACN,CAAC;QAGF,MAAM,IAAI,CAAC,yBAAyB,CAAC,gBAAgB,CACnD,OAAO,EACP,qBAAqB,CACtB,CAAC;QAGF,KAAK,MAAM,YAAY,IAAI,qBAAqB,EAAE,CAAC;YACjD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAC/C,MAAM,CAAC,OAAO,EACd,YAAY,CACb,CAAC;YACF,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;gBACpB,MAAM;YACR,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,cAA4B,EAC5B,OAAyB;QAEzB,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;YAC7B,OAAO,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,eAAe,CAC5D,OAAO,EACP,cAAc,CAAC,SAAS,CACzB,CAAC;QACJ,CAAC;QAED,IAAI,cAAgC,CAAC;QACrC,QAAQ,cAAc,CAAC,IAAI,EAAE,CAAC;YAC5B,KAAK,UAAU;gBACb,cAAc,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBACrE,MAAM;YACR,KAAK,SAAS;gBACZ,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBACpE,MAAM;QACV,CAAC;QAGD,IACE,cAAc;YACd,cAAc,CAAC,SAAS,CAAC,EAAE,KAAK,OAAO,CAAC,SAAS,CAAC,EAAE,EACpD,CAAC;YACD,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,IAAsB,EACtB,OAAyB;QAEzB,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAE5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;QAElD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CACb,YAAY,QAAQ,qBAAqB,IAAI,kBAAkB,CAChE,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAM,GAAG,IAAI,GAAG,EAAE,QAAQ,CAAC,CAAC;QAErE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CACb,oBAAoB,QAAQ,cAAc,IAAI,aAAa,CAC5D,CAAC;QACJ,CAAC;QAED,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,UAAU;gBACb,OAAO,IAAI,CAAC,eAAe,CAAC,MAAsB,EAAE,OAAO,CAAC,CAAC;YAC/D,KAAK,UAAU;gBACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAC/C,MAAsB,EACtB,OAAO,CACR,CAAC;QACN,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,WAAW,CAAC,CAAC;IACpD,CAAC;CACF,CAAA;AA1NY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAIkB,oCAAoB;QACZ,uDAAyB;QACpC,uBAAc;QACV,2BAAkB;QACnB,qDAAwB;GAP1C,wBAAwB,CA0NpC"}
+{"version":3,"file":"pipeline-processor.service.js","sourceRoot":"","sources":["../../../../src/modules/workflow-processor/services/pipeline-processor.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/workflow-processor/services/root-processor.service.d.ts

@@ -1,5 +1,5 @@
 import { ContextService } from '../../common';
-import { PipelineEntity } from '@loopstack/shared';
+import { ContextInterface, PipelineEntity } from '@loopstack/shared';
 import { NamespacesService } from '../../persistence';
 import { PipelineProcessorService } from './pipeline-processor.service';
 export declare class RootProcessorService {
@@ -8,5 +8,5 @@ export declare class RootProcessorService {
     private namespacesService;
     private readonly logger;
     constructor(contextService: ContextService, processorService: PipelineProcessorService, namespacesService: NamespacesService);
-    processRootPipeline(pipeline: PipelineEntity, payload: any): Promise<import("@loopstack/shared").ContextInterface>;
+    processRootPipeline(pipeline: PipelineEntity, payload: any): Promise<ContextInterface>;
 }

package/dist/modules/workflow-processor/services/root-processor.service.js

@@ -32,6 +32,7 @@ let RootProcessorService = RootProcessorService_1 = class RootProcessorService {
             namespace: namespace,
             transition: payload.transition,
             stop: false,
+            error: false,
         });
         return this.processorService.processPipelineItem({
             pipeline: pipeline.model,

package/dist/modules/workflow-processor/services/root-processor.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"root-processor.service.js","sourceRoot":"","sources":["../../../../src/modules/workflow-processor/services/root-processor.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,yCAA8C;AAE9C,mDAAsD;AACtD,6EAAwE;AAGjE,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAGrB;IACA;IACA;IAJO,MAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;IAChE,YACU,cAA8B,EAC9B,gBAA0C,EAC1C,iBAAoC;QAFpC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,qBAAgB,GAAhB,gBAAgB,CAA0B;QAC1C,sBAAiB,GAAjB,iBAAiB,CAAmB;IAC3C,CAAC;IAEJ,KAAK,CAAC,mBAAmB,CAAC,QAAwB,EAAE,OAAY;QAC9D,MAAM,SAAS,GACb,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,QAAQ,EAAE;YAC9D,MAAM,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC;YAC5C,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAC9C;YACE,QAAQ,EAAE,QAAQ,CAAC,KAAK;SACzB,EACD,OAAO,CACR,CAAC;IACJ,CAAC;CACF,CAAA;AAzBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAIe,uBAAc;QACZ,qDAAwB;QACvB,+BAAiB;GALnC,oBAAoB,CAyBhC"}
+{"version":3,"file":"root-processor.service.js","sourceRoot":"","sources":["../../../../src/modules/workflow-processor/services/root-processor.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,yCAA8C;AAE9C,mDAAsD;AACtD,6EAAwE;AAGjE,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAGrB;IACA;IACA;IAJO,MAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;IAChE,YACU,cAA8B,EAC9B,gBAA0C,EAC1C,iBAAoC;QAFpC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,qBAAgB,GAAhB,gBAAgB,CAA0B;QAC1C,sBAAiB,GAAjB,iBAAiB,CAAmB;IAC3C,CAAC;IAEJ,KAAK,CAAC,mBAAmB,CACvB,QAAwB,EACxB,OAAY;QAEZ,MAAM,SAAS,GACb,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAE7D,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,QAAQ,EAAE;YAC9D,MAAM,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC;YAC5C,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAC9C;YACE,QAAQ,EAAE,QAAQ,CAAC,KAAK;SACzB,EACD,OAAO,CACR,CAAC;IACJ,CAAC;CACF,CAAA;AA9BY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAIe,uBAAc;QACZ,qDAAwB;QACvB,+BAAiB;GALnC,oBAAoB,CA8BhC"}

package/dist/modules/workflow-processor/services/service-execution.service.d.ts

@@ -0,0 +1,12 @@
+import { ServiceRegistry } from '../../configuration';
+import { ContextInterface, ServiceCallResult, TransitionMetadataInterface } from '@loopstack/shared';
+import { WorkflowEntity } from '@loopstack/shared';
+import { TemplateExpressionEvaluatorService } from './template-expression-evaluator.service';
+import { ServiceCallType } from '@loopstack/shared/dist/schemas/service-call.schema';
+export declare class ServiceExecutionService {
+    private serviceRegistry;
+    private templateExpressionEvaluatorService;
+    private logger;
+    constructor(serviceRegistry: ServiceRegistry, templateExpressionEvaluatorService: TemplateExpressionEvaluatorService);
+    callService(serviceCall: ServiceCallType, parentArguments: any, workflow: WorkflowEntity | undefined, context: ContextInterface, transitionData: TransitionMetadataInterface): Promise<ServiceCallResult>;
+}

package/dist/modules/workflow-processor/services/service-execution.service.js

@@ -0,0 +1,53 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ServiceExecutionService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceExecutionService = void 0;
+const common_1 = require("@nestjs/common");
+const configuration_1 = require("../../configuration");
+const template_expression_evaluator_service_1 = require("./template-expression-evaluator.service");
+let ServiceExecutionService = ServiceExecutionService_1 = class ServiceExecutionService {
+    serviceRegistry;
+    templateExpressionEvaluatorService;
+    logger = new common_1.Logger(ServiceExecutionService_1.name);
+    constructor(serviceRegistry, templateExpressionEvaluatorService) {
+        this.serviceRegistry = serviceRegistry;
+        this.templateExpressionEvaluatorService = templateExpressionEvaluatorService;
+    }
+    async callService(serviceCall, parentArguments, workflow, context, transitionData) {
+        this.logger.debug(`Service ${serviceCall.service} called with arguments`, serviceCall.arguments);
+        this.logger.debug(`Parent Arguments:`, parentArguments);
+        const { instance, options } = this.serviceRegistry.getServiceByName(serviceCall.service);
+        const hasArguments = serviceCall.arguments && Object.keys(serviceCall.arguments).length;
+        if (!options.schema && hasArguments) {
+            throw Error(`Service called with arguments but no schema defined.`);
+        }
+        const serviceCallArguments = hasArguments
+            ? this.templateExpressionEvaluatorService.parse(serviceCall.arguments, {
+                arguments: parentArguments,
+                context,
+                workflow,
+                transition: transitionData,
+            }, {
+                schema: options.schema,
+            })
+            : {};
+        this.logger.debug(`Calling service ${serviceCall.service}`);
+        return instance.apply(serviceCallArguments, workflow, context, transitionData, parentArguments);
+    }
+};
+exports.ServiceExecutionService = ServiceExecutionService;
+exports.ServiceExecutionService = ServiceExecutionService = ServiceExecutionService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [configuration_1.ServiceRegistry,
+        template_expression_evaluator_service_1.TemplateExpressionEvaluatorService])
+], ServiceExecutionService);
+//# sourceMappingURL=service-execution.service.js.map

package/dist/modules/workflow-processor/services/service-execution.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-execution.service.js","sourceRoot":"","sources":["../../../../src/modules/workflow-processor/services/service-execution.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,uDAAsD;AAQtD,mGAA6F;AAItF,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAIxB;IACA;IAJF,MAAM,GAAG,IAAI,eAAM,CAAC,yBAAuB,CAAC,IAAI,CAAC,CAAC;IAE1D,YACU,eAAgC,EAChC,kCAAsE;QADtE,oBAAe,GAAf,eAAe,CAAiB;QAChC,uCAAkC,GAAlC,kCAAkC,CAAoC;IAC7E,CAAC;IAEJ,KAAK,CAAC,WAAW,CACf,WAA4B,EAC5B,eAAoB,EACpB,QAAoC,EACpC,OAAyB,EACzB,cAA2C;QAE3C,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,WAAW,WAAW,CAAC,OAAO,wBAAwB,EACtD,WAAW,CAAC,SAAS,CACtB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;QAExD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,gBAAgB,CACjE,WAAW,CAAC,OAAO,CACpB,CAAC;QAEF,MAAM,YAAY,GAChB,WAAW,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;QACrE,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,YAAY,EAAE,CAAC;YACpC,MAAM,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACtE,CAAC;QAGD,MAAM,oBAAoB,GAAG,YAAY;YACvC,CAAC,CAAC,IAAI,CAAC,kCAAkC,CAAC,KAAK,CAC3C,WAAW,CAAC,SAAS,EACrB;gBACE,SAAS,EAAE,eAAe;gBAC1B,OAAO;gBACP,QAAQ;gBACR,UAAU,EAAE,cAAc;aAC3B,EACD;gBACE,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CACF;YACH,CAAC,CAAC,EAAE,CAAC;QAEP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5D,OAAO,QAAQ,CAAC,KAAK,CACnB,oBAAoB,EACpB,QAAQ,EACR,OAAO,EACP,cAAc,EACd,eAAe,CAChB,CAAC;IACJ,CAAC;CACF,CAAA;AAzDY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAKgB,+BAAe;QACI,0EAAkC;GALrE,uBAAuB,CAyDnC"}

package/dist/modules/workflow-processor/services/state-machine-config.service.d.ts

@@ -1,22 +1,7 @@
-import { StateMachineType } from '@loopstack/shared';
+import { StateMachineType, ConfigElement } from '@loopstack/shared';
 import { ConfigurationService } from '../../configuration';
 export declare class StateMachineConfigService {
     private loopConfigService;
     constructor(loopConfigService: ConfigurationService);
-    getTemplate(name: string): {
-        extends?: string | undefined;
-        transitions?: {
-            name: string;
-            from?: string | string[] | undefined;
-            to?: string | string[] | undefined;
-            when?: string | undefined;
-            call?: {
-                tool: string;
-                arguments?: any;
-                exportAs?: string | undefined;
-            }[] | undefined;
-            onError?: string | undefined;
-        }[] | undefined;
-    };
-    getConfig(stateMachine: StateMachineType): StateMachineType;
+    getConfig(configElement: ConfigElement<StateMachineType>): ConfigElement<StateMachineType>;
 }

package/dist/modules/workflow-processor/services/state-machine-config.service.js

@@ -21,27 +21,43 @@ let StateMachineConfigService = class StateMachineConfigService {
     constructor(loopConfigService) {
         this.loopConfigService = loopConfigService;
     }
-    getTemplate(name) {
-        const stateMachine = this.loopConfigService.get('workflowTemplates', name);
-        if (!stateMachine) {
-            throw new Error(`State machine template with name ${name} does not exist.`);
-        }
-        return this.getConfig(stateMachine);
-    }
-    getConfig(stateMachine) {
-        let transitions = stateMachine.transitions ?? [];
-        if (stateMachine.extends) {
-            const parentStateMachine = this.getTemplate(stateMachine.extends);
-            transitions = lodash_1.default.unionBy(transitions, parentStateMachine?.transitions ?? [], 'name');
+    getConfig(configElement) {
+        let transitions = configElement.config.transitions ?? [];
+        let args = configElement.config.arguments ?? {};
+        let parameters = configElement.config.parameters ?? {
+            type: 'object',
+        };
+        let ui = configElement.config.ui ?? {};
+        if (!configElement.config.extends) {
             return {
-                ...parentStateMachine,
-                ...stateMachine,
-                transitions,
+                ...configElement,
+                config: {
+                    ...configElement.config,
+                    transitions,
+                    arguments: args,
+                    parameters,
+                },
             };
         }
+        const parentStateMachine = this.getConfig(this.loopConfigService.resolveConfig('workflows', configElement.config.extends, configElement.importMap));
+        transitions = lodash_1.default.unionBy(transitions, parentStateMachine?.config.transitions ?? [], 'name');
+        args = lodash_1.default.merge({}, args, parentStateMachine.config.arguments);
+        parameters = lodash_1.default.merge({}, parameters, parentStateMachine.config.parameters);
+        ui = lodash_1.default.merge({}, ui, parentStateMachine.config.ui);
+        const mergedImportMap = new Map([
+            ...parentStateMachine.importMap,
+            ...configElement.importMap,
+        ]);
         return {
-            ...stateMachine,
-            transitions,
+            ...configElement,
+            importMap: mergedImportMap,
+            config: {
+                ...configElement.config,
+                transitions,
+                arguments: args,
+                parameters,
+                ui,
+            },
         };
     }
 };

package/dist/modules/workflow-processor/services/state-machine-config.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"state-machine-config.service.js","sourceRoot":"","sources":["../../../../src/modules/workflow-processor/services/state-machine-config.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oDAAuB;AAMvB,uDAA2D;AAGpD,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAChB;IAApB,YAAoB,iBAAuC;QAAvC,sBAAiB,GAAjB,iBAAiB,CAAsB;IAAG,CAAC;IAE/D,WAAW,CAAC,IAAY;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAC7C,mBAAmB,EACnB,IAAI,CACL,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,kBAAkB,CAC3D,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC;IAED,SAAS,CAAC,YAA8B;QACtC,IAAI,WAAW,GAA6B,YAAY,CAAC,WAAW,IAAI,EAAE,CAAC;QAE3E,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;YACzB,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAClE,WAAW,GAAG,gBAAC,CAAC,OAAO,CACrB,WAAW,EACX,kBAAkB,EAAE,WAAW,IAAI,EAAE,EACrC,MAAM,CACP,CAAC;YAEF,OAAO;gBACL,GAAG,kBAAkB;gBACrB,GAAG,YAAY;gBACf,WAAW;aACZ,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,YAAY;YACf,WAAW;SACZ,CAAC;IACJ,CAAC;CACF,CAAA;AAxCY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;qCAE4B,oCAAoB;GADhD,yBAAyB,CAwCrC"}
+{"version":3,"file":"state-machine-config.service.js","sourceRoot":"","sources":["../../../../src/modules/workflow-processor/services/state-machine-config.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oDAAuB;AAOvB,uDAA2D;AAIpD,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAChB;IAApB,YAAoB,iBAAuC;QAAvC,sBAAiB,GAAjB,iBAAiB,CAAsB;IAAG,CAAC;IAExD,SAAS,CACd,aAA8C;QAE9C,IAAI,WAAW,GACb,aAAa,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;QACzC,IAAI,IAAI,GAAwB,aAAa,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;QACrE,IAAI,UAAU,GAAwB,aAAa,CAAC,MAAM,CAAC,UAAU,IAAI;YACvE,IAAI,EAAE,QAAQ;SACf,CAAC;QACF,IAAI,EAAE,GAAiB,aAAa,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC;QAErD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClC,OAAO;gBACL,GAAG,aAAa;gBAChB,MAAM,EAAE;oBACN,GAAG,aAAa,CAAC,MAAM;oBACvB,WAAW;oBACX,SAAS,EAAE,IAAI;oBACf,UAAU;iBACX;aACF,CAAC;QACJ,CAAC;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CACvC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAClC,WAAW,EACX,aAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,aAAa,CAAC,SAAS,CACxB,CACF,CAAC;QAEF,WAAW,GAAG,gBAAC,CAAC,OAAO,CACrB,WAAW,EACX,kBAAkB,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,EAC5C,MAAM,CACP,CAAC;QACF,IAAI,GAAG,gBAAC,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9D,UAAU,GAAG,gBAAC,CAAC,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3E,EAAE,GAAG,gBAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC;YAC9B,GAAG,kBAAkB,CAAC,SAAS;YAC/B,GAAG,aAAa,CAAC,SAAS;SAC3B,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,aAAa;YAChB,SAAS,EAAE,eAAe;YAC1B,MAAM,EAAE;gBACN,GAAG,aAAa,CAAC,MAAM;gBACvB,WAAW;gBACX,SAAS,EAAE,IAAI;gBACf,UAAU;gBACV,EAAE;aACH;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AA5DY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;qCAE4B,oCAAoB;GADhD,yBAAyB,CA4DrC"}

package/dist/modules/workflow-processor/services/state-machine-processor.service.d.ts

@@ -1,28 +1,32 @@
 import { StateMachineConfigService } from './state-machine-config.service';
-import { ContextInterface, HistoryTransition, TransitionInfoInterface, TransitionPayloadInterface, WorkflowEntity, WorkflowTransitionType, WorkflowType } from '@loopstack/shared';
+import { ConfigElement, ContextInterface, HistoryTransition, ServiceCallResult, ToolCallType, TransitionInfoInterface, TransitionPayloadInterface, WorkflowEntity, WorkflowTransitionType, WorkflowType } from '@loopstack/shared';
 import { ToolExecutionService } from './tool-execution.service';
 import { WorkflowService } from '../../persistence';
 import { StateMachineValidatorRegistry } from './state-machine-validator.registry';
-import { ValueParserService } from '../../common';
+import { ContextService } from '../../common';
 import { StateMachineValidatorResultInterface } from '@loopstack/shared/dist/interfaces/state-machine-validator-result.interface';
 import { StateMachineInfoDto } from '@loopstack/shared/dist/dto/state-machine-info.dto';
 import { TemplateExpressionEvaluatorService } from './template-expression-evaluator.service';
+import { WorkflowContextService } from './workflow-context.service';
 export declare class StateMachineProcessorService {
     private readonly workflowConfigService;
     private readonly workflowService;
     private readonly toolExecutionService;
     private readonly stateMachineValidatorRegistry;
-    private readonly configValueParserService;
+    private readonly contextService;
     private readonly templateExpressionEvaluatorService;
+    private readonly workflowContextService;
     private readonly logger;
-    constructor(workflowConfigService: StateMachineConfigService, workflowService: WorkflowService, toolExecutionService: ToolExecutionService, stateMachineValidatorRegistry: StateMachineValidatorRegistry, configValueParserService: ValueParserService, templateExpressionEvaluatorService: TemplateExpressionEvaluatorService);
-    canSkipRun(workflow: WorkflowEntity, options: Record<string, any> | undefined): StateMachineValidatorResultInterface;
-    processStateMachine(context: ContextInterface, workflow: WorkflowEntity, config: WorkflowType): Promise<WorkflowEntity>;
+    constructor(workflowConfigService: StateMachineConfigService, workflowService: WorkflowService, toolExecutionService: ToolExecutionService, stateMachineValidatorRegistry: StateMachineValidatorRegistry, contextService: ContextService, templateExpressionEvaluatorService: TemplateExpressionEvaluatorService, workflowContextService: WorkflowContextService);
+    canSkipRun(workflow: WorkflowEntity, args: Record<string, any> | undefined): StateMachineValidatorResultInterface;
+    processStateMachine(context: ContextInterface, workflow: WorkflowEntity, configElement: ConfigElement<WorkflowType>): Promise<WorkflowEntity>;
     updateWorkflowState(workflow: WorkflowEntity, historyItem: HistoryTransition): void;
     updateWorkflowAvailableTransitions(workflow: WorkflowEntity, transitions: WorkflowTransitionType[]): void;
     initStateMachine(workflow: WorkflowEntity, stateMachineInfo: StateMachineInfoDto): Promise<WorkflowEntity>;
     validateTransition(nextTransition: TransitionInfoInterface, historyItem: HistoryTransition): void;
     getNextTransition(workflow: WorkflowEntity, pendingTransition: TransitionPayloadInterface | undefined): TransitionInfoInterface | null;
     commitWorkflowTransition(workflow: WorkflowEntity, nextPlace: string | undefined, nextTransition: TransitionInfoInterface): void;
-    loopStateMachine(beforeContext: ContextInterface, workflow: WorkflowEntity, config: WorkflowType, stateMachineInfo: StateMachineInfoDto): Promise<WorkflowEntity>;
+    addWorkflowTransitionData(workflow: WorkflowEntity, transition: string, target: string, data: any): void;
+    commitToolCallResult(workflow: WorkflowEntity, transition: string, toolCall: ToolCallType, result: ServiceCallResult | undefined): WorkflowEntity;
+    loopStateMachine(beforeContext: ContextInterface, workflow: WorkflowEntity, configElement: ConfigElement<WorkflowType>, stateMachineInfo: StateMachineInfoDto): Promise<WorkflowEntity>;
 }