Dry code

Author: TrySound

src/index.js

@@ -101,68 +101,51 @@ const createGenerator = (i = 0) => name =>
 module.exports = postcss.plugin(plugin, () => (css, result) => {
   const { icssImports, icssExports } = extractICSS(css);
   const getAliasName = createGenerator();
+  const addExports = (node, name, value) => {
+    if (isForbidden(name)) {
+      result.warn(`Dot and hash symbols are not allowed in value "${name}"`, {
+        node
+      });
+    } else {
+      if (icssExports[name]) {
+        result.warn(`"${name}" value already declared`, { node });
+      }
+    }
+    icssExports[name] = replaceValueSymbols(value, icssExports);
+  };
 
-  css.walkAtRules("value", atRule => {
-    if (atRule.params.indexOf("@value") !== -1) {
-      result.warn(`Invalid value definition "${atRule.params}"`, {
-        node: atRule
+  css.walkAtRules("value", atrule => {
+    if (atrule.params.indexOf("@value") !== -1) {
+      result.warn(`Invalid value definition "${atrule.params}"`, {
+        node: atrule
       });
     } else {
-      const parsed = parse(atRule.params);
+      const parsed = parse(atrule.params);
       if (parsed) {
         if (parsed.type === "value") {
           const { name, value } = parsed;
-          if (isForbidden(name)) {
-            result.warn(
-              `Dot and hash symbols are not allowed in value "${name}"`,
-              { node: atRule }
-            );
-          } else {
-            if (icssExports[name]) {
-              result.warn(`"${name}" value already declared`, {
-                node: atRule
-              });
-            }
-            icssExports[name] = replaceValueSymbols(value, icssExports);
-          }
+          addExports(atrule, name, value);
         }
         if (parsed.type === "import") {
-          const pairs = parsed.pairs
-            .filter(([, local]) => {
-              if (isForbidden(local)) {
-                result.warn(
-                  `Dot and hash symbols are not allowed in value "${local}"`
-                );
-                return false;
-              }
-              return true;
-            })
-            .map(([imported, local]) => {
-              const alias = getAliasName(local);
-              if (icssExports[local]) {
-                result.warn(`"${local}" value already declared`, {
-                  node: atRule
-                });
-              }
-              icssExports[local] = alias;
-              return [alias, imported];
-            });
-          if (pairs.length) {
-            const aliases = fromPairs(pairs);
-            icssImports[parsed.path] = Object.assign(
-              {},
-              icssImports[parsed.path],
-              aliases
-            );
-          }
+          const pairs = parsed.pairs.map(([imported, local]) => {
+            const alias = getAliasName(local);
+            addExports(atrule, local, alias);
+            return [alias, imported];
+          });
+          const aliases = fromPairs(pairs);
+          icssImports[parsed.path] = Object.assign(
+            {},
+            icssImports[parsed.path],
+            aliases
+          );
         }
       } else {
-        result.warn(`Invalid value definition "${atRule.params}"`, {
-          node: atRule
+        result.warn(`Invalid value definition "${atrule.params}"`, {
+          node: atrule
         });
       }
     }
-    atRule.remove();
+    atrule.remove();
   });
 
   replaceSymbols(css, icssExports);

test/test.js

@@ -351,6 +351,16 @@ test("warn on using dot or hash in value name", () => {
       #blue {}
     `,
     expected: `
+      :import('path') {
+        __value___red__0: .red;
+        __value___blue__1: #blue
+      }
+      :export {
+        colors.red: #f00;
+        colors#blue: #00f;
+        .red: __value___red__0;
+        #blue: __value___blue__1
+      }
       .foo { color: colors.red; background: colors#blue }
       .red {}
       #blue {}