Fix aliases

tadatuta · Jul 1, 2017 · 47b632c · 47b632c
1 parent 812376a
commit 47b632c
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/generate.js b/generate.js
@@ -30,25 +30,33 @@ const selectorRegexp = /\.fa\-(.+)\:before/; // .fa-clock-o:before
 
 const css = fs.readFileSync(path.join(faSourceFolder, 'css', 'font-awesome.css'), 'utf8');
 
-const glyphMap = {};
+const glyphToEntityMap = {};
+const entityToGlyphMap = {};
 const fa = postcss.plugin('fa', function(options = {}) {
     return function(css) {
         css.walkRules(function(rule) {
             const selectors = rule.selector.split(',');
 
+            let firstParsedModVal;
+
             selectors.forEach(selector => {
                 const parsedSelector = selectorRegexp.exec(selector);
+
                 if (!parsedSelector) return;
 
                 const modVal = parsedSelector[1];
+                firstParsedModVal || (firstParsedModVal = modVal);
 
                 const styleArr = [
                     '.' + blockWithModName + MOD_SEPARATOR + modVal + ' {'
                 ];
 
                 rule.walkDecls(function(decl, i) {
-                    glyphMap[decl.value.slice(2, decl.value.length - 1)] = blockWithModName + MOD_SEPARATOR + modVal;
-                    styleArr.push(decl.raws.before + '  background-image: url(' + blockWithModName + MOD_SEPARATOR + modVal + '.svg);');
+                    const glyphId = decl.value.slice(2, decl.value.length - 1);
+
+                    glyphToEntityMap[glyphId] = blockWithModName + MOD_SEPARATOR + firstParsedModVal;
+                    entityToGlyphMap[blockWithModName + MOD_SEPARATOR + modVal] = glyphId;
+                    styleArr.push(decl.raws.before + '  background-image: url(' + blockWithModName + MOD_SEPARATOR + firstParsedModVal + '.svg);');
                 });
 
                 styleArr.push('\n}');
@@ -77,12 +85,16 @@ function getBhTmpl(modVal, svg) {
 }
 
 postcss([fa]).process(css).then(result => {
-    fontBlast(path.join(faSourceFolder, 'fonts', 'fontawesome-webfont.svg'), 'tmp', { filenames: glyphMap });
+    fontBlast(path.join(faSourceFolder, 'fonts', 'fontawesome-webfont.svg'), 'tmp', { filenames: glyphToEntityMap });
+
+    const readGlyphs = {};
+
+    Promise.all(Object.keys(entityToGlyphMap).map(entity => {
+        const glyphId = entityToGlyphMap[entity];
+        const filename = glyphToEntityMap[glyphId] + '.svg';
+        const modVal = entity.split(MOD_SEPARATOR).pop();
 
-    Promise.all(Object.keys(glyphMap).map(key => {
-        const filename = glyphMap[key] + '.svg';
-        const modVal = glyphMap[key].split(MOD_SEPARATOR).pop();
-        const svgContent = fs.readFileSync(path.join('tmp', 'svg', filename), 'utf8');
+        const svgContent = readGlyphs[filename] || (readGlyphs[filename] = fs.readFileSync(path.join('tmp', 'svg', filename), 'utf8'));
 
         fs.writeFileSync(path.join(BLOCK_NAME, MOD_SEPARATOR + MOD_NAME, BLOCK_NAME + MOD_SEPARATOR + MOD_NAME + MOD_SEPARATOR + modVal + '.bemhtml.js'),
             getBemhtmlTmpl(modVal, svgContent));