@teachinglab/omd 0.3.7 → 0.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teachinglab/omd",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "omd",
   "main": "./index.js",
   "module": "./index.js",

package/src/omdEquation.js

@@ -8,6 +8,7 @@ import { omdExpression } from "./omdExpression.js";
 import { omdVariable } from "./omdVariable.js";
 import { omdString } from "./omdString.js";
 import { omdNumber } from "./omdNumber.js";
+import { parseEquationString } from "./omdUtils.js";
 
 export class omdEquation extends omdMetaExpression
 {
@@ -50,7 +51,7 @@ export class omdEquation extends omdMetaExpression
             else if ( left.omdType == "number" ) this.leftExpression = new omdNumber();
             else if ( left.omdType == "variable" ) this.leftExpression = new omdVariable();
             else if ( left.omdType == "term" ) this.leftExpression = new omdTerm();
-            else if ( left.omdType == "string" || typeof left == 'string' ) this.leftExpression = new omdString( typeof left == 'string' ? left : left.name || '' );
+            else if ( left.omdType == "string" || typeof left == 'string' ) this.leftExpression = new omdExpression();
 
             if (this.leftExpression && typeof this.leftExpression.loadFromJSON === 'function' && left && typeof left === 'object') {
                 this.leftExpression.loadFromJSON( left );
@@ -69,7 +70,7 @@ export class omdEquation extends omdMetaExpression
             else if ( right.omdType == "number" ) this.rightExpression = new omdNumber();
             else if ( right.omdType == "variable" ) this.rightExpression = new omdVariable();
             else if ( right.omdType == "term" ) this.rightExpression = new omdTerm();
-            else if ( right.omdType == "string" || typeof right == 'string' ) this.rightExpression = new omdString( typeof right == 'string' ? right : right.name || '' );
+            else if ( right.omdType == "string" || typeof right == 'string' ) this.rightExpression = new omdExpression();
 
             if (this.rightExpression && typeof this.rightExpression.loadFromJSON === 'function' && right && typeof right === 'object') {
                 this.rightExpression.loadFromJSON( right );
@@ -81,23 +82,28 @@ export class omdEquation extends omdMetaExpression
             }
         }
 
-        // If no structured left/right provided but an `equation` string exists, parse it into simple string nodes
+        // If no structured left/right provided but an `equation` string exists, try to parse it into structured expressions
         if ( (!this.leftExpression || !this.rightExpression) && typeof data.equation === 'string' ) {
-            const eq = data.equation || '';
-            const parts = eq.split('=');
-            const leftStr = (parts[0] || '').trim();
-            const rightStr = (parts[1] || '').trim();
-
-            if (!this.leftExpression) this.leftExpression = new omdString(leftStr || '');
-            if (!this.rightExpression) this.rightExpression = new omdString(rightStr || '');
-
-            if (this.leftExpression) {
-                this.leftHolder.removeAllChildren();
-                this.leftHolder.addChild(this.leftExpression);
-            }
-            if (this.rightExpression) {
-                this.rightHolder.removeAllChildren();
-                this.rightHolder.addChild(this.rightExpression);
+            const parsed = parseEquationString(data.equation);
+            if ( parsed ) {
+                if (!this.leftExpression) this.leftExpression = new omdExpression();
+                if (!this.rightExpression) this.rightExpression = new omdExpression();
+                // pass parsed structured JSON to expressions
+                if (this.leftExpression && typeof this.leftExpression.loadFromJSON === 'function') this.leftExpression.loadFromJSON(parsed.leftExpression);
+                if (this.rightExpression && typeof this.rightExpression.loadFromJSON === 'function') this.rightExpression.loadFromJSON(parsed.rightExpression);
+                this.leftHolder.removeAllChildren(); this.leftHolder.addChild(this.leftExpression);
+                this.rightHolder.removeAllChildren(); this.rightHolder.addChild(this.rightExpression);
+            } else {
+                // fallback: treat sides as plain strings
+                const parts = String(data.equation || '').split('=');
+                const leftStr = (parts[0] || '').trim();
+                const rightStr = (parts[1] || '').trim();
+                if (!this.leftExpression) this.leftExpression = new omdString(leftStr || '');
+                if (!this.rightExpression) this.rightExpression = new omdString(rightStr || '');
+                if (this.leftExpression && typeof this.leftExpression.loadFromJSON === 'function' && typeof leftStr === 'string') this.leftExpression.loadFromJSON(leftStr);
+                if (this.rightExpression && typeof this.rightExpression.loadFromJSON === 'function' && typeof rightStr === 'string') this.rightExpression.loadFromJSON(rightStr);
+                this.leftHolder.removeAllChildren(); this.leftHolder.addChild(this.leftExpression);
+                this.rightHolder.removeAllChildren(); this.rightHolder.addChild(this.rightExpression);
             }
         }
 

package/src/omdExpression.js

@@ -7,6 +7,7 @@ import { omdOperator } from "./omdOperator.js";
 import { omdNumber } from "./omdNumber.js";
 import { omdVariable } from "./omdVariable.js";
 import { omdMetaExpression } from "./omdMetaExpression.js"
+import { parseExpressionString } from "./omdUtils.js";
 
 export class omdExpression extends omdMetaExpression
 {
@@ -29,6 +30,12 @@ export class omdExpression extends omdMetaExpression
 
     loadFromJSON( data )
     {
+        // Accept either structured object or a plain expression string
+        if ( typeof data === 'string' ) {
+            const parsed = parseExpressionString(data);
+            if ( parsed ) data = parsed;
+        }
+
         if ( typeof data.termsAndOpers != "undefined" )
         {
             for( var i=0; i<data.termsAndOpers.length; i++ )

package/src/omdFunction.js

@@ -64,8 +64,9 @@ export class omdFunction extends omdMetaExpression
         
         // format the f(x) part on the left
         this.leftHolder.removeAllChildren();
-        var funcText = this.functionName + "(" + this.inputVariableArray[0] + ")";   // this should be refactored as a function call
-        this.leftExpression = new omdString(funcText);
+    var funcText = this.functionName + "(" + this.inputVariableArray[0] + ")";   // this should be refactored as a function call
+    this.leftExpression = new omdExpression();
+    this.leftExpression.loadFromJSON(funcText);
         this.leftHolder.addChild( this.leftExpression );
     
         this.updateLayout();
@@ -75,7 +76,8 @@ export class omdFunction extends omdMetaExpression
     {
         this.leftHolder.removeAllChildren();
         var funcText = funcName + "(" + funcVariable + ")";   // this should be refactored as a function call
-        this.leftExpression = new omdString(funcText);
+        this.leftExpression = new omdExpression();
+        this.leftExpression.loadFromJSON(funcText);
         this.leftHolder.addChild( this.leftExpression );
 
         this.rightExpresion = rightExp;

package/src/omdString.js

@@ -9,7 +9,7 @@ export class omdString extends omdMetaExpression
         // initialization
         super();
 
-        this.type = "omdVariable";
+        this.type = "omdString";
 
         this.numText = new jsvgTextBox();
         this.numText.setWidthAndHeight( 30,30 );
@@ -36,4 +36,15 @@ export class omdString extends omdMetaExpression
 
         this.setWidthAndHeight( this.backRect.width, this.backRect.height );
     }
+
+    loadFromJSON(data) {
+        if (typeof data === 'string') {
+            this.setName(data);
+            return;
+        }
+        if (data && typeof data.name === 'string') {
+            this.setName(data.name);
+            return;
+        }
+    }
 }

package/src/omdUtils.js

@@ -0,0 +1,84 @@
+// Small parsers to convert simple equation/expression strings into OMD JSON
+
+// Parse an expression like "3x+4-2y" into a termsAndOpers array:
+// ['3x', '+', '4', '-', '2y'] -> [{omdType:'term', coefficient:3, variable:'x' }, {omdType:'operator', operator:'+'}, ...]
+export function parseExpressionString(str) {
+    const cleaned = String(str || '').replace(/\s+/g, '');
+    if (!cleaned) return null;
+
+    // Tokenize numbers, variables, operators, and superscripts
+    // Token regex covers +/- as signs attached to numbers/vars, or standalone operators
+    const tokenRe = /([+-]?\d*\.?\d+[a-zA-Z]*)|([+-]?[a-zA-Z]+\^?\d*)|([+\-*/=×÷])/g;
+    const matches = cleaned.match(tokenRe) || [];
+    if (matches.length === 0) return null;
+
+    const out = [];
+    for (let tok of matches) {
+        // operator-only tokens
+        if (/^[+\-*/=×÷]$/.test(tok)) {
+            out.push({ omdType: 'operator', operator: tok.replace('*', '×') });
+            continue;
+        }
+        // term or number/variable
+        const m = tok.match(/^([+-]?)(\d*\.?\d*)([a-zA-Z]?)(?:\^(\d+))?$/);
+        if (m) {
+            const sign = m[1] === '-' ? -1 : 1;
+            const coefRaw = m[2];
+            const varChar = m[3] || '';
+            const exp = m[4] ? Number(m[4]) : 1;
+            let coef = 1;
+            if (coefRaw && coefRaw.length > 0) coef = Number(coefRaw);
+            if (!varChar && coefRaw) {
+                // pure number
+                out.push({ omdType: 'number', value: sign * coef });
+            } else {
+                out.push({ omdType: 'term', coefficient: sign * coef, variable: varChar, exponent: exp });
+            }
+        } else {
+            // fallback to string token
+            out.push({ omdType: 'string', name: tok });
+        }
+    }
+
+    // If first token is an operator like '+' or '-', and followed by a term/number, fold it
+    const folded = [];
+    for (let i = 0; i < out.length; i++) {
+        const t = out[i];
+        if (t.omdType === 'operator' && (t.operator === '+' || t.operator === '-')) {
+            // If it's a leading sign attached to next term, merge
+            const next = out[i+1];
+            if (next && (next.omdType === 'term' || next.omdType === 'number')) {
+                if (next.omdType === 'number') {
+                    next.value = (t.operator === '-') ? -next.value : next.value;
+                } else if (next.omdType === 'term') {
+                    next.coefficient = (t.operator === '-') ? -next.coefficient : next.coefficient;
+                }
+                i++; // skip next because we've merged
+                folded.push(next);
+                continue;
+            }
+        }
+        folded.push(t);
+    }
+
+    // Interleave operators where missing: if folded array alternates term/number and operator
+    const result = [];
+    for (let i = 0; i < folded.length; i++) {
+        result.push(folded[i]);
+    }
+
+    return { termsAndOpers: result };
+}
+
+// Parse an equation like "3x+4=2x+1" into left/right expression JSON
+export function parseEquationString(str) {
+    const s = String(str || '');
+    const parts = s.split('=');
+    if (parts.length !== 2) return null;
+    const left = parts[0].trim();
+    const right = parts[1].trim();
+    const leftJson = parseExpressionString(left);
+    const rightJson = parseExpressionString(right);
+    if (!leftJson || !rightJson) return null;
+    return { leftExpression: leftJson, rightExpression: rightJson };
+}

package/src/omdVariable.js

@@ -1,6 +1,7 @@
 
 import { omdColor } from "./omdColor.js";
 import { omdMetaExpression } from "./omdMetaExpression.js"
+import { jsvgTextBox } from "@teachinglab/jsvg";
 
 export class omdVariable extends omdMetaExpression
 {