Refactor code with nullish coalescing and optional chaining

PKief · Mar 15, 2020 · e4920f5 · e4920f5
1 parent 734b079
commit e4920f5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/src/commands/folderColor.ts b/src/commands/folderColor.ts
@@ -70,8 +70,7 @@ const validateColorInput = (colorInput: string) => {
 export const checkFolderColorStatus = (): string => {
     const defaultOptions = getDefaultIconOptions();
     const config = helpers.getMaterialIconsJSON();
-    return config.options.folders.color === undefined ?
-        defaultOptions.folders.color : config.options.folders.color;
+    return config.options.folders.color ?? defaultOptions.folders.color;
 };
 
 const setColorConfig = (value: string) => {

diff --git a/src/commands/opacity.ts b/src/commands/opacity.ts
@@ -36,8 +36,7 @@ const validateOpacityInput = (opacityInput: string) => {
 export const getCurrentOpacityValue = (): number => {
     const defaultOptions = getDefaultIconOptions();
     const config = helpers.getMaterialIconsJSON();
-    return config.options.opacity === undefined ?
-        defaultOptions.opacity : config.options.opacity;
+    return config.options.opacity ?? defaultOptions.opacity;
 };
 
 const setOpacityConfig = (opacity: number) => {

diff --git a/src/commands/saturation.ts b/src/commands/saturation.ts
@@ -36,8 +36,7 @@ const validateSaturationInput = (saturationInput: string) => {
 export const getCurrentSaturationValue = (): number => {
     const defaultOptions = getDefaultIconOptions();
     const config = helpers.getMaterialIconsJSON();
-    return config.options.saturation === undefined ?
-        defaultOptions.saturation : config.options.saturation;
+    return config.options.saturation ?? defaultOptions.saturation;
 };
 
 const setSaturationConfig = (saturation: number) => {

diff --git a/src/icons/generator/iconOpacity.ts b/src/icons/generator/iconOpacity.ts
@@ -52,7 +52,7 @@ export const setIconOpacity = (opacity: number, fileNames?: string[]) => {
  * @param opacity Opacity value
  */
 export const validateOpacityValue = (opacity: number) => {
-    return opacity !== null && opacity <= 1 && opacity >= 0;
+    return opacity !== undefined && opacity <= 1 && opacity >= 0;
 };
 
 /**
@@ -61,7 +61,7 @@ export const validateOpacityValue = (opacity: number) => {
  */
 const getSVGRootElement = (svg: string) => {
     const result = new RegExp(/<svg[^>]*>/).exec(svg);
-    return result.length > 0 ? result[0] : undefined;
+    return result?.[0];
 };
 
 /**

diff --git a/src/icons/generator/iconSaturation.ts b/src/icons/generator/iconSaturation.ts
@@ -60,7 +60,7 @@ export const setIconSaturation = (saturation: number, fileNames?: string[]) => {
  */
 const getSVGRootElement = (svg: string) => {
     const result = new RegExp(/<svg[^>]*>/).exec(svg);
-    return result.length > 0 ? result[0] : undefined;
+    return result?.[0];
 };
 
 /**
@@ -114,5 +114,5 @@ const removeFilterElement = (svg: string) => {
  * @param saturation Saturation value
  */
 export const validateSaturationValue = (saturation: number) => {
-    return saturation !== null && saturation <= 1 && saturation >= 0;
+    return saturation !== undefined && saturation <= 1 && saturation >= 0;
 };
diff --git a/src/scripts/contributors/index.ts b/src/scripts/contributors/index.ts
@@ -52,7 +52,7 @@ const fetchContributors = (page: string): Promise<{ contributorsOfPage: Contribu
                     const buffer = Buffer.concat(result);
                     const bufferAsString = buffer.toString('utf8');
                     const contributorsOfPage = JSON.parse(bufferAsString);
-                    resolve({ contributorsOfPage, nextPage: nextPage ? nextPage[1] : undefined });
+                    resolve({ contributorsOfPage, nextPage: nextPage?.[1] });
                 } catch (error) {
                     reject(error);
                 }

diff --git a/src/scripts/icons/checks/checkIconUsage.ts b/src/scripts/icons/checks/checkIconUsage.ts
@@ -92,7 +92,7 @@ const getAllUsedFolderIcons = (): string[] => {
 };
 
 const getAllFolderIcons = (theme: FolderTheme): (FolderIcon | DefaultIcon)[] => {
-    const icons = theme.icons ? theme.icons : [];
+    const icons = theme.icons || [];
     return [
         theme.defaultIcon,
         theme.rootFolder,