cssstyle 5.3.5 → 5.3.7

package/lib/properties/stopColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "stop-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/top.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "top";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,22 +14,9 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ isNumber, name, type, value: itemValue }] = value;
-    switch (type) {
-      case "Calc": {
-        if (isNumber) {
-          return;
-        }
-        return `${name}(${itemValue})`;
-      }
-      case "GlobalKeyword":
-      case "Identifier": {
-        return name;
-      }
-      default: {
-        return parsers.parseLengthPercentage(value);
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -37,7 +24,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -56,3 +43,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/webkitBorderAfterColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "-webkit-border-after-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/webkitBorderBeforeColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "-webkit-border-before-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/webkitBorderEndColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "-webkit-border-end-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/webkitBorderStartColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "-webkit-border-start-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/webkitColumnRuleColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "-webkit-column-rule-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/webkitTapHighlightColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "-webkit-tap-highlight-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/webkitTextEmphasisColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "-webkit-text-emphasis-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/webkitTextFillColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "-webkit-text-fill-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/webkitTextStrokeColor.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "-webkit-text-stroke-color";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,15 +14,7 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ name, type }] = value;
-    switch (type) {
-      case "GlobalKeyword": {
-        return name;
-      }
-      default: {
-        return parsers.parseColor(value);
-      }
-    }
+    return parsers.resolveColorValue(value);
   } else if (typeof value === "string") {
     return value;
   }
@@ -30,7 +22,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -49,3 +41,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/properties/width.js

@@ -4,7 +4,7 @@ const parsers = require("../parsers");
 
 const property = "width";
 
-module.exports.parse = function parse(v, opt = {}) {
+module.exports.parse = (v, opt = {}) => {
   const { globalObject } = opt;
   if (v === "") {
     return v;
@@ -14,22 +14,10 @@ module.exports.parse = function parse(v, opt = {}) {
     inArray: true
   });
   if (Array.isArray(value) && value.length === 1) {
-    const [{ isNumber, name, type, value: itemValue }] = value;
-    switch (type) {
-      case "Calc": {
-        if (isNumber) {
-          return;
-        }
-        return `${name}(${itemValue})`;
-      }
-      case "GlobalKeyword":
-      case "Identifier": {
-        return name;
-      }
-      default: {
-        return parsers.parseLengthPercentage(value);
-      }
-    }
+    return parsers.resolveNumericValue(value, {
+      min: 0,
+      type: "length"
+    });
   } else if (typeof value === "string") {
     return value;
   }
@@ -37,7 +25,7 @@ module.exports.parse = function parse(v, opt = {}) {
 
 module.exports.definition = {
   set(v) {
-    v = parsers.prepareValue(v, this._global);
+    v = parsers.prepareValue(v);
     if (parsers.hasVarFunc(v)) {
       this._setProperty(property, v);
     } else {
@@ -56,3 +44,5 @@ module.exports.definition = {
   enumerable: true,
   configurable: true
 };
+
+module.exports.property = property;

package/lib/utils/propertyDescriptors.js

@@ -2,18 +2,54 @@
 
 const parsers = require("../parsers");
 
-exports.getPropertyDescriptor = function getPropertyDescriptor(property) {
-  return {
-    set(v) {
-      v = parsers.parsePropertyValue(property, v, {
-        globalObject: this._global
+const { AST_TYPES } = parsers;
+
+const getPropertyDescriptor = (property) => ({
+  set(v) {
+    const value = parsers.prepareValue(v);
+    if (parsers.hasVarFunc(value)) {
+      this._setProperty(property, value);
+    } else {
+      const parsedValue = parsers.parsePropertyValue(property, v, {
+        globalObject: this._global,
+        inArray: true
       });
-      this._setProperty(property, v);
-    },
-    get() {
-      return this.getPropertyValue(property);
-    },
-    enumerable: true,
-    configurable: true
-  };
+      if (Array.isArray(parsedValue)) {
+        if (parsedValue.length === 1) {
+          const [{ name, type, value: itemValue }] = parsedValue;
+          switch (type) {
+            case AST_TYPES.CALC: {
+              this._setProperty(property, `${name}(${itemValue})`);
+              break;
+            }
+            case AST_TYPES.GLOBAL_KEYWORD:
+            case AST_TYPES.IDENTIFIER: {
+              // Set the normalized name for keywords or identifiers.
+              this._setProperty(property, name);
+              break;
+            }
+            default: {
+              // Set the prepared value for Dimension, Function, etc.
+              this._setProperty(property, value);
+            }
+          }
+        } else {
+          // Set the prepared value for lists containing multiple values.
+          this._setProperty(property, value);
+        }
+      } else if (typeof parsedValue === "string") {
+        // Empty string.
+        this._setProperty(property, parsedValue);
+      }
+    }
+  },
+  get() {
+    return this.getPropertyValue(property);
+  },
+  enumerable: true,
+  configurable: true
+});
+
+module.exports = {
+  getPropertyDescriptor
 };

package/lib/utils/strings.js

@@ -8,6 +8,9 @@ exports.asciiWhitespaceRe = asciiWhitespaceRe;
 
 // https://infra.spec.whatwg.org/#ascii-lowercase
 exports.asciiLowercase = (s) => {
+  if (!/[^\x00-\x7f]/.test(s)) {
+    return s.toLowerCase();
+  }
   const len = s.length;
   const out = new Array(len);
   for (let i = 0; i < len; i++) {
@@ -20,6 +23,9 @@ exports.asciiLowercase = (s) => {
 
 // https://infra.spec.whatwg.org/#ascii-uppercase
 exports.asciiUppercase = (s) => {
+  if (!/[^\x00-\x7f]/.test(s)) {
+    return s.toUpperCase();
+  }
   const len = s.length;
   const out = new Array(len);
   for (let i = 0; i < len; i++) {

package/package.json

@@ -1,36 +1,15 @@
 {
   "name": "cssstyle",
-  "description": "CSSStyleDeclaration Object Model implementation",
+  "description": "An implementation of the CSSStyleDeclaration class from the CSS Object Model specification",
   "keywords": [
     "CSS",
     "CSSStyleDeclaration",
     "StyleSheet"
   ],
-  "version": "5.3.5",
-  "homepage": "https://github.com/jsdom/cssstyle",
-  "maintainers": [
-    {
-      "name": "Jon Sakas",
-      "email": "jon.sakas@gmail.com",
-      "url": "https://jon.sakas.co/"
-    },
-    {
-      "name": "Rafał Ruciński",
-      "email": "fatfisz@gmail.com",
-      "url": "https://fatfisz.com"
-    }
-  ],
-  "contributors": [
-    {
-      "name": "Chad Walker",
-      "email": "chad@chad-cat-lore-eddie.com",
-      "url": "https://github.com/chad3814"
-    }
-  ],
-  "repository": "jsdom/cssstyle",
-  "bugs": "https://github.com/jsdom/cssstyle/issues",
-  "directories": {
-    "lib": "./lib"
+  "version": "5.3.7",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jsdom/cssstyle.git"
   },
   "files": [
     "lib/"
@@ -39,7 +18,8 @@
   "dependencies": {
     "@asamuzakjp/css-color": "^4.1.1",
     "@csstools/css-syntax-patches-for-csstree": "^1.0.21",
-    "css-tree": "^3.1.0"
+    "css-tree": "^3.1.0",
+    "lru-cache": "^11.2.4"
   },
   "devDependencies": {
     "@babel/generator": "^7.28.5",
@@ -63,6 +43,7 @@
     "prepare": "run-p prepare:*",
     "prepare:implemented_properties": "node ./scripts/generateImplementedProperties.mjs",
     "prepare:properties": "node ./scripts/generateProperties.js",
+    "prepare:propertyDefinitions": "node ./scripts/generatePropertyDefinitions.mjs",
     "test": "node --test"
   },
   "license": "MIT",