Extract code into functions for clarity

Author: pilafmon

src/rev-web-assets.ts

@@ -100,7 +100,8 @@ const revWebAssets = {
       // assets manifest detail.
       const hashLen =         8;
       const brokenWindows =   /$\r\n/gm;
-      const contents =        fs.readFileSync(detail.origin).toString().replace(brokenWindows, '\n');
+      const normalize =       (buffer: Buffer) => buffer.toString().replace(brokenWindows, '\n');
+      const contents =        normalize(fs.readFileSync(detail.origin));
       const hash =            crypto.createHash('md5').update(contents).digest('hex');
       detail.bytes =          contents.length;
       detail.hash =           hash.substring(0, hashLen);
@@ -152,11 +153,12 @@ const revWebAssets = {
       const metaPattern = /(<meta\s.*content=['"]?)([^"'>\s]*)(['"]?[^<]*>)/ig
       const process = (detail: ManifestDetail) => {
          const content = fs.readFileSync(detail.origin, 'utf-8');
+         const calcNext = () => revWebAssets.hashAssetPath(manifest, detail, settings);
          const hashedContent = content
-            .replace(hrefPattern, revWebAssets.hashAssetPath(manifest, detail, settings))
-            .replace(srcPattern,  revWebAssets.hashAssetPath(manifest, detail, settings))
-            .replace(metaPattern, revWebAssets.hashAssetPath(manifest, detail, settings));
-         detail.destPath = detail.destFolder + '/' + detail.filename;
+            .replace(hrefPattern, calcNext())
+            .replace(srcPattern,  calcNext())
+            .replace(metaPattern, calcNext());
+         detail.destPath = `${detail.destFolder}/${detail.filename}`;
          fs.mkdirSync(detail.destFolder, { recursive: true });
          fs.writeFileSync(detail.destPath, hashedContent);
          };
@@ -167,10 +169,10 @@ const revWebAssets = {
       // url(../background.jpg)
       const urlPattern = /(url\(["']?)([^)('"]*)(["']?\))/ig
       const process = (detail: ManifestDetail) => {
-         const content = fs.readFileSync(detail.origin, 'utf-8');
-         const hashedContent = content
-            .replace(urlPattern, revWebAssets.hashAssetPath(manifest, detail, settings));
-         detail.destPath = detail.destFolder + '/' + (detail.hashedFilename ?? detail.filename);
+         const content =       fs.readFileSync(detail.origin, 'utf-8');
+         const calcNext =      () => revWebAssets.hashAssetPath(manifest, detail, settings);
+         const hashedContent = content.replace(urlPattern, calcNext());
+         detail.destPath =     `${detail.destFolder}/${detail.hashedFilename ?? detail.filename}`;
          fs.mkdirSync(detail.destFolder, { recursive: true });
          fs.writeFileSync(detail.destPath, hashedContent);
          };
@@ -179,7 +181,7 @@ const revWebAssets = {
 
    copyAssets(manifest: ManifestDetail[]) {
       const process = (detail: ManifestDetail) => {
-         detail.destPath = detail.destFolder + '/' + (detail.hashedFilename ?? detail.filename);
+         detail.destPath = `${detail.destFolder}/${detail.hashedFilename ?? detail.filename}`;
          fs.mkdirSync(detail.destFolder, { recursive: true });
          fs.copyFileSync(detail.origin, detail.destPath);
          };