node-opcua-address-space 2.183.1 → 2.184.1

package/dist/api/interfaces/state_machine/ua_transition_ex.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=ua_transition_ex.js.map

package/dist/api/interfaces/ua_subscription_diagnostics_variable_ex.d.ts

@@ -6,3 +6,4 @@ import type { SubscriptionDiagnosticsDataType } from "node-opcua-types";
 export interface UASubscriptionDiagnosticsVariableEx extends UASubscriptionDiagnostics<DTSubscriptionDiagnostics> {
     $extensionObject: SubscriptionDiagnosticsDataType;
 }
+//# sourceMappingURL=ua_subscription_diagnostics_variable_ex.d.ts.map

package/dist/api/interfaces/ua_subscription_diagnostics_variable_ex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ua_subscription_diagnostics_variable_ex.d.ts","sourceRoot":"","sources":["../../../api/interfaces/ua_subscription_diagnostics_variable_ex.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClG,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,kBAAkB,CAAC;AACxE,MAAM,WAAW,mCAAoC,SAAQ,yBAAyB,CAAC,yBAAyB,CAAC;IAC7G,gBAAgB,EAAE,+BAA+B,CAAC;CACrD"}

package/dist/api/interfaces/ua_subscription_diagnostics_variable_ex.js

@@ -1,6 +1,5 @@
-"use strict";
 /**
  * @module node-opcua-address-space
  */
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=ua_subscription_diagnostics_variable_ex.js.map

package/dist/api/interfaces/ua_subscription_diagnostics_variable_ex.js.map

@@ -1 +1 @@
-{"version":3,"file":"ua_subscription_diagnostics_variable_ex.js","sourceRoot":"","sources":["../../../api/interfaces/ua_subscription_diagnostics_variable_ex.ts"],"names":[],"mappings":";AAAA;;GAEG"}
+{"version":3,"file":"ua_subscription_diagnostics_variable_ex.js","sourceRoot":"","sources":["../../../api/interfaces/ua_subscription_diagnostics_variable_ex.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/api/loader/decode_xml_extension_object.d.ts

@@ -4,3 +4,4 @@ import type { NodeId } from "node-opcua-nodeid";
 import { type DefinitionMap2 } from "./make_xml_extension_object_parser.js";
 export declare function makeDefinitionMap(addressSpace: IAddressSpace): DefinitionMap2;
 export declare function decodeXmlExtensionObject(addressSpace: IAddressSpace, encodingNodeId: NodeId, xmlBody: string, translateNodeId: (nodeId: string) => NodeId): ExtensionObject | null;
+//# sourceMappingURL=decode_xml_extension_object.d.ts.map

package/dist/api/loader/decode_xml_extension_object.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"decode_xml_extension_object.d.ts","sourceRoot":"","sources":["../../../api/loader/decode_xml_extension_object.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAc,MAAM,+BAA+B,CAAC;AAE/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAAE,KAAK,cAAc,EAA+C,MAAM,uCAAuC,CAAC;AAuBzH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,aAAa,GAAG,cAAc,CAuB7E;AACD,wBAAgB,wBAAwB,CACpC,YAAY,EAAE,aAAa,EAC3B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAC5C,eAAe,GAAG,IAAI,CAoBxB"}

package/dist/api/loader/decode_xml_extension_object.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeDefinitionMap = makeDefinitionMap;
-exports.decodeXmlExtensionObject = decodeXmlExtensionObject;
-const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_types_1 = require("node-opcua-types");
-const node_opcua_xml2json_1 = require("node-opcua-xml2json");
-const make_xml_extension_object_parser_js_1 = require("./make_xml_extension_object_parser.js");
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("decode_xml_extension_object");
-const debugLog = (0, node_opcua_debug_1.make_debugLog)("decode_xml_extension_object");
-const _errorLog = (0, node_opcua_debug_1.make_errorLog)("decode_xml_extension_object");
+import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
+import { NodeClass } from "node-opcua-types";
+import { Xml2Json } from "node-opcua-xml2json";
+import { makeXmlExtensionObjectReader } from "./make_xml_extension_object_parser.js";
+const doDebug = checkDebugFlag("decode_xml_extension_object");
+const debugLog = make_debugLog("decode_xml_extension_object");
+const _errorLog = make_errorLog("decode_xml_extension_object");
 function encodingNodeIdToDataTypeNode(addressSpace, encodingNodeId) {
     const encodingNode = addressSpace.findNode(encodingNodeId);
-    // c8 ignore next
+    /* c8 ignore next */
     if (!encodingNode) {
         throw new Error(`findDataTypeNode:  Cannot find encoding NodeId${encodingNodeId.toString()}`);
     }
@@ -24,14 +20,14 @@ function encodingNodeIdToDataTypeNode(addressSpace, encodingNodeId) {
     const dataTypeNode = dataTypes[0];
     return dataTypeNode;
 }
-function makeDefinitionMap(addressSpace) {
+export function makeDefinitionMap(addressSpace) {
     return {
         findDefinition(dataTypeNodeId) {
             const dataTypeNode = addressSpace.findDataType(dataTypeNodeId);
             if (!dataTypeNode) {
                 throw new Error(`findDefinition: cannot find dataType ${dataTypeNodeId.toString()}`);
             }
-            if (dataTypeNode.nodeClass !== node_opcua_types_1.NodeClass.DataType) {
+            if (dataTypeNode.nodeClass !== NodeClass.DataType) {
                 throw new Error("Expecting a DataType node here");
             }
             const name = dataTypeNode.browseName.name || "";
@@ -50,13 +46,13 @@ function makeDefinitionMap(addressSpace) {
         }
     };
 }
-function decodeXmlExtensionObject(addressSpace, encodingNodeId, xmlBody, translateNodeId) {
+export function decodeXmlExtensionObject(addressSpace, encodingNodeId, xmlBody, translateNodeId) {
     const definitionMap = makeDefinitionMap(addressSpace);
     const dataType = encodingNodeIdToDataTypeNode(addressSpace, encodingNodeId);
     //  const { name, definition } = definitionMap.findDefinition(dataType.nodeId);
     // const hasOptionalFields = definition.fields!.some((field) => field.isOptional);
-    const reader = (0, make_xml_extension_object_parser_js_1.makeXmlExtensionObjectReader)(dataType.nodeId, definitionMap, new Map(), translateNodeId);
-    const parser2 = new node_opcua_xml2json_1.Xml2Json(reader);
+    const reader = makeXmlExtensionObjectReader(dataType.nodeId, definitionMap, new Map(), translateNodeId);
+    const parser2 = new Xml2Json(reader);
     const pojo = parser2.parseString(xmlBody);
     const userDefinedExtensionObject = addressSpace.constructExtensionObject(dataType, pojo);
     // c8 ignore next

package/dist/api/loader/decode_xml_extension_object.js.map

@@ -1 +1 @@
-{"version":3,"file":"decode_xml_extension_object.js","sourceRoot":"","sources":["../../../api/loader/decode_xml_extension_object.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decode_xml_extension_object.js","sourceRoot":"","sources":["../../../api/loader/decode_xml_extension_object.ts"],"names":[],"mappings":"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"}

package/dist/api/loader/ensure_datatype_extracted.d.ts

@@ -3,3 +3,4 @@ import { ExtraDataTypeManager } from "node-opcua-client-dynamic-extension-object
 import type { CallbackT } from "node-opcua-status-code";
 export declare function ensureDatatypeExtracted(addressSpace: IAddressSpace): Promise<ExtraDataTypeManager>;
 export declare function ensureDatatypeExtractedWithCallback(addressSpace: IAddressSpace, callback: CallbackT<ExtraDataTypeManager>): void;
+//# sourceMappingURL=ensure_datatype_extracted.d.ts.map

package/dist/api/loader/ensure_datatype_extracted.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ensure_datatype_extracted.d.ts","sourceRoot":"","sources":["../../../api/loader/ensure_datatype_extracted.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAA0B,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EAGH,oBAAoB,EAEvB,MAAM,4CAA4C,CAAC;AAGpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AA4CxD,wBAAsB,uBAAuB,CAAC,YAAY,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAkGxG;AAED,wBAAgB,mCAAmC,CAAC,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAIhI"}

package/dist/api/loader/ensure_datatype_extracted.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureDatatypeExtracted = ensureDatatypeExtracted;
-exports.ensureDatatypeExtractedWithCallback = ensureDatatypeExtractedWithCallback;
-const node_opcua_client_dynamic_extension_object_1 = require("node-opcua-client-dynamic-extension-object");
-const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_factory_1 = require("node-opcua-factory");
-const construct_namespace_dependency_js_1 = require("../../impl/nodeset_tools/construct_namespace_dependency.js");
-const pseudo_session_js_1 = require("../pseudo_session.js");
-const debugLog = (0, node_opcua_debug_1.make_debugLog)("ensure_datatype_extracted");
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("ensure_datatype_extracted");
+import { convertStructureTypeSchemaToStructureDefinition, DataTypeExtractStrategy, ExtraDataTypeManager, populateDataTypeManager } from "node-opcua-client-dynamic-extension-object";
+import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
+import { DataTypeFactory, getStandardDataTypeFactory } from "node-opcua-factory";
+import { constructNamespaceDependency, constructNamespacePriorityTable } from "../../impl/nodeset_tools/construct_namespace_dependency.js";
+import { PseudoSession } from "../pseudo_session.js";
+const debugLog = make_debugLog("ensure_datatype_extracted");
+const doDebug = checkDebugFlag("ensure_datatype_extracted");
 function fixDefinition103(addressSpace, namespaceArray, dataTypeManager) {
     // fix datatype _getDefinition();
     for (let namespaceIndex = 1; namespaceIndex < namespaceArray.length; namespaceIndex++) {
@@ -26,61 +22,96 @@ function fixDefinition103(addressSpace, namespaceArray, dataTypeManager) {
             }
             // debugLog(" Exploration", dataType.browseName.toString());
             if (!dataType.$partialDefinition || (dataType.$partialDefinition.length === 0 && s.schema.fields?.length > 0)) {
-                const sd = (0, node_opcua_client_dynamic_extension_object_1.convertStructureTypeSchemaToStructureDefinition)(s.schema);
+                const sd = convertStructureTypeSchemaToStructureDefinition(s.schema);
                 dataType.$partialDefinition = sd.fields || undefined;
             }
         }
     }
 }
-async function ensureDatatypeExtracted(addressSpace) {
+export async function ensureDatatypeExtracted(addressSpace) {
     const addressSpacePriv = addressSpace;
     if (!addressSpacePriv.$$extraDataTypeManager) {
-        const dataTypeManager = new node_opcua_client_dynamic_extension_object_1.ExtraDataTypeManager();
-        const namespaceArray = addressSpace.getNamespaceArray().map((n) => n.namespaceUri);
-        doDebug && debugLog("INamespace Array = ", namespaceArray.join("\n                   "));
-        dataTypeManager.setNamespaceArray(namespaceArray);
-        addressSpacePriv.$$extraDataTypeManager = dataTypeManager;
-        const factories = [(0, node_opcua_factory_1.getStandardDataTypeFactory)()];
-        const priorityTable = (0, construct_namespace_dependency_js_1.constructNamespacePriorityTable)(addressSpace).priorityTable;
-        for (let namespaceIndex = 1; namespaceIndex < namespaceArray.length; namespaceIndex++) {
-            const namespace = addressSpace.getNamespace(namespaceIndex);
-            if (doDebug) {
-                debugLog("namespaceIndex = ", namespaceIndex);
-                debugLog("namespace = ", namespace.namespaceUri);
-                debugLog("factories = ", factories.map((f) => f.targetNamespace).join(" "));
-                // find dependent namespaces
-                let dependency = (0, construct_namespace_dependency_js_1.constructNamespaceDependency)(namespace);
-                // remove last element that is my namespace
-                dependency = dependency.filter((ns) => ns.index !== namespaceIndex);
-                const dependFactories = dependency.map((ns) => {
-                    const df = factories[ns.index];
-                    if (!df) {
-                        debugLog("namespaceIndex = ", namespaceIndex);
-                        debugLog("namespace = ", namespace.namespaceUri);
-                        debugLog("priorityTable", priorityTable);
-                        debugLog(dependency.map((ns) => `${ns.index} ${ns.namespaceUri}`).join("\n"));
-                        throw new Error(`Cannot find factory for namespace ${ns.namespaceUri}`);
-                    }
-                    return df;
-                });
-                //            getStandardDataTypeFactory()
-                const _dataTypeFactory1 = new node_opcua_factory_1.DataTypeFactory(dependFactories);
-            }
-            const dataTypeFactory1 = new node_opcua_factory_1.DataTypeFactory([...factories]);
-            dataTypeFactory1.targetNamespace = namespace.namespaceUri;
-            factories.push(dataTypeFactory1);
-            dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
+        addressSpacePriv.$$extraDataTypeManager = new ExtraDataTypeManager();
+    }
+    const dataTypeManager = addressSpacePriv.$$extraDataTypeManager;
+    const namespaceArray = addressSpace.getNamespaceArray().map((n) => n.namespaceUri);
+    doDebug && debugLog("INamespace Array = ", namespaceArray.join("\n                   "));
+    dataTypeManager.setNamespaceArray(namespaceArray);
+    const factories = [getStandardDataTypeFactory()];
+    // A namespace with no factory is one this call has not seen yet: the first call sees them
+    // all, and a later one sees a namespace registered since, or one emptied by
+    // `deleteNamespace` and populated again - `deleteNamespace` drops that namespace's factory
+    // precisely so that its structures are extracted afresh rather than colliding with the
+    // schemas of the previous load. When every namespace already has one there is nothing to
+    // extract and this returns as fast as it always did.
+    let hasNewFactory = false;
+    for (let namespaceIndex = 1; namespaceIndex < namespaceArray.length; namespaceIndex++) {
+        const namespace = addressSpace.getNamespace(namespaceIndex);
+        if (dataTypeManager.hasDataTypeFactory(namespaceIndex)) {
+            factories.push(dataTypeManager.getDataTypeFactory(namespaceIndex));
+            continue;
         }
+        // NOTE: a DataTypeFactory chains POSITIONALLY — to every factory built
+        // before it, not to the namespaces it actually depends on. That over-couples
+        // namespaces, and it matters now that `deleteNamespace` exists: dropping a
+        // namespace leaves everything loaded after it holding a discarded factory,
+        // so the factory, its schemas and its ExtensionObject constructors stay
+        // alive. A consumer that registers its own namespace BEFORE its dependencies
+        // is chained through by every one of them, and leaks a factory per reload.
+        //
+        // The dependency-correct computation exists below, under `if (doDebug)`,
+        // with its result assigned to a variable nobody reads. Using it is NOT a
+        // drop-in: `constructNamespaceDependency` walks values and throws on an
+        // ExtensionObject with a null schema (`construct_namespace_dependency.ts`,
+        // `exploreExtensionObject`). Being debug-only, it has never had to survive
+        // the hot path — calling it on every load breaks server writes with
+        // `TypeError: Cannot read properties of null (reading 'schema')`.
+        //
+        // So the fix is two changes, not one: harden that walk, then switch the
+        // chain. Deliberately left for its own change, with its own tests, rather
+        // than smuggled into this one.
+        if (doDebug) {
+            const priorityTable = constructNamespacePriorityTable(addressSpace).priorityTable;
+            debugLog("namespaceIndex = ", namespaceIndex);
+            debugLog("namespace = ", namespace.namespaceUri);
+            debugLog("factories = ", factories.map((f) => f.targetNamespace).join(" "));
+            // find dependent namespaces
+            let dependency = constructNamespaceDependency(namespace);
+            // remove last element that is my namespace
+            dependency = dependency.filter((ns) => ns.index !== namespaceIndex);
+            const dependFactories = dependency.map((ns) => {
+                const df = factories[ns.index];
+                if (!df) {
+                    debugLog("namespaceIndex = ", namespaceIndex);
+                    debugLog("namespace = ", namespace.namespaceUri);
+                    debugLog("priorityTable", priorityTable);
+                    debugLog(dependency.map((ns) => `${ns.index} ${ns.namespaceUri}`).join("\n"));
+                    throw new Error(`Cannot find factory for namespace ${ns.namespaceUri}`);
+                }
+                return df;
+            });
+            //            getStandardDataTypeFactory()
+            const _dataTypeFactory1 = new DataTypeFactory(dependFactories);
+        }
+        const dataTypeFactory1 = new DataTypeFactory([...factories]);
+        dataTypeFactory1.targetNamespace = namespace.namespaceUri;
+        factories.push(dataTypeFactory1);
+        dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
+        hasNewFactory = true;
+    }
+    if (hasNewFactory) {
         // inject simple types
         // now extract structure and enumeration from old form
-        const session = new pseudo_session_js_1.PseudoSession(addressSpace);
-        await (0, node_opcua_client_dynamic_extension_object_1.populateDataTypeManager)(session, dataTypeManager, node_opcua_client_dynamic_extension_object_1.DataTypeExtractStrategy.Auto);
+        const session = new PseudoSession(addressSpace);
+        // the extraction skips a dataType whose factory already knows it, so the namespaces that
+        // were extracted by an earlier call are walked but not rebuilt
+        await populateDataTypeManager(session, dataTypeManager, DataTypeExtractStrategy.Auto);
         // turn old <=103 structure to have valid DataTypeDefinition
         fixDefinition103(addressSpace, namespaceArray, dataTypeManager);
     }
-    return addressSpacePriv.$$extraDataTypeManager;
+    return dataTypeManager;
 }
-function ensureDatatypeExtractedWithCallback(addressSpace, callback) {
+export function ensureDatatypeExtractedWithCallback(addressSpace, callback) {
     ensureDatatypeExtracted(addressSpace)
         .then((result) => callback(null, result))
         .catch((err) => callback(err));

package/dist/api/loader/ensure_datatype_extracted.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensure_datatype_extracted.js","sourceRoot":"","sources":["../../../api/loader/ensure_datatype_extracted.ts"],"names":[],"mappings":";;AAqDA,0DA8DC;AAED,kFAIC;AAxHD,2GAKoD;AACpD,uDAAiE;AACjE,2DAAiF;AAIjF,kHAGoE;AACpE,4DAAqD;AAErD,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,2BAA2B,CAAC,CAAC;AAC5D,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,2BAA2B,CAAC,CAAC;AAU5D,SAAS,gBAAgB,CAAC,YAA2B,EAAE,cAAwB,EAAE,eAAqC;IAClH,iCAAiC;IACjC,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC;QACpF,MAAM,EAAE,GAAG,eAAe,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;QAC9D,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAmB,CAAC;YACtF,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjB,SAAS;YACb,CAAC;YACD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,SAAS;YACb,CAAC;YACD,IAAI,QAAQ,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;gBACtC,SAAS;YACb,CAAC;YACD,4DAA4D;YAC5D,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC5G,MAAM,EAAE,GAAG,IAAA,4FAA+C,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBACrE,QAAQ,CAAC,kBAAkB,GAAG,EAAE,CAAC,MAAM,IAAI,SAAS,CAAC;YACzD,CAAC;QACL,CAAC;IACL,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAAC,YAA2B;IACrE,MAAM,gBAAgB,GAAG,YAAsD,CAAC;IAEhF,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,CAAC;QAC3C,MAAM,eAAe,GAAG,IAAI,iEAAoB,EAAE,CAAC;QAEnD,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QAE/F,OAAO,IAAI,QAAQ,CAAC,qBAAqB,EAAE,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAEzF,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAElD,gBAAgB,CAAC,sBAAsB,GAAG,eAAe,CAAC;QAE1D,MAAM,SAAS,GAAsB,CAAC,IAAA,+CAA0B,GAAE,CAAC,CAAC;QAEpE,MAAM,aAAa,GAAG,IAAA,mEAA+B,EAAC,YAAY,CAAC,CAAC,aAAa,CAAC;QAElF,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC;YACpF,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;YAE5D,IAAI,OAAO,EAAE,CAAC;gBACV,QAAQ,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;gBAC9C,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;gBACjD,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5E,4BAA4B;gBAC5B,IAAI,UAAU,GAAG,IAAA,gEAA4B,EAAC,SAAS,CAAC,CAAC;gBACzD,2CAA2C;gBAC3C,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,cAAc,CAAC,CAAC;gBACpE,MAAM,eAAe,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;oBAC1C,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;oBAC/B,IAAI,CAAC,EAAE,EAAE,CAAC;wBACN,QAAQ,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;wBAC9C,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;wBACjD,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;wBACzC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;wBAC9E,MAAM,IAAI,KAAK,CAAC,qCAAqC,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;oBAC5E,CAAC;oBACD,OAAO,EAAE,CAAC;gBACd,CAAC,CAAC,CAAC;gBACH,0CAA0C;gBAE1C,MAAM,iBAAiB,GAAG,IAAI,oCAAe,CAAC,eAAe,CAAC,CAAC;YACnE,CAAC;YACD,MAAM,gBAAgB,GAAG,IAAI,oCAAe,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;YAC7D,gBAAgB,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC;YAE1D,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAEjC,eAAe,CAAC,uBAAuB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QAC9E,CAAC;QACD,sBAAsB;QAEtB,sDAAsD;QACtD,MAAM,OAAO,GAAG,IAAI,iCAAa,CAAC,YAAY,CAAC,CAAC;QAEhD,MAAM,IAAA,oEAAuB,EAAC,OAAO,EAAE,eAAe,EAAE,oEAAuB,CAAC,IAAI,CAAC,CAAC;QAEtF,4DAA4D;QAC5D,gBAAgB,CAAC,YAAY,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,gBAAgB,CAAC,sBAA8C,CAAC;AAC3E,CAAC;AAED,SAAgB,mCAAmC,CAAC,YAA2B,EAAE,QAAyC;IACtH,uBAAuB,CAAC,YAAY,CAAC;SAChC,IAAI,CAAC,CAAC,MAA4B,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC9D,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"ensure_datatype_extracted.js","sourceRoot":"","sources":["../../../api/loader/ensure_datatype_extracted.ts"],"names":[],"mappings":"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"}

package/dist/api/loader/generateAddressSpaceRaw.d.ts

@@ -56,3 +56,4 @@ export declare function generateAddressSpaceRaw(addressSpace: IAddressSpace, xml
 export type XmlLoaderFunc = (nodeset2xmlUri: string, callback: CallbackT<string>) => void;
 export type XmlLoaderAsyncFunc = (nodeset2xmlUri: string) => Promise<string>;
 export {};
+//# sourceMappingURL=generateAddressSpaceRaw.d.ts.map

package/dist/api/loader/generateAddressSpaceRaw.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateAddressSpaceRaw.d.ts","sourceRoot":"","sources":["../../../api/loader/generateAddressSpaceRaw.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAElF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAKxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAIpF,OAAO,EAIH,KAAK,gBAAgB,IAAI,WAAW,EAEvC,MAAM,qBAAqB,CAAC;AAa7B,OAAO,EAAsB,KAAK,aAAa,EAAwC,MAAM,qBAAqB,CAAC;AAWnH,UAAU,WAAW;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,WAAW,CAAC;CAC/B;AAsHD;;GAEG;AACH,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAmBhI;AACD;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;AAEnG;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,aAAa,GAAG,sBAAsB,CAgBxF;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CACrB,YAAY,EAAE,KAAK,CAAC;IAAE,cAAc,EAAE,WAAW,CAAA;CAAE,CAAC,EACpD,WAAW,GAAE,sBAAoC,GAClD,MAAM,EAAE,CA0CV;AACD;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CACzC,YAAY,EAAE,aAAa,EAC3B,OAAO,EAAE,aAAa,GAAG,aAAa,EAAE,EACxC,OAAO,CAAC,EAAE,oBAAoB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;AACjB;;;;;GAKG;AACH,wBAAsB,uBAAuB,CACzC,YAAY,EAAE,aAAa,EAC3B,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAC3B,SAAS,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACtD,OAAO,EAAE,oBAAoB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAAC;AAuFjB,MAAM,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;AAC1F,MAAM,MAAM,kBAAkB,GAAG,CAAC,cAAc,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC"}

package/dist/api/loader/generateAddressSpaceRaw.js

@@ -1,30 +1,22 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.preLoad = preLoad;
-exports.loadedModelSatisfies = loadedModelSatisfies;
-exports.findOrder = findOrder;
-exports.generateAddressSpaceRaw = generateAddressSpaceRaw;
-const node_opcua_debug_1 = require("node-opcua-debug");
-const semver_1 = __importDefault(require("semver"));
-const adjust_namespace_array_js_1 = require("../../impl/nodeset_tools/adjust_namespace_array.js");
-const load_nodeset2_js_1 = require("./load_nodeset2.js");
-const make_semver_compatible_js_1 = require("./make_semver_compatible.js");
-const nodeset_builtin_formats_js_1 = require("./nodeset_builtin_formats.js");
-const nodeset_format_js_1 = require("./nodeset_format.js");
-const nodeset_image_js_1 = require("./nodeset_image.js");
-const nodeset_image_codec_js_1 = require("./nodeset_image_codec.js");
-const nodeset_image_store_js_1 = require("./nodeset_image_store.js");
-const nodeset_source_js_1 = require("./nodeset_source.js");
-const nodeset_xml_header_js_1 = require("./nodeset_xml_header.js");
+import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
+import semver from "semver";
+import { beginBulkLoadClock, endBulkLoadClock } from "../../impl/bulk_load_clock.js";
+import { adjustNamespaceArray } from "../../impl/nodeset_tools/adjust_namespace_array.js";
+import { NodeSetLoader } from "./load_nodeset2.js";
+import { makeSemverCompatible } from "./make_semver_compatible.js";
+import { NDJSON_IMAGE_FORMAT, registerBuiltinNodesetFormats } from "./nodeset_builtin_formats.js";
+import { nodesetFormatByName } from "./nodeset_format.js";
+import { imageLinesToRecords, inflatedImageLines, NodesetImageError, NodesetImageWriter, nodesetImageProblem, readNodesetImageInfo, releaseInflatedImageLines } from "./nodeset_image.js";
+import { decodeHeader } from "./nodeset_image_codec.js";
+import { nodesetImageKey, sharedMemoryNodesetImageStore } from "./nodeset_image_store.js";
+import { nodesetDocumentOf, openNodesetSource } from "./nodeset_source.js";
+import { parseDependencies, sliceHeader } from "./nodeset_xml_header.js";
 // the loader reads NodeSet2 XML and its own NDJSON images out of the box: registering them is
 // what makes that true, and it has to happen before any source is sniffed
-(0, nodeset_builtin_formats_js_1.registerBuiltinNodesetFormats)();
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("generateAddressSpaceRaw");
-const debugLog = (0, node_opcua_debug_1.make_debugLog)("generateAddressSpaceRaw");
-const errorLog = (0, node_opcua_debug_1.make_errorLog)("generateAddressSpaceRaw");
+registerBuiltinNodesetFormats();
+const doDebug = checkDebugFlag("generateAddressSpaceRaw");
+const debugLog = make_debugLog("generateAddressSpaceRaw");
+const errorLog = make_errorLog("generateAddressSpaceRaw");
 /**
  * Detect the order of namespace loading, reading each source no further than its header
  */
@@ -33,13 +25,13 @@ async function preLoadSources(readers) {
     for (let index = 0; index < readers.length; index++) {
         const reader = readers[index];
         doDebug && console.log("---------------------------------------------", reader.name);
-        const format = (0, nodeset_format_js_1.nodesetFormatByName)(await reader.probe());
+        const format = nodesetFormatByName(await reader.probe());
         // probe() only returns a name it found in the registry, so this cannot be missing; the
         // check is here because a caller may unregister a format between the probe and the load
         if (!format) {
             throw new Error(`nodeset source ${reader.name}: its format is no longer registered`);
         }
-        const document = (0, nodeset_source_js_1.nodesetDocumentOf)(reader);
+        const document = nodesetDocumentOf(reader);
         const namespaceModel = await format.readModels(document);
         namespaceDesc.push({ reader, document, format, namespaceModel, index });
     }
@@ -55,7 +47,7 @@ async function* tee(records, consumer) {
 function resolveImageStore(option) {
     if (!option)
         return undefined;
-    return option === true ? (0, nodeset_image_store_js_1.sharedMemoryNodesetImageStore)() : option;
+    return option === true ? sharedMemoryNodesetImageStore() : option;
 }
 /**
  * whether an image from the store can be replayed: it inflates to its end (gzip integrity), its
@@ -65,17 +57,17 @@ function resolveImageStore(option) {
  */
 async function isReplayable(image, digest, name) {
     try {
-        const info = await (0, nodeset_image_js_1.readNodesetImageInfo)(image);
-        const problem = (0, nodeset_image_js_1.nodesetImageProblem)(info, digest);
+        const info = await readNodesetImageInfo(image);
+        const problem = nodesetImageProblem(info, digest);
         if (problem) {
-            throw new nodeset_image_js_1.NodesetImageError(problem);
+            throw new NodesetImageError(problem);
         }
         // the header parses with the schema this loader reads
-        (0, nodeset_image_codec_js_1.decodeHeader)(info.header);
+        decodeHeader(info.header);
         return true;
     }
     catch (err) {
-        if (!(err instanceof nodeset_image_js_1.NodesetImageError)) {
+        if (!(err instanceof NodesetImageError)) {
             throw err;
         }
         debugLog("discarding the image of", name, ":", err.message);
@@ -99,27 +91,27 @@ async function loadThroughCache(nodesetLoader, format, document, reader, store)
     // the digest is known up front for a document given whole; a stream must be read first
     const digest = reader.imageKey ?? (reader.whole ? await reader.digest() : undefined);
     if (digest !== undefined) {
-        const key = (0, nodeset_image_store_js_1.nodesetImageKey)(digest);
+        const key = nodesetImageKey(digest);
         const image = await store.get(key);
         if (image && (await isReplayable(image, digest, reader.name))) {
             // a replay that fails half-way would leave nodes behind that the XML would then
             // collide with; the check above is what makes it safe to commit to the image here
             try {
-                await nodesetLoader.addRecords((0, nodeset_image_js_1.imageLinesToRecords)(await (0, nodeset_image_js_1.inflatedImageLines)(image), { expectedDigest: digest }));
+                await nodesetLoader.addRecords(imageLinesToRecords(await inflatedImageLines(image), { expectedDigest: digest }));
             }
             finally {
-                (0, nodeset_image_js_1.releaseInflatedImageLines)(image);
+                releaseInflatedImageLines(image);
             }
             doDebug && debugLog("loaded", reader.name, "from its image", key);
             return;
         }
     }
-    const writer = new nodeset_image_js_1.NodesetImageWriter();
+    const writer = new NodesetImageWriter();
     await nodesetLoader.addRecords(tee(format.records(document), writer));
     const sourceDigest = digest ?? (await reader.digest());
     try {
-        await store.put((0, nodeset_image_store_js_1.nodesetImageKey)(sourceDigest), await writer.finish(sourceDigest, reader.length));
-        doDebug && debugLog("loaded", reader.name, "from XML; image written under", (0, nodeset_image_store_js_1.nodesetImageKey)(sourceDigest));
+        await store.put(nodesetImageKey(sourceDigest), await writer.finish(sourceDigest, reader.length));
+        doDebug && debugLog("loaded", reader.name, "from XML; image written under", nodesetImageKey(sourceDigest));
     }
     catch (err) {
         // a store that cannot write costs a log line, never the load
@@ -129,20 +121,20 @@ async function loadThroughCache(nodesetLoader, format, document, reader, store)
 /**
  * Detect order of namespace loading
  */
-async function preLoad(xmlFiles, xmlLoader) {
+export async function preLoad(xmlFiles, xmlLoader) {
     // a nodeset2 file may define multiple namespaces
     const namespaceDesc = [];
     for (let index = 0; index < xmlFiles.length; index++) {
         doDebug && console.log("---------------------------------------------", xmlFiles[index]);
         const xmlData = await xmlLoader(xmlFiles[index]);
-        const xmlData2 = (0, nodeset_xml_header_js_1.sliceHeader)(xmlData, xmlFiles[index]);
+        const xmlData2 = sliceHeader(xmlData, xmlFiles[index]);
         doDebug &&
             console.log(xmlData2
                 .split("\n")
                 .splice(0, 46)
                 .map((x, i) => `${i + 0} ${x}`)
                 .join("\n"));
-        const namespaceModel = await (0, nodeset_xml_header_js_1.parseDependencies)(xmlData2);
+        const namespaceModel = await parseDependencies(xmlData2);
         namespaceDesc.push({ xmlData, namespaceModel, index });
     }
     return namespaceDesc;
@@ -153,15 +145,15 @@ async function preLoad(xmlFiles, xmlLoader) {
  * least the required one. A lower version is an error naming both versions; an absent
  * namespace is not satisfied, and left to the caller to report as missing.
  */
-function loadedModelSatisfies(addressSpace) {
+export function loadedModelSatisfies(addressSpace) {
     return (requiredModel, requiredBy) => {
         const namespace = addressSpace.getNamespace(requiredModel.modelUri);
         if (!namespace) {
             return false;
         }
-        const loaded = (0, make_semver_compatible_js_1.makeSemverCompatible)(namespace.version);
-        const required = (0, make_semver_compatible_js_1.makeSemverCompatible)(requiredModel.version);
-        if (semver_1.default.lt(loaded, required)) {
+        const loaded = makeSemverCompatible(namespace.version);
+        const required = makeSemverCompatible(requiredModel.version);
+        if (semver.lt(loaded, required)) {
             throw new Error(`Namespace ${requiredModel.modelUri} is loaded with version ${namespace.version || "unknown"}` +
                 ` but ${requiredBy} requires version ${requiredModel.version} or later`);
         }
@@ -175,7 +167,7 @@ function loadedModelSatisfies(addressSpace) {
  * @param isSatisfied a required model that no document of the call defines is an error unless
  *   this says it is satisfied, typically because the address space holds it already
  */
-function findOrder(nodesetDescs, isSatisfied = () => false) {
+export function findOrder(nodesetDescs, isSatisfied = () => false) {
     // compute the order of loading of the namespaces
     const order = [];
     const visited = new Set();
@@ -218,7 +210,7 @@ function findOrder(nodesetDescs, isSatisfied = () => false) {
     }
     return order;
 }
-async function generateAddressSpaceRaw(addressSpace, sourcesOrUris, loaderOrOptions, maybeOptions) {
+export async function generateAddressSpaceRaw(addressSpace, sourcesOrUris, loaderOrOptions, maybeOptions) {
     let readers;
     let options;
     let store;
@@ -228,7 +220,7 @@ async function generateAddressSpaceRaw(addressSpace, sourcesOrUris, loaderOrOpti
         options = maybeOptions || {};
         store = resolveImageStore(options.imageStore);
         // the loader hands the document whole, so its digest is known before it is parsed
-        readers = uris.map((uri, index) => (0, nodeset_source_js_1.openNodesetSource)({
+        readers = uris.map((uri, index) => openNodesetSource({
             name: uri,
             source: async function* () {
                 yield await xmlLoader(uri);
@@ -239,9 +231,9 @@ async function generateAddressSpaceRaw(addressSpace, sourcesOrUris, loaderOrOpti
         const list = (Array.isArray(sourcesOrUris) ? sourcesOrUris : [sourcesOrUris]);
         options = loaderOrOptions || {};
         store = resolveImageStore(options.imageStore);
-        readers = list.map((source, index) => (0, nodeset_source_js_1.openNodesetSource)(source, index, { hash: !!store }));
+        readers = list.map((source, index) => openNodesetSource(source, index, { hash: !!store }));
     }
-    const nodesetLoader = new load_nodeset2_js_1.NodeSetLoader(addressSpace, options);
+    const nodesetLoader = new NodeSetLoader(addressSpace, options);
     const nodesetDesc = await preLoadSources(readers);
     const order = findOrder(nodesetDesc, loadedModelSatisfies(addressSpace));
     // register namespace in the same order as specified in the xmlFiles array
@@ -252,35 +244,45 @@ async function generateAddressSpaceRaw(addressSpace, sourcesOrUris, loaderOrOpti
             ns.setRequiredModels(model.requiredModel);
         }
     }
-    for (let index = 0; index < order.length; index++) {
-        const nodesetIndex = order[index];
-        const nodeset = nodesetDesc[nodesetIndex];
-        // c8 ignore next
-        doDebug && debugLog(" loading ", nodesetIndex, nodeset.reader.name);
-        try {
-            if (nodeset.format.name === nodeset_builtin_formats_js_1.NDJSON_IMAGE_FORMAT) {
-                // an image is already the cache: replaying it through the cache would be storing
-                // a copy of what was just read
-                try {
-                    await nodesetLoader.addRecords(nodeset.format.records(nodeset.document));
+    // Everything this load creates is stamped with ONE clock reading rather than one apiece:
+    // see impl/bulk_load_clock.ts. Scoped to this address space and reference counted, so a
+    // load of another address space, or a write to one that is not loading, is unaffected.
+    // `finally` matters: a load that throws must not leave the clock frozen.
+    beginBulkLoadClock(addressSpace);
+    try {
+        for (let index = 0; index < order.length; index++) {
+            const nodesetIndex = order[index];
+            const nodeset = nodesetDesc[nodesetIndex];
+            // c8 ignore next
+            doDebug && debugLog(" loading ", nodesetIndex, nodeset.reader.name);
+            try {
+                if (nodeset.format.name === NDJSON_IMAGE_FORMAT) {
+                    // an image is already the cache: replaying it through the cache would be storing
+                    // a copy of what was just read
+                    try {
+                        await nodesetLoader.addRecords(nodeset.format.records(nodeset.document));
+                    }
+                    finally {
+                        releaseInflatedImageLines(await nodeset.document.rawBytes());
+                    }
                 }
-                finally {
-                    (0, nodeset_image_js_1.releaseInflatedImageLines)(await nodeset.document.rawBytes());
+                else {
+                    await loadThroughCache(nodesetLoader, nodeset.format, nodeset.document, nodeset.reader, store);
                 }
             }
-            else {
-                await loadThroughCache(nodesetLoader, nodeset.format, nodeset.document, nodeset.reader, store);
+            catch (err) {
+                const cause = err instanceof Error ? err.message : String(err);
+                const message = `generateAddressSpace: loading nodeset ${nodeset.reader.name} failed: ${cause}`;
+                errorLog(message);
+                throw new Error(message, { cause: err });
             }
         }
-        catch (err) {
-            const cause = err instanceof Error ? err.message : String(err);
-            const message = `generateAddressSpace: loading nodeset ${nodeset.reader.name} failed: ${cause}`;
-            errorLog(message);
-            throw new Error(message, { cause: err });
-        }
+        await nodesetLoader.terminate();
+    }
+    finally {
+        endBulkLoadClock(addressSpace);
     }
-    await nodesetLoader.terminate();
-    (0, adjust_namespace_array_js_1.adjustNamespaceArray)(addressSpace);
+    adjustNamespaceArray(addressSpace);
     // however process them in series
 }
 //# sourceMappingURL=generateAddressSpaceRaw.js.map