node-opcua-xml2json 2.54.0 → 2.60.0

package/source/fragment_cloner.ts

@@ -1,51 +1,58 @@
-import { Xml2Json, XmlAttributes, IReaderState } from "./xml2json";
-
-interface XmlWriter {
-    startElement(elementName: string): this;
-
-    endElement(): this;
-
-    writeAttribute(attributeName: string, attributeValue: string | number): this;
-
-    writeComment(comment: string): this;
-
-    text(str: string): this;
-}
-const XMLWriter = require("xml-writer");
-
-export class InternalFragmentClonerReaderState implements IReaderState {
-    private _xw: XmlWriter = new XMLWriter(true);
-    public value: any;
-    public initLevel: number = 0;
-    public engine?: Xml2Json;
-
-    public _on_startElement(level: number, elementName: string, attrs: XmlAttributes): void {
-        this._xw.startElement(elementName);
-        for (const [attName, attValue] of Object.entries(attrs)) {
-            this._xw.writeAttribute(attName, attValue);
-        }
-    }
-    public _on_endElement(level: number, elementName: string): void {
-        this._xw.endElement();
-        if (this.initLevel === level) {
-            this.value = this._xw.toString();
-            this.engine!._demote(this, this.engine!.currentLevel, elementName);
-            this.engine = undefined;
-            this._on_finish();
-        }
-    }
-    public _on_init(elementName: string, attrs: XmlAttributes, parent: IReaderState, level: number, engine: Xml2Json): void {
-        this.engine = engine;
-        this.initLevel = level;
-        this._xw = new XMLWriter(true);
-        this._xw.startElement(elementName);
-        for (const [attName, attValue] of Object.entries(attrs)) {
-            this._xw.writeAttribute(attName, attValue);
-        }
-    }
-    public _on_finish(): void {}
-    public _on_endElement2(level: number, elementName: string): void {}
-    public _on_text(text: string): void {
-        this._xw.text(text);
-    }
-}
+import { Xml2Json, XmlAttributes, IReaderState } from "./xml2json";
+
+interface XmlWriter {
+    startElement(elementName: string): this;
+
+    endElement(): this;
+
+    writeAttribute(attributeName: string, attributeValue: string | number): this;
+
+    writeComment(comment: string): this;
+
+    text(str: string): this;
+}
+const XMLWriter = require("xml-writer");
+
+export class InternalFragmentClonerReaderState implements IReaderState {
+    private _xw: XmlWriter = new XMLWriter(true);
+    public value: any;
+    public initLevel = 0;
+    public engine?: Xml2Json;
+
+    public _on_startElement(level: number, elementName: string, attrs: XmlAttributes): void {
+        this._xw.startElement(elementName);
+        for (const [attName, attValue] of Object.entries(attrs)) {
+            this._xw.writeAttribute(attName, attValue);
+        }
+    }
+    public _on_endElement(level: number, elementName: string): void {
+        this._xw.endElement();
+        if (this.initLevel === level) {
+            this.value = this._xw.toString();
+            this.engine!._demote(this, this.engine!.currentLevel, elementName);
+            this.engine = undefined;
+            this._on_finish();
+        }
+    }
+    public _on_init(elementName: string, attrs: XmlAttributes, parent: IReaderState, level: number, engine: Xml2Json): void {
+        this.engine = engine;
+        this.initLevel = level;
+        this._xw = new XMLWriter(true);
+        this._xw.startElement(elementName);
+        for (const [attName, attValue] of Object.entries(attrs)) {
+            this._xw.writeAttribute(attName, attValue);
+        }
+    }
+
+    public _on_finish(): void {
+        /** */
+    }
+
+    public _on_endElement2(level: number, elementName: string): void {
+        /** */
+    }
+
+    public _on_text(text: string): void {
+        this._xw.text(text);
+    }
+}

package/source/fragment_cloner_parser.ts

@@ -1,17 +1,20 @@
-import { InternalFragmentClonerReaderState } from "./fragment_cloner";
-import { XmlAttributes } from "./xml2json";
-
-export class FragmentClonerParser {
-    public value: any;
-    private _cloneFragment?: InternalFragmentClonerReaderState;
-    constructor() {}
-
-    public startElement(this: any, elementName: string, attrs: XmlAttributes) {
-        this._cloneFragment = new InternalFragmentClonerReaderState();
-        this.engine!._promote(this._cloneFragment, this.engine!.currentLevel, elementName, attrs);
-    }
-    public finish() {
-        this.value = this._cloneFragment!.value;
-        this._cloneFragment!.value = null;
-    }
-}
+import { InternalFragmentClonerReaderState } from "./fragment_cloner";
+import { XmlAttributes } from "./xml2json";
+
+export class FragmentClonerParser {
+    public value: any;
+    private _cloneFragment?: InternalFragmentClonerReaderState;
+    private engine?: {
+        currentLevel: number;
+        _promote: (frag: InternalFragmentClonerReaderState, level: number, elementName: string, attrs: XmlAttributes) => void;
+    };
+
+    public startElement(elementName: string, attrs: XmlAttributes): void {
+        this._cloneFragment = new InternalFragmentClonerReaderState();
+        this.engine!._promote(this._cloneFragment, this.engine!.currentLevel, elementName, attrs);
+    }
+    public finish(): void {
+        this.value = this._cloneFragment!.value;
+        this._cloneFragment!.value = null;
+    }
+}

package/source/index.ts

@@ -1,6 +1,6 @@
-export * from "./xml2json";
-export * from "./fragment_cloner";
-export * from "./xml2json_pojo";
-export * from "./fragment_cloner_parser";
-export * from "./extension_object_parser";
-export * from "./definition_parser";
+export * from "./xml2json";
+export * from "./fragment_cloner";
+export * from "./xml2json_pojo";
+export * from "./fragment_cloner_parser";
+export * from "./extension_object_parser";
+export * from "./definition_parser";

package/source/nodejs/xml2json_fs.ts

@@ -1,43 +1,43 @@
-import * as fs from "fs";
-import { Callback, SimpleCallback, Xml2Json } from "../xml2json";
-
-export class Xml2JsonFs extends Xml2Json {
-    /**
-     * @method  parse
-     * @async
-     * @param xmlFile - the name of the xml file to parse.
-     */
-    public parse(xmlFile: string): Promise<any>;
-    public parse(xmlFile: string, callback: Callback<any> | SimpleCallback): void;
-    public parse(xmlFile: string, callback?: Callback<any> | SimpleCallback): any {
-        if (!callback) {
-            throw new Error("internal error");
-        }
-        const readWholeFile = true;
-        if (readWholeFile) {
-            // slightly faster but require more memory ..
-            fs.readFile(xmlFile, (err: Error | null, data: Buffer) => {
-                if (err) {
-                    return callback(err);
-                }
-                if (data[0] === 0xef && data[1] === 0xbb && data[2] === 0xbf) {
-                    data = data.slice(3);
-                }
-                const dataAsString = data.toString();
-                const parser = this._prepareParser(callback);
-                parser.write(dataAsString);
-                parser.end();
-            });
-        } else {
-            const Bomstrip = require("bomstrip");
-
-            const parser = this._prepareParser(callback);
-
-            fs.createReadStream(xmlFile, { autoClose: true, encoding: "utf8" }).pipe(new Bomstrip()).pipe(parser);
-        }
-    }
-}
-// tslint:disable:no-var-requires
-const thenify = require("thenify");
-const opts = { multiArgs: false };
-Xml2JsonFs.prototype.parse = thenify.withCallback(Xml2JsonFs.prototype.parse, opts);
+import * as fs from "fs";
+import { Callback, SimpleCallback, Xml2Json } from "../xml2json";
+
+export class Xml2JsonFs extends Xml2Json {
+    /**
+     * @method  parse
+     * @async
+     * @param xmlFile - the name of the xml file to parse.
+     */
+    public parse(xmlFile: string): Promise<any>;
+    public parse(xmlFile: string, callback: Callback<any> | SimpleCallback): void;
+    public parse(xmlFile: string, callback?: Callback<any> | SimpleCallback): any {
+        if (!callback) {
+            throw new Error("internal error");
+        }
+        const readWholeFile = true;
+        if (readWholeFile) {
+            // slightly faster but require more memory ..
+            fs.readFile(xmlFile, (err: Error | null, data: Buffer) => {
+                if (err) {
+                    return callback(err);
+                }
+                if (data[0] === 0xef && data[1] === 0xbb && data[2] === 0xbf) {
+                    data = data.slice(3);
+                }
+                const dataAsString = data.toString();
+                const parser = this._prepareParser(callback);
+                parser.write(dataAsString);
+                parser.end();
+            });
+        } else {
+            const Bomstrip = require("bomstrip");
+
+            const parser = this._prepareParser(callback);
+
+            fs.createReadStream(xmlFile, { autoClose: true, encoding: "utf8" }).pipe(new Bomstrip()).pipe(parser);
+        }
+    }
+}
+// tslint:disable:no-var-requires
+const thenify = require("thenify");
+const opts = { multiArgs: false };
+Xml2JsonFs.prototype.parse = thenify.withCallback(Xml2JsonFs.prototype.parse, opts);

package/source/xml2Json_pojo_tools.ts

@@ -1,98 +1,98 @@
-import { IReaderState, ReaderState, ReaderStateBase, ReaderStateParser, Xml2Json, XmlAttributes } from "./xml2json";
-import { lowerFirstLetter } from "node-opcua-utils";
-export type withPojoLambda = (name: string, pojo: any) => void;
-
-export class ReaderState2 extends ReaderStateBase {
-    public _stack: any;
-    public _pojo: any;
-    public _element: any;
-    public text: string;
-
-    public _withPojo: withPojoLambda;
-
-    private parent?: IReaderState;
-    private engine?: Xml2Json;
-    private initLevel: number = 0;
-
-    constructor() {
-        super();
-        this._pojo = {};
-        this._stack = [];
-        this._element = {};
-        this.text = "";
-        this.parent = undefined;
-        this._withPojo = (pojo: any) => {
-            /* empty */
-        };
-    }
-
-    public _on_init(elementName: string, attrs: XmlAttributes, parent: IReaderState, level: number, engine: Xml2Json): void {
-        this.parent = parent;
-        this.engine = engine;
-        this.initLevel = level;
-        if (this._stack.length === 0) {
-            this._pojo = {};
-            this._element = this._pojo;
-        }
-    }
-
-    public _on_finish() {
-        /* empy */
-    }
-
-    public _on_startElement(level: number, elementName: string, attrs: XmlAttributes): void {
-        this._stack.push(this._element);
-
-        if (elementName.match(/^ListOf/)) {
-            elementName = elementName.substring(6);
-            const elName = lowerFirstLetter(elementName);
-            if (this._element instanceof Array) {
-                const array: any[] = [];
-                this._element.push(array);
-                this._element = array;
-            } else {
-                this._element[elName] = [];
-                this._element = this._element[elName];
-            }
-        } else {
-            const elName = lowerFirstLetter(elementName);
-            if (this._element instanceof Array) {
-                const obj = {};
-                this._element.push(obj);
-                this._element = obj;
-            } else {
-                this._element[elName] = {};
-                this._element = this._element[elName];
-            }
-        }
-    }
-
-    public _on_endElement2(level: number, elementName: string): void {
-        /* empty */
-    }
-
-    public _on_endElement(level: number, elementName: string): void {
-        this._element = this._stack.pop();
-        if (this.text.length > 0 && this._element) {
-            const elName = lowerFirstLetter(elementName);
-            this._element[elName] = this.text;
-            // this.engine!._pojo = this._pojo;
-        } else {
-            const elName = lowerFirstLetter(elementName);
-            if (this.initLevel === level) {
-                if (this._withPojo) {
-                    if (this.text.length) {
-                        this._withPojo.call(null, elName, this.text);
-                    } else {
-                        this._withPojo.call(null, elName, this._pojo);
-                    }
-                }
-            }
-        }
-        this.text = "";
-    }
-
-    public _on_text(text: string): void {
-        this.text = text;
-    }
-}
+import { lowerFirstLetter } from "node-opcua-utils";
+import { IReaderState, ReaderStateBase, Xml2Json, XmlAttributes } from "./xml2json";
+export type withPojoLambda = (name: string, pojo: any) => void;
+
+export class ReaderState2 extends ReaderStateBase {
+    public _stack: any;
+    public _pojo: any;
+    public _element: any;
+    public text: string;
+
+    public _withPojo: withPojoLambda;
+
+    private parent?: IReaderState;
+    private engine?: Xml2Json;
+    private initLevel = 0;
+
+    constructor() {
+        super();
+        this._pojo = {};
+        this._stack = [];
+        this._element = {};
+        this.text = "";
+        this.parent = undefined;
+        this._withPojo = (pojo: any) => {
+            /* empty */
+        };
+    }
+
+    public _on_init(elementName: string, attrs: XmlAttributes, parent: IReaderState, level: number, engine: Xml2Json): void {
+        this.parent = parent;
+        this.engine = engine;
+        this.initLevel = level;
+        if (this._stack.length === 0) {
+            this._pojo = {};
+            this._element = this._pojo;
+        }
+    }
+
+    public _on_finish(): void {
+        /* empy */
+    }
+
+    public _on_startElement(level: number, elementName: string, attrs: XmlAttributes): void {
+        this._stack.push(this._element);
+
+        if (elementName.match(/^ListOf/)) {
+            elementName = elementName.substring(6);
+            const elName = lowerFirstLetter(elementName);
+            if (this._element instanceof Array) {
+                const array: any[] = [];
+                this._element.push(array);
+                this._element = array;
+            } else {
+                this._element[elName] = [];
+                this._element = this._element[elName];
+            }
+        } else {
+            const elName = lowerFirstLetter(elementName);
+            if (this._element instanceof Array) {
+                const obj = {};
+                this._element.push(obj);
+                this._element = obj;
+            } else {
+                this._element[elName] = {};
+                this._element = this._element[elName];
+            }
+        }
+    }
+
+    public _on_endElement2(level: number, elementName: string): void {
+        /* empty */
+    }
+
+    public _on_endElement(level: number, elementName: string): void {
+        this._element = this._stack.pop();
+        if (this.text.length > 0 && this._element) {
+            const elName = lowerFirstLetter(elementName);
+            this._element[elName] = this.text;
+            // this.engine!._pojo = this._pojo;
+        } else {
+            const elName = lowerFirstLetter(elementName);
+            if (this.initLevel === level) {
+                if (this._withPojo) {
+                    if (this.text.length) {
+                        this._withPojo.call(null, elName, this.text);
+                    } else {
+                        this._withPojo.call(null, elName, this._pojo);
+                    }
+                }
+            }
+        }
+        this.text = "";
+    }
+
+    public _on_text(text: string): void {
+        this.text = text;
+    }
+}

package/source/xml2json_pojo.ts

@@ -1,27 +1,26 @@
-import { IReaderState, ReaderState, ReaderStateParser, Xml2Json, XmlAttributes } from "./xml2json";
-import { ReaderState2, withPojoLambda } from "./xml2Json_pojo_tools";
-
-
-const json_extractor: ReaderState2 = new ReaderState2();
-export const json_parser: ReaderStateParser = {
-    init(this: IReaderState, elementName: string, attrs: XmlAttributes, parent: IReaderState, engine: Xml2Json) {
-        json_extractor._on_init(elementName, attrs, parent, 0, engine);
-    },
-    finish(this: any) {
-        this.parent._pojo = json_extractor._pojo;
-    }
-};
-
-export function startPojo(pThis: ReaderState, elementName: string, attrs: XmlAttributes, withPojo: withPojoLambda) {
-    pThis.engine!._promote(json_extractor, pThis.engine!.currentLevel, elementName, attrs);
-    json_extractor._withPojo = (name: string, pojo: any) => {
-        withPojo(name, pojo);
-        pThis.engine!._demote(json_extractor, pThis.engine!.currentLevel, elementName);
-    };
-}
-
-export class Xml2JsonPojo extends Xml2Json {
-    constructor() {
-        super(json_extractor as ReaderStateParser);
-    }
-}
+import { IReaderState, ReaderState, ReaderStateParser, Xml2Json, XmlAttributes } from "./xml2json";
+import { ReaderState2, withPojoLambda } from "./xml2Json_pojo_tools";
+
+const json_extractor: ReaderState2 = new ReaderState2();
+export const json_parser: ReaderStateParser = {
+    init(this: IReaderState, elementName: string, attrs: XmlAttributes, parent: IReaderState, engine: Xml2Json) {
+        json_extractor._on_init(elementName, attrs, parent, 0, engine);
+    },
+    finish(this: any) {
+        this.parent._pojo = json_extractor._pojo;
+    }
+};
+
+export function startPojo(pThis: ReaderState, elementName: string, attrs: XmlAttributes, withPojo: withPojoLambda): void {
+    pThis.engine!._promote(json_extractor, pThis.engine!.currentLevel, elementName, attrs);
+    json_extractor._withPojo = (name: string, pojo: any) => {
+        withPojo(name, pojo);
+        pThis.engine!._demote(json_extractor, pThis.engine!.currentLevel, elementName);
+    };
+}
+
+export class Xml2JsonPojo extends Xml2Json {
+    constructor() {
+        super(json_extractor as ReaderStateParser);
+    }
+}