pacc 4.14.1 → 4.15.1

package/README.md

@@ -105,11 +105,11 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [DIVIDE](#divide)
 *   [NOT](#not)
 *   [NOT\_EQUAL](#not_equal)
+*   [EQUAL](#equal)
 *   [GREATER](#greater)
 *   [GREATER\_EQUAL](#greater_equal)
 *   [LESS](#less)
 *   [LESS\_EQUAL](#less_equal)
-*   [EQUAL](#equal)
 *   [OPEN\_ROUND](#open_round)
 *   [CLOSE\_ROUND](#close_round)
 *   [OPEN\_BRACKET](#open_bracket)
@@ -491,6 +491,10 @@ Type: [Token](#token)
 
 Type: [Token](#token)
 
+## EQUAL
+
+Type: [Token](#token)
+
 ## GREATER
 
 Type: [Token](#token)
@@ -507,10 +511,6 @@ Type: [Token](#token)
 
 Type: [Token](#token)
 
-## EQUAL
-
-Type: [Token](#token)
-
 ## OPEN\_ROUND
 
 Type: [Token](#token)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "4.14.1",
+  "version": "4.15.1",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -38,7 +38,7 @@
     "browser-ava": "^2.3.31",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.7",
+    "semantic-release": "^24.2.8",
     "typescript": "^5.9.2"
   },
   "engines": {

package/src/expression.mjs

@@ -1,5 +1,4 @@
 import {
-  tokens,
   DOT,
   OPEN_ROUND,
   CLOSE_ROUND,
@@ -66,6 +65,8 @@ export function parse(context) {
     switch (typeof token) {
       case "string":
         return { path: [token] };
+      case "boolean":
+      case "bigint":
       case "number":
         return token;
     }
@@ -75,10 +76,53 @@ export function parse(context) {
 
   const led = (token, left) => {
     switch (token.type) {
-      case "infix":
+      case "infixr": {
+        const right = expression(token.precedence - 1);
+        if (typeof left === typeof right) {
+          switch (typeof left) {
+            case "bigint":
+            case "number":
+            case "string":
+              switch (token) {
+                case GREATER:
+                  return left > right;
+                case GREATER_EQUAL:
+                  return left >= right;
+                case LESS:
+                  return left < right;
+                case LESS_EQUAL:
+                  return left <= right;
+                case EQUAL:
+                  return left == right;
+                case NOT_EQUAL:
+                  return left != right;
+              }
+              break;
+            case "boolean":
+              switch (token) {
+                case DOUBLE_BAR:
+                  return left || right;
+                case DOUBLE_AMPERSAND:
+                  return left && right;
+                case EQUAL:
+                  return left == right;
+                case NOT_EQUAL:
+                  return left != right;
+              }
+          }
+        }
+        return {
+          token,
+          left,
+          right
+        };
+      }
+
+      case "infix": {
         const right = expression(token.precedence);
         if (typeof left === typeof right) {
           switch (typeof left) {
+            case "bigint":
             case "number":
               switch (token) {
                 case PLUS:
@@ -91,13 +135,6 @@ export function parse(context) {
                   return left / right;
               }
               break;
-            case "boolean":
-              switch (token) {
-                case DOUBLE_BAR:
-                  return left || right;
-                case DOUBLE_AMPERSAND:
-                  return left && right;
-              }
           }
         }
         if (token === DOT) {
@@ -105,9 +142,10 @@ export function parse(context) {
             left.path.push(...right.path);
             return left;
           }
-          if (typeof left === "number") {
-            right.path.unshift(left);
-            return right;
+          switch (typeof left) {
+            case "number":
+              right.path.unshift(left);
+              return right;
           }
           return { path: [left.token, right.token] };
         }
@@ -120,14 +158,7 @@ export function parse(context) {
           left,
           right
         };
-
-      case "infixr":
-        return {
-          token,
-          left,
-          right: expression(token.precedence - 1)
-        };
-
+      }
       case "prefix":
         switch (token) {
           case OPEN_BRACKET: {

package/src/properties.mjs

@@ -5,7 +5,7 @@ import { convertValue } from "./attributes.mjs";
 export function definePropertiesFromAttributes(
   object,
   attributes,
-  values,
+  initialValues,
   properties = {}
 ) {
   const applyLater = {};
@@ -13,7 +13,7 @@ export function definePropertiesFromAttributes(
   for (const [path, attribute] of attributeIterator(attributes)) {
     const name = path.join(".");
 
-    let value = getAttribute(values, name, attribute) ?? values?.[name];
+    let value = getAttribute(initialValues, name, attribute) ?? initialValues?.[name] ?? attribute.default;
 
     if (value !== undefined) {
       if (path.length === 1) {

package/src/tokens.mjs

@@ -25,6 +25,7 @@ export /** @type {Token} */ const STAR = createToken("*", 60, "infix");
 export /** @type {Token} */ const DIVIDE = createToken("/", 60, "infix");
 export /** @type {Token} */ const NOT = createToken("!");
 export /** @type {Token} */ const NOT_EQUAL = createToken("!=", 40, "infixr");
+export /** @type {Token} */ const EQUAL = createToken("=", 40, "infixr");
 export /** @type {Token} */ const GREATER = createToken(">", 40, "infixr");
 export /** @type {Token} */ const GREATER_EQUAL = createToken(
   ">=",
@@ -33,7 +34,6 @@ export /** @type {Token} */ const GREATER_EQUAL = createToken(
 );
 export /** @type {Token} */ const LESS = createToken("<", 40, "infixr");
 export /** @type {Token} */ const LESS_EQUAL = createToken("<=", 40, "infixr");
-export /** @type {Token} */ const EQUAL = createToken("=", 40);
 export /** @type {Token} */ const OPEN_ROUND = createToken("(", 0, "prefix");
 export /** @type {Token} */ const CLOSE_ROUND = createToken(")", 0, "infix");
 export /** @type {Token} */ const OPEN_BRACKET = createToken("[", 10, "prefix");

package/types/properties.d.mts

@@ -1 +1 @@
-export function definePropertiesFromAttributes(object: any, attributes: any, values: any, properties?: {}): void;
+export function definePropertiesFromAttributes(object: any, attributes: any, initialValues: any, properties?: {}): void;

package/types/tokens.d.mts

@@ -13,11 +13,11 @@ export namespace STAR { }
 export namespace DIVIDE { }
 export namespace NOT { }
 export namespace NOT_EQUAL { }
+export namespace EQUAL { }
 export namespace GREATER { }
 export namespace GREATER_EQUAL { }
 export namespace LESS { }
 export namespace LESS_EQUAL { }
-export namespace EQUAL { }
 export namespace OPEN_ROUND { }
 export namespace CLOSE_ROUND { }
 export namespace OPEN_BRACKET { }