feat(svgo): use configuration to config svgo

package.json

@@ -12,6 +12,7 @@
     "format:write": "prettier --write 'src/**/*.ts'",
     "prebuild": "npm run copy:readme",
     "start": "ts-node ./src/bin/svg-to-ts.ts -s './inputfiles/*.svg'",
+    "start:svgconfig": "ts-node ./src/bin/svg-to-ts.ts -s './inputfiles/*.svg' --svgoConfig ./svgo-test.config.json",
     "start:ofl": "ts-node ./src/bin/svg-to-ts.ts -s './inputfiles/*.svg' --optimizeForLazyLoading true",
     "start:ofl:preCompile": "ts-node ./src/bin/svg-to-ts.ts -s './inputfiles/*.svg' --optimizeForLazyLoading true --preCompileSources true",
     "start:ofl:preCompile-additionalPath": "ts-node ./src/bin/svg-to-ts.ts -s './inputfiles/*.svg' --optimizeForLazyLoading true --preCompileSources true --additionalModelOutputPath ./additional",

src/bin/svg-to-ts.ts

@@ -1,21 +1,18 @@
 #!/usr/bin/env node
-
 import { convertToSingleFile } from '../lib/converters/single-file.converter';
 import { convertToMultipleFiles } from '../lib/converters/multiple-files.converter';
 import { getOptions, MultiFileConvertionOptions, SingleFileConvertionOptions } from '../lib/options/convertion-options';
 import { printLogo } from '../lib/helpers/log-helper';
 import { setupCommander } from '../lib/options/args-collector';
 
-const start = async () => {
+(async () => {
   setupCommander();
   printLogo();
   const convertionOptions = await getOptions();
 
   if (convertionOptions.optimizeForLazyLoading) {
-    convertToMultipleFiles(convertionOptions as MultiFileConvertionOptions);
+    await convertToMultipleFiles(convertionOptions as MultiFileConvertionOptions);
   } else {
-    convertToSingleFile(convertionOptions as SingleFileConvertionOptions);
+    await convertToSingleFile(convertionOptions as SingleFileConvertionOptions);
   }
-};
-
-start();
+})();

src/lib/converters/multiple-files.converter.ts

@@ -11,7 +11,7 @@ import {
 import { getFilePathsFromRegex } from '../helpers/regex-helpers';
 import { deleteFiles, deleteFolder, extractSvgContent, writeFile } from '../helpers/file-helpers';
 import { info, separatorEnd, separatorStart, success } from '../helpers/log-helper';
-import { svgOptimizer } from '../helpers/svg-optimization';
+import { generateSvgOptimizer } from '../helpers/svg-optimization';
 import { MultiFileConvertionOptions } from '../options/convertion-options';
 import { compile } from '../compiler/typescript-compiler';
 
@@ -28,8 +28,11 @@ export const convertToMultipleFiles = async (convertionOptions: MultiFileConvert
     modelFileName,
     additionalModelOutputPath,
     iconsFolderName,
+    svgoConfig,
     compileSources
   } = convertionOptions;
+  const svgOptimizer = generateSvgOptimizer(svgoConfig);
+
   let indexFileContent = '';
   let types = generateTypeDefinition(typeName);
 

src/lib/converters/single-file.converter.ts

@@ -10,13 +10,24 @@ import {
 import { getFilePathsFromRegex } from '../helpers/regex-helpers';
 import { extractSvgContent, writeFile } from '../helpers/file-helpers';
 import { error, success, underlineSuccess } from '../helpers/log-helper';
-import { svgOptimizer } from '../helpers/svg-optimization';
 import { SingleFileConvertionOptions } from '../options/convertion-options';
+import { generateSvgOptimizer } from '../helpers/svg-optimization';
 
 const typesDelimitor = ' | ';
 
 export const convertToSingleFile = async (convertionOptions: SingleFileConvertionOptions): Promise<void> => {
-  const { typeName, prefix, delimiter, interfaceName, outputDirectory, srcFiles, fileName } = convertionOptions;
+  const {
+    typeName,
+    prefix,
+    delimiter,
+    interfaceName,
+    outputDirectory,
+    srcFiles,
+    fileName,
+    svgoConfig
+  } = convertionOptions;
+  const svgOptimizer = generateSvgOptimizer(svgoConfig);
+
   let svgConstants = '';
   let types = generateTypeDefinition(typeName);
 

src/lib/helpers/svg-optimization.ts

@@ -1,110 +1,8 @@
-import { readFile } from './file-helpers';
-
 const svgo = require('svgo');
 
-export const svgOptimizer = new svgo({
-  plugins: [
-    {
-      cleanupAttrs: true
-    },
-    {
-      removeDoctype: true
-    },
-    {
-      removeXMLProcInst: true
-    },
-    {
-      removeComments: true
-    },
-    {
-      removeMetadata: true
-    },
-    {
-      removeTitle: true
-    },
-    {
-      removeDesc: true
-    },
-    {
-      removeUselessDefs: true
-    },
-    {
-      removeEditorsNSData: true
-    },
-    {
-      removeEmptyAttrs: true
-    },
-    {
-      removeHiddenElems: true
-    },
-    {
-      removeEmptyText: true
-    },
-    {
-      removeEmptyContainers: true
-    },
-    {
-      removeViewBox: false
-    },
-    {
-      cleanupEnableBackground: true
-    },
-    {
-      convertStyleToAttrs: true
-    },
-    {
-      convertColors: true
-    },
-    {
-      convertPathData: true
-    },
-    {
-      convertTransform: true
-    },
-    {
-      removeUnknownsAndDefaults: true
-    },
-    {
-      removeNonInheritableGroupAttrs: true
-    },
-    {
-      removeUselessStrokeAndFill: true
-    },
-    {
-      removeUnusedNS: true
-    },
-    {
-      cleanupIDs: true
-    },
-    {
-      cleanupNumericValues: true
-    },
-    {
-      moveElemsAttrsToGroup: true
-    },
-    {
-      moveGroupAttrsToElems: true
-    },
-    {
-      collapseGroups: true
-    },
-    {
-      removeRasterImages: false
-    },
-    {
-      mergePaths: true
-    },
-    {
-      convertShapeToPath: true
-    },
-    {
-      sortAttrs: true
-    },
-    {
-      removeDimensions: true
-    }
-  ]
-});
+import { readFile } from './file-helpers';
+
+export const generateSvgOptimizer = config => new svgo(config);
 
 export const getSvgoConfig = async (svgoConfig: any): Promise<string> => {
   if (typeof svgoConfig === 'string') {

svgo-test.config.json

@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    {
+      "cleanupAttrs": true
+    },
+    {
+      "removeDoctype": true
+    }
+  ]
+}