node-opcua-address-space 2.98.2 → 2.99.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.98.2",
+    "version": "2.99.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -22,36 +22,36 @@
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.98.2",
+        "node-opcua-address-space-base": "2.99.0",
         "node-opcua-assert": "2.98.1",
-        "node-opcua-basic-types": "2.98.1",
+        "node-opcua-basic-types": "2.99.0",
         "node-opcua-binary-stream": "2.98.1",
-        "node-opcua-client-dynamic-extension-object": "2.98.2",
+        "node-opcua-client-dynamic-extension-object": "2.99.0",
         "node-opcua-constants": "2.98.1",
         "node-opcua-crypto": "^2.1.2",
-        "node-opcua-data-access": "2.98.2",
-        "node-opcua-data-model": "2.98.1",
-        "node-opcua-data-value": "2.98.1",
-        "node-opcua-date-time": "2.98.1",
-        "node-opcua-debug": "2.98.1",
+        "node-opcua-data-access": "2.99.0",
+        "node-opcua-data-model": "2.99.0",
+        "node-opcua-data-value": "2.99.0",
+        "node-opcua-date-time": "2.99.0",
+        "node-opcua-debug": "2.99.0",
         "node-opcua-enum": "2.98.1",
-        "node-opcua-extension-object": "2.98.1",
-        "node-opcua-factory": "2.98.1",
-        "node-opcua-nodeid": "2.98.1",
-        "node-opcua-nodeset-ua": "2.98.2",
-        "node-opcua-numeric-range": "2.98.1",
-        "node-opcua-object-registry": "2.98.1",
-        "node-opcua-pseudo-session": "2.98.2",
-        "node-opcua-service-browse": "2.98.2",
-        "node-opcua-service-call": "2.98.2",
-        "node-opcua-service-history": "2.98.2",
-        "node-opcua-service-translate-browse-path": "2.98.2",
-        "node-opcua-service-write": "2.98.2",
+        "node-opcua-extension-object": "2.99.0",
+        "node-opcua-factory": "2.99.0",
+        "node-opcua-nodeid": "2.99.0",
+        "node-opcua-nodeset-ua": "2.99.0",
+        "node-opcua-numeric-range": "2.99.0",
+        "node-opcua-object-registry": "2.99.0",
+        "node-opcua-pseudo-session": "2.99.0",
+        "node-opcua-service-browse": "2.99.0",
+        "node-opcua-service-call": "2.99.0",
+        "node-opcua-service-history": "2.99.0",
+        "node-opcua-service-translate-browse-path": "2.99.0",
+        "node-opcua-service-write": "2.99.0",
         "node-opcua-status-code": "2.98.1",
-        "node-opcua-types": "2.98.2",
+        "node-opcua-types": "2.99.0",
         "node-opcua-utils": "2.98.1",
-        "node-opcua-variant": "2.98.1",
-        "node-opcua-xml2json": "2.98.2",
+        "node-opcua-variant": "2.99.0",
+        "node-opcua-xml2json": "2.99.0",
         "semver": "^7.3.8",
         "set-prototype-of": "^1.0.0",
         "thenify": "^3.3.1",
@@ -60,11 +60,11 @@
     "devDependencies": {
         "mocha": "^10.2.0",
         "node-opcua-benchmarker": "2.98.1",
-        "node-opcua-leak-detector": "2.98.1",
-        "node-opcua-nodesets": "2.98.2",
-        "node-opcua-packet-analyzer": "2.98.1",
-        "node-opcua-service-filter": "2.98.2",
-        "node-opcua-test-fixtures": "2.98.2",
+        "node-opcua-leak-detector": "2.99.0",
+        "node-opcua-nodesets": "2.99.0",
+        "node-opcua-packet-analyzer": "2.99.0",
+        "node-opcua-service-filter": "2.99.0",
+        "node-opcua-test-fixtures": "2.99.0",
         "should": "^13.2.3",
         "sinon": "^15.0.3",
         "source-map-support": "^0.5.21"
@@ -84,7 +84,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "6df8aa25475ba1235e585566cb2dec68b7e7a85f",
+    "gitHead": "90ce9f5b44d74198d84a384de622dfa94fd05c0c",
     "files": [
         "dist",
         "distHelpers",
@@ -94,6 +94,7 @@
         "nodeJS.d.ts",
         "nodeJS.js",
         "testHelpers.js",
-        "testHelpers.d.ts"
+        "testHelpers.d.ts",
+        "source_nodejs"
     ]
 }

package/source/loader/load_nodeset2.ts

@@ -261,9 +261,9 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                 // istanbul ignore next
                 if (!existingNamespace) {
                     errorLog(
-                        "Please ensure that the required namespace ",
+                        "Please ensure that the required namespace",
                         requiredModel.modelUri,
-                        "is loaded firs when loading ",
+                        "is loaded first when loading",
                         model.modelUri
                     );
                     throw new Error("LoadNodeSet : Cannot find namespace for " + requiredModel.modelUri);
@@ -271,8 +271,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                 /**
                  *  from https://reference.opcfoundation.org/Core/docs/Part6/F.2/
                  *  The version of the model defined in the UANodeSet.
-                 *  This is a human readable string and not intended for programmatic comparisons.
-                 *
+                 *  This is a human-readable string and not intended for programmatic comparisons.
                  */
                 const isLowerVersion = (existingVersion: string, requiredVersion: string): boolean => {
                     const existingSemver = makeSemverCompatible(existingVersion);
@@ -294,7 +293,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                     errorLog(
                         "Expecting ",
                         requiredModel.modelUri,
-                        " with publicationDatea at least ",
+                        " with publicationDate at least ",
                         requiredModel.publicationDate.toUTCString(),
                         " but namespace publicationDate is ",
                         existingNamespace.publicationDate.toUTCString()

package/source_nodejs/generate_address_space.ts

@@ -0,0 +1,60 @@
+import * as fs from "fs";
+import { callbackify } from "util";
+
+import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
+import { IAddressSpace } from "node-opcua-address-space-base";
+
+import { generateAddressSpaceRaw } from "..";
+import { NodeSetLoaderOptions } from "../source/interfaces/nodeset_loader_options";
+
+const doDebug = checkDebugFlag(__filename);
+const debugLog = make_debugLog(__filename);
+const errorLog = make_errorLog(__filename);
+
+export async function readNodeSet2XmlFile(xmlFile: string): Promise<string> {
+    // istanbul ignore next
+    if (!fs.existsSync(xmlFile)) {
+        const msg = "[NODE-OPCUA-E02] generateAddressSpace : cannot find nodeset2 xml file at " + xmlFile;
+        errorLog(msg);
+        throw new Error(msg);
+    }
+    debugLog(" parsing ", xmlFile);
+    const xmlData = await fs.promises.readFile(xmlFile, "utf-8");
+    return xmlData;
+}
+export function generateAddressSpace(
+    addressSpace: IAddressSpace,
+    xmlFiles: string | string[],
+    callback: (err?: Error) => void
+): void;
+export function generateAddressSpace(
+    addressSpace: IAddressSpace,
+    xmlFiles: string | string[],
+    options: NodeSetLoaderOptions | undefined,
+    callback: (err?: Error) => void
+): void;
+export function generateAddressSpace(
+    addressSpace: IAddressSpace,
+    xmlFiles: string | string[],
+    options?: NodeSetLoaderOptions
+): Promise<void>;
+export function generateAddressSpace(
+    ... args: any[]
+): any {
+    const addressSpace = args[0] as IAddressSpace;
+    const xmlFiles = args[1] as string | string[];
+    if (args.length === 4) {
+        const options = args[2] as NodeSetLoaderOptions | undefined;
+        const callback = args[3]  as (err?: Error) => void;
+        callbackify(generateAddressSpaceRaw)(addressSpace, xmlFiles, readNodeSet2XmlFile, options ||{}, callback!);
+    } else {
+        const options = {};
+        const callback = args[2]  as (err?: Error) => void;
+        callbackify(generateAddressSpaceRaw)(addressSpace, xmlFiles, readNodeSet2XmlFile, options, callback!);
+    }
+}
+
+// tslint:disable:no-var-requires
+// tslint:disable:max-line-length
+const thenify = require("thenify");
+(module.exports as any).generateAddressSpace = thenify.withCallback((module.exports as any).generateAddressSpace);

package/source_nodejs/index.ts

@@ -0,0 +1 @@
+export * from "./generate_address_space";