node-opcua-factory 2.77.0 → 2.78.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.
@@ -15,6 +15,8 @@ export declare class DataTypeFactory {
15
15
  private _enumerations;
16
16
  private baseDataFactories;
17
17
  constructor(baseDataFactories: DataTypeFactory[]);
18
+ getStructureIterator(): IterableIterator<StructureInfo>;
19
+ getEnumIterator(): IterableIterator<EnumerationDefinitionSchema>;
18
20
  repairBaseDataFactories(baseDataFactories: DataTypeFactory[]): void;
19
21
  hasBuiltInType(name: string): boolean;
20
22
  getBuiltInType(name: string): CommonInterface;
@@ -25,6 +25,12 @@ class DataTypeFactory {
25
25
  this.targetNamespace = "";
26
26
  this.baseDataFactories = baseDataFactories;
27
27
  }
28
+ getStructureIterator() {
29
+ return this._structureInfoByDataTypeMap.values();
30
+ }
31
+ getEnumIterator() {
32
+ return this._enumerations.values();
33
+ }
28
34
  repairBaseDataFactories(baseDataFactories) {
29
35
  this.baseDataFactories = baseDataFactories;
30
36
  }
@@ -236,9 +242,8 @@ class DataTypeFactory {
236
242
  _registerFactory(dataTypeNodeId, typeName, constructor, schema) {
237
243
  /* istanbul ignore next */
238
244
  if (this._structureInfoByName.has(typeName)) {
239
- warningLog(this.getStructureInfoByTypeName(typeName));
240
245
  warningLog("target namespace = `" + this.targetNamespace + "`");
241
- warningLog(" registerFactory : " + typeName + " already registered. dataTypeNodeId=", dataTypeNodeId.toString());
246
+ warningLog("registerFactory : " + typeName + " already registered. dataTypeNodeId=", dataTypeNodeId.toString());
242
247
  return;
243
248
  }
244
249
  debugLog("registering typeName ", typeName, dataTypeNodeId.toString(), "isAbstract ", schema.isAbstract);
@@ -278,10 +283,11 @@ function dumpDataFactory(dataFactory, write) {
278
283
  }
279
284
  else {
280
285
  if (dataFactory.hasConstructor(schema.encodingDefaultBinary)) {
281
- console.log("schema", schema.name);
282
- console.log("schema", schema.dataTypeNodeId.toString());
283
- console.log("schema", schema.encodingDefaultBinary ? schema.encodingDefaultBinary.toString() : " ");
284
- console.log("schema", schema.encodingDefaultXml ? schema.encodingDefaultXml.toString() : " ");
286
+ write("ERROR: cannot find constructor for encodingDefaultBinary");
287
+ write("schema name:", schema.name, "(abstract=", schema.isAbstract, ")");
288
+ write(" dataType NodeId:", schema.dataTypeNodeId.toString());
289
+ write("encoding Default Binary:", schema.encodingDefaultBinary ? schema.encodingDefaultBinary.toString() : " ");
290
+ write("encoding Default Xml :", schema.encodingDefaultXml ? schema.encodingDefaultXml.toString() : " ");
285
291
  // return;
286
292
  // throw new Error("Not in Binary Encoding Map!!!!! " + schema.encodingDefaultBinary);
287
293
  }
@@ -1 +1 @@
1
- {"version":3,"file":"datatype_factory.js","sourceRoot":"","sources":["../source/datatype_factory.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,6BAA6B;AAC7B,+BAA+B;AAE/B,yDAA2C;AAC3C,uDAAkF;AAElF,+DAAmD;AAEnD,mDAAmF;AACnF,iDAA2G;AAU3G,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;AAM/C,MAAa,eAAe;IAaxB,YAAmB,iBAAoC;QAVhD,YAAO,GAAa,EAAE,CAAC;QAEtB,yBAAoB,GAA+B,IAAI,GAAG,EAAE,CAAC;QAC7D,gCAA2B,GAA+B,IAAI,GAAG,EAAE,CAAC;QAEpE,gCAA2B,GAA+B,IAAI,GAAG,EAAE,CAAC;QACpE,kBAAa,GAA6C,IAAI,GAAG,EAAE,CAAC;QAKxE,IAAI,CAAC,gBAAgB,GAAG,cAAc,CAAC;QACvC,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAEM,uBAAuB,CAAC,iBAAoC;QAC/D,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAEM,cAAc,CAAC,IAAY;QAC9B,OAAO,IAAA,8BAAc,EAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAEM,cAAc,CAAC,IAAY;QAC9B,OAAO,IAAA,8BAAc,EAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAEM,wBAAwB,CAAC,MAAc;QAC1C,OAAO,IAAA,8BAAc,EAAC,kCAAW,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,gCAAgC;IAChC,8BAA8B;IACvB,mBAAmB,CAAC,WAAwC;QAC/D,IAAA,0BAAM,EAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,gCAAgC,CAAC,CAAC;QACpF,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;IAEM,cAAc,CAAC,QAAgB;QAClC,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC;SACf;QACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1C,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC3C,IAAI,CAAC,EAAE;gBACH,OAAO,IAAI,CAAC;aACf;SACJ;QACD,IAAI,IAAA,oCAAqB,EAAC,QAAQ,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,cAAc,CAAC,QAAgB;QAClC,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;SACnD;QACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,OAAO,EAAE;gBACT,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAC3C,OAAO,CAAC,CAAC;aACZ;SACJ;QACD,MAAM,EAAE,GAAG,IAAA,oCAAqB,EAAC,QAAQ,CAAC,CAAC;QAC3C,OAAO,EAAE,CAAC;IACd,CAAC;IACD,gCAAgC;IAEzB,4BAA4B,CAAC,cAAsB;QACtD,MAAM,aAAa,GAAG,IAAI,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;QACvE,IAAI,aAAa,EAAE;YACf,OAAO,aAAa,CAAC;SACxB;QACD,IAAI,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,qDAAqD,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvG,CAAC;IACM,2BAA2B,CAAC,cAAsB;QACrD,MAAM,aAAa,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtF,IAAI,aAAa,EAAE;YACf,OAAO,aAAa,CAAC;SACxB;QACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1C,MAAM,cAAc,GAAG,OAAO,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;YAC3E,IAAI,cAAc,EAAE;gBAChB,OAAO,cAAc,CAAC;aACzB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,uGAAuG;IACvG,qBAAqB;IACrB,uGAAuG;IAChG,oBAAoB;QACvB,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC;IACM,YAAY;QACf,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IACrC,CAAC;IAEM,0BAA0B,CAAC,QAAgB;QAC9C,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9D,IAAI,aAAa,EAAE;YACf,OAAO,aAAa,CAAC;SACxB;QACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1C,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE;gBAC3C,SAAS;aACZ;YACD,MAAM,cAAc,GAAG,OAAO,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;YACpE,IAAI,cAAc,EAAE;gBAChB,OAAO,cAAc,CAAC;aACzB;SACJ;QACD,uBAAuB;QACvB,IAAI,OAAO,EAAE;YACT,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SAC3D;QACD,uBAAuB;QACvB,MAAM,IAAI,KAAK,CACX,4CAA4C,GAAG,QAAQ,GAAG,oDAAoD,CACjH,CAAC;IACN,CAAC;IAEM,sBAAsB,CAAC,QAAgB;QAC1C,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC;SACf;QACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1C,IAAI,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE;gBAC1C,OAAO,IAAI,CAAC;aACf;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,uBAAuB,CAAC,QAAgB;QAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QAChE,OAAO,aAAa,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,uBAAuB;IAChB,IAAI;QACP,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CACP,WAAW,EACX,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAC5D,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAEM,yBAAyB,CAAC,cAAsB,EAAE,SAAiB,EAAE,MAA6B;QACrG,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAEM,uBAAuB,CAAC,cAAsB,EAAE,SAAiB,EAAE,gBAA2C;QACjH,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC5F,IAAI,gBAAgB,CAAC,qBAAqB,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,KAAK,KAAK,CAAC,EAAE;YAC9F,IAAI,CAAC,2BAA2B,CAAC,SAAS,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;SACvF;aAAM;YACH,uEAAuE;YACvE,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,8BAA8B,CAAC,CAAC;SACvG;IACL,CAAC;IAED,uGAAuG;IACvG,iCAAiC;IACjC,uGAAuG;IAChG,cAAc,CAAC,oBAA4B;QAC9C,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,oBAAoB,CAAC,CAAC;QACtE,MAAM,aAAa,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC9E,IAAI,CAAC,aAAa;YAAE,OAAO,IAAI,CAAC;QAChC,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAC9C,IAAI,WAAW,EAAE;YACb,OAAO,WAAW,CAAC;SACtB;QACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;YAClE,IAAI,YAAY,EAAE;gBACd,OAAO,YAAY,CAAC;aACvB;SACJ;QACD,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,2DAA2D,CAAC,EAAE,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClH,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,cAAc,CAAC,oBAA4B;QAC9C,IAAI,CAAC,oBAAoB,EAAE;YACvB,OAAO,KAAK,CAAC;SAChB;QACD,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;QAE3C,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,oBAAoB,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC5E,IAAI,WAAW,EAAE;YACb,OAAO,IAAI,CAAC;SACf;QACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;YAClE,IAAI,YAAY,EAAE;gBACd,OAAO,IAAI,CAAC;aACf;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,eAAe,CAAC,oBAA4B;QAC/C,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;QAE3C,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;QAE9D,IAAI,CAAC,WAAW,EAAE;YACd,QAAQ,CAAC,8BAA8B,GAAG,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3E,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC;SACrF;QACD,OAAO,IAAI,WAAW,EAAE,CAAC;IAC7B,CAAC;IAEM,2BAA2B,CAAC,SAAiB,EAAE,cAA8B;QAChF,MAAM,aAAa,GAAG,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;QACjE,IAAI,OAAO,EAAE;YACT,QAAQ,CAAC,+BAA+B,EAAE,SAAS,EAAE,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;SACnF;QAED,oBAAoB,CAAC,cAAc,CAAC,CAAC;QAErC,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,cAAc,CAAC,CAAC;QAEhE,0BAA0B;QAC1B,IAAI,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;YACzD,MAAM,IAAI,KAAK,CACX,SAAS;gBACL,SAAS;gBACT,WAAW;gBACX,cAAc;gBACd,mCAAmC;gBACnC,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,iBAAiB,CAAE,CAAC,MAAM,CAAC,IAAI,CAC3E,CAAC;SACL;QAED,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;IAC3E,CAAC;IAEM,QAAQ;QACX,MAAM,CAAC,GAAa,EAAE,CAAC;QACvB,SAAS,KAAK,CAAC,GAAG,IAAqB;YACnC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7B,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAEO,gBAAgB,CACpB,cAAsB,EACtB,QAAgB,EAChB,WAA6C,EAC7C,MAA6B;QAE7B,0BAA0B;QAC1B,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACzC,UAAU,CAAC,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC,CAAC;YACtD,UAAU,CAAC,sBAAsB,GAAG,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,CAAC;YAChE,UAAU,CAAC,sBAAsB,GAAG,QAAQ,GAAG,sCAAsC,EAAE,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClH,OAAO;SACV;QACD,QAAQ,CAAC,uBAAuB,EAAE,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACzG,MAAM,aAAa,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;QAC9C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QACvD,IAAI,cAAc,CAAC,KAAK,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,aAAa,CAAC,CAAC;SAClF;QAED,8CAA8C;QAC9C,qBAAqB;QACrB,+DAA+D;QAC/D,6BAA6B;QAC7B,uBAAuB;QACvB,0BAA0B;QAC1B,UAAU;QACV,IAAI;IACR,CAAC;CACJ;AA/RD,0CA+RC;AAED,SAAS,UAAU,CAAC,MAA6B,EAAE,KAAU;IACzD,KAAK,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACtC,KAAK,CAAC,iBAAiB,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3D,KAAK,CAAC,iBAAiB,EAAE,MAAM,CAAC,qBAAsB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnE,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC3B,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;KACtF;AACL,CAAC;AACD,SAAS,eAAe,CAAC,WAA4B,EAAE,KAAU;IAC7D,KAAK,MAAM,iBAAiB,IAAI,WAAW,CAAC,oBAAoB,EAAE,EAAE;QAChE,MAAM,MAAM,GAAG,WAAW,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;QAEtE,KAAK,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;QAEhD,IAAI,CAAC,WAAW,CAAC,2BAA2B,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YACjE,KAAK,CAAC,yBAAyB,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC5F;QACD,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE;YAC/B,KAAK,CAAC,0CAA0C,CAAC,CAAC;SACrD;aAAM;YACH,IAAI,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE;gBAC1D,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACxD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBACpG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC9F,UAAU;gBACV,wFAAwF;aAC3F;SACJ;QACD,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KAC7B;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,cAAsB;IAChD,0BAA0B;IAC1B,IAAI,cAAc,CAAC,KAAK,YAAY,MAAM,EAAE;QACxC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACvE;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,qBAAqB,CAAC,cAAsB;IACjD,OAAO,cAAc,CAAC,QAAQ,EAAE,CAAC;AACrC,CAAC"}
1
+ {"version":3,"file":"datatype_factory.js","sourceRoot":"","sources":["../source/datatype_factory.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { BinaryStream, OutputBinaryStream } from "node-opcua-binary-stream";
2
2
  import { Enum, EnumItem, _TypescriptEnum } from "node-opcua-enum";
3
+ import { NodeId } from "node-opcua-nodeid";
3
4
  import { TypeSchemaBase } from "./builtin_types";
4
5
  import { EnumerationDefinition, TypeSchemaConstructorOptions } from "./types";
5
6
  export interface EnumerationDefinitionOptions extends TypeSchemaConstructorOptions {
@@ -14,7 +15,8 @@ export declare class EnumerationDefinitionSchema extends TypeSchemaBase implemen
14
15
  enumValues: _TypescriptEnum;
15
16
  typedEnum: Enum;
16
17
  lengthInBits: number;
17
- constructor(options: EnumerationDefinitionOptions);
18
+ dataTypeNodeId: NodeId;
19
+ constructor(dataTypeNodeId: NodeId, options: EnumerationDefinitionOptions);
18
20
  }
19
21
  /**
20
22
  * @method registerEnumeration
@@ -5,7 +5,9 @@ exports.getBuiltInEnumeration = exports.hasBuiltInEnumeration = exports.register
5
5
  * @module node-opcua-factory
6
6
  */
7
7
  const node_opcua_assert_1 = require("node-opcua-assert");
8
+ const node_opcua_constants_1 = require("node-opcua-constants");
8
9
  const node_opcua_enum_1 = require("node-opcua-enum");
10
+ const node_opcua_nodeid_1 = require("node-opcua-nodeid");
9
11
  const builtin_types_1 = require("./builtin_types");
10
12
  function _encode_enumeration(typedEnum, value, stream) {
11
13
  (0, node_opcua_assert_1.assert)(typeof value === "number", "Expecting a number here");
@@ -24,8 +26,9 @@ function _decode_enumeration(typedEnum, stream) {
24
26
  class EnumerationDefinitionSchema extends builtin_types_1.TypeSchemaBase {
25
27
  // xx encode: (value: EnumItem, stream: OutputBinaryStream) => void;
26
28
  // xx decode: (stream: BinaryStream) => EnumItem;
27
- constructor(options) {
29
+ constructor(dataTypeNodeId, options) {
28
30
  super(options);
31
+ this.dataTypeNodeId = dataTypeNodeId;
29
32
  // create a new Enum
30
33
  this.enumValues = (0, node_opcua_enum_1.adaptTypescriptEnum)(options.enumValues);
31
34
  const typedEnum = new node_opcua_enum_1.Enum(options.enumValues);
@@ -53,13 +56,14 @@ const _enumerations = new Map();
53
56
  * @return {Enum}
54
57
  */
55
58
  function registerEnumeration(options) {
59
+ const dataTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_constants_1.DataTypeIds[options.name]);
56
60
  (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(options, "name"));
57
61
  (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(options, "enumValues"));
58
62
  const name = options.name;
59
63
  if (Object.prototype.hasOwnProperty.call(_enumerations, name)) {
60
64
  throw new Error("factories.registerEnumeration : Enumeration " + options.name + " has been already inserted");
61
65
  }
62
- const enumerationDefinition = new EnumerationDefinitionSchema(options);
66
+ const enumerationDefinition = new EnumerationDefinitionSchema(dataTypeNodeId, options);
63
67
  _enumerations.set(name, enumerationDefinition);
64
68
  return enumerationDefinition.typedEnum;
65
69
  }
@@ -1 +1 @@
1
- {"version":3,"file":"enumerations.js","sourceRoot":"","sources":["../source/enumerations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"enumerations.js","sourceRoot":"","sources":["../source/enumerations.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-opcua-factory",
3
- "version": "2.77.0",
3
+ "version": "2.78.0",
4
4
  "description": "pure nodejs OPCUA SDK - module -factory",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -42,5 +42,5 @@
42
42
  "internet of things"
43
43
  ],
44
44
  "homepage": "http://node-opcua.github.io/",
45
- "gitHead": "5c8d45772d786fa4ba59369dd26679353ab5482b"
45
+ "gitHead": "31c6eee3c51f52427584364fff2fdb07bbac65be"
46
46
  }
@@ -47,6 +47,13 @@ export class DataTypeFactory {
47
47
  this.baseDataFactories = baseDataFactories;
48
48
  }
49
49
 
50
+ public getStructureIterator(): IterableIterator<StructureInfo> {
51
+ return this._structureInfoByDataTypeMap.values();
52
+ }
53
+ public getEnumIterator(): IterableIterator<EnumerationDefinitionSchema> {
54
+ return this._enumerations.values();
55
+ }
56
+
50
57
  public repairBaseDataFactories(baseDataFactories: DataTypeFactory[]): void {
51
58
  this.baseDataFactories = baseDataFactories;
52
59
  }
@@ -294,9 +301,8 @@ export class DataTypeFactory {
294
301
  ): void {
295
302
  /* istanbul ignore next */
296
303
  if (this._structureInfoByName.has(typeName)) {
297
- warningLog(this.getStructureInfoByTypeName(typeName));
298
304
  warningLog("target namespace = `" + this.targetNamespace + "`");
299
- warningLog(" registerFactory : " + typeName + " already registered. dataTypeNodeId=", dataTypeNodeId.toString());
305
+ warningLog("registerFactory : " + typeName + " already registered. dataTypeNodeId=", dataTypeNodeId.toString());
300
306
  return;
301
307
  }
302
308
  debugLog("registering typeName ", typeName, dataTypeNodeId.toString(), "isAbstract ", schema.isAbstract);
@@ -325,7 +331,7 @@ function dumpSchema(schema: IStructuredTypeSchema, write: any) {
325
331
  write(" ", f.name.padEnd(30, " "), f.isArray ? true : false, f.fieldType);
326
332
  }
327
333
  }
328
- function dumpDataFactory(dataFactory: DataTypeFactory, write: any) {
334
+ function dumpDataFactory(dataFactory: DataTypeFactory, write: (...args: [any, ...any[]])=>void) {
329
335
  for (const structureTypeName of dataFactory.structuredTypesNames()) {
330
336
  const schema = dataFactory.getStructuredTypeSchema(structureTypeName);
331
337
 
@@ -338,10 +344,11 @@ function dumpDataFactory(dataFactory: DataTypeFactory, write: any) {
338
344
  write(" (Schema has no encoding defaultBinary )");
339
345
  } else {
340
346
  if (dataFactory.hasConstructor(schema.encodingDefaultBinary)) {
341
- console.log("schema", schema.name);
342
- console.log("schema", schema.dataTypeNodeId.toString());
343
- console.log("schema", schema.encodingDefaultBinary ? schema.encodingDefaultBinary.toString() : " ");
344
- console.log("schema", schema.encodingDefaultXml ? schema.encodingDefaultXml.toString() : " ");
347
+ write("ERROR: cannot find constructor for encodingDefaultBinary");
348
+ write("schema name:", schema.name, "(abstract=", schema.isAbstract,")");
349
+ write(" dataType NodeId:", schema.dataTypeNodeId.toString());
350
+ write("encoding Default Binary:", schema.encodingDefaultBinary ? schema.encodingDefaultBinary.toString() : " ");
351
+ write("encoding Default Xml :", schema.encodingDefaultXml ? schema.encodingDefaultXml.toString() : " ");
345
352
  // return;
346
353
  // throw new Error("Not in Binary Encoding Map!!!!! " + schema.encodingDefaultBinary);
347
354
  }
@@ -4,7 +4,9 @@
4
4
  import { assert } from "node-opcua-assert";
5
5
 
6
6
  import { BinaryStream, OutputBinaryStream } from "node-opcua-binary-stream";
7
- import { Enum, EnumItem, _TypescriptEnum , adaptTypescriptEnum} from "node-opcua-enum";
7
+ import { DataTypeIds } from "node-opcua-constants";
8
+ import { Enum, EnumItem, _TypescriptEnum, adaptTypescriptEnum } from "node-opcua-enum";
9
+ import { NodeId, resolveNodeId } from "node-opcua-nodeid";
8
10
  import { TypeSchemaBase } from "./builtin_types";
9
11
  import { EnumerationDefinition, TypeSchemaConstructorOptions } from "./types";
10
12
 
@@ -24,7 +26,6 @@ function _decode_enumeration(typedEnum: Enum, stream: BinaryStream): number {
24
26
  return value;
25
27
  }
26
28
 
27
-
28
29
  export interface EnumerationDefinitionOptions extends TypeSchemaConstructorOptions {
29
30
  enumValues: _TypescriptEnum | string[];
30
31
  typedEnum?: Enum;
@@ -36,16 +37,17 @@ export interface EnumerationDefinitionOptions extends TypeSchemaConstructorOptio
36
37
  decode?: (stream: BinaryStream) => EnumItem;
37
38
  }
38
39
 
39
-
40
40
  export class EnumerationDefinitionSchema extends TypeSchemaBase implements EnumerationDefinition {
41
41
  public enumValues: _TypescriptEnum;
42
42
  public typedEnum: Enum;
43
43
  public lengthInBits: number;
44
+ public dataTypeNodeId: NodeId;
44
45
  // xx encode: (value: EnumItem, stream: OutputBinaryStream) => void;
45
46
  // xx decode: (stream: BinaryStream) => EnumItem;
46
47
 
47
- constructor(options: EnumerationDefinitionOptions) {
48
+ constructor(dataTypeNodeId: NodeId, options: EnumerationDefinitionOptions) {
48
49
  super(options);
50
+ this.dataTypeNodeId = dataTypeNodeId;
49
51
  // create a new Enum
50
52
  this.enumValues = adaptTypescriptEnum(options.enumValues);
51
53
  const typedEnum = new Enum(options.enumValues);
@@ -76,6 +78,8 @@ const _enumerations: Map<string, EnumerationDefinitionSchema> = new Map<string,
76
78
  * @return {Enum}
77
79
  */
78
80
  export function registerEnumeration(options: EnumerationDefinitionOptions): Enum {
81
+ const dataTypeNodeId = resolveNodeId(DataTypeIds[options.name as any]);
82
+
79
83
  assert(Object.prototype.hasOwnProperty.call(options, "name"));
80
84
  assert(Object.prototype.hasOwnProperty.call(options, "enumValues"));
81
85
  const name = options.name;
@@ -83,7 +87,7 @@ export function registerEnumeration(options: EnumerationDefinitionOptions): Enum
83
87
  if (Object.prototype.hasOwnProperty.call(_enumerations, name)) {
84
88
  throw new Error("factories.registerEnumeration : Enumeration " + options.name + " has been already inserted");
85
89
  }
86
- const enumerationDefinition = new EnumerationDefinitionSchema(options);
90
+ const enumerationDefinition = new EnumerationDefinitionSchema(dataTypeNodeId, options);
87
91
  _enumerations.set(name, enumerationDefinition);
88
92
 
89
93
  return enumerationDefinition.typedEnum;
@@ -99,4 +103,3 @@ export function getBuiltInEnumeration(enumerationName: string): EnumerationDefin
99
103
  }
100
104
  return _enumerations.get(enumerationName) as EnumerationDefinitionSchema;
101
105
  }
102
-