Merge branch 'master' into dependabot/npm_and_yarn/chai-6.2.0

Author: D-Sketon

.eslintrc.json

@@ -1,6 +1,6 @@
 # hexo-util
 
-[![Build Status](https://github.com/hexojs/hexo-util/workflows/Tester/badge.svg?branch=master)](https://github.com/hexojs/hexo-util/actions?query=workflow%3ATester)
+[![Build Status](https://github.com/hexojs/hexo-util/workflows/Tester/badge.svg)](https://github.com/hexojs/hexo-util/actions?query=workflow%3ATester)
 [![NPM version](https://badge.fury.io/js/hexo-util.svg)](https://www.npmjs.com/package/hexo-util)
 [![Coverage Status](https://coveralls.io/repos/hexojs/hexo-util/badge.svg?branch=master&service=github)](https://coveralls.io/github/hexojs/hexo-util?branch=master)
 

README.md

@@ -0,0 +1,30 @@
+const config = require('eslint-config-hexo/ts');
+const testConfig = require('eslint-config-hexo/test');
+
+module.exports = [
+  // Configurations applied globally
+  ...config,
+  {
+    rules: {
+      '@typescript-eslint/no-explicit-any': 0,
+      '@typescript-eslint/no-var-requires': 0,
+      '@typescript-eslint/no-require-imports': 0,
+      'n/no-missing-import': 0,
+      'n/no-missing-require': 0
+    }
+  },
+  // Configurations applied only to test files
+  {
+    files: [
+      'test/**/*.ts'
+    ],
+    languageOptions: {
+      ...testConfig.languageOptions
+    },
+    rules: {
+      ...testConfig.rules,
+      '@typescript-eslint/no-explicit-any': 0,
+      '@typescript-eslint/no-unused-expressions': 0
+    }
+  }
+];

eslint.config.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line n/no-deprecated-api
 import { parse, format } from 'url';
 import { unescape } from 'querystring';
 

lib/decode_url.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line n/no-deprecated-api
 import { parse, format } from 'url';
 import { unescape } from 'querystring';
 

lib/encode_url.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line n/no-deprecated-api
 import { parse } from 'url';
 import encodeURL from './encode_url';
 import prettyUrls from './pretty_urls';

lib/full_url_for.ts

@@ -1,6 +1,6 @@
 import type { HLJSApi, HighlightResult } from 'highlight.js';
 import stripIndent from 'strip-indent';
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+
 const alias = require('../highlight_alias.json');
 
 let hljs: HLJSApi | undefined;

lib/highlight.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line n/no-deprecated-api
 import { parse } from 'url';
 import Cache from './cache';
 const cache = new Cache<boolean>();
@@ -23,7 +24,7 @@ function isExternalLink(input: string, sitehost: string, exclude?: string | stri
     let data;
     try {
       data = new URL(input, `http://${sitehost}`);
-    } catch (e) { }
+    } catch { }
 
     // if input is invalid url, data should be undefined
     if (typeof data !== 'object') return false;

lib/is_external_link.ts

@@ -1,123 +1,102 @@
-const STATE_PLAINTEXT = Symbol('plaintext');
-const STATE_HTML = Symbol('html');
-const STATE_COMMENT = Symbol('comment');
-
-// eslint-disable-next-line @typescript-eslint/ban-types
+const STATE_PLAINTEXT = 0;
+const STATE_HTML = 1;
+const STATE_COMMENT = 2;
+
+const CHAR_LT = 60; // '<'
+const CHAR_GT = 62; // '>'
+const CHAR_QUOTE = 34; // '"'
+const CHAR_APOS = 39; // "'"
+const CHAR_DASH = 45; // '-'
+const CHAR_SPACE = 32; // ' '
+const CHAR_NEWLINE = 10; // '\n'
+const CHAR_EXCLAIM = 33; // '!'
+
+// eslint-disable-next-line @typescript-eslint/no-wrapper-object-types
 function striptags(html: string | String = '') {
   // if not string, then safely return an empty string
   if (typeof html !== 'string' && !(html instanceof String)) {
     return '';
   }
 
   let state = STATE_PLAINTEXT;
-  let tag_buffer = '';
   let depth = 0;
-  let in_quote_char = '';
+  let in_quote_char = 0;
   let output = '';
+  let tag_start = -1;
+  let plain_text_start = 0;
 
   const { length } = html;
 
   for (let idx = 0; idx < length; idx++) {
-    const char = html[idx];
+    const charCode = html.charCodeAt(idx);
 
     if (state === STATE_PLAINTEXT) {
-      switch (char) {
-        case '<':
-          state = STATE_HTML;
-          tag_buffer = tag_buffer + char;
-          break;
-
-        default:
-          output += char;
-          break;
+      if (charCode === CHAR_LT) {
+        output += html.slice(plain_text_start, idx);
+        state = STATE_HTML;
+        tag_start = idx;
       }
     } else if (state === STATE_HTML) {
-      switch (char) {
-        case '<':
-          // ignore '<' if inside a quote
-          if (in_quote_char) break;
-
-          // we're seeing a nested '<'
-          depth++;
-          break;
-
-        case '>':
-          // ignore '>' if inside a quote
-          if (in_quote_char) {
-            break;
-          }
-
-          // something like this is happening: '<<>>'
+      if (charCode === CHAR_LT) {
+        // ignore '<' if inside a quote
+        if (!in_quote_char) depth++;
+      } else if (charCode === CHAR_GT) {
+        // ignore '>' if inside a quote
+        if (!in_quote_char) {
           if (depth) {
             depth--;
-
-            break;
-          }
-
-          // this is closing the tag in tag_buffer
-          in_quote_char = '';
-          state = STATE_PLAINTEXT;
-          // tag_buffer += '>';
-
-          tag_buffer = '';
-          break;
-
-        case '"':
-        case '\'':
-          // catch both single and double quotes
-
-          if (char === in_quote_char) {
-            in_quote_char = '';
           } else {
-            in_quote_char = in_quote_char || char;
-          }
-
-          tag_buffer = tag_buffer + char;
-          break;
-
-        case '-':
-          if (tag_buffer === '<!-') {
-            state = STATE_COMMENT;
-          }
-
-          tag_buffer = tag_buffer + char;
-          break;
-
-        case ' ':
-        case '\n':
-          if (tag_buffer === '<') {
+            // this is closing the tag in tag_buffer
+            in_quote_char = 0;
             state = STATE_PLAINTEXT;
-            output += '< ';
-            tag_buffer = '';
-
-            break;
+            tag_start = -1;
+            plain_text_start = idx + 1;
           }
-
-          tag_buffer = tag_buffer + char;
-          break;
-
-        default:
-          tag_buffer = tag_buffer + char;
-          break;
+        }
+      } else if (charCode === CHAR_QUOTE || charCode === CHAR_APOS) {
+        // catch both single and double quotes
+
+        if (charCode === in_quote_char) {
+          in_quote_char = 0;
+        } else {
+          in_quote_char = in_quote_char || charCode;
+        }
+      } else if (charCode === CHAR_DASH) {
+        // same as if (html.slice(tag_start, idx) === '<!-') {
+        if (idx - tag_start === 3
+          && html.charCodeAt(tag_start + 1) === CHAR_EXCLAIM
+          && html.charCodeAt(tag_start + 2) === CHAR_DASH
+        ) {
+          state = STATE_COMMENT;
+        }
+      } else if (charCode === CHAR_SPACE || charCode === CHAR_NEWLINE) {
+        // same as if (html.slice(tag_start, idx) === '<') {
+        if (idx - tag_start === 1) {
+          state = STATE_PLAINTEXT;
+          output += '< ';
+          tag_start = -1;
+          plain_text_start = idx + 1;
+        }
       }
     } else if (state === STATE_COMMENT) {
-      switch (char) {
-        case '>':
-          if (tag_buffer.slice(-2) === '--') {
-            // close the comment
-            state = STATE_PLAINTEXT;
-          }
-
-          tag_buffer = '';
-          break;
-
-        default:
-          tag_buffer = tag_buffer + char;
-          break;
+      if (charCode === CHAR_GT) {
+        // same as if (html.slice(idx - 2, idx) === '--') {
+        if (idx >= 2
+            && html.charCodeAt(idx - 1) === CHAR_DASH
+            && html.charCodeAt(idx - 2) === CHAR_DASH) {
+          // close the comment
+          state = STATE_PLAINTEXT;
+          plain_text_start = idx + 1;
+        }
+        tag_start = -1;
       }
     }
   }
 
+  if (state === STATE_PLAINTEXT && plain_text_start < length) {
+    output += html.slice(plain_text_start);
+  }
+
   return output;
 }
 

lib/strip_html.ts

@@ -1,5 +1,4 @@
 import { DomHandler, DomUtils, Parser } from 'htmlparser2';
-// eslint-disable-next-line node/no-extraneous-import
 import type { Element } from 'domhandler';
 import escapeHTML from './escape_html';
 const nonWord = /^\s*[^a-zA-Z0-9]\s*$/;