node-opcua-address-space 2.138.0 → 2.139.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.138.0",
+    "version": "2.139.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -12,7 +12,7 @@
         "test": "mocha",
         "lint": "eslint source test src source_nodejs test_helpers",
         "format": "prettier --write source test src source_nodejs test_helpers",
-        "clean": "npx rimraf node_modules dist *.tsbuildinfo",
+        "clean": "npx rimraf -g node_modules dist *.tsbuildinfo",
         "c": "mocha --version"
     },
     "dependencies": {
@@ -22,48 +22,48 @@
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.138.0",
-        "node-opcua-assert": "2.120.0",
-        "node-opcua-basic-types": "2.134.0",
-        "node-opcua-binary-stream": "2.133.0",
-        "node-opcua-client-dynamic-extension-object": "2.138.0",
-        "node-opcua-constants": "2.125.0",
-        "node-opcua-crypto": "4.12.0",
-        "node-opcua-data-access": "2.137.0",
-        "node-opcua-data-model": "2.137.0",
-        "node-opcua-data-value": "2.137.0",
-        "node-opcua-date-time": "2.134.0",
-        "node-opcua-debug": "2.133.0",
-        "node-opcua-enum": "2.133.0",
-        "node-opcua-extension-object": "2.137.0",
-        "node-opcua-factory": "2.137.0",
-        "node-opcua-nodeid": "2.133.0",
-        "node-opcua-nodeset-ua": "2.138.0",
-        "node-opcua-numeric-range": "2.137.0",
-        "node-opcua-object-registry": "2.133.0",
-        "node-opcua-pseudo-session": "2.138.0",
-        "node-opcua-service-browse": "2.137.0",
-        "node-opcua-service-call": "2.137.0",
-        "node-opcua-service-history": "2.137.0",
-        "node-opcua-service-translate-browse-path": "2.137.0",
-        "node-opcua-service-write": "2.137.0",
-        "node-opcua-status-code": "2.133.0",
-        "node-opcua-types": "2.137.0",
-        "node-opcua-utils": "2.133.0",
-        "node-opcua-variant": "2.137.0",
-        "node-opcua-xml2json": "2.137.0",
+        "node-opcua-address-space-base": "2.139.0",
+        "node-opcua-assert": "2.139.0",
+        "node-opcua-basic-types": "2.139.0",
+        "node-opcua-binary-stream": "2.139.0",
+        "node-opcua-client-dynamic-extension-object": "2.139.0",
+        "node-opcua-constants": "2.139.0",
+        "node-opcua-crypto": "4.15.0",
+        "node-opcua-data-access": "2.139.0",
+        "node-opcua-data-model": "2.139.0",
+        "node-opcua-data-value": "2.139.0",
+        "node-opcua-date-time": "2.139.0",
+        "node-opcua-debug": "2.139.0",
+        "node-opcua-enum": "2.139.0",
+        "node-opcua-extension-object": "2.139.0",
+        "node-opcua-factory": "2.139.0",
+        "node-opcua-nodeid": "2.139.0",
+        "node-opcua-nodeset-ua": "2.139.0",
+        "node-opcua-numeric-range": "2.139.0",
+        "node-opcua-object-registry": "2.139.0",
+        "node-opcua-pseudo-session": "2.139.0",
+        "node-opcua-service-browse": "2.139.0",
+        "node-opcua-service-call": "2.139.0",
+        "node-opcua-service-history": "2.139.0",
+        "node-opcua-service-translate-browse-path": "2.139.0",
+        "node-opcua-service-write": "2.139.0",
+        "node-opcua-status-code": "2.139.0",
+        "node-opcua-types": "2.139.0",
+        "node-opcua-utils": "2.139.0",
+        "node-opcua-variant": "2.139.0",
+        "node-opcua-xml2json": "2.139.0",
         "semver": "^7.6.3",
         "set-prototype-of": "^1.0.0",
         "thenify": "^3.3.1",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
-        "node-opcua-benchmarker": "2.133.0",
-        "node-opcua-leak-detector": "2.133.0",
-        "node-opcua-nodesets": "2.137.0",
-        "node-opcua-packet-analyzer": "2.137.0",
-        "node-opcua-service-filter": "2.138.0",
-        "node-opcua-test-fixtures": "2.137.0",
+        "node-opcua-benchmarker": "2.139.0",
+        "node-opcua-leak-detector": "2.139.0",
+        "node-opcua-nodesets": "2.139.0",
+        "node-opcua-packet-analyzer": "2.139.0",
+        "node-opcua-service-filter": "2.139.0",
+        "node-opcua-test-fixtures": "2.139.0",
         "source-map-support": "^0.5.21"
     },
     "author": "Etienne Rossignon",
@@ -81,7 +81,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "383bbe814f9261b2bc01a5d0fe476813153bb110",
+    "gitHead": "b7a01d31c7602d323e60a5f4a54428199a266f29",
     "files": [
         "dist",
         "distHelpers",

package/source/pseudo_session.ts

@@ -263,7 +263,7 @@ export class PseudoSession implements IBasicSession {
             }
             innerBrowseNext(
                 { continuationPointManager: this.continuationPointManager },
-                continuationPoints,
+                continuationPoints as Buffer[],
                 releaseContinuationPoints,
                 callback
             );

package/src/nodeid_manager.ts

@@ -20,50 +20,27 @@ function isValidNodeClass(nodeClass: NodeClass) {
 
 const regExp1 = /^(s|i|b|g)=/;
 const regExp2 = /^ns=[0-9]+;(s|i|b|g)=/;
-const hasPropertyRefId = resolveNodeId("HasProperty");
-const hasComponentRefId = resolveNodeId("HasComponent");
-const hasOrderedComponentRefId = resolveNodeId("HasOrderedComponent");
-const hasAddIn = resolveNodeId("HasAddIn");
 const hasEncoding = resolveNodeId("HasEncoding");
 
 type Suffix = string;
 
-// function _identifyParentInReference(references: UAReference[]): [NodeId, Suffix] | null {
-//     const candidates = references.filter((r: UAReference) => {
-//         return (
-//             !r.isForward &&
-//             (sameNodeId(r.referenceType, hasComponentRefId) ||
-//                 sameNodeId(r.referenceType, hasOrderedComponentRefId) ||
-//                 sameNodeId(r.referenceType, hasPropertyRefId) ||
-//                 sameNodeId(r.referenceType, hasEncoding) ||
-//                 sameNodeId(r.referenceType, hasAddIn))
-//         );
-//     });
-//     assert(candidates.length <= 1);
-//     if (candidates.length === 0) {
-//         return null;
-//     }
-//     const ref = candidates[0];
-//     if (sameNodeId(ref.referenceType, hasEncoding)) {
-//         return [ref.nodeId, "_Encoding"];
-//     }
-//     return [ref.nodeId, ""];
-// }
-
-function checkAggregate(addressSpace: AddressSpacePartial, reference: UAReference, refType: UAReferenceType): boolean {
-    const r = resolveReferenceType(addressSpace, reference);
-    if (!r) {
-        return false;
-    }
-    return r.isSubtypeOf(refType)
-}
 function _filterAggregates(addressSpace: AddressSpacePartial, references: UAReference[]): [NodeId, Suffix] | null {
 
-    const aggregates = addressSpace.findNode(resolveNodeId("Aggregates")) as UAReferenceType;
-    
-    const candidates = references.filter((r: UAReference) =>
-        !r.isForward && checkAggregate(addressSpace, r, aggregates)
-    );
+    const aggregatesRefType = addressSpace.findNode(resolveNodeId("Aggregates")) as UAReferenceType;
+    const hasEncodinRefType = addressSpace.findNode(resolveNodeId("HasEncoding")) as UAReferenceType;
+
+    const checkAggregate = (
+        reference: UAReference,
+    ): boolean => {
+        if (reference.isForward) return false;
+        const r = resolveReferenceType(addressSpace, reference);
+        if (!r) {
+            return false;
+        }
+        return r.isSubtypeOf(aggregatesRefType) || r.isSubtypeOf(hasEncodinRefType)
+    }
+
+    const candidates = references.filter(checkAggregate);
 
     assert(candidates.length <= 1, "a node shall not have more than one parent (link to a parent with a reference derived from 'Aggregates')");
     if (candidates.length === 0) {

package/dist/src/ua_addin.d.ts

@@ -1,11 +0,0 @@
-import { ModellingRuleType, UAObject, UAObjectType, UAVariableT } from "node-opcua-address-space-base";
-import { DataType } from "node-opcua-basic-types";
-import { QualifiedName, QualifiedNameLike } from "node-opcua-data-model";
-export interface InstantiateAddInOptions {
-    defaultName?: QualifiedNameLike;
-    modellingRule?: ModellingRuleType;
-    addInOf: UAObject | UAObjectType;
-    copyAlsoModellingRules?: boolean;
-}
-export declare function instantiateAddIn(objectType: UAObjectType, options: InstantiateAddInOptions): UAObject;
-export declare function addDefaultInstanceBrowseName(objectType: UAObjectType): UAVariableT<QualifiedName, DataType.QualifiedName>;

package/dist/src/ua_addin.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDefaultInstanceBrowseName = exports.instantiateAddIn = void 0;
-const node_opcua_basic_types_1 = require("node-opcua-basic-types");
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-function instantiateAddIn(objectType, options) {
-    let defaultName = options.defaultName;
-    // check that objectType has he shape of an addInd
-    const defaultInstanceBrowseName = objectType.getPropertyByName("DefaultInstanceBrowseName");
-    if (!defaultInstanceBrowseName) {
-        throw new Error("objectType must have a DefaultInstanceBrowseName property");
-    }
-    const browseName = (0, node_opcua_data_model_1.coerceQualifiedName)(defaultName || defaultInstanceBrowseName.readValue().value.value);
-    const addIn = objectType.instantiate({
-        browseName: browseName,
-        modellingRule: options.modellingRule,
-        namespace: objectType.namespace,
-        copyAlsoModellingRules: options.copyAlsoModellingRules,
-    });
-    options.addInOf.addReference({
-        referenceType: "HasAddIn",
-        nodeId: addIn.nodeId
-    });
-    return addIn;
-}
-exports.instantiateAddIn = instantiateAddIn;
-function addDefaultInstanceBrowseName(objectType) {
-    const namespace1 = objectType.namespace;
-    const uaVaraible = namespace1.addVariable({
-        browseName: (0, node_opcua_data_model_1.coerceQualifiedName)({ name: "DefaultInstanceBrowseName", namespaceIndex: 0 }),
-        propertyOf: objectType,
-        typeDefinition: "PropertyType",
-        dataType: node_opcua_basic_types_1.DataType.QualifiedName,
-        value: {
-            dataType: node_opcua_basic_types_1.DataType.QualifiedName,
-            value: { namespaceIndex: namespace1.index, name: "JobManager" }
-        },
-        modellingRule: null
-    });
-    return uaVaraible;
-}
-exports.addDefaultInstanceBrowseName = addDefaultInstanceBrowseName;
-//# sourceMappingURL=ua_addin.js.map

package/dist/src/ua_addin.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ua_addin.js","sourceRoot":"","sources":["../../src/ua_addin.ts"],"names":[],"mappings":";;;AACA,mEAAkD;AAClD,iEAA8F;AAS9F,SAAgB,gBAAgB,CAAC,UAAwB,EAAE,OAAgC;IAEvF,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IACtC,kDAAkD;IAClD,MAAM,yBAAyB,GAAG,UAAU,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,CAAC;IAC5F,IAAI,CAAC,yBAAyB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;KAChF;IAED,MAAM,UAAU,GAAG,IAAA,2CAAmB,EAAC,WAAW,IAAI,yBAAyB,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,KAAsB,CAAC,CAAC;IAC1H,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC;QACjC,UAAU,EAAE,UAAU;QACtB,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,SAAS,EAAE,UAAU,CAAC,SAAS;QAC/B,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;KACzD,CAAC,CAAC;IACH,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;QACzB,aAAa,EAAE,UAAU;QACzB,MAAM,EAAE,KAAK,CAAC,MAAM;KACvB,CAAC,CAAA;IACF,OAAO,KAAK,CAAC;AACjB,CAAC;AArBD,4CAqBC;AAED,SAAgB,4BAA4B,CAAC,UAAwB;IAEjE,MAAM,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC;IACxC,MAAM,UAAU,GAAG,UAAU,CAAC,WAAW,CAAC;QACtC,UAAU,EAAE,IAAA,2CAAmB,EAAC,EAAE,IAAI,EAAE,2BAA2B,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC;QACzF,UAAU,EAAE,UAAU;QACtB,cAAc,EAAE,cAAc;QAC9B,QAAQ,EAAE,iCAAQ,CAAC,aAAa;QAChC,KAAK,EAAE;YACH,QAAQ,EAAE,iCAAQ,CAAC,aAAa;YAChC,KAAK,EAAE,EAAE,cAAc,EAAE,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE;SAClE;QACD,aAAa,EAAE,IAAI;KACtB,CAAC,CAAC;IACH,OAAO,UAAgE,CAAC;AAE5E,CAAC;AAhBD,oEAgBC"}