ibs-format 1.4.13 → 1.4.15

package/README.md

@@ -1,20 +1,20 @@
 # Description
 
-Detect the user-defined identifiers in the text and convert them into HTML tags like bold, italic, strike, and many more having XSS (Cross-site scripting) security with escaping functionality, also detect the links like URLs, email, and IP addresses and wrap them into Anchor tag `<a>`.
+Text formatting in Javascript. Detect the user-defined identifiers in the text and convert them into HTML tags like bold, italic, strike, and many more having XSS (Cross-site scripting) security with escaping functionality, also detect the links like URLs, email, and IP addresses and wrap them into Anchor tag `<a>` with also other user define formatting.
 
 ## Table of Contents
-- [Online Demo](#demo)
+- [Online Demo](#online-demo)
 - [Supported browsers](#browsers)
 - [Installation](#installation)
 - [Usage](#usage)
 - [Text Formatting](#text-formatting)
 - [Links Detecting](#links-detecting)
-- [Cross Site Scripting (XSS)](#cross-site-scripting)
-- [Format the text at run time using custom Pipe](#pipe)
-- [Use the external 'ngx-linkifyjs' library for detecting the links](#linkifyjs)
+- [Cross Site Scripting (XSS)](#cross-site-scripting-(xss))
+- [Format the text at run time using custom Pipe](#format-the-text-at-run-time-using-custom-pipe)
+- [Use the external 'ngx-linkifyjs' library for detecting the links](#use-the-external-'ngx-linkifyjs'-library-for-detecting-the-links)
 - [Precautions](#precautions)
 
-<a name="demo"/>
+<a name="online-demo"/>
 
 # Online Demo
 
@@ -122,7 +122,7 @@ and my email is <a href='mailto:info@myemail.com' target='_blank'>info@myemail.c
 ```js
 myText = ibsFormat(myText, null, obj);
 ```
-<a name="cross-site-scripting"/>
+<a name="cross-site-scripting-(xss)"/>
 
 # Cross Site Scripting (XSS).
 
@@ -138,7 +138,7 @@ Place a JSON object in the forth argument and set it's value to false, if the fo
 myText = ibsFormat(myText, tagArray, obj, { allowXssEscaping : false });
 ```
 
-<a name="pipe"/>
+<a name="format-the-text-at-run-time-using-custom-pipe"/>
 
 # Format the text at run time using custom Pipe.
 
@@ -176,7 +176,7 @@ import { ibsformatPipe } from './custom-pipe.pipe';
 
 `<p [innerHTML]="myText | ibsformat"></p>`
 
-<a name="linkifyjs"/>
+<a name="use-the-external-'ngx-linkifyjs'-library-for-detecting-the-links"/>
 
 # Use the external 'ngx-linkifyjs' library for detecting the links
 

package/index.js

@@ -10,6 +10,64 @@ function ibsFormat(value, arr, linky, escaping) {
     value = value.replace(/\n/g, " <br> ");
   }
   if (value != "" && value != null && value != undefined && arr && arr.length > 0) {
+    // Preprocess to handle empty formatting markers
+    if (arr[0].constructor === Array) {
+      arr.forEach(function (formatConfig) {
+        let marker = formatConfig[1];
+        // Create regex to match empty formatting markers (marker followed by optional whitespace then same marker)
+        let escapedMarker = marker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        let emptyMarkerRegex = new RegExp(escapedMarker + '\\s*' + escapedMarker, 'g');
+        
+        // Find all empty marker pairs and track their positions
+        let matches = [];
+        let match;
+        while ((match = emptyMarkerRegex.exec(value)) !== null) {
+          matches.push({
+            start: match.index,
+            end: match.index + match[0].length,
+            content: match[0]
+          });
+          // Reset lastIndex to avoid infinite loop with zero-length matches
+          if (match.index === emptyMarkerRegex.lastIndex) {
+            emptyMarkerRegex.lastIndex++;
+          }
+        }
+        
+        // Process matches from end to start to avoid index shifting
+        for (let i = matches.length - 1; i >= 0; i--) {
+          let matchObj = matches[i];
+          let beforeMatch = value.substring(0, matchObj.start);
+          let afterMatch = value.substring(matchObj.end);
+          // Replace with just the markers (no formatting)
+          value = beforeMatch + marker + marker + afterMatch;
+        }
+      });
+    } else {
+      let marker = arr[1];
+      let escapedMarker = marker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      let emptyMarkerRegex = new RegExp(escapedMarker + '\\s*' + escapedMarker, 'g');
+      
+      let matches = [];
+      let match;
+      while ((match = emptyMarkerRegex.exec(value)) !== null) {
+        matches.push({
+          start: match.index,
+          end: match.index + match[0].length,
+          content: match[0]
+        });
+        if (match.index === emptyMarkerRegex.lastIndex) {
+          emptyMarkerRegex.lastIndex++;
+        }
+      }
+      
+      for (let i = matches.length - 1; i >= 0; i--) {
+        let matchObj = matches[i];
+        let beforeMatch = value.substring(0, matchObj.start);
+        let afterMatch = value.substring(matchObj.end);
+        value = beforeMatch + marker + marker + afterMatch;
+      }
+    }
+    
     if (arr[0].constructor === Array) {
       arr.map(function (e) {
         e[2] = (e[0].length + 1).toString();
@@ -118,10 +176,19 @@ function doubleAstericHandler(text, tag, iden, trim, space) {
           box.push(e.indexOf(iden, v));
         }
       }
-      e = e.replace('**', "<" + tag + ">");
-      e = e.replace('**', "</" + tag + ">");
+      
+      // Check if there's content between the ** markers
+      let firstIndex = box[0];
+      let lastIndex = box[box.length - 1];
+      let contentBetween = e.substring(firstIndex + 2, lastIndex);
+      
+      if (contentBetween.trim().length > 0) {
+        e = e.replace('**', "<" + tag + ">");
+        e = e.replace('**', "</" + tag + ">");
+      }
       box = [];
     }
+    
     arr.push(e);
   });
   arr.forEach(function (e) {
@@ -162,6 +229,7 @@ function astericHandler(text, tag, iden, trim, space) {
     ) {
       if (loopCounter == singleStericCounter && loopCounter % 2 == 0) {
       } else {
+        // Check if there's actual content between paired asterisks across words
         if (flag == "1") {
           e = e.replace(/\x2a/g, "<" + tag + ">");
           flag = "2";
@@ -188,8 +256,14 @@ function astericHandler(text, tag, iden, trim, space) {
       }
       let firstIndex = box[0];
       let lastIndex = box[box.length - 1];
-      e = replaceChar(e, "<" + tag + ">", firstIndex);
-      e = replaceChar(e, "</" + tag + ">", lastIndex + trim);
+      
+      // Check if there's content between the * markers
+      let contentBetween = e.substring(firstIndex + 1, lastIndex);
+      
+      if (contentBetween.trim().length > 0) {
+        e = replaceChar(e, "<" + tag + ">", firstIndex);
+        e = replaceChar(e, "</" + tag + ">", lastIndex + trim);
+      }
       box = [];
     }
 
@@ -265,8 +339,13 @@ function getFormat(text, tag, iden, trim, space) {
       let firstIndex = box[0];
       let lastIndex = box[box.length - 1];
 
-      e = replaceChar(e, "<" + tag + ">", firstIndex);
-      e = replaceChar(e, "</" + tag + ">", lastIndex + trim);
+      // Check if there's content between the formatting markers
+      let contentBetween = e.substring(firstIndex + iden.length, lastIndex);
+      
+      if (contentBetween.trim().length > 0) {
+        e = replaceChar(e, "<" + tag + ">", firstIndex);
+        e = replaceChar(e, "</" + tag + ">", lastIndex + trim);
+      }
 
       box = [];
     }
@@ -291,7 +370,7 @@ function getFormat(text, tag, iden, trim, space) {
 }
 
 function linkfy(text, target) {
-  let strictUrlExpression = /^(?:(?:https?|ftp):\/\/)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/\S*)?$/gi;
+  let strictUrlExpression = /^(?:(?:https?|ftp):\/\/)?(?:(?!(?:10|127)(?:\.(?![\p{Extended_Pictographic}])\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.(?![\p{Extended_Pictographic}])\d{1,3}){2})(?!172\.(?![\p{Extended_Pictographic}])(?:1[6-9]|2\d|3[0-1])(?:\.(?![\p{Extended_Pictographic}])\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?![\p{Extended_Pictographic}])(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?![\p{Extended_Pictographic}])(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-)[a-z\u00a1-\uffff0-9]+)(?:\.(?![\p{Extended_Pictographic}])(?:[a-z\u00a1-\uffff0-9]-)[a-z\u00a1-\uffff0-9]+)(?:\.(?![\p{Extended_Pictographic}])(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/\S)?$/giu;
   let looseUrlExpression = /^https?\:\/\/[^\/\s]+(\/.*)?$/;
   let ip4Expression = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]):[0-9]+\b(\/[-a-zA-Z0-9@:%_\+.~#?&\/=]*)?/g;
   let emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ibs-format",
-  "version": "1.4.13",
+  "version": "1.4.15",
   "description": "Detect the user-defined identifiers in the text and convert them into HTML tags like bold, italic, strike, and many more having XSS (Cross-site scripting) security with escaping functionality, also detect the links like URLs, email, and IP addresses and wrap them into Anchor tag `<a>`.",
   "main": "index.js",
   "scripts": {