From 7bbc95efc9c7e8cb274210895a4a3deb1b411a84 Mon Sep 17 00:00:00 2001
From: neumaennl <neumaennl@gmx.net>
Date: Wed, 9 Nov 2022 09:02:04 +0100
Subject: [PATCH] update xmldom

---
 packages/xmldom-decorators/package.json                     | 3 +--
 .../src/{xmldom-sax.ts => customTypes/xmldom-sax.d.ts}      | 4 ++--
 packages/xmldom-decorators/src/deserializer.ts              | 2 +-
 packages/xmldom-decorators/src/serializer.ts                | 2 +-
 packages/xmldom-decorators/tsconfig.json                    | 6 +++++-
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename packages/xmldom-decorators/src/{xmldom-sax.ts => customTypes/xmldom-sax.d.ts} (93%)

diff --git a/packages/xmldom-decorators/package.json b/packages/xmldom-decorators/package.json
index 854ca61..94c2f16 100644
--- a/packages/xmldom-decorators/package.json
+++ b/packages/xmldom-decorators/package.json
@@ -19,12 +19,11 @@
   },
   "devDependencies": {
     "@types/node": "^10.12.7",
-    "@types/xmldom": "^0.1.29",
     "typescript": "^3.3.1"
   },
   "dependencies": {
     "reflect-metadata": "^0.1.12",
-    "xmldom": "^0.1.27"
+		"@xmldom/xmldom": ">=0.8.0"
   },
   "blerf": {
     "steps": [
diff --git a/packages/xmldom-decorators/src/xmldom-sax.ts b/packages/xmldom-decorators/src/customTypes/xmldom-sax.d.ts
similarity index 93%
rename from packages/xmldom-decorators/src/xmldom-sax.ts
rename to packages/xmldom-decorators/src/customTypes/xmldom-sax.d.ts
index 24a09c4..0cc52da 100644
--- a/packages/xmldom-decorators/src/xmldom-sax.ts
+++ b/packages/xmldom-decorators/src/customTypes/xmldom-sax.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for xmldom/sax internals (XMLReader). These APIs are not officially documented.
 
-declare module 'xmldom/sax' {
+declare module '@xmldom/xmldom/lib/sax' {
     var XMLReader: XMLReaderStatic;
 
     interface XMLReaderStatic {
@@ -16,7 +16,7 @@ declare module 'xmldom/sax' {
     interface ElementAttributes extends Array<ElementAttribute> {
         length: number;
         setTagName(tagName: string): void;
-        add(qName: string, value: string, offset: number): void;
+        addValue(qName: string, value: string, offset: number): void;
         getLocalName(i: number): string;
         getLocator(i: number): string;
         getQName(i: number): string;
diff --git a/packages/xmldom-decorators/src/deserializer.ts b/packages/xmldom-decorators/src/deserializer.ts
index 249cb1a..97ab2c9 100644
--- a/packages/xmldom-decorators/src/deserializer.ts
+++ b/packages/xmldom-decorators/src/deserializer.ts
@@ -1,4 +1,4 @@
-import { XMLReader, Locator, DOMBuilder, ElementAttributes } from "xmldom/sax";
+import { XMLReader, Locator, DOMBuilder, ElementAttributes } from "@xmldom/xmldom/lib/sax";
 import { RootSchema, ArraySchema, BaseSchema, ArrayItemOptions, isRootSchema, isElementSchema, isArraySchema, ElementSchema, TextSchema, AttributeSchema, isTextSchema } from "./decorators";
 
 export function getArrayItemName(schema: ArraySchema, opts: ArrayItemOptions): string {
diff --git a/packages/xmldom-decorators/src/serializer.ts b/packages/xmldom-decorators/src/serializer.ts
index c41dca6..087a3f5 100644
--- a/packages/xmldom-decorators/src/serializer.ts
+++ b/packages/xmldom-decorators/src/serializer.ts
@@ -1,5 +1,5 @@
 import { BaseSchema, ElementSchema, ArraySchema, RootSchema, ArrayItemOptions, isAttributeSchema, isTextSchema, isElementSchema, isArraySchema } from "./decorators";
-import { DOMImplementation, XMLSerializer } from "xmldom";
+import { DOMImplementation, XMLSerializer } from "@xmldom/xmldom";
 import { getArrayItemName } from "./deserializer";
 
 export interface SerializerContext {
diff --git a/packages/xmldom-decorators/tsconfig.json b/packages/xmldom-decorators/tsconfig.json
index d50edbc..042c113 100644
--- a/packages/xmldom-decorators/tsconfig.json
+++ b/packages/xmldom-decorators/tsconfig.json
@@ -7,7 +7,11 @@
     "strict": true,
     "sourceMap": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
+    "emitDecoratorMetadata": true,
+    "typeRoots": [
+      "src/customTypes",
+      "node_modules/@types"
+    ]
   },
   "include": ["./src"]
 }