pacc 4.13.1 → 4.14.0

package/package.json

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

package/src/attributes.mjs

@@ -1,17 +1,23 @@
 const types = {
   base: { name: "base" },
   string: { name: "string", extends: "base" },
-  number: { name: "number", extends: "base" },
+  number: {
+    name: "number",
+    extends: "base",
+    convertValue: (value, attribute) =>
+      typeof value === "string" ? parseFloat(value) : value
+  },
   integer: {
     name: "integer",
     extends: "base",
-    convertValue: value => (typeof value === "string" ? parseInt(value) : value)
+    convertValue: (value, attribute) =>
+      typeof value === "string" ? parseInt(value) : value
   },
   "unsigned-integer": { name: "unsigned-integer", extends: "integer" },
   boolean: {
     name: "boolean",
     extends: "base",
-    convertValue: value => (!value || value === "0" ? false : true)
+    convertValue: (value, attribute) => (!value || value === "0" ? false : true)
   },
   url: { name: "url", extends: "string" },
   object: { name: "object", extends: "base" }
@@ -79,9 +85,9 @@ export function* attributeIterator(definition, path = []) {
   }
 }
 
-export function convertValue(value, definition) {
-  if (definition?.type?.convertValue) {
-    return definition.type.convertValue(value);
+export function convertValue(value, attribute) {
+  if (attribute?.type?.convertValue) {
+    return attribute.type.convertValue(value, attribute);
   }
   return value;
 }

package/src/tokens.mjs

@@ -34,7 +34,7 @@ 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 OPEN_ROUND = createToken("(", 0, "prefix");
 export /** @type {Token} */ const CLOSE_ROUND = createToken(")", 0, "infix");
 export /** @type {Token} */ const OPEN_BRACKET = createToken("[", 10, "prefix");
 export /** @type {Token} */ const CLOSE_BRACKET = createToken("]", 0, "infix");
@@ -64,6 +64,17 @@ export /** @type {Token} */ const EOF = createToken("EOF", -1, "eof");
 export function* tokens(string) {
   let state, value, hex, divider;
 
+  function maybeKeyword() {
+    switch (value) {
+      case "true":
+        return true;
+      case "false":
+        return false;
+      default:
+        return value;
+    }
+  }
+
   for (const c of string) {
     switch (state) {
       case "string-escaping-hex":
@@ -105,7 +116,7 @@ export function* tokens(string) {
           case "number-fraction":
           case "number":
           case "identifier":
-            yield value;
+            yield maybeKeyword();
             value = undefined;
             state = undefined;
             break;
@@ -132,7 +143,7 @@ export function* tokens(string) {
           case "number-fraction":
           case "number":
           case "identifier":
-            yield value;
+            yield maybeKeyword();
             value = "";
             state = "string";
             break;
@@ -171,7 +182,7 @@ export function* tokens(string) {
           case "number-fraction":
           case "number":
           case "identifier":
-            yield value;
+            yield maybeKeyword();
             state = c;
             break;
           default:
@@ -191,7 +202,7 @@ export function* tokens(string) {
           case "number-fraction":
           case "number":
           case "identifier":
-            yield value;
+            yield maybeKeyword();
             state = c;
             break;
           default:
@@ -224,7 +235,7 @@ export function* tokens(string) {
           case "number":
           case "number-fraction":
           case "identifier":
-            yield value;
+            yield maybeKeyword();
             state = c;
             break;
           default:
@@ -297,7 +308,7 @@ export function* tokens(string) {
     case "number-fraction":
     case "number":
     case "identifier":
-      yield value;
+      yield maybeKeyword();
       break;
     default:
       yield lookup[state];

package/types/attributes.d.mts

@@ -11,4 +11,4 @@ export function prepareAttributesDefinitions(newDefinitions: any, presentDefinit
  * @param {string[]} path
  */
 export function attributeIterator(definition: any, path?: string[]): any;
-export function convertValue(value: any, definition: any): any;
+export function convertValue(value: any, attribute: any): any;