opcjs-base 0.1.26-alpha → 0.1.29-alpha

package/dist/index.d.cts

@@ -107,7 +107,7 @@ declare class NodeId {
 /**
  * OPC UA ExpandedNodeId Type
  *
- * ExpandedNodeId extends NodeId with optional server identification,
+ * ExpandedNodeId wraps a NodeId with optional server identification,
  * allowing nodes to be identified across multiple servers.
  *
  * @module expanded-nodeid
@@ -116,41 +116,38 @@ declare class NodeId {
 /**
  * OPC UA ExpandedNodeId
  *
- * An ExpandedNodeId extends NodeId with optional server identification,
+ * An ExpandedNodeId wraps a NodeId with optional server identification,
  * allowing nodes to be identified across multiple servers.
  *
  * @example
  * ```typescript
  * import { ExpandedNodeId } from '@opcua/types';
  *
- * const expandedNodeId = new ExpandedNodeId(2, 123, "http://opcfoundation.org/UA/", 1);
+ * const expandedNodeId = new ExpandedNodeId(
+ *   new NodeId(2, 123),
+ *   'http://opcfoundation.org/UA/',
+ *   1,
+ * );
  * console.log(expandedNodeId.toString());
  * // "svr=1;nsu=http://opcfoundation.org/UA/;ns=2;i=123"
  * ```
  */
-declare class ExpandedNodeId extends NodeId {
-    /**
-     * The server index (optional, for cross-server references)
-     */
+declare class ExpandedNodeId {
+    /** The wrapped NodeId. */
+    readonly nodeId: NodeId;
+    /** The server index (optional, for cross-server references). */
     readonly serverIndex?: number;
-    /**
-     * The namespace URI (optional, alternative to namespace index)
-     */
+    /** The namespace URI (optional, alternative to the namespace index on nodeId). */
     readonly namespaceUri?: string;
     /**
-     * Create a new ExpandedNodeId
+     * Create a new ExpandedNodeId.
      *
-     * @param namespace - The namespace index
-     * @param identifier - The identifier
+     * @param nodeId - The wrapped NodeId
      * @param namespaceUri - Optional namespace URI
      * @param serverIndex - Optional server index
      */
-    constructor(namespace?: number, identifier?: number | string | Uint8Array, namespaceUri?: string, serverIndex?: number);
-    /**
-     * Convert ExpandedNodeId to string representation
-     *
-     * @returns String representation of the ExpandedNodeId
-     */
+    constructor(nodeId: NodeId, namespaceUri?: string, serverIndex?: number);
+    /** Convert ExpandedNodeId to string representation. */
     toString(): string;
 }
 
@@ -739,9 +736,9 @@ declare enum ExtensionObjectEncoding {
  */
 declare class ExtensionObject {
     /**
-     * The NodeId that identifies the type of structure encoded in the body.
+     * The NodeId (or ExpandedNodeId) that identifies the type of structure encoded in the body.
      */
-    readonly typeId: NodeId;
+    readonly typeId: NodeId | ExpandedNodeId;
     /**
      * The encoding used for the body.
      */
@@ -760,7 +757,7 @@ declare class ExtensionObject {
      * @param encoding - The encoding type
      * @param body - The encoded body (null for None encoding)
      */
-    constructor(typeId: NodeId, encoding?: ExtensionObjectEncoding, data?: IOpcType);
+    constructor(typeId: NodeId | ExpandedNodeId, encoding?: ExtensionObjectEncoding, data?: IOpcType);
     /**
      * Creates an ExtensionObject with no body.
      *
@@ -783,7 +780,7 @@ declare class ExtensionObject {
      * @param body - The XML encoded body
      * @returns A new ExtensionObject with Xml encoding
      */
-    static newXml(typeId: NodeId, data: IOpcType): ExtensionObject;
+    static newXml(typeId: NodeId | ExpandedNodeId, data: IOpcType): ExtensionObject;
 }
 
 /**

package/dist/index.d.ts

@@ -107,7 +107,7 @@ declare class NodeId {
 /**
  * OPC UA ExpandedNodeId Type
  *
- * ExpandedNodeId extends NodeId with optional server identification,
+ * ExpandedNodeId wraps a NodeId with optional server identification,
  * allowing nodes to be identified across multiple servers.
  *
  * @module expanded-nodeid
@@ -116,41 +116,38 @@ declare class NodeId {
 /**
  * OPC UA ExpandedNodeId
  *
- * An ExpandedNodeId extends NodeId with optional server identification,
+ * An ExpandedNodeId wraps a NodeId with optional server identification,
  * allowing nodes to be identified across multiple servers.
  *
  * @example
  * ```typescript
  * import { ExpandedNodeId } from '@opcua/types';
  *
- * const expandedNodeId = new ExpandedNodeId(2, 123, "http://opcfoundation.org/UA/", 1);
+ * const expandedNodeId = new ExpandedNodeId(
+ *   new NodeId(2, 123),
+ *   'http://opcfoundation.org/UA/',
+ *   1,
+ * );
  * console.log(expandedNodeId.toString());
  * // "svr=1;nsu=http://opcfoundation.org/UA/;ns=2;i=123"
  * ```
  */
-declare class ExpandedNodeId extends NodeId {
-    /**
-     * The server index (optional, for cross-server references)
-     */
+declare class ExpandedNodeId {
+    /** The wrapped NodeId. */
+    readonly nodeId: NodeId;
+    /** The server index (optional, for cross-server references). */
     readonly serverIndex?: number;
-    /**
-     * The namespace URI (optional, alternative to namespace index)
-     */
+    /** The namespace URI (optional, alternative to the namespace index on nodeId). */
     readonly namespaceUri?: string;
     /**
-     * Create a new ExpandedNodeId
+     * Create a new ExpandedNodeId.
      *
-     * @param namespace - The namespace index
-     * @param identifier - The identifier
+     * @param nodeId - The wrapped NodeId
      * @param namespaceUri - Optional namespace URI
      * @param serverIndex - Optional server index
      */
-    constructor(namespace?: number, identifier?: number | string | Uint8Array, namespaceUri?: string, serverIndex?: number);
-    /**
-     * Convert ExpandedNodeId to string representation
-     *
-     * @returns String representation of the ExpandedNodeId
-     */
+    constructor(nodeId: NodeId, namespaceUri?: string, serverIndex?: number);
+    /** Convert ExpandedNodeId to string representation. */
     toString(): string;
 }
 
@@ -739,9 +736,9 @@ declare enum ExtensionObjectEncoding {
  */
 declare class ExtensionObject {
     /**
-     * The NodeId that identifies the type of structure encoded in the body.
+     * The NodeId (or ExpandedNodeId) that identifies the type of structure encoded in the body.
      */
-    readonly typeId: NodeId;
+    readonly typeId: NodeId | ExpandedNodeId;
     /**
      * The encoding used for the body.
      */
@@ -760,7 +757,7 @@ declare class ExtensionObject {
      * @param encoding - The encoding type
      * @param body - The encoded body (null for None encoding)
      */
-    constructor(typeId: NodeId, encoding?: ExtensionObjectEncoding, data?: IOpcType);
+    constructor(typeId: NodeId | ExpandedNodeId, encoding?: ExtensionObjectEncoding, data?: IOpcType);
     /**
      * Creates an ExtensionObject with no body.
      *
@@ -783,7 +780,7 @@ declare class ExtensionObject {
      * @param body - The XML encoded body
      * @returns A new ExtensionObject with Xml encoding
      */
-    static newXml(typeId: NodeId, data: IOpcType): ExtensionObject;
+    static newXml(typeId: NodeId | ExpandedNodeId, data: IOpcType): ExtensionObject;
 }
 
 /**

package/dist/index.js

@@ -1,5 +1,39 @@
 import { XMLParser } from 'fast-xml-parser';
 
+// src/types/expandedNodeId.ts
+var ExpandedNodeId = class {
+  /** The wrapped NodeId. */
+  nodeId;
+  /** The server index (optional, for cross-server references). */
+  serverIndex;
+  /** The namespace URI (optional, alternative to the namespace index on nodeId). */
+  namespaceUri;
+  /**
+   * Create a new ExpandedNodeId.
+   *
+   * @param nodeId - The wrapped NodeId
+   * @param namespaceUri - Optional namespace URI
+   * @param serverIndex - Optional server index
+   */
+  constructor(nodeId, namespaceUri, serverIndex) {
+    this.nodeId = nodeId;
+    this.namespaceUri = namespaceUri;
+    this.serverIndex = serverIndex;
+  }
+  /** Convert ExpandedNodeId to string representation. */
+  toString() {
+    let result = "";
+    if (this.serverIndex !== void 0) {
+      result += `svr=${this.serverIndex};`;
+    }
+    if (this.namespaceUri !== void 0) {
+      result += `nsu=${this.namespaceUri};`;
+    }
+    result += this.nodeId.toString();
+    return result;
+  }
+};
+
 // src/types/nodeId.ts
 var NodeIdType = /* @__PURE__ */ ((NodeIdType2) => {
   NodeIdType2[NodeIdType2["Numeric"] = 0] = "Numeric";
@@ -170,47 +204,6 @@ var NodeId = class _NodeId {
   }
 };
 
-// src/types/expandedNodeId.ts
-var ExpandedNodeId = class extends NodeId {
-  /**
-   * The server index (optional, for cross-server references)
-   */
-  serverIndex;
-  /**
-   * The namespace URI (optional, alternative to namespace index)
-   */
-  namespaceUri;
-  /**
-   * Create a new ExpandedNodeId
-   * 
-   * @param namespace - The namespace index
-   * @param identifier - The identifier
-   * @param namespaceUri - Optional namespace URI
-   * @param serverIndex - Optional server index
-   */
-  constructor(namespace = 0, identifier = 0, namespaceUri, serverIndex) {
-    super(namespace, identifier);
-    this.namespaceUri = namespaceUri;
-    this.serverIndex = serverIndex;
-  }
-  /**
-   * Convert ExpandedNodeId to string representation
-   * 
-   * @returns String representation of the ExpandedNodeId
-   */
-  toString() {
-    let result = "";
-    if (this.serverIndex !== void 0) {
-      result += `svr=${this.serverIndex};`;
-    }
-    if (this.namespaceUri !== void 0) {
-      result += `nsu=${this.namespaceUri};`;
-    }
-    result += super.toString();
-    return result;
-  }
-};
-
 // src/codecs/encoder.ts
 var Encoder = class {
   encoders = /* @__PURE__ */ new Map();
@@ -228,7 +221,7 @@ var Encoder = class {
     }
     const writer = writerFactory();
     const encodingId = value.getBinaryEncodingId();
-    const eid = new ExpandedNodeId(0, encodingId);
+    const eid = new ExpandedNodeId(new NodeId(0, encodingId));
     writer.writeExpandedNodeId(eid);
     const typeId = value.getTypeId();
     const encodingFunction = this.encoders.get(typeId);
@@ -275,7 +268,7 @@ var Decoder = class {
     }
     const reader = readerFactory(data);
     const eid = reader.readExpandedNodeId();
-    return this.decodeWithEncodingId(eid.identifier, reader);
+    return this.decodeWithEncodingId(eid.nodeId.identifier, reader);
   }
   decodeWithEncodingId(encodingId, reader) {
     const decodingInfo = this.encodingIdMap.get(encodingId);
@@ -491,7 +484,7 @@ function decodeExpandedNodeId(reader) {
   if (hasServerIndex) {
     serverIndex = reader.readUInt32();
   }
-  return new ExpandedNodeId(nodeId.namespace, nodeId.identifier, namespaceUri, serverIndex);
+  return new ExpandedNodeId(nodeId, namespaceUri, serverIndex);
 }
 function encodeExpandedNodeId(writer, value) {
   let extraFlags = 0;
@@ -502,9 +495,9 @@ function encodeExpandedNodeId(writer, value) {
     extraFlags |= ExpandedNodeIdMask.ServerIndexFlag;
   }
   if (extraFlags === 0) {
-    encodeNodeId(writer, value);
+    encodeNodeId(writer, value.nodeId);
   } else {
-    encodeNodeIdWithExtraFlags(writer, value, extraFlags);
+    encodeNodeIdWithExtraFlags(writer, value.nodeId, extraFlags);
   }
   if (value.namespaceUri !== void 0) {
     writer.writeString(value.namespaceUri);
@@ -725,7 +718,7 @@ function encodeLocalizedText(writer, value) {
 // src/types/extensionObject.ts
 var ExtensionObject = class _ExtensionObject {
   /**
-   * The NodeId that identifies the type of structure encoded in the body.
+   * The NodeId (or ExpandedNodeId) that identifies the type of structure encoded in the body.
    */
   typeId;
   /**
@@ -1054,7 +1047,7 @@ function decodeExtensionObject(reader, decoder) {
 }
 function encodeExtensionObject(writer, value, encoder) {
   const typeId = value.typeId;
-  if ("namespaceUri" in typeId || "serverIndex" in typeId) {
+  if (typeId instanceof ExpandedNodeId) {
     encodeExpandedNodeId(writer, typeId);
   } else {
     encodeNodeId(writer, typeId);
@@ -1370,7 +1363,7 @@ function StatusCodeToString(statusCode) {
   if (statusCode === void 0) {
     return "Unknown";
   }
-  const baseCode = statusCode & 4294901760;
+  const baseCode = (statusCode & 4294901760) >>> 0;
   const name = Object.entries(StatusCode).find(([, v]) => v === baseCode)?.[0];
   return name ?? `0x${baseCode.toString(16).toUpperCase().padStart(8, "0")}`;
 }
@@ -1393,7 +1386,7 @@ function StatusCodeGetFlagBits(statusCode) {
   };
 }
 function StatusCodeIs(statusCode, expected) {
-  return (statusCode & 4294901760) === expected;
+  return (statusCode & 4294901760) >>> 0 === expected;
 }
 
 // src/types/dataValue.ts