@enervance/insight-cim-model 0.0.77 → 0.0.79

package/dist/model/assetinfo/SwitchInfo.js

@@ -6,26 +6,6 @@ class SwitchInfo extends AssetInfo_1.AssetInfo {
     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(?mrid), '#'), '_') AS ?uuid) 
-        (CONCAT(STRBEFORE(STR(?mrid), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName
-        WHERE { 
-            GRAPH <http://default/>{
-                ?mrid rdf:type cim:SwitchInfo .
-                OPTIONAL{?mrid cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?mrid entsoe:IdentifiedObject.shortName ?shortName .}
-            }
-        }
-    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return SwitchInfo.sparqlQuery.replace('<http://default/>', graphURI);
@@ -33,7 +13,8 @@ class SwitchInfo extends AssetInfo_1.AssetInfo {
         return SwitchInfo.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 switchInfo = new SwitchInfo();
             switchInfo.resolveAttributesFusekiJSON(value);
             cimModel.addSwitchInfo(switchInfo);
@@ -47,4 +28,24 @@ class SwitchInfo extends AssetInfo_1.AssetInfo {
     }
 }
 exports.SwitchInfo = SwitchInfo;
+SwitchInfo.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(?mrid), '#'), '_') AS ?uuid) 
+        (CONCAT(STRBEFORE(STR(?mrid), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName
+        WHERE { 
+            GRAPH <http://default/>{
+                ?mrid rdf:type cim:SwitchInfo .
+                OPTIONAL{?mrid cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?mrid entsoe:IdentifiedObject.shortName ?shortName .}
+            }
+        }
+    `;
 //# sourceMappingURL=SwitchInfo.js.map

package/dist/model/assetinfo/SwitchInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchInfo.js","sourceRoot":"","sources":["../../../src/model/assetinfo/SwitchInfo.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAGxC,MAAa,UAAW,SAAQ,qBAAS;IAEvC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,MAAM,CAAC,WAAW,GAAY;;;;;;;;;;;;;;;;;;;KAmBlC,CAAA;IACI,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC5C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,WAAW,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;YACpC,UAAU,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC9C,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;;AAhDH,gCAkDC"}
+{"version":3,"file":"SwitchInfo.js","sourceRoot":"","sources":["../../../src/model/assetinfo/SwitchInfo.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAGxC,MAAa,UAAW,SAAQ,qBAAS;IAEvC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAuBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC5C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,WAAW,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACtE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;YACpC,UAAU,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC9C,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;;AAhDH,gCAkDC;AA3Ce,sBAAW,GAAY;;;;;;;;;;;;;;;;;;;KAmBlC,CAAA"}

package/dist/model/assetinfo/TapChangerInfo.js

@@ -6,47 +6,13 @@ const CurrentFlow_1 = require("../domain/CurrentFlow.js");
 const Voltage_1 = require("../domain/Voltage.js");
 const ApparentPower_1 = require("../domain/ApparentPower.js");
 const AngleDegrees_1 = require("../domain/AngleDegrees.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");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const UnitMultiplier_1 = require("../domain/UnitMultiplier.js");
 const UnitSymbol_1 = require("../domain/UnitSymbol.js");
 const datatype_converter_1 = require("../../util/datatype-converter.js");
-const xml_serializer_2 = require("../../util/xml/xml.serializer.js");
 class TapChangerInfo extends AssetInfo_1.AssetInfo {
-    /** Highest possible tap step position, advance from neutral. */
-    highStep;
-    /** Lowest possible tap step position, retard from neutral. */
-    lowStep;
-    /** The neutral tap step position for the winding. */
-    neutralStep;
-    /** Rated Voltage */
-    ratedVoltage;
-    /** Tap step increment, in per cent of rated voltage, per step position. In %*/
-    stepVoltageIncrement;
-    /**
-     * Basic Insulation Level (BIL) expressed as the impulse crest voltage of a nominal wave, typically 1.2 X 50 microsecond.
-     * This is a measure of the ability of the insulation to withstand very high voltage surges.
-     */
-    bil;
-    /** Built-in current transformer primary rating. */
-    ctRating;
-    /** Built-in current transducer ratio. */
-    ctRatio;
-    /** Frequency at which the ratings apply. */
-    //frequency: Frequency;
-    /** Whether this tap changer has under load tap changing capabilities. */
-    isTcul;
-    /** Voltage at which the winding operates at the neutral tap setting. */
-    neutralU;
-    /** Built-in voltage transducer ratio. */
-    ptRatio;
-    /** Rated apparent power. */
-    ratedApparendPower;
-    /** Rated current. */
-    ratedCurrent;
-    /** Phase shift per step position. */
-    stepPhaseIncrement;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
@@ -55,32 +21,60 @@ class TapChangerInfo extends AssetInfo_1.AssetInfo {
         const suffixID = rdf_xml_1.RDF_XML.RDF_ID;
         const prefixUUID = this.getPrefixUUID(suffixID);
         xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'TapChangerInfo', rdf_xml_1.RDF_XML.CIM_NS_16);
-        (0, xml_serializer_2.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+        (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
         this.toCIMXMLAttributes(xmlWriter, profile);
         this.toCIMXMLAssociations(xmlWriter, profile);
         xmlWriter.endElement();
     }
     toCIMXMLAttributes(xmlWriter, profile) {
+        var _a, _b, _c, _d, _e, _f, _g;
         super.toCIMXMLAttributes(xmlWriter, profile);
         (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.highStep`, this.highStep);
         (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.lowStep`, this.lowStep);
         (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.neutralStep`, this.neutralStep);
-        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ratedVoltage`, this.ratedVoltage?.value);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ratedVoltage`, (_a = this.ratedVoltage) === null || _a === void 0 ? void 0 : _a.value);
         (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.stepVoltageIncrement`, this.stepVoltageIncrement);
-        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.bil`, this.bil?.value);
-        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ctRating`, this.ctRating?.value);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.bil`, (_b = this.bil) === null || _b === void 0 ? void 0 : _b.value);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ctRating`, (_c = this.ctRating) === null || _c === void 0 ? void 0 : _c.value);
         (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ctRatio`, this.ctRatio);
         (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.isTcul`, this.isTcul);
-        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.neutralU`, this.neutralU?.value);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.neutralU`, (_d = this.neutralU) === null || _d === void 0 ? void 0 : _d.value);
         (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ptRatio`, this.ptRatio);
-        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ratedApparendPower`, this.ratedApparendPower?.value);
-        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ratedCurrent`, this.ratedCurrent?.value);
-        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.stepPhaseIncrement`, this.stepPhaseIncrement?.value);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ratedApparendPower`, (_e = this.ratedApparendPower) === null || _e === void 0 ? void 0 : _e.value);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.ratedCurrent`, (_f = this.ratedCurrent) === null || _f === void 0 ? void 0 : _f.value);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:TapChangerInfo.stepPhaseIncrement`, (_g = this.stepPhaseIncrement) === null || _g === void 0 ? void 0 : _g.value);
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
     }
-    static sparqlQuery = `
+    //TODO
+    /*    public static resolveClassFusekiJSON(data: any, cimModel: Model) {
+            data?.results?.bindings?.forEach((value: any) => {
+                const newClass = new TapChangerInfo();
+                newClass.resolveAttributesFusekiJSON(value);
+                cimModel.addTapChangerInfo(newClass);
+            });
+        }*/
+    resolveAttributesFusekiJSON(value) {
+        super.resolveAttributesFusekiJSON(value);
+        this.highStep = +parser_utils_1.ParserUtils.getValue(value, 'highStep');
+        this.lowStep = +parser_utils_1.ParserUtils.getValue(value, 'lowStep');
+        this.neutralStep = +parser_utils_1.ParserUtils.getValue(value, 'neutralStep');
+        this.ratedVoltage = new Voltage_1.Voltage(+parser_utils_1.ParserUtils.getValue(value, 'ratedVoltage'), UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
+        this.stepVoltageIncrement = +parser_utils_1.ParserUtils.getValue(value, 'stepVoltageIncrement');
+        this.bil = new Voltage_1.Voltage(+parser_utils_1.ParserUtils.getValue(value, 'bil'), UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
+        this.ctRating = new CurrentFlow_1.CurrentFlow(+parser_utils_1.ParserUtils.getValue(value, 'ctRating'), UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
+        this.ctRatio = +parser_utils_1.ParserUtils.getValue(value, 'ctRatio');
+        this.isTcul = (0, datatype_converter_1.toBoolean)(parser_utils_1.ParserUtils.getValue(value, 'isTcul'));
+        this.neutralU = new Voltage_1.Voltage(+parser_utils_1.ParserUtils.getValue(value, 'neutralU'), UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
+        this.ptRatio = +parser_utils_1.ParserUtils.getValue(value, 'ptRatio');
+        this.ratedApparendPower = new ApparentPower_1.ApparentPower(+parser_utils_1.ParserUtils.getValue(value, 'ratedApparendPower'), UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
+        this.ratedCurrent = new CurrentFlow_1.CurrentFlow(+parser_utils_1.ParserUtils.getValue(value, 'ratedCurrent'), UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
+        this.stepPhaseIncrement = new AngleDegrees_1.AngleDegrees(+parser_utils_1.ParserUtils.getValue(value, 'stepPhaseIncrement'), UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.deg);
+    }
+}
+exports.TapChangerInfo = TapChangerInfo;
+TapChangerInfo.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#>
@@ -120,31 +114,4 @@ class TapChangerInfo extends AssetInfo_1.AssetInfo {
             }
         }
     `;
-    //TODO
-    /*    public static resolveClassFusekiJSON(data: any, cimModel: Model) {
-            data?.results?.bindings?.forEach((value: any) => {
-                const newClass = new TapChangerInfo();
-                newClass.resolveAttributesFusekiJSON(value);
-                cimModel.addTapChangerInfo(newClass);
-            });
-        }*/
-    resolveAttributesFusekiJSON(value) {
-        super.resolveAttributesFusekiJSON(value);
-        this.highStep = +(0, utils_1.getValue)(value, 'highStep');
-        this.lowStep = +(0, utils_1.getValue)(value, 'lowStep');
-        this.neutralStep = +(0, utils_1.getValue)(value, 'neutralStep');
-        this.ratedVoltage = new Voltage_1.Voltage(+(0, utils_1.getValue)(value, 'ratedVoltage'), UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
-        this.stepVoltageIncrement = +(0, utils_1.getValue)(value, 'stepVoltageIncrement');
-        this.bil = new Voltage_1.Voltage(+(0, utils_1.getValue)(value, 'bil'), UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
-        this.ctRating = new CurrentFlow_1.CurrentFlow(+(0, utils_1.getValue)(value, 'ctRating'), UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
-        this.ctRatio = +(0, utils_1.getValue)(value, 'ctRatio');
-        this.isTcul = (0, datatype_converter_1.toBoolean)((0, utils_1.getValue)(value, 'isTcul'));
-        this.neutralU = new Voltage_1.Voltage(+(0, utils_1.getValue)(value, 'neutralU'), UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
-        this.ptRatio = +(0, utils_1.getValue)(value, 'ptRatio');
-        this.ratedApparendPower = new ApparentPower_1.ApparentPower(+(0, utils_1.getValue)(value, 'ratedApparendPower'), UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
-        this.ratedCurrent = new CurrentFlow_1.CurrentFlow(+(0, utils_1.getValue)(value, 'ratedCurrent'), UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
-        this.stepPhaseIncrement = new AngleDegrees_1.AngleDegrees(+(0, utils_1.getValue)(value, 'stepPhaseIncrement'), UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.deg);
-    }
-}
-exports.TapChangerInfo = TapChangerInfo;
 //# sourceMappingURL=TapChangerInfo.js.map

package/dist/model/assetinfo/TapChangerInfo.js.map

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

package/dist/model/assetinfo/TransformerEndInfo.js

@@ -4,16 +4,9 @@ exports.TransformerEndInfo = void 0;
 const AssetInfo_1 = require("./AssetInfo.js");
 const ApparentPower_1 = require("../domain/ApparentPower.js");
 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");
-const xml_serializer_2 = require("../../util/xml/xml.serializer.js");
 class TransformerEndInfo extends AssetInfo_1.AssetInfo {
-    connectionKind;
-    endNumber;
-    ratedS;
-    ratedU;
-    shortTermS;
-    r;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
@@ -22,15 +15,16 @@ class TransformerEndInfo extends AssetInfo_1.AssetInfo {
         const suffixID = __1.RDF_XML.RDF_ID;
         const prefixUUID = this.getPrefixUUID(suffixID);
         xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'TransformerEndInfo', __1.RDF_XML.CIM_NS_16);
-        (0, xml_serializer_2.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+        (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
         this.toCIMXMLAttributes(xmlWriter, profile);
         this.toCIMXMLAssociations(xmlWriter, profile);
         xmlWriter.endElement();
     }
     toCIMXMLAttributes(xmlWriter, profile) {
+        var _a, _b;
         super.toCIMXMLAttributes(xmlWriter, profile);
-        (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:TransformerEndInfo.ratedS`, this.ratedS?.value);
-        (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:TransformerEndInfo.ratedU`, this.ratedU?.value);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:TransformerEndInfo.ratedS`, (_a = this.ratedS) === null || _a === void 0 ? void 0 : _a.value);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:TransformerEndInfo.ratedU`, (_b = this.ratedU) === null || _b === void 0 ? void 0 : _b.value);
         (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:TransformerEndInfo.r`, this.r);
         (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:TransformerEndInfo.endNumber`, this.endNumber);
     }
@@ -39,10 +33,10 @@ class TransformerEndInfo extends AssetInfo_1.AssetInfo {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.endNumber = +(0, utils_1.getValue)(value, 'endNumber');
-        this.ratedS = new ApparentPower_1.ApparentPower(+(0, utils_1.getValue)(value, 'ratedS'), __1.UnitMultiplier.k, __1.UnitSymbol.V);
-        this.ratedU = new __1.Voltage(+(0, utils_1.getValue)(value, 'ratedU'), __1.UnitMultiplier.k, __1.UnitSymbol.V);
-        this.r = +(0, utils_1.getValue)(value, 'r');
+        this.endNumber = +parser_utils_1.ParserUtils.getValue(value, 'endNumber');
+        this.ratedS = new ApparentPower_1.ApparentPower(+parser_utils_1.ParserUtils.getValue(value, 'ratedS'), __1.UnitMultiplier.k, __1.UnitSymbol.V);
+        this.ratedU = new __1.Voltage(+parser_utils_1.ParserUtils.getValue(value, 'ratedU'), __1.UnitMultiplier.k, __1.UnitSymbol.V);
+        this.r = +parser_utils_1.ParserUtils.getValue(value, 'r');
     }
 }
 exports.TransformerEndInfo = TransformerEndInfo;

package/dist/model/assetinfo/TransformerEndInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"TransformerEndInfo.js","sourceRoot":"","sources":["../../../src/model/assetinfo/TransformerEndInfo.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,2DAAsD;AACtD,6BAAmE;AACnE,4CAA0C;AAC1C,kEAA6D;AAE7D,kEAAsE;AAGtE,MAAa,kBAAmB,SAAQ,qBAAS;IAE7C,cAAc,CAAoB;IAClC,SAAS,CAAS;IAElB,MAAM,CAAgB;IACtB,MAAM,CAAU;IAChB,UAAU,CAAgB;IAC1B,CAAC,CAAS;IAEV,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,MAAM,QAAQ,GAAG,WAAO,CAAC,MAAM,CAAC;QAChC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChD,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,oBAAoB,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;QACzF,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACjF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACrG,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,6BAAa,CAAC,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,kBAAc,CAAC,CAAC,EAAE,cAAU,CAAC,CAAC,CAAC,CAAC;QAC5F,IAAI,CAAC,MAAM,GAAG,IAAI,WAAO,CAAC,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,kBAAc,CAAC,CAAC,EAAE,cAAU,CAAC,CAAC,CAAC,CAAC;QACtF,IAAI,CAAC,CAAC,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;CACJ;AA5CD,gDA4CC"}
+{"version":3,"file":"TransformerEndInfo.js","sourceRoot":"","sources":["../../../src/model/assetinfo/TransformerEndInfo.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,2DAAwD;AACxD,6BAAqE;AACrE,4DAAwD;AACxD,kEAAoF;AAIpF,MAAa,kBAAmB,SAAQ,qBAAS;IAU/C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,MAAM,QAAQ,GAAG,WAAO,CAAC,MAAM,CAAC;QAChC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChD,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,oBAAoB,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;QACzF,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;IACzB,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,4BAA4B,EAAE,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,CAAC;QAClG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,4BAA4B,EAAE,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,CAAC;QAClG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACjF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,+BAA+B,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACnG,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3D,IAAI,CAAC,MAAM,GAAG,IAAI,6BAAa,CAAC,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,kBAAc,CAAC,CAAC,EAAE,cAAU,CAAC,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,MAAM,GAAG,IAAI,WAAO,CAAC,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,kBAAc,CAAC,CAAC,EAAE,cAAU,CAAC,CAAC,CAAC,CAAC;QAClG,IAAI,CAAC,CAAC,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;CACF;AA5CD,gDA4CC"}

package/dist/model/assetinfo/WireInfo.js

@@ -3,12 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WireInfo = void 0;
 const AssetInfo_1 = require("./AssetInfo.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const utils_1 = require("../../util/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class WireInfo extends AssetInfo_1.AssetInfo {
-    sizeDescription; // Querschnitt
-    strandCount; // Anzahl der Adern
-    ratedCurrent; //CurrentFlow;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
@@ -20,9 +17,9 @@ class WireInfo extends AssetInfo_1.AssetInfo {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.sizeDescription = (0, utils_1.getValue)(value, 'sizeDescription');
-        this.strandCount = +(0, utils_1.getValue)(value, 'strandCount');
-        this.ratedCurrent = +(0, utils_1.getValue)(value, 'ratedCurrent');
+        this.sizeDescription = parser_utils_1.ParserUtils.getValue(value, 'sizeDescription');
+        this.strandCount = +parser_utils_1.ParserUtils.getValue(value, 'strandCount');
+        this.ratedCurrent = +parser_utils_1.ParserUtils.getValue(value, 'ratedCurrent');
     }
     createNewStatementSPARQL() {
         return `

package/dist/model/assetinfo/WireInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"WireInfo.js","sourceRoot":"","sources":["../../../src/model/assetinfo/WireInfo.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AACtC,qDAAgD;AAChD,4CAA0C;AAE1C,kEAA6D;AAE7D,MAAa,QAAS,SAAQ,qBAAS;IAErC,eAAe,CAAS,CAAC,cAAc;IACvC,WAAW,CAAS,CAAC,mBAAmB;IAExC,YAAY,CAAS,CAAC,cAAc;IAEpC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGS,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,wBAAwB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC/F,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACvD,CAAC;IAGM,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;6CAEM,IAAI,CAAC,IAAI,KAAK,CAAC;IAC1D,CAAC;CACF;AAjCD,4BAiCC"}
+{"version":3,"file":"WireInfo.js","sourceRoot":"","sources":["../../../src/model/assetinfo/WireInfo.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,qDAAkD;AAGlD,kEAA6D;AAC7D,4DAAwD;AAExD,MAAa,QAAS,SAAQ,qBAAS;IAOrC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGS,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACnG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,wBAAwB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC/F,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACtE,IAAI,CAAC,WAAW,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,GAAG,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACnE,CAAC;IAGM,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;6CAEM,IAAI,CAAC,IAAI,KAAK,CAAC;IAC1D,CAAC;CACF;AAjCD,4BAiCC"}

package/dist/model/assets/AggregateScore.js

@@ -3,11 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AggregateScore = void 0;
 const AnalyticScore_1 = require("./AnalyticScore.js");
 class AggregateScore extends AnalyticScore_1.AnalyticScore {
-    analyticScore = new Map();
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
+        this.analyticScore = new Map();
     }
-    static sparqlQuery = `
+    static getQuerySPARQL(graphURI) {
+        if (graphURI.length > 0) {
+            return AggregateScore.sparqlQuery.replace('<http://default/>', graphURI);
+        }
+        return AggregateScore.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 newClass = new AggregateScore();
+            newClass.resolveAttributesFusekiJSON(value);
+            cimModel.addAnalyticScore(newClass);
+        });
+    }
+    getAnalyticScore() {
+        return this.analyticScore;
+    }
+    addAnalyticScore(score) {
+        return this.analyticScore.set(score === null || score === void 0 ? void 0 : score.getUUID(), score);
+    }
+}
+exports.AggregateScore = AggregateScore;
+AggregateScore.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#> 
@@ -30,25 +52,4 @@ class AggregateScore extends AnalyticScore_1.AnalyticScore {
             }
         }
     `;
-    static getQuerySPARQL(graphURI) {
-        if (graphURI.length > 0) {
-            return AggregateScore.sparqlQuery.replace('<http://default/>', graphURI);
-        }
-        return AggregateScore.sparqlQuery;
-    }
-    static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
-            const newClass = new AggregateScore();
-            newClass.resolveAttributesFusekiJSON(value);
-            cimModel.addAnalyticScore(newClass);
-        });
-    }
-    getAnalyticScore() {
-        return this.analyticScore;
-    }
-    addAnalyticScore(score) {
-        return this.analyticScore.set(score?.getUUID(), score);
-    }
-}
-exports.AggregateScore = AggregateScore;
 //# sourceMappingURL=AggregateScore.js.map

package/dist/model/assets/AggregateScore.js.map

@@ -1 +1 @@
-{"version":3,"file":"AggregateScore.js","sourceRoot":"","sources":["../../../src/model/assets/AggregateScore.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAIhD,MAAa,cAAe,SAAQ,6BAAa;IAEvC,aAAa,GAA+B,IAAI,GAAG,EAAE,CAAC;IAE9D,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;KAsBjC,CAAC;IAEG,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC1E;QACD,OAAO,cAAc,CAAC,WAAW,CAAC;IACpC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;YACtC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAGM,gBAAgB;QACrB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAEM,gBAAgB,CAAC,KAAoB;QAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;;AAtDH,wCAyDC"}
+{"version":3,"file":"AggregateScore.js","sourceRoot":"","sources":["../../../src/model/assets/AggregateScore.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAIhD,MAAa,cAAe,SAAQ,6BAAa;IAI/C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAHpC,kBAAa,GAA+B,IAAI,GAAG,EAAE,CAAC;IAI9D,CAAC;IA0BM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC1E;QACD,OAAO,cAAc,CAAC,WAAW,CAAC;IACpC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACtE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;YACtC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAGM,gBAAgB;QACrB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAEM,gBAAgB,CAAC,KAAoB;QAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;;AAtDH,wCAyDC;AAjDe,0BAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;KAsBjC,CAAC"}

package/dist/model/assets/Analytic.js

@@ -3,42 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Analytic = void 0;
 const Document_1 = require("../common/Document.js");
 const AnalyticKind_1 = require("./AnalyticKind.js");
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class Analytic extends Document_1.Document {
-    kind;
-    bestValue;
-    worstValue;
-    assets = new Map();
-    assetsUUID; // für Parser
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
+        this.assets = new Map();
         this.baseIRI = baseIRI;
     }
-    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 apf:         <http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (STRAFTER(str(?mrid), '#_') AS ?uuid)  
-        (CONCAT(STRBEFORE(str(?mrid), '#_'), '#_') AS ?baseIRI) 
-        ?name ?type ?kind ?bestValue ?worstValue
-        (STRAFTER(STRAFTER(str(?analyticKind), '#'), '.') AS ?kind) 
-         (group_concat(STRAFTER(str(?aUUID), '#_');separator=',') as ?assetsUUID)
-        WHERE { 
-            GRAPH <http://default/>{
-                ?mrid rdf:type cim:Analytic .
-                OPTIONAL { ?mrid cim:IdentifiedObject.name ?name .}
-                OPTIONAL { ?mrid cim:Document.type ?type .}
-                OPTIONAL { ?mrid cim:Analytic.kind ?analyticKind .}
-                OPTIONAL { ?mrid cim:Analytic.bestValue ?bestValue .}
-                OPTIONAL { ?mrid cim:Analytic.worstValue ?worstValue .}
-                OPTIONAL { ?mrid cim:Analytic.Asset ?aUUID .}
-            }
-        }
-        GROUP BY ?mrid ?baseIRI   ?name ?type  ?analyticKind ?bestValue ?worstValue`;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return Analytic.sparqlQuery.replace('<http://default/>', graphURI);
@@ -46,7 +17,8 @@ class Analytic extends Document_1.Document {
         return Analytic.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 Analytic();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addAnalytic(newClass);
@@ -54,10 +26,10 @@ class Analytic extends Document_1.Document {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.bestValue = +(0, utils_1.getNumberValue)(value, 'bestValue');
-        this.worstValue = +(0, utils_1.getNumberValue)(value, 'worstValue');
-        this.kind = AnalyticKind_1.AnalyticKind[(0, utils_1.getValue)(value, 'kind')];
-        this.assetsUUID = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'assetsUUID'), ',');
+        this.bestValue = +(0, parser_utils_1.getNumberValue)(value, 'bestValue');
+        this.worstValue = +(0, parser_utils_1.getNumberValue)(value, 'worstValue');
+        this.kind = AnalyticKind_1.AnalyticKind[parser_utils_1.ParserUtils.getValue(value, 'kind')];
+        this.assetsUUID = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'assetsUUID'), ',');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -88,4 +60,29 @@ class Analytic extends Document_1.Document {
     }
 }
 exports.Analytic = Analytic;
+Analytic.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 apf:         <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (STRAFTER(str(?mrid), '#_') AS ?uuid)  
+        (CONCAT(STRBEFORE(str(?mrid), '#_'), '#_') AS ?baseIRI) 
+        ?name ?type ?kind ?bestValue ?worstValue
+        (STRAFTER(STRAFTER(str(?analyticKind), '#'), '.') AS ?kind) 
+         (group_concat(STRAFTER(str(?aUUID), '#_');separator=',') as ?assetsUUID)
+        WHERE { 
+            GRAPH <http://default/>{
+                ?mrid rdf:type cim:Analytic .
+                OPTIONAL { ?mrid cim:IdentifiedObject.name ?name .}
+                OPTIONAL { ?mrid cim:Document.type ?type .}
+                OPTIONAL { ?mrid cim:Analytic.kind ?analyticKind .}
+                OPTIONAL { ?mrid cim:Analytic.bestValue ?bestValue .}
+                OPTIONAL { ?mrid cim:Analytic.worstValue ?worstValue .}
+                OPTIONAL { ?mrid cim:Analytic.Asset ?aUUID .}
+            }
+        }
+        GROUP BY ?mrid ?baseIRI   ?name ?type  ?analyticKind ?bestValue ?worstValue`;
 //# sourceMappingURL=Analytic.js.map

package/dist/model/assets/Analytic.js.map

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

package/dist/model/assets/AnalyticScore.d.ts

@@ -1,6 +1,7 @@
-import { IdentifiedObject, ModelContainer } from '../../index.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 import { Asset } from './Asset.js';
 import { AggregateScore } from './AggregateScore.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
 export declare class AnalyticScore extends IdentifiedObject {
     value: number;
     asset: Asset;

package/dist/model/assets/AnalyticScore.js

@@ -1,22 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalyticScore = void 0;
-const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
-class AnalyticScore extends __1.IdentifiedObject {
-    value;
-    asset;
-    assetUUID;
-    assetAggregateScore;
-    assetAggregateScoreUUID;
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const parser_utils_2 = require("../../utils2/parser.utils.js");
+class AnalyticScore extends IdentifiedObject_1.IdentifiedObject {
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.value = +(0, utils_1.getNumberValue)(value, 'value');
-        this.assetUUID = (0, utils_1.getValue)(value, 'assetUUID');
-        this.assetAggregateScoreUUID = (0, utils_1.getValue)(value, 'assetAggregateScoreUUID');
+        this.value = +(0, parser_utils_2.getNumberValue)(value, 'value');
+        this.assetUUID = parser_utils_1.ParserUtils.getValue(value, 'assetUUID');
+        this.assetAggregateScoreUUID = parser_utils_1.ParserUtils.getValue(value, 'assetAggregateScoreUUID');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);

package/dist/model/assets/AnalyticScore.js.map

@@ -1 +1 @@
-{"version":3,"file":"AnalyticScore.js","sourceRoot":"","sources":["../../../src/model/assets/AnalyticScore.ts"],"names":[],"mappings":";;;AAAA,6BAAyD;AAEzD,4CAA4D;AAI5D,MAAa,aAAc,SAAQ,oBAAgB;IACjD,KAAK,CAAS;IACd,KAAK,CAAQ;IACb,SAAS,CAAS;IAEV,mBAAmB,CAAiB;IAC5C,uBAAuB,CAAC;IAExB,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAA,sBAAc,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC9C,IAAI,CAAC,uBAAuB,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IAC5E,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,QAAQ;QACR,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAU,CAAC;QACzD,IAAI,IAAI,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;;YAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,2BAA2B,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAEzG,iBAAiB;QACjB,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAU,CAAC;QACzD,IAAI,IAAI,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAEpD,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/G,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACpH,CAAC;IAED,sBAAsB,CAAC,KAAqB;QAC1C,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;IACnC,CAAC;IAED,sBAAsB;QACpB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AAvDD,sCAuDC"}
+{"version":3,"file":"AnalyticScore.js","sourceRoot":"","sources":["../../../src/model/assets/AnalyticScore.ts"],"names":[],"mappings":";;;AAGA,4DAAwD;AAExD,+DAA4D;AAC5D,4DAA2D;AAG3D,MAAa,aAAc,SAAQ,mCAAgB;IAQjD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAA,6BAAc,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC1D,IAAI,CAAC,uBAAuB,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IACxF,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,QAAQ;QACR,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAU,CAAC;QACzD,IAAI,IAAI,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;;YAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,2BAA2B,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAEzG,iBAAiB;QACjB,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAU,CAAC;QACzD,IAAI,IAAI,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAEpD,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/G,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACpH,CAAC;IAED,sBAAsB,CAAC,KAAqB;QAC1C,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;IACnC,CAAC;IAED,sBAAsB;QACpB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AAvDD,sCAuDC"}

package/dist/model/assets/Asset.d.ts

@@ -1,4 +1,3 @@
-import { AssetInfo, AssetOwner, IdentifiedObject, ILocation, ModelContainer, PowerSystemResource, Status } from '../../index.js';
 import { AssetContainer } from './AssetContainer.js';
 import { AssetDeployment } from './AssetDeployment.js';
 import { ActivityRecord } from '../common/ActivityRecord.js';
@@ -10,6 +9,13 @@ import { Analytic } from './Analytic.js';
 import { AnalyticKind } from './AnalyticKind.js';
 import { IAnalytic } from '../../interfaces/model/assets/IAnalytic.js';
 import { IActivityRecord } from '../../interfaces/model/assets/IActivityRecord.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { ILocation } from '../../interfaces/model/common/ILocation.js';
+import { PowerSystemResource } from '../core/PowerSystemResource.js';
+import { AssetInfo } from '../assetinfo/AssetInfo.js';
+import { Status } from '../common/Status.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
+import { AssetOwner } from './AssetOwner.js';
 export declare class Asset extends IdentifiedObject {
     static sparqlQuery: string;
     type: string;