@nerimity/html-embed 1.2.0 → 1.2.1

package/dist/index.js

@@ -210,7 +210,16 @@ function htmlToJson(html) {
 }
 function validateHtmlStructure(html) {
     let isMalformed = false;
+    const voidElements = ["img", "br", "hr", "input", "meta", "link"];
     const parser = new htmlparser2.Parser({
+        onopentag(name) {
+            if (voidElements.includes(name.toLowerCase())) {
+                const tagClosing = html.substring(parser.startIndex, html.indexOf(">", parser.startIndex) + 1);
+                if (!tagClosing.endsWith("/>")) {
+                    throw new Error(`The <${name}> tag must be self-closed with a slash (e.g., <${name} />).`);
+                }
+            }
+        },
         onerror(error) {
             isMalformed = true;
         },
@@ -222,8 +231,9 @@ function validateHtmlStructure(html) {
     }
     const openTags = (html.match(/<[a-zA-Z0-9]+/g) || []).length;
     const closeTags = (html.match(/<\/[a-zA-Z0-9]+/g) || []).length;
+    const voidTagsFound = (html.match(/<(img|br|hr|input|meta|link)/g) || []).length;
     const expectedCloseTags = openTags - (html.match(/<(img|br|hr)/g) || []).length;
-    if (expectedCloseTags !== closeTags) {
+    if (openTags - voidTagsFound !== closeTags) {
         throw new Error("Mismatched or unclosed HTML tags.");
     }
 }

package/example.js

@@ -4,16 +4,8 @@ const { htmlToJson } = require("./dist");
 
 // throw error because invalid css
 console.log(htmlToJson(`
-<div class="owo">
-test
-<a href="https://google.com">test</a>
-</div>
+<dIv class="owo" style="owo: lol"; onclick="Lol">
+  <br />
+</dIv>
 
-
-<style>
-}
-.owo {
-  color: red;
-}
-</style>
 `))

package/package.json

@@ -1,24 +1,24 @@
-{
-  "name": "@nerimity/html-embed",
-  "version": "1.2.0",
-  "description": "",
-  "main": "dist/index.js",
-  "scripts": {
-    "build": "tsc",
-    "example": "tsc & node example.js"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/css": "^0.0.37",
-    "@types/node": "^22.10.10",
-    "typescript": "^5.5.2"
-  },
-  "dependencies": {
-    "css": "^3.0.0",
-    "csstree-validator": "^4.0.1",
-    "htm": "^3.1.0",
-    "htmlparser2": "^10.0.0"
-  }
-}
+{
+  "name": "@nerimity/html-embed",
+  "version": "1.2.1",
+  "description": "",
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "tsc",
+    "example": "tsc & node example.js"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/css": "^0.0.37",
+    "@types/node": "^22.10.10",
+    "typescript": "^5.5.2"
+  },
+  "dependencies": {
+    "css": "^3.0.0",
+    "csstree-validator": "^4.0.1",
+    "htm": "^3.1.0",
+    "htmlparser2": "^10.0.0"
+  }
+}

package/src/index.ts

@@ -182,8 +182,18 @@ export function htmlToJson(html: string) {
 
 function validateHtmlStructure(html: string) {
   let isMalformed = false;
+  const voidElements = ["img", "br", "hr", "input", "meta", "link"];
   const parser = new htmlparser2.Parser(
     {
+      onopentag(name) {
+        if (voidElements.includes(name.toLowerCase())) {
+          const tagClosing = html.substring(parser.startIndex, html.indexOf(">", parser.startIndex) + 1);
+          
+          if (!tagClosing.endsWith("/>")) {
+            throw new Error(`The <${name}> tag must be self-closed with a slash (e.g., <${name} />).`);
+          }
+        }
+      },
       onerror(error) {
         isMalformed = true;
       },
@@ -200,11 +210,12 @@ function validateHtmlStructure(html: string) {
 
   const openTags = (html.match(/<[a-zA-Z0-9]+/g) || []).length;
   const closeTags = (html.match(/<\/[a-zA-Z0-9]+/g) || []).length;
-
+  const voidTagsFound = (html.match(/<(img|br|hr|input|meta|link)/g) || []).length;
+  
   const expectedCloseTags =
     openTags - (html.match(/<(img|br|hr)/g) || []).length;
 
-  if (expectedCloseTags !== closeTags) {
+  if (openTags - voidTagsFound !== closeTags) {
     throw new Error("Mismatched or unclosed HTML tags.");
   }
 }