@vertesia/workflow 1.2.0 → 1.4.0-dev.20260615.042549Z

package/src/dsl/workflow-exec-child.test.ts

@@ -1,7 +1,12 @@
 import * as protos from '@temporalio/proto';
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
-import { ContentEventName, DSLActivityExecutionPayload, DSLWorkflowExecutionPayload, DSLWorkflowStep } from '@vertesia/common';
+import { bundleWorkflowCode, Worker, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
+import {
+    ContentEventName,
+    type DSLActivityExecutionPayload,
+    type DSLWorkflowExecutionPayload,
+    type DSLWorkflowStep,
+} from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, test } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
 import { setupActivity } from './setup/ActivityContext.js';
@@ -26,7 +31,7 @@ async function sayHelloFromDSLChild(payload: DSLActivityExecutionPayload<SayHell
 
 async function prepareResult(payload: DSLActivityExecutionPayload<PrepareResultParams>) {
     const { params } = await setupActivity(payload);
-    return [params.parent, params.child]
+    return [params.parent, params.child];
 }
 
 const steps1: DSLWorkflowStep[] = [
@@ -34,7 +39,7 @@ const steps1: DSLWorkflowStep[] = [
         type: 'activity',
         name: 'sayHelloFromParent',
         output: 'parent',
-        import: ["name"],
+        import: ['name'],
     },
     {
         type: 'workflow',
@@ -44,80 +49,79 @@ const steps1: DSLWorkflowStep[] = [
     {
         type: 'activity',
         name: 'prepareResult',
-        import: ["parent", "child"],
+        import: ['parent', 'child'],
         output: 'result',
-    }
-]
+    },
+];
 
 const childSteps: DSLWorkflowStep[] = [
     {
         type: 'activity',
         name: 'sayHelloFromDSLChild',
         output: 'result',
-        import: ["name"],
+        import: ['name'],
     },
-]
+];
 
 const steps2: DSLWorkflowStep[] = [
     {
         type: 'activity',
         name: 'sayHelloFromParent',
         output: 'parent',
-        import: ["name"],
+        import: ['name'],
     },
     {
         type: 'workflow',
         name: 'dslWorkflow',
         output: 'child',
         spec: {
+            spec_format: 'steps',
             name: 'testChildWorkflow',
             steps: childSteps,
-            vars: {}
-        }
+            vars: {},
+        },
     },
     {
         type: 'activity',
         name: 'prepareResult',
-        import: ["parent", "child"],
+        import: ['parent', 'child'],
         output: 'result',
-    }
-]
+    },
+];
 
 const steps3: DSLWorkflowStep[] = [
     {
         type: 'activity',
         name: 'sayHelloFromParent',
         output: 'parent',
-        import: ["name"],
+        import: ['name'],
     },
     {
         type: 'workflow',
         name: 'dslWorkflow',
         output: 'child',
         spec: {
+            spec_format: 'steps',
             name: 'testChildWorkflow',
             steps: childSteps,
-            vars: {}
+            vars: {},
         },
         vars: {
             storeUrl: 'store:${objectIds[0]}',
-            name: '${name}'
-        }
+            name: '${name}',
+        },
     },
     {
         type: 'activity',
         name: 'prepareResult',
-        import: ["parent", "child"],
+        import: ['parent', 'child'],
         output: 'result',
-    }
-]
-
+    },
+];
 
 // ========== test env setup ==========
 
-
 describe('DSL Workflow with child workflows', () => {
-
     let testEnv: TestWorkflowEnvironment;
     let workflowBundle: WorkflowBundleWithSourceMap;
 
@@ -143,7 +147,7 @@ describe('DSL Workflow with child workflows', () => {
         await testEnv?.teardown();
     });
 
-    test('execute child workflow', async () => {
+    test('should execute child workflow', async () => {
         const { client, nativeConnection } = testEnv;
         const taskQueue = 'test';
 
@@ -163,31 +167,35 @@ describe('DSL Workflow with child workflows', () => {
             account_id: '123',
             project_id: '123',
             wf_rule_name: 'test',
-            auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
+            auth_token:
+                process.env.VERTESIA_KEY ||
+                'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
-                studio_url: process.env.CP_STUDIO_URL || "http://localhost:8081",
-                store_url: process.env.CP_STORE_URL || "http://localhost:8082",
+                studio_url: process.env.CP_STUDIO_URL || 'http://localhost:8081',
+                store_url: process.env.CP_STORE_URL || 'http://localhost:8082',
             },
             workflow: {
+                spec_format: 'steps',
                 steps: steps1,
                 vars: {
                     name,
                 },
                 name: 'test',
-            }
-        }
+            },
+        };
 
-        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
-            args: [payload],
-            workflowId: 'test',
-            taskQueue,
-        }));
+        const result = await worker.runUntil(
+            client.workflow.execute(dslWorkflow, {
+                args: [payload],
+                workflowId: 'test',
+                taskQueue,
+            }),
+        );
 
         expect(result).toEqual([`Parent: Hello, ${name}!`, `Child: Hello, ${name}!`]);
-
     });
 
-    test('execute DSL child workflow', async () => {
+    test('should execute DSL child workflow', async () => {
         const { client, nativeConnection } = testEnv;
         const taskQueue = 'test';
 
@@ -207,31 +215,35 @@ describe('DSL Workflow with child workflows', () => {
             account_id: '123',
             project_id: '123',
             wf_rule_name: 'test',
-            auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
+            auth_token:
+                process.env.VERTESIA_KEY ||
+                'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
-                studio_url: process.env.CP_STUDIO_URL || "http://localhost:8081",
-                store_url: process.env.CP_STORE_URL || "http://localhost:8082",
+                studio_url: process.env.CP_STUDIO_URL || 'http://localhost:8081',
+                store_url: process.env.CP_STORE_URL || 'http://localhost:8082',
             },
             workflow: {
+                spec_format: 'steps',
                 steps: steps2,
                 vars: {
                     name,
                 },
                 name: 'test',
-            }
-        }
+            },
+        };
 
-        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
-            args: [payload],
-            workflowId: 'test',
-            taskQueue,
-        }));
+        const result = await worker.runUntil(
+            client.workflow.execute(dslWorkflow, {
+                args: [payload],
+                workflowId: 'test',
+                taskQueue,
+            }),
+        );
 
         expect(result).toEqual([`Parent: Hello, ${name}!`, `DSL Child: Hello, ${name}!`]);
-
     });
 
-    test('execute DSL child workflow with variable resolution', async () => {
+    test('should execute DSL child workflow with variable resolution', async () => {
         const { client, nativeConnection } = testEnv;
         const taskQueue = 'test';
 
@@ -251,27 +263,31 @@ describe('DSL Workflow with child workflows', () => {
             account_id: '123',
             project_id: '123',
             wf_rule_name: 'test',
-            auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
+            auth_token:
+                process.env.VERTESIA_KEY ||
+                'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
-                studio_url: process.env.CP_STUDIO_URL || "http://localhost:8081",
-                store_url: process.env.CP_STORE_URL || "http://localhost:8082",
+                studio_url: process.env.CP_STUDIO_URL || 'http://localhost:8081',
+                store_url: process.env.CP_STORE_URL || 'http://localhost:8082',
             },
             workflow: {
+                spec_format: 'steps',
                 steps: steps3,
                 vars: {
                     name,
                 },
                 name: 'test',
-            }
-        }
+            },
+        };
 
-        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
-            args: [payload],
-            workflowId: 'test-vars',
-            taskQueue,
-        }));
+        const result = await worker.runUntil(
+            client.workflow.execute(dslWorkflow, {
+                args: [payload],
+                workflowId: 'test-vars',
+                taskQueue,
+            }),
+        );
 
         expect(result).toEqual([`Parent: Hello, ${name}!`, `DSL Child: Hello, ${name}!`]);
-
     });
 });

package/src/dsl/workflow-fetch.test.ts

@@ -1,10 +1,16 @@
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
-import { VertesiaClient } from '@vertesia/client';
-import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload, FindPayload } from '@vertesia/common';
+import { bundleWorkflowCode, Worker, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
+import type { VertesiaClient } from '@vertesia/client';
+import {
+    ContentEventName,
+    type DSLActivityExecutionPayload,
+    type DSLActivitySpec,
+    type DSLWorkflowExecutionPayload,
+    type FindPayload,
+} from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
-import { setupActivity } from "./setup/ActivityContext.js";
+import { setupActivity } from './setup/ActivityContext.js';
 import { DataProvider } from './setup/fetch/DataProvider.js';
 import { registerFetchProviderFactory } from './setup/fetch/index.js';
 
@@ -13,20 +19,19 @@ interface SayMessageParams {
 }
 
 class DocumentTestProvider extends DataProvider {
-
-    static ID = "document";
+    static ID = 'document';
 
     constructor() {
         super(DocumentTestProvider.ID, true);
     }
 
-    doFetch(payload: FindPayload): Promise<Record<string, any>[]> {
+    doFetch(payload: FindPayload): Promise<Record<string, unknown>[]> {
         const query = payload.query;
         console.log('query', query);
         if (query.lang === 'en') {
-            return Promise.resolve([query.greeting ? { text: 'Hello' } : { text: "World" }])
+            return Promise.resolve([query.greeting ? { text: 'Hello' } : { text: 'World' }]);
         } else {
-            return Promise.resolve([query.greeting ? { text: 'Bonjour' } : { text: "Monde" }])
+            return Promise.resolve([query.greeting ? { text: 'Bonjour' } : { text: 'Monde' }]);
         }
     }
 
@@ -37,45 +42,43 @@ class DocumentTestProvider extends DataProvider {
 
 registerFetchProviderFactory(DocumentTestProvider.ID, DocumentTestProvider.factory);
 
-
 async function sayMessage(payload: DSLActivityExecutionPayload<SayMessageParams>): Promise<string> {
     const { params } = await setupActivity(payload);
     return params.message;
 }
 
-
 const activities: DSLActivitySpec[] = [
     {
         name: 'sayMessage',
         output: 'result',
-        import: ["lang"],
+        import: ['lang'],
         params: {
-            message: "${greeting.text}, ${name.text}!"
+            message: '${greeting.text}, ${name.text}!',
         },
         fetch: {
             name: {
-                type: "document",
+                type: 'document',
                 query: {
-                    lang: "${lang}", greeting: false
+                    lang: '${lang}',
+                    greeting: false,
                 },
                 limit: 1,
             },
             greeting: {
-                type: "document",
+                type: 'document',
                 query: {
-                    lang: "${lang}", greeting: true
+                    lang: '${lang}',
+                    greeting: true,
                 },
                 limit: 1,
-            }
+            },
         },
     },
-]
+];
 
 // ========== test env setup ==========
 
-
 describe('DSL Workflow', () => {
-
     let testEnv: TestWorkflowEnvironment;
     let workflowBundle: WorkflowBundleWithSourceMap;
 
@@ -90,7 +93,7 @@ describe('DSL Workflow', () => {
         await testEnv?.teardown();
     });
 
-    it('successfully completes a mock workflow', async () => {
+    it('should successfully complete a mock workflow', async () => {
         const { client, nativeConnection } = testEnv;
         const taskQueue = 'test';
 
@@ -110,32 +113,31 @@ describe('DSL Workflow', () => {
             account_id: '123',
             project_id: '123',
             wf_rule_name: 'test',
-            auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
+            auth_token:
+                process.env.VERTESIA_KEY ||
+                'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
-                studio_url: process.env.CP_STUDIO_URL || "http://localhost:8081",
-                store_url: process.env.CP_STORE_URL || "http://localhost:8082",
+                studio_url: process.env.CP_STUDIO_URL || 'http://localhost:8081',
+                store_url: process.env.CP_STORE_URL || 'http://localhost:8082',
             },
             workflow: {
+                spec_format: 'activities',
                 activities,
                 vars: {
                     lang,
                 },
                 name: 'test',
-            }
-        }
+            },
+        };
 
-        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
-            args: [payload],
-            workflowId: 'test',
-            taskQueue,
-        }));
+        const result = await worker.runUntil(
+            client.workflow.execute(dslWorkflow, {
+                args: [payload],
+                workflowId: 'test',
+                taskQueue,
+            }),
+        );
 
         expect(result).toBe('Hello, World!');
-
     });
-
-
-
-
-
 });

package/src/dsl/workflow-import.test.ts

@@ -1,32 +1,33 @@
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
-import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload } from '@vertesia/common';
+import { bundleWorkflowCode, Worker, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
+import {
+    ContentEventName,
+    type DSLActivityExecutionPayload,
+    type DSLActivitySpec,
+    type DSLWorkflowExecutionPayload,
+} from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
-import { setupActivity } from "./setup/ActivityContext.js";
+import { setupActivity } from './setup/ActivityContext.js';
 
-
-async function testImportedVars(payload: DSLActivityExecutionPayload<Record<string, any>>) {
+async function testImportedVars(payload: DSLActivityExecutionPayload<Record<string, unknown>>) {
     const { params } = await setupActivity(payload);
     if (!params.object_name) throw new Error('object_name is required');
     console.log('!!!!!!!!!!@@@@@@@@@@@@@@!!!!!!!!!!!!!!', params.object_name);
     return params.object_name;
 }
 
-
 const activities: DSLActivitySpec[] = [
     {
         name: 'testImportedVars',
-        import: ["object_name"],
+        import: ['object_name'],
         output: 'result',
     },
-]
+];
 
 // ========== test env setup ==========
 
-
 describe('DSL Workflow import vars', () => {
-
     let testEnv: TestWorkflowEnvironment;
     let workflowBundle: WorkflowBundleWithSourceMap;
 
@@ -41,10 +42,7 @@ describe('DSL Workflow import vars', () => {
         await testEnv?.teardown();
     });
 
-
-    it('import vars are part of activity params', async () => {
-
-
+    it('should include import vars in activity params', async () => {
         const { client, nativeConnection } = testEnv;
         const taskQueue = 'test';
 
@@ -64,29 +62,31 @@ describe('DSL Workflow import vars', () => {
             account_id: '123',
             project_id: '123',
             wf_rule_name: 'test',
-            auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
+            auth_token:
+                process.env.VERTESIA_KEY ||
+                'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
-                studio_url: process.env.CP_STUDIO_URL || "http://localhost:8081",
-                store_url: process.env.CP_STORE_URL || "http://localhost:8082",
+                studio_url: process.env.CP_STUDIO_URL || 'http://localhost:8081',
+                store_url: process.env.CP_STORE_URL || 'http://localhost:8082',
             },
             workflow: {
+                spec_format: 'activities',
                 activities,
                 vars: {
                     object_name,
                 },
                 name: 'test',
-            }
-        }
+            },
+        };
 
-        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
-            args: [payload],
-            workflowId: 'test',
-            taskQueue,
-        }));
+        const result = await worker.runUntil(
+            client.workflow.execute(dslWorkflow, {
+                args: [payload],
+                workflowId: 'test',
+                taskQueue,
+            }),
+        );
 
         expect(result).toBe(object_name);
-
     });
-
-
 });

package/src/dsl/workflow.test.ts

@@ -1,54 +1,56 @@
 import * as protos from '@temporalio/proto';
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
-import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload } from '@vertesia/common';
+import { bundleWorkflowCode, Worker, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
+import {
+    ContentEventName,
+    type DSLActivityExecutionPayload,
+    type DSLActivitySpec,
+    type DSLWorkflowExecutionPayload,
+} from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
-import { setupActivity } from "./setup/ActivityContext.js";
+import { setupActivity } from './setup/ActivityContext.js';
 
-async function sayHello(payload: DSLActivityExecutionPayload<Record<string, any>>): Promise<string> {
+async function sayHello(payload: DSLActivityExecutionPayload<Record<string, unknown>>): Promise<string> {
     const { params } = await setupActivity(payload);
-    return params.lang === 'fr' ? "Bonjour" : "Hello";
+    return params.lang === 'fr' ? 'Bonjour' : 'Hello';
 }
 
-async function sayName(payload: DSLActivityExecutionPayload<Record<string, any>>): Promise<string> {
+async function sayName(payload: DSLActivityExecutionPayload<Record<string, unknown>>): Promise<string> {
     const { params } = await setupActivity(payload);
-    return params.lang === 'fr' ? "Monde" : "World";
+    return params.lang === 'fr' ? 'Monde' : 'World';
 }
 
-async function sayGreeting(payload: DSLActivityExecutionPayload<Record<string, any>>): Promise<string> {
+async function sayGreeting(payload: DSLActivityExecutionPayload<Record<string, unknown>>): Promise<string> {
     const { params } = await setupActivity(payload);
     return `${params.hello}, ${params.name}!`;
 }
 
-
 const activities: DSLActivitySpec[] = [
     {
         name: 'sayHello',
         output: 'hello',
-        import: ["lang"],
+        import: ['lang'],
     },
     {
         name: 'sayName',
         output: 'name',
-        import: ["lang"],
+        import: ['lang'],
     },
     {
         name: 'sayGreeting',
-        import: ["hello", "name"],
+        import: ['hello', 'name'],
         condition: {
             hello: { $null: false },
-            name: { $null: false }
+            name: { $null: false },
         },
         output: 'result',
     },
-]
+];
 
 // ========== test env setup ==========
 
-
 describe('DSL Workflow', () => {
-
     let testEnv: TestWorkflowEnvironment;
     let workflowBundle: WorkflowBundleWithSourceMap;
 
@@ -74,7 +76,7 @@ describe('DSL Workflow', () => {
         await testEnv?.teardown();
     });
 
-    it('successfully completes a mock workflow', async () => {
+    it('should successfully complete a mock workflow', async () => {
         const { client, nativeConnection } = testEnv;
         const taskQueue = 'test';
 
@@ -94,32 +96,31 @@ describe('DSL Workflow', () => {
             account_id: '123',
             project_id: '123',
             wf_rule_name: 'test',
-            auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
+            auth_token:
+                process.env.VERTESIA_KEY ||
+                'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
-                studio_url: process.env.CP_STUDIO_URL || "http://localhost:8081",
-                store_url: process.env.CP_STORE_URL || "http://localhost:8082",
+                studio_url: process.env.CP_STUDIO_URL || 'http://localhost:8081',
+                store_url: process.env.CP_STORE_URL || 'http://localhost:8082',
             },
             workflow: {
+                spec_format: 'activities',
                 activities,
                 vars: {
                     lang,
                 },
                 name: 'test',
-            }
-        }
+            },
+        };
 
-        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
-            args: [payload],
-            workflowId: 'test',
-            taskQueue,
-        }));
+        const result = await worker.runUntil(
+            client.workflow.execute(dslWorkflow, {
+                args: [payload],
+                workflowId: 'test',
+                taskQueue,
+            }),
+        );
 
         expect(result).toBe('Bonjour, Monde!');
-
     });
-
-
-
-
-
 });

package/src/dsl.ts

@@ -1,4 +1,3 @@
-export * from "./dsl/dslProxyActivities.js";
-export * from "./errors.js";
-export * from "./result-types.js";
-
+export * from './dsl/dslProxyActivities.js';
+export * from './errors.js';
+export * from './result-types.js';