@cortex-js/compute-engine 0.12.4 → 0.12.5

package/dist/compute-engine.js

@@ -1,4 +1,4 @@
-/** CortexJS Compute Engine 0.12.4 */
+/** CortexJS Compute Engine 0.12.5 */
     (function(global,factory){typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof define === 'function' && define.amd ? define(['exports'],factory):(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ComputeEngine = {}));})(this, (function (exports) { 'use strict';
 var ComputeEngine = (() => {
   var __create = Object.create;
@@ -4608,6 +4608,15 @@ var ComputeEngine = (() => {
       parse: "ExponentialE",
       serialize: "\\exponentialE"
     },
+    {
+      kind: "function",
+      trigger: "exp",
+      parse: (parser) => ["Exp", ...parser.matchArguments("enclosure") ?? []]
+    },
+    {
+      trigger: "\\exp",
+      parse: (parser) => ["Exp", ...parser.matchArguments("enclosure") ?? []]
+    },
     {
       name: "ImaginaryUnit",
       trigger: ["\\imaginaryI"]
@@ -4731,11 +4740,12 @@ var ComputeEngine = (() => {
     },
     {
       name: "Exp",
-      serialize: (serializer, expr) => joinLatex([
-        "\\exponentialE^{",
-        serializer.serialize(missingIfEmpty(op(expr, 1))),
-        "}"
-      ])
+      serialize: (serializer, expr) => {
+        const op12 = op(expr, 1);
+        if (symbol(op12) || machineValue(op12) !== null)
+          return joinLatex(["\\exponentialE^{", serializer.serialize(op12)]);
+        return joinLatex(["\\exp", serializer.wrap(missingIfEmpty(op12))]);
+      }
     },
     {
       name: "Factorial",
@@ -4912,7 +4922,31 @@ var ComputeEngine = (() => {
       trigger: ["\\pm"],
       kind: "infix",
       associativity: "both",
-      precedence: 270
+      precedence: 270,
+      serialize: (serializer, expr) => {
+        const op12 = op(expr, 1);
+        if (op12 === null)
+          return "\\pm";
+        if (nops(expr) === 1)
+          return joinLatex(["\\pm", serializer.serialize(op12)]);
+        const op22 = op(expr, 2);
+        return joinLatex([
+          serializer.serialize(op12),
+          "\\pm",
+          serializer.serialize(op22)
+        ]);
+      }
+    },
+    {
+      trigger: ["\\pm"],
+      kind: "prefix",
+      precedence: 270,
+      parse: (parser, terminator) => {
+        if (270 < terminator.minPrec)
+          return null;
+        const rhs = parser.matchExpression({ ...terminator, minPrec: 400 });
+        return ["PlusMinus", missingIfEmpty(rhs)];
+      }
     },
     {
       name: "Power",
@@ -5641,7 +5675,7 @@ var ComputeEngine = (() => {
       kind: "infix",
       associativity: "right",
       precedence: 241,
-      parse: "Equal"
+      parse: "LessEqual"
     },
     {
       trigger: ["\\leqslant"],
@@ -7425,7 +7459,7 @@ var ComputeEngine = (() => {
             message: [
               "invalid-dictionary-entry",
               indexedEntry.name,
-              "Duplicate definition"
+              "Duplicate definition. The name must be unique, but a trigger can be used by multiple definitions."
             ]
           });
         }
@@ -8722,6 +8756,8 @@ var ComputeEngine = (() => {
      * - 'enclosure' : will look for an argument inside an enclosure (open/close fence)
      * - 'implicit': either an expression inside a pair of `()`, or just a product
      *  (i.e. we interpret `\cos 2x + 1` as `\cos(2x) + 1`)
+     *
+     * This returns an array of arguments, or null if there is no match.
      */
     matchArguments(kind, until) {
       if (!kind)
@@ -8730,23 +8766,15 @@ var ComputeEngine = (() => {
         return null;
       const savedIndex = this.index;
       const group = this.matchEnclosure();
-      if (kind === "enclosure" && head(group) === "Delimiter") {
-        if (op(group, 1) === "Sequence")
-          return ops(op(group, 1)) ?? [];
-        return [op(group, 1) ?? ["Sequence"]];
-      }
+      if (kind === "enclosure")
+        return getSequence(group) ?? [];
       if (kind === "implicit") {
-        if (head(group) === "Delimiter") {
-          if (head(op(group, 1)) === "Sequence")
-            return getSequence(group) ?? [];
-          return [op(group, 1) ?? ["Sequence"]];
-        }
+        if (head(group) === "Delimiter")
+          return getSequence(group) ?? [];
         if (group !== null)
           return [group];
         const primary = this.matchExpression({ ...until, minPrec: 390 });
-        if (primary !== null)
-          return [primary];
-        return null;
+        return primary === null ? null : [primary];
       }
       this.index = savedIndex;
       return null;
@@ -8766,7 +8794,7 @@ var ComputeEngine = (() => {
         fn = pf;
       } while (true);
       const seq = this.matchArguments("enclosure");
-      return seq ? [fn, ...seq] : id;
+      return seq ? [fn, ...seq] : fn;
     }
     /** A prime suffix is a sequence of `'`, `\prime` or `\doubleprime`
      * after a function or in a superscript.
@@ -9175,7 +9203,7 @@ var ComputeEngine = (() => {
         this.index = index;
       return result;
     }
-    matchPostfix(lhs) {
+    matchPostfix(lhs, until) {
       console.assert(lhs !== null);
       if (lhs === null)
         return null;
@@ -9185,7 +9213,7 @@ var ComputeEngine = (() => {
       const start = this.index;
       for (const [def, n] of defs) {
         this.index = start + n;
-        const result = def.parse(this, lhs);
+        const result = def.parse(this, lhs, until);
         if (result !== null)
           return result;
       }
@@ -9531,7 +9559,7 @@ var ComputeEngine = (() => {
         let postfix = null;
         let index = this.index;
         do {
-          postfix = this.matchPostfix(result);
+          postfix = this.matchPostfix(result, until);
           result = postfix ?? result;
           if (this.index === index && postfix !== null) {
             console.assert(this.index !== index, "No token consumed");
@@ -15392,7 +15420,7 @@ var ComputeEngine = (() => {
     const ce = expr.engine;
     if (expr.op1.head === "Negate") {
       const sign2 = exp2 % 2 === 0 ? 1 : -1;
-      const result2 = expandMultinomial(ce.box(["Power", expr.op1.op1, expr.op2]));
+      const result2 = expandMultinomial(ce.pow(expr.op1.op1, expr.op2));
       if (result2 === null)
         return null;
       if (sign2 > 0)
@@ -15617,15 +15645,14 @@ var ComputeEngine = (() => {
       const sols = findUnivariateRoots(proposition, lhs2);
       if (sols.length === 0) {
         ce.assumptions.set(
-          ce.box([
-            "Equal",
+          ce.fn("Equal", [
             ce.add([proposition.op1.canonical, ce.neg(proposition.op2.canonical)]).simplify(),
             0
           ]),
           true
         );
       }
-      const val = sols.length === 1 ? sols[0] : ce.box(["List", ...sols]);
+      const val = sols.length === 1 ? sols[0] : ce.fn("List", sols);
       const def = ce.lookupSymbol(lhs2);
       if (!def) {
         ce.defineSymbol(lhs2, { value: val });
@@ -16607,7 +16634,6 @@ var ComputeEngine = (() => {
       return result;
     }
     solve(vars) {
-      console.log("solve this:", this.toString());
       if (vars.length !== 1)
         return null;
       const roots = findUnivariateRoots(this.simplify(), vars[0]);
@@ -16686,6 +16712,8 @@ var ComputeEngine = (() => {
           xs.push(y);
       }
     }
+    if (!xs.every((x) => x.isValid))
+      return new BoxedFunction(ce, head2, xs, { metadata, canonical: false });
     const sig = def.signature;
     if (sig.canonical) {
       try {
@@ -16716,21 +16744,22 @@ var ComputeEngine = (() => {
     return new BoxedFunction(ce, head2, xs, { metadata, def, canonical: true });
   }
   function apply(fn, args) {
+    const ce = fn.engine;
     if (fn.head !== "Lambda")
-      return fn.engine._fn(fn.evaluate(), args);
+      return ce._fn(fn.evaluate(), args);
     const subs2 = {
-      "__": fn.engine.tuple(args),
-      "_#": fn.engine.number(args.length)
+      "__": ce.tuple(args),
+      "_#": ce.number(args.length)
     };
     let n = 1;
     for (const op3 of args)
       subs2[`_${n++}`] = op3;
     subs2["_"] = subs2["_1"];
-    const savedContext = this.context;
-    this.context = fn.scope ?? null;
-    const result = fn.subs(subs2).evaluate();
-    this.context = savedContext;
-    return result;
+    const savedContext = ce.context;
+    ce.context = fn.scope ?? null;
+    const result = fn.subs(subs2);
+    ce.context = savedContext;
+    return result.op1.evaluate();
   }
   function holdMap(xs, skip, associativeHead, f) {
     if (xs.length === 0)
@@ -18845,7 +18874,7 @@ var ComputeEngine = (() => {
               return ce._NEGATIVE_INFINITY;
             if (ops2.length === 1)
               return ops2[0];
-            return ce.box(["Max", ...ops2]);
+            return ce.fn("Max", ops2);
           },
           evaluate: (ce, ops2) => {
             if (ops2.length === 0)
@@ -18874,7 +18903,7 @@ var ComputeEngine = (() => {
               return ce._NEGATIVE_INFINITY;
             if (ops2.length === 1)
               return ops2[0];
-            return ce.box(["Min", ...ops2]);
+            return ce.fn("Min", ops2);
           },
           evaluate: (ce, ops2) => {
             if (ops2.length === 0)
@@ -19215,7 +19244,7 @@ var ComputeEngine = (() => {
       e: {
         domain: "TranscendentalNumber",
         constant: true,
-        holdUntil: "never",
+        holdUntil: "N",
         value: "ExponentialE"
       },
       i: {
@@ -19241,14 +19270,13 @@ var ComputeEngine = (() => {
       },
       Half: {
         constant: true,
-        holdUntil: "never",
+        holdUntil: "evaluate",
         value: ["Rational", 1, 2]
       },
       ImaginaryUnit: {
         domain: "ImaginaryNumber",
         constant: true,
-        holdUntil: "evaluate",
-        // @todo maybe?
+        holdUntil: "never",
         wikidata: "Q193796",
         flags: { imaginary: true },
         value: ["Complex", 0, 1]
@@ -20076,8 +20104,7 @@ var ComputeEngine = (() => {
         signature: {
           domain: ["Function", ["Maybe", ["Sequence", "Anything"]], "String"],
           evaluate: (ce, ops2) => {
-            return ce.box([
-              "Latex",
+            return ce.fn("Latex", [
               ce.string(tokensToString(ops2.map((x) => x.string ?? x.latex)))
             ]);
           }
@@ -20100,7 +20127,7 @@ var ComputeEngine = (() => {
         hold: "all",
         signature: {
           domain: ["Function", ["Maybe", ["Sequence", "Anything"]], "String"],
-          evaluate: (ce, ops2) => ce.box(["Latex", ce.string(joinLatex(ops2.map((x) => x.latex)))])
+          evaluate: (ce, ops2) => ce.fn("Latex", [ce.string(joinLatex(ops2.map((x) => x.latex)))])
         }
       },
       SplitAsLatexTokens: {
@@ -20937,13 +20964,13 @@ var ComputeEngine = (() => {
               "Number"
             ]);
             if (ops2.length !== 1)
-              return ce.box(["Degrees", ops2]);
+              return ce.fn("Degrees", ops2, { canonical: false });
             const arg = ops2[0];
             if (arg.numericValue === null || !arg.isValid)
-              return ce.box(["Degrees", arg]);
+              return ce.fn("Degrees", ops2, { canonical: false });
             return ce.div(ce.mul([arg, ce.symbol("Pi")]), ce.number(180));
           },
-          evaluate: (ce, ops2) => ce.mul([ops2[0], ce.box(["Divide", "Pi", 180])])
+          evaluate: (ce, ops2) => ce.mul([ops2[0], ce.div(ce.symbol("Pi"), ce.number(180))])
         }
       },
       Hypot: {
@@ -21463,6 +21490,8 @@ var ComputeEngine = (() => {
     ]
   };
   function constructibleValues(ce, head2, x) {
+    if (!x)
+      return void 0;
     const specialValues = ce.cache(
       "constructible-trigonometric-values",
       () => {
@@ -21539,6 +21568,8 @@ var ComputeEngine = (() => {
     return newHead ? ce.symbol(newHead) : void 0;
   }
   function evalTrig(ce, mode, head2, op3) {
+    if (!op3)
+      return void 0;
     if (mode === "evaluate") {
       const result = constructibleValues(ce, head2, op3)?.evaluate();
       if (result)
@@ -21736,7 +21767,7 @@ var ComputeEngine = (() => {
       this._flags = def.flags ? normalizeFlags(def.flags) : void 0;
       this._domain = def.domain ? ce.domain(def.domain) : void 0;
       this.constant = def.constant ?? false;
-      this.holdUntil = def.holdUntil ?? "simplify";
+      this.holdUntil = def.holdUntil ?? "evaluate";
       if (this.constant) {
         this._defValue = def.value;
         this._value = null;
@@ -23392,17 +23423,20 @@ ${JSON.stringify(entry)}`
     }
     simplify(options) {
       const def = this.symbolDefinition;
-      if ((def?.holdUntil === "never" || def?.holdUntil === "simplify") && def.value)
+      if (def?.holdUntil === "simplify" && def.value)
         return def.value.simplify(options);
       return options?.rules ? this.replace(options.rules) ?? this : this;
     }
     evaluate(options) {
       const def = this.symbolDefinition;
-      if (def?.holdUntil !== "N")
-        return def?.value?.evaluate(options) ?? this;
+      if (def && (def.holdUntil === "simplify" || def.holdUntil === "evaluate"))
+        return def.value?.evaluate(options) ?? this;
       return this;
     }
     N(options) {
+      const def = this.symbolDefinition;
+      if (def && def.holdUntil === "never")
+        return this;
       return this.symbolDefinition?.value?.N(options) ?? this;
     }
     replace(rules, options) {
@@ -23815,7 +23849,7 @@ ${JSON.stringify(entry)}`
           precision: this.precision,
           avoidExponentsInRange: [-6, this.precision],
           onError: (err) => {
-            throw new Error(err[0].message.toString());
+            throw new Error(JSON.stringify(err[0].message));
           }
         });
       return this._latexSyntax;
@@ -24079,8 +24113,8 @@ ${JSON.stringify(entry)}`
       const bxs = xs;
       return bxs.every((x) => x.isCanonical) ? bxs : bxs.map((x) => x.canonical);
     }
-    fn(head2, ops2, metadata) {
-      return boxFunction(this, head2, ops2, { metadata, canonical: true });
+    fn(head2, ops2, options) {
+      return boxFunction(this, head2, ops2, options ?? { canonical: true });
     }
     /** @internal */
     _fn(head2, ops2, metadata) {
@@ -24494,10 +24528,10 @@ ${JSON.stringify(entry)}`
   };
 
   // src/compute-engine.ts
-  var version = "0.12.4";
+  var version = "0.12.5";
   globalThis[Symbol.for("io.cortexjs.compute-engine")] = {
     ComputeEngine: ComputeEngine.prototype.constructor,
-    version: "0.12.4"
+    version: "0.12.5"
   };
   return __toCommonJS(compute_engine_exports);
 })();