@xmldom/xmldom 0.8.2 → 0.9.0-beta.1

package/lib/sax.js

@@ -1,4 +1,10 @@
-var NAMESPACE = require("./conventions").NAMESPACE;
+'use strict'
+
+var conventions = require("./conventions");
+var isHTMLRawTextElement = conventions.isHTMLRawTextElement;
+var isHTMLEscapableRawTextElement = conventions.isHTMLEscapableRawTextElement;
+var NAMESPACE = conventions.NAMESPACE;
+var MIME_TYPE = conventions.MIME_TYPE;
 
 //[4]   	NameStartChar	   ::=   	":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
 //[4a]   	NameChar	   ::=   	NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
@@ -50,6 +56,7 @@ XMLReader.prototype = {
 	}
 }
 function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
+	var isHTML = MIME_TYPE.isHTML(domBuilder.mimeType);
 	function fixedFromCharCode(code) {
 		// String.prototype.fromCharCode does not supports
 		// > 2 bytes unicode chars directly
@@ -162,13 +169,21 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
 				var el = new ElementAttributes();
 				var currentNSMap = parseStack[parseStack.length-1].currentNSMap;
 				//elStartEnd
-				var end = parseElementStartPart(source,tagStart,el,currentNSMap,entityReplacer,errorHandler);
+				var end = parseElementStartPart(
+					source,
+					tagStart,
+					el,
+					currentNSMap,
+					entityReplacer,
+					errorHandler,
+					isHTML
+				)
 				var len = el.length;
 
 
 				if(!el.closed && fixSelfClosed(source,end,el.tagName,closeMap)){
 					el.closed = true;
-					if(!entityMap.nbsp){
+					if(!isHTML){
 						errorHandler.warning('unclosed xml attribute');
 					}
 				}
@@ -191,7 +206,7 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
 					}
 				}
 
-				if (NAMESPACE.isHTML(el.uri) && !el.closed) {
+				if (isHTML && !el.closed) {
 					end = parseHtmlSpecialContent(source,end,el.tagName,entityReplacer,domBuilder)
 				} else {
 					end++;
@@ -222,7 +237,9 @@ function copyLocator(f,t){
  * @see #appendElement(source,elStartEnd,el,selfClosed,entityReplacer,domBuilder,parseStack);
  * @return end of the elementStartPart(end of elementEndPart for selfClosed el)
  */
-function parseElementStartPart(source,start,el,currentNSMap,entityReplacer,errorHandler){
+function parseElementStartPart(
+	source,start,el,currentNSMap,entityReplacer,errorHandler, isHTML
+){
 
 	/**
 	 * @param {string} qname
@@ -337,7 +354,7 @@ function parseElementStartPart(source,start,el,currentNSMap,entityReplacer,error
 					errorHandler.warning('attribute "'+value+'" missed quot(")!');
 					addAttribute(attrName, value, start)
 				}else{
-					if(!NAMESPACE.isHTML(currentNSMap['']) || !value.match(/^(?:disabled|checked|selected)$/i)){
+					if(!isHTML){
 						errorHandler.warning('attribute "'+value+'" missed value!! "'+value+'" instead!!')
 					}
 					addAttribute(value, value, start)
@@ -385,7 +402,7 @@ function parseElementStartPart(source,start,el,currentNSMap,entityReplacer,error
 				//case S_ATTR_NOQUOT_VALUE:void();break;
 				case S_ATTR_SPACE:
 					var tagName =  el.tagName;
-					if (!NAMESPACE.isHTML(currentNSMap['']) || !attrName.match(/^(?:disabled|checked|selected)$/i)) {
+					if (!isHTML) {
 						errorHandler.warning('attribute "'+attrName+'" missed value!! "'+attrName+'" instead2!!')
 					}
 					addAttribute(attrName, attrName, start);
@@ -457,8 +474,6 @@ function appendElement(el,domBuilder,currentNSMap){
 				a.uri = NAMESPACE.XML;
 			}if(prefix !== 'xmlns'){
 				a.uri = currentNSMap[prefix || '']
-
-				//{console.log('###'+a.qName,domBuilder.locator.systemId+'',currentNSMap,a.uri)}
 			}
 		}
 	}
@@ -490,24 +505,20 @@ function appendElement(el,domBuilder,currentNSMap){
 	}
 }
 function parseHtmlSpecialContent(source,elStartEnd,tagName,entityReplacer,domBuilder){
-	if(/^(?:script|textarea)$/i.test(tagName)){
+	// https://html.spec.whatwg.org/#raw-text-elements
+	// https://html.spec.whatwg.org/#escapable-raw-text-elements
+	// https://html.spec.whatwg.org/#cdata-rcdata-restrictions:raw-text-elements
+	// TODO: https://html.spec.whatwg.org/#cdata-rcdata-restrictions
+	var isEscapableRaw = isHTMLEscapableRawTextElement(tagName);
+	if(isEscapableRaw || isHTMLRawTextElement(tagName)){
 		var elEndStart =  source.indexOf('</'+tagName+'>',elStartEnd);
 		var text = source.substring(elStartEnd+1,elEndStart);
-		if(/[&<]/.test(text)){
-			if(/^script$/i.test(tagName)){
-				//if(!/\]\]>/.test(text)){
-					//lexHandler.startCDATA();
-					domBuilder.characters(text,0,text.length);
-					//lexHandler.endCDATA();
-					return elEndStart;
-				//}
-			}//}else{//text area
+
+		if(isEscapableRaw){
 				text = text.replace(/&#?\w+;/g,entityReplacer);
+		}
 				domBuilder.characters(text,0,text.length);
 				return elEndStart;
-			//}
-
-		}
 	}
 	return elStartEnd+1;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmldom/xmldom",
-  "version": "0.8.2",
+  "version": "0.9.0-beta.1",
   "description": "A pure JavaScript W3C standard-based (XML DOM Level 2 Core) DOMParser and XMLSerializer module.",
   "keywords": [
     "w3c",
@@ -44,15 +44,15 @@
   "devDependencies": {
     "@stryker-mutator/core": "5.6.1",
     "auto-changelog": "2.4.0",
-    "eslint": "8.12.0",
+    "eslint": "8.25.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-es5": "1.5.0",
-    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-prettier": "4.2.1",
     "get-stream": "6.0.1",
     "jest": "27.5.1",
-    "nodemon": "2.0.15",
-    "np": "7.6.1",
-    "prettier": "2.6.2",
+    "nodemon": "2.0.20",
+    "np": "7.6.2",
+    "prettier": "2.7.1",
     "xmltest": "1.5.0",
     "yauzl": "2.10.0"
   },