Merge pull request #49 from GitScrum/milestone-0.0.20

Milestone 0.0.20

Author: Scrum

CHANGELOG.md

@@ -1,3 +1,22 @@
+## [0.0.20] - 07-04-2016
+### Added
+- Added #41, trevor
+- Added #46, ava-codemods
+- Added #44, lodash.merge
+
+### Change
+- Change #48, updateDev to update
+- Update #45, devDep
+- Update #33, core
+
+### Remove
+- Remove #47, run task postinstall
+- Remove #41, trevor need nvm
+- Remove #44, deep-assign, not merge array
+
+### Fixed
+- Fixed #44, broken test, deep-assign not merge array. Change to lodash
+
 ## [0.0.19] - 02-04-2016
 ### Added 
 - Added #34, husky

package.json

@@ -1,16 +1,15 @@
 {
   "name": "postcss-at-rules-variables",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "PostCss plugin to use CSS Custom Properties in at-rule @each, @for, @if, @else ",
   "main": "./lib/index.js",
   "scripts": {
     "test": "xo ./src/*.js ./test/*.js && nyc ava",
     "clean": "rm -rf lib && mkdir lib",
     "build": "npm run clean && babel src/index.js --out-file lib/index.js",
-    "postinstall": "npm run updateDev",
     "prepublish": "npm run build",
     "prepush": "npm test",
-    "updateDev": "updtr"
+    "update": "updtr && ava-codemods"
   },
   "keywords": [
     "postcss",
@@ -36,15 +35,17 @@
     "postcss": "^5.0.19"
   },
   "devDependencies": {
-    "ava": "^0.13.0",
+    "ava": "^0.14.0",
+    "ava-codemods": "^0.2.1",
     "babel-cli": "^6.6.5",
     "babel-plugin-add-module-exports": "^0.1.2",
     "babel-preset-node5": "^11.0.0",
     "babel-register": "^6.7.2",
     "coveralls": "^2.11.8",
     "husky": "^0.11.4",
+    "lodash.merge": "^4.3.4",
     "nyc": "^6.1.1",
-    "updtr": "^0.1.7",
+    "updtr": "^0.1.10",
     "xo": "^0.13.0"
   },
   "babel": {

src/index.js

@@ -1,46 +1,52 @@
 import postcss from 'postcss';
-import deepAssign from 'deep-assign';
+import {merge as assign} from 'lodash';
 
-const VAR_FUNC_IDENTIFIER = 'var';
-const maps = {};
+function hasVar(str) {
+	return str.indexOf('var(');
+}
 
-function resolveValue(value) {
-	const hasVar = value.indexOf(`${VAR_FUNC_IDENTIFIER}(`);
-	if (hasVar === -1) {
+function resolveValue(value, maps) {
+	if (hasVar(value) === -1) {
 		return value;
 	}
 
 	return value.replace(/var\(--.*?\)/g, (match) => maps[match.slice(4, -1)] || match);
 }
 
+function getProperty(nodes) {
+	let propertys = {};
+
+	nodes.walkRules(rule => {
+		if (rule.selector !== ':root') {
+			return;
+		}
+
+		rule.each(decl => {
+			const {prop, value} = decl;
+			propertys[prop] = value;
+		});
+	});
+
+	return propertys;
+}
+
 export default postcss.plugin('postcss-at-rules-variables', options => {
 	const DEFAULT = {
 		atRules: ['for', 'if', 'else', 'each']
 	};
 
-	const mergeOptions = deepAssign(DEFAULT, options, (a, b) => {
+	options = assign(DEFAULT, options, (a, b) => {
 		if (Array.isArray(a)) {
 			return a.concat(b);
 		}
 	});
 
 	return nodes => {
-		const reg = new RegExp(mergeOptions.atRules.join('|'));
-
-		nodes.walkRules(rule => {
-			if (rule.selector !== ':root') {
-				return;
-			}
-
-			rule.each(decl => {
-				const prop = decl.prop;
-				const value = decl.value;
-				maps[prop] = value;
-			});
-		});
+		const maps = getProperty(nodes);
+		const {atRules} = options;
 
-		nodes.walkAtRules(reg, rules => {
-			rules.params = resolveValue(rules.params);
+		nodes.walkAtRules(new RegExp(atRules.join('|')), rules => {
+			rules.params = resolveValue(rules.params, maps);
 		});
 	};
 });

test/test.js

@@ -43,8 +43,8 @@ test('it change two properties for @if, @else if', t => {
 });
 
 test('it change multi properties for @each', t => {
-	const expected = ':root{ --array: foo, bar, baz; } @each $val in foo, bar, baz @for foo, bar, baz';
-	const value = ':root{ --array: foo, bar, baz; } @each $val in var(--array) @for var(--array)';
+	const expected = ':root{ --array: foo, bar, baz; } @each $val in foo, bar, baz {} @for foo, bar, baz {}';
+	const value = ':root{ --array: foo, bar, baz; } @each $val in var(--array) {} @for var(--array) {}';
 	t.is(processing(value, {atRules: ['each']}), expected);
 });