node-opcua-address-space 2.136.0 → 2.138.0

package/source/interfaces/state_machine/ua_state_machine_type.ts

@@ -27,7 +27,9 @@ import { UATransitionEx } from "./ua_transition_ex";
 
 export type UtcTime = DateTime;
 
-export interface NonHierarchicalReferences extends UAReferenceType {}
+export interface NonHierarchicalReferences extends UAReferenceType {
+    /** empty interface */
+}
 
 export interface UAStateVariableType extends UAVariableTypeT<LocalizedText, DataType.LocalizedText> {
     // attributes
@@ -38,9 +40,14 @@ export interface StateB {
     stateNumber: UAProperty<UInt32, DataType.UInt32>;
 }
 
-export interface UAStateType extends UAState_Base, UAObjectType {}
+export interface UAStateType extends UAState_Base, UAObjectType {
+    /** empty interface */
+}
 
-export interface UATransitionType extends UATransition_Base, UAObjectType {}
+/** empty interface */
+export interface UATransitionType extends UATransition_Base, UAObjectType {
+    /** empty interface */
+}
 
 /**
  * Initial State Type
@@ -63,9 +70,11 @@ export interface UATransitionType extends UATransition_Base, UAObjectType {}
  * entered directly, then the State of the SubStateMachine is server-specific.
  */
 
-export interface UAInitialStateType extends UAInitialState_Base, UAStateType {}
+export interface UAInitialStateType extends UAInitialState_Base, UAStateType {
+    /** empty interface */
+}
 
-// export interface UAInitialState extends InitialStateB, UAState {}
+// export interface UAInitialState extends InitialStateB, UAState {     /** empty interface */}
 
 /**
  * ToState Reference Type
@@ -255,7 +264,6 @@ export interface UAStateMachineHelper {
 
 export interface UAStateMachineEx extends UAObject, UAStateMachineHelper, UAStateMachine_Base {}
 
-
 export interface UAStateMachineTypeHelper extends UAObjectType {
     /**
      * return all state nodes associated with this state machine
@@ -268,7 +276,6 @@ export interface UAStateMachineTypeHelper extends UAObjectType {
     getTransitions(): UATransitionEx[];
 
     getStateByName(name: string): UAState | null;
-    
 }
 
 export interface UAStateMachineType extends UAObjectType, UAStateMachineTypeHelper, UAStateMachine_Base {

package/source/loader/decode_xml_extension_object.ts

@@ -1,7 +1,7 @@
 import { IAddressSpace, UADataType } from "node-opcua-address-space-base";
 import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
 import { ExtensionObject } from "node-opcua-extension-object";
-import { NodeId } from "node-opcua-nodeid";
+import { NodeId, resolveNodeId } from "node-opcua-nodeid";
 import { NodeClass } from "node-opcua-types";
 import { Xml2Json } from "node-opcua-xml2json";
 
@@ -55,7 +55,8 @@ export function makeDefinitionMap(addressSpace: IAddressSpace): DefinitionMap2 {
 export function decodeXmlExtensionObject(
     addressSpace: IAddressSpace,
     encodingNodeId: NodeId,
-    xmlBody: string
+    xmlBody: string,
+    translateNodeId: (nodeId: string) => NodeId
 ): ExtensionObject | null {
     const definitionMap = makeDefinitionMap(addressSpace);
 
@@ -64,7 +65,7 @@ export function decodeXmlExtensionObject(
     //  const { name, definition } = definitionMap.findDefinition(dataType.nodeId);
     // const hasOptionalFields = definition.fields!.some((field) => field.isOptional);
 
-    const reader = makeXmlExtensionObjectReader(dataType.nodeId, definitionMap, {});
+    const reader = makeXmlExtensionObjectReader(dataType.nodeId, definitionMap, new Map(), translateNodeId);
     const parser2 = new Xml2Json(reader);
     const pojo = parser2.parseStringSync(xmlBody);
 

package/source/loader/ensure_datatype_extracted.ts

@@ -11,6 +11,7 @@ import { CallbackT } from "node-opcua-status-code";
 import { StructureField } from "node-opcua-types";
 import { AddressSpacePrivate } from "../../src/address_space_private";
 import { PseudoSession } from "../pseudo_session";
+import { constructNamespaceDependency, constructNamespacePriorityTable } from "../../src/nodeset_tools/construct_namespace_dependency";
 
 const debugLog = make_debugLog(__filename);
 
@@ -40,7 +41,7 @@ function fixDefinition103(addressSpace: IAddressSpace, namespaceArray: string[],
             }
         }
     }
-} 
+}
 
 export async function ensureDatatypeExtracted(addressSpace: IAddressSpace): Promise<ExtraDataTypeManager> {
     const addressSpacePriv: any = addressSpace as AddressSpacePrivate;
@@ -52,8 +53,43 @@ export async function ensureDatatypeExtracted(addressSpace: IAddressSpace): Prom
         dataTypeManager.setNamespaceArray(namespaceArray);
         addressSpacePriv.$$extraDataTypeManager = dataTypeManager;
 
+        const factories: DataTypeFactory[] = [getStandardDataTypeFactory()];
+
+        const priorityTable = constructNamespacePriorityTable(addressSpace).priorityTable;
+
         for (let namespaceIndex = 1; namespaceIndex < namespaceArray.length; namespaceIndex++) {
-            const dataTypeFactory1 = new DataTypeFactory([getStandardDataTypeFactory()]);
+
+            const namespace = addressSpace.getNamespace(namespaceIndex);
+         
+            if (false) {
+                console.log("namespaceIndex = ", namespaceIndex);
+                console.log("namespace = ", namespace.namespaceUri);
+                console.log("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) {
+                        console.log("namespaceIndex = ", namespaceIndex);
+                        console.log("namespace = ", namespace.namespaceUri);
+                        console.log("priorityTable", priorityTable);
+                        console.log(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);
+            // xx console.log("factories = ", factories.map((f) => f.targetNamespace).join(" "));
+
             dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
         }
         // inject simple types

package/source/loader/generateAddressSpaceRaw.ts

@@ -1,7 +1,7 @@
 import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
 import { CallbackT } from "node-opcua-status-code";
 import { IAddressSpace, RequiredModel } from "node-opcua-address-space-base";
-import { ReaderStateParserLike, Xml2Json } from "node-opcua-xml2json";
+import { ReaderStateParser, ReaderStateParserLike, Xml2Json } from "node-opcua-xml2json";
 import { getMinOPCUADate } from "node-opcua-date-time";
 import { adjustNamespaceArray } from "../../src/nodeset_tools/adjust_namespace_array";
 import { NodeSetLoaderOptions } from "../interfaces/nodeset_loader_options";
@@ -25,14 +25,14 @@ async function parseDependencies(xmlData: string): Promise<NodesetInfo> {
 
     const models: Model[] = [];
     let currentModel: Model | undefined = undefined;
-    const state0: ReaderStateParserLike = {
+    const state0: ReaderStateParser = {
         parser: {
             UANodeSet: {
                 parser: {
                     NamespaceUris: {
                         parser: {
-                            Uri: {
-                                finish() {
+                            Uri: <ReaderStateParserLike & { text: string }>{
+                                finish(this: ReaderStateParserLike & {text: string}) {
                                     namespaceUris.push(this.text);
                                 }
                             }