stylecow-plugin-color - npm Package Compare versions

Comparing version 2.0.0 to 3.0.0

index.js

@@ -7,7 +7,9 @@ //http://dev.w3.org/csswg/css-color/
 
+	//Convert hex + alpha values to rgba values
 	stylecow.addTask({
-
-		//Convert hex + alpha values to rgba values
-		Keyword: function (keyword) {
-			if (keyword.name[0] === '#' && (keyword.name.length === 5 || keyword.name.length === 9) && keyword.ancestor({type: 'Declaration'})) {
+		filter: {
+			type: 'Keyword'
+		},
+		fn: function (keyword) {
+			if (keyword.name[0] === '#' && (keyword.name.length === 5 || keyword.name.length === 9) && keyword.parent('Declaration')) {
 				var rgba = color.toRGBA(keyword.name);
@@ -18,134 +20,142 @@
 				} else {
-					keyword.replaceWith('rgba(' + color.toRGBA(keyword.name).join(',') + ')');
+					keyword.replaceWith(stylecow.Function.createFromString('rgba(' + color.toRGBA(keyword.name).join(',') + ')'));
 				}
 			}
-		},
+		}
+	});
 
-		"Function": {
+ 	//Convert gray() function to rgba/hex values
+ 	stylecow.addTask({
+ 		filter: {
+ 			type: 'Function',
+ 			name: 'gray'
+ 		},
+ 		fn: function (fn) {
+			var rgba = color.toRGBA(fn);
 
-			//Convert gray() function to rgba/hex values
-			gray: function (fn) {
-				var rgba = color.toRGBA(fn.getContent(), 'gray');
+			if (rgba[3] === 1) {
+				fn.replaceWith(stylecow.Keyword.createFromString('#' + color.RGBA_HEX(rgba)));
+			} else {
+				fn.replaceWith(stylecow.Function.createFromString('rgba(' + rgba.join(',') + ')'));
+			}
+		}
+	});
 
-				if (rgba[3] === 1) {
-					fn.replaceWith('#' + color.RGBA_HEX(rgba));
-				} else {
-					fn.setContent(rgba);
-					fn.name = 'rgba';
+	//Convert color() function to rgba/hex values
+	stylecow.addTask({
+		filter: {
+			type: 'Function',
+			name: 'color'
+		},
+		fn: function (fn) {
+			var rgba;
+
+			fn[0].forEach(function (child, key) {
+				if (key === 0) {
+					rgba = color.toRGBA(child);
+					return;
 				}
-			},
 
-			//Convert color() function to rgba/hex values
-			color: function (fn) {
-				var args = fn[0];
-				var rgba;
+				var args = child.toArray();
 
-				rgba = color.toRGBA(args[0]);
-				args[0].remove();
+				switch (child.name) {
+					case 'alpha':
+					case 'a':
+						rgba[3] = modify(rgba[3], args[0], 1);
+						break;
 
-				args.forEach(function (adjust) {
-					var args = adjust.getContent();
+					case 'red':
+						rgba[0] = modify(rgba[0], args[0], 255);
+						break;
 
-					switch (adjust.name) {
-						case 'alpha':
-						case 'a':
-							rgba[3] = modify(rgba[3], args[0], 1);
-							break;
+					case 'green':
+						rgba[1] = modify(rgba[1], args[0], 255);
+						break;
 
-						case 'red':
-							rgba[0] = modify(rgba[0], args[0], 255);
-							break;
+					case 'blue':
+						rgba[2] = modify(rgba[2], args[0], 255);
+						break;
 
-						case 'green':
-							rgba[1] = modify(rgba[1], args[0], 255);
-							break;
+					case 'rgb':
+						rgba[0] = modify(rgba[0], args[0], 255);
+						rgba[1] = modify(rgba[1], args[1], 255);
+						rgba[2] = modify(rgba[2], args[2], 255);
+						break;
 
-						case 'blue':
-							rgba[2] = modify(rgba[2], args[0], 255);
-							break;
+					case 'saturation':
+					case 's':
+						var hsla = color.RGBA_HSLA(rgba);
+						hsla[1] = modify(hsla[1], args[0], 100);
+						rgba = color.HSLA_RGBA(hsla);
+						break;
 
-						case 'rgb':
-							rgba[0] = modify(rgba[0], args[0], 255);
-							rgba[1] = modify(rgba[1], args[1], 255);
-							rgba[2] = modify(rgba[2], args[2], 255);
-							break;
+					case 'lightness':
+					case 'l':
+						var hsla = color.RGBA_HSLA(rgba);
+						hsla[2] = modify(hsla[2], args[0], 100);
+						rgba = color.HSLA_RGBA(hsla);
+						break;
 
-						case 'saturation':
-						case 's':
-							var hsla = color.RGBA_HSLA(rgba);
-							hsla[1] = modify(hsla[1], args[0], 100);
-							rgba = color.HSLA_RGBA(hsla);
-							break;
+					case 'whiteness':
+					case 'w':
+						var hwba = color.RGBA_HWBA(rgba);
+						hwba[1] = modify(hwba[1], args[0], 100);
+						rgba = color.HWBA_RGBA(hwba);
+						break;
 
-						case 'lightness':
-						case 'l':
-							var hsla = color.RGBA_HSLA(rgba);
-							hsla[2] = modify(hsla[2], args[0], 100);
-							rgba = color.HSLA_RGBA(hsla);
-							break;
+					case 'blackness':
+					case 'b':
+						var hwba = color.RGBA_HWBA(rgba);
+						hwba[2] = modify(hwba[2], args[0], 100);
+						rgba = color.HWBA_RGBA(hwba);
+						break;
 
-						case 'whiteness':
-						case 'w':
-							var hwba = color.RGBA_HWBA(rgba);
-							hwba[1] = modify(hwba[1], args[0], 100);
-							rgba = color.HWBA_RGBA(hwba);
-							break;
+					case 'blend':
+						var c = color.toRGBA(child[0][0]);
+						var p = child[0][1].toString();
 
-						case 'blackness':
-						case 'b':
-							var hwba = color.RGBA_HWBA(rgba);
-							hwba[2] = modify(hwba[2], args[0], 100);
-							rgba = color.HWBA_RGBA(hwba);
-							break;
+						rgba[0] = blend(rgba[0], c[0], p, 255);
+						rgba[1] = blend(rgba[1], c[1], p, 255);
+						rgba[2] = blend(rgba[2], c[2], p, 255);
+						break;
 
-						case 'blend':
-							var c = color.toRGBA(adjust[0][0]);
-							var p = adjust[0][1].toString();
+					case 'blenda':
+						var c = color.toRGBA(child[0][0]);
+						var p = child[0][1].toString();
 
-							rgba[0] = blend(rgba[0], c[0], p, 255);
-							rgba[1] = blend(rgba[1], c[1], p, 255);
-							rgba[2] = blend(rgba[2], c[2], p, 255);
-							break;
+						rgba[0] = blend(rgba[0], c[0], p, 255);
+						rgba[1] = blend(rgba[1], c[1], p, 255);
+						rgba[2] = blend(rgba[2], c[2], p, 255);
+						rgba[3] = blend(rgba[3], c[3], p, 1);
+						break;
 
-						case 'blenda':
-							var c = color.toRGBA(adjust[0][0]);
-							var p = adjust[0][1].toString();
+					case 'tint':
+						rgba[0] = blend(rgba[0], 255, args[0], 255);
+						rgba[1] = blend(rgba[1], 255, args[0], 255);
+						rgba[2] = blend(rgba[2], 255, args[0], 255);
+						break;
 
-							rgba[0] = blend(rgba[0], c[0], p, 255);
-							rgba[1] = blend(rgba[1], c[1], p, 255);
-							rgba[2] = blend(rgba[2], c[2], p, 255);
-							rgba[3] = blend(rgba[3], c[3], p, 1);
-							break;
+					case 'shade':
+						rgba[0] = blend(rgba[0], 0, args[0], 255);
+						rgba[1] = blend(rgba[1], 0, args[0], 255);
+						rgba[2] = blend(rgba[2], 0, args[0], 255);
+						break;
 
-						case 'tint':
-							rgba[0] = blend(rgba[0], 255, args[0], 255);
-							rgba[1] = blend(rgba[1], 255, args[0], 255);
-							rgba[2] = blend(rgba[2], 255, args[0], 255);
-							break;
+					case 'contrast':
+						var hsla = color.RGBA_HSLA(rgba);
+						var hwba = color.RGBA_HWBA(rgba);
 
-						case 'shade':
-							rgba[0] = blend(rgba[0], 0, args[0], 255);
-							rgba[1] = blend(rgba[1], 0, args[0], 255);
-							rgba[2] = blend(rgba[2], 0, args[0], 255);
-							break;
+						if (hsla[2] < 50) { //is dark +50%
+							hwba[1] = modify(hwba[1], args[0], 100);
+						} else {
+							hwba[2] = modify(hwba[2], args[0], 100);
+						}
+						rgba = color.HWBA_RGBA(hwba);
+				}
+			});
 
-						case 'contrast':
-							var hsla = color.RGBA_HSLA(rgba);
-							var hwba = color.RGBA_HWBA(rgba);
-
-							if (hsla[2] < 50) { //is dark +50%
-								hwba[1] = modify(hwba[1], args[0], 100);
-							} else {
-								hwba[2] = modify(hwba[2], args[0], 100);
-							}
-							rgba = color.HWBA_RGBA(hwba);
-					}
-				});
-
-
-				if (rgba[3] === 1) {
-					fn.replaceWith('#' + color.RGBA_HEX(rgba));
-				} else {
-					fn.setContent(rgba).name = 'rgba';
-				}
+			if (rgba[3] === 1) {
+				fn.replaceWith(stylecow.Keyword.createFromString('#' + color.RGBA_HEX(rgba)));
+			} else {
+				fn.replaceWith(stylecow.Function.createFromString('rgba(' + rgba.join(',') + ')'));
 			}
@@ -152,0 +162,0 @@ }

package.json

 {
 	"name": "stylecow-plugin-color",
 	"description": "Stylecow plugin to add support for CSS Color Module Level 4",
-	"version": "2.0.0",
+	"version": "3.0.0",
 	"author": "Oscar Otero <[e-mail]>",
@@ -14,5 +14,5 @@ "homepage": "https://github.com/stylecow/stylecow-plugin-color",
 	"dependencies": {
-		"stylecow-color": "*"
+		"stylecow-color": "2.*"
 	},
 	"license": "MIT"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Wildcard dependency

Quality

Package has a dependency with a floating version range. This can cause issues if the dependency publishes a new major version.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

8784

increased by2.59%

Lines of code

184

increased by7.6%

Number of medium quality alerts

1

decreased by-50%

Dependency changes

• Updatedstylecow-color@2.*