node-opcua-xml2json 2.71.0 → 2.73.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.71.0",
+  "version": "2.73.0",
   "description": "pure nodejs OPCUA SDK - module -xml2json",
   "main": "dist/source/index.js",
   "types": "dist/source/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "Etienne Rossignon",
   "license": "MIT",
   "devDependencies": {
-    "node-opcua-nodesets": "2.71.0",
+    "node-opcua-nodesets": "2.73.0",
     "should": "^13.2.3"
   },
   "repository": {
@@ -38,5 +38,5 @@
     "internet of things"
   ],
   "homepage": "http://node-opcua.github.io/",
-  "gitHead": "10f7cc1e1cd30dfef75adad9cb709a78401fabf3"
+  "gitHead": "b23a87c1ef777c0d8b680f45ee77e2a319feb092"
 }

package/source/definition_parser.ts

@@ -1,5 +1,5 @@
-// <Definition Name="SomeName">
-//   <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
+//<Definition Name="SomeName">
+//    <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
 //      [<Description>text</Description>]
 //   <Field>
 // </Definition>
@@ -7,7 +7,7 @@ import assert from "node-opcua-assert";
 import { ReaderStateParserLike, XmlAttributes } from "./xml2json";
 
 // <Definition Name="SomeName">
-//   <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
+//        <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
 //      [<Description>text</Description>]
 //   <Field>
 // </Definition>
@@ -17,9 +17,41 @@ import { ReaderStateParserLike, XmlAttributes } from "./xml2json";
 //  (IsOptionSet)
 //
 //
+type UAString = string |null;
+type NodeIdLike = string | null;
+type Int32 = number;
+type UInt32 = number;
+type UABoolean = boolean;
+type LocalizedTextLike = string | null;
+
+export interface StructureFieldOptions {
+    name?: UAString ;
+    description?: (LocalizedTextLike | null);
+    dataType?: (NodeIdLike | null);
+    valueRank?: Int32 ;
+    arrayDimensions?: UInt32 [] | null;
+    maxStringLength?: UInt32 ;
+    isOptional?: UABoolean ;
+}
+interface AA {
+    parent: {
+        definitionFields: StructureFieldOptions[];
+        nFields: number;
+        definitionName: string;
+    
+    },
+    array: StructureFieldOptions[];
+    isUnion: boolean;
+}
+interface FieldParser {
+    description?: (LocalizedTextLike | null);
+    parent: AA;
+    attrs: Record<string, string>;
+}
 export const _definitionParser: ReaderStateParserLike = {
-    init(this: any, name: string, attrs: XmlAttributes) {
-        assert(!this.parent.definitionFields || this.parent.definitionFields.length === 0);
+    init(this: AA, name: string, attrs: XmlAttributes) {
+        assert(!this.parent.
+            nFields || this.parent.definitionFields.length === 0);
         this.parent.definitionFields = [];
         this.parent.definitionName = attrs.SymbolicName || attrs.Name;
         this.array = this.parent.definitionFields;
@@ -27,7 +59,7 @@ export const _definitionParser: ReaderStateParserLike = {
     },
     parser: {
         Field: {
-            init(this: any) {
+            init(this: FieldParser) {
                 this.description = undefined;
             },
             parser: {
@@ -37,10 +69,15 @@ export const _definitionParser: ReaderStateParserLike = {
                     }
                 }
             },
-            finish(this: any) {
+            finish(this: FieldParser) {
                 const obj: any = {
                     name: this.attrs.Name
                 };
+                if (this.attrs.AllowSubtype !== undefined) {
+                    obj.allowSubtype = this.attrs.AllowSubtype === "true";
+                } else {
+                    obj.allowSubtype = false;
+                }
                 if (this.attrs.DataType !== undefined) {
                     obj.dataType = this.attrs.DataType;
                 }

package/source/extension_object_parser.ts

@@ -172,6 +172,7 @@ interface Field {
     name: string;
     value?: any;
     valueRank?: number; // default is -1 => scalar
+    allowSubtype?: boolean;
 }
 
 export interface Definition {
@@ -265,7 +266,7 @@ function _makeExtensionObjectReader(
             listReader.parser![field.dataType] = fieldReader;
             reader.parser![field.name] = listReader;
         } else {
-            throw new Error("Unsupported ValueRank !");
+            throw new Error("Unsupported ValueRank ! " + field.valueRank);
         }
     }
     // xx const parser: ParserLike = {};