Merge pull request #76 from contentstack/next

Next

Author: reeshika-h

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.3.7](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.3.7) (2024-06-18)
+ - Fix: Cheerio and DOMPurify packages removed
+
+
 ## [1.3.6](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.3.6) (2024-05-31)
  - Fix: handle case of td or th nodes with attr void:true
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/utils",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "Contentstack utilities for Javascript",
   "main": "dist/index.es.js",
   "types": "dist/types/index.d.ts",
@@ -37,7 +37,6 @@
     "@babel/preset-env": "^7.22.20",
     "@commitlint/cli": "^17.7.1",
     "@commitlint/config-conventional": "^17.7.0",
-    "@types/dompurify": "^3.0.5",
     "@types/jest": "^26.0.24",
     "babel-core": "^4.7.16",
     "babel-jest": "^29.7.0",
@@ -79,9 +78,5 @@
     "presets": [
       "es2015"
     ]
-  },
-  "dependencies": {
-    "cheerio": "^1.0.0-rc.12",
-    "dompurify": "^3.1.1"
   }
 }

package.json

@@ -1,27 +1,11 @@
+const FigureTagRegex = /<\s*figure[^>]*>([^]*?)<\s*\/\s*figure>/g;
+
 export function containsFigureTag(content: string): boolean {
-  const openingTag = '<figure';
-  const closingTag = '</figure>';
-  const openingIndex = content.indexOf(openingTag);
-  const closingIndex = content.indexOf(closingTag);
-  return openingIndex !== -1 && closingIndex !== -1 && closingIndex > openingIndex;
+   return countFigureTags(content) > 0;
 }
 
-export function matchFigureTag(content: string): string[] | null {
-  const matches: string[] = [];
-  const openingTag = '<figure';
-  const closingTag = '</figure>';
-  let startIndex = content.indexOf(openingTag);
-  while (startIndex !== -1) {
-    const endIndex = content.indexOf(closingTag, startIndex);
-    if (endIndex !== -1 && endIndex > startIndex) {
-      matches.push(content.substring(startIndex, endIndex + closingTag.length));
-      startIndex = content.indexOf(openingTag, endIndex + closingTag.length);
-    } else {
-      console.error('Malformed figure tag found in content');
-      break;
-    }
- }
-  return matches.length > 0 ? matches : null;
+export function matchFigureTag(content: string): RegExpMatchArray {
+   return content.match(FigureTagRegex);
 }
 
 export function countFigureTags(content: string): number {