Merge pull request #39 from yuezk/bugfix

Use PostCSS 5 API #25 , Fix some bug.

Author: yisibl

lib/index.js

@@ -30,7 +30,7 @@ var removeDisplay = function(decl) {
     decl.parent.each(function(neighbor) {
       if ((neighbor.prop == 'display') && (neighbor.value == 'block' || neighbor.value == 'inline-block')) {
         //存在时删掉它
-        neighbor.removeSelf();
+        neighbor.remove();
       }
     });
   }
@@ -49,7 +49,7 @@ var removeFloat = function(decl) {
       if (
         (neighbor.prop == 'float' && neighbor.prop != 'none')
       ) {
-        neighbor.removeSelf();
+        neighbor.remove();
       }
     });
   }
@@ -75,17 +75,16 @@ function positionCenterMixin(decl, i) {
   });
 
   if (hasPosition && hasWidth && hasHeight) {
-    var widthValue, heightValue;
+    var widthValue, heightValue, matchWidth, matchHeight;
     if (decl.prop == 'position') {
       decl.value = 'absolute';
-      decl.parent.eachDecl(function(decl) {
+      decl.parent.walkDecls(function(decl) {
 
         if (decl.prop == 'width') {
           matchWidth = decl.value.match(reVALUE);
           if (matchWidth && matchWidth != null) {
             widthValue = (-matchWidth[1] / 2) + matchWidth[2];
           }
-
         }
         if (decl.prop == 'height') {
           matchHeight = decl.value.match(reVALUE);
@@ -96,7 +95,7 @@ function positionCenterMixin(decl, i) {
       });
 
       //在后面插入计算的内容
-      var reBefore = decl.before.replace(reBLANK_LINE, '$1')
+      var reBefore = decl.raws.before.replace(reBLANK_LINE, '$1')
 
       insertDecl(decl, i, {
         before: reBefore,
@@ -130,11 +129,11 @@ function positionCenterMixin(decl, i) {
 function ellipsisMixin(decl, i) {
   // var decl = decl.parent.childs[i];
   if (decl.prop == 'text-overflow' && decl.value == 'ellipsis') {
-    var reBefore = decl.before.replace(reBLANK_LINE, '$1')
+    var reBefore = decl.raws.before.replace(reBLANK_LINE, '$1')
     var countOverflow = 0,
       countWhitespace = 0;
 
-    decl.parent.eachDecl(function(decl) {
+    decl.parent.walkDecls(function(decl) {
       // 如果存在 overflow 且不等于 hidden, 增加 white-space
       if (decl.prop == 'overflow') {
         decl.value = 'hidden';
@@ -182,12 +181,12 @@ function ellipsisMixin(decl, i) {
 function resizeMixin(decl, i) {
   if (decl.prop == 'resize' && decl.value !== 'none') {
     var count = 0;
-    decl.parent.eachDecl(function(decl) {
+    decl.parent.walkDecls(function(decl) {
       if (decl.prop == 'overflow')
         count++;
     });
     if (count === 0) {
-      var reBefore = decl.before.replace(reBLANK_LINE, '$1')
+      var reBefore = decl.raws.before.replace(reBLANK_LINE, '$1')
 
       insertDecl(decl, i, {
         before: reBefore,
@@ -211,7 +210,7 @@ function clearfixMixin(decl, i) {
     var count = 0;
 
     //当存在这些属性的时候不生成伪元素
-    decl.parent.eachDecl(function(decl) {
+    decl.parent.walkDecls(function(decl) {
       if (
         (decl.prop == "overflow" && decl.value != 'visible') ||
         (decl.prop == "display" && decl.value == 'inline-block') ||
@@ -251,9 +250,9 @@ function clearfixMixin(decl, i) {
       });
     } else {
       if (decl.next() && decl.next().type == "comment") {
-        decl.next().removeSelf();
+        decl.next().remove();
       }
-      decl.removeSelf();
+      decl.remove();
     }
   }
 }
@@ -267,7 +266,7 @@ function ieOpacityHack(decl, i) {
   var amount = Math.round(decl.value * 100);
   if (decl.prop == 'opacity') {
 
-    var reBefore = decl.before.replace(reBLANK_LINE, '$1')
+    var reBefore = decl.raws.before.replace(reBLANK_LINE, '$1');
 
     insertDecl(decl, i, {
       before: reBefore,
@@ -296,7 +295,7 @@ function ieRgbaHack(decl, i) {
     var ARGB   = "'" + "#" + colorA + colorR + colorG + colorB + "'";
 
     // 插入IE半透明滤镜
-    var reBefore = decl.before.replace(reBLANK_LINE, '$1')
+    var reBefore = decl.raws.before.replace(reBLANK_LINE, '$1')
     insertDecl(decl, i, {
       before: reBefore,
       prop: 'filter',
@@ -321,7 +320,7 @@ function ieRgbaHack(decl, i) {
 function ieInlineBlockHack(decl, i) {
   if (decl.prop == 'display' && decl.value == 'inline-block') {
 
-    var reBefore = decl.before.replace(reBLANK_LINE, '$1')
+    var reBefore = decl.raws.before.replace(reBLANK_LINE, '$1')
 
     insertDecl(decl, i, {
       before: reBefore,
@@ -394,7 +393,7 @@ function imageSetMixin(decl, i) {
 
           var nextrule = postcss.rule({
             selector: decl.parent.selector,
-            after: decl.parent.after,
+            after: decl.parent.raws.after,
             before: '\n  '
           });
           //插入 @规则 中的选择器
@@ -413,7 +412,7 @@ function imageSetMixin(decl, i) {
       }
     } else if (decl.value.indexOf('url(') != -1) {
       //没有image-set，执行以下
-      var retinaPaths = returnURL(decl.value, reNO_SETURL) //获取第一个url图片的路径
+      var retinaPaths = returnURL(decl.value, reNO_SETURL); //获取第一个url图片的路径
 
       // var retinaSizes = sizeOf(getAbsolutePath(retinaPaths[0][2]));
 
@@ -448,7 +447,7 @@ function imageSetMixin(decl, i) {
 function insertDecl(decl, i, newDecl) {
   var next = decl.next(),
     declAfter;
-  if (next && next.type == 'comment' && next.before.indexOf('\n') == -1) {
+  if (next && next.type == 'comment' && next.raws.before.indexOf('\n') == -1) {
     declAfter = next;
   } else {
     declAfter = decl;
@@ -466,7 +465,7 @@ var cssgraceRule = function(rule, i) {
   removeColons(rule, i);
 
   //遍历 decl
-  rule.eachDecl(function(decl, i) {
+  rule.walkDecls(function(decl, i) {
     removeDisplay(decl, i);
     ieInlineBlockHack(decl, i);
     ieOpacityHack(decl, i);
@@ -477,11 +476,11 @@ var cssgraceRule = function(rule, i) {
     imageSetMixin(decl, i);
   });
 
-  rule.eachDecl(function(decl, i) {
+  rule.walkDecls(function(decl, i) {
     clearfixMixin(decl, i);
   });
 
-  rule.eachDecl(function(decl, i) {
+  rule.walkDecls(function(decl, i) {
     positionCenterMixin(decl, i);
     removeFloat(decl, i);
     removeDisplay(decl, i);
@@ -490,7 +489,7 @@ var cssgraceRule = function(rule, i) {
 
 //根据decl.value的值，返回paths数组
 function returnURL(val, reg) {
-  var result, paths = []
+  var result, paths = [];
   while ((result = reg.exec(val)) != null) {
     paths.push(result);
   }
@@ -505,17 +504,22 @@ function getAbsolutePath(sourcePath) {
   return path.resolve(currentFilePath, sourcePath.split("?")[0]);
 }
 
+function getCurrentFilePath(node) {
+  var inputfile = node.source && node.source.input && node.source.input.file;
+  var dirname = inputfile ? path.dirname(inputfile) : '';
+  return dirname;
+}
+
 // PostCSS Processor
-var cssprocess = function(css, opts) {
+var cssprocess = function(css) {
   //保存当前处理文件路径
-  currentFilePath = path.dirname(opts.from);
-  css.eachRule(cssgraceRule);
+  currentFilePath = getCurrentFilePath(css) || currentFilePath;
+  css.walkRules(cssgraceRule);
 }
 
 var pack = function(css, opts) {
   //保存当前处理文件路径
   currentFilePath = path.dirname(opts.from);
-  console.log(currentFilePath);
   return postcss(cssprocess).process(css, opts).css;
 }
 

package.json

@@ -23,13 +23,10 @@
     "postproccessor"
   ],
   "dependencies": {
+    "postcss": "^5.0.0",
     "image-size": "^0.3.5"
   },
-  "peerDependencies": {
-    "postcss": "^4.0.0"
-  },
   "devDependencies": {
-    "postcss": "^4.0.0",
     "tape": "^3.0.0"
   },
   "scripts": {