@o-lang/olang 1.0.15 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o-lang/olang",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "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,12 +1,9 @@
 // src/parser.js
-
 function parse(code, fileName = null) {
   if (fileName && !fileName.endsWith(".ol")) {
     throw new Error(`Expected .ol workflow, got: ${fileName}`);
   }
-
   const rawLines = code.split(/\r?\n/);
-
   const lines = rawLines
     .map(l => l.trim())
     .filter(l => l && !l.startsWith('#') && !l.startsWith('//'));
@@ -17,37 +14,41 @@ function parse(code, fileName = null) {
     steps: [],
     returnValues: [],
     allowedResolvers: [],
-
     resolverPolicy: {
       declared: [],
       autoInjected: [],
       used: [],
       warnings: []
     },
-
     __warnings: [],
     __requiresMath: false
   };
 
   let i = 0;
-
   while (i < lines.length) {
     let line = lines[i];
 
-    const allowMatch = line.match(/^Allow resolvers\s*:\s*$/i);
+    // ✅ FIXED: Match both "Allow resolvers" and "Allowed resolvers"
+    const allowMatch = line.match(/^Allow(?:ed)?\s+resolvers\s*:\s*$/i);
     if (allowMatch) {
       i++;
-      while (i < lines.length && !/^[A-Za-z]/.test(lines[i])) {
-        const val = lines[i].trim();
-        if (val) {
-          workflow.allowedResolvers.push(val);
-          workflow.resolverPolicy.declared.push(val);
+      // Read all subsequent non-empty lines until a new top-level section (starts with capital letter)
+      while (i < lines.length) {
+        const nextLine = lines[i].trim();
+        // Stop if line is empty or appears to be a new top-level keyword (e.g., Step, Workflow, Return)
+        if (nextLine === '' || /^[A-Z][a-z]/.test(nextLine)) {
+          break;
+        }
+        if (nextLine) {
+          workflow.allowedResolvers.push(nextLine);
+          workflow.resolverPolicy.declared.push(nextLine);
         }
         i++;
       }
       continue;
     }
 
+    // ---- Math step patterns (standalone) ----
     let mathAdd = line.match(/^Add\s+\{(.+?)\}\s+and\s+\{(.+?)\}\s+Save as\s+(.+)$/i);
     if (mathAdd) {
       workflow.__requiresMath = true;
@@ -65,7 +66,7 @@ function parse(code, fileName = null) {
       workflow.__requiresMath = true;
       workflow.steps.push({
         type: 'calculate',
-        expression: `subtract({${mathSub[2]}}, {${mathSub[1]}})`,
+        expression: `subtract({${mathAdd[2]}}, {${mathAdd[1]}})`,
         saveAs: mathSub[3].trim()
       });
       i++;
@@ -96,6 +97,7 @@ function parse(code, fileName = null) {
       continue;
     }
 
+    // ---- Workflow declaration ----
     const wfMatch = line.match(/^Workflow\s+"([^"]+)"(?:\s+with\s+(.+))?/i);
     if (wfMatch) {
       workflow.name = wfMatch[1];
@@ -106,96 +108,84 @@ 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 (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;
+    // ---- 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;
     }
-  }
-
-  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;
-}
+    // ---- Step parsing (with inline math detection) ----
+    const stepMatch = line.match(/^Step\s+(\d+)\s*:\s*(.+)$/i);
+    if (stepMatch) {
+      const stepNum = parseInt(stepMatch[1], 10);
+      const raw = stepMatch[2].trim();
+
+      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;
+    }
 
+    // ---- Save as (for legacy or multi-line steps) ----
     const saveMatch = line.match(/^Save as\s+(.+)$/i);
     if (saveMatch && workflow.steps.length > 0) {
       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;
     }
 
+    // ---- Constraint parsing ----
     const constraintMatch = line.match(/^Constraint:\s*(.+)$/i);
     if (constraintMatch && workflow.steps.length > 0) {
       const lastStep = workflow.steps[workflow.steps.length - 1];
       if (!lastStep.constraints) lastStep.constraints = {};
-
       const eq = constraintMatch[1].match(/^([^=]+)=\s*(.+)$/);
       if (eq) {
         let key = eq[1].trim();
         let value = eq[2].trim();
-
         if (value.startsWith('[') && value.endsWith(']')) {
           value = value.slice(1, -1).split(',').map(v =>
             v.trim().replace(/^"/, '').replace(/"$/, '')
@@ -205,7 +195,6 @@ if (stepMatch) {
         } else if (value.startsWith('"') && value.endsWith('"')) {
           value = value.slice(1, -1);
         }
-
         lastStep.constraints[key] = value;
       }
       i++;
@@ -220,7 +209,6 @@ if (stepMatch) {
   // ============================
   if (workflow.__requiresMath) {
     workflow.resolverPolicy.used.push('builtInMathResolver');
-
     if (!workflow.resolverPolicy.declared.includes('builtInMathResolver')) {
       workflow.resolverPolicy.autoInjected.push('builtInMathResolver');
       workflow.allowedResolvers.unshift('builtInMathResolver');
@@ -237,7 +225,6 @@ if (stepMatch) {
   }
 
   workflow.resolverPolicy.warnings = workflow.__warnings.slice();
-
   return workflow;
 }
 
@@ -247,7 +234,6 @@ if (stepMatch) {
 function parseBlock(lines) {
   const steps = [];
   let current = null;
-
   for (const line of lines) {
     const stepMatch = line.match(/^Step\s+(\d+)\s*:\s*(.+)$/i);
     if (stepMatch) {
@@ -261,37 +247,30 @@ function parseBlock(lines) {
       steps.push(current);
       continue;
     }
-
     const saveMatch = line.match(/^Save as\s+(.+)$/i);
     if (saveMatch && current) current.saveAs = saveMatch[1].trim();
-
     const debriefMatch = line.match(/^Debrief\s+(\w+)\s+with\s+"(.+)"$/i);
     if (debriefMatch) {
       steps.push({ type: 'debrief', agent: debriefMatch[1], message: debriefMatch[2] });
     }
-
     const evolveMatch = line.match(/^Evolve\s+(\w+)\s+using\s+feedback:\s+"(.+)"$/i);
     if (evolveMatch) {
       steps.push({ type: 'evolve', agent: evolveMatch[1], feedback: evolveMatch[2] });
     }
-
     const promptMatch = line.match(/^Prompt user to\s+"(.+)"$/i);
     if (promptMatch) {
       steps.push({ type: 'prompt', question: promptMatch[1], saveAs: null });
     }
-
     const useMatch = line.match(/^Use\s+(.+)$/i);
     if (useMatch) {
       steps.push({ type: 'use', tool: useMatch[1].trim(), saveAs: null, constraints: {} });
     }
-
     const askMatch = line.match(/^Ask\s+(.+)$/i);
     if (askMatch) {
       steps.push({ type: 'ask', target: askMatch[1].trim(), saveAs: null, constraints: {} });
     }
   }
-
   return steps;
 }
 
-module.exports = { parse };
+module.exports = { parse };