@o-lang/olang 1.0.11 → 1.0.13

package/package.json

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

package/src/parser.js

@@ -1,7 +1,6 @@
 // src/parser.js
 
 function parse(code, fileName = null) {
-  // --- Enforce .ol extension if filename provided ---
   if (fileName && !fileName.endsWith(".ol")) {
     throw new Error(`Expected .ol workflow, got: ${fileName}`);
   }
@@ -19,7 +18,6 @@ function parse(code, fileName = null) {
     returnValues: [],
     allowedResolvers: [],
 
-    // --- NEW: formal resolver policy ---
     resolverPolicy: {
       declared: [],
       autoInjected: [],
@@ -27,10 +25,7 @@ function parse(code, fileName = null) {
       warnings: []
     },
 
-    // --- NEW: parser warnings (non-fatal) ---
     __warnings: [],
-
-    // --- NEW: feature detection flags ---
     __requiresMath: false
   };
 
@@ -39,9 +34,6 @@ function parse(code, fileName = null) {
   while (i < lines.length) {
     let line = lines[i];
 
-    // ---------------------------
-    // Resolver policy declaration
-    // ---------------------------
     const allowMatch = line.match(/^Allow resolvers\s*:\s*$/i);
     if (allowMatch) {
       i++;
@@ -56,9 +48,6 @@ function parse(code, fileName = null) {
       continue;
     }
 
-    // ============================
-    // Math operations (detected)
-    // ============================
     let mathAdd = line.match(/^Add\s+\{(.+?)\}\s+and\s+\{(.+?)\}\s+Save as\s+(.+)$/i);
     if (mathAdd) {
       workflow.__requiresMath = true;
@@ -107,9 +96,6 @@ function parse(code, fileName = null) {
       continue;
     }
 
-    // ---------------------------
-    // Workflow definition
-    // ---------------------------
     const wfMatch = line.match(/^Workflow\s+"([^"]+)"(?:\s+with\s+(.+))?/i);
     if (wfMatch) {
       workflow.name = wfMatch[1];
@@ -120,25 +106,82 @@ function parse(code, fileName = null) {
       continue;
     }
 
+// ---------------------------
+// Return statement (updated: auto-detect math)
+// ---------------------------
+const returnMatch = line.match(/^Return\s+(.+)$/i);
+if (returnMatch) {
+  const returns = returnMatch[1].split(',').map(v => v.trim());
+  workflow.returnValues = returns;
+
+  // --- Check if any return vars come from math steps ---
+  for (const retVar of returns) {
+    const producedByMath = workflow.steps.some(
+      s => s.saveAs === retVar && s.type === 'calculate'
+    );
+    if (producedByMath) workflow.__requiresMath = true;
+  }
+
+  i++;
+  continue;
+}
+
+
     // ---------------------------
-    // Steps
-    // ---------------------------
-    const stepMatch = line.match(/^Step\s+(\d+)\s*:\s*(.+)$/i);
-    if (stepMatch) {
-      workflow.steps.push({
-        type: 'action',
-        stepNumber: parseInt(stepMatch[1], 10),
-        actionRaw: stepMatch[2].trim(),
-        saveAs: null,
-        constraints: {}
-      });
-      i++;
-      continue;
+// Steps (updated: auto-detect math + saveAs)
+// ---------------------------
+const stepMatch = line.match(/^Step\s+(\d+)\s*:\s*(.+)$/i);
+if (stepMatch) {
+  const stepNum = parseInt(stepMatch[1], 10);
+  const raw = stepMatch[2].trim();
+
+  // --- Detect math inside Step ---
+  let mathDetected = null;
+  let expr = '';
+  let saveVar = null;
+
+  const mathOps = [
+    { re: /^Add\s+\{(.+?)\}\s+and\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'add' },
+    { re: /^Subtract\s+\{(.+?)\}\s+from\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'subtract' },
+    { re: /^Multiply\s+\{(.+?)\}\s+and\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'multiply' },
+    { re: /^Divide\s+\{(.+?)\}\s+by\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'divide' }
+  ];
+
+  for (const op of mathOps) {
+    const m = raw.match(op.re);
+    if (m) {
+      mathDetected = op.fn;
+      saveVar = m[3].trim();
+      if (op.fn === 'subtract') expr = `subtract({${m[2]}}, {${m[1]}})`;
+      else expr = `${op.fn}({${m[1]}}, {${m[2]}})`;
+      break;
     }
+  }
+
+  if (mathDetected) workflow.__requiresMath = true;
+
+  workflow.steps.push({
+    type: mathDetected ? 'calculate' : 'action',
+    stepNumber: stepNum,
+    actionRaw: mathDetected ? null : raw,
+    expression: mathDetected ? expr : undefined,
+    saveAs: saveVar,
+    constraints: {}
+  });
+
+  i++;
+  continue;
+}
 
     const saveMatch = line.match(/^Save as\s+(.+)$/i);
     if (saveMatch && workflow.steps.length > 0) {
-      workflow.steps[workflow.steps.length - 1].saveAs = saveMatch[1].trim();
+      const lastStep = workflow.steps[workflow.steps.length - 1];
+      lastStep.saveAs = saveMatch[1].trim();
+
+      if (lastStep.saveAs.match(/[A-Z][A-Za-z0-9_]*/)) {
+        workflow.__requiresMath = true;
+      }
+
       i++;
       continue;
     }
@@ -169,26 +212,18 @@ function parse(code, fileName = null) {
       continue;
     }
 
-    // ---------------------------
-    // (ALL remaining blocks unchanged)
-    // If, Parallel, Connect, Agent, Debrief, Evolve,
-    // Prompt, Persist, Emit, Return, Use, Ask
-    // ---------------------------
-
     i++;
   }
 
   // ============================
   // LINT & POLICY FINALIZATION
   // ============================
-
   if (workflow.__requiresMath) {
     workflow.resolverPolicy.used.push('builtInMathResolver');
 
     if (!workflow.resolverPolicy.declared.includes('builtInMathResolver')) {
       workflow.resolverPolicy.autoInjected.push('builtInMathResolver');
       workflow.allowedResolvers.unshift('builtInMathResolver');
-
       workflow.__warnings.push(
         'Math operations detected. builtInMathResolver auto-injected.'
       );