@xmldom/xmldom 0.9.7 → 0.9.8

package/CHANGELOG.md

@@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.9.8](https://github.com/xmldom/xmldom/compare/0.9.8...0.9.7)
+
+### Fixed
+
+- fix: replace \u2029 as part of normalizeLineEndings [`#839`](https://github.com/xmldom/xmldom/pull/839) / [`#838`](https://github.com/xmldom/xmldom/issues/838)
+- perf: speed up line detection [`#847`](https://github.com/xmldom/xmldom/pull/847) / [`#838`](https://github.com/xmldom/xmldom/issues/838)
+
+### Chore
+
+- updated dependencies
+- drop jazzer and rxjs devDependencies [`#845`](https://github.com/xmldom/xmldom/pull/845)
+
+Thank you,
+[@kboshold](https://github.com/kboshold),
+[@Ponynjaa](https://github.com/Ponynjaa),
+for your contributions.
+
+
 ## [0.9.7](https://github.com/xmldom/xmldom/compare/0.9.6...0.9.7)
 
 ### Added

package/index.d.ts

@@ -1527,12 +1527,15 @@ declare module '@xmldom/xmldom' {
 		readonly locator?: boolean;
 
 		/**
-		 * used to replace line endings before parsing, defaults to `normalizeLineEndings`,
-		 * which normalizes line endings according to <https://www.w3.org/TR/xml11/#sec-line-ends>.
+		 * used to replace line endings before parsing, defaults to exported `normalizeLineEndings`,
+		 * which normalizes line endings according to <https://www.w3.org/TR/xml11/#sec-line-ends>,
+		 * including some Unicode "newline" characters.
+		 *
+		 * @see {@link normalizeLineEndings}
 		 */
 		readonly normalizeLineEndings?: (source: string) => string;
 		/**
-		 * A function that is invoked for every error that occurs during parsing.
+		 * A function invoked for every error that occurs during parsing.
 		 *
 		 * If it is not provided, all errors are reported to `console.error`
 		 * and only `fatalError`s are thrown as a `ParseError`,
@@ -1572,6 +1575,29 @@ declare module '@xmldom/xmldom' {
 		): void;
 	}
 
+	/**
+	 * Normalizes line ending according to <https://www.w3.org/TR/xml11/#sec-line-ends>,
+	 * including some Unicode "newline" characters:
+	 *
+	 * > XML parsed entities are often stored in computer files which,
+	 * > for editing convenience, are organized into lines.
+	 * > These lines are typically separated by some combination
+	 * > of the characters CARRIAGE RETURN (#xD) and LINE FEED (#xA).
+	 * >
+	 * > To simplify the tasks of applications, the XML processor must behave
+	 * > as if it normalized all line breaks in external parsed entities (including the document entity)
+	 * > on input, before parsing, by translating the following to a single #xA character:
+	 * >
+	 * > 1. the two-character sequence #xD #xA,
+	 * > 2. the two-character sequence #xD #x85,
+	 * > 3. the single character #x85,
+	 * > 4. the single character #x2028,
+	 * > 5. the single character #x2029,
+	 * > 6. any #xD character that is not immediately followed by #xA or #x85.
+	 *
+	 * @prettierignore
+	 */
+	function normalizeLineEndings(input: string): string;
 	/**
 	 * A method that prevents any further parsing when an `error`
 	 * with level `error` is reported during parsing.

package/lib/dom-parser.js

@@ -18,7 +18,8 @@ var ParseError = errors.ParseError;
 var XMLReader = sax.XMLReader;
 
 /**
- * Normalizes line ending according to <https://www.w3.org/TR/xml11/#sec-line-ends>:
+ * Normalizes line ending according to <https://www.w3.org/TR/xml11/#sec-line-ends>,
+ * including some Unicode "newline" characters:
  *
  * > XML parsed entities are often stored in computer files which,
  * > for editing convenience, are organized into lines.
@@ -27,20 +28,21 @@ var XMLReader = sax.XMLReader;
  * >
  * > To simplify the tasks of applications, the XML processor must behave
  * > as if it normalized all line breaks in external parsed entities (including the document entity)
- * > on input, before parsing, by translating all of the following to a single #xA character:
+ * > on input, before parsing, by translating the following to a single #xA character:
  * >
  * > 1. the two-character sequence #xD #xA,
  * > 2. the two-character sequence #xD #x85,
  * > 3. the single character #x85,
  * > 4. the single character #x2028,
- * > 5. any #xD character that is not immediately followed by #xA or #x85.
+ * > 5. the single character #x2029,
+ * > 6. any #xD character that is not immediately followed by #xA or #x85.
  *
  * @param {string} input
  * @returns {string}
  * @prettierignore
  */
 function normalizeLineEndings(input) {
-	return input.replace(/\r[\n\u0085]/g, '\n').replace(/[\r\u0085\u2028]/g, '\n');
+	return input.replace(/\r[\n\u0085]/g, '\n').replace(/[\r\u0085\u2028\u2029]/g, '\n');
 }
 
 /**
@@ -63,7 +65,7 @@ function normalizeLineEndings(input) {
  * DEPRECATED! use `onError` instead.
  * @property {function(level:ErrorLevel, message:string, context: DOMHandler):void}
  * [onError]
- * A function that is invoked for every error that occurs during parsing.
+ * A function invoked for every error that occurs during parsing.
  *
  * If it is not provided, all errors are reported to `console.error`
  * and only `fatalError`s are thrown as a `ParseError`,
@@ -78,7 +80,9 @@ function normalizeLineEndings(input) {
  * attribute describing their location in the XML string.
  * Default is true.
  * @property {(string) => string} [normalizeLineEndings]
- * used to replace line endings before parsing, defaults to `normalizeLineEndings`
+ * used to replace line endings before parsing, defaults to exported `normalizeLineEndings`,
+ * which normalizes line endings according to <https://www.w3.org/TR/xml11/#sec-line-ends>,
+ * including some Unicode "newline" characters.
  * @property {Object} [xmlns]
  * The XML namespaces that should be assumed when parsing.
  * The default namespace can be provided by the key that is the empty string.

package/lib/index.js

@@ -36,5 +36,6 @@ exports.XMLSerializer = dom.XMLSerializer;
 
 var domParser = require('./dom-parser');
 exports.DOMParser = domParser.DOMParser;
+exports.normalizeLineEndings = domParser.normalizeLineEndings;
 exports.onErrorStopParsing = domParser.onErrorStopParsing;
 exports.onWarningStopParsing = domParser.onWarningStopParsing;

package/lib/sax.js

@@ -81,7 +81,7 @@ function parse(source, defaultNSMapCopy, entityMap, domBuilder, errorHandler) {
 		if (hasOwn(entityMap, k)) {
 			return entityMap[k];
 		} else if (k.charAt(0) === '#') {
-			return fixedFromCharCode(parseInt(k.substr(1).replace('x', '0x')));
+			return fixedFromCharCode(parseInt(k.substring(1).replace('x', '0x')));
 		} else {
 			errorHandler.error('entity not found:' + a);
 			return a;
@@ -98,20 +98,20 @@ function parse(source, defaultNSMapCopy, entityMap, domBuilder, errorHandler) {
 		}
 	}
 
+	var lineStart = 0;
+	var lineEnd = 0;
+	var linePattern = /\r\n?|\n|$/g;
+	var locator = domBuilder.locator;
+
 	function position(p, m) {
 		while (p >= lineEnd && (m = linePattern.exec(source))) {
-			lineStart = m.index;
-			lineEnd = lineStart + m[0].length;
+			lineStart = lineEnd;
+			lineEnd = m.index + m[0].length;
 			locator.lineNumber++;
 		}
 		locator.columnNumber = p - lineStart + 1;
 	}
 
-	var lineStart = 0;
-	var lineEnd = 0;
-	var linePattern = /.*(?:\r\n?|\n)|.*$/g;
-	var locator = domBuilder.locator;
-
 	var parseStack = [{ currentNSMap: defaultNSMapCopy }];
 	var unclosedTags = [];
 	var start = 0;
@@ -124,7 +124,7 @@ function parse(source, defaultNSMapCopy, entityMap, domBuilder, errorHandler) {
 				}
 				if (!source.substring(start).match(/^\s*$/)) {
 					var doc = domBuilder.doc;
-					var text = doc.createTextNode(source.substr(start));
+					var text = doc.createTextNode(source.substring(start));
 					if (doc.documentElement) {
 						return errorHandler.error('Extra content at the end of the document');
 					}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xmldom/xmldom",
-	"version": "0.9.7",
+	"version": "0.9.8",
 	"description": "A pure JavaScript W3C standard-based (XML DOM Level 2 Core) DOMParser and XMLSerializer module.",
 	"keywords": [
 		"w3c",
@@ -44,21 +44,18 @@
 	},
 	"devDependencies": {
 		"@homer0/prettier-plugin-jsdoc": "9.1.0",
-		"@jazzer.js/core": "2.1.0",
-		"@jazzer.js/jest-runner": "2.1.0",
 		"auto-changelog": "2.5.0",
 		"eslint": "8.57.1",
 		"eslint-config-prettier": "10.0.1",
 		"eslint-plugin-anti-trojan-source": "1.1.1",
 		"eslint-plugin-es5": "1.5.0",
 		"eslint-plugin-n": "17.15.1",
-		"eslint-plugin-prettier": "5.2.2",
+		"eslint-plugin-prettier": "5.2.3",
 		"get-stream": "6.0.1",
 		"jest": "29.7.0",
 		"nodemon": "3.1.9",
 		"np": "8.0.4",
-		"prettier": "3.4.2",
-		"rxjs": "7.8.1",
+		"prettier": "3.5.2",
 		"xmltest": "2.0.3",
 		"yauzl": "3.2.0"
 	},
@@ -71,5 +68,6 @@
 		"remote": "origin",
 		"tagPrefix": "",
 		"template": "./auto-changelog.hbs"
-	}
+	},
+	"packageManager": "npm@11.1.0+sha512.acf301ad9b9ddba948fcb72341e2f0fcae477f56a95cc2a092934d133a7461062633cefbf93d5934a3dc0768674e2edee9f04dcfcc4bb4c327ff0e3a7d552a1b"
 }