Fix icss-composed contract

Author: TrySound

src/index.js

@@ -128,16 +128,24 @@ const isValue = (messages, name) =>
 const isRedeclared = (messages, name) =>
   messages.find(msg => msg.type === "icss-scoped" && msg.name === name);
 
-const getComposed = (messages, name) =>
-  messages
-    .filter(msg => msg.type === "icss-composed" && msg.name === name)
-    .map(msg => msg.value);
+const flatten = array => array.reduce((acc, item) => [...acc, ...item], []);
+
+const getComposed = (name, messages, root) => [
+  name,
+  ...flatten(
+    messages
+      .filter(msg => msg.name === name && msg.value !== root)
+      .map(msg => getComposed(msg.value, messages, root))
+  )
+];
 
 const composeAliases = (aliases, messages) =>
   Object.keys(aliases).reduce(
     (acc, name) =>
       Object.assign({}, acc, {
-        [name]: [aliases[name], ...getComposed(messages, name)].join(" ")
+        [name]: getComposed(name, messages, name)
+          .map(value => aliases[value] || value)
+          .join(" ")
       }),
     {}
   );
@@ -147,6 +155,9 @@ module.exports = postcss.plugin(plugin, (options = {}) => (css, result) => {
     options.generateScopedName ||
     genericNames("[name]__[local]---[hash:base64:5]");
   const input = (css && css.source && css.source.input) || {};
+  const composedMessages = result.messages.filter(
+    msg => msg.type === "icss-composed"
+  );
   const aliases = {};
   walkRules(css, rule => {
     const getAlias = name => {
@@ -177,5 +188,5 @@ module.exports = postcss.plugin(plugin, (options = {}) => (css, result) => {
   });
   result.messages.push(...getMessages(aliases));
   // icss-composed contract
-  addExports(css, composeAliases(aliases, result.messages));
+  addExports(css, composeAliases(aliases, composedMessages));
 });

test/test.js

@@ -761,24 +761,9 @@ test("icss-scoped contract", () => {
 
 test("icss-composed contract", () => {
   const inputMessages = [
-    {
-      plugin: "previous-plugin",
-      type: "icss-composed",
-      name: "foo",
-      value: "__compose__foo1"
-    },
-    {
-      plugin: "previous-plugin",
-      type: "icss-composed",
-      name: "foo",
-      value: "__compose__foo2"
-    },
-    {
-      plugin: "previous-plugin",
-      type: "icss-composed",
-      name: "bar",
-      value: "__compose__bar"
-    }
+    { type: "icss-composed", name: "foo", value: "__compose__foo1" },
+    { type: "icss-composed", name: "foo", value: "__compose__foo2" },
+    { type: "icss-composed", name: "bar", value: "__compose__bar" }
   ];
   return runMessages({
     fixture: `
@@ -825,6 +810,109 @@ test("icss-composed contract", () => {
   });
 });
 
+test("icss-composed contract with local dependencies", () => {
+  const inputMessages = [
+    { type: "icss-composed", name: "bar", value: "foo" },
+    { type: "icss-composed", name: "tar", value: "baz" },
+    { type: "icss-composed", name: "doo", value: "bar" },
+    { type: "icss-composed", name: "doo", value: "tar" }
+  ];
+  return runMessages({
+    fixture: `
+      .foo {}
+      .bar {}
+      .baz {}
+      .tar {}
+      .doo {}
+    `,
+    expected: `
+      :export {
+        foo: __scope__foo;
+        bar: __scope__bar __scope__foo;
+        baz: __scope__baz;
+        tar: __scope__tar __scope__baz;
+        doo: __scope__doo __scope__bar __scope__foo __scope__tar __scope__baz
+      }
+      .__scope__foo {}
+      .__scope__bar {}
+      .__scope__baz {}
+      .__scope__tar {}
+      .__scope__doo {}
+    `,
+    inputMessages,
+    outputMessages: [
+      ...inputMessages,
+      {
+        plugin: "postcss-icss-selectors",
+        type: "icss-scoped",
+        name: "foo",
+        value: "__scope__foo"
+      },
+      {
+        plugin: "postcss-icss-selectors",
+        type: "icss-scoped",
+        name: "bar",
+        value: "__scope__bar"
+      },
+      {
+        plugin: "postcss-icss-selectors",
+        type: "icss-scoped",
+        name: "baz",
+        value: "__scope__baz"
+      },
+      {
+        plugin: "postcss-icss-selectors",
+        type: "icss-scoped",
+        name: "tar",
+        value: "__scope__tar"
+      },
+      {
+        plugin: "postcss-icss-selectors",
+        type: "icss-scoped",
+        name: "doo",
+        value: "__scope__doo"
+      }
+    ]
+  });
+});
+
+test("icss-composed contract with recursive local composition", () => {
+  const inputMessages = [
+    { type: "icss-composed", name: "foo", value: "bar" },
+    { type: "icss-composed", name: "bar", value: "foo" }
+  ];
+  return runMessages({
+    fixture: `
+      .foo {}
+      .bar {}
+    `,
+    expected: `
+      :export {
+        foo: __scope__foo __scope__bar;
+        bar: __scope__bar __scope__foo
+      }
+      .__scope__foo {}
+      .__scope__bar {}
+    `,
+    inputMessages,
+    outputMessages: [
+      ...inputMessages,
+      {
+        plugin: "postcss-icss-selectors",
+        type: "icss-scoped",
+        name: "foo",
+        value: "__scope__foo"
+      },
+      {
+        plugin: "postcss-icss-selectors",
+        type: "icss-scoped",
+        name: "bar",
+        value: "__scope__bar"
+      }
+    ]
+  });
+});
+
 test("icss-value contract", () => {
   const inputMessages = [
     {