properly enum values to coerceInt64 while parsing nodeset2.xml files

node-opcua · Jul 15, 2023 · 1a06642 · 1a06642
1 parent 8318259
commit 1a06642
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/node-opcua-address-space/source/helpers/coerce_enum_value.ts b/packages/node-opcua-address-space/source/helpers/coerce_enum_value.ts
@@ -2,7 +2,7 @@
  * @module node-opcua-address-space
  */
 import { assert } from "node-opcua-assert";
-import { Int64 } from "node-opcua-basic-types";
+import { Int64, coerceInt64 } from "node-opcua-basic-types";
 import { coerceLocalizedText } from "node-opcua-data-model";
 import { EnumValueType } from "node-opcua-types";
 import { EnumValueTypeOptionsLike } from "../address_space_ts";
@@ -15,17 +15,17 @@ export function coerceEnumValues(enumValues: EnumValueTypeOptionsLike[] | { [key
             assert(Object.prototype.hasOwnProperty.call(en, "displayName"));
             return new EnumValueType({
                 displayName: coerceLocalizedText(en.displayName),
-                value: en.value
+                value: coerceInt64(en.value)
             });
         });
     } else {
         return coerceEnumValues(
-            Object.entries(enumValues as { [key: string]: Int64 }).map((entrie: [string, Int64]) => {
-                const [key, value] = entrie;
+            Object.entries(enumValues as { [key: string]: Int64 }).map((entry: [string, Int64]) => {
+                const [key, value] = entry;
                 return new EnumValueType({
                     description: coerceLocalizedText(key),
                     displayName: coerceLocalizedText(key),
-                    value
+                    value: coerceInt64(value)
                 });
             })
         );

diff --git a/packages/node-opcua-address-space/source/loader/load_nodeset2.ts b/packages/node-opcua-address-space/source/loader/load_nodeset2.ts
@@ -648,7 +648,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                 Value: {
                     finish(this: any) {
                         // Low part
-                        this.parent.enumValueType.value[1] = parseInt(this.text, 10);
+                        this.parent.enumValueType.value = coerceInt64(parseInt(this.text, 10));
                     }
                 },