node-opcua-xml2json 2.64.1 → 2.66.0

package/dist/source/xml2json_pojo.js

@@ -1,29 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Xml2JsonPojo = exports.startPojo = exports.json_parser = void 0;
-const xml2json_1 = require("./xml2json");
-const xml2Json_pojo_tools_1 = require("./xml2Json_pojo_tools");
-const json_extractor = new xml2Json_pojo_tools_1.ReaderState2();
-exports.json_parser = {
-    init(elementName, attrs, parent, engine) {
-        json_extractor._on_init(elementName, attrs, parent, 0, engine);
-    },
-    finish() {
-        this.parent._pojo = json_extractor._pojo;
-    }
-};
-function startPojo(pThis, elementName, attrs, withPojo) {
-    pThis.engine._promote(json_extractor, pThis.engine.currentLevel, elementName, attrs);
-    json_extractor._withPojo = (name, pojo) => {
-        withPojo(name, pojo);
-        pThis.engine._demote(json_extractor, pThis.engine.currentLevel, elementName);
-    };
-}
-exports.startPojo = startPojo;
-class Xml2JsonPojo extends xml2json_1.Xml2Json {
-    constructor() {
-        super(json_extractor);
-    }
-}
-exports.Xml2JsonPojo = Xml2JsonPojo;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Xml2JsonPojo = exports.startPojo = exports.json_parser = void 0;
+const xml2json_1 = require("./xml2json");
+const xml2Json_pojo_tools_1 = require("./xml2Json_pojo_tools");
+const json_extractor = new xml2Json_pojo_tools_1.ReaderState2();
+exports.json_parser = {
+    init(elementName, attrs, parent, engine) {
+        json_extractor._on_init(elementName, attrs, parent, 0, engine);
+    },
+    finish() {
+        this.parent._pojo = json_extractor._pojo;
+    }
+};
+function startPojo(pThis, elementName, attrs, withPojo) {
+    pThis.engine._promote(json_extractor, pThis.engine.currentLevel, elementName, attrs);
+    json_extractor._withPojo = (name, pojo) => {
+        withPojo(name, pojo);
+        pThis.engine._demote(json_extractor, pThis.engine.currentLevel, elementName);
+    };
+}
+exports.startPojo = startPojo;
+class Xml2JsonPojo extends xml2json_1.Xml2Json {
+    constructor() {
+        super(json_extractor);
+    }
+}
+exports.Xml2JsonPojo = Xml2JsonPojo;
 //# sourceMappingURL=xml2json_pojo.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-opcua-xml2json",
-  "version": "2.64.1",
+  "version": "2.66.0",
   "description": "pure nodejs OPCUA SDK - module -xml2json",
   "main": "dist/source/index.js",
   "types": "dist/source/index.d.ts",
@@ -8,21 +8,21 @@
     "build": "tsc -b",
     "lint": "eslint source test",
     "format": "prettier --write source test",
-    "clean": "node -e \"require('rimraf').sync('dist');\"",
+    "clean": "npx rimraf dist *.tsbuildinfo",
     "test": "mocha"
   },
   "dependencies": {
     "bomstrip": "^0.1.4",
     "ltx": "^3.0.0",
-    "node-opcua-assert": "2.64.1",
-    "node-opcua-debug": "2.64.1",
-    "node-opcua-utils": "2.64.1",
+    "node-opcua-assert": "2.66.0",
+    "node-opcua-debug": "2.66.0",
+    "node-opcua-utils": "2.66.0",
     "xml-writer": "^1.7.0"
   },
   "author": "Etienne Rossignon",
   "license": "MIT",
   "devDependencies": {
-    "node-opcua-nodesets": "2.64.1",
+    "node-opcua-nodesets": "2.66.0",
     "should": "^13.2.3"
   },
   "repository": {
@@ -38,5 +38,5 @@
     "internet of things"
   ],
   "homepage": "http://node-opcua.github.io/",
-  "gitHead": "b65b8738603cd475d7d99a2b20b0ae9d32b4110c"
+  "gitHead": "97f47e2e242a1fd737495fd64cb65e8fb7a9964b"
 }

package/source/extension_object_parser.ts

@@ -187,6 +187,9 @@ function _clone(a: any): any {
     if (typeof a === "string" || typeof a === "number" || typeof a === "boolean") {
         return a;
     }
+    if (a instanceof Buffer) {
+        return Buffer.from(a);
+    }
     if (a instanceof Array) {
         return a.map((x) => _clone(x));
     }
@@ -271,6 +274,13 @@ function _makeExtensionObjectReader(
     return reader;
 }
 
+/**
+ * @deprecated ( use makeXmlExtensionObjectReader instead)
+ * @param definitionName 
+ * @param definitionMap 
+ * @param readerMap 
+ * @returns 
+ */
 export function makeExtensionObjectReader(
     definitionName: string,
     definitionMap: DefinitionMap,

package/source/xml2json.ts

@@ -305,7 +305,16 @@ export class Xml2Json {
         this._promote(state, 0);
     }
 
+
+    public parseStringSync(xml_text: string): Record<string, unknown> {
+        let retValue:  Record<string, unknown> = {};
+        const parser = this._prepareParser((err: Error | null | undefined, r:  Record<string, unknown>)=> retValue =r);
+        parser.write(xml_text);
+        parser.end();
+        return retValue;
+    }
     /**
+     * @deprecated
      * @method parseString
      * @async
      */

package/dist/source/fragmentCloner.d.ts

@@ -1,20 +0,0 @@
-import { Xml2Json, XmlAttributes, IReaderState } from "./xml2json";
-export declare class InternalFragmentClonerReaderState implements IReaderState {
-    private _xw;
-    value: any;
-    initLevel: number;
-    engine?: Xml2Json;
-    _on_startElement(level: number, elementName: string, attrs: XmlAttributes): void;
-    _on_endElement(level: number, elementName: string): void;
-    _on_init(elementName: string, attrs: XmlAttributes, parent: IReaderState, level: number, engine: Xml2Json): void;
-    _on_finish(): void;
-    _on_endElement2(level: number, elementName: string): void;
-    _on_text(text: string): void;
-}
-export declare class FragmentClonerParser {
-    value: any;
-    private _cloneFragment?;
-    constructor();
-    startElement(this: any, elementName: string, attrs: XmlAttributes): void;
-    finish(): void;
-}

package/dist/source/fragmentCloner.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const XMLWriter = require("xml-writer");
-class InternalFragmentClonerReaderState {
-    constructor() {
-        this._xw = new XMLWriter(true);
-        this.initLevel = 0;
-    }
-    _on_startElement(level, elementName, attrs) {
-        this._xw.startElement(elementName);
-        for (const [attName, attValue] of Object.entries(attrs)) {
-            this._xw.writeAttribute(attName, attValue);
-        }
-    }
-    _on_endElement(level, elementName) {
-        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();
-        }
-    }
-    _on_init(elementName, attrs, parent, level, engine) {
-        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);
-        }
-    }
-    _on_finish() {
-    }
-    _on_endElement2(level, elementName) {
-    }
-    _on_text(text) {
-        this._xw.text(text);
-    }
-}
-exports.InternalFragmentClonerReaderState = InternalFragmentClonerReaderState;
-class FragmentClonerParser {
-    constructor() {
-    }
-    startElement(elementName, attrs) {
-        this._cloneFragment = new InternalFragmentClonerReaderState();
-        this.engine._promote(this._cloneFragment, this.engine.currentLevel, elementName, attrs);
-    }
-    finish() {
-        this.value = this._cloneFragment.value;
-        this._cloneFragment.value = null;
-    }
-}
-exports.FragmentClonerParser = FragmentClonerParser;
-//# sourceMappingURL=fragmentCloner.js.map

package/dist/source/fragmentCloner.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fragmentCloner.js","sourceRoot":"","sources":["../../source/fragmentCloner.ts"],"names":[],"mappings":";;AAkBA,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAExC,MAAa,iCAAiC;IAA9C;QACY,QAAG,GAAc,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QAEtC,cAAS,GAAU,CAAC,CAAC;IAkChC,CAAC;IA/BU,gBAAgB,CAAC,KAAa,EAAE,WAAmB,EAAE,KAAoB;QAC5E,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACnC,KAAI,MAAM,CAAE,OAAO,EAAE,QAAQ,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtD,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;SAC9C;IACL,CAAC;IACM,cAAc,CAAC,KAAa,EAAE,WAAmB;QACpD,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,EAAE;YAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YACjC,IAAI,CAAC,MAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAO,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YACnE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,IAAI,CAAC,UAAU,EAAE,CAAC;SACrB;IACL,CAAC;IACM,QAAQ,CAAC,WAAmB,EAAE,KAAoB,EAAE,MAAoB,EAAE,KAAa,EAAE,MAAgB;QAC5G,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACnC,KAAI,MAAM,CAAE,OAAO,EAAE,QAAQ,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtD,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;SAC9C;IACL,CAAC;IACM,UAAU;IACjB,CAAC;IACM,eAAe,CAAC,KAAa,EAAE,WAAmB;IACzD,CAAC;IACM,QAAQ,CAAC,IAAY;QACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACJ;AArCD,8EAqCC;AAED,MAAa,oBAAoB;IAG7B;IACA,CAAC;IAEM,YAAY,CAAY,WAAmB,EAAE,KAAoB;QACpE,IAAI,CAAC,cAAc,GAAE,IAAI,iCAAiC,EAAE,CAAC;QAC7D,IAAI,CAAC,MAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,MAAO,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC9F,CAAC;IACM,MAAM;QACT,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAe,CAAC,KAAK,CAAC;QACxC,IAAI,CAAC,cAAe,CAAC,KAAK,GAAG,IAAI,CAAC;IACtC,CAAC;CACJ;AAdD,oDAcC"}

package/dist/source/xml2JsonPojo.d.ts

@@ -1,8 +0,0 @@
-import { ReaderState, ReaderStateParser, Xml2Json, XmlAttributes } from "./xml2json";
-declare type withPojoLambda = (name: string, pojo: any) => void;
-export declare const json_parser: ReaderStateParser;
-export declare function startPojo(pThis: ReaderState, elementName: string, attrs: XmlAttributes, withPojo: withPojoLambda): void;
-export declare class Xml2JsonPojo extends Xml2Json {
-    constructor();
-}
-export {};

package/dist/source/xml2JsonPojo.js

@@ -1,109 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const xml2json_1 = require("./xml2json");
-const node_opcua_utils_1 = require("node-opcua-utils");
-class ReaderState2 extends xml2json_1.ReaderStateBase {
-    constructor() {
-        super();
-        this.initLevel = 0;
-        this._pojo = {};
-        this._stack = [];
-        this._element = {};
-        this.text = "";
-        this.parent = undefined;
-        this._withPojo = (pojo) => {
-        };
-    }
-    _on_init(elementName, attrs, parent, level, engine) {
-        this.parent = parent;
-        this.engine = engine;
-        this.initLevel = level;
-        if (this._stack.length === 0) {
-            this._pojo = {};
-            this._element = this._pojo;
-        }
-    }
-    _on_finish() {
-        /* empy */
-    }
-    _on_startElement(level, elementName, attrs) {
-        this._stack.push(this._element);
-        if (elementName.match(/^ListOf/)) {
-            elementName = elementName.substring(6);
-            const elName = node_opcua_utils_1.lowerFirstLetter(elementName);
-            if (this._element instanceof Array) {
-                const array = [];
-                this._element.push(array);
-                this._element = array;
-            }
-            else {
-                this._element[elName] = [];
-                this._element = this._element[elName];
-            }
-        }
-        else {
-            const elName = node_opcua_utils_1.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];
-            }
-        }
-    }
-    _on_endElement2(level, elementName) {
-        /* empty */
-    }
-    _on_endElement(level, elementName) {
-        this._element = this._stack.pop();
-        if (this.text.length > 0 && this._element) {
-            const elName = node_opcua_utils_1.lowerFirstLetter(elementName);
-            this._element[elName] = this.text;
-            // this.engine!._pojo = this._pojo;
-        }
-        else {
-            const elName = node_opcua_utils_1.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 = "";
-    }
-    _on_text(text) {
-        this.text = text;
-    }
-}
-const json_extractor = new ReaderState2();
-exports.json_parser = {
-    init(elementName, attrs, parent, engine) {
-        json_extractor._on_init(elementName, attrs, parent, 0, engine);
-    },
-    finish() {
-        this.parent._pojo = json_extractor._pojo;
-    }
-};
-function startPojo(pThis, elementName, attrs, withPojo) {
-    pThis.engine._promote(json_extractor, pThis.engine.currentLevel, elementName, attrs);
-    json_extractor._withPojo = (name, pojo) => {
-        withPojo(name, pojo);
-        pThis.engine._demote(json_extractor, pThis.engine.currentLevel, elementName);
-    };
-}
-exports.startPojo = startPojo;
-class Xml2JsonPojo extends xml2json_1.Xml2Json {
-    constructor() {
-        super(json_extractor);
-    }
-}
-exports.Xml2JsonPojo = Xml2JsonPojo;
-//# sourceMappingURL=xml2JsonPojo.js.map

package/dist/source/xml2JsonPojo.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"xml2JsonPojo.js","sourceRoot":"","sources":["../../source/xml2JsonPojo.ts"],"names":[],"mappings":"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"}