@danielsimonjr/mathts-expression 0.6.6 → 0.7.0

package/dist/index.js

@@ -164,6 +164,11 @@ function isRange(x) {
   const obj = x;
   return obj.constructor?.prototype?.isRange === true;
 }
+function isIndex(x) {
+  if (!x || typeof x !== "object") return false;
+  const obj = x;
+  return obj.constructor?.prototype?.isIndex === true;
+}
 function isHelp(x) {
   if (!x || typeof x !== "object") return false;
   const obj = x;
@@ -756,7 +761,8 @@ var createParse = /* @__PURE__ */ factory(
       ">=": true,
       "<<": true,
       ">>": true,
-      ">>>": true
+      ">>>": true,
+      ".": true
     };
     const NAMED_DELIMITERS = {
       mod: true,
@@ -851,25 +857,28 @@ var createParse = /* @__PURE__ */ factory(
       const c1 = currentCharacter(state);
       const c2 = currentString(state, 2);
       const c3 = currentString(state, 3);
+      let delim = "";
       if (c3.length === 3 && DELIMITERS[c3]) {
-        state.tokenType = 1 /* DELIMITER */;
-        state.token = c3;
-        next(state);
-        next(state);
-        next(state);
-        return;
-      }
-      if (c2.length === 2 && DELIMITERS[c2] && (c2 !== "?." || !parse.isDigit(state.expression.charAt(state.index + 2)))) {
-        state.tokenType = 1 /* DELIMITER */;
-        state.token = c2;
-        next(state);
-        next(state);
-        return;
+        delim = c3;
+      } else if (c2.length === 2 && DELIMITERS[c2]) {
+        delim = c2;
+      } else if (DELIMITERS[c1]) {
+        delim = c1;
+      }
+      if (delim) {
+        if (delim.endsWith(".") && parse.isDigit(state.expression.charAt(state.index + delim.length))) {
+          delim = delim.slice(0, -1);
+          if (delim.length > 0 && !DELIMITERS[delim]) {
+            delim = "";
+          }
+        }
       }
-      if (DELIMITERS[c1]) {
+      if (delim) {
         state.tokenType = 1 /* DELIMITER */;
-        state.token = c1;
-        next(state);
+        state.token = delim;
+        for (let i = 0; i < delim.length; i++) {
+          next(state);
+        }
         return;
       }
       if (parse.isDigitDot(c1)) {
@@ -904,10 +913,6 @@ var createParse = /* @__PURE__ */ factory(
         if (currentCharacter(state) === ".") {
           state.token += currentCharacter(state);
           next(state);
-          if (!parse.isDigit(currentCharacter(state))) {
-            state.tokenType = 1 /* DELIMITER */;
-            return;
-          }
         } else {
           while (parse.isDigit(currentCharacter(state))) {
             state.token += currentCharacter(state);
@@ -1023,26 +1028,29 @@ var createParse = /* @__PURE__ */ factory(
     function parseBlock(state) {
       let node;
       const blocks = [];
-      let visible;
-      if (state.token !== "" && state.token !== "\n" && state.token !== ";") {
-        node = parseAssignment(state);
-        if (state.comment) {
-          node.comment = state.comment;
-        }
-      }
-      while (state.token === "\n" || state.token === ";") {
-        if (blocks.length === 0 && node) {
-          visible = state.token !== ";";
-          blocks.push({ node, visible });
-        }
-        getToken(state);
-        if (state.token !== "\n" && state.token !== ";" && state.token !== "") {
+      let hasSeparators = false;
+      let nodePushed = true;
+      while (state.token !== "") {
+        if (state.token !== "\n" && state.token !== ";") {
           node = parseAssignment(state);
+          nodePushed = false;
           if (state.comment) {
             node.comment = state.comment;
           }
-          visible = state.token !== ";";
-          blocks.push({ node, visible });
+        }
+        if (state.token === "\n" || state.token === ";") {
+          hasSeparators = true;
+          if (node && !nodePushed) {
+            blocks.push({ node, visible: state.token !== ";" });
+            nodePushed = true;
+          }
+          getToken(state);
+        } else {
+          if (node && hasSeparators && !nodePushed) {
+            blocks.push({ node, visible: state.token !== ";" });
+            nodePushed = true;
+          }
+          break;
         }
       }
       if (blocks.length > 0) {
@@ -1787,9 +1795,15 @@ var createParserClass = /* @__PURE__ */ factory(
     Parser.prototype.type = "Parser";
     Parser.prototype.isParser = true;
     Parser.prototype.evaluate = function(expr) {
+      if (typeof expr !== "string" && !Array.isArray(expr)) {
+        throw new TypeError('String or string array expected for parameter "expr"');
+      }
       return evaluate(expr, this.scope);
     };
     Parser.prototype.get = function(name47) {
+      if (typeof name47 !== "string") {
+        throw new TypeError('String expected for parameter "name"');
+      }
       return this.scope.has(name47) ? this.scope.get(name47) : void 0;
     };
     Parser.prototype.getAll = function() {
@@ -7860,6 +7874,72 @@ function errorTransform(err) {
   return err;
 }
 
+// src/utils/array.ts
+import {
+  arraySize,
+  validate,
+  validateIndexSourceSize,
+  validateIndex,
+  isEmptyIndex,
+  resize,
+  reshape,
+  processSizesWildcard,
+  squeeze,
+  unsqueeze,
+  flatten,
+  map,
+  forEach,
+  filter,
+  filterRegExp,
+  join,
+  identify,
+  generalize,
+  getArrayDataType,
+  last,
+  initial,
+  concat,
+  broadcastSizes,
+  checkBroadcastingRules,
+  broadcastTo,
+  broadcastArrays,
+  stretch,
+  getArrayElement,
+  deepMapArray,
+  deepForEachArray,
+  cloneArray
+} from "@danielsimonjr/mathts-core/internal";
+
+// src/error/DimensionError.ts
+import { DimensionError } from "@danielsimonjr/mathts-core/internal";
+
+// src/node/utils/stringSubset.ts
+function getStringSubset(str, index) {
+  if (!isIndex(index)) {
+    throw new TypeError("Index expected");
+  }
+  if (isEmptyIndex(index)) {
+    return "";
+  }
+  validateIndexSourceSize(Array.from(str), index);
+  if (index.size().length !== 1) {
+    throw new DimensionError(index.size().length, 1);
+  }
+  const strLen = str.length;
+  validateIndex(index.min()[0], strLen);
+  validateIndex(index.max()[0], strLen);
+  const range = index.dimension(0);
+  let substr = "";
+  function callback(v) {
+    substr += str.charAt(v);
+  }
+  if (Number.isInteger(range)) {
+    callback(range);
+  } else {
+    range.forEach(callback);
+  }
+  return substr;
+}
+
 // src/node/utils/access.ts
 function accessFactory({ subset }) {
   return function access(object, index) {
@@ -7869,7 +7949,7 @@ function accessFactory({ subset }) {
       } else if (object && typeof object.subset === "function") {
         return object.subset(index);
       } else if (typeof object === "string") {
-        return subset(object, index);
+        return getStringSubset(object, index);
       } else if (typeof object === "object") {
         if (!index.isObjectProperty()) {
           throw new TypeError("Cannot apply a numeric index as object property");
@@ -8085,41 +8165,6 @@ var createAccessorNode = /* @__PURE__ */ factory(
   { isClass: true, isNode: true }
 );
 
-// src/utils/array.ts
-import {
-  arraySize,
-  validate,
-  validateIndexSourceSize,
-  validateIndex,
-  isEmptyIndex,
-  resize,
-  reshape,
-  processSizesWildcard,
-  squeeze,
-  unsqueeze,
-  flatten,
-  map,
-  forEach,
-  filter,
-  filterRegExp,
-  join,
-  identify,
-  generalize,
-  getArrayDataType,
-  last,
-  initial,
-  concat,
-  broadcastSizes,
-  checkBroadcastingRules,
-  broadcastTo,
-  broadcastArrays,
-  stretch,
-  getArrayElement,
-  deepMapArray,
-  deepForEachArray,
-  cloneArray
-} from "@danielsimonjr/mathts-core/internal";
-
 // src/node/ArrayNode.ts
 var name7 = "ArrayNode";
 var dependencies7 = ["Node"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielsimonjr/mathts-expression",
-  "version": "0.6.6",
+  "version": "0.7.0",
   "description": "Expression parser and evaluator for MathTS",
   "author": "Daniel Simon Jr.",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "build:prod": "tsup src/index.ts --format esm --dts --clean --minify --treeshake"
   },
   "dependencies": {
-    "@danielsimonjr/mathts-core": "^0.12.0",
+    "@danielsimonjr/mathts-core": "^0.14.0",
     "typed-function": "^4.0.0"
   },
   "devDependencies": {
@@ -45,7 +45,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/danielsimonjr/mathts.git",
+    "url": "git+https://github.com/danielsimonjr/MathTS.git",
     "directory": "expression"
   },
   "keywords": [