node-opcua-xml2json 2.70.3 → 2.74.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +3 -1
- package/dist/source/definition_parser.d.ts +16 -0
- package/dist/source/definition_parser.js +10 -14
- package/dist/source/definition_parser.js.map +1 -1
- package/dist/source/extension_object_parser.d.ts +1 -0
- package/dist/source/extension_object_parser.js +1 -1
- package/dist/source/extension_object_parser.js.map +1 -1
- package/package.json +6 -6
- package/source/definition_parser.ts +44 -7
- package/source/extension_object_parser.ts +2 -1
package/LICENSE
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
The MIT License (MIT)
|
|
2
2
|
|
|
3
|
-
Copyright (c)
|
|
3
|
+
Copyright (c) 2022 Sterfive SAS - 833264583 RCS ORLEANS - France (https://www.sterfive.com)
|
|
4
|
+
|
|
5
|
+
Copyright (c) 2014-2022 Etienne Rossignon
|
|
4
6
|
|
|
5
7
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
6
8
|
this software and associated documentation files (the "Software"), to deal in
|
|
@@ -1,3 +1,19 @@
|
|
|
1
1
|
import { ReaderStateParserLike } from "./xml2json";
|
|
2
|
+
declare type UAString = string | null;
|
|
3
|
+
declare type NodeIdLike = string | null;
|
|
4
|
+
declare type Int32 = number;
|
|
5
|
+
declare type UInt32 = number;
|
|
6
|
+
declare type UABoolean = boolean;
|
|
7
|
+
declare type LocalizedTextLike = string | null;
|
|
8
|
+
export interface StructureFieldOptions {
|
|
9
|
+
name?: UAString;
|
|
10
|
+
description?: (LocalizedTextLike | null);
|
|
11
|
+
dataType?: (NodeIdLike | null);
|
|
12
|
+
valueRank?: Int32;
|
|
13
|
+
arrayDimensions?: UInt32[] | null;
|
|
14
|
+
maxStringLength?: UInt32;
|
|
15
|
+
isOptional?: UABoolean;
|
|
16
|
+
}
|
|
2
17
|
export declare const _definitionParser: ReaderStateParserLike;
|
|
3
18
|
export declare const definitionReaderStateParser: ReaderStateParserLike;
|
|
19
|
+
export {};
|
|
@@ -1,26 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.definitionReaderStateParser = exports._definitionParser = void 0;
|
|
4
|
-
|
|
5
|
-
//
|
|
4
|
+
//<Definition Name="SomeName">
|
|
5
|
+
// <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
|
|
6
6
|
// [<Description>text</Description>]
|
|
7
7
|
// <Field>
|
|
8
8
|
// </Definition>
|
|
9
9
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
10
|
-
// <Definition Name="SomeName">
|
|
11
|
-
// <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
|
|
12
|
-
// [<Description>text</Description>]
|
|
13
|
-
// <Field>
|
|
14
|
-
// </Definition>
|
|
15
|
-
//
|
|
16
|
-
// Or
|
|
17
|
-
//
|
|
18
|
-
// (IsOptionSet)
|
|
19
|
-
//
|
|
20
|
-
//
|
|
21
10
|
exports._definitionParser = {
|
|
22
11
|
init(name, attrs) {
|
|
23
|
-
(0, node_opcua_assert_1.default)(!this.parent.
|
|
12
|
+
(0, node_opcua_assert_1.default)(!this.parent.
|
|
13
|
+
nFields || this.parent.definitionFields.length === 0);
|
|
24
14
|
this.parent.definitionFields = [];
|
|
25
15
|
this.parent.definitionName = attrs.SymbolicName || attrs.Name;
|
|
26
16
|
this.array = this.parent.definitionFields;
|
|
@@ -42,6 +32,12 @@ exports._definitionParser = {
|
|
|
42
32
|
const obj = {
|
|
43
33
|
name: this.attrs.Name
|
|
44
34
|
};
|
|
35
|
+
if (this.attrs.AllowSubtype !== undefined) {
|
|
36
|
+
obj.allowSubtype = this.attrs.AllowSubtype === "true";
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
obj.allowSubtype = false;
|
|
40
|
+
}
|
|
45
41
|
if (this.attrs.DataType !== undefined) {
|
|
46
42
|
obj.dataType = this.attrs.DataType;
|
|
47
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definition_parser.js","sourceRoot":"","sources":["../../source/definition_parser.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"definition_parser.js","sourceRoot":"","sources":["../../source/definition_parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -220,7 +220,7 @@ function _makeExtensionObjectReader(definitionName, definitionMap, readerMap) {
|
|
|
220
220
|
reader.parser[field.name] = listReader;
|
|
221
221
|
}
|
|
222
222
|
else {
|
|
223
|
-
throw new Error("Unsupported ValueRank !");
|
|
223
|
+
throw new Error("Unsupported ValueRank ! " + field.valueRank);
|
|
224
224
|
}
|
|
225
225
|
}
|
|
226
226
|
// xx const parser: ParserLike = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension_object_parser.js","sourceRoot":"","sources":["../../source/extension_object_parser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"extension_object_parser.js","sourceRoot":"","sources":["../../source/extension_object_parser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-xml2json",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.74.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module -xml2json",
|
|
5
5
|
"main": "dist/source/index.js",
|
|
6
6
|
"types": "dist/source/index.d.ts",
|
|
@@ -14,15 +14,15 @@
|
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"bomstrip": "^0.1.4",
|
|
16
16
|
"ltx": "^3.0.0",
|
|
17
|
-
"node-opcua-assert": "2.
|
|
18
|
-
"node-opcua-debug": "2.
|
|
19
|
-
"node-opcua-utils": "2.
|
|
17
|
+
"node-opcua-assert": "2.74.0",
|
|
18
|
+
"node-opcua-debug": "2.74.0",
|
|
19
|
+
"node-opcua-utils": "2.74.0",
|
|
20
20
|
"xml-writer": "^1.7.0"
|
|
21
21
|
},
|
|
22
22
|
"author": "Etienne Rossignon",
|
|
23
23
|
"license": "MIT",
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"node-opcua-nodesets": "2.
|
|
25
|
+
"node-opcua-nodesets": "2.74.0",
|
|
26
26
|
"should": "^13.2.3"
|
|
27
27
|
},
|
|
28
28
|
"repository": {
|
|
@@ -38,5 +38,5 @@
|
|
|
38
38
|
"internet of things"
|
|
39
39
|
],
|
|
40
40
|
"homepage": "http://node-opcua.github.io/",
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "003ee041795f3b737afaaef5721045ee31ea9f77"
|
|
42
42
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
//
|
|
1
|
+
//<Definition Name="SomeName">
|
|
2
|
+
// <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
|
|
3
3
|
// [<Description>text</Description>]
|
|
4
4
|
// <Field>
|
|
5
5
|
// </Definition>
|
|
@@ -7,7 +7,7 @@ import assert from "node-opcua-assert";
|
|
|
7
7
|
import { ReaderStateParserLike, XmlAttributes } from "./xml2json";
|
|
8
8
|
|
|
9
9
|
// <Definition Name="SomeName">
|
|
10
|
-
//
|
|
10
|
+
// <Field Name="Running" Value="0" dataType: [ValueRank="1"]>
|
|
11
11
|
// [<Description>text</Description>]
|
|
12
12
|
// <Field>
|
|
13
13
|
// </Definition>
|
|
@@ -17,9 +17,41 @@ import { ReaderStateParserLike, XmlAttributes } from "./xml2json";
|
|
|
17
17
|
// (IsOptionSet)
|
|
18
18
|
//
|
|
19
19
|
//
|
|
20
|
+
type UAString = string |null;
|
|
21
|
+
type NodeIdLike = string | null;
|
|
22
|
+
type Int32 = number;
|
|
23
|
+
type UInt32 = number;
|
|
24
|
+
type UABoolean = boolean;
|
|
25
|
+
type LocalizedTextLike = string | null;
|
|
26
|
+
|
|
27
|
+
export interface StructureFieldOptions {
|
|
28
|
+
name?: UAString ;
|
|
29
|
+
description?: (LocalizedTextLike | null);
|
|
30
|
+
dataType?: (NodeIdLike | null);
|
|
31
|
+
valueRank?: Int32 ;
|
|
32
|
+
arrayDimensions?: UInt32 [] | null;
|
|
33
|
+
maxStringLength?: UInt32 ;
|
|
34
|
+
isOptional?: UABoolean ;
|
|
35
|
+
}
|
|
36
|
+
interface AA {
|
|
37
|
+
parent: {
|
|
38
|
+
definitionFields: StructureFieldOptions[];
|
|
39
|
+
nFields: number;
|
|
40
|
+
definitionName: string;
|
|
41
|
+
|
|
42
|
+
},
|
|
43
|
+
array: StructureFieldOptions[];
|
|
44
|
+
isUnion: boolean;
|
|
45
|
+
}
|
|
46
|
+
interface FieldParser {
|
|
47
|
+
description?: (LocalizedTextLike | null);
|
|
48
|
+
parent: AA;
|
|
49
|
+
attrs: Record<string, string>;
|
|
50
|
+
}
|
|
20
51
|
export const _definitionParser: ReaderStateParserLike = {
|
|
21
|
-
init(this:
|
|
22
|
-
assert(!this.parent.
|
|
52
|
+
init(this: AA, name: string, attrs: XmlAttributes) {
|
|
53
|
+
assert(!this.parent.
|
|
54
|
+
nFields || this.parent.definitionFields.length === 0);
|
|
23
55
|
this.parent.definitionFields = [];
|
|
24
56
|
this.parent.definitionName = attrs.SymbolicName || attrs.Name;
|
|
25
57
|
this.array = this.parent.definitionFields;
|
|
@@ -27,7 +59,7 @@ export const _definitionParser: ReaderStateParserLike = {
|
|
|
27
59
|
},
|
|
28
60
|
parser: {
|
|
29
61
|
Field: {
|
|
30
|
-
init(this:
|
|
62
|
+
init(this: FieldParser) {
|
|
31
63
|
this.description = undefined;
|
|
32
64
|
},
|
|
33
65
|
parser: {
|
|
@@ -37,10 +69,15 @@ export const _definitionParser: ReaderStateParserLike = {
|
|
|
37
69
|
}
|
|
38
70
|
}
|
|
39
71
|
},
|
|
40
|
-
finish(this:
|
|
72
|
+
finish(this: FieldParser) {
|
|
41
73
|
const obj: any = {
|
|
42
74
|
name: this.attrs.Name
|
|
43
75
|
};
|
|
76
|
+
if (this.attrs.AllowSubtype !== undefined) {
|
|
77
|
+
obj.allowSubtype = this.attrs.AllowSubtype === "true";
|
|
78
|
+
} else {
|
|
79
|
+
obj.allowSubtype = false;
|
|
80
|
+
}
|
|
44
81
|
if (this.attrs.DataType !== undefined) {
|
|
45
82
|
obj.dataType = this.attrs.DataType;
|
|
46
83
|
}
|
|
@@ -172,6 +172,7 @@ interface Field {
|
|
|
172
172
|
name: string;
|
|
173
173
|
value?: any;
|
|
174
174
|
valueRank?: number; // default is -1 => scalar
|
|
175
|
+
allowSubtype?: boolean;
|
|
175
176
|
}
|
|
176
177
|
|
|
177
178
|
export interface Definition {
|
|
@@ -265,7 +266,7 @@ function _makeExtensionObjectReader(
|
|
|
265
266
|
listReader.parser![field.dataType] = fieldReader;
|
|
266
267
|
reader.parser![field.name] = listReader;
|
|
267
268
|
} else {
|
|
268
|
-
throw new Error("Unsupported ValueRank !");
|
|
269
|
+
throw new Error("Unsupported ValueRank ! " + field.valueRank);
|
|
269
270
|
}
|
|
270
271
|
}
|
|
271
272
|
// xx const parser: ParserLike = {};
|