@enervance/insight-cim-model 0.0.77 → 0.0.79

package/dist/model/wires/Breaker.js

@@ -8,7 +8,41 @@ class Breaker extends ProtectedSwitch_1.ProtectedSwitch {
     constructor(uuid, name, shortName, description, normalOpen, retained) {
         super(uuid, name, shortName, description, normalOpen, retained);
     }
-    static sparqlQuery = `
+    static getQuerySPARQL(graphURI) {
+        if (graphURI.length > 0) {
+            return Breaker.sparqlQuery.replace('<http://default/>', graphURI);
+        }
+        return Breaker.sparqlQuery;
+    }
+    static resolveClassFusekiJSON(data, cimModel) {
+        var _a, _b;
+        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
+            const breaker = new Breaker();
+            breaker.resolveAttributesFusekiJSON(value);
+            cimModel.addBreaker(breaker);
+        });
+    }
+    resolveAttributesFusekiJSON(value) {
+        super.resolveAttributesFusekiJSON(value);
+    }
+    resolveParsedAssociations(cimModel) {
+        super.resolveParsedAssociations(cimModel);
+    }
+    /** CIM RDF/XML Serialisierung */
+    toCIMXML(xmlWriter, profile) {
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_SSH || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
+            const suffixID = this.getSuffixID(profile);
+            const prefixUUID = this.getPrefixUUID(suffixID);
+            xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            this.toCIMXMLAttributes(xmlWriter, profile);
+            this.toCIMXMLAssociations(xmlWriter, profile);
+            xmlWriter.endElement();
+        }
+    }
+}
+exports.Breaker = Breaker;
+Breaker.sparqlQuery = `
         PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
         PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
         PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
@@ -43,37 +77,4 @@ class Breaker extends ProtectedSwitch_1.ProtectedSwitch {
         GROUP BY ?vlUUID ?baseIRI ?name ?shortName ?description 
          ?open ?aggregate ?normalOpen ?retained ?ecUUID ?bvUUID
     `;
-    static getQuerySPARQL(graphURI) {
-        if (graphURI.length > 0) {
-            return Breaker.sparqlQuery.replace('<http://default/>', graphURI);
-        }
-        return Breaker.sparqlQuery;
-    }
-    static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
-            const breaker = new Breaker();
-            breaker.resolveAttributesFusekiJSON(value);
-            cimModel.addBreaker(breaker);
-        });
-    }
-    resolveAttributesFusekiJSON(value) {
-        super.resolveAttributesFusekiJSON(value);
-    }
-    resolveParsedAssociations(cimModel) {
-        super.resolveParsedAssociations(cimModel);
-    }
-    /** CIM RDF/XML Serialisierung */
-    toCIMXML(xmlWriter, profile) {
-        if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_SSH || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
-            const suffixID = this.getSuffixID(profile);
-            const prefixUUID = this.getPrefixUUID(suffixID);
-            xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
-            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
-            this.toCIMXMLAttributes(xmlWriter, profile);
-            this.toCIMXMLAssociations(xmlWriter, profile);
-            xmlWriter.endElement();
-        }
-    }
-}
-exports.Breaker = Breaker;
 //# sourceMappingURL=Breaker.js.map

package/dist/model/wires/Breaker.js.map

@@ -1 +1 @@
-{"version":3,"file":"Breaker.js","sourceRoot":"","sources":["../../../src/model/wires/Breaker.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAElD,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,OAAQ,SAAQ,iCAAe;IAExC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,UAAoB,EAAE,QAAkB;QACxH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACpE,CAAC;IAGM,MAAM,CAAC,WAAW,GAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkCpC,CAAA;IACM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACrE;QACD,OAAO,OAAO,CAAC,WAAW,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC9B,OAAO,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC3C,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACrD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvG,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SAC1B;IACL,CAAC;;AA5EL,0BA6EC"}
+{"version":3,"file":"Breaker.js","sourceRoot":"","sources":["../../../src/model/wires/Breaker.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAElD,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,OAAQ,SAAQ,iCAAe;IAExC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,UAAoB,EAAE,QAAkB;QACxH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACpE,CAAC;IAsCM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACrE;QACD,OAAO,OAAO,CAAC,WAAW,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACpE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC9B,OAAO,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC3C,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACrD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvG,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SAC1B;IACL,CAAC;;AA5EL,0BA6EC;AAtEiB,mBAAW,GAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkCpC,CAAA"}

package/dist/model/wires/BusbarSection.js

@@ -5,32 +5,9 @@ const Connector_1 = require("./Connector.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class BusbarSection extends Connector_1.Connector {
-    ipMax;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }
-    static sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX amp:	 		<http://amprion.net/CIM/Extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?bbsUUID), "#"), "_") AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?bbsUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName (strafter(strafter(str(?ecUUID), "#"), "_") AS ?equipmentContainerUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-                ?bbsUUID rdf:type cim:BusbarSection .
-                OPTIONAL{?bbsUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?bbsUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?bbsUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-            }
-        }
-    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return BusbarSection.sparqlQuery.replace("<http://default/>", graphURI);
@@ -38,7 +15,8 @@ class BusbarSection extends Connector_1.Connector {
         return BusbarSection.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        var _a, _b;
+        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
             const busbarSection = new BusbarSection();
             busbarSection.resolveAttributesFusekiJSON(value);
             cimModel.addBusbarSection(busbarSection);
@@ -70,4 +48,26 @@ class BusbarSection extends Connector_1.Connector {
     }
 }
 exports.BusbarSection = BusbarSection;
+BusbarSection.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+        PREFIX amp:	 		<http://amprion.net/CIM/Extensions#> 
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (strafter(strafter(str(?bbsUUID), "#"), "_") AS ?uuid) 
+                        (CONCAT(STRBEFORE(STR(?bbsUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName (strafter(strafter(str(?ecUUID), "#"), "_") AS ?equipmentContainerUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+                ?bbsUUID rdf:type cim:BusbarSection .
+                OPTIONAL{?bbsUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?bbsUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?bbsUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+            }
+        }
+    `;
 //# sourceMappingURL=BusbarSection.js.map

package/dist/model/wires/BusbarSection.js.map

@@ -1 +1 @@
-{"version":3,"file":"BusbarSection.js","sourceRoot":"","sources":["../../../src/model/wires/BusbarSection.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qDAAgD;AAEhD,kEAAoF;AAEpF,MAAa,aAAc,SAAQ,qBAAS;IAExC,KAAK,CAAS;IAEd,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAEM,MAAM,CAAC,WAAW,GAAY;;;;;;;;;;;;;;;;;;;;;KAqBpC,CAAA;IACM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,aAAa,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;YAC1C,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACjD,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACrD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAC/B,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SAC1B;IACL,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAChC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,sBAAsB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SACvF;IACL,CAAC;;AAvEL,sCAyEC"}
+{"version":3,"file":"BusbarSection.js","sourceRoot":"","sources":["../../../src/model/wires/BusbarSection.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qDAAgD;AAEhD,kEAAoF;AAEpF,MAAa,aAAc,SAAQ,qBAAS;IAIxC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAwBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,aAAa,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACpE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;YAC1C,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACjD,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACrD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAC/B,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SAC1B;IACL,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAChC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,sBAAsB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SACvF;IACL,CAAC;;AAvEL,sCAyEC;AAjEiB,yBAAW,GAAY;;;;;;;;;;;;;;;;;;;;;KAqBpC,CAAA"}

package/dist/model/wires/Clamp.js

@@ -6,7 +6,15 @@ class Clamp extends ConductingEquipment_1.ConductingEquipment {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }
-    static sparqlQuery = `
+    static getQuerySPARQL(graphURI) {
+        if (graphURI.length > 0) {
+            return Clamp.sparqlQuery.replace("<http://default/>", graphURI);
+        }
+        return Clamp.sparqlQuery;
+    }
+}
+exports.Clamp = Clamp;
+Clamp.sparqlQuery = `
         PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
         PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
         PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
@@ -24,12 +32,4 @@ class Clamp extends ConductingEquipment_1.ConductingEquipment {
             }
         }
     `;
-    static getQuerySPARQL(graphURI) {
-        if (graphURI.length > 0) {
-            return Clamp.sparqlQuery.replace("<http://default/>", graphURI);
-        }
-        return Clamp.sparqlQuery;
-    }
-}
-exports.Clamp = Clamp;
 //# sourceMappingURL=Clamp.js.map

package/dist/model/wires/Clamp.js.map

@@ -1 +1 @@
-{"version":3,"file":"Clamp.js","sourceRoot":"","sources":["../../../src/model/wires/Clamp.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,MAAa,KAAM,SAAQ,yCAAmB;IAE1C,YAAY,IAAY,EAAE,IAAY,EAAE,SAAkB,EAAE,WAAoB;QAC5E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAEM,MAAM,CAAC,WAAW,GAAY;;;;;;;;;;;;;;;;;KAiBpC,CAAA;IACM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACnE;QACD,OAAO,KAAK,CAAC,WAAW,CAAC;IAC7B,CAAC;;AA7BL,sBA8BC"}
+{"version":3,"file":"Clamp.js","sourceRoot":"","sources":["../../../src/model/wires/Clamp.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,MAAa,KAAM,SAAQ,yCAAmB;IAE1C,YAAY,IAAY,EAAE,IAAY,EAAE,SAAkB,EAAE,WAAoB;QAC5E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAoBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACnE;QACD,OAAO,KAAK,CAAC,WAAW,CAAC;IAC7B,CAAC;;AA7BL,sBA8BC;AAxBiB,iBAAW,GAAY;;;;;;;;;;;;;;;;;KAiBpC,CAAA"}

package/dist/model/wires/CompositeSwitch.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompositeSwitch = void 0;
 const Equipment_1 = require("../core/Equipment.js");
 class CompositeSwitch extends Equipment_1.Equipment {
-    switches;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
         this.switches = new Map();

package/dist/model/wires/CompositeSwitch.js.map

@@ -1 +1 @@
-{"version":3,"file":"CompositeSwitch.js","sourceRoot":"","sources":["../../../src/model/wires/CompositeSwitch.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAG5C,MAAa,eAAgB,SAAQ,qBAAS;IAClC,QAAQ,CAAsB;IAEtC,YAAY,IAAY,EAAE,IAAY,EAAE,SAAkB,EAAE,WAAoB;QAC5E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9B,CAAC;CAGJ;AATD,0CASC"}
+{"version":3,"file":"CompositeSwitch.js","sourceRoot":"","sources":["../../../src/model/wires/CompositeSwitch.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAG5C,MAAa,eAAgB,SAAQ,qBAAS;IAG1C,YAAY,IAAY,EAAE,IAAY,EAAE,SAAkB,EAAE,WAAoB;QAC5E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9B,CAAC;CAGJ;AATD,0CASC"}

package/dist/model/wires/Conductor.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Conductor = void 0;
 const ConductingEquipment_1 = require("../core/ConductingEquipment.js");
-const utils_1 = require("../../util/utils.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const utils_2 = require("../../converter/integral7/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class Conductor extends ConductingEquipment_1.ConductingEquipment {
-    length;
     constructor(uuid, name, shortName, description, length) {
         super(uuid, name, shortName, description);
         this.length = +length;
@@ -18,7 +16,7 @@ class Conductor extends ConductingEquipment_1.ConductingEquipment {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.length = +(0, utils_1.getValue)(value, 'length');
+        this.length = +parser_utils_1.ParserUtils.getValue(value, 'length');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -42,7 +40,7 @@ class Conductor extends ConductingEquipment_1.ConductingEquipment {
     }
     validateMandatoryAttributesCGMES(defaultValuesConfig) {
         let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
-        if (!(0, utils_2.isNumericI7)(this.length)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.length)) {
             this.length = defaultValuesConfig.Conductor.length;
             if (defaultValues.length === 0) {
                 defaultValues += 'length';

package/dist/model/wires/Conductor.js.map

@@ -1 +1 @@
-{"version":3,"file":"Conductor.js","sourceRoot":"","sources":["../../../src/model/wires/Conductor.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,4CAA0C;AAG1C,qDAAgD;AAEhD,2DAA4D;AAC5D,kEAA6D;AAE7D,MAAa,SAAU,SAAQ,yCAAmB;IAEhD,MAAM,CAAS;IAEf,YAAY,IAAY,EAAE,IAAY,EAAE,SAAiB,EAAE,WAAmB,EAAE,MAAc;QAC5F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC;QAEtB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,wCAAwC;QACxF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAC1C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAGM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IACpC,CAAC;IAEM,kBAAkB,CAAC,eAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,iCAAiC;IACvB,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3F;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC;YACnD,IAAG,aAAa,CAAC,MAAM,KAAG,CAAC,EAAC;gBAC1B,aAAa,IAAI,QAAQ,CAAA;aAC1B;iBAAI;gBACH,aAAa,IAAI,SAAS,CAAA;aAC3B;SACF;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAClH,CAAC;IACM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAAA,CAAC;CACH;AAhED,8BAgEC"}
+{"version":3,"file":"Conductor.js","sourceRoot":"","sources":["../../../src/model/wires/Conductor.ts"],"names":[],"mappings":";;;AAAA,qEAAkE;AAIlE,qDAAkD;AAElD,kEAA6D;AAC7D,4DAAqE;AAErE,MAAa,SAAU,SAAQ,yCAAmB;IAIhD,YAAY,IAAY,EAAE,IAAY,EAAE,SAAiB,EAAE,WAAmB,EAAE,MAAc;QAC5F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC;QAEtB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,wCAAwC;QACxF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IACtD,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAGM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IACpC,CAAC;IAEM,kBAAkB,CAAC,eAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,iCAAiC;IACvB,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3F;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,IAAA,0BAAW,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC;YACnD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,aAAa,IAAI,QAAQ,CAAA;aAC1B;iBAAM;gBACL,aAAa,IAAI,SAAS,CAAA;aAC3B;SACF;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAClH,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAAA,CAAC;CACH;AAjED,8BAiEC"}

package/dist/model/wires/Cut.d.ts

@@ -1,4 +1,4 @@
-import { Switch } from '../../index.js';
+import { Switch } from './Switch.js';
 export declare class Cut extends Switch {
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
 }

package/dist/model/wires/Cut.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cut = void 0;
-const __1 = require("../../index.js");
-class Cut extends __1.Switch {
+const Switch_1 = require("./Switch.js");
+class Cut extends Switch_1.Switch {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }

package/dist/model/wires/Cut.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cut.js","sourceRoot":"","sources":["../../../src/model/wires/Cut.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B,MAAa,GAAI,SAAQ,UAAM;IAC3B,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;CACJ;AAJD,kBAIC"}
+{"version":3,"file":"Cut.js","sourceRoot":"","sources":["../../../src/model/wires/Cut.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAElC,MAAa,GAAI,SAAQ,eAAM;IAC7B,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;CACF;AAJD,kBAIC"}

package/dist/model/wires/Disconnector.js

@@ -28,38 +28,6 @@ class Disconnector extends Switch_1.Switch {
         }
         return geoJSON;
     }
-    static sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX amp:	 		<http://amprion.net/CIM/Extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-
-        SELECT  (strafter(strafter(str(?dUUID), '#'), '_') AS ?uuid) 
-        (CONCAT(STRBEFORE(STR(?dUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName ?description 
-        ?open ?aggregate ?normalOpen ?retained (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
-                        
-        WHERE {
-            GRAPH <http://default/>{
-                ?dUUID rdf:type cim:Disconnector .
-                OPTIONAL{?dUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?dUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?dUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?dUUID cim:Equipment.aggregate ?aggregate .}
-                OPTIONAL{?dUUID cim:Switch.normalOpen ?normalOpen .}
-                OPTIONAL{?dUUID cim:Switch.retained ?retained .}
-                OPTIONAL{?dUUID cim:Switch.open ?open .}
-                OPTIONAL{?dUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-                OPTIONAL{?dUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
-            }
-        }
-        GROUP BY ?dUUID ?baseIRI ?name ?shortName ?description 
-         ?open ?aggregate ?normalOpen ?retained ?ecUUID
-    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return Disconnector.sparqlQuery.replace('<http://default/>', graphURI);
@@ -67,7 +35,8 @@ class Disconnector extends Switch_1.Switch {
         return Disconnector.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        var _a, _b;
+        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
             const newClass = new Disconnector();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addDisconnector(newClass);
@@ -105,4 +74,36 @@ class Disconnector extends Switch_1.Switch {
     }
 }
 exports.Disconnector = Disconnector;
+Disconnector.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+        PREFIX amp:	 		<http://amprion.net/CIM/Extensions#> 
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+
+        SELECT  (strafter(strafter(str(?dUUID), '#'), '_') AS ?uuid) 
+        (CONCAT(STRBEFORE(STR(?dUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName ?description 
+        ?open ?aggregate ?normalOpen ?retained (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
+                        
+        WHERE {
+            GRAPH <http://default/>{
+                ?dUUID rdf:type cim:Disconnector .
+                OPTIONAL{?dUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?dUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?dUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?dUUID cim:Equipment.aggregate ?aggregate .}
+                OPTIONAL{?dUUID cim:Switch.normalOpen ?normalOpen .}
+                OPTIONAL{?dUUID cim:Switch.retained ?retained .}
+                OPTIONAL{?dUUID cim:Switch.open ?open .}
+                OPTIONAL{?dUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+                OPTIONAL{?dUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
+            }
+        }
+        GROUP BY ?dUUID ?baseIRI ?name ?shortName ?description 
+         ?open ?aggregate ?normalOpen ?retained ?ecUUID
+    `;
 //# sourceMappingURL=Disconnector.js.map

package/dist/model/wires/Disconnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"Disconnector.js","sourceRoot":"","sources":["../../../src/model/wires/Disconnector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Disconnector.js","sourceRoot":"","sources":["../../../src/model/wires/Disconnector.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/EarthFaultCompensator.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EarthFaultCompensator = void 0;
 const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class EarthFaultCompensator extends __1.ConductingEquipment {
-    r;
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.r = +(0, utils_1.getValue)(value, 'r');
+        this.r = +parser_utils_1.ParserUtils.getValue(value, 'r');
     }
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);

package/dist/model/wires/EarthFaultCompensator.js.map

@@ -1 +1 @@
-{"version":3,"file":"EarthFaultCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/EarthFaultCompensator.ts"],"names":[],"mappings":";;;AAAA,6BAAmD;AACnD,4CAA0C;AAE1C,kEAA6D;AAE7D,MAAa,qBAAsB,SAAQ,uBAAmB;IAC1D,CAAC,CAAS;IAEH,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACS,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAG,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAC/B,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,0BAA0B,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;SACvF;IACL,CAAC;CAGJ;AAfD,sDAeC"}
+{"version":3,"file":"EarthFaultCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/EarthFaultCompensator.ts"],"names":[],"mappings":";;;AAAA,6BAAqD;AACrD,4DAAwD;AAExD,kEAA6D;AAE7D,MAAa,qBAAsB,SAAQ,uBAAmB;IAGrD,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,CAAC,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,0BAA0B,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;SACrF;IACH,CAAC;CAGF;AAhBD,sDAgBC"}

package/dist/model/wires/EnergyConsumer.js

@@ -1,23 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnergyConsumer = void 0;
-const utils_1 = require("../../util/utils.js");
 const sparql_building_block_1 = require("../../util/sparql/sparql-building-block.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const datatype_converter_1 = require("../../util/datatype-converter.js");
-const utils_2 = require("../../converter/integral7/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 const EnergyConnection_1 = require("./EnergyConnection.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class EnergyConsumer extends EnergyConnection_1.EnergyConnection {
-    customerCount;
-    /** installierte Wirklast */
-    p;
-    /** installierte Blindlast */
-    q;
-    pfixed;
-    qfixed;
-    pfixedPct;
-    qfixedPct;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
         this.prop2namespacePrefix.set('p', 'cim'); // zur Generierung der Insert-Statements
@@ -92,39 +82,6 @@ class EnergyConsumer extends EnergyConnection_1.EnergyConnection {
         }
         return geoJSON;
     }
-    static sparqlQuery = `
-      ${sparql_building_block_1.NS_PREFIX_CIM} 
-      ${sparql_building_block_1.NS_PREFIX_ENERVANCE} 
-      ${sparql_building_block_1.NS_PREFIX_ENTSOE} 
-      ${sparql_building_block_1.NS_PREFIX_RDF} 
-      ${sparql_building_block_1.NS_PREFIX_RDF} 
-      ${sparql_building_block_1.NS_PREFIX_ENTSOE} 
-      ${sparql_building_block_1.NS_PREFIX_APF}
-      ${sparql_building_block_1.NS_PREFIX_AFN}
-
-      SELECT  (strafter(strafter(str(?econUUID), '#'), '_') AS ?uuid)  
-      (CONCAT(STRBEFORE(STR(?econUUID), '#_'), '#_') AS ?baseIRI) 
-      ?name ?shortName ?description ?aggregate ?p ?q
-      (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)  
-      (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
-      (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)              
-      WHERE {
-          GRAPH <http://default/>{
-              ?econUUID rdf:type cim:EnergyConsumer . 
-              OPTIONAL{?econUUID cim:IdentifiedObject.name ?name .}
-              OPTIONAL{?econUUID entsoe:IdentifiedObject.shortName ?shortName .}
-              OPTIONAL{?econUUID cim:IdentifiedObject.description ?description .}
-              OPTIONAL{?econUUID cim:EnergyConsumer.p ?p .}
-              OPTIONAL{?econUUID cim:EnergyConsumer.q ?q .}
-                              
-              OPTIONAL{?econUUID cim:Equipment.aggregate ?aggregate .}
-              OPTIONAL{?econUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-              OPTIONAL{?econUUID cim:PowerSystemResource.PSRType ?ptUUID .}
-              OPTIONAL{?econUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
-          }
-      }
-     GROUP BY ?econUUID ?baseIRI ?name ?shortName ?description ?aggregate ?p ?q ?ecUUID ?ptUUID
-  `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return EnergyConsumer.sparqlQuery.replace('<http://default/>', graphURI);
@@ -132,7 +89,8 @@ class EnergyConsumer extends EnergyConnection_1.EnergyConnection {
         return EnergyConsumer.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        var _a, _b;
+        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
             const newClass = new EnergyConsumer();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addEnergyConsumer(newClass);
@@ -140,8 +98,8 @@ class EnergyConsumer extends EnergyConnection_1.EnergyConnection {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.p = +(0, utils_1.getNumberValue)(value, 'p');
-        this.q = +(0, utils_1.getNumberValue)(value, 'q');
+        this.p = +(0, parser_utils_1.getNumberValue)(value, 'p');
+        this.q = +(0, parser_utils_1.getNumberValue)(value, 'q');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -236,11 +194,11 @@ class EnergyConsumer extends EnergyConnection_1.EnergyConnection {
     }
     validateMandatoryAttributesCGMES(defaultValuesConfig) {
         let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
-        if (!(0, utils_2.isNumericI7)(this.p)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.p)) {
             this.p = defaultValuesConfig.EnergyConsumer.p;
             defaultValues += 'p,';
         }
-        if (!(0, utils_2.isNumericI7)(this.q)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.q)) {
             this.q = defaultValuesConfig.EnergyConsumer.q;
             defaultValues += 'q,';
         }
@@ -258,4 +216,37 @@ class EnergyConsumer extends EnergyConnection_1.EnergyConnection {
     }
 }
 exports.EnergyConsumer = EnergyConsumer;
+EnergyConsumer.sparqlQuery = `
+      ${sparql_building_block_1.NS_PREFIX_CIM} 
+      ${sparql_building_block_1.NS_PREFIX_ENERVANCE} 
+      ${sparql_building_block_1.NS_PREFIX_ENTSOE} 
+      ${sparql_building_block_1.NS_PREFIX_RDF} 
+      ${sparql_building_block_1.NS_PREFIX_RDF} 
+      ${sparql_building_block_1.NS_PREFIX_ENTSOE} 
+      ${sparql_building_block_1.NS_PREFIX_APF}
+      ${sparql_building_block_1.NS_PREFIX_AFN}
+
+      SELECT  (strafter(strafter(str(?econUUID), '#'), '_') AS ?uuid)  
+      (CONCAT(STRBEFORE(STR(?econUUID), '#_'), '#_') AS ?baseIRI) 
+      ?name ?shortName ?description ?aggregate ?p ?q
+      (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)  
+      (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
+      (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)              
+      WHERE {
+          GRAPH <http://default/>{
+              ?econUUID rdf:type cim:EnergyConsumer . 
+              OPTIONAL{?econUUID cim:IdentifiedObject.name ?name .}
+              OPTIONAL{?econUUID entsoe:IdentifiedObject.shortName ?shortName .}
+              OPTIONAL{?econUUID cim:IdentifiedObject.description ?description .}
+              OPTIONAL{?econUUID cim:EnergyConsumer.p ?p .}
+              OPTIONAL{?econUUID cim:EnergyConsumer.q ?q .}
+                              
+              OPTIONAL{?econUUID cim:Equipment.aggregate ?aggregate .}
+              OPTIONAL{?econUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+              OPTIONAL{?econUUID cim:PowerSystemResource.PSRType ?ptUUID .}
+              OPTIONAL{?econUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
+          }
+      }
+     GROUP BY ?econUUID ?baseIRI ?name ?shortName ?description ?aggregate ?p ?q ?ecUUID ?ptUUID
+  `;
 //# sourceMappingURL=EnergyConsumer.js.map

package/dist/model/wires/EnergyConsumer.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnergyConsumer.js","sourceRoot":"","sources":["../../../src/model/wires/EnergyConsumer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EnergyConsumer.js","sourceRoot":"","sources":["../../../src/model/wires/EnergyConsumer.ts"],"names":[],"mappings":"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"}