node-opcua-xml2json 2.71.0 → 2.73.0

package/dist/source/definition_parser.d.ts

@@ -1,3 +1,19 @@
-import { ReaderStateParserLike } from "./xml2json";
-export declare const _definitionParser: ReaderStateParserLike;
-export declare const definitionReaderStateParser: ReaderStateParserLike;
+import { ReaderStateParserLike } from "./xml2json";
+declare type UAString = string | null;
+declare type NodeIdLike = string | null;
+declare type Int32 = number;
+declare type UInt32 = number;
+declare type UABoolean = boolean;
+declare type LocalizedTextLike = string | null;
+export interface StructureFieldOptions {
+    name?: UAString;
+    description?: (LocalizedTextLike | null);
+    dataType?: (NodeIdLike | null);
+    valueRank?: Int32;
+    arrayDimensions?: UInt32[] | null;
+    maxStringLength?: UInt32;
+    isOptional?: UABoolean;
+}
+export declare const _definitionParser: ReaderStateParserLike;
+export declare const definitionReaderStateParser: ReaderStateParserLike;
+export {};

package/dist/source/definition_parser.js

@@ -1,84 +1,80 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.definitionReaderStateParser = exports._definitionParser = void 0;
-// <Definition Name="SomeName">
-//   <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
-//      [<Description>text</Description>]
-//   <Field>
-// </Definition>
-const node_opcua_assert_1 = require("node-opcua-assert");
-// <Definition Name="SomeName">
-//   <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
-//      [<Description>text</Description>]
-//   <Field>
-// </Definition>
-//
-// Or
-//
-//  (IsOptionSet)
-//
-//
-exports._definitionParser = {
-    init(name, attrs) {
-        (0, node_opcua_assert_1.default)(!this.parent.definitionFields || this.parent.definitionFields.length === 0);
-        this.parent.definitionFields = [];
-        this.parent.definitionName = attrs.SymbolicName || attrs.Name;
-        this.array = this.parent.definitionFields;
-        this.isUnion = attrs.IsUnion === "true" ? true : false;
-    },
-    parser: {
-        Field: {
-            init() {
-                this.description = undefined;
-            },
-            parser: {
-                Description: {
-                    finish() {
-                        this.parent.description = this.text;
-                    }
-                }
-            },
-            finish() {
-                const obj = {
-                    name: this.attrs.Name
-                };
-                if (this.attrs.DataType !== undefined) {
-                    obj.dataType = this.attrs.DataType;
-                }
-                if (this.description) {
-                    obj.description = this.description;
-                }
-                if (this.attrs.Value !== undefined) {
-                    obj.value = parseInt(this.attrs.Value, 10);
-                }
-                if (this.attrs.ValueRank !== undefined) {
-                    obj.valueRank = parseInt(this.attrs.ValueRank, 10);
-                }
-                else {
-                    // when not specified valueRank means Scalar and Scalar is -1
-                    obj.valueRank = -1;
-                }
-                if (this.attrs.ArrayDimensions !== undefined) {
-                    obj.arrayDimensions = this.attrs.ArrayDimensions.split(",").map((e) => parseInt(e, 10));
-                }
-                obj.isOptional = this.attrs.IsOptional === "true" ? true : false;
-                if (this.attrs.SymbolicName !== undefined) {
-                    obj.symbolicName = this.attrs.SymbolicName;
-                }
-                this.parent.array.push(obj);
-            }
-        }
-    }
-};
-exports.definitionReaderStateParser = {
-    parser: {
-        Definition: exports._definitionParser
-    },
-    endElement() {
-        this._pojo = {
-            name: this.definitionName,
-            fields: this.definitionFields
-        };
-    }
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.definitionReaderStateParser = exports._definitionParser = void 0;
+//<Definition Name="SomeName">
+//    <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
+//      [<Description>text</Description>]
+//   <Field>
+// </Definition>
+const node_opcua_assert_1 = require("node-opcua-assert");
+exports._definitionParser = {
+    init(name, attrs) {
+        (0, node_opcua_assert_1.default)(!this.parent.
+            nFields || this.parent.definitionFields.length === 0);
+        this.parent.definitionFields = [];
+        this.parent.definitionName = attrs.SymbolicName || attrs.Name;
+        this.array = this.parent.definitionFields;
+        this.isUnion = attrs.IsUnion === "true" ? true : false;
+    },
+    parser: {
+        Field: {
+            init() {
+                this.description = undefined;
+            },
+            parser: {
+                Description: {
+                    finish() {
+                        this.parent.description = this.text;
+                    }
+                }
+            },
+            finish() {
+                const obj = {
+                    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;
+                }
+                if (this.description) {
+                    obj.description = this.description;
+                }
+                if (this.attrs.Value !== undefined) {
+                    obj.value = parseInt(this.attrs.Value, 10);
+                }
+                if (this.attrs.ValueRank !== undefined) {
+                    obj.valueRank = parseInt(this.attrs.ValueRank, 10);
+                }
+                else {
+                    // when not specified valueRank means Scalar and Scalar is -1
+                    obj.valueRank = -1;
+                }
+                if (this.attrs.ArrayDimensions !== undefined) {
+                    obj.arrayDimensions = this.attrs.ArrayDimensions.split(",").map((e) => parseInt(e, 10));
+                }
+                obj.isOptional = this.attrs.IsOptional === "true" ? true : false;
+                if (this.attrs.SymbolicName !== undefined) {
+                    obj.symbolicName = this.attrs.SymbolicName;
+                }
+                this.parent.array.push(obj);
+            }
+        }
+    }
+};
+exports.definitionReaderStateParser = {
+    parser: {
+        Definition: exports._definitionParser
+    },
+    endElement() {
+        this._pojo = {
+            name: this.definitionName,
+            fields: this.definitionFields
+        };
+    }
+};
 //# sourceMappingURL=definition_parser.js.map

package/dist/source/definition_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"definition_parser.js","sourceRoot":"","sources":["../../source/definition_parser.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,+DAA+D;AAC/D,yCAAyC;AACzC,YAAY;AACZ,gBAAgB;AAChB,yDAAuC;AAGvC,+BAA+B;AAC/B,+DAA+D;AAC/D,yCAAyC;AACzC,YAAY;AACZ,gBAAgB;AAChB,EAAE;AACF,KAAK;AACL,EAAE;AACF,iBAAiB;AACjB,EAAE;AACF,EAAE;AACW,QAAA,iBAAiB,GAA0B;IACpD,IAAI,CAAY,IAAY,EAAE,KAAoB;QAC9C,IAAA,2BAAM,EAAC,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,IAAI,CAAC;QAC9D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3D,CAAC;IACD,MAAM,EAAE;QACJ,KAAK,EAAE;YACH,IAAI;gBACA,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;YACjC,CAAC;YACD,MAAM,EAAE;gBACJ,WAAW,EAAE;oBACT,MAAM;wBACF,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;oBACxC,CAAC;iBACJ;aACJ;YACD,MAAM;gBACF,MAAM,GAAG,GAAQ;oBACb,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;iBACxB,CAAC;gBACF,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;oBACnC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;iBACtC;gBACD,IAAI,IAAI,CAAC,WAAW,EAAE;oBAClB,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;iBACtC;gBACD,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE;oBAChC,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;iBAC9C;gBACD,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE;oBACpC,GAAG,CAAC,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;iBACtD;qBAAM;oBACH,6DAA6D;oBAC7D,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;iBACtB;gBACD,IAAI,IAAI,CAAC,KAAK,CAAC,eAAe,KAAK,SAAS,EAAE;oBAC1C,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;iBACnG;gBAED,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;gBAEjE,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE;oBACvC,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;iBAC9C;gBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;SACJ;KACJ;CACJ,CAAC;AACW,QAAA,2BAA2B,GAA0B;IAC9D,MAAM,EAAE;QACJ,UAAU,EAAE,yBAAiB;KAChC;IACD,UAAU;QACN,IAAI,CAAC,KAAK,GAAG;YACT,IAAI,EAAE,IAAI,CAAC,cAAc;YAEzB,MAAM,EAAE,IAAI,CAAC,gBAAgB;SAChC,CAAC;IACN,CAAC;CACJ,CAAC"}
+{"version":3,"file":"definition_parser.js","sourceRoot":"","sources":["../../source/definition_parser.ts"],"names":[],"mappings":"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"}

package/dist/source/extension_object_parser.d.ts

@@ -1,24 +1,25 @@
-import { ReaderState, ReaderStateParserLike } from "./xml2json";
-interface Field {
-    dataType: any;
-    description?: string;
-    name: string;
-    value?: any;
-    valueRank?: number;
-}
-export interface Definition {
-    name: string;
-    fields: Field[];
-}
-export interface DefinitionMap {
-    findDefinition(name: string): Definition;
-}
-/**
- * @deprecated ( use makeXmlExtensionObjectReader instead)
- * @param definitionName
- * @param definitionMap
- * @param readerMap
- * @returns
- */
-export declare function makeExtensionObjectReader(definitionName: string, definitionMap: DefinitionMap, readerMap: Record<string, ReaderStateParserLike>): ReaderState;
-export {};
+import { ReaderState, ReaderStateParserLike } from "./xml2json";
+interface Field {
+    dataType: any;
+    description?: string;
+    name: string;
+    value?: any;
+    valueRank?: number;
+    allowSubtype?: boolean;
+}
+export interface Definition {
+    name: string;
+    fields: Field[];
+}
+export interface DefinitionMap {
+    findDefinition(name: string): Definition;
+}
+/**
+ * @deprecated ( use makeXmlExtensionObjectReader instead)
+ * @param definitionName
+ * @param definitionMap
+ * @param readerMap
+ * @returns
+ */
+export declare function makeExtensionObjectReader(definitionName: string, definitionMap: DefinitionMap, readerMap: Record<string, ReaderStateParserLike>): ReaderState;
+export {};