cssstyle 4.3.1 → 4.4.0

package/lib/properties/webkitColumnRuleColor.js

@@ -1,14 +1,30 @@
-'use strict';
+"use strict";
 
-var parseColor = require('../parsers').parseColor;
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseColor(v);
+  if (val) {
+    return val;
+  }
+  return parsers.parseKeyword(v);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
+    return true;
+  }
+  return parsers.isValidColor(v);
+};
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('-webkit-column-rule-color', parseColor(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("-webkit-column-rule-color", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('-webkit-column-rule-color');
+  get() {
+    return this.getPropertyValue("-webkit-column-rule-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/webkitTapHighlightColor.js

@@ -1,14 +1,30 @@
-'use strict';
+"use strict";
 
-var parseColor = require('../parsers').parseColor;
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseColor(v);
+  if (val) {
+    return val;
+  }
+  return parsers.parseKeyword(v);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
+    return true;
+  }
+  return parsers.isValidColor(v);
+};
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('-webkit-tap-highlight-color', parseColor(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("-webkit-tap-highlight-color", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('-webkit-tap-highlight-color');
+  get() {
+    return this.getPropertyValue("-webkit-tap-highlight-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/webkitTextEmphasisColor.js

@@ -1,14 +1,30 @@
-'use strict';
+"use strict";
 
-var parseColor = require('../parsers').parseColor;
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseColor(v);
+  if (val) {
+    return val;
+  }
+  return parsers.parseKeyword(v);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
+    return true;
+  }
+  return parsers.isValidColor(v);
+};
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('-webkit-text-emphasis-color', parseColor(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("-webkit-text-emphasis-color", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('-webkit-text-emphasis-color');
+  get() {
+    return this.getPropertyValue("-webkit-text-emphasis-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/webkitTextFillColor.js

@@ -1,14 +1,30 @@
-'use strict';
+"use strict";
 
-var parseColor = require('../parsers').parseColor;
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseColor(v);
+  if (val) {
+    return val;
+  }
+  return parsers.parseKeyword(v);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
+    return true;
+  }
+  return parsers.isValidColor(v);
+};
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('-webkit-text-fill-color', parseColor(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("-webkit-text-fill-color", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('-webkit-text-fill-color');
+  get() {
+    return this.getPropertyValue("-webkit-text-fill-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/webkitTextStrokeColor.js

@@ -1,14 +1,30 @@
-'use strict';
+"use strict";
 
-var parseColor = require('../parsers').parseColor;
+const parsers = require("../parsers");
+
+module.exports.parse = function parse(v) {
+  const val = parsers.parseColor(v);
+  if (val) {
+    return val;
+  }
+  return parsers.parseKeyword(v);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "" || typeof parsers.parseKeyword(v) === "string") {
+    return true;
+  }
+  return parsers.isValidColor(v);
+};
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('-webkit-text-stroke-color', parseColor(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("-webkit-text-stroke-color", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('-webkit-text-stroke-color');
+  get() {
+    return this.getPropertyValue("-webkit-text-stroke-color");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/properties/width.js

@@ -1,24 +1,31 @@
-'use strict';
+"use strict";
 
-var parseMeasurement = require('../parsers').parseMeasurement;
+const parsers = require("../parsers");
 
-function parse(v) {
-  if (String(v).toLowerCase() === 'auto') {
-    return 'auto';
+module.exports.parse = function parse(v) {
+  const dim = parsers.parseMeasurement(v, true);
+  if (dim) {
+    return dim;
   }
-  if (String(v).toLowerCase() === 'inherit') {
-    return 'inherit';
+  const keywords = ["auto", "min-content", "max-content", "fit-content"];
+  return parsers.parseKeyword(v, keywords);
+};
+
+module.exports.isValid = function isValid(v) {
+  if (v === "") {
+    return true;
   }
-  return parseMeasurement(v);
-}
+  return typeof module.exports.parse(v) === "string";
+};
 
 module.exports.definition = {
-  set: function (v) {
-    this._setProperty('width', parse(v));
+  set(v) {
+    v = parsers.prepareValue(v, this._global);
+    this._setProperty("width", module.exports.parse(v));
   },
-  get: function () {
-    return this.getPropertyValue('width');
+  get() {
+    return this.getPropertyValue("width");
   },
   enumerable: true,
-  configurable: true,
+  configurable: true
 };

package/lib/utils/camelize.js

@@ -0,0 +1,35 @@
+"use strict";
+
+// Utility to translate from `border-width` to `borderWidth`.
+// NOTE: For values prefixed with webkit, e.g. `-webkit-foo`, we need to provide
+// both `webkitFoo` and `WebkitFoo`. Here we only return `webkitFoo`.
+exports.dashedToCamelCase = function (dashed) {
+  if (dashed.startsWith("--")) {
+    return dashed;
+  }
+  let camel = "";
+  let nextCap = false;
+  // skip leading hyphen in vendor prefixed value, e.g. -webkit-foo
+  let i = /^-webkit-/.test(dashed) ? 1 : 0;
+  for (; i < dashed.length; i++) {
+    if (dashed[i] !== "-") {
+      camel += nextCap ? dashed[i].toUpperCase() : dashed[i];
+      nextCap = false;
+    } else {
+      nextCap = true;
+    }
+  }
+  return camel;
+};
+
+// Utility to translate from `borderWidth` to `border-width`.
+exports.camelCaseToDashed = function (camelCase) {
+  if (camelCase.startsWith("--")) {
+    return camelCase;
+  }
+  const dashed = camelCase.replace(/(?<=[a-z])[A-Z]/g, "-$&").toLowerCase();
+  if (/^webkit-/.test(dashed)) {
+    return `-${dashed}`;
+  }
+  return dashed;
+};

package/lib/utils/propertyDescriptors.js

@@ -0,0 +1,16 @@
+"use strict";
+
+const prepareValue = require("../parsers").prepareValue;
+
+module.exports.getPropertyDescriptor = function getPropertyDescriptor(property) {
+  return {
+    set(v) {
+      this._setProperty(property, prepareValue(v));
+    },
+    get() {
+      return this.getPropertyValue(property);
+    },
+    enumerable: true,
+    configurable: true
+  };
+};

package/package.json

@@ -6,7 +6,7 @@
     "CSSStyleDeclaration",
     "StyleSheet"
   ],
-  "version": "4.3.1",
+  "version": "4.4.0",
   "homepage": "https://github.com/jsdom/cssstyle",
   "maintainers": [
     {
@@ -37,7 +37,7 @@
   ],
   "main": "./lib/CSSStyleDeclaration.js",
   "dependencies": {
-    "@asamuzakjp/css-color": "^3.1.2",
+    "@asamuzakjp/css-color": "^3.2.0",
     "rrweb-cssom": "^0.8.0"
   },
   "devDependencies": {
@@ -45,6 +45,7 @@
     "@babel/parser": "^7.26.9",
     "@babel/traverse": "^7.26.9",
     "@babel/types": "^7.26.9",
+    "@domenic/eslint-config": "^4.0.1",
     "eslint": "^9.22.0",
     "eslint-config-prettier": "^10.1.1",
     "eslint-plugin-prettier": "^5.2.3",
@@ -54,10 +55,10 @@
     "resolve": "^1.22.10"
   },
   "scripts": {
-    "download": "node ./scripts/downloadLatestProperties.mjs && eslint lib/allProperties.js --fix",
+    "download": "node ./scripts/downloadLatestProperties.mjs",
     "generate": "run-p generate:*",
     "generate:implemented_properties": "node ./scripts/generateImplementedProperties.mjs",
-    "generate:properties": "node ./scripts/generate_properties.js",
+    "generate:properties": "node ./scripts/generateProperties.js",
     "lint": "npm run generate && eslint --max-warnings 0",
     "lint:fix": "eslint --fix --max-warnings 0",
     "prepublishOnly": "npm run lint && npm run test",