refactor: add ciaplu for pattern matching in language detection and MIME type resolution

package-lock.json

@@ -22,6 +22,7 @@
         "babel-loader": "~8.2.3",
         "better-sqlite3": "~10.0.0",
         "chalk": "~4.1.2",
+        "ciaplu": "^2.2.0",
         "cpu-features": "^0.0.10",
         "cross-env": "~7.0.2",
         "css-loader": "~6.5.0",
@@ -5608,6 +5609,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/ciaplu": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ciaplu/-/ciaplu-2.2.0.tgz",
+      "integrity": "sha512-7y8s0GMFpIKqX2kwiOEYbaX3P9tPIbX4x41uw8GZjkZ+y0QZrpY3PFjE2Ed6BOeFxcCWi7b85MYHeiRrVrlSOQ==",
+      "license": "MIT"
+    },
     "node_modules/clean-css": {
       "version": "5.3.2",
       "license": "MIT",
@@ -20345,6 +20352,11 @@
       "version": "3.9.0",
       "dev": true
     },
+    "ciaplu": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ciaplu/-/ciaplu-2.2.0.tgz",
+      "integrity": "sha512-7y8s0GMFpIKqX2kwiOEYbaX3P9tPIbX4x41uw8GZjkZ+y0QZrpY3PFjE2Ed6BOeFxcCWi7b85MYHeiRrVrlSOQ=="
+    },
     "clean-css": {
       "version": "5.3.2",
       "requires": {

package.json

@@ -131,6 +131,7 @@
     "babel-loader": "~8.2.3",
     "better-sqlite3": "~10.0.0",
     "chalk": "~4.1.2",
+    "ciaplu": "^2.2.0",
     "cpu-features": "^0.0.10",
     "cross-env": "~7.0.2",
     "css-loader": "~6.5.0",

src/common/libs/langDetector.ts

@@ -1,3 +1,5 @@
+import { match } from 'ciaplu';
+
 function isJSON (str: string) {
    try {
       if (!['{', '['].includes(str.trim()[0]))
@@ -176,17 +178,13 @@ function isMD (str: string) {
 }
 
 export function langDetector (str: string) {
-   if (!str || !str.trim().length)
+   return match(str)
-      return 'text';
+      .when(() => !str || !str.trim().length, () => 'text')
-   if (isJSON(str))
+      .when(isJSON, () => 'json')
-      return 'json';
+      .when(isHTML, () => 'html')
-   if (isHTML(str))
+      .when(isSVG, () => 'svg')
-      return 'html';
+      .when(isXML, () => 'xml')
-   if (isSVG(str))
+      .when(isMD, () => 'markdown')
-      return 'svg';
+      .otherwise(() => 'text')
-   if (isXML(str))
+      .return();
-      return 'xml';
-   if (isMD(str))
-      return 'markdown';
-   return 'text';
 }

src/common/libs/mimeFromHex.ts

@@ -1,45 +1,25 @@
+import { match } from 'ciaplu';
+
 export function mimeFromHex (hex: string) {
-   switch (hex.substring(0, 4)) { // 2 bytes
+   return match(hex.substring(0, 4)) // 2 bytes
-      case '424D':
+      .with('424D', () => ({ ext: 'bmp', mime: 'image/bmp' }))
-         return { ext: 'bmp', mime: 'image/bmp' };
+      .with('1F8B', () => ({ ext: 'tar.gz', mime: 'application/gzip' }))
-      case '1F8B':
+      .with('0B77', () => ({ ext: 'ac3', mime: 'audio/vnd.dolby.dd-raw' }))
-         return { ext: 'tar.gz', mime: 'application/gzip' };
+      .with('7801', () => ({ ext: 'dmg', mime: 'application/x-apple-diskimage' }))
-      case '0B77':
+      .with('4D5A', () => ({ ext: 'exe', mime: 'application/x-msdownload' }))
-         return { ext: 'ac3', mime: 'audio/vnd.dolby.dd-raw' };
+      .when((val) => ['1FA0', '1F9D'].includes(val), () => ({ ext: 'Z', mime: 'application/x-compress' }))
-      case '7801':
+      .extracting(() => hex.substring(0, 6)) // 3 bytes
-         return { ext: 'dmg', mime: 'application/x-apple-diskimage' };
+      .with('FFD8FF', () => ({ ext: 'jpg', mime: 'image/jpeg' }))
-      case '4D5A':
+      .with('4949BC', () => ({ ext: 'jxr', mime: 'image/vnd.ms-photo' }))
-         return { ext: 'exe', mime: 'application/x-msdownload' };
+      .with('425A68', () => ({ ext: 'bz2', mime: 'application/x-bzip2' }))
-      case '1FA0':
+      .extracting(() => hex) // 4 bytes
-      case '1F9D':
+      .with('89504E47', () => ({ ext: 'png', mime: 'image/png' }))
-         return { ext: 'Z', mime: 'application/x-compress' };
+      .with('47494638', () => ({ ext: 'gif', mime: 'image/gif' }))
-      default:
+      .with('25504446', () => ({ ext: 'pdf', mime: 'application/pdf' }))
-         switch (hex.substring(0, 6)) { // 3 bytes
+      .with('504B0304', () => ({ ext: 'zip', mime: 'application/zip' }))
-            case 'FFD8FF':
+      .with('425047FB', () => ({ ext: 'bpg', mime: 'image/bpg' }))
-               return { ext: 'jpg', mime: 'image/jpeg' };
+      .with('4D4D002A', () => ({ ext: 'tif', mime: 'image/tiff' }))
-            case '4949BC':
+      .with('00000100', () => ({ ext: 'ico', mime: 'image/x-icon' }))
-               return { ext: 'jxr', mime: 'image/vnd.ms-photo' };
+      .otherwise(() => ({ ext: '', mime: 'unknown ' + hex }))
-            case '425A68':
+      .return();
-               return { ext: 'bz2', mime: 'application/x-bzip2' };
-            default:
-               switch (hex) { // 4 bites
-                  case '89504E47':
-                     return { ext: 'png', mime: 'image/png' };
-                  case '47494638':
-                     return { ext: 'gif', mime: 'image/gif' };
-                  case '25504446':
-                     return { ext: 'pdf', mime: 'application/pdf' };
-                  case '504B0304':
-                     return { ext: 'zip', mime: 'application/zip' };
-                  case '425047FB':
-                     return { ext: 'bpg', mime: 'image/bpg' };
-                  case '4D4D002A':
-                     return { ext: 'tif', mime: 'image/tiff' };
-                  case '00000100':
-                     return { ext: 'ico', mime: 'image/x-icon' };
-                  default:
-                     return { ext: '', mime: 'unknown ' + hex };
-               }
-         }
-   }
 }