node-opcua-convert-nodeset-to-javascript 2.97.0 → 2.98.2

package/dist/_dataType.d.ts

@@ -1,10 +1,10 @@
-import { NodeId } from "node-opcua-nodeid";
-import { IBasicSession } from "node-opcua-pseudo-session";
-import { LineFile } from "node-opcua-utils";
-import { Type } from "./convert_to_typescript";
-import { Cache } from "./private/cache";
-export declare function _exportDataTypeToTypescript(session: IBasicSession, nodeId: NodeId, cache: Cache, f?: LineFile): Promise<{
-    type: Type;
-    content: string;
-    typeName: string;
-}>;
+import { NodeId } from "node-opcua-nodeid";
+import { IBasicSession } from "node-opcua-pseudo-session";
+import { LineFile } from "node-opcua-utils";
+import { Type } from "./convert_to_typescript";
+import { Cache } from "./private/cache";
+export declare function _exportDataTypeToTypescript(session: IBasicSession, nodeId: NodeId, cache: Cache, f?: LineFile): Promise<{
+    type: Type;
+    content: string;
+    typeName: string;
+}>;

package/dist/_dataType.js

@@ -1,153 +1,153 @@
-"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._exportDataTypeToTypescript = void 0;
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const node_opcua_types_1 = require("node-opcua-types");
-const node_opcua_utils_1 = require("node-opcua-utils");
-const node_opcua_variant_1 = require("node-opcua-variant");
-const private_stuff_1 = require("./private-stuff");
-const cache_1 = require("./private/cache");
-const get_corresponding_data_type_1 = require("./private/get_corresponding_data_type");
-const utils2_1 = require("./utils2");
-// eslint-disable-next-line max-statements, complexity
-function _exportDataTypeToTypescript(session, nodeId, cache, f) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const importCollect = undefined;
-        const referenceBasicType = (name) => {
-            const t = { name, namespace: -1, module: "BasicType" };
-            importCollect && importCollect(t);
-            cache.ensureImported(t);
-            return t.name;
-        };
-        f = f || new node_opcua_utils_1.LineFile();
-        const importCollector = (i) => {
-            cache.ensureImported(i);
-        };
-        const nodeClass = node_opcua_data_model_1.NodeClass.DataType;
-        const description = yield (0, private_stuff_1.getDescription)(session, nodeId);
-        const definition = yield (0, private_stuff_1.getDefinition)(session, nodeId);
-        const browseName = yield (0, private_stuff_1.getBrowseName)(session, nodeId);
-        const isAbstract = yield (0, private_stuff_1.getIsAbstract)(session, nodeId);
-        const interfaceImport = (0, private_stuff_1.makeTypeNameNew)(nodeClass, definition, browseName);
-        const interfaceName = interfaceImport.name;
-        const superType = yield (0, private_stuff_1.getSubtypeNodeId)(session, nodeId);
-        const baseInterfaceImport = (0, private_stuff_1.makeTypeNameNew)(nodeClass, definition, superType.browseName);
-        cache.ensureImported(baseInterfaceImport);
-        const baseInterfaceName = baseInterfaceImport.name;
-        //  f.write(superType.toString());
-        f.write(`/**`);
-        if (description.text) {
-            f.write((0, utils2_1.toComment)(" * ", description.text || ""));
-            f.write(` *`);
-        }
-        f.write(` * |           |${(0, utils2_1.f1)(" ")}|`);
-        f.write(` * |-----------|${(0, utils2_1.f2)("-")}|`);
-        f.write(` * | namespace |${(0, utils2_1.f1)(cache.namespace[nodeId.namespace].namespaceUri)}|`);
-        f.write(` * | nodeClass |${(0, utils2_1.f1)(node_opcua_data_model_1.NodeClass[nodeClass])}|`);
-        f.write(` * | name      |${(0, utils2_1.f1)(browseName.toString())}|`);
-        f.write(` * | isAbstract|${(0, utils2_1.f1)(isAbstract.toString())}|`);
-        f.write(` */`);
-        let type = "basic";
-        if (definition instanceof node_opcua_types_1.EnumDefinition) {
-            type = "enum";
-            f.write(`export enum ${interfaceName}  {`);
-            for (const field of definition.fields) {
-                if (field.description.text) {
-                    f.write(`  /**`);
-                    f.write((0, utils2_1.toComment)("   * ", field.description.text || ""));
-                    f.write(`   */`);
-                }
-                f.write(`  ${(0, utils2_1.quotifyIfNecessary)(field.name)} = ${field.value[1]},`);
-            }
-            f.write(`}`);
-        }
-        else if (definition instanceof node_opcua_types_1.StructureDefinition) {
-            if (baseInterfaceName === "DTUnion") {
-                type = "structure";
-                for (let i = 0; i < definition.fields.length; i++) {
-                    f.write(`export interface ${interfaceName}_${i} extends ${baseInterfaceName} {`);
-                    for (let j = 0; j < definition.fields.length; j++) {
-                        const field = definition.fields[j];
-                        const fieldName = (0, utils2_1.toJavascritPropertyName)(field.name, { ignoreConflictingName: false });
-                        if (j === i) {
-                            yield outputStructureField(f, field);
-                        }
-                        else {
-                            f.write(`  ${(0, utils2_1.quotifyIfNecessary)(fieldName)}?: never`);
-                        }
-                    }
-                    f.write(`}`);
-                }
-                f.write(`export type ${interfaceName} = `);
-                for (let i = 0; i < definition.fields.length; i++) {
-                    f.write(`  | ${interfaceName}_${i}`);
-                }
-                f.write(`  ;`);
-            }
-            else {
-                type = "structure";
-                if (!definition.fields.length && interfaceName !== "DTStructure") {
-                    f.write(`export type ${interfaceName} = ${baseInterfaceName};`);
-                }
-                else {
-                    if (interfaceName === "DTStructure") {
-                        f.write(`export interface ${interfaceName} {`);
-                    }
-                    else {
-                        f.write(`export interface ${interfaceName} extends ${baseInterfaceName} {`);
-                    }
-                    for (const field of definition.fields) {
-                        yield outputStructureField(f, field);
-                    }
-                    f.write(`}`);
-                    //
-                    referenceBasicType("ExtensionObject");
-                    // ache.ensureImported({ module: "BasicType", name: "ExtensionObject", namespace: 0 });
-                    // interface TighteningResultOptions extends Partial<DTTighteningResult> {}
-                    // interface TighteningResult extends ExtensionObject, DTTighteningResult {}
-                    const full = (0, cache_1.makeName2)(interfaceName);
-                    // filter issue with UDTOpticalVerifierScanResult that has a decode:Uint32 conflicting with the ExtensionObject decode method
-                    const toAvoid = ["decode", "encode"];
-                    const collidingNames = definition
-                        .fields.map((a) => (0, utils2_1.toJavascritPropertyName)(a.name, { ignoreConflictingName: false }))
-                        .filter((d) => toAvoid.indexOf(d.toLowerCase()) !== -1);
-                    const adpatedIntefaceName = collidingNames.length === 0
-                        ? interfaceName
-                        : `Omit<${interfaceName},${collidingNames.map((a) => `"${a}"`).join(",")}>`;
-                    f.write(`export interface ${full} extends ExtensionObject, ${adpatedIntefaceName} {};`);
-                }
-            }
-        }
-        else {
-            type = "basic";
-            f.write(`// NO DEFINITION`);
-            f.write(`export type ${interfaceName} = ${baseInterfaceName};`);
-            // throw new Error("Invalid " + definition?.constructor.name);
-        }
-        return { type, content: f.toString(), typeName: interfaceName };
-        function outputStructureField(f, field) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const fieldName = (0, utils2_1.toJavascritPropertyName)(field.name, { ignoreConflictingName: false });
-                // special case ! fieldName=
-                if (field.description.text) {
-                    f.write(`  /** ${field.description.text}*/`);
-                }
-                const opt = field.isOptional ? "?" : "";
-                const arrayMarker = field.valueRank >= 1 ? "[]" : "";
-                const { dataType, jtype } = yield (0, get_corresponding_data_type_1.getCorrepondingJavascriptType)(session, field.dataType, cache, importCollector);
-                f.write(`  ${(0, utils2_1.quotifyIfNecessary)(fieldName)}${opt}: ${jtype}${arrayMarker}; // ${node_opcua_variant_1.DataType[dataType]} ${field.dataType.toString()}`);
-            });
-        }
-    });
-}
-exports._exportDataTypeToTypescript = _exportDataTypeToTypescript;
+"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._exportDataTypeToTypescript = void 0;
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_types_1 = require("node-opcua-types");
+const node_opcua_utils_1 = require("node-opcua-utils");
+const node_opcua_variant_1 = require("node-opcua-variant");
+const private_stuff_1 = require("./private-stuff");
+const cache_1 = require("./private/cache");
+const get_corresponding_data_type_1 = require("./private/get_corresponding_data_type");
+const utils2_1 = require("./utils2");
+// eslint-disable-next-line max-statements, complexity
+function _exportDataTypeToTypescript(session, nodeId, cache, f) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const importCollect = undefined;
+        const referenceBasicType = (name) => {
+            const t = { name, namespace: -1, module: "BasicType" };
+            importCollect && importCollect(t);
+            cache.ensureImported(t);
+            return t.name;
+        };
+        f = f || new node_opcua_utils_1.LineFile();
+        const importCollector = (i) => {
+            cache.ensureImported(i);
+        };
+        const nodeClass = node_opcua_data_model_1.NodeClass.DataType;
+        const description = yield (0, private_stuff_1.getDescription)(session, nodeId);
+        const definition = yield (0, private_stuff_1.getDefinition)(session, nodeId);
+        const browseName = yield (0, private_stuff_1.getBrowseName)(session, nodeId);
+        const isAbstract = yield (0, private_stuff_1.getIsAbstract)(session, nodeId);
+        const interfaceImport = (0, private_stuff_1.makeTypeNameNew)(nodeClass, definition, browseName);
+        const interfaceName = interfaceImport.name;
+        const superType = yield (0, private_stuff_1.getSubtypeNodeId)(session, nodeId);
+        const baseInterfaceImport = (0, private_stuff_1.makeTypeNameNew)(nodeClass, definition, superType.browseName);
+        cache.ensureImported(baseInterfaceImport);
+        const baseInterfaceName = baseInterfaceImport.name;
+        //  f.write(superType.toString());
+        f.write(`/**`);
+        if (description.text) {
+            f.write((0, utils2_1.toComment)(" * ", description.text || ""));
+            f.write(` *`);
+        }
+        f.write(` * |           |${(0, utils2_1.f1)(" ")}|`);
+        f.write(` * |-----------|${(0, utils2_1.f2)("-")}|`);
+        f.write(` * | namespace |${(0, utils2_1.f1)(cache.namespace[nodeId.namespace].namespaceUri)}|`);
+        f.write(` * | nodeClass |${(0, utils2_1.f1)(node_opcua_data_model_1.NodeClass[nodeClass])}|`);
+        f.write(` * | name      |${(0, utils2_1.f1)(browseName.toString())}|`);
+        f.write(` * | isAbstract|${(0, utils2_1.f1)(isAbstract.toString())}|`);
+        f.write(` */`);
+        let type = "basic";
+        if (definition instanceof node_opcua_types_1.EnumDefinition) {
+            type = "enum";
+            f.write(`export enum ${interfaceName}  {`);
+            for (const field of definition.fields) {
+                if (field.description.text) {
+                    f.write(`  /**`);
+                    f.write((0, utils2_1.toComment)("   * ", field.description.text || ""));
+                    f.write(`   */`);
+                }
+                f.write(`  ${(0, utils2_1.quotifyIfNecessary)(field.name)} = ${field.value[1]},`);
+            }
+            f.write(`}`);
+        }
+        else if (definition instanceof node_opcua_types_1.StructureDefinition) {
+            if (baseInterfaceName === "DTUnion") {
+                type = "structure";
+                for (let i = 0; i < definition.fields.length; i++) {
+                    f.write(`export interface ${interfaceName}_${i} extends ${baseInterfaceName} {`);
+                    for (let j = 0; j < definition.fields.length; j++) {
+                        const field = definition.fields[j];
+                        const fieldName = (0, utils2_1.toJavascritPropertyName)(field.name, { ignoreConflictingName: false });
+                        if (j === i) {
+                            yield outputStructureField(f, field);
+                        }
+                        else {
+                            f.write(`  ${(0, utils2_1.quotifyIfNecessary)(fieldName)}?: never`);
+                        }
+                    }
+                    f.write(`}`);
+                }
+                f.write(`export type ${interfaceName} = `);
+                for (let i = 0; i < definition.fields.length; i++) {
+                    f.write(`  | ${interfaceName}_${i}`);
+                }
+                f.write(`  ;`);
+            }
+            else {
+                type = "structure";
+                if (!definition.fields.length && interfaceName !== "DTStructure") {
+                    f.write(`export type ${interfaceName} = ${baseInterfaceName};`);
+                }
+                else {
+                    if (interfaceName === "DTStructure") {
+                        f.write(`export interface ${interfaceName} {`);
+                    }
+                    else {
+                        f.write(`export interface ${interfaceName} extends ${baseInterfaceName} {`);
+                    }
+                    for (const field of definition.fields) {
+                        yield outputStructureField(f, field);
+                    }
+                    f.write(`}`);
+                    //
+                    referenceBasicType("ExtensionObject");
+                    // ache.ensureImported({ module: "BasicType", name: "ExtensionObject", namespace: 0 });
+                    // interface TighteningResultOptions extends Partial<DTTighteningResult> {}
+                    // interface TighteningResult extends ExtensionObject, DTTighteningResult {}
+                    const full = (0, cache_1.makeName2)(interfaceName);
+                    // filter issue with UDTOpticalVerifierScanResult that has a decode:Uint32 conflicting with the ExtensionObject decode method
+                    const toAvoid = ["decode", "encode"];
+                    const collidingNames = definition
+                        .fields.map((a) => (0, utils2_1.toJavascritPropertyName)(a.name, { ignoreConflictingName: false }))
+                        .filter((d) => toAvoid.indexOf(d.toLowerCase()) !== -1);
+                    const adpatedIntefaceName = collidingNames.length === 0
+                        ? interfaceName
+                        : `Omit<${interfaceName},${collidingNames.map((a) => `"${a}"`).join(",")}>`;
+                    f.write(`export interface ${full} extends ExtensionObject, ${adpatedIntefaceName} {};`);
+                }
+            }
+        }
+        else {
+            type = "basic";
+            f.write(`// NO DEFINITION`);
+            f.write(`export type ${interfaceName} = ${baseInterfaceName};`);
+            // throw new Error("Invalid " + definition?.constructor.name);
+        }
+        return { type, content: f.toString(), typeName: interfaceName };
+        function outputStructureField(f, field) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const fieldName = (0, utils2_1.toJavascritPropertyName)(field.name, { ignoreConflictingName: false });
+                // special case ! fieldName=
+                if (field.description.text) {
+                    f.write(`  /** ${field.description.text}*/`);
+                }
+                const opt = field.isOptional ? "?" : "";
+                const arrayMarker = field.valueRank >= 1 ? "[]" : "";
+                const { dataType, jtype } = yield (0, get_corresponding_data_type_1.getCorrepondingJavascriptType)(session, field.dataType, cache, importCollector);
+                f.write(`  ${(0, utils2_1.quotifyIfNecessary)(fieldName)}${opt}: ${jtype}${arrayMarker}; // ${node_opcua_variant_1.DataType[dataType]} ${field.dataType.toString()}`);
+            });
+        }
+    });
+}
+exports._exportDataTypeToTypescript = _exportDataTypeToTypescript;
 //# sourceMappingURL=_dataType.js.map

package/dist/convert_namespace_to_typescript.d.ts

@@ -1,3 +1,3 @@
-import { IBasicSession } from "node-opcua-pseudo-session";
-import { Options } from "./options";
-export declare function convertNamespaceTypeToTypescript(session: IBasicSession, namespaceIndex: number, options: Options): Promise<void>;
+import { IBasicSession } from "node-opcua-pseudo-session";
+import { Options } from "./options";
+export declare function convertNamespaceTypeToTypescript(session: IBasicSession, namespaceIndex: number, options: Options): Promise<void>;