node-opcua-address-space 2.180.0 → 2.181.1

package/dist/source/loader/generateAddressSpaceRaw.js

@@ -1,188 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.preLoad = preLoad;
-exports.findOrder = findOrder;
-exports.generateAddressSpaceRaw = generateAddressSpaceRaw;
-const node_opcua_date_time_1 = require("node-opcua-date-time");
-const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_xml2json_1 = require("node-opcua-xml2json");
-const adjust_namespace_array_1 = require("../../src/nodeset_tools/adjust_namespace_array");
-const load_nodeset2_1 = require("./load_nodeset2");
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
-const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
-const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
-async function parseDependencies(xmlData) {
-    const namespaceUris = [];
-    const models = [];
-    let currentModel;
-    const state0 = {
-        parser: {
-            UANodeSet: {
-                parser: {
-                    NamespaceUris: {
-                        parser: {
-                            Uri: {
-                                finish() {
-                                    namespaceUris.push(this.text);
-                                }
-                            }
-                        }
-                    },
-                    Models: {
-                        parser: {
-                            Model: {
-                                init(_elementName, attrs) {
-                                    const modelUri = attrs.ModelUri;
-                                    const version = attrs.Version;
-                                    const publicationDate = new Date(Date.parse(attrs.PublicationDate));
-                                    currentModel = {
-                                        modelUri,
-                                        version,
-                                        publicationDate,
-                                        requiredModel: []
-                                    };
-                                    doDebug && console.log(`currentModel = ${JSON.stringify(currentModel)}`);
-                                    models.push(currentModel);
-                                },
-                                parser: {
-                                    RequiredModel: {
-                                        init(_elementName, attrs) {
-                                            const modelUri = attrs.ModelUri;
-                                            const version = attrs.Version;
-                                            const publicationDate = new Date(Date.parse(attrs.PublicationDate));
-                                            if (!currentModel) {
-                                                throw new Error("Internal Error");
-                                            }
-                                            currentModel.requiredModel.push({
-                                                modelUri,
-                                                version,
-                                                publicationDate
-                                            });
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    };
-    const parser = new node_opcua_xml2json_1.Xml2Json(state0);
-    parser.parseString(xmlData);
-    if (models.length === 0 && namespaceUris.length >= 1) {
-        models.push({
-            modelUri: namespaceUris[0],
-            version: "1",
-            publicationDate: (0, node_opcua_date_time_1.getMinOPCUADate)(),
-            requiredModel: []
-        });
-    }
-    return { models, namespaceUris: namespaceUris };
-}
-/**
- * Detect order of namespace loading
- */
-async function preLoad(xmlFiles, xmlLoader) {
-    // a nodeset2 file may define multiple namespaces
-    const namespaceDesc = [];
-    for (let index = 0; index < xmlFiles.length; index++) {
-        doDebug && console.log("---------------------------------------------", xmlFiles[index]);
-        const xmlData = await xmlLoader(xmlFiles[index]);
-        const indexStart = xmlData.match(/<UANodeSet/m)?.index;
-        const i1 = (xmlData.match(/<\/Models>/m)?.index || 0) + "</Models>".length;
-        const i2 = (xmlData.match(/<\/NamespaceUris>/m)?.index || 0) + "</NamespaceUris>".length;
-        const indexEnd = Math.max(i1, i2);
-        if (indexStart === undefined || indexEnd === undefined) {
-            throw new Error("Internal Error");
-        }
-        const xmlData2 = xmlData.substring(indexStart, indexEnd);
-        doDebug &&
-            console.log(xmlData2
-                .split("\n")
-                .splice(0, 46)
-                .map((x, i) => `${i + 0} ${x}`)
-                .join("\n"));
-        const namespaceModel = await parseDependencies(xmlData2);
-        namespaceDesc.push({ xmlData, namespaceModel, index });
-    }
-    return namespaceDesc;
-}
-function findOrder(nodesetDescs) {
-    // compute the order of loading of the namespaces
-    const order = [];
-    const visited = new Set();
-    const findNodesetIndex = (namespaceUri) => {
-        const index = nodesetDescs.findIndex((x) => x.namespaceModel.models.findIndex((e) => e.modelUri === namespaceUri) !== -1);
-        return index;
-    };
-    const visit = (model) => {
-        const key = model.modelUri;
-        if (visited.has(key)) {
-            return;
-        }
-        visited.add(key);
-        for (const requiredModel of model.requiredModel) {
-            const requiredModelIndex = findNodesetIndex(requiredModel.modelUri);
-            if (requiredModelIndex === -1) {
-                throw new Error(`Cannot find namespace for ${requiredModel.modelUri}`);
-            }
-            const nd = nodesetDescs[requiredModelIndex];
-            for (const n of nd.namespaceModel.models) {
-                visit(n);
-            }
-        }
-        const nodesetIndex = findNodesetIndex(model.modelUri);
-        const alreadyIn = order.indexOf(nodesetIndex) !== -1;
-        if (!alreadyIn)
-            order.push(nodesetIndex);
-    };
-    const visit2 = (nodesetDesc) => {
-        for (const model of nodesetDesc.namespaceModel.models.values()) {
-            visit(model);
-        }
-    };
-    for (let index = 0; index < nodesetDescs.length; index++) {
-        const nodesetDesc = nodesetDescs[index];
-        visit2(nodesetDesc);
-    }
-    return order;
-}
-/**
- * @param addressSpace the addressSpace to populate
- * @xmlFiles: a lis of xml files
- * @param xmlLoader - a helper function to return the content of the xml file
- */
-async function generateAddressSpaceRaw(addressSpace, xmlFiles, xmlLoader, options) {
-    const nodesetLoader = new load_nodeset2_1.NodeSetLoader(addressSpace, options);
-    if (!Array.isArray(xmlFiles)) {
-        xmlFiles = [xmlFiles];
-    }
-    const nodesetDesc = await preLoad(xmlFiles, xmlLoader);
-    const order = findOrder(nodesetDesc);
-    // register namespace in the same order as specified in the xmlFiles array
-    for (let index = 0; index < order.length; index++) {
-        const n = nodesetDesc[index];
-        for (const model of n.namespaceModel.models) {
-            const ns = addressSpace.registerNamespace(model.modelUri);
-            ns.setRequiredModels(model.requiredModel);
-        }
-    }
-    for (let index = 0; index < order.length; index++) {
-        const nodesetIndex = order[index];
-        const nodeset = nodesetDesc[nodesetIndex];
-        // c8 ignore next
-        doDebug && debugLog(" loading ", nodesetIndex, nodeset.xmlData.length);
-        try {
-            await nodesetLoader.addNodeSetAsync(nodeset.xmlData);
-        }
-        catch (err) {
-            errorLog("generateAddressSpace:  Loading xml file ", xmlFiles[index], " failed with error ", err.message);
-            throw err;
-        }
-    }
-    await nodesetLoader.terminate();
-    (0, adjust_namespace_array_1.adjustNamespaceArray)(addressSpace);
-    // however process them in series
-}
-//# sourceMappingURL=generateAddressSpaceRaw.js.map

package/dist/source/loader/generateAddressSpaceRaw.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateAddressSpaceRaw.js","sourceRoot":"","sources":["../../../source/loader/generateAddressSpaceRaw.ts"],"names":[],"mappings":"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"}

package/dist/source/loader/load_nodeset2.d.ts

@@ -1,15 +0,0 @@
-/**
- * @module node-opcua-address-space
- */
-import type { IAddressSpace } from "node-opcua-address-space-base";
-import type { NodeSetLoaderOptions } from "../interfaces/nodeset_loader_options";
-export interface NodeSet2ParserEngine {
-    addNodeSet: (xmlData: string) => Promise<void>;
-    terminate: () => Promise<void>;
-}
-export declare class NodeSetLoader {
-    _s: NodeSet2ParserEngine;
-    constructor(addressSpace: IAddressSpace, options?: NodeSetLoaderOptions);
-    addNodeSetAsync(xmlData: string): Promise<void>;
-    terminate(): Promise<void>;
-}