node-opcua-modeler 2.76.0 → 2.77.0

package/distNodeJS/build_model.d.ts

@@ -1,7 +1,7 @@
-import { BuildModelOptionsBase } from "..";
-import { Symbols } from "..";
-export declare function buildModel(data: BuildModelOptionsBase): Promise<{
-    markdown: string;
-    xmlModel: string;
-    symbols: Symbols;
-}>;
+import { BuildModelOptionsBase } from "..";
+import { Symbols } from "..";
+export declare function buildModel(data: BuildModelOptionsBase): Promise<{
+    markdown: string;
+    xmlModel: string;
+    symbols: Symbols;
+}>;

package/distNodeJS/build_model.js

@@ -1,22 +1,22 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildModel = void 0;
-const nodeJS_1 = require("node-opcua-address-space/nodeJS");
-const __1 = require("..");
-function buildModel(data) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const option1 = Object.assign(Object.assign({}, data), { xmlLoader: nodeJS_1.readNodeSet2XmlFile });
-        return (0, __1.buildModelInner)(option1);
-    });
-}
-exports.buildModel = buildModel;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildModel = void 0;
+const nodeJS_1 = require("node-opcua-address-space/nodeJS");
+const __1 = require("..");
+function buildModel(data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const option1 = Object.assign(Object.assign({}, data), { xmlLoader: nodeJS_1.readNodeSet2XmlFile });
+        return (0, __1.buildModelInner)(option1);
+    });
+}
+exports.buildModel = buildModel;
 //# sourceMappingURL=build_model.js.map

package/distNodeJS/index.d.ts

@@ -1,5 +1,5 @@
-export * from "./symbol_cvs";
-export * from "./build_model";
-export * from "./build_documentation_to_file";
-export * from "..";
-export { generateAddressSpace } from "node-opcua-address-space/nodeJS";
+export * from "./symbol_cvs";
+export * from "./build_model";
+export * from "./build_documentation_to_file";
+export * from "..";
+export { generateAddressSpace } from "node-opcua-address-space/nodeJS";

package/distNodeJS/index.js

@@ -1,24 +1,24 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateAddressSpace = void 0;
-__exportStar(require("./symbol_cvs"), exports);
-__exportStar(require("./build_model"), exports);
-__exportStar(require("./build_documentation_to_file"), exports);
-__exportStar(require(".."), exports);
-var nodeJS_1 = require("node-opcua-address-space/nodeJS");
-Object.defineProperty(exports, "generateAddressSpace", { enumerable: true, get: function () { return nodeJS_1.generateAddressSpace; } });
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateAddressSpace = void 0;
+__exportStar(require("./symbol_cvs"), exports);
+__exportStar(require("./build_model"), exports);
+__exportStar(require("./build_documentation_to_file"), exports);
+__exportStar(require(".."), exports);
+var nodeJS_1 = require("node-opcua-address-space/nodeJS");
+Object.defineProperty(exports, "generateAddressSpace", { enumerable: true, get: function () { return nodeJS_1.generateAddressSpace; } });
 //# sourceMappingURL=index.js.map

package/distNodeJS/symbol_cvs.d.ts

@@ -1,3 +1,3 @@
-import { Symbols } from "..";
-export declare function saveSymbolsToCSV(csvFilename: string, symbols: Symbols): Promise<void>;
-export declare function getPresetSymbolsFromCSV(csvFilename: string): Promise<Symbols>;
+import { Symbols } from "..";
+export declare function saveSymbolsToCSV(csvFilename: string, symbols: Symbols): Promise<void>;
+export declare function getPresetSymbolsFromCSV(csvFilename: string): Promise<Symbols>;

package/distNodeJS/symbol_cvs.js

@@ -1,64 +1,64 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPresetSymbolsFromCSV = exports.saveSymbolsToCSV = void 0;
-const fs = require("fs");
-const csv_parse_1 = require("csv-parse");
-const __1 = require("..");
-// node 14 onward : import { readFile, writeFile } from "fs/promises";
-const { readFile, writeFile } = fs.promises;
-function saveSymbolsToCSV(csvFilename, symbols) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield writeFile(csvFilename, (0, __1.toCSV)(symbols), "utf-8");
-    });
-}
-exports.saveSymbolsToCSV = saveSymbolsToCSV;
-function getPresetSymbolsFromCSV(csvFilename) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!fs.existsSync(csvFilename)) {
-            return [];
-        }
-        try {
-            const data = yield readFile(csvFilename, "utf-8");
-            const records = yield new Promise((resolve) => {
-                const output = [];
-                (0, csv_parse_1.parse)(data, {
-                    cast: (value, context) => {
-                        if (context.index === 1) {
-                            return parseInt(value, 10);
-                        }
-                        return value;
-                    }
-                })
-                    .on("readable", function () {
-                    let record = this.read();
-                    while (record) {
-                        output.push(record);
-                        record = this.read();
-                    }
-                })
-                    .on("end", () => {
-                    resolve(output);
-                });
-            });
-            return records;
-        }
-        catch (err) {
-            if (err instanceof Error) {
-                // tslint:disable-next-line: no-console
-                console.log("getPresetSymbols err = ", err.message);
-            }
-            return [];
-        }
-    });
-}
-exports.getPresetSymbolsFromCSV = getPresetSymbolsFromCSV;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPresetSymbolsFromCSV = exports.saveSymbolsToCSV = void 0;
+const fs = require("fs");
+const csv_parse_1 = require("csv-parse");
+const __1 = require("..");
+// node 14 onward : import { readFile, writeFile } from "fs/promises";
+const { readFile, writeFile } = fs.promises;
+function saveSymbolsToCSV(csvFilename, symbols) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield writeFile(csvFilename, (0, __1.toCSV)(symbols), "utf-8");
+    });
+}
+exports.saveSymbolsToCSV = saveSymbolsToCSV;
+function getPresetSymbolsFromCSV(csvFilename) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!fs.existsSync(csvFilename)) {
+            return [];
+        }
+        try {
+            const data = yield readFile(csvFilename, "utf-8");
+            const records = yield new Promise((resolve) => {
+                const output = [];
+                (0, csv_parse_1.parse)(data, {
+                    cast: (value, context) => {
+                        if (context.index === 1) {
+                            return parseInt(value, 10);
+                        }
+                        return value;
+                    }
+                })
+                    .on("readable", function () {
+                    let record = this.read();
+                    while (record) {
+                        output.push(record);
+                        record = this.read();
+                    }
+                })
+                    .on("end", () => {
+                    resolve(output);
+                });
+            });
+            return records;
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                // tslint:disable-next-line: no-console
+                console.log("getPresetSymbols err = ", err.message);
+            }
+            return [];
+        }
+    });
+}
+exports.getPresetSymbolsFromCSV = getPresetSymbolsFromCSV;
 //# sourceMappingURL=symbol_cvs.js.map

package/package.json

@@ -1,39 +1,39 @@
 {
     "name": "node-opcua-modeler",
-    "version": "2.76.0",
+    "version": "2.77.0",
     "description": "pure nodejs OPCUA SDK - module - model",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
         "build": "tsc -b",
-        "clean": "npx rimraf dist *.tsbuildinfo",
+        "clean": "npx rimraf node_modules dist *.tsbuildinfo",
         "test": "mocha"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
     "dependencies": {
         "cli-table3": "^0.6.2",
-        "csv-parse": "5.2.0",
-        "node-opcua-address-space": "2.76.0",
-        "node-opcua-assert": "2.76.0",
-        "node-opcua-basic-types": "2.76.0",
-        "node-opcua-client-dynamic-extension-object": "2.76.0",
-        "node-opcua-constants": "2.74.0",
-        "node-opcua-data-model": "2.76.0",
-        "node-opcua-debug": "2.76.0",
-        "node-opcua-factory": "2.76.0",
-        "node-opcua-nodeid": "2.76.0",
-        "node-opcua-nodesets": "2.74.0",
-        "node-opcua-numeric-range": "2.76.0",
-        "node-opcua-schemas": "2.76.0",
-        "node-opcua-service-translate-browse-path": "2.76.0",
-        "node-opcua-status-code": "2.76.0",
-        "node-opcua-types": "2.76.0",
-        "node-opcua-variant": "2.76.0",
+        "csv-parse": "5.3.0",
+        "node-opcua-address-space": "2.77.0",
+        "node-opcua-assert": "2.77.0",
+        "node-opcua-basic-types": "2.77.0",
+        "node-opcua-client-dynamic-extension-object": "2.77.0",
+        "node-opcua-constants": "2.77.0",
+        "node-opcua-data-model": "2.77.0",
+        "node-opcua-debug": "2.77.0",
+        "node-opcua-factory": "2.77.0",
+        "node-opcua-nodeid": "2.77.0",
+        "node-opcua-nodesets": "2.77.0",
+        "node-opcua-numeric-range": "2.77.0",
+        "node-opcua-schemas": "2.77.0",
+        "node-opcua-service-translate-browse-path": "2.77.0",
+        "node-opcua-status-code": "2.77.0",
+        "node-opcua-types": "2.77.0",
+        "node-opcua-variant": "2.77.0",
         "yargs": "15.4.1"
     },
     "devDependencies": {
-        "node-opcua-leak-detector": "2.76.0",
+        "node-opcua-leak-detector": "2.77.0",
         "should": "^13.2.3",
         "sinon": "^14.0.0"
     },
@@ -50,5 +50,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "75d9b8cf894c8fbadf77d2c4a48a730d055465e7"
+    "gitHead": "5c8d45772d786fa4ba59369dd26679353ab5482b"
 }

package/source/addExtensionObjectDataType.ts

@@ -72,10 +72,12 @@ export async function addExtensionObjectDataType(namespace: Namespace, options:
         ? resolveNodeId(structureDefinition.baseDataType)
         : resolveNodeId("Structure");
 
+    const isAbstract = options.isAbstract || false;
+
     const dataType = namespace.createDataType({
         browseName: options.browseName,
         description: options.description,
-        isAbstract: options.isAbstract,
+        isAbstract,
         subtypeOf
     });
 
@@ -104,6 +106,7 @@ export async function addExtensionObjectDataType(namespace: Namespace, options:
         className,
         dataType.getStructureDefinition(),
         dataTypeFactory,
+        isAbstract,
         cache
     );
     const Constructor = createDynamicObjectConstructor(schema, dataTypeFactory) as ConstructorFuncWithSchema;

package/tsconfig_common.json

@@ -23,6 +23,17 @@
         {
             "path": "../node-opcua-constants"
         },
+        {
+            "path": "../node-opcua-factory"
+        },
+        
+        {
+            "path": "../node-opcua-schemas"
+        },
+        {
+            "path": "../node-opcua-status-code"
+        },
+        
         {
             "path": "../node-opcua-data-model"
         },
@@ -45,7 +56,7 @@
             "path": "../node-opcua-variant"
         },
         {
-            "path": "../node-opcua-xml2json"
+            "path": "../node-opcua-debug"
         },
         {
             "path": "../node-opcua-leak-detector"

package/MyModel.NodeSet2.xml

@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
-    <NamespaceUris>
-        <Uri>http://acme.com/Boiler/V0</Uri>
-        <Uri>http://opcfoundation.org/UA/DI/</Uri>
-    </NamespaceUris>
-    <Models/>
-    <Aliases>
-        <Alias Alias="2:DeviceHealthEnumeration">ns=2;i=6244</Alias>
-        <Alias Alias="Boolean">i=1</Alias>
-        <Alias Alias="DateTime">i=13</Alias>
-        <Alias Alias="HasComponent">i=47</Alias>
-        <Alias Alias="HasModellingRule">i=37</Alias>
-        <Alias Alias="HasProperty">i=46</Alias>
-        <Alias Alias="HasSubtype">i=45</Alias>
-        <Alias Alias="HasTypeDefinition">i=40</Alias>
-        <Alias Alias="IdType">i=256</Alias>
-        <Alias Alias="NumericRange">i=291</Alias>
-        <Alias Alias="Organizes">i=35</Alias>
-        <Alias Alias="String">i=12</Alias>
-    </Aliases>
-<!--ReferenceTypes-->
-<!--ObjectTypes-->
-<!--ObjectType - 1:BoilerType {{{{ -->
-    <UAObjectType NodeId="ns=1;i=1008" BrowseName="1:BoilerType">
-        <DisplayName>BoilerType</DisplayName>
-        <References>
-            <Reference ReferenceType="HasSubtype" IsForward="false">ns=2;i=1002</Reference>
-            <Reference ReferenceType="HasComponent">ns=1;i=1009</Reference>
-        </References>
-    </UAObjectType>
-    <UAVariable NodeId="ns=1;i=1009" BrowseName="2:DeviceHealth" DataType="2:DeviceHealthEnumeration">
-        <DisplayName>DeviceHealth</DisplayName>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=63</Reference>
-            <Reference ReferenceType="HasModellingRule">i=78</Reference>
-        </References>
-    </UAVariable>
-<!--ObjectType - 1:BoilerType }}}}-->
-<!--VariableTypes-->
-<!--Other Nodes-->
-<!-- StaticStringNodeIdPattern StaticNumericNodeIdRange StaticNodeIdTypes NamespaceVersion NamespaceUri NamespacePublicationDate IsNamespaceSubset http://acme.com/Boiler/V0 BoilerType DeviceHealth-->
-    <UAVariable NodeId="ns=1;i=1007" BrowseName="StaticStringNodeIdPattern" DataType="String">
-        <DisplayName>StaticStringNodeIdPattern</DisplayName>
-        <Description>A regular expression which matches string node ids are the same in every server that exposes them.</Description>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-            <Reference ReferenceType="HasModellingRule">i=78</Reference>
-        </References>
-    </UAVariable>
-    <UAVariable NodeId="ns=1;i=1006" BrowseName="StaticNumericNodeIdRange" ValueRank="1" DataType="NumericRange">
-        <DisplayName>StaticNumericNodeIdRange</DisplayName>
-        <Description>A list of ranges for numeric node ids which are the same in every server that exposes them.</Description>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-            <Reference ReferenceType="HasModellingRule">i=78</Reference>
-        </References>
-    </UAVariable>
-    <UAVariable NodeId="ns=1;i=1005" BrowseName="StaticNodeIdTypes" ValueRank="1" DataType="IdType">
-        <DisplayName>StaticNodeIdTypes</DisplayName>
-        <Description>A list of IdTypes for nodes which are the same in every server that exposes them.</Description>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-            <Reference ReferenceType="HasModellingRule">i=78</Reference>
-        </References>
-    </UAVariable>
-    <UAVariable NodeId="ns=1;i=1002" BrowseName="NamespaceVersion" DataType="String">
-        <DisplayName>NamespaceVersion</DisplayName>
-        <Description>The human readable string representing version of the namespace.</Description>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-            <Reference ReferenceType="HasModellingRule">i=78</Reference>
-        </References>
-        <Value>
-            <String>1.0.0</String>
-        </Value>
-    </UAVariable>
-    <UAVariable NodeId="ns=1;i=1001" BrowseName="NamespaceUri" DataType="String">
-        <DisplayName>NamespaceUri</DisplayName>
-        <Description>The URI of the namespace.</Description>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-            <Reference ReferenceType="HasModellingRule">i=78</Reference>
-        </References>
-        <Value>
-            <String>http://acme.com/Boiler/V0</String>
-        </Value>
-    </UAVariable>
-    <UAVariable NodeId="ns=1;i=1003" BrowseName="NamespacePublicationDate" DataType="DateTime">
-        <DisplayName>NamespacePublicationDate</DisplayName>
-        <Description>The publication date for the namespace.</Description>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-            <Reference ReferenceType="HasModellingRule">i=78</Reference>
-        </References>
-        <Value>
-            <DateTime>2020-01-16T10:11:59.351Z</DateTime>
-        </Value>
-    </UAVariable>
-    <UAVariable NodeId="ns=1;i=1004" BrowseName="IsNamespaceSubset" DataType="Boolean">
-        <DisplayName>IsNamespaceSubset</DisplayName>
-        <Description>If TRUE then the server only supports a subset of the namespace.</Description>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-            <Reference ReferenceType="HasModellingRule">i=78</Reference>
-        </References>
-    </UAVariable>
-<!--Object - 1:http://acme.com/Boiler/V0 {{{{ -->
-    <UAObject NodeId="ns=1;i=1000" BrowseName="1:http://acme.com/Boiler/V0">
-        <DisplayName>http://acme.com/Boiler/V0</DisplayName>
-        <Description>Provides the metadata for a namespace used by the server.</Description>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=11616</Reference>
-            <Reference ReferenceType="Organizes" IsForward="false">i=11715</Reference>
-            <Reference ReferenceType="HasProperty">ns=1;i=1001</Reference>
-            <Reference ReferenceType="HasProperty">ns=1;i=1002</Reference>
-            <Reference ReferenceType="HasProperty">ns=1;i=1003</Reference>
-            <Reference ReferenceType="HasProperty">ns=1;i=1004</Reference>
-            <Reference ReferenceType="HasProperty">ns=1;i=1005</Reference>
-            <Reference ReferenceType="HasProperty">ns=1;i=1006</Reference>
-            <Reference ReferenceType="HasProperty">ns=1;i=1007</Reference>
-        </References>
-    </UAObject>
-<!--Object - 1:http://acme.com/Boiler/V0 }}}} -->
-</UANodeSet>