Merge branch 'main' into dependabot/npm_and_yarn/jsonata-2.0.4

.eslintrc.json

@@ -23,6 +23,7 @@
   "rules": {
     "import/prefer-default-export": "off",
     "@typescript-eslint/no-explicit-any": "off",
-    "no-restricted-syntax": "off"
+    "no-restricted-syntax": "off",
+    "import/no-cycle": "off"
   }
 }

src/steps/base/batch/factory.ts

@@ -11,6 +11,7 @@ import { BatchExecutor } from '../../types';
 import { DefaultBatchWorkflowExecutor } from './default_batch_workflow_executor';
 import { SimpleBatchExecutor } from './simple_batch_executor';
 import { BatchStepExecutor } from './step_executor';
+import { StepExecutorFactory } from '../../factory';
 
 export class BatchStepExecutorFactory {
   static async create(
@@ -47,7 +48,6 @@ export class BatchStepExecutorFactory {
     } else {
       filterStep.identity = true;
     }
-    const { StepExecutorFactory } = await import('../../factory' as string);
     return StepExecutorFactory.create(filterStep, options);
   }
 

src/steps/base/factory.ts

@@ -12,6 +12,7 @@ import { CustomStepExecutorFactory } from './custom/factory';
 import { WorkflowStepExecutor } from './executors/workflow_step';
 import { SimpleStepExecutorFactory } from './simple';
 import { BaseStepUtils } from './utils';
+import { StepExecutorFactory } from '../factory';
 
 export class BaseStepExecutorFactory {
   static create(step: Step, options: WorkflowOptionsInternal): Promise<StepExecutor> {
@@ -47,7 +48,6 @@ export class BaseStepExecutorFactory {
     options: WorkflowOptionsInternal,
   ): Promise<StepExecutor[]> {
     const steps = workflowStep.steps as SimpleStep[];
-    const { StepExecutorFactory } = await import('../factory' as string);
     return Promise.all(steps.map((step) => StepExecutorFactory.create(step, options)));
   }
 }

src/steps/composed/factory.ts

@@ -5,6 +5,7 @@ import { CustomInputStepExecutor } from './executors/custom_input';
 import { DebuggableStepExecutor } from './executors/debuggable';
 import { ErrorWrapStepExecutor } from './executors/error_wrap';
 import { LoopStepExecutor } from './executors/loop';
+import { StepExecutorFactory } from '../factory';
 
 export class ComposableExecutorFactory {
   static async create(
@@ -60,7 +61,6 @@ export class ComposableExecutorFactory {
     );
     let elseExecutor: StepExecutor | undefined;
     if (step.else) {
-      const { StepExecutorFactory } = await import('../factory' as string);
       elseExecutor = await StepExecutorFactory.create(step.else, options);
     }
     return new ConditionalStepExecutor(condtionalExecutor, thenExecutor, elseExecutor);

src/workflow/factory.ts

@@ -1,3 +1,4 @@
+import { StepExecutorFactory } from '../steps/factory';
 import * as libraryBindings from '../bindings';
 import {
   Binding,
@@ -85,7 +86,6 @@ export class WorkflowEngineFactory {
     steps: Step[],
     options: WorkflowOptionsInternal,
   ): Promise<StepExecutor[]> {
-    const { StepExecutorFactory } = await import('../steps' as string);
     return Promise.all(steps.map((step) => StepExecutorFactory.create(step, options)));
   }
 }