@o-lang/olang 1.2.30 → 1.2.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o-lang/olang",
-  "version": "1.2.30",
+  "version": "1.2.32",
   "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

@@ -305,7 +305,7 @@ function parseWorkflowLines(lines, filename) {
       continue;
     }
 
-       // ✅ ADD: Set keyword (e.g., Set analysis_result = "")
+    // ✅ ADD: Set keyword (e.g., Set analysis_result = "")
     const setMatch = line.match(/^Set\s+(\w+)\s*=\s*(.+)$/i);
     if (setMatch) {
       flushCurrentStep();
@@ -399,38 +399,41 @@ function parseWorkflowLines(lines, filename) {
     }
 
     // Ask (for Notify/resolver calls) - ✅ PRESERVE TARGET EXACTLY (NO NORMALIZATION)
-const askMatch = line.match(/^Ask\s+(.+)$/i);
-if (askMatch) {
-  flushCurrentStep();
-  let actionContent = askMatch[1].trim();
-
-  // ✅ Multiline heredoc support: Ask llm-groq """
-  if (actionContent.endsWith('"""')) {
-    // Consume lines until closing """
-    let multiline = actionContent.slice(0, -3).trim() + ' ';
-    while (i < lines.length) {
-      const nextLine = lines[i++].trim();
-      if (nextLine === '"""') break;
-      multiline += nextLine + ' ';
-    }
-    actionContent = multiline.trim();
-  }
+    const askMatch = line.match(/^Ask\s+(.+)$/i);
+    if (askMatch) {
+      flushCurrentStep();
+      let actionContent = askMatch[1].trim();
+
+      // ✅ Multiline heredoc support: Ask llm-groq """
+      if (actionContent.endsWith('"""')) {
+        // Consume lines until closing """
+        let multiline = actionContent.slice(0, -3).trim() + ' ';
+        while (i < lines.length) {
+          const nextLine = lines[i++].trim();
+          if (nextLine === '"""') break;
+          multiline += nextLine + ' ';
+        }
+        actionContent = multiline.trim();
+      }
 
-  workflow.steps.push({
-    type: 'action',
-    actionRaw: `Action ${actionContent}`,
-    stepNumber: workflow.steps.length + 1,
-    saveAs: null,
-    constraints: {}
-  });
-  continue;
-}
+      workflow.steps.push({
+        type: 'action',
+        actionRaw: `Action ${actionContent}`,
+        stepNumber: workflow.steps.length + 1,
+        saveAs: null,
+        constraints: {}
+      });
+      continue;
+    }
 
-    // Return
+    // ✅ 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 !== '');
+      workflow.returnValues = returnMatch[1]
+        .split(',')
+        .map(r => r.trim())
+        .filter(r => r !== '');
       continue;
     }
 
@@ -603,7 +606,7 @@ function parseBlock(lines) {
       continue;
     }
 
-        // ✅ ADD: Set keyword inside blocks (e.g., Set analysis_result = "")
+    // ✅ ADD: Set keyword inside blocks (e.g., Set analysis_result = "")
     const setMatch = line.match(/^Set\s+(\w+)\s*=\s*(.+)$/i);
     if (setMatch) {
       flush(); // Flush any pending step
@@ -615,6 +618,15 @@ function parseBlock(lines) {
       });
       continue;
     }
+
+    // ✅ ADD: Return keyword inside blocks (rare but supported)
+    const returnMatch = line.match(/^Return\s+(.+)$/i);
+    if (returnMatch) {
+      flush();
+      // Note: Return inside blocks is unusual; this just parses it
+      continue;
+    }
+
     // Fallback
     if (current) {
       current.actionRaw += ' ' + line;  // ← PRESERVED EXACTLY (no normalizeAction)

package/src/runtime/RuntimeAPI.js

@@ -690,15 +690,38 @@ class RuntimeAPI {
     abs: a => Math.abs(a)
   };
 
-  evaluateMath(expr) {
+    evaluateMath(expr) {
+    // ✅ Handle quoted string literals with interpolation: "{var}" → interpolated string
+    if (typeof expr === 'string') {
+      const trimmed = expr.trim();
+      
+      // Check if it's a quoted string (single or double quotes)
+      if ((trimmed.startsWith('"') && trimmed.endsWith('"')) || 
+          (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
+        // Extract the inner content
+        let inner = trimmed.slice(1, -1);
+        
+        // Perform interpolation: replace {var} with context values
+        inner = inner.replace(/\{([^\}]+)\}/g, (_, path) => {
+          const value = this.getNested(this.context, path.trim());
+          return value !== undefined ? String(value) : `{${path}}`;
+        });
+        
+        return inner;
+      }
+    }
+    
+    // ── Original math evaluation logic (unchanged) ──────────────────────────
     expr = expr.replace(/\{([^\}]+)\}/g, (_, path) => {
       const value = this.getNested(this.context, path.trim());
       if (typeof value === 'string') return `"${value.replace(/"/g, '\\"')}"`;
       return value !== undefined ? value : 0;
     });
+    
     const funcNames = Object.keys(this.mathFunctions);
     const safeFunc = {};
     funcNames.forEach(fn => safeFunc[fn] = this.mathFunctions[fn]);
+    
     try {
       const f = new Function(...funcNames, `return ${expr};`);
       return f(...funcNames.map(fn => safeFunc[fn]));