@vertesia/workflow 1.1.1-dev.20260505.163000Z → 1.3.0-dev.20260620.061059Z

package/lib/{esm/dsl → dsl}/dsl-workflow.js

@@ -1,10 +1,10 @@
-import { CancellationScope, executeChild, isCancellation, log, patched, proxyActivities, sleep, startChild, } from "@temporalio/workflow";
-import { getDocumentIds, getTenantId } from "@vertesia/common";
+import { CancellationScope, executeChild, isCancellation, log, patched, proxyActivities, sleep, startChild, uuid4, } from '@temporalio/workflow';
+import { getDocumentIds, getTenantId, } from '@vertesia/common';
 import ms from 'ms';
-import { WF_NON_RETRYABLE_ERRORS, WorkflowParamNotFoundError } from "../errors.js";
-import { Vars } from "./vars.js";
+import { WF_NON_RETRYABLE_ERRORS, WorkflowParamNotFoundError } from '../errors.js';
+import { Vars } from './vars.js';
 /** Prefix identifying a remote activity name in DSL workflow steps */
-const REMOTE_ACTIVITY_PREFIX = "app:";
+const REMOTE_ACTIVITY_PREFIX = 'app:';
 function dslActivityPayload(basePayload, activity, params) {
     return {
         ...basePayload,
@@ -15,18 +15,18 @@ function dslActivityPayload(basePayload, activity, params) {
 export async function dslWorkflow(payload) {
     const definition = payload.workflow;
     if (!definition) {
-        throw new WorkflowParamNotFoundError("workflow");
+        throw new WorkflowParamNotFoundError('workflow');
     }
     // Normalize input: convert legacy objectIds format to new input format
     if (!payload.input && payload.objectIds) {
         payload.input = {
             inputType: 'objectIds',
-            objectIds: payload.objectIds
+            objectIds: payload.objectIds,
         };
     }
     // Validate that workflow has input
     if (!payload.input && !payload.objectIds) {
-        throw new WorkflowParamNotFoundError("input", definition);
+        throw new WorkflowParamNotFoundError('input', definition);
     }
     // the base payload will be used to create the activities payload
     const basePayload = {
@@ -37,7 +37,7 @@ export async function dslWorkflow(payload) {
     delete basePayload.workflow;
     const defaultOptions = {
         ...convertDSLActivityOptions(definition.options),
-        startToCloseTimeout: "5 minute",
+        startToCloseTimeout: '5 minute',
         retry: {
             initialInterval: '10s',
             backoffCoefficient: 2,
@@ -46,11 +46,11 @@ export async function dslWorkflow(payload) {
             nonRetryableErrorTypes: WF_NON_RETRYABLE_ERRORS,
         },
     };
-    log.debug("Global activity options", {
+    log.debug('Global activity options', {
         activityOptions: defaultOptions,
     });
     const defaultProxy = proxyActivities(defaultOptions);
-    log.debug("Default activity proxy is ready");
+    log.debug('Default activity proxy is ready');
     // Merge default vars with the payload vars and add input variables
     const inputType = payload.input?.inputType || 'objectIds';
     // Extract objectIds and files based on input type
@@ -76,22 +76,24 @@ export async function dslWorkflow(payload) {
         files,
         file: files[0],
     });
-    log.info("Executing workflow", { payload });
+    log.debug('Executing workflow', { payload });
     // Resolve remote activities from installed apps only if the workflow uses prefixed activity names
     let remoteActivities = {};
     if (patched('dsl-remote-activities') && hasRemoteActivitySteps(definition)) {
         try {
             const resolvePayload = dslActivityPayload(basePayload, { name: 'resolveRemoteActivities' }, {});
-            remoteActivities = await defaultProxy.resolveRemoteActivities(resolvePayload);
+            remoteActivities = (await defaultProxy.resolveRemoteActivities(resolvePayload));
             if (Object.keys(remoteActivities).length > 0) {
-                log.info("Resolved remote activities", {
+                log.debug('Resolved remote activities', {
                     count: Object.keys(remoteActivities).length,
                     names: Object.keys(remoteActivities),
                 });
             }
         }
         catch (e) {
-            log.warn("Failed to resolve remote activities, continuing without them", { error: e.message });
+            log.warn('Failed to resolve remote activities, continuing without them', {
+                error: e instanceof Error ? e.message : String(e),
+            });
         }
     }
     // TODO(mhuang): remove patch when all workflows are migrated to v2
@@ -126,18 +128,20 @@ async function executeSteps(definition, payload, basePayload, vars, defaultProxy
                     await executeChildWorkflow(childWorkflowStep, payload, vars, basePayload.debug_mode, defaultProxy, basePayload);
                 }
             }
-            else { // activity
+            else {
+                // activity
                 await runActivity(step, basePayload, vars, defaultProxy, defaultOptions, remoteActivities);
             }
         }
     }
-    else if (definition.activities) { // legacy support
+    else if (definition.activities) {
+        // legacy support
         for (const activity of definition.activities) {
             await runActivity(activity, basePayload, vars, defaultProxy, defaultOptions, remoteActivities);
         }
     }
     else {
-        throw new Error("No steps or activities found in the workflow definition");
+        throw new Error('No steps or activities found in the workflow definition');
     }
 }
 /**
@@ -147,16 +151,19 @@ async function executeSteps(definition, payload, basePayload, vars, defaultProxy
  */
 function hasRemoteActivitySteps(definition) {
     const steps = definition.steps || definition.activities || [];
-    return steps.some(step => 'name' in step && step.name?.startsWith(REMOTE_ACTIVITY_PREFIX));
+    return steps.some((step) => 'name' in step && step.name?.startsWith(REMOTE_ACTIVITY_PREFIX));
 }
 async function handleError(originalError, basePayload, defaultOptions) {
     const { handleDslError } = proxyActivities(defaultOptions);
+    const errorMessage = originalError instanceof Error ? originalError.message : String(originalError);
     const payload = dslActivityPayload(basePayload, {
-        name: "handleDslError",
-        params: { errorMessage: originalError.message },
-    }, { errorMessage: originalError.message });
+        name: 'handleDslError',
+        params: { errorMessage },
+    }, { errorMessage });
     if (isCancellation(originalError)) {
-        log.warn(`Workflow execution cancelled, executing error handler to update document status`, { error: originalError });
+        log.warn(`Workflow execution cancelled, executing error handler to update document status`, {
+            error: originalError,
+        });
         // Cleanup logic must be in a nonCancellable scope
         // If we'd run cleanup outside of a nonCancellable scope it would've been cancelled
         // before being started because the Workflow's root scope is cancelled.
@@ -164,23 +171,29 @@ async function handleError(originalError, basePayload, defaultOptions) {
         await CancellationScope.nonCancellable(() => handleDslError(payload));
     }
     else {
-        log.warn(`Workflow execution failed, executing error handler to update document status`, { error: originalError });
+        log.warn(`Workflow execution failed, executing error handler to update document status`, {
+            error: originalError,
+        });
         await handleDslError(payload);
     }
     throw originalError;
 }
 async function startChildWorkflow(step, payload, vars, debug_mode, proxy, basePayload) {
     if (step.condition && !vars.match(step.condition)) {
-        log.info("Child workflow skipped: condition not satisfied", { workflow: step.name, condition: step.condition });
+        log.debug('Child workflow skipped: condition not satisfied', {
+            workflow: step.name,
+            condition: step.condition,
+        });
         return;
     }
     if (step.name.startsWith('dsl:') && !step.spec && proxy && basePayload) {
         const workflowName = step.name.slice(4);
-        const specPayload = dslActivityPayload(basePayload, { name: 'loadChildWorkflowSpec' }, { workflowName });
-        const spec = await proxy.loadChildWorkflowSpec(specPayload);
+        const specPayload = dslActivityPayload(basePayload, { name: 'loadChildWorkflowSpec' }, {
+            workflowName,
+        });
+        const spec = (await proxy.loadChildWorkflowSpec(specPayload));
         const humanName = spec.name.replace(/([A-Z])/g, ' $1').trim();
-        const objectIds = getDocumentIds(payload);
-        const workflowId = objectIds.length > 0 ? `${humanName}:${objectIds[0]}` : humanName;
+        const workflowId = `${humanName}:${uuid4()}`;
         step = { ...step, name: 'dslWorkflow', spec, options: { ...step.options, workflowId } };
     }
     const resolvedVars = vars.resolve();
@@ -194,11 +207,13 @@ async function startChildWorkflow(step, payload, vars, debug_mode, proxy, basePa
     }
     const handle = await startChild(step.name, {
         ...step.options,
-        args: [{
+        args: [
+            {
                 ...payload,
                 workflow: step.spec,
                 vars: resolvedVars,
-            }],
+            },
+        ],
         memo: {
             InitiatedBy: payload.initiated_by,
         },
@@ -216,16 +231,20 @@ async function startChildWorkflow(step, payload, vars, debug_mode, proxy, basePa
 }
 async function executeChildWorkflow(step, payload, vars, debug_mode, proxy, basePayload) {
     if (step.condition && !vars.match(step.condition)) {
-        log.info("Child workflow skipped: condition not satisfied", { workflow: step.name, condition: step.condition });
+        log.debug('Child workflow skipped: condition not satisfied', {
+            workflow: step.name,
+            condition: step.condition,
+        });
         return;
     }
     if (step.name.startsWith('dsl:') && !step.spec && proxy && basePayload) {
         const workflowName = step.name.slice(4);
-        const specPayload = dslActivityPayload(basePayload, { name: 'loadChildWorkflowSpec' }, { workflowName });
-        const spec = await proxy.loadChildWorkflowSpec(specPayload);
+        const specPayload = dslActivityPayload(basePayload, { name: 'loadChildWorkflowSpec' }, {
+            workflowName,
+        });
+        const spec = (await proxy.loadChildWorkflowSpec(specPayload));
         const humanName = spec.name.replace(/([A-Z])/g, ' $1').trim();
-        const objectIds = getDocumentIds(payload);
-        const workflowId = objectIds.length > 0 ? `${humanName}:${objectIds[0]}` : humanName;
+        const workflowId = `${humanName}:${uuid4()}`;
         step = { ...step, name: 'dslWorkflow', spec, options: { ...step.options, workflowId } };
     }
     const resolvedVars = vars.resolve();
@@ -239,11 +258,13 @@ async function executeChildWorkflow(step, payload, vars, debug_mode, proxy, base
     }
     const result = await executeChild(step.name, {
         ...step.options,
-        args: [{
+        args: [
+            {
                 ...payload,
                 workflow: step.spec,
                 vars: resolvedVars,
-            }],
+            },
+        ],
         memo: {
             InitiatedBy: payload.initiated_by,
         },
@@ -273,25 +294,32 @@ function buildRateLimitParams(activity, executionPayload) {
     });
     const params = vars.resolve();
     let interactionId;
+    const interactionName = typeof params.interactionName === 'string' ? params.interactionName : undefined;
+    const interactionNames = params.interactionNames && typeof params.interactionNames === 'object'
+        ? params.interactionNames
+        : undefined;
     switch (activity.name) {
-        case "executeInteraction":
-            interactionId = params.interactionName;
+        case 'executeInteraction':
+            interactionId = interactionName || '';
             break;
-        case "generateDocumentProperties":
-            interactionId = params.interactionName || "sys:ExtractInformation";
+        case 'generateDocumentProperties':
+            interactionId = interactionName || 'sys:ExtractInformation';
             break;
-        case "identifyTextSections":
-            interactionId = params.interactionName || "sys:IdentifyTextSections";
+        case 'identifyTextSections':
+            interactionId = interactionName || 'sys:IdentifyTextSections';
             break;
-        case "generateOrAssignContentType":
-            interactionId = params.interactionNames?.selectDocumentType || "sys:SelectDocumentType";
+        case 'generateOrAssignContentType':
+            interactionId =
+                typeof interactionNames?.selectDocumentType === 'string'
+                    ? interactionNames.selectDocumentType
+                    : 'sys:SelectDocumentType';
             break;
-        case "chunkDocument":
-            interactionId = params.interactionName || "sys:ChunkDocument";
+        case 'chunkDocument':
+            interactionId = interactionName || 'sys:ChunkDocument';
             break;
         default:
             // For any other rate-limited activities, try to extract what we can
-            interactionId = params.interactionName;
+            interactionId = interactionName || '';
             break;
     }
     if (!interactionId) {
@@ -299,8 +327,8 @@ function buildRateLimitParams(activity, executionPayload) {
     }
     return {
         interactionIdOrEndpoint: interactionId,
-        environmentId: params.environment,
-        modelId: params.model,
+        environmentId: typeof params.environment === 'string' ? params.environment : undefined,
+        modelId: typeof params.model === 'string' ? params.model : undefined,
     };
 }
 async function runActivity(activity, basePayload, vars, defaultProxy, defaultOptions, remoteActivities = {}) {
@@ -308,23 +336,23 @@ async function runActivity(activity, basePayload, vars, defaultProxy, defaultOpt
         log.debug(`Workflow vars before executing activity ${activity.name}`, { vars: vars.resolve() });
     }
     if (activity.condition && !vars.match(activity.condition)) {
-        log.info("Activity skipped: condition not satisfied", activity.condition);
+        log.debug('Activity skipped: condition not satisfied', activity.condition);
         return;
     }
     const importParams = vars.createImportVars(activity.import);
     const executionPayload = dslActivityPayload(basePayload, activity, importParams);
-    log.debug("Executing activity: " + activity.name, { payload: executionPayload });
+    log.debug(`Executing activity: ${activity.name}`, { payload: executionPayload });
     let proxy = defaultProxy;
     if (activity.options) {
         const options = computeActivityOptions(activity.options, defaultOptions);
-        log.debug("Use custom activity options", {
+        log.debug('Use custom activity options', {
             activityName: activity.name,
             activityOptions: options,
         });
         proxy = proxyActivities(options);
     }
     else {
-        log.debug("Use default activity options", {
+        log.debug('Use default activity options', {
             activityName: activity.name,
             activityOptions: defaultOptions,
         });
@@ -340,7 +368,7 @@ async function runActivity(activity, basePayload, vars, defaultProxy, defaultOpt
                 `Available: ${Object.keys(remoteActivities).join(', ') || '(none resolved)'}`);
         }
         const remote = remoteActivities[activity.name];
-        log.info("Executing remote activity", {
+        log.debug('Executing remote activity', {
             activityName: activity.name,
             remoteName: remote.activity_name,
             app: remote.app_name,
@@ -367,11 +395,11 @@ async function runActivity(activity, basePayload, vars, defaultProxy, defaultOpt
     }
     // call rate limiter depending on the activity type
     const rateLimitedActivities = [
-        "chunkDocument",
-        "executeInteraction",
-        "generateDocumentProperties",
-        "generateOrAssignContentType",
-        "identifyTextSections",
+        'chunkDocument',
+        'executeInteraction',
+        'generateDocumentProperties',
+        'generateOrAssignContentType',
+        'identifyTextSections',
     ];
     if (activity.name && rateLimitedActivities.includes(activity.name)) {
         log.debug(`Applying rate limit for activity ${activity.name}`);
@@ -390,10 +418,10 @@ async function runActivity(activity, basePayload, vars, defaultProxy, defaultOpt
     const fn = proxy[activity.name];
     if (activity.parallel) {
         //TODO execute in parallel
-        log.info("Parallel execution not yet implemented");
+        log.debug('Parallel execution not yet implemented');
     }
     else {
-        log.debug("Executing activity: " + activity.name, { importParams });
+        log.debug(`Executing activity: ${activity.name}`, { importParams });
         const result = await fn(executionPayload);
         if (activity.output) {
             vars.setValue(activity.output, result);
@@ -411,14 +439,14 @@ export function computeActivityOptions(customOptions, defaultOptions) {
         retry: {
             ...defaultOptions.retry,
             ...options.retry,
-        }
+        },
     };
 }
 function convertDSLActivityOptions(options) {
     if (!options) {
         return {};
     }
-    let result = {};
+    const result = {};
     if (options.startToCloseTimeout) {
         result.startToCloseTimeout = ms(options.startToCloseTimeout);
     }

package/lib/dsl/dsl-workflow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dsl-workflow.js","sourceRoot":"","sources":["../../src/dsl/dsl-workflow.ts"],"names":[],"mappings":"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"}

package/lib/dsl/dslProxyActivities.d.ts

@@ -0,0 +1,7 @@
+import { type ActivityOptions } from '@temporalio/workflow';
+import type { DSLActivityExecutionPayload, WorkflowExecutionBaseParams } from '@vertesia/common';
+export type DslActivityFunction<ParamsT extends object = Record<string, unknown>, ReturnT = unknown> = (payload: DSLActivityExecutionPayload<ParamsT>) => Promise<ReturnT>;
+export type DslSimplifiedActivityFunction<ParamsT extends object = Record<string, unknown>, ReturnT = unknown> = (payload: WorkflowExecutionBaseParams<unknown>, params: ParamsT) => Promise<ReturnT>;
+export declare function stripWorkflowContinuationFromVars<T>(vars: T): T;
+export declare function dslProxyActivities<ActivitiesT extends object>(workflowName: string, options?: ActivityOptions): { [K in keyof ActivitiesT]: ActivitiesT[K] extends DslActivityFunction<infer ParamsT extends object, infer ReturnT> ? DslSimplifiedActivityFunction<ParamsT, ReturnT> : never; };
+//# sourceMappingURL=dslProxyActivities.d.ts.map

package/lib/dsl/dslProxyActivities.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dslProxyActivities.d.ts","sourceRoot":"","sources":["../../src/dsl/dslProxyActivities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EACR,2BAA2B,EAC3B,2BAA2B,EAE9B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,IAAI,CACnG,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,KAC5C,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,MAAM,MAAM,6BAA6B,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,IAAI,CAC7G,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,EAC7C,MAAM,EAAE,OAAO,KACd,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,wBAAgB,iCAAiC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAQ/D;AAED,wBAAgB,kBAAkB,CAAC,WAAW,SAAS,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,MAEzG,CAAC,yEAAyE,OAAO,uBAAQ,OAAO,+DA6BxG"}

package/lib/{esm/dsl → dsl}/dslProxyActivities.js

@@ -1,4 +1,12 @@
-import { proxyActivities } from "@temporalio/workflow";
+import { proxyActivities } from '@temporalio/workflow';
+export function stripWorkflowContinuationFromVars(vars) {
+    if (!vars || typeof vars !== 'object' || Array.isArray(vars) || !('_continuation' in vars)) {
+        return vars;
+    }
+    const rest = { ...vars };
+    delete rest._continuation;
+    return rest;
+}
 export function dslProxyActivities(workflowName, options = {}) {
     const activities = proxyActivities(options);
     return new Proxy({}, {
@@ -7,6 +15,7 @@ export function dslProxyActivities(workflowName, options = {}) {
             return (payload, params) => {
                 return activityFn({
                     ...payload,
+                    vars: stripWorkflowContinuationFromVars(payload.vars),
                     activity: {
                         name: prop,
                     },

package/lib/dsl/dslProxyActivities.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dslProxyActivities.js","sourceRoot":"","sources":["../../src/dsl/dslProxyActivities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAgB7E,MAAM,UAAU,iCAAiC,CAAI,IAAO;IACxD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,eAAe,IAAI,IAAI,CAAC,EAAE,CAAC;QACzF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,IAAI,GAAG,EAAE,GAAI,IAAgC,EAAE,CAAC;IACtD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC1B,OAAO,IAAS,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAA6B,YAAoB,EAAE,UAA2B,EAAE;IAO9G,MAAM,UAAU,GAAG,eAAe,CAAc,OAAO,CAAgB,CAAC;IAExE,OAAO,IAAI,KAAK,CACZ,EAAE,EACF;QACI,GAAG,CAAC,OAAO,EAAE,IAAI;YACb,MAAM,UAAU,GAAG,UAAU,CAAC,IAAyB,CAGtD,CAAC;YACF,OAAO,CAAC,OAAiC,EAAE,MAA+B,EAAE,EAAE;gBAC1E,OAAO,UAAU,CAAC;oBACd,GAAG,OAAO;oBACV,IAAI,EAAE,iCAAiC,CAAC,OAAO,CAAC,IAAI,CAAC;oBACrD,QAAQ,EAAE;wBACN,IAAI,EAAE,IAAc;qBACvB;oBACD,aAAa,EAAE,YAAY;oBAC3B,MAAM;iBACT,CAAC,CAAC;YACP,CAAC,CAAC;QACN,CAAC;KACJ,CACwB,CAAC;AAClC,CAAC"}

package/lib/dsl/projections.d.ts

@@ -0,0 +1,4 @@
+import type { DSLActivityExecutionPayload } from '@vertesia/common';
+export declare function projectResult<TParams extends object>(payload: DSLActivityExecutionPayload<TParams>, params: TParams, result: unknown, fallback: unknown): unknown;
+export declare function makeProjection(spec: Record<string, unknown>, params: Record<string, unknown>, result: unknown): Record<string, unknown>;
+//# sourceMappingURL=projections.d.ts.map

package/lib/dsl/projections.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"projections.d.ts","sourceRoot":"","sources":["../../src/dsl/projections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAkEpE,wBAAgB,aAAa,CAAC,OAAO,SAAS,MAAM,EAChD,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,EAC7C,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,WAKpB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,2BAc7G"}

package/lib/{esm/dsl → dsl}/projections.js

@@ -1,12 +1,24 @@
-import { matchCondition } from "./conditions.js";
-import { Vars } from "./vars.js";
+import { matchCondition } from './conditions.js';
+import { Vars } from './vars.js';
+function isRecord(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function asRecord(value) {
+    return value;
+}
+function isElementOperation(value) {
+    return isRecord(value) && Array.isArray(value.from) && isRecord(value.where);
+}
 const operations = {
     $element(arg, _vars) {
+        if (!isElementOperation(arg)) {
+            return undefined;
+        }
         const where = arg.where;
         const whereKeys = Object.keys(where);
         const r = arg.from.find((elem) => {
             for (const key of whereKeys) {
-                const value = key === '_' ? elem : elem[key];
+                const value = key === '_' ? elem : isRecord(elem) ? elem[key] : undefined;
                 if (matchCondition(value, where[key])) {
                     return true;
                 }
@@ -14,18 +26,18 @@ const operations = {
             return false;
         });
         if (arg.field) {
-            return r ? r[arg.field] : arg.else;
+            return isRecord(r) ? r[arg.field] : arg.else;
         }
         else {
             return r || arg.else;
         }
     },
     $eval(arg, vars) {
-        return vars.match(arg);
-    }
+        return isRecord(arg) ? vars.match(arg) : false;
+    },
 };
 function runProjection(obj, vars) {
-    if (obj && !Array.isArray(obj) && typeof obj === "object") {
+    if (isRecord(obj)) {
         const keys = Object.keys(obj);
         if (keys.length === 1) {
             const key = keys[0];
@@ -38,7 +50,9 @@ function runProjection(obj, vars) {
     return obj; // return the value as is
 }
 export function projectResult(payload, params, result, fallback) {
-    return payload.activity.projection ? makeProjection(payload.activity.projection, params, result) : fallback;
+    return payload.activity.projection
+        ? makeProjection(payload.activity.projection, asRecord(params), result)
+        : fallback;
 }
 export function makeProjection(spec, params, result) {
     const vars = new Vars({

package/lib/dsl/projections.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projections.js","sourceRoot":"","sources":["../../src/dsl/projections.ts"],"names":[],"mappings":"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"}

package/lib/{types/dsl → dsl}/setup/ActivityContext.d.ts

@@ -1,6 +1,6 @@
-import { VertesiaClient } from "@vertesia/client";
-import { DSLActivityExecutionPayload, Project, WorkflowInputType, WorkflowInputFile } from "@vertesia/common";
-export declare class ActivityContext<ParamsT extends Record<string, any>> {
+import type { VertesiaClient } from '@vertesia/client';
+import type { DSLActivityExecutionPayload, Project, WorkflowInputFile, WorkflowInputType } from '@vertesia/common';
+export declare class ActivityContext<ParamsT extends object> {
     payload: DSLActivityExecutionPayload<ParamsT>;
     params: ParamsT;
     client: VertesiaClient;
@@ -43,5 +43,5 @@ export declare class ActivityContext<ParamsT extends Record<string, any>> {
     get inputs(): string[];
     fetchProject(): Promise<Project | undefined>;
 }
-export declare function setupActivity<ParamsT extends Record<string, any>>(payload: DSLActivityExecutionPayload<ParamsT>): Promise<ActivityContext<ParamsT>>;
+export declare function setupActivity<ParamsT extends object>(payload: DSLActivityExecutionPayload<ParamsT>): Promise<ActivityContext<ParamsT>>;
 //# sourceMappingURL=ActivityContext.d.ts.map

package/lib/dsl/setup/ActivityContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ActivityContext.d.ts","sourceRoot":"","sources":["../../../src/dsl/setup/ActivityContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EACR,2BAA2B,EAE3B,OAAO,EAEP,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,kBAAkB,CAAC;AAa1B,qBAAa,eAAe,CAAC,OAAO,SAAS,MAAM;IAKpC,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC;IAE7C,MAAM,EAAE,OAAO;IAN1B,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;gBAG7B,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,EACpD,MAAM,EAAE,cAAc,EACf,MAAM,EAAE,OAAO;IAM1B,IAAI,SAAS,yBAEZ;IAED,IAAI,QAAQ,WAUX;IAED,IAAI,YAAY,wCAEf;IAED,IAAI,KAAK,WAUR;IAED,IAAI,UAAU,WAUb;IAED;;;OAGG;IACH,IAAI,SAAS,IAAI,iBAAiB,CAEjC;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,iBAAiB,CAe5B;IAED;;;;OAIG;IACH,IAAI,KAAK,IAAI,iBAAiB,EAAE,CAO/B;IAED;;;;OAIG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,MAAM,EAAE,CAErB;IAED,YAAY;CAMf;AAED,wBAAsB,aAAa,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,qCAkExG"}