@o-lang/olang 1.2.32 → 1.2.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o-lang/olang",
-  "version": "1.2.32",
+  "version": "1.2.34",
   "author": "Olalekan Ogundipe <info@olang.cloud>",
   "description": "O-Lang: A governance language for user-directed, rule-enforced agent workflows",
   "main": "./src/runtime/index.js",

package/src/parser/index.js

@@ -427,16 +427,23 @@ function parseWorkflowLines(lines, filename) {
     }
 
     // ✅ ADD: Return keyword support (ensures wf.returnValues is populated)
-    const returnMatch = line.match(/^Return\s+(.+)$/i);
-    if (returnMatch) {
-      flushCurrentStep();
-      workflow.returnValues = returnMatch[1]
-        .split(',')
-        .map(r => r.trim())
-        .filter(r => r !== '');
-      continue;
-    }
-
+// ✅ ADD: Return keyword support (with debug logging)
+const returnMatch = line.match(/^Return\s+(.+)$/i);
+if (returnMatch) {
+  flushCurrentStep();
+  const rawReturns = returnMatch[1];
+  console.log(`[PARSER DEBUG] Return line: "${line}"`);
+  console.log(`[PARSER DEBUG] Return match[1]: "${rawReturns}"`);
+  console.log(`[PARSER DEBUG] Return match[1] char codes: ${Array.from(rawReturns).map(c => c.charCodeAt(0))}`);
+  
+  workflow.returnValues = rawReturns
+    .split(',')
+    .map(r => r.trim())
+    .filter(r => r !== '');
+    
+  console.log(`[PARSER DEBUG] Parsed returnValues: ${JSON.stringify(workflow.returnValues)}`);
+  continue;
+}
     // Fallback: treat as action
     if (line.trim() !== '') {
       if (!currentStep) {

package/src/runtime/RuntimeAPI.js

@@ -1258,9 +1258,14 @@ const forbiddenPatterns = [
       throw new Error(errorMessage);
     };
 
-    switch (stepType) {
+      switch (stepType) {
       case 'calculate': {
-        const result = this.evaluateMath(step.expression || step.actionRaw);
+        // ✅ Interpolate variables in the expression before evaluation
+        let expr = step.expression || step.actionRaw;
+        if (typeof expr === 'string' && expr.includes('{')) {
+          expr = this._safeInterpolate(expr, this.context, 'calculate step');
+        }
+        const result = this.evaluateMath(expr);
         if (step.saveAs) this.context[step.saveAs] = result;
         break;
       }