File tree Expand file tree Collapse file tree 6 files changed +21
-17
lines changed
Expand file tree Collapse file tree 6 files changed +21
-17
lines changed Original file line number Diff line number Diff line change 4141 "devDependencies" : {
4242 "@types/jest" : " ^29.4.0" ,
4343 "@types/node" : " ^18.11.18" ,
44- "@types/xmldom" : " ^0.1.30 " ,
44+ "@types/xmldom" : " ^0.1.34 " ,
4545 "@typescript-eslint/eslint-plugin" : " ^5.49.0" ,
4646 "@typescript-eslint/parser" : " ^5.49.0" ,
4747 "eslint" : " ^8.32.0" ,
Original file line number Diff line number Diff line change 1- import { DOMParser , XMLSerializer } from '@xmldom/xmldom' ;
1+ import { DOMParser , Node , XMLSerializer } from '@xmldom/xmldom' ;
22import { ArchivedFile , ArchiveType } from '../../interfaces/iarchive' ;
33import { XmlDocument } from '../../types/xml-types' ;
44import { AutomizerFile , AutomizerParams } from '../../types/types' ;
@@ -17,13 +17,15 @@ export default class Archive {
1717
1818 parseXml ( xmlString : string ) : XmlDocument {
1919 const dom = new DOMParser ( ) ;
20- return dom . parseFromString ( xmlString ) ;
20+ return dom . parseFromString (
21+ xmlString ,
22+ 'application/xml' ,
23+ ) as unknown as XmlDocument ;
2124 }
2225
23- serializeXml ( XmlDocument : XmlDocument ) {
26+ serializeXml ( XmlDocument : XMLDocument | Node ) {
2427 const s = new XMLSerializer ( ) ;
25- const xmlBuffer = s . serializeToString ( XmlDocument ) ;
26- return xmlBuffer ;
28+ return s . serializeToString ( < Node > XmlDocument ) ;
2729 }
2830
2931 async writeBuffer ( archiveType : ArchiveType ) {
Original file line number Diff line number Diff line change @@ -97,7 +97,7 @@ export default class ModifyXmlHelper {
9797 sourceSibling = this . templates [ tag ] ;
9898 }
9999
100- const newChild = sourceSibling . cloneNode ( true ) ;
100+ const newChild = sourceSibling . cloneNode ( true ) as XmlElement ;
101101
102102 XmlHelper . insertAfter ( newChild , lastSibling ) ;
103103 }
Original file line number Diff line number Diff line change @@ -79,7 +79,6 @@ export default class XmlElements {
7979 this . paragraphTemplate = paragraphs [ 0 ] ;
8080 XmlHelper . sliceCollection ( paragraphs , 0 ) ;
8181
82-
8382 const runs = this . paragraphTemplate . getElementsByTagName ( 'a:r' ) ;
8483 if ( runs . length > 0 ) {
8584 this . runTemplate = runs [ 0 ] ;
@@ -297,15 +296,15 @@ export default class XmlElements {
297296 }
298297
299298 dataPointLabel ( ) {
300- const doc = new DOMParser ( ) . parseFromString ( dLblXml ) ;
301- const ele = doc . getElementsByTagName ( 'c:dLbl' ) [ 0 ] ;
299+ const doc = new DOMParser ( ) . parseFromString ( dLblXml , 'application/ xml' ) ;
300+ const ele = doc . getElementsByTagName ( 'c:dLbl' ) [ 0 ] as unknown as Node ;
302301 const firstChild = this . element . firstChild ;
303302 this . element . insertBefore ( ele . cloneNode ( true ) , firstChild ) ;
304303 }
305304
306305 tableCellBorder ( tag : 'a:lnL' | 'a:lnR' | 'a:lnT' | 'a:lnB' ) {
307- const doc = new DOMParser ( ) . parseFromString ( lnLRTB ) ;
308- const ele = doc . getElementsByTagName ( tag ) [ 0 ] ;
306+ const doc = new DOMParser ( ) . parseFromString ( lnLRTB , 'application/ xml' ) ;
307+ const ele = doc . getElementsByTagName ( tag ) [ 0 ] as unknown as Node ;
309308 const firstChild = this . element . firstChild ;
310309 this . element . insertBefore ( ele . cloneNode ( true ) , firstChild ) ;
311310 }
Original file line number Diff line number Diff line change 1- import { XMLSerializer } from '@xmldom/xmldom' ;
1+ import { Node , XMLSerializer } from '@xmldom/xmldom' ;
22import {
33 DefaultAttribute ,
44 HelperElement ,
@@ -514,7 +514,10 @@ export class XmlHelper {
514514 return strings . getElementsByTagName ( 'si' ) . length - 1 ;
515515 }
516516
517- static insertAfter ( newNode : Node , referenceNode : XmlElement ) : Node {
517+ static insertAfter (
518+ newNode : XmlElement ,
519+ referenceNode : XmlElement ,
520+ ) : XmlElement {
518521 return referenceNode . parentNode . insertBefore (
519522 newNode ,
520523 referenceNode . nextSibling ,
@@ -595,9 +598,9 @@ export class XmlHelper {
595598 }
596599 }
597600
598- static dump ( element : XmlDocument | XmlElement ) : void {
601+ static dump ( element : XMLDocument | Element | Node ) : void {
599602 const s = new XMLSerializer ( ) ;
600- const xmlBuffer = s . serializeToString ( element ) ;
603+ const xmlBuffer = s . serializeToString ( < Node > element ) ;
601604 const p = new XmlPrettyPrint ( xmlBuffer ) ;
602605 p . dump ( ) ;
603606 }
Original file line number Diff line number Diff line change 730730 resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
731731 integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
732732
733- " @types/xmldom@^0.1.30 " :
733+ " @types/xmldom@^0.1.34 " :
734734 version "0.1.34"
735735 resolved "https://registry.yarnpkg.com/@types/xmldom/-/xmldom-0.1.34.tgz#a752f73bdf09cc6d78b3d3b2e7ca4dd04cc96fd2"
736736 integrity sha512-7eZFfxI9XHYjJJuugddV6N5YNeXgQE1lArWOcd1eCOKWb/FGs5SIjacSYuEJuwhsGS3gy4RuZ5EUIcqYscuPDA==
You can’t perform that action at this time.
0 commit comments