node-opcua-convert-nodeset-to-javascript 2.96.0 → 2.97.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.
|
@@ -85,7 +85,7 @@ interface ClassDefinitionB {
|
|
|
85
85
|
}
|
|
86
86
|
export declare function extractClassMemberDef(session: IBasicSession, nodeId: NodeId, parentDef: ClassDefinitionB, cache: Cache): Promise<ClassMember>;
|
|
87
87
|
export declare function findUsedImport(namespaceIndex: number, cache: Cache): string[];
|
|
88
|
-
export
|
|
88
|
+
export type Type = "enum" | "basic" | "structure" | "ua";
|
|
89
89
|
/**
|
|
90
90
|
* nodeId : a DataType, ReferenceType,AObjectType, VariableType node
|
|
91
91
|
*/
|
package/dist/private/utils.js
CHANGED
|
@@ -109,10 +109,11 @@ function getModellingRule(session, nodeId) {
|
|
|
109
109
|
exports.getModellingRule = getModellingRule;
|
|
110
110
|
function isExtensionObject(session, nodeId) {
|
|
111
111
|
return __awaiter(this, void 0, void 0, function* () {
|
|
112
|
-
|
|
112
|
+
const n = nodeId;
|
|
113
|
+
if (n.namespace === 0 && n.identifierType === node_opcua_nodeid_1.NodeIdType.NUMERIC && n.value === node_opcua_constants_1.DataTypeIds.Structure) {
|
|
113
114
|
return true;
|
|
114
115
|
}
|
|
115
|
-
if (
|
|
116
|
+
if (n.namespace === 0 && n.identifierType === node_opcua_nodeid_1.NodeIdType.NUMERIC && n.value <= node_opcua_constants_1.DataTypeIds.DiagnosticInfo) {
|
|
116
117
|
return false;
|
|
117
118
|
}
|
|
118
119
|
const r = yield getSubtypeNodeIdIfAny(session, nodeId);
|
|
@@ -122,10 +123,11 @@ function isExtensionObject(session, nodeId) {
|
|
|
122
123
|
exports.isExtensionObject = isExtensionObject;
|
|
123
124
|
function isEnumeration(session, nodeId) {
|
|
124
125
|
return __awaiter(this, void 0, void 0, function* () {
|
|
125
|
-
|
|
126
|
+
const n = nodeId;
|
|
127
|
+
if (n.namespace === 0 && n.identifierType === node_opcua_nodeid_1.NodeIdType.NUMERIC && n.value === node_opcua_constants_1.DataTypeIds.Enumeration) {
|
|
126
128
|
return true;
|
|
127
129
|
}
|
|
128
|
-
if (
|
|
130
|
+
if (n.namespace === 0 && n.identifierType === node_opcua_nodeid_1.NodeIdType.NUMERIC && n.value <= node_opcua_constants_1.DataTypeIds.DiagnosticInfo) {
|
|
129
131
|
return false;
|
|
130
132
|
}
|
|
131
133
|
const r = yield getSubtypeNodeIdIfAny(session, nodeId);
|
|
@@ -135,7 +137,8 @@ function isEnumeration(session, nodeId) {
|
|
|
135
137
|
exports.isEnumeration = isEnumeration;
|
|
136
138
|
function extractBasicDataType(session, dataTypeNodeId) {
|
|
137
139
|
return __awaiter(this, void 0, void 0, function* () {
|
|
138
|
-
|
|
140
|
+
const n = dataTypeNodeId;
|
|
141
|
+
if (n.namespace === 0 && n.identifierType === node_opcua_nodeid_1.NodeIdType.NUMERIC && n.value <= node_opcua_constants_1.DataTypeIds.DiagnosticInfo) {
|
|
139
142
|
return dataTypeNodeId.value;
|
|
140
143
|
}
|
|
141
144
|
const r = yield getSubtypeNodeIdIfAny(session, dataTypeNodeId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8H;AAC9H,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-convert-nodeset-to-javascript",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.97.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module -convert-nodeset-to-javascript",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -15,26 +15,26 @@
|
|
|
15
15
|
"@types/wordwrap": "^1.0.1",
|
|
16
16
|
"case-anything": "1.1.5",
|
|
17
17
|
"chalk": "4.1.2",
|
|
18
|
-
"node-opcua-address-space": "2.
|
|
19
|
-
"node-opcua-address-space-base": "2.
|
|
18
|
+
"node-opcua-address-space": "2.97.0",
|
|
19
|
+
"node-opcua-address-space-base": "2.97.0",
|
|
20
20
|
"node-opcua-assert": "2.88.0",
|
|
21
21
|
"node-opcua-constants": "2.88.0",
|
|
22
|
-
"node-opcua-data-model": "2.
|
|
22
|
+
"node-opcua-data-model": "2.97.0",
|
|
23
23
|
"node-opcua-debug": "2.90.1",
|
|
24
|
-
"node-opcua-extension-object": "2.
|
|
25
|
-
"node-opcua-nodeid": "2.
|
|
24
|
+
"node-opcua-extension-object": "2.97.0",
|
|
25
|
+
"node-opcua-nodeid": "2.97.0",
|
|
26
26
|
"node-opcua-nodesets": "2.96.0",
|
|
27
|
-
"node-opcua-pseudo-session": "2.
|
|
27
|
+
"node-opcua-pseudo-session": "2.97.0",
|
|
28
28
|
"node-opcua-status-code": "2.90.1",
|
|
29
|
-
"node-opcua-types": "2.
|
|
29
|
+
"node-opcua-types": "2.97.0",
|
|
30
30
|
"node-opcua-utils": "2.90.1",
|
|
31
|
-
"node-opcua-variant": "2.
|
|
31
|
+
"node-opcua-variant": "2.97.0",
|
|
32
32
|
"wordwrap": "^1.0.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"node-opcua-leak-detector": "2.90.1",
|
|
36
|
-
"node-opcua-packet-analyzer": "2.
|
|
37
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
36
|
+
"node-opcua-packet-analyzer": "2.97.0",
|
|
37
|
+
"node-opcua-service-translate-browse-path": "2.97.0",
|
|
38
38
|
"should": "^13.2.3"
|
|
39
39
|
},
|
|
40
40
|
"author": "Etienne Rossignon",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"internet of things"
|
|
53
53
|
],
|
|
54
54
|
"homepage": "http://node-opcua.github.io/",
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "19c96bda0810d2dec73dd1c2427546be40908646"
|
|
56
56
|
}
|
package/source/private/utils.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AttributeIds, BrowseDirection, LocalizedText, NodeClass, NodeClassMask, QualifiedName } from "node-opcua-data-model";
|
|
2
|
-
import { NodeId, resolveNodeId } from "node-opcua-nodeid";
|
|
2
|
+
import { INodeId, NodeId, NodeIdType, resolveNodeId } from "node-opcua-nodeid";
|
|
3
3
|
import { DataTypeIds } from "node-opcua-constants";
|
|
4
4
|
import { IBasicSession } from "node-opcua-pseudo-session";
|
|
5
5
|
import { BrowseResult, DataTypeDefinition, ReferenceDescription } from "node-opcua-types";
|
|
@@ -75,10 +75,12 @@ export async function getModellingRule(session: IBasicSession, nodeId: NodeId):
|
|
|
75
75
|
return browseResult.references[0].browseName.name! as ModellingRuleType;
|
|
76
76
|
}
|
|
77
77
|
export async function isExtensionObject(session: IBasicSession, nodeId: NodeId): Promise<boolean> {
|
|
78
|
-
|
|
78
|
+
|
|
79
|
+
const n = nodeId as INodeId;
|
|
80
|
+
if (n.namespace === 0 && n.identifierType === NodeIdType.NUMERIC && n.value === DataTypeIds.Structure) {
|
|
79
81
|
return true;
|
|
80
82
|
}
|
|
81
|
-
if (
|
|
83
|
+
if (n.namespace === 0 && n.identifierType === NodeIdType.NUMERIC && n.value <= DataTypeIds.DiagnosticInfo) {
|
|
82
84
|
return false;
|
|
83
85
|
}
|
|
84
86
|
const r = await getSubtypeNodeIdIfAny(session, nodeId);
|
|
@@ -86,10 +88,11 @@ export async function isExtensionObject(session: IBasicSession, nodeId: NodeId):
|
|
|
86
88
|
}
|
|
87
89
|
|
|
88
90
|
export async function isEnumeration(session: IBasicSession, nodeId: NodeId): Promise<boolean> {
|
|
89
|
-
|
|
91
|
+
const n = nodeId as INodeId;
|
|
92
|
+
if (n.namespace === 0 && n.identifierType === NodeIdType.NUMERIC && n.value === DataTypeIds.Enumeration) {
|
|
90
93
|
return true;
|
|
91
94
|
}
|
|
92
|
-
if (
|
|
95
|
+
if (n.namespace === 0 && n.identifierType === NodeIdType.NUMERIC && n.value <= DataTypeIds.DiagnosticInfo) {
|
|
93
96
|
return false;
|
|
94
97
|
}
|
|
95
98
|
const r = await getSubtypeNodeIdIfAny(session, nodeId);
|
|
@@ -97,7 +100,8 @@ export async function isEnumeration(session: IBasicSession, nodeId: NodeId): Pro
|
|
|
97
100
|
}
|
|
98
101
|
|
|
99
102
|
export async function extractBasicDataType(session: IBasicSession, dataTypeNodeId: NodeId): Promise<DataType> {
|
|
100
|
-
|
|
103
|
+
const n = dataTypeNodeId as INodeId;
|
|
104
|
+
if (n.namespace === 0 && n.identifierType === NodeIdType.NUMERIC && n.value <= DataTypeIds.DiagnosticInfo) {
|
|
101
105
|
return dataTypeNodeId.value as DataType;
|
|
102
106
|
}
|
|
103
107
|
const r = await getSubtypeNodeIdIfAny(session, dataTypeNodeId);
|