Adding protection string options for Issue #9

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "htmlfy",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"description": "HTML formatter yo!. Prettify, minify, and more!",
 	"scripts": {
 		"check": "tsc",

src/constants.js

@@ -5,5 +5,6 @@ export const CONFIG = {
   ignore: [],
   strict: false,
   tab_size: 2,
-  trim: []
+  trim: [],
+  protection_string: '',
 }

src/prettify.js

@@ -159,17 +159,19 @@ export const prettify = (html, config) => {
   const ignore = validated_config.ignore.length > 0
   trim = validated_config.trim
 
+  const protectionString = config?.protection_string || '_!i-£___£%_';
+
   /* Protect ignored elements. */
   if (ignore) {
-    html = ignoreElement(html, validated_config.ignore)
+    html = ignoreElement(html, validated_config.ignore, 'protect', protectionString)
   }
 
   html = preprocess(html)
   html = process(html, validated_config.tab_size)
 
   /* Unprotect ignored elements. */
   if (ignore) {
-    html = ignoreElement(html, validated_config.ignore, 'unprotect')
+    html = ignoreElement(html, validated_config.ignore, 'unprotect', protectionString)
   }
 
   return html

src/types/internal.d.ts

@@ -3,6 +3,7 @@ export interface DefaultConfig {
 	strict: boolean;
 	tab_size: number;
 	trim: string[];
+	protection_string: string
 }
 
 type RecursiveRequired<T> = {

src/utils.js

@@ -64,13 +64,14 @@ export const mergeConfig = (dconfig, config) => {
  * 
  * @param {string} html 
  * @param {string[]} ignore
- * @param {string} [mode]
+ * @param {'protect'|'unprotect'} mode
+ * @param {string} protectionString
  * @returns {string}
  */
-export const ignoreElement = (html, ignore, mode = 'protect') => {
+export const ignoreElement = (html, ignore, mode, protectionString) => {
   for (let e = 0; e < ignore.length; e++) {
     const regex = new RegExp(`<${ignore[e]}[^>]*>((.|\n)*?)<\/${ignore[e]}>`, "g")
-    html = html.replace(regex, mode === 'protect' ? protectElement : unprotectElement)
+    html = html.replace(regex, mode === 'protect' ? (match, capture) => protectElement(match, capture, protectionString) : (match, capture) => unprotectElement(match, capture, protectionString))
   }
 
   return html
@@ -81,16 +82,17 @@ export const ignoreElement = (html, ignore, mode = 'protect') => {
  * 
  * @param {string} match 
  * @param {any} capture 
+ * @param {string} protectionString 
  * @returns 
  */
-const protectElement = (match, capture) => {
+const protectElement = (match, capture, protectionString) => {
   return match.replace(capture, (match) => {
     return match
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
-      .replace(/\n/g, '&#10;')
-      .replace(/\r/g, '&#13;')
-      .replace(/\s/g, '&nbsp;')
+      .replace(/</g, '-' + protectionString + 'lt-')
+      .replace(/>/g, '-' + protectionString + 'gt-')
+      .replace(/\n/g, '-' + protectionString + 'nl-')
+      .replace(/\r/g, '-' + protectionString + 'cr-')
+      .replace(/\s/g, '-' + protectionString + 'ws-')
   })
 }
 
@@ -120,16 +122,17 @@ export const trimify = (html, trim) => {
  * 
  * @param {string} match 
  * @param {any} capture 
+ * @param {string} protectionString 
  * @returns 
  */
-const unprotectElement = (match, capture) => {
+const unprotectElement = (match, capture, protectionString) => {
   return match.replace(capture, (match) => {
     return match
-      .replace(/&lt;/g, '<')
-      .replace(/&gt;/g, '>')
-      .replace(/&#10;/g, '\n')
-      .replace(/&#13;/g, '\r')
-      .replace(/&nbsp;/g, ' ')
+      .replace(new RegExp('-' + protectionString + 'lt-', "g"), '<')
+      .replace(new RegExp('-' + protectionString + 'gt-', "g"), '>')
+      .replace(new RegExp('-' + protectionString + 'nl-', "g"), '\n')
+      .replace(new RegExp('-' + protectionString + 'cr-', "g"), '\r')
+      .replace(new RegExp('-' + protectionString + 'ws-', "g"), ' ')
   })
 }
 
@@ -146,7 +149,8 @@ export const validateConfig = (config) => {
     Object.hasOwn(config, 'tab_size') || 
     Object.hasOwn(config, 'strict') || 
     Object.hasOwn(config, 'ignore') || 
-    Object.hasOwn(config, 'trim'))
+    Object.hasOwn(config, 'trim') || 
+    Object.hasOwn(config, 'protection_string'))
   if (config_empty) return CONFIG
 
   let tab_size = config.tab_size

types/index.d.ts

@@ -4,6 +4,7 @@ declare module 'htmlfy' {
     strict?: boolean;
     tab_size?: number;
     trim?: string[];
+    protection_string?: string;
   }
 
   export type Config = Required<UserConfig>