@aiot-toolkit/parser 2.0.5-beta.7 → 2.0.5-beta.9

package/lib/ux/utils/StyleUtil.js

@@ -12,9 +12,7 @@ var _path = _interopRequireDefault(require("path"));
 var _CompressConfig = require("../config/CompressConfig");
 var _StyleSelectorType = require("../enum/StyleSelectorType");
 var _StyleAttributeConfig = require("../config/vela/StyleAttributeConfig");
-var colord = _interopRequireWildcard(require("colord"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _tinycolor = _interopRequireDefault(require("tinycolor2"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * StyleUtil
@@ -769,29 +767,33 @@ class StyleUtil {
       return numberValue;
     }
     // 2
-    else if (StyleUtil.isColor(value)) {
-      return StyleUtil.formatColor(value);
+    else if (StyleUtil.isColor(`${value}${unit}`)) {
+      return StyleUtil.formatColor(`${value}${unit}`);
     }
     // 3
     return node.value + this.translatePercentage(unit);
   }
   static isColor(color) {
-    const colorItem = colord.colord(color);
+    const colorItem = (0, _tinycolor.default)(color);
     return colorItem.isValid();
   }
   static formatColor(color) {
-    const colorItem = colord.colord(color);
+    const colorItem = (0, _tinycolor.default)(color);
     if (!colorItem.isValid()) {
       return color;
     }
-    const format = colord.getFormat(color);
+    const format = colorItem.getFormat();
     switch (format) {
       case 'hex':
-        return colorItem.toHex().toString();
+        return colorItem.toHexString();
+      case 'hex8':
+        return colorItem.toHex8String();
       case 'rgb':
         return colorItem.toRgbString();
       case 'hsl':
         return colorItem.toHslString();
+      case 'name':
+        return color;
       default:
         return colorItem.toRgbString();
     }
@@ -813,7 +815,9 @@ class StyleUtil {
           return value[0];
         } else {
           // 例如animation-name属性值
-          return value.map(item => item === ',' ? `${item} ` : item).join('').trim();
+          return value.map(item => {
+            return item === ',' ? item : ` ${item}`;
+          }).join('').trim();
         }
       } else {
         // 例如transform属性值,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/parser",
-  "version": "2.0.5-beta.7",
+  "version": "2.0.5-beta.9",
   "description": "Parse the source code of aiot and convert it to the AST (Abstract Syntax Tree) of the target code.",
   "keywords": [
     "aiot",
@@ -20,8 +20,8 @@
     "test": "node ./__tests__/parser.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.5-beta.7",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.7",
+    "@aiot-toolkit/generator": "2.0.5-beta.9",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.9",
     "@babel/core": "^7.23.6",
     "@babel/generator": "^7.24.10",
     "@babel/parser": "^7.24.8",
@@ -29,11 +29,10 @@
     "@babel/traverse": "^7.23.7",
     "@babel/types": "^7.23.6",
     "aiot-parse5": "^1.0.2",
-    "colord": "^2.9.3",
     "css-tree": "npm:aiot-css-tree@^2.3.1",
     "csstree-validator": "^3.0.0",
     "eslint": "^8.46.0",
-    "file-lane": "2.0.5-beta.7",
+    "file-lane": "2.0.5-beta.9",
     "fs-extra": "^11.2.0",
     "google-protobuf": "^3.21.2",
     "less": "^4.2.0",
@@ -46,6 +45,7 @@
     "sass": "^1.69.5",
     "sass-alias": "^2.0.1",
     "source-map": "^0.7.4",
+    "tinycolor2": "^1.6.0",
     "ts-morph": "^19.0.0",
     "vela-chai": "^1.0.2",
     "vela-quickapp-test": "^1.0.13"
@@ -58,7 +58,8 @@
     "@types/postcss-import": "^14.0.3",
     "@types/postcss-url": "^10.0.4",
     "@types/reserved-words": "^0.1.4",
+    "@types/tinycolor2": "^1.4.6",
     "babel-plugin-tester": "^11.0.4"
   },
-  "gitHead": "553c62c29e7ddde9cf12fe8ce3801d77bf5e0fcb"
+  "gitHead": "c8c79fa9f882b5dcdac5f0dadb5863343eda44b1"
 }