Update Material Design Icons to 4.0.0

scripts/extract-md.js

@@ -2,36 +2,61 @@
 const fs = require('fs');
 const path = require('path');
 const { writeIconModule, createExportLine,
-    readFromSvgContent, findAllSvgFiles : baseFindAllSvgFiles } = require('./utils');
-const baseFolder = 'material-design-icons-3.0.1';
+    readFromSvgContent, findAllSvgFiles  } = require('./utils');
+const baseFolder = __dirname + 'material-design-icons-4.0.0';
 
-const outFolder = path.join('..', 'src', 'md');
+const outFolder = __dirname + '/' + path.join('..', 'src', 'md');
 /**
  * Download latest from:
  * https://github.com/google/material-design-icons/releases
  *
  *
  *
  */
-const filterName = f => f.indexOf('svg/production') >= 0;
-const filterSize = f => f.indexOf('_24px') >= 0;
-const findAllSvgFiles = baseFindAllSvgFiles(filterName);
+const filterName = f => (
+    (f.indexOf('24px.svg') >= 0) && (
+    (f.indexOf('materialicons/') >= 0) ||
+    (f.indexOf('materialiconsoutlined/') >= 0) ||
+    (f.indexOf('materialiconstwotone/') >= 0)
+  )
+);
 
+const filterSize = f => f.indexOf('24px') >= 0;
 
-const extractName = fname => {
-    const index = fname.indexOf('_24px.svg');
-    return fname.substring(0, index);
+const modifierMap = {
+    outline: /materialiconsoutlined/,
+    twotone: /materialiconstwotone/,
+};
+
+const nameRegex = /^.*\/(\w+)\/materialicons.*\/24px.svg$/;
+
+const extractName = (fname, path) => {
+    const modifier = (
+        Object.entries(modifierMap)
+            .find(([, regex]) => regex.test(path)) || []
+    )[0];
+
+    const name = path.match(nameRegex)[1];
+
+    if (!name) {
+        throw new Error(`Did not find a valid name for ${path}`);
+    }
+
+    return [
+        'ic',
+        name,
+        modifier,
+    ].filter(Boolean).join('_');
 };
 
 const generateFiles = () => {
-    const svgs = findAllSvgFiles(baseFolder).filter(filterSize);
+    const svgs = findAllSvgFiles(filterName, undefined, baseFolder).filter(filterSize);
 
     const processed = {};
 
     const exportLines = svgs.map( svgFile => {
         const filename = path.basename(svgFile);
-        const name = extractName(filename);
-
+        const name = extractName(filename, svgFile);
         if ( !processed[name] ) { //there seems to be some duplicate names
             const content = fs.readFileSync(svgFile, { encoding: 'UTF-8' });
             const { viewBox, children } = readFromSvgContent(content);
@@ -46,4 +71,4 @@ const generateFiles = () => {
 
 };
 
-generateFiles();
+generateFiles();

scripts/utils.js

@@ -126,7 +126,7 @@ const readFromSvgContent = (content) => {
     const attribs = filteredAttribs.reduce( (partial, key) => {
         if ( $svg[0].attribs && $svg[0].attribs[key] ) {
             return Object.assign({}, partial, { [key]: $svg[0].attribs[key] })
-        } 
+        }
         return partial
     }, {})
     return { children, viewBox: $svg[0].attribs['viewBox'], attribs };
@@ -149,7 +149,7 @@ const generateFromSvgFiles = (svgFolder, outFolder, options = {} ) => {
         const content = fs.readFileSync(path.join(svgFolder,f), { encoding: 'UTF-8' });
 
         const { viewBox, children, attribs } = readFromSvgContent(content, f);
-        
+
         return { name: exportableName(extractName(f)), children, viewBox, f, attribs };
     });
     //write it
@@ -159,8 +159,8 @@ const generateFromSvgFiles = (svgFolder, outFolder, options = {} ) => {
         if ( !exportedNames[name] ) {
             const safeExportName = TRANSLATE_MAP[name] ? TRANSLATE_MAP[name] : name;
             const { viewBox, children, attribs } = parsed;
-            
-            const exportLine = createExportLine(safeExportName, viewBox, children, attribs); //`export const ${safeExportName} = ${exportedObject};`;            
+
+            const exportLine = createExportLine(safeExportName, viewBox, children, attribs); //`export const ${safeExportName} = ${exportedObject};`;
             fs.writeFileSync(path.join(outFolder, `${safeExportName}.js`), exportLine);
 
             exportedNames[name] = name;
@@ -177,10 +177,18 @@ const generateFromSvgFiles = (svgFolder, outFolder, options = {} ) => {
 
 const findAllSvgFiles = (filterName, filterDir, dir, filelist = []) => {
     fs.readdirSync(dir).forEach(file => {
-        filelist = fs.statSync(path.join(dir, file)).isDirectory()
-        ? findAllSvgFiles(filterName, filterDir, path.join(dir, file), filelist)
-        : filelist.filter(filterName).concat(path.join(dir, file));
+        const isDir = fs.statSync(path.join(dir, file)).isDirectory();
+
+        if (isDir) {
+            filelist = findAllSvgFiles(filterName, filterDir, path.join(dir, file), filelist);
+            return;
+        }
+
+        const pathToAdd = path.join(dir, file);
 
+        if (!filterName(pathToAdd)) return;
+
+        filelist = filelist.concat(pathToAdd);
     });
     return filelist;
 
@@ -196,4 +204,4 @@ module.exports = {
     generateExportCode,
     writeIconModule,
     generateFromSvgFiles
-};
+};