postcss-custom-properties - npm Package Compare versions

Comparing version 8.0.1 to 8.0.2

CHANGELOG.md

 # Changes to PostCSS Custom Properties
 
+### 8.0.2 (September 17, 2018)
+
+- Fixed: Spacing is preserved before replaced variables.
+
 ### 8.0.1 (September 17, 2018)
@@ -4,0 +8,0 @@

index.cjs.js

@@ -155,16 +155,8 @@ 'use strict';
           // conditionally replace a known custom property
-          child.replaceWith(...asClonedArray(customProperties[name], null));
-          const nextCustomProperties = Object.assign({}, customProperties);
-          delete nextCustomProperties[name];
-          transformValueAST(root, nextCustomProperties);
+          child.replaceWith(...asClonedArrayWithBeforeSpacing(customProperties[name], child.raws.before));
+          retransformValueAST(root, customProperties, name);
         } else if (fallbacks.length) {
           // conditionally replace a custom property with a fallback
-          const clonedFallbacks = asClonedArray(fallbacks);
-          Object.assign(clonedFallbacks[0].raws, {
-            before: ''
-          });
-          child.replaceWith(...clonedFallbacks);
-          const nextCustomProperties = Object.assign({}, customProperties);
-          delete nextCustomProperties[name];
-          transformValueAST(root, nextCustomProperties);
+          child.replaceWith(...asClonedArrayWithBeforeSpacing(fallbacks, child.raws.before));
+          transformValueAST(root, customProperties);
         }
@@ -178,9 +170,27 @@ } else {
   return root;
+} // retransform the current ast without a custom property (to prevent recursion)
+
+function retransformValueAST(root, customProperties, withoutProperty) {
+  const nextCustomProperties = Object.assign({}, customProperties);
+  delete nextCustomProperties[withoutProperty];
+  return transformValueAST(root, nextCustomProperties);
 } // match var() functions
 
+
 const varRegExp = /^var$/i; // whether the node is a var() function
 
-const isVarFunction = node => node.type === 'func' && varRegExp.test(node.value) && Object(node.nodes).length > 0; // return an array with its nodes cloned
+const isVarFunction = node => node.type === 'func' && varRegExp.test(node.value) && Object(node.nodes).length > 0; // return an array with its nodes cloned, preserving the raw
 
 
+const asClonedArrayWithBeforeSpacing = (array, beforeSpacing) => {
+  const clonedArray = asClonedArray(array, null);
+
+  if (clonedArray[0]) {
+    clonedArray[0].raws.before = beforeSpacing;
+  }
+
+  return clonedArray;
+}; // return an array with its nodes cloned
+
+
 const asClonedArray = (array, parent) => array.map(node => asClonedNode(node, parent)); // return a cloned node
@@ -187,0 +197,0 @@

package.json

 {
   "name": "postcss-custom-properties",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "Use Custom Properties Queries in CSS",
@@ -5,0 +5,0 @@ "author": "Jonathan Neal <[e-mail]>",

No alert changes

Improved metrics

Total package byte prevSize

109535

increased by1.72%

Lines of code

918

increased by0.88%

No dependency changes