Fixes #109 & #110

oozcitak · Nov 11, 2022 · 4e494e6 · 4e494e6
1 parent 17d2390
commit 4e494e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/constants.ts b/src/constants.ts
@@ -0,0 +1 @@
+export const nonEntityAmpersandRegex = /&(?![A-Za-z]+;|#\d+;)/g;
diff --git a/src/writers/BaseWriter.ts b/src/writers/BaseWriter.ts
@@ -7,6 +7,7 @@ import { LocalNameSet } from "@oozcitak/dom/lib/serializer/LocalNameSet"
 import { NamespacePrefixMap } from "@oozcitak/dom/lib/serializer/NamespacePrefixMap"
 import { namespace as infraNamespace } from "@oozcitak/infra"
 import { xml_isName, xml_isLegalChar, xml_isPubidChar } from "@oozcitak/dom/lib/algorithm"
+import { nonEntityAmpersandRegex } from "../constants"
 
 /**
  * Pre-serializes XML nodes.
@@ -928,7 +929,7 @@ export abstract class BaseWriter<T extends BaseWriterOptions, U extends XMLSeria
      * 5. Replace any occurrences of ">" in markup by "&gt;".
      * 6. Return the value of markup.
      */
-    const markup = node.data.replace(/&/g, '&amp;')
+    const markup = node.data.replace(nonEntityAmpersandRegex, '&amp;')
       .replace(/</g, '&lt;')
       .replace(/>/g, '&gt;')
 
@@ -1597,7 +1598,7 @@ export abstract class BaseWriter<T extends BaseWriterOptions, U extends XMLSeria
      * grammar requirement in the XML specification's AttValue production by
      * also replacing ">" characters.
      */
-    return value.replace(/(?!&([^&; ]*);)&/g, '&amp;')
+    return value.replace(nonEntityAmpersandRegex, '&amp;')
       .replace(/</g, '&lt;')
       .replace(/>/g, '&gt;')
       .replace(/"/g, '&quot;')