node-opcua-convert-nodeset-to-javascript 2.75.0 → 2.76.0

package/dist/walk_through.d.ts

@@ -1,13 +1,13 @@
-import { IBasicSession } from "node-opcua-pseudo-session";
-import { ReferenceDescription } from "node-opcua-types";
-export interface ReferenceDescriptionEx extends ReferenceDescription {
-    parent: ReferenceDescriptionEx;
-}
-export interface NodeVisitor {
-    visit(reference: ReferenceDescriptionEx, level: number): Promise<void>;
-}
-export declare function walkThroughReferenceTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
-export declare function walkThroughDataTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
-export declare function walkThroughInterfaceTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
-export declare function walkThroughObjectTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
-export declare function walkThroughVariableTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+import { IBasicSession } from "node-opcua-pseudo-session";
+import { ReferenceDescription } from "node-opcua-types";
+export interface ReferenceDescriptionEx extends ReferenceDescription {
+    parent: ReferenceDescriptionEx;
+}
+export interface NodeVisitor {
+    visit(reference: ReferenceDescriptionEx, level: number): Promise<void>;
+}
+export declare function walkThroughReferenceTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+export declare function walkThroughDataTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+export declare function walkThroughInterfaceTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+export declare function walkThroughObjectTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+export declare function walkThroughVariableTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;

package/dist/walk_through.js

@@ -1,87 +1,87 @@
-"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.walkThroughVariableTypes = exports.walkThroughObjectTypes = exports.walkThroughInterfaceTypes = exports.walkThroughDataTypes = exports.walkThroughReferenceTypes = void 0;
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const node_opcua_nodeid_1 = require("node-opcua-nodeid");
-const node_opcua_types_1 = require("node-opcua-types");
-function _walkThroughTypes(session, nodeId, visitor, level, parent) {
-    return __awaiter(this, void 0, void 0, function* () {
-        level = level || 0;
-        if (!parent) {
-            const dataValues = yield session.read([
-                { nodeId, attributeId: node_opcua_data_model_1.AttributeIds.BrowseName },
-                { nodeId, attributeId: node_opcua_data_model_1.AttributeIds.NodeClass }
-            ]);
-            const browseName = dataValues[0].value.value;
-            const nodeClass = dataValues[1].value.value;
-            parent = new node_opcua_types_1.ReferenceDescription({
-                isForward: true,
-                nodeId: nodeId,
-                browseName,
-                nodeClass,
-                referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype")
-                // typeDefinition,
-            });
-        }
-        const browseResult = yield session.browse({
-            browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
-            nodeId,
-            includeSubtypes: true,
-            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype"),
-            resultMask: 0xff
-        });
-        for (const reference of browseResult.references || []) {
-            if (visitor) {
-                const r = reference;
-                r.parent = parent;
-                yield visitor.visit(r, level);
-            }
-            yield _walkThroughTypes(session, reference.nodeId, visitor, level + 1, reference);
-        }
-    });
-}
-function walkThroughReferenceTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseReferenceTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("References");
-        yield _walkThroughTypes(session, baseReferenceTypeNodeId, nodeVisitor);
-    });
-}
-exports.walkThroughReferenceTypes = walkThroughReferenceTypes;
-function walkThroughDataTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseDataTypeTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("BaseDataType");
-        yield _walkThroughTypes(session, baseDataTypeTypeNodeId, nodeVisitor);
-    });
-}
-exports.walkThroughDataTypes = walkThroughDataTypes;
-function walkThroughInterfaceTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseInterfaceTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("BaseInterfaceType");
-        yield _walkThroughTypes(session, baseInterfaceTypeNodeId, nodeVisitor);
-    });
-}
-exports.walkThroughInterfaceTypes = walkThroughInterfaceTypes;
-function walkThroughObjectTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseObjectType = (0, node_opcua_nodeid_1.resolveNodeId)("BaseObjectType");
-        yield _walkThroughTypes(session, baseObjectType, nodeVisitor);
-    });
-}
-exports.walkThroughObjectTypes = walkThroughObjectTypes;
-function walkThroughVariableTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseObjectType = (0, node_opcua_nodeid_1.resolveNodeId)("BaseVariableType");
-        yield _walkThroughTypes(session, baseObjectType, nodeVisitor);
-    });
-}
-exports.walkThroughVariableTypes = walkThroughVariableTypes;
+"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.walkThroughVariableTypes = exports.walkThroughObjectTypes = exports.walkThroughInterfaceTypes = exports.walkThroughDataTypes = exports.walkThroughReferenceTypes = void 0;
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_nodeid_1 = require("node-opcua-nodeid");
+const node_opcua_types_1 = require("node-opcua-types");
+function _walkThroughTypes(session, nodeId, visitor, level, parent) {
+    return __awaiter(this, void 0, void 0, function* () {
+        level = level || 0;
+        if (!parent) {
+            const dataValues = yield session.read([
+                { nodeId, attributeId: node_opcua_data_model_1.AttributeIds.BrowseName },
+                { nodeId, attributeId: node_opcua_data_model_1.AttributeIds.NodeClass }
+            ]);
+            const browseName = dataValues[0].value.value;
+            const nodeClass = dataValues[1].value.value;
+            parent = new node_opcua_types_1.ReferenceDescription({
+                isForward: true,
+                nodeId: nodeId,
+                browseName,
+                nodeClass,
+                referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype")
+                // typeDefinition,
+            });
+        }
+        const browseResult = yield session.browse({
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
+            nodeId,
+            includeSubtypes: true,
+            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype"),
+            resultMask: 0xff
+        });
+        for (const reference of browseResult.references || []) {
+            if (visitor) {
+                const r = reference;
+                r.parent = parent;
+                yield visitor.visit(r, level);
+            }
+            yield _walkThroughTypes(session, reference.nodeId, visitor, level + 1, reference);
+        }
+    });
+}
+function walkThroughReferenceTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseReferenceTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("References");
+        yield _walkThroughTypes(session, baseReferenceTypeNodeId, nodeVisitor);
+    });
+}
+exports.walkThroughReferenceTypes = walkThroughReferenceTypes;
+function walkThroughDataTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseDataTypeTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("BaseDataType");
+        yield _walkThroughTypes(session, baseDataTypeTypeNodeId, nodeVisitor);
+    });
+}
+exports.walkThroughDataTypes = walkThroughDataTypes;
+function walkThroughInterfaceTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseInterfaceTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("BaseInterfaceType");
+        yield _walkThroughTypes(session, baseInterfaceTypeNodeId, nodeVisitor);
+    });
+}
+exports.walkThroughInterfaceTypes = walkThroughInterfaceTypes;
+function walkThroughObjectTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseObjectType = (0, node_opcua_nodeid_1.resolveNodeId)("BaseObjectType");
+        yield _walkThroughTypes(session, baseObjectType, nodeVisitor);
+    });
+}
+exports.walkThroughObjectTypes = walkThroughObjectTypes;
+function walkThroughVariableTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseObjectType = (0, node_opcua_nodeid_1.resolveNodeId)("BaseVariableType");
+        yield _walkThroughTypes(session, baseObjectType, nodeVisitor);
+    });
+}
+exports.walkThroughVariableTypes = walkThroughVariableTypes;
 //# sourceMappingURL=walk_through.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-convert-nodeset-to-javascript",
-    "version": "2.75.0",
+    "version": "2.76.0",
     "description": "pure nodejs OPCUA SDK - module -convert-nodeset-to-javascript",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -14,29 +14,26 @@
     "dependencies": {
         "@types/wordwrap": "^1.0.1",
         "case-anything": "1.1.5",
-        "node-opcua-address-space": "2.75.0",
-        "node-opcua-address-space-base": "2.75.0",
-        "node-opcua-assert": "2.74.0",
-        "node-opcua-basic-types": "2.74.0",
+        "chalk": "4.1.2",
+        "node-opcua-address-space": "2.76.0",
+        "node-opcua-address-space-base": "2.76.0",
+        "node-opcua-assert": "2.76.0",
         "node-opcua-constants": "2.74.0",
-        "node-opcua-data-access": "2.75.0",
-        "node-opcua-data-model": "2.75.0",
-        "node-opcua-data-value": "2.75.0",
-        "node-opcua-debug": "2.74.0",
-        "node-opcua-factory": "2.75.0",
-        "node-opcua-nodeid": "2.74.0",
-        "node-opcua-pseudo-session": "2.75.0",
-        "node-opcua-service-translate-browse-path": "2.75.0",
-        "node-opcua-status-code": "2.74.0",
-        "node-opcua-types": "2.75.0",
-        "node-opcua-utils": "2.74.0",
+        "node-opcua-data-model": "2.76.0",
+        "node-opcua-debug": "2.76.0",
+        "node-opcua-nodeid": "2.76.0",
+        "node-opcua-nodesets": "2.74.0",
+        "node-opcua-pseudo-session": "2.76.0",
+        "node-opcua-status-code": "2.76.0",
+        "node-opcua-types": "2.76.0",
+        "node-opcua-utils": "2.76.0",
+        "node-opcua-variant": "2.76.0",
         "wordwrap": "^1.0.0"
     },
     "devDependencies": {
-        "node-opcua-leak-detector": "2.74.0",
-        "node-opcua-nodesets": "2.74.0",
-        "node-opcua-packet-analyzer": "2.75.0",
-        "node-opcua-variant": "2.75.0",
+        "node-opcua-leak-detector": "2.76.0",
+        "node-opcua-packet-analyzer": "2.76.0",
+        "node-opcua-service-translate-browse-path": "2.76.0",
         "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
@@ -54,5 +51,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "5ccb835ca480c2a8a591ae61b5949a9d8bad4017"
+    "gitHead": "75d9b8cf894c8fbadf77d2c4a48a730d055465e7"
 }

package/source/convert_namespace_to_typescript.ts

@@ -8,9 +8,7 @@ import { convertTypeToTypescript } from "./convert_to_typescript";
 import { constructCache } from "./private/cache";
 import { Options } from "./options";
 
-function getPackageInfo(dependency: string, options: Options) {
-    //xx console.log("getPackageInfo", dependency);
-
+function getPackageFolder(dependency: string, options: Options) {
     const l = [...(options.lookupFolders || [])];
     l.push(path.join(__dirname, "../../"));
     for (const folder of l) {
@@ -18,11 +16,15 @@ function getPackageInfo(dependency: string, options: Options) {
         if (!fs.existsSync(d)) {
             continue;
         }
-        const p = JSON.parse(fs.readFileSync(d, "utf8"));
-        return p;
+        return d;
     }
     throw new Error("cannot find package.json for " + dependency);
 }
+function getPackageInfo(dependency: string, options: Options) {
+    const d = getPackageFolder(dependency, options);
+    const p = JSON.parse(fs.readFileSync(d, "utf8"));
+    return p;
+}
 
 interface Info {
     files: string[];
@@ -146,7 +148,7 @@ async function _output_package_json(info: Info, options: Options): Promise<void>
 
     fs.writeFileSync(packagejson, content2.join("\n"));
 }
-async function _output_tsconfig_json(info: Info): Promise<void> {
+async function _output_tsconfig_json(info: Info, options: Options): Promise<void> {
     const tsconfig = path.join(info.folder, "tsconfig.json");
     const content3: string[] = [];
     content3.push(`{`);
@@ -164,7 +166,10 @@ async function _output_tsconfig_json(info: Info): Promise<void> {
     // content3.push(`      { "path": "../node-opcua-address-space-base" }`);
     const l = [] as string[];
     for (const dep of info.dependencies) {
-        l.push(`     { "path": "../${dep}" }`);
+        // only add in dep if not found in node_module
+        if (!isIn_node_modules_Folder(dep)) {
+            l.push(`     { "path": "../${dep}" }`);
+        }
     }
     content3.push(l.join(",\n"));
     content3.push(`   ],`);
@@ -175,6 +180,11 @@ async function _output_tsconfig_json(info: Info): Promise<void> {
     content3.push(`}`);
 
     fs.writeFileSync(tsconfig, content3.join("\n"));
+
+    function isIn_node_modules_Folder(dep: string) {
+        const c = getPackageFolder(dep, options);
+        return !!c.match(/node_modules/);
+    }
 }
 async function outputFiles(infos: { [key: string]: Info }, options: Options) {
     for (const info of Object.values(infos) as Info[]) {
@@ -183,6 +193,6 @@ async function outputFiles(infos: { [key: string]: Info }, options: Options) {
 
         await _output_package_json(info, options);
 
-        await _output_tsconfig_json(info);
+        await _output_tsconfig_json(info, options);
     }
 }