pacc 8.3.0 → 8.3.1

package/README.md

@@ -635,8 +635,9 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 ### Parameters
 
 *   `str` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-*   `precedence`   (optional, default `0`)
-*   `type`  
+*   `precedence` **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?**  (optional, default `0`)
+*   `type` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** 
+*   `binop`  
 
 Returns **[Token](#token)** 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/ast.mjs

@@ -25,18 +25,17 @@ import {
  * @param {AST} right
  *
  */
-export function binopError(op, left, right) {
+function binopError(op, left, right) {
   throw new Error(`Unexpected '${op.str || op}'`, { cause: op });
 }
 
 export function binop(op, left, right, fallback) {
-
   if(op.binop) { return op.binop(left,right); }
 
   return fallback(op, left, right);
 }
 
-export function binopEval(node, current, context) {
+function binopEval(node, current, context) {
   return binop(
     node.token,
     node.left.eval ? node.left.eval(node.left, current, context) : node.left,

package/src/expression.mjs

@@ -9,14 +9,7 @@ import {
   COMMA,
   EOF
 } from "./tokens.mjs";
-
-import {
-  binopEval,
-  pathEval,
-  functionEval,
-  ASTTrue,
-  ASTBinop
-} from "./ast.mjs";
+import { pathEval, functionEval, ASTTrue, ASTBinop } from "./ast.mjs";
 
 /**
  *
@@ -104,11 +97,7 @@ export function parse(input, context = {}) {
         return ASTBinop(last, left, expression(last.precedence - 1));
 
       case "infix": {
-        let right = expression(last.precedence);
-
-        if (last.binop) {
-          return ASTBinop(last, left, right);
-        }
+        const right = expression(last.precedence);
 
         if (last === DOT) {
           if (left.path) {
@@ -124,16 +113,7 @@ export function parse(input, context = {}) {
           return { eval: pathEval, path: [left.token, right.token] };
         }
 
-        if (right.token === EOF) {
-          error("unexpected EOF");
-        }
-
-        return {
-          eval: binopEval,
-          token: last,
-          left,
-          right
-        };
+        return ASTBinop(last, left, right);
       }
       case "prefix":
         switch (last) {
@@ -190,9 +170,9 @@ export function parse(input, context = {}) {
   if (context.exec !== false && result?.eval) {
     result = result.eval(result, context.root, context);
 
-    if (typeof result === "function") {
+    /*if (typeof result === "function") {
       return [...result()];
-    }
+    }*/
   }
 
   return result;

package/types/ast.d.mts

@@ -1,17 +1,4 @@
-/**
- * @typedef {Object} AST
- * @property {Function} [eval]
- */
-/**
- *
- * @param {Token} op
- * @param {AST} left
- * @param {AST} right
- *
- */
-export function binopError(op: Token, left: AST, right: AST): void;
 export function binop(op: any, left: any, right: any, fallback: any): any;
-export function binopEval(node: any, current: any, context: any): any;
 export function ASTBinop(token: any, left: any, right: any): any;
 export function pathEval(node: any, current: any, context: any): any;
 export function functionEval(node: any, current: any, context: any): any;