node-opcua-client-dynamic-extension-object 2.95.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.
Files changed (4) hide show
  1. package/dist/convert_data_type_definition_to_structuretype_schema.js +14 -9
  2. package/dist/convert_data_type_definition_to_structuretype_schema.js.map +1 -1
  3. package/package.json +13 -13
  4. package/source/convert_data_type_definition_to_structuretype_schema.ts +16 -10
package/dist/convert_data_type_definition_to_structuretype_schema.js CHANGED
@@ -62,9 +62,10 @@ function findDataTypeCategory(session, cache, dataTypeNodeId) {
62
62
  return cache[key].category;
63
63
  }
64
64
  let category;
65
- if (subTypeNodeId.namespace === 0 && subTypeNodeId.value <= 29) {
65
+ const n = subTypeNodeId;
66
+ if (n.identifierType === node_opcua_nodeid_1.NodeIdType.NUMERIC && n.namespace === 0 && n.value <= 29) {
66
67
  // well known node ID !
67
- switch (subTypeNodeId.value) {
68
+ switch (n.value) {
68
69
  case 22 /* Structure */:
69
70
  category = node_opcua_factory_1.FieldCategory.complex;
70
71
  break;
@@ -89,8 +90,9 @@ function findDataTypeBasicType(session, cache, dataTypeNodeId) {
89
90
  if (cache[key]) {
90
91
  return cache[key].schema;
91
92
  }
92
- if (subTypeNodeId.namespace === 0 && subTypeNodeId.value < 29) {
93
- switch (subTypeNodeId.value) {
93
+ const n = subTypeNodeId;
94
+ if (n.identifierType === node_opcua_nodeid_1.NodeIdType.NUMERIC && n.namespace === 0 && n.value < 29) {
95
+ switch (n.value) {
94
96
  case 22: /* Structure */
95
97
  case 29 /* Enumeration */:
96
98
  throw new Error("Not expecting Structure or Enumeration");
@@ -176,11 +178,14 @@ const isExtensionObject = (session, dataTypeNodeId) => __awaiter(void 0, void 0,
176
178
  return true;
177
179
  }
178
180
  const baseDataType = yield findSuperType(session, dataTypeNodeId);
179
- if (baseDataType.namespace === 0 && baseDataType.value === node_opcua_variant_1.DataType.ExtensionObject) {
180
- return true;
181
- }
182
- if (baseDataType.namespace === 0 && baseDataType.value < node_opcua_variant_1.DataType.ExtensionObject) {
183
- return false;
181
+ const bn = baseDataType;
182
+ if (bn.identifierType === node_opcua_nodeid_1.NodeIdType.NUMERIC) {
183
+ if (bn.namespace === 0 && bn.value === node_opcua_variant_1.DataType.ExtensionObject) {
184
+ return true;
185
+ }
186
+ if (bn.namespace === 0 && bn.value < node_opcua_variant_1.DataType.ExtensionObject) {
187
+ return false;
188
+ }
184
189
  }
185
190
  return yield isExtensionObject(session, baseDataType);
186
191
  });
package/dist/convert_data_type_definition_to_structuretype_schema.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"convert_data_type_definition_to_structuretype_schema.js","sourceRoot":"","sources":["../source/convert_data_type_definition_to_structuretype_schema.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iEAAqG;AAErG,uDAAiF;AACjF,yDAA+C;AAC/C,oDAAoD;AACpD,2DAY4B;AAC5B,yDAA4F;AAC5F,yEAAmI;AAEnI,uDAO0B;AAC1B,6EAA8D;AAC9D,EAAE;AACF,2DAA8C;AAC9C,6DAA0D;AAE1D,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;AAE/C,SAAe,aAAa,CAAC,OAAsB,EAAE,cAAsB;;QACvE,IAAI,cAAc,CAAC,SAAS,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,KAAK,EAAE,EAAE;YAC/D,iBAAiB;YACjB,OAAO,IAAA,gCAAY,EAAC,CAAC,CAAC,CAAC;SAC1B;QAED,MAAM,aAAa,GAA0B;YACzC,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,KAAK;YACtB,aAAa,EAAE,qCAAa,CAAC,QAAQ;YACrC,MAAM,EAAE,cAAc;YACtB,eAAe,EAAE,IAAA,iCAAa,EAAC,YAAY,CAAC;YAC5C,UAAU,EAAE,IAAA,sCAAc,EAAC,iDAAiD,CAAC;SAChF,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAExD,0BAA0B;QAC1B,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC7E;QACD,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;QAE9C,0BAA0B;QAC1B,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChC,MAAM,IAAI,KAAK,CACX,uDAAuD,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAC1H,CAAC;SACL;QACD,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACxC,CAAC;CAAA;AACD,SAAe,oBAAoB,CAC/B,OAAsB,EACtB,KAAiD,EACjD,cAAsB;;QAEtB,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACnE,QAAQ,CAAC,oBAAoB,EAAE,cAAc,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5F,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;YACZ,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;SAC9B;QACD,IAAI,QAAuB,CAAC;QAC5B,IAAI,aAAa,CAAC,SAAS,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,IAAI,EAAE,EAAE;YAC5D,uBAAuB;YACvB,QAAQ,aAAa,CAAC,KAAK,EAAE;gBACzB,KAAK,EAAE,CAAC,eAAe;oBACnB,QAAQ,GAAG,kCAAa,CAAC,OAAO,CAAC;oBACjC,MAAM;gBACV,KAAK,EAAE,CAAC,iBAAiB;oBACrB,QAAQ,GAAG,kCAAa,CAAC,WAAW,CAAC;oBACrC,MAAM;gBACV;oBACI,QAAQ,GAAG,kCAAa,CAAC,KAAK,CAAC;oBAC/B,MAAM;aACb;YACD,OAAO,QAAQ,CAAC;SACnB;QACD,sBAAsB;QACtB,OAAO,MAAM,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;IACrE,CAAC;CAAA;AAED,SAAe,qBAAqB,CAChC,OAAsB,EACtB,KAAiD,EACjD,cAAsB;;QAEtB,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAEnE,QAAQ,CAAC,oBAAoB,EAAE,cAAc,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE5F,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;YACZ,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;SAC5B;QACD,IAAI,aAAa,CAAC,SAAS,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,GAAG,EAAE,EAAE;YAC3D,QAAQ,aAAa,CAAC,KAAK,EAAE;gBACzB,KAAK,EAAE,CAAC,CAAC,eAAe;gBACxB,KAAK,EAAE,CAAC,iBAAiB;oBACrB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAC9D;oBACI,MAAM;aACb;YACD,MAAM,aAAa,GAAc,MAAM,OAAO,CAAC,IAAI,CAAC;gBAChD,WAAW,EAAE,oCAAY,CAAC,UAAU;gBACpC,MAAM,EAAE,aAAa;aACxB,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,IAAK,CAAC;YAC7C,OAAO,IAAA,mCAAc,EAAC,IAAI,CAAC,CAAC;SAC/B;QACD,sBAAsB;QACtB,OAAO,MAAM,qBAAqB,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;IACtE,CAAC;CAAA;AAUD,SAAe,cAAc,CAAC,OAAsB,EAAE,MAAc;;QAChE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QACvF,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;YAClC,MAAM,OAAO,GACT,wCAAwC,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,gBAAgB,GAAG,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACtH,QAAQ,CAAC,OAAO,CAAC,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;SAC5B;QACD,OAAO,SAAS,CAAC,KAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IACvC,CAAC;CAAA;AAED,SAAe,QAAQ,CACnB,OAAsB,EACtB,cAAsB,EACtB,eAAgC,EAChC,aAAqB,EACrB,KAAiD;;QAEjD,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAC5E,QAAQ,CAAC,QAAQ,GAAG,aAAa,GAAG,wDAAwD,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAE9G,IAAI,MAAM,GAA+B,SAAS,CAAC;QACnD,QAAQ,QAAQ,EAAE;YACd,KAAK,kCAAa,CAAC,KAAK;gBACpB,MAAM,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;gBACrE,0BAA0B;gBAC1B,IAAI,CAAC,MAAM,EAAE;oBACT,QAAQ,CAAC,yBAAyB,GAAG,aAAa,CAAC,CAAC;iBACvD;gBACD,MAAM;YACV,QAAQ;YACR,KAAK,kCAAa,CAAC,OAAO;gBACtB;oBACI,MAAM,2BAA2B,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;wBACnD,WAAW,EAAE,oCAAY,CAAC,kBAAkB;wBAC5C,MAAM,EAAE,cAAc;qBACzB,CAAC,CAAC;oBAEH,0BAA0B;oBAC1B,IAAI,2BAA2B,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;wBACpD,MAAM,IAAI,KAAK,CAAC,kDAAkD,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;qBACnG;oBACD,MAAM,UAAU,GAAG,2BAA2B,CAAC,KAAK,CAAC,KAAK,CAAC;oBAE3D,MAAM,oBAAoB,GAAG,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEnD,MAAM,OAAO,GAAG,CAAC,MAA0B,EAAE,EAAE;wBAC3C,MAAM,MAAM,GAA2B,EAAE,CAAC;wBAC1C,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,KAAgB,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAC/G,OAAO,MAAM,CAAC;oBAClB,CAAC,CAAC;oBACF,IAAI,QAAQ,KAAK,kCAAa,CAAC,WAAW,EAAE;wBACxC,IAAI,UAAU,YAAY,iCAAc,EAAE;4BACtC,MAAM,CAAC,GAAG,IAAI,gDAA2B,CAAC,cAAc,EAAE;gCACtD,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;gCACtC,IAAI,EAAE,aAAa;6BACtB,CAAC,CAAC;4BACH,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;4BAEvC,MAAM,GAAG,CAAC,CAAC;yBACd;qBACJ;yBAAM;wBACH,MAAM,UAAU,GAAG,KAAK,CAAC;wBACzB,MAAM,GAAG,MAAM,8CAA8C,CACzD,OAAO,EACP,cAAc,EACd,aAAa,EACb,UAAU,EACV,eAAe,EACf,UAAU,EACV,KAAK,CACR,CAAC;qBACL;oBACD,6EAA6E;iBAChF;gBACD,MAAM;SACb;QACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;CAAA;AAED,MAAM,iBAAiB,GAAG,CAAO,OAAsB,EAAE,cAAsB,EAAoB,EAAE;IACjG,IAAI,cAAc,CAAC,SAAS,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,KAAK,6BAAQ,CAAC,eAAe,EAAE;QACrF,OAAO,IAAI,CAAC;KACf;IACD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAClE,IAAI,YAAY,CAAC,SAAS,KAAK,CAAC,IAAI,YAAY,CAAC,KAAK,KAAK,6BAAQ,CAAC,eAAe,EAAE;QACjF,OAAO,IAAI,CAAC;KACf;IACD,IAAI,YAAY,CAAC,SAAS,KAAK,CAAC,IAAI,YAAY,CAAC,KAAK,GAAG,6BAAQ,CAAC,eAAe,EAAE;QAC/E,OAAO,KAAK,CAAC;KAChB;IACD,OAAO,MAAM,iBAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AAC1D,CAAC,CAAA,CAAC;AAEF,0CAA0C;AAC1C,SAAe,gBAAgB,CAC3B,OAAsB,EACtB,cAAsB,EACtB,eAAgC,EAChC,KAAiD;;QAEjD,IAAI,cAAc,CAAC,SAAS,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,KAAK,EAAE,EAAE;YAC/D,qBAAqB;YACrB,MAAM,QAAQ,GAAkB,kCAAa,CAAC,OAAO,CAAC;YACtD,MAAM,aAAa,GAAG,WAAW,CAAC;YAClC,MAAM,MAAM,GAAG,6CAAe,CAAC,MAAM,CAAC;YACtC,OAAO;gBACH,QAAQ;gBACR,aAAa;gBACb,MAAM;gBACN,YAAY,EAAE,IAAI;gBAClB,QAAQ,EAAE,IAAA,gCAAY,EAAC,6BAAQ,CAAC,eAAe,CAAC;aACnD,CAAC;SACL;QACD,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,EAAE;YACH,OAAO,CAAC,CAAC;SACZ;QAED,IAAI,cAAc,CAAC,KAAK,KAAK,CAAC,EAAE;YAC5B,MAAM,EAAE,GAA4B;gBAChC,QAAQ,EAAE,kCAAa,CAAC,KAAK;gBAC7B,aAAa,EAAE,SAAS;gBACxB,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,SAAS,CAAC;aACpD,CAAC;YACF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;SACb;QAED,MAAM,UAAU,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QACtH,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAEpE,IAAI,UAAU,EAAE;YACZ,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAC5E,QAAQ,CACJ,YAAY,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,aAAa,GAAG,4BAA4B,GAAG,kBAAkB,CACrH,CAAC;YACF,IAAI,kBAAkB,EAAE;gBACpB,qCAAqC;gBACrC,MAAM,EAAE,GAA4B;oBAChC,QAAQ,EAAE,kCAAa,CAAC,OAAO;oBAC/B,aAAa,EAAE,aAAa;oBAC5B,MAAM,EAAE,6CAAe,CAAC,MAAM;oBAC9B,YAAY,EAAE,IAAI;oBAClB,QAAQ,EAAE,cAAc;iBAC3B,CAAC;gBACF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;gBAChB,OAAO,EAAE,CAAC;aACb;iBAAM;gBACH,iCAAiC;gBACjC,MAAM,EAAE,GAA4B;oBAChC,QAAQ,EAAE,kCAAa,CAAC,KAAK;oBAC7B,aAAa,EAAE,aAAa;oBAC5B,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,SAAS,CAAC;oBACjD,YAAY,EAAE,IAAI;oBAClB,QAAQ,EAAE,cAAc;iBAC3B,CAAC;gBACF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;gBAChB,OAAO,EAAE,CAAC;aACb;SACJ;QAED,IAAI,MAAkC,CAAC;QACvC,IAAI,QAAQ,GAAkB,kCAAa,CAAC,WAAW,CAAC;QAExD,IAAI,eAAe,CAAC,sBAAsB,CAAC,aAAc,CAAC,EAAE;YACxD,MAAM,GAAG,eAAe,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YAChE,QAAQ,GAAG,kCAAa,CAAC,OAAO,CAAC;SACpC;aAAM,IAAI,eAAe,CAAC,cAAc,CAAC,aAAc,CAAC,EAAE;YACvD,QAAQ,GAAG,kCAAa,CAAC,KAAK,CAAC;YAC/B,MAAM,GAAG,eAAe,CAAC,cAAc,CAAC,aAAc,CAAC,CAAC;SAC3D;aAAM,IAAI,eAAe,CAAC,cAAc,CAAC,aAAc,CAAC,EAAE;YACvD,QAAQ,GAAG,kCAAa,CAAC,WAAW,CAAC;YACrC,MAAM,GAAG,eAAe,CAAC,cAAc,CAAC,aAAc,CAAE,CAAC;SAC5D;aAAM;YACH,QAAQ,CAAC,QAAQ,GAAG,aAAa,GAAG,wCAAwC,CAAC,CAAC;YAC9E,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;YAC3F,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;YACpB,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;SAC3B;QAED,0BAA0B;QAC1B,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CACX,wCAAwC,GAAG,aAAa,GAAG,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,cAAc,GAAG,QAAQ,CACzH,CAAC;SACL;QAED,MAAM,EAAE,GAA4B;YAChC,QAAQ;YACR,aAAa;YACb,MAAM;SACT,CAAC;QACF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QAChB,OAAO,EAAE,CAAC;IACd,CAAC;CAAA;AAED,SAAe,eAAe,CAC1B,OAAsB,EACtB,cAAsB,EACtB,MAA6B;;QAE7B,qBAAqB;QACrB,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1G,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC;QAEvC,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,EAAE;YACxE,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAc,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAChE,MAAM,CAAC,qBAAqB,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;YAClF,MAAM,CAAC,kBAAkB,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YAC5E,MAAM,CAAC,mBAAmB,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;SACjF;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AAED,0CAA0C;AAC1C,SAAsB,8CAA8C,CAChE,OAAsB,EACtB,cAAsB,EACtB,IAAY,EACZ,UAA8B,EAC9B,eAAgC,EAChC,UAAmB,EACnB,KAAiD;;QAEjD,IAAI,UAAU,YAAY,sCAAmB,EAAE;YAC3C,IAAI,kBAAkB,GAAG,CAAC,CAAC;YAC3B,MAAM,aAAa,GAAG,eAAe,CAAC,2BAA2B,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YAC3F,MAAM,UAAU,GAA6C,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAC;YAEnF,IAAI,UAAU,EAAE;gBACZ,MAAM,cAAc,GAAG,IAAA,6CAAwB,EAAC,UAAU,CAAC,CAAC;gBAC5D,kBAAkB,IAAI,cAAc,CAAC,MAAM,CAAC;aAC/C;YACD,qHAAqH;YACrH,0CAA0C;YAC1C,mCAAmC;YACnC,IAAI;YAEJ,MAAM,MAAM,GAA4B,EAAE,CAAC;YAE3C,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,KAAK,gCAAa,CAAC,KAAK,CAAC;YAEjE,QAAQ,UAAU,CAAC,aAAa,EAAE;gBAC9B,KAAK,gCAAa,CAAC,KAAK;oBACpB,0CAA0C;oBAC1C,MAAM,CAAC,IAAI,CAAC;wBACR,SAAS,EAAE,QAAQ;wBACnB,IAAI,EAAE,aAAa;qBACtB,CAAC,CAAC;oBACH,MAAM;gBACV,KAAK,gCAAa,CAAC,SAAS,CAAC;gBAC7B,KAAK,gCAAa,CAAC,2BAA2B;oBAC1C,MAAM;aACb;YAED,IAAI,WAAW,GAAG,CAAC,CAAC;YACpB,IAAI,SAAS,GAAG,CAAC,CAAC;YAElB,MAAM,SAAS,GAA2B,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;YAEnE,MAAM,WAAW,GAAgD,EAAE,CAAC;YAEpE,IAAI,UAAU,CAAC,MAAM,EAAE;gBACnB,KAAK,IAAI,CAAC,GAAG,kBAAkB,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAChE,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBACpC,sEAAsE;oBAEtE,IAAI,KAAwC,CAAC;oBAC7C,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;oBAEtG,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,KAAK,cAAc,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,KAAK,cAAc,CAAC,SAAS,EAAE;wBAC1G,oDAAoD;wBACpD,oDAAoD;wBACpD,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;wBACpE,CAAC,KAAK,CAAC,SAAS,GAAG,aAAc,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,GAAG,kCAAa,CAAC,OAAO,CAAC,CAAC;wBAC7E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;wBACnB,MAAM,aAAa,GAAG,KAAK,CAAC;wBAC5B,WAAW,CAAC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;4BAC/C,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC;wBAClC,CAAC,CAAC,CAAC;wBACH,SAAS;qBACZ;oBACD,MAAM,EAAE,GAAG,CAAC,MAAM,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAE,CAAC;oBACvF,IAAI,CAAC,EAAE,EAAE;wBACL,QAAQ,CACJ,oEAAoE,EACpE,MAAM,CAAC,IAAI,EACX,IAAI,EACJ,IAAI,EACJ,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,qBAAqB,CAClE,CAAC;wBACF,SAAS;qBACZ;oBACD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;oBAEvE,KAAK,CAAC,SAAS,GAAG,aAAc,CAAC;oBACjC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBAC1B,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;oBACtB,KAAK,CAAC,QAAQ,GAAG,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC;oBAC7C,KAAK,CAAC,YAAY,GAAG,YAAY,IAAI,KAAK,CAAC;oBAC3C,KAAK,CAAC,aAAa,GAAG,MAAM,IAAA,6CAAiB,EAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;oBACvE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACtB;aACJ;YACD,gFAAgF;YAChF,2BAA2B;YAC3B,IAAI,OAAO,IAAI,IAAA,8BAAU,EAAC,UAAU,CAAC,YAAY,EAAE,IAAA,gCAAY,EAAC,MAAM,CAAC,CAAC,EAAE;gBACtE,UAAU,CAAC,YAAY,GAAG,IAAA,iCAAa,EAAC,QAAQ,CAAC,CAAC,CAAC,wBAAwB;aAC9E;YAED,MAAM,CAAC,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,YAAY,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;YAC3F,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC;YAE7E,MAAM,EAAE,GAAG,IAAI,yCAAoB,CAAC;gBAChC,QAAQ;gBACR,SAAS;gBACT,MAAM;gBACN,IAAI;gBACJ,eAAe;aAClB,CAAC,CAAC;YACH,MAAM,oBAAoB,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;YAEhF,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAE9D,OAAO,oBAAoB,CAAC;SAC/B;QACD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEnC,SAAS,WAAW,CAChB,MAAsB,EACtB,SAAiB,EACjB,SAAiC,EACjC,OAAgB,EAChB,WAAmB;YAEnB,MAAM,KAAK,GAA0B;gBACjC,SAAS,EAAE,EAAE;gBACb,IAAI,EAAE,MAAM,CAAC,IAAK;gBAClB,MAAM,EAAE,SAAS;aACpB,CAAC;YAEF,IAAI,MAAM,CAAC,UAAU,EAAE;gBACnB,KAAK,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;gBAC9B,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAK,GAAG,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;aACpE;YACD,IAAI,OAAO,EAAE;gBACT,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;gBAChC,WAAW,IAAI,CAAC,CAAC;aACpB;YAED,iFAAiF;YAEjF,IAAI,MAAM,CAAC,SAAS,IAAI,CAAC,EAAE;gBACvB,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;gBACnC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;aACxB;iBAAM;gBACH,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;aACzB;YACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QAC7C,CAAC;IACL,CAAC;CAAA;AAjJD,wGAiJC"}
1
+ {"version":3,"file":"convert_data_type_definition_to_structuretype_schema.js","sourceRoot":"","sources":["../source/convert_data_type_definition_to_structuretype_schema.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-opcua-client-dynamic-extension-object",
3
- "version": "2.95.0",
3
+ "version": "2.97.0",
4
4
  "description": "pure nodejs OPCUA SDK - module client-dynamic-extension-object",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -14,19 +14,19 @@
14
14
  "node-opcua-assert": "2.88.0",
15
15
  "node-opcua-binary-stream": "2.90.1",
16
16
  "node-opcua-constants": "2.88.0",
17
- "node-opcua-data-model": "2.95.0",
18
- "node-opcua-data-value": "2.95.0",
17
+ "node-opcua-data-model": "2.97.0",
18
+ "node-opcua-data-value": "2.97.0",
19
19
  "node-opcua-debug": "2.90.1",
20
- "node-opcua-extension-object": "2.95.0",
21
- "node-opcua-factory": "2.95.0",
22
- "node-opcua-nodeid": "2.90.1",
23
- "node-opcua-pseudo-session": "2.95.0",
24
- "node-opcua-schemas": "2.95.0",
25
- "node-opcua-service-browse": "2.95.0",
26
- "node-opcua-service-translate-browse-path": "2.95.0",
20
+ "node-opcua-extension-object": "2.97.0",
21
+ "node-opcua-factory": "2.97.0",
22
+ "node-opcua-nodeid": "2.97.0",
23
+ "node-opcua-pseudo-session": "2.97.0",
24
+ "node-opcua-schemas": "2.97.0",
25
+ "node-opcua-service-browse": "2.97.0",
26
+ "node-opcua-service-translate-browse-path": "2.97.0",
27
27
  "node-opcua-status-code": "2.90.1",
28
- "node-opcua-types": "2.95.0",
29
- "node-opcua-variant": "2.95.0"
28
+ "node-opcua-types": "2.97.0",
29
+ "node-opcua-variant": "2.97.0"
30
30
  },
31
31
  "author": "Etienne Rossignon",
32
32
  "license": "MIT",
@@ -43,5 +43,5 @@
43
43
  "internet of things"
44
44
  ],
45
45
  "homepage": "http://node-opcua.github.io/",
46
- "gitHead": "ad7086f9c4cd2ab52922e26cb6782ec6b86f9d20"
46
+ "gitHead": "19c96bda0810d2dec73dd1c2427546be40908646"
47
47
  }
package/source/convert_data_type_definition_to_structuretype_schema.ts CHANGED
@@ -2,7 +2,7 @@ import { assert } from "node-opcua-assert";
2
2
  import { AttributeIds, BrowseDirection, makeResultMask, NodeClassMask } from "node-opcua-data-model";
3
3
  import { DataValue } from "node-opcua-data-value";
4
4
  import { make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
5
- import { sameNodeId } from "node-opcua-nodeid";
5
+ import { INodeId, NodeIdType, sameNodeId } from "node-opcua-nodeid";
6
6
  //import { DataTypeIds } from "node-opcua-constant";
7
7
  import {
8
8
  BitField,
@@ -80,9 +80,10 @@ async function findDataTypeCategory(
80
80
  return cache[key].category;
81
81
  }
82
82
  let category: FieldCategory;
83
- if (subTypeNodeId.namespace === 0 && subTypeNodeId.value <= 29) {
83
+ const n = subTypeNodeId as INodeId;
84
+ if (n.identifierType === NodeIdType.NUMERIC && n.namespace === 0 && n.value <= 29) {
84
85
  // well known node ID !
85
- switch (subTypeNodeId.value) {
86
+ switch (n.value) {
86
87
  case 22 /* Structure */:
87
88
  category = FieldCategory.complex;
88
89
  break;
@@ -112,8 +113,9 @@ async function findDataTypeBasicType(
112
113
  if (cache[key]) {
113
114
  return cache[key].schema;
114
115
  }
115
- if (subTypeNodeId.namespace === 0 && subTypeNodeId.value < 29) {
116
- switch (subTypeNodeId.value) {
116
+ const n = subTypeNodeId as INodeId;
117
+ if (n.identifierType === NodeIdType.NUMERIC && n.namespace === 0 && n.value < 29) {
118
+ switch (n.value) {
117
119
  case 22: /* Structure */
118
120
  case 29 /* Enumeration */:
119
121
  throw new Error("Not expecting Structure or Enumeration");
@@ -224,11 +226,15 @@ const isExtensionObject = async (session: IBasicSession, dataTypeNodeId: NodeId)
224
226
  return true;
225
227
  }
226
228
  const baseDataType = await findSuperType(session, dataTypeNodeId);
227
- if (baseDataType.namespace === 0 && baseDataType.value === DataType.ExtensionObject) {
228
- return true;
229
- }
230
- if (baseDataType.namespace === 0 && baseDataType.value < DataType.ExtensionObject) {
231
- return false;
229
+
230
+ const bn = baseDataType as INodeId;
231
+ if (bn.identifierType === NodeIdType.NUMERIC) {
232
+ if (bn.namespace === 0 && bn.value === DataType.ExtensionObject) {
233
+ return true;
234
+ }
235
+ if (bn.namespace === 0 && bn.value < DataType.ExtensionObject) {
236
+ return false;
237
+ }
232
238
  }
233
239
  return await isExtensionObject(session, baseDataType);
234
240
  };