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

package/dist/utils2.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.f1 = exports.f2 = exports.quotifyIfNecessary = exports.toJavascritPropertyName = exports.toComment = void 0;
+const node_opcua_utils_1 = require("node-opcua-utils");
+const wrap = require("wordwrap");
+const wrapText = wrap(0, 50);
+function toComment(prefix, description) {
+    const d = wrapText(description);
+    return d
+        .split("\n")
+        .map((x) => prefix + x)
+        .join("\n");
+}
+exports.toComment = toComment;
+// to avoid clashes
+function toJavascritPropertyName(childName, { ignoreConflictingName }) {
+    childName = (0, node_opcua_utils_1.lowerFirstLetter)(childName);
+    if (ignoreConflictingName) {
+        if (childName === "namespaceUri") {
+            childName = "$namespaceUri";
+        }
+        if (childName === "rolePermissions") {
+            childName = "$rolePermissions";
+        }
+        if (childName === "displayName") {
+            childName = "$displayName";
+        }
+        if (childName === "eventNotifier") {
+            childName = "$eventNotifier";
+        }
+        if (childName === "description") {
+            childName = "$description";
+        }
+        if (childName === "decode") {
+            childName = "$decode";
+        }
+        if (childName === "encode") {
+            childName = "$encode";
+        }
+    }
+    return childName.replace(/</g, "$").replace(/>/g, "$").replace(/ |\./g, "_").replace(/#/g, "_");
+}
+exports.toJavascritPropertyName = toJavascritPropertyName;
+function quotifyIfNecessary(s) {
+    if (s.match(/(^[^a-zA-Z])|([^a-zA-Z_0-9])/)) {
+        return `"${s}"`;
+    }
+    if (s === "nodeClass") {
+        return `["$nodeClass"]`;
+    }
+    return s;
+}
+exports.quotifyIfNecessary = quotifyIfNecessary;
+const f2 = (str) => str.padEnd(50, "-");
+exports.f2 = f2;
+const f1 = (str) => str.padEnd(50, " ");
+exports.f1 = f1;
+//# sourceMappingURL=utils2.js.map

package/dist/utils2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils2.js","sourceRoot":"","sources":["../source/utils2.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,iCAAiC;AAEjC,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAE7B,SAAgB,SAAS,CAAC,MAAc,EAAE,WAAmB;IACzD,MAAM,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IAChC,OAAO,CAAC;SACH,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;SACtB,IAAI,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC;AAND,8BAMC;AAED,mBAAmB;AACnB,SAAgB,uBAAuB,CAAC,SAAiB,EAAE,EAAE,qBAAqB,EAAsC;IACpH,SAAS,GAAG,IAAA,mCAAgB,EAAC,SAAS,CAAC,CAAC;IAExC,IAAI,qBAAqB,EAAE;QACvB,IAAI,SAAS,KAAK,cAAc,EAAE;YAC9B,SAAS,GAAG,eAAe,CAAC;SAC/B;QACD,IAAI,SAAS,KAAK,iBAAiB,EAAE;YACjC,SAAS,GAAG,kBAAkB,CAAC;SAClC;QACD,IAAI,SAAS,KAAK,aAAa,EAAE;YAC7B,SAAS,GAAG,cAAc,CAAC;SAC9B;QACD,IAAI,SAAS,KAAK,eAAe,EAAE;YAC/B,SAAS,GAAG,gBAAgB,CAAC;SAChC;QACD,IAAI,SAAS,KAAK,aAAa,EAAE;YAC7B,SAAS,GAAG,cAAc,CAAC;SAC9B;QACD,IAAI,SAAS,KAAK,QAAQ,EAAE;YACxB,SAAS,GAAG,SAAS,CAAC;SACzB;QACD,IAAI,SAAS,KAAK,QAAQ,EAAE;YACxB,SAAS,GAAG,SAAS,CAAC;SACzB;KACJ;IACD,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AACpG,CAAC;AA3BD,0DA2BC;AAED,SAAgB,kBAAkB,CAAC,CAAS;IACxC,IAAI,CAAC,CAAC,KAAK,CAAC,8BAA8B,CAAC,EAAE;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC;KACnB;IACD,IAAI,CAAC,KAAK,WAAW,EAAE;QACnB,OAAO,gBAAgB,CAAC;KAC3B;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AARD,gDAQC;AAEM,MAAM,EAAE,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAA1C,QAAA,EAAE,MAAwC;AAChD,MAAM,EAAE,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAA1C,QAAA,EAAE,MAAwC"}

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.76.0",
+    "version": "2.77.0",
     "description": "pure nodejs OPCUA SDK - module -convert-nodeset-to-javascript",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -15,25 +15,26 @@
         "@types/wordwrap": "^1.0.1",
         "case-anything": "1.1.5",
         "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-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",
+        "node-opcua-address-space": "2.77.0",
+        "node-opcua-address-space-base": "2.77.0",
+        "node-opcua-assert": "2.77.0",
+        "node-opcua-constants": "2.77.0",
+        "node-opcua-data-model": "2.77.0",
+        "node-opcua-debug": "2.77.0",
+        "node-opcua-extension-object": "2.77.0",
+        "node-opcua-nodeid": "2.77.0",
+        "node-opcua-nodesets": "2.77.0",
+        "node-opcua-pseudo-session": "2.77.0",
+        "node-opcua-status-code": "2.77.0",
+        "node-opcua-types": "2.77.0",
+        "node-opcua-utils": "2.77.0",
+        "node-opcua-variant": "2.77.0",
         "wordwrap": "^1.0.0"
     },
     "devDependencies": {
-        "node-opcua-leak-detector": "2.76.0",
-        "node-opcua-packet-analyzer": "2.76.0",
-        "node-opcua-service-translate-browse-path": "2.76.0",
+        "node-opcua-leak-detector": "2.77.0",
+        "node-opcua-packet-analyzer": "2.77.0",
+        "node-opcua-service-translate-browse-path": "2.77.0",
         "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
@@ -51,5 +52,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "75d9b8cf894c8fbadf77d2c4a48a730d055465e7"
+    "gitHead": "5c8d45772d786fa4ba59369dd26679353ab5482b"
 }

package/source/_dataType.ts

@@ -0,0 +1,164 @@
+import { NodeClass } from "node-opcua-data-model";
+import { NodeId } from "node-opcua-nodeid";
+import { IBasicSession } from "node-opcua-pseudo-session";
+import { EnumDefinition, StructureDefinition, StructureField } from "node-opcua-types";
+import { LineFile } from "node-opcua-utils";
+import { DataType } from "node-opcua-variant";
+import { Type } from "./convert_to_typescript";
+import {
+    Import,
+    getDescription,
+    getDefinition,
+    getBrowseName,
+    getIsAbstract,
+    makeTypeNameNew,
+    getSubtypeNodeId
+} from "./private-stuff";
+import { Cache, makeName2 } from "./private/cache";
+import { getCorrepondingJavascriptType } from "./private/get_corresponding_data_type";
+import { f1, f2, quotifyIfNecessary, toComment, toJavascritPropertyName } from "./utils2";
+
+// eslint-disable-next-line max-statements, complexity
+export async function _exportDataTypeToTypescript(
+    session: IBasicSession,
+    nodeId: NodeId,
+    cache: Cache,
+    f?: LineFile
+): Promise<{ type: Type; content: string; typeName: string }> {
+    const importCollect: any = undefined;
+    const referenceBasicType = (name: string): string => {
+        const t = { name, namespace: -1, module: "BasicType" };
+        importCollect && importCollect(t);
+        cache.ensureImported(t);
+        return t.name;
+    };
+
+    f = f || new LineFile();
+
+    const importCollector = (i: Import) => {
+        cache.ensureImported(i);
+    };
+    const nodeClass = NodeClass.DataType;
+    const description = await getDescription(session, nodeId);
+    const definition = await getDefinition(session, nodeId);
+    const browseName = await getBrowseName(session, nodeId);
+    const isAbstract = await getIsAbstract(session, nodeId);
+
+    const interfaceImport: Import = makeTypeNameNew(nodeClass, definition, browseName);
+    const interfaceName = interfaceImport.name;
+
+    const superType = await getSubtypeNodeId(session, nodeId);
+    const baseInterfaceImport: Import = makeTypeNameNew(nodeClass, definition, superType.browseName);
+
+    cache.ensureImported(baseInterfaceImport);
+
+    const baseInterfaceName = baseInterfaceImport.name;
+    //  f.write(superType.toString());
+    f.write(`/**`);
+    if (description.text) {
+        f.write(toComment(" * ", description.text || ""));
+        f.write(` *`);
+    }
+    f.write(` * |           |${f1(" ")}|`);
+    f.write(` * |-----------|${f2("-")}|`);
+    f.write(` * | namespace |${f1(cache.namespace[nodeId.namespace].namespaceUri)}|`);
+    f.write(` * | nodeClass |${f1(NodeClass[nodeClass])}|`);
+    f.write(` * | name      |${f1(browseName.toString())}|`);
+    f.write(` * | isAbstract|${f1(isAbstract.toString())}|`);
+    f.write(` */`);
+
+    let type: "basic" | "structure" | "enum" | "ua" = "basic";
+    if (definition instanceof EnumDefinition) {
+        type = "enum";
+        f.write(`export enum ${interfaceName}  {`);
+        for (const field of definition.fields!) {
+            if (field.description.text) {
+                f.write(`  /**`);
+                f.write(toComment("   * ", field.description.text || ""));
+                f.write(`   */`);
+            }
+            f.write(`  ${quotifyIfNecessary(field.name!)} = ${field.value[1]},`);
+        }
+        f.write(`}`);
+    } else if (definition instanceof 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 = toJavascritPropertyName(field.name!, { ignoreConflictingName: false });
+                    if (j === i) {
+                        await outputStructureField(f, field);
+                    } else {
+                        f.write(`  ${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!) {
+                    await 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 = 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) => 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 };
+
+    async function outputStructureField(f: LineFile, field: StructureField) {
+        const fieldName = 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 } = await getCorrepondingJavascriptType(session, field.dataType, cache, importCollector);
+        f.write(
+            `  ${quotifyIfNecessary(fieldName)}${opt}: ${jtype}${arrayMarker}; // ${
+                DataType[dataType]
+            } ${field.dataType.toString()}`
+        );
+    }
+}