chore: use @markedjs/eslint-config (#381)

markedjs · Aug 6, 2024 · cf504f4 · cf504f4
1 parent 1caf6d1
commit cf504f4
Show file tree

Hide file tree

Showing 18 changed files with 2,013 additions and 3,633 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,16 @@
+import markedEslintConfig from '@markedjs/eslint-config';
+import globals from 'globals';
+
+export default [
+  {
+    ignores: ['**/coverage'],
+  },
+  ...markedEslintConfig,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.mocha,
+      },
+    },
+  },
+];
diff --git a/lib/cli.js b/lib/cli.js
@@ -6,6 +6,8 @@ import coa from 'coa';
 import { HtmlDiffer } from './index.js';
 import * as diffLogger from './logger.js';
 import { defaults, presets } from './defaults.js';
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
 
 const boldGreen = chalk.green.bold;
 const boldRed = chalk.red.bold;
@@ -50,7 +52,7 @@ export function run(argv) {
     .title('Name of a preset')
     .short('p').long('preset')
     .val(function(val) {
-      if (!presets.hasOwnProperty(val)) {
+      if (!Object.hasOwnProperty.call(presets, val)) {
         console.log(boldRed(val) + ' is an invalid preset name. Available presets are: '
           + Object.keys(presets).map(function(preset) {
             return boldGreen(preset);
@@ -83,7 +85,7 @@ export function run(argv) {
     const [html1, html2, configFile] = await Promise.all([
       readAsync(path.resolve(args.path1), 'utf8'),
       readAsync(path.resolve(args.path2), 'utf8'),
-      opts.config ? readAsync(path.resolve(opts.config), 'utf8') : undefined
+      opts.config ? readAsync(path.resolve(opts.config), 'utf8') : undefined,
     ]);
 
     const config = configFile ? JSON.parse(configFile) : {};
@@ -98,7 +100,7 @@ export function run(argv) {
     const diff = await htmlDiffer.diffHtml(html1, html2);
 
     const loggerOptions = {
-      charsAroundDiff: opts.charsAroundDiff
+      charsAroundDiff: opts.charsAroundDiff,
     };
     if (!diffLogger.logDiffText(diff, loggerOptions)) {
       process.exit(1);

diff --git a/lib/defaults.js b/lib/defaults.js
@@ -2,7 +2,7 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 export const presets = {
-  bem: require('../presets/bem.json')
+  bem: require('../presets/bem.json'),
 };
 
 /**
@@ -28,7 +28,7 @@ export function defaults(options = {}) {
 
   if (options.preset) {
     const preset = String(options.preset);
-    if (!presets.hasOwnProperty(preset)) {
+    if (!Object.hasOwnProperty.call(presets, preset)) {
       throw Error(preset + ' is an invalid preset name.');
     }
 
@@ -46,6 +46,6 @@ export function defaults(options = {}) {
     ignoreEndTags: false,
     ignoreSelfClosingSlash: false,
 
-    ...options
+    ...options,
   };
-};
+}
diff --git a/lib/index.js b/lib/index.js
@@ -37,7 +37,7 @@ export class HtmlDiffer {
     // the sax parser is async
     const tokens = {
       html1: await getModifiedTokens(html1, this.options),
-      html2: await getModifiedTokens(html2, this.options)
+      html2: await getModifiedTokens(html2, this.options),
     };
 
     const htmlDiffer = new HtmlDiff(this.options, tokens);
@@ -47,7 +47,7 @@ export class HtmlDiffer {
     const diff = htmlDiffer.diff('html1', 'html2');
 
     return handleMasks(diff);
-  };
+  }
 
   /**
    * Compares two given chunks of HTML

diff --git a/lib/logger.js b/lib/logger.js
@@ -19,7 +19,7 @@ const grey = chalk.grey;
  */
 export function getDiffText(diff, options) {
   options = options || {
-    charsAroundDiff: 40
+    charsAroundDiff: 40,
   };
 
   let charsAroundDiff = options.charsAroundDiff,
@@ -48,7 +48,9 @@ export function getDiffText(diff, options) {
     if (partValue.length < charsAroundDiff * 2) {
       output += (index !== 0 ? '' : '\n') + grey(partValue);
     } else {
-      index !== 0 && (output += grey(partValue.substr(0, charsAroundDiff)));
+      if (index !== 0) {
+        output += grey(partValue.substr(0, charsAroundDiff));
+      }
 
       if (index < diff.length - 1) {
         output += '\n...\n' + grey(partValue.substr(partValue.length - charsAroundDiff));

diff --git a/lib/utils/mask.js b/lib/utils/mask.js
@@ -90,4 +90,4 @@ export default function(diff) {
   diff = _revealMasks(diff);
 
   return _concatNotDiffParts(diff);
-};
+}
diff --git a/lib/utils/modify.js b/lib/utils/modify.js
@@ -75,7 +75,9 @@ export default function modify(value, options) {
     parser.on('text', function(textToken) {
       let text = textToken.text;
 
-      options.ignoreWhitespaces && (text = utils.removeWhitespaces(text));
+      if (options.ignoreWhitespaces) {
+        text = utils.removeWhitespaces(text);
+      }
 
       modifiedValues.push(serialize.text(text));
     });

diff --git a/lib/utils/serialize.js b/lib/utils/serialize.js
@@ -45,7 +45,9 @@ export function startTag(tagName, attrs, selfClosing) {
     res += ' ' + attr.name + '="' + utils.htmlEntities(attr.value) + '"';
   });
 
-  selfClosing && (res += '/');
+  if (selfClosing) {
+    res += '/';
+  }
 
   return res + '>';
 }

diff --git a/lib/utils/utils.js b/lib/utils/utils.js
@@ -107,7 +107,7 @@ export function sortAttrsValues(attrs, compareAttributesAsJSON) {
       }
 
       return JSON.parse(val);
-    } catch (err) {
+    } catch {
       return undefined;
     }
   }
@@ -198,7 +198,7 @@ export function htmlEntities(str) {
     "'": '&#39;',
     '"': '&quot;',
     '<': '&lt;',
-    '>': '&gt;'
+    '>': '&gt;',
   };
   return str.replace(/[&"'<>]/g, function(c) {
     return map[c];
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,4 +90,4 @@ export default function(diff) { @@
       diff = _revealMasks(diff);
       return _concatNotDiffParts(diff);
-    };
+    }