node-opcua-address-space 2.186.17 → 2.187.0

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "node-opcua-address-space",
     "type": "module",
-    "version": "2.186.17",
+    "version": "2.187.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/api/index.js",
     "types": "./dist/api/index.d.ts",
@@ -23,48 +23,49 @@
         "@types/semver": "7.8.0",
         "chalk": "6.0.1",
         "dequeue": "^1.0.5",
-        "node-opcua-address-space-base": "2.186.17",
+        "node-opcua-address-space-base": "2.187.0",
+        "node-opcua-address-space-store": "2.187.0",
         "node-opcua-assert": "2.186.7",
-        "node-opcua-basic-types": "2.186.7",
-        "node-opcua-binary-stream": "2.186.7",
-        "node-opcua-client-dynamic-extension-object": "2.186.17",
+        "node-opcua-basic-types": "2.187.0",
+        "node-opcua-binary-stream": "2.187.0",
+        "node-opcua-client-dynamic-extension-object": "2.187.0",
         "node-opcua-constants": "2.185.0",
-        "node-opcua-crypto": "6.1.4",
-        "node-opcua-data-access": "2.186.10",
-        "node-opcua-data-model": "2.186.10",
-        "node-opcua-data-value": "2.186.10",
-        "node-opcua-date-time": "2.186.7",
+        "node-opcua-crypto": "6.2.0",
+        "node-opcua-data-access": "2.187.0",
+        "node-opcua-data-model": "2.187.0",
+        "node-opcua-data-value": "2.187.0",
+        "node-opcua-date-time": "2.187.0",
         "node-opcua-debug": "2.186.7",
-        "node-opcua-enum": "2.186.7",
-        "node-opcua-extension-object": "2.186.7",
-        "node-opcua-factory": "2.186.7",
-        "node-opcua-nodeid": "2.186.7",
-        "node-opcua-nodeset-ua": "2.186.17",
-        "node-opcua-numeric-range": "2.186.7",
+        "node-opcua-enum": "2.187.0",
+        "node-opcua-extension-object": "2.187.0",
+        "node-opcua-factory": "2.187.0",
+        "node-opcua-nodeid": "2.187.0",
+        "node-opcua-nodeset-ua": "2.187.0",
+        "node-opcua-numeric-range": "2.187.0",
         "node-opcua-object-registry": "2.186.7",
-        "node-opcua-pseudo-session": "2.186.17",
-        "node-opcua-service-browse": "2.186.10",
-        "node-opcua-service-call": "2.186.10",
-        "node-opcua-service-history": "2.186.10",
-        "node-opcua-service-translate-browse-path": "2.186.16",
-        "node-opcua-service-write": "2.186.10",
-        "node-opcua-status-code": "2.186.7",
-        "node-opcua-types": "2.186.10",
-        "node-opcua-utils": "2.186.7",
-        "node-opcua-variant": "2.186.10",
-        "node-opcua-xml2json": "2.186.7",
+        "node-opcua-pseudo-session": "2.187.0",
+        "node-opcua-service-browse": "2.187.0",
+        "node-opcua-service-call": "2.187.0",
+        "node-opcua-service-history": "2.187.0",
+        "node-opcua-service-translate-browse-path": "2.187.0",
+        "node-opcua-service-write": "2.187.0",
+        "node-opcua-status-code": "2.187.0",
+        "node-opcua-types": "2.187.0",
+        "node-opcua-utils": "2.187.0",
+        "node-opcua-variant": "2.187.0",
+        "node-opcua-xml2json": "2.187.0",
         "semver": "^7.8.5",
         "thenify-ex": "4.4.0",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
         "humanize": "0.0.9",
-        "node-opcua-benchmarker": "2.186.7",
+        "node-opcua-benchmarker": "2.187.0",
         "node-opcua-leak-detector": "2.186.7",
-        "node-opcua-nodesets": "2.185.0",
-        "node-opcua-packet-analyzer": "2.186.7",
-        "node-opcua-schemas": "2.186.10",
-        "node-opcua-service-filter": "2.186.17",
+        "node-opcua-nodesets": "2.187.0",
+        "node-opcua-packet-analyzer": "2.187.0",
+        "node-opcua-schemas": "2.187.0",
+        "node-opcua-service-filter": "2.187.0",
         "node-opcua-test-fixtures": "2.184.0",
         "node-opcua-test-helpers": "2.184.0"
     },
@@ -83,7 +84,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "bdb3848c06d19056a99dfc06ef73771a0666472f",
+    "gitHead": "3397e8ca2017b8592a50912b34c747f3da617763",
     "files": [
         "dist",
         "distHelpers",

package/source_nodejs/generate_address_space.ts

@@ -5,17 +5,23 @@ import zlib, { gunzip, gzip as gzipCb } from "node:zlib";
 import type { IAddressSpace } from "node-opcua-address-space-base";
 import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
 import {
+    type CompactAddressSpace,
+    compactRecordConsumer,
     generateAddressSpaceRaw,
     type NamedNodesetSource,
+    NODESET2_XML_FORMAT,
     type NodeSetLoaderOptions,
     type NodesetSource,
     type NodesetToImageOptions,
     nodesetImageProblem,
     nodesetToImage as nodesetToImageRaw,
+    openNodesetSource,
     readNodesetImageInfo,
+    type StoreRecordApplierOptions,
     setImageDeflater,
     setImageInflater,
-    sha256Hex
+    sha256Hex,
+    xmlNodesetRecords
 } from "../dist/api/index.js";
 import { FileNodesetImageStore } from "./nodeset_image_file_store.js";
 
@@ -227,3 +233,42 @@ export async function nodesetFileToImage(source: NodesetSource | string, options
         typeof source === "string" && !source.trimStart().startsWith("<") ? nodesetSourceFromFileWhole(source) : source;
     return nodesetToImageRaw(resolved, { addressSpaceVersion: addressSpacePackageVersion(), ...options });
 }
+
+/**
+ * the NodeSet2 XML files loaded into a compact address space, in the order given, each
+ * streamed in chunks: no node object is created, the records go straight into the columns
+ */
+export async function generateCompactAddressSpace(
+    addressSpace: CompactAddressSpace,
+    documents: string | NodesetSource | Array<string | NodesetSource>,
+    options: StoreRecordApplierOptions = {}
+): Promise<void> {
+    const list = Array.isArray(documents) ? documents : [documents];
+    const consumer = compactRecordConsumer(addressSpace, options);
+    for (const [index, document] of list.entries()) {
+        const source = typeof document === "string" ? nodesetSourceFromFile(document) : document;
+        const reader = openNodesetSource(source, index);
+        if ((await reader.probe()) !== NODESET2_XML_FORMAT) {
+            throw new Error(
+                `generateCompactAddressSpace: ${reader.name} is not a NodeSet2 XML document (images are not loaded into a compact space yet)`
+            );
+        }
+        for await (const record of xmlNodesetRecords(textChunks(reader.chunks()))) {
+            consumer.apply(record);
+        }
+    }
+    const { unresolved } = consumer.finish();
+    if (unresolved > 0) {
+        debugLog(`generateCompactAddressSpace: ${unresolved} references point at nodes no document declares`);
+    }
+}
+
+/** the chunks of a source as text, whatever the stream yields */
+async function* textChunks(chunks: AsyncIterable<string | Uint8Array>): AsyncGenerator<string> {
+    const decoder = new TextDecoder();
+    for await (const chunk of chunks) {
+        yield typeof chunk === "string" ? chunk : decoder.decode(chunk, { stream: true });
+    }
+    const tail = decoder.decode();
+    if (tail) yield tail;
+}