@enervance/insight-cim-model 0.0.77 → 0.0.79

package/dist/model/assets/Asset.js

@@ -1,58 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Asset = void 0;
-const __1 = require("../../index.js");
 const HealthScore_1 = require("./HealthScore.js");
-const utils_1 = require("../../util/utils.js");
 const LifecycleDate_1 = require("./LifecycleDate.js");
-class Asset extends __1.IdentifiedObject {
-    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(?fUUID), '#_') AS ?uuid)
-                (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI) 
-                ?name ?status ?manufacturedDate
-                (STRAFTER(str(?lUUID), '#_') AS ?locationUUID) 
-                (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)
-    
-        WHERE {
-              GRAPH <http://default/> {
-                ?fUUID rdf:type cim:Asset .
-                OPTIONAL {?fUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?fUUID cim:Asset.type ?type .}
-                OPTIONAL {?fUUID cim:Asset.status [ cim:Status.value ?status ] .}
-                OPTIONAL {?fUUID cim:Asset.lifecycleDate [ cim:LifecycleDate.manufacturedDate ?manufacturedDate ] .}
-                OPTIONAL {?fUUID cim:Asset.PowerSystemResources ?psrUUIDs . }
-                OPTIONAL {?fUUID cim:Asset.Location ?lUUID . }
-                  
-            }
-        }
-        GROUP BY ?fUUID ?baseIRI ?name ?status ?manufacturedDate ?lUUID`;
-    type;
-    assetDeployment;
-    assetContainer;
-    assetContainerUUID;
-    location;
-    locationUUID;
-    powerSystemResources = new Map();
-    powerSystemResourcesUUIDs;
-    assetInfo;
-    assetInfoUUID;
-    organisationRoles = new Map();
-    // activityRecordsUUIDs: string[] = [];
-    activityRecords;
-    analyticScore = new Map();
-    analyticScoresUUIDs = [];
-    lifecycleDate = new LifecycleDate_1.LifecycleDate();
-    analytic = new Map();
-    status = new __1.Status();
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const PowerSystemResource_1 = require("../core/PowerSystemResource.js");
+const Status_1 = require("../common/Status.js");
+const AssetOwner_1 = require("./AssetOwner.js");
+class Asset extends IdentifiedObject_1.IdentifiedObject {
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
+        this.powerSystemResources = new Map();
+        this.organisationRoles = new Map();
+        this.analyticScore = new Map();
+        this.analyticScoresUUIDs = [];
+        this.lifecycleDate = new LifecycleDate_1.LifecycleDate();
+        this.analytic = new Map();
+        this.status = new Status_1.Status();
         this.baseIRI = baseIRI;
         this.prop2namespacePrefix.set('psrType', 'cim'); // zur Generierung der Insert-Statements
         this.prop2Class.set('psrType', 'PowerSystemResource');
@@ -75,7 +40,8 @@ class Asset extends __1.IdentifiedObject {
     }
     // JSON
     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 Asset();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addAsset(newClass);
@@ -139,7 +105,7 @@ class Asset extends __1.IdentifiedObject {
         return '';
     }
     getAssetOwner() {
-        return [...this.organisationRoles.values()].find(it => it instanceof __1.AssetOwner);
+        return [...this.organisationRoles.values()].find(it => it instanceof AssetOwner_1.AssetOwner);
     }
     removeAssetOrganisationRole(delOrganisationRole) {
         if (this.organisationRoles.has(delOrganisationRole.mrid)) {
@@ -168,16 +134,17 @@ class Asset extends __1.IdentifiedObject {
     }
     setAssetContainer(assetContainer) {
         this.assetContainer = assetContainer;
-        return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'Asset', 'AssetContainer', assetContainer?.mrid);
+        return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'Asset', 'AssetContainer', assetContainer === null || assetContainer === void 0 ? void 0 : assetContainer.mrid);
     }
     setLocation(location) {
+        var _a;
         this.location = location;
         this.location.addAsset(this);
-        return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'Asset', 'Location', this.location?.mrid);
+        return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'Asset', 'Location', (_a = this.location) === null || _a === void 0 ? void 0 : _a.mrid);
     }
     setAssetInfo(assetInfo) {
         this.assetInfo = assetInfo;
-        return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'Asset', 'AssetInfo', assetInfo?.mrid);
+        return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'Asset', 'AssetInfo', assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.mrid);
     }
     getAssetInfo() {
         return this.assetInfo;
@@ -215,20 +182,22 @@ class Asset extends __1.IdentifiedObject {
         return this.assetDeployment.setInServiceDate(date);
     }
     getInServiceDate() {
-        return this.assetDeployment?.getInServiceDate();
+        var _a;
+        return (_a = this.assetDeployment) === null || _a === void 0 ? void 0 : _a.getInServiceDate();
     }
     resolveParsedAssociations(cimModel) {
+        var _a, _b, _c;
         super.resolveParsedAssociations(cimModel);
         this.assetContainer = cimModel.getObject(this.assetContainerUUID);
-        this.assetContainer?.addAsset(this);
+        (_a = this.assetContainer) === null || _a === void 0 ? void 0 : _a.addAsset(this);
         this.assetInfo = cimModel.getAssetInfo(this.assetInfoUUID);
-        this.assetInfo?.addAsset(this);
+        (_b = this.assetInfo) === null || _b === void 0 ? void 0 : _b.addAsset(this);
         this.location = cimModel.getObject(this.locationUUID);
-        this.location?.addAsset(this);
+        (_c = this.location) === null || _c === void 0 ? void 0 : _c.addAsset(this);
         /** psr parsen */
         for (const psrUUID of this.powerSystemResourcesUUIDs) {
             const psr = cimModel.getObject(psrUUID);
-            if (psr && psr instanceof __1.PowerSystemResource) {
+            if (psr && psr instanceof PowerSystemResource_1.PowerSystemResource) {
                 this.powerSystemResources.set(psr.mrid, psr);
                 psr.addAsset(this);
             }
@@ -246,12 +215,39 @@ class Asset extends __1.IdentifiedObject {
         super.resolveAttributesFusekiJSON(value);
         this.lifecycleDate.resolveClassFusekiJSON(value);
         this.status.resolveClassFusekiJSON(value);
-        this.type = (0, utils_1.getValue)(value, 'type');
-        this.assetContainerUUID = (0, utils_1.getValue)(value, 'assetContainerUUID');
-        this.assetInfoUUID = (0, utils_1.getValue)(value, 'assetInfoUUID');
-        this.locationUUID = (0, utils_1.getValue)(value, 'locationUUID');
-        this.powerSystemResourcesUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'powerSystemResourceUUIDs'), ',');
+        this.type = parser_utils_1.ParserUtils.getValue(value, 'type');
+        this.assetContainerUUID = parser_utils_1.ParserUtils.getValue(value, 'assetContainerUUID');
+        this.assetInfoUUID = parser_utils_1.ParserUtils.getValue(value, 'assetInfoUUID');
+        this.locationUUID = parser_utils_1.ParserUtils.getValue(value, 'locationUUID');
+        this.powerSystemResourcesUUIDs = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'powerSystemResourceUUIDs'), ',');
     }
 }
 exports.Asset = Asset;
+Asset.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(?fUUID), '#_') AS ?uuid)
+                (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI) 
+                ?name ?status ?manufacturedDate
+                (STRAFTER(str(?lUUID), '#_') AS ?locationUUID) 
+                (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)
+    
+        WHERE {
+              GRAPH <http://default/> {
+                ?fUUID rdf:type cim:Asset .
+                OPTIONAL {?fUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?fUUID cim:Asset.type ?type .}
+                OPTIONAL {?fUUID cim:Asset.status [ cim:Status.value ?status ] .}
+                OPTIONAL {?fUUID cim:Asset.lifecycleDate [ cim:LifecycleDate.manufacturedDate ?manufacturedDate ] .}
+                OPTIONAL {?fUUID cim:Asset.PowerSystemResources ?psrUUIDs . }
+                OPTIONAL {?fUUID cim:Asset.Location ?lUUID . }
+                  
+            }
+        }
+        GROUP BY ?fUUID ?baseIRI ?name ?status ?manufacturedDate ?lUUID`;
 //# sourceMappingURL=Asset.js.map

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

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

package/dist/model/assets/AssetContainer.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetContainer = void 0;
 const Asset_1 = require("./Asset.js");
 class AssetContainer extends Asset_1.Asset {
-    assets = new Map();
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
+        this.assets = new Map();
     }
     addAsset(asset) {
-        this.assets.set(asset?.mrid, asset);
+        this.assets.set(asset === null || asset === void 0 ? void 0 : asset.mrid, asset);
     }
 }
 exports.AssetContainer = AssetContainer;

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

@@ -1 +1 @@
-{"version":3,"file":"AssetContainer.js","sourceRoot":"","sources":["../../../src/model/assets/AssetContainer.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAE9B,MAAa,cAAe,SAAQ,aAAK;IAErC,MAAM,GAAuB,IAAI,GAAG,EAAE,CAAC;IAEvC,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACxF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAED,QAAQ,CAAC,KAAY;QACjB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CACJ;AAXD,wCAWC"}
+{"version":3,"file":"AssetContainer.js","sourceRoot":"","sources":["../../../src/model/assets/AssetContainer.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAE9B,MAAa,cAAe,SAAQ,aAAK;IAIrC,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACxF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAH9C,WAAM,GAAuB,IAAI,GAAG,EAAE,CAAC;IAIvC,CAAC;IAED,QAAQ,CAAC,KAAY;QACjB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CACJ;AAXD,wCAWC"}

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

@@ -1,8 +1,10 @@
-import { BaseVoltage, IdentifiedObject, ModelContainer } from '../../index.js';
 import { Asset } from './Asset.js';
 import { DeploymentDate } from './DeploymentDate.js';
 import { DeploymentStateKind } from './DeploymentStateKind.js';
 import { TransformerApplicationKind } from './TransformerApplicationKind.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { BaseVoltage } from '../core/BaseVoltage.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class AssetDeployment extends IdentifiedObject {
     deploymentDate: DeploymentDate;
     deploymentState: DeploymentStateKind;

package/dist/model/assets/AssetDeployment.js

@@ -1,46 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetDeployment = void 0;
-const __1 = require("../../index.js");
 const DeploymentDate_1 = require("./DeploymentDate.js");
 const DeploymentStateKind_1 = require("./DeploymentStateKind.js");
-const utils_1 = require("../../util/utils.js");
-class AssetDeployment extends __1.IdentifiedObject {
-    deploymentDate;
-    deploymentState;
-    transformerApplication;
-    asset;
-    assetUUID;
-    baseVoltage;
-    baseVoltageUUID;
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const sparql_building_block_1 = require("../../util/sparql/sparql-building-block.js");
+class AssetDeployment extends IdentifiedObject_1.IdentifiedObject {
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
         this.deploymentDate = new DeploymentDate_1.DeploymentDate();
     }
-    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(?adUUID), '#_') AS ?uuid)  
-        (CONCAT(STRBEFORE(str(?adUUID), '#_'), '#_') AS ?baseIRI) 
-        (STRAFTER(str(?aUUID), '#_') AS ?assetUUID)
-        (STRAFTER(STRAFTER(str(?deplState), '#'), '.') AS ?deploymentState) 
-        ?installedDate ?inServiceDate 
-        WHERE { 
-            GRAPH <http://default/>{
-                ?adUUID rdf:type cim:AssetDeployment .
-                OPTIONAL {?adUUID cim:AssetDeployment.deploymentDate [ cim:DeploymentDate.installedDate ?installedDate ] .}
-                OPTIONAL {?adUUID cim:AssetDeployment.deploymentDate [ cim:DeploymentDate.inServiceDate ?inServiceDate ] .}
-                OPTIONAL {?adUUID cim:AssetDeployment.deploymentState ?deplState }
-                OPTIONAL {?adUUID cim:AssetDeployment.Asset ?aUUID . }
-            }
-        }
-    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return AssetDeployment.sparqlQuery.replace('<http://default/>', graphURI);
@@ -48,7 +19,8 @@ class AssetDeployment extends __1.IdentifiedObject {
         return AssetDeployment.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 AssetDeployment();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addAssetDeployment(newClass);
@@ -56,8 +28,8 @@ class AssetDeployment extends __1.IdentifiedObject {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.assetUUID = (0, utils_1.getValue)(value, 'assetUUID');
-        deploymentState: DeploymentStateKind_1.DeploymentStateKind[(0, utils_1.getValue)(value, 'deploymentState')];
+        this.assetUUID = parser_utils_1.ParserUtils.getValue(value, 'assetUUID');
+        deploymentState: DeploymentStateKind_1.DeploymentStateKind[parser_utils_1.ParserUtils.getValue(value, 'deploymentState')];
         // Compound ?inServiceDate
         this.deploymentDate = new DeploymentDate_1.DeploymentDate();
         this.deploymentDate.resolveClassFusekiJSON(value);
@@ -118,8 +90,8 @@ class AssetDeployment extends __1.IdentifiedObject {
     }
     getInsertNewSPARQL(baseIRI, graphURI) {
         const insertStatement = `
-            ${__1.NS_PREFIX_RDF}
-            ${__1.NS_PREFIX_CIM}
+            ${sparql_building_block_1.NS_PREFIX_RDF}
+            ${sparql_building_block_1.NS_PREFIX_CIM}
              INSERT DATA
              {
                 GRAPH ${graphURI}
@@ -139,4 +111,27 @@ class AssetDeployment extends __1.IdentifiedObject {
     }
 }
 exports.AssetDeployment = AssetDeployment;
+AssetDeployment.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(?adUUID), '#_') AS ?uuid)  
+        (CONCAT(STRBEFORE(str(?adUUID), '#_'), '#_') AS ?baseIRI) 
+        (STRAFTER(str(?aUUID), '#_') AS ?assetUUID)
+        (STRAFTER(STRAFTER(str(?deplState), '#'), '.') AS ?deploymentState) 
+        ?installedDate ?inServiceDate 
+        WHERE { 
+            GRAPH <http://default/>{
+                ?adUUID rdf:type cim:AssetDeployment .
+                OPTIONAL {?adUUID cim:AssetDeployment.deploymentDate [ cim:DeploymentDate.installedDate ?installedDate ] .}
+                OPTIONAL {?adUUID cim:AssetDeployment.deploymentDate [ cim:DeploymentDate.inServiceDate ?inServiceDate ] .}
+                OPTIONAL {?adUUID cim:AssetDeployment.deploymentState ?deplState }
+                OPTIONAL {?adUUID cim:AssetDeployment.Asset ?aUUID . }
+            }
+        }
+    `;
 //# sourceMappingURL=AssetDeployment.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"AssetDeployment.js","sourceRoot":"","sources":["../../../src/model/assets/AssetDeployment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AssetDeployment.js","sourceRoot":"","sources":["../../../src/model/assets/AssetDeployment.ts"],"names":[],"mappings":";;;AAEA,qDAAkD;AAClD,+DAA4D;AAE5D,4DAAwD;AACxD,+DAA4D;AAG5D,mFAAuF;AAGvF,MAAa,eAAgB,SAAQ,mCAAgB;IAYjD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAChG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,EAAE,CAAA;IAC9C,CAAC;IAyBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC7E;QACD,OAAO,eAAe,CAAC,WAAW,CAAC;IACvC,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,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;YACvC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC1D,eAAe,EAAE,yCAAmB,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACrF,0BAA0B;QAC1B,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,EAAE,CAAC;QAC3C,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACrD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAU,CAAC;QACzD,IAAG,IAAI,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;;YAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,0BAA0B,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5G,CAAC;IAED;;;;wFAIoF;IAC7E,eAAe,CAAC,SAAiB,EAAE,QAAgB;QACtD,IAAG,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE;YACpC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,+BAA+B;YAEzE,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5D,IAAI,MAAM,EAAE;gBACR,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,aAAa,IAAI,QAAQ,MAAM,SAAS,OAAO,CAAC;aACrG;SACJ;QACD,OAAO;IACX,CAAC;IAEM,wBAAwB;QAC3B,OAAO;eACA,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;;;;SAQ9B,CAAC;IACN,CAAC;IAEM,QAAQ,CAAC,KAAY;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACnH,CAAC;IAEM,gBAAgB,CAAC,IAAY;QAChC,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC1E,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,sBAAsB,CAAC,CAAC;IACxI,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;IAClD,CAAC;IAEM,gBAAgB,CAAC,IAAY;QAChC,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAE1E,OAAO,KAAK,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,uCAAuC,CAAC;IAChF,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;IAClD,CAAC;IAEM,kBAAkB,CAAC,OAAe,EAAE,QAAgB;QAEvD,MAAM,eAAe,GAAG;cAClB,qCAAa;cACb,qCAAa;;;wBAGH,QAAQ;;sBAEV,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;;;;;;SAUhC,CAAC;QACF,OAAO,eAAe,CAAC;IAC3B,CAAC;;AApJL,0CAqJC;AAnIiB,2BAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;KAsBnC,CAAC"}

package/dist/model/assets/AssetHealthEvent.js

@@ -6,32 +6,6 @@ class AssetHealthEvent extends ActivityRecord_1.ActivityRecord {
     constructor(mrid, name, shortName, description) {
         super(mrid, 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(str(?asUUID), '#_') AS ?uuid)
-        (CONCAT(STRBEFORE(str(?asUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?description ?severity ?type
-        (group_concat(STRAFTER(str(?aUUIDs), '#_');separator=',') as ?assetUUIDs)
-        
-        WHERE { 
-          GRAPH<http://default/> {
-            ?asUUID rdf:type cim:AssetHealthEvent .
-            OPTIONAL { ?asUUID cim:IdentifiedObject.name ?name .}
-            OPTIONAL { ?asUUID cim:IdentifiedObject.description ?description .}
-            OPTIONAL { ?asUUID cim:ActivityRecord.severity ?severity .}
-            OPTIONAL { ?asUUID cim:ActivityRecord.type ?type .}
-            OPTIONAL { ?asUUID cim:ActivityRecord.Assets ?aUUIDs .}
-          }
-        }
-        GROUP BY ?asUUID ?baseIRI ?name ?description ?severity ?type 
-    `;
     /** SPARQL/JSON */
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
@@ -40,7 +14,8 @@ class AssetHealthEvent extends ActivityRecord_1.ActivityRecord {
         return AssetHealthEvent.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 AssetHealthEvent();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addAssetHealthEvent(newClass);
@@ -63,4 +38,30 @@ class AssetHealthEvent extends ActivityRecord_1.ActivityRecord {
     }
 }
 exports.AssetHealthEvent = AssetHealthEvent;
+AssetHealthEvent.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(str(?asUUID), '#_') AS ?uuid)
+        (CONCAT(STRBEFORE(str(?asUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?description ?severity ?type
+        (group_concat(STRAFTER(str(?aUUIDs), '#_');separator=',') as ?assetUUIDs)
+        
+        WHERE { 
+          GRAPH<http://default/> {
+            ?asUUID rdf:type cim:AssetHealthEvent .
+            OPTIONAL { ?asUUID cim:IdentifiedObject.name ?name .}
+            OPTIONAL { ?asUUID cim:IdentifiedObject.description ?description .}
+            OPTIONAL { ?asUUID cim:ActivityRecord.severity ?severity .}
+            OPTIONAL { ?asUUID cim:ActivityRecord.type ?type .}
+            OPTIONAL { ?asUUID cim:ActivityRecord.Assets ?aUUIDs .}
+          }
+        }
+        GROUP BY ?asUUID ?baseIRI ?name ?description ?severity ?type 
+    `;
 //# sourceMappingURL=AssetHealthEvent.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"AssetHealthEvent.js","sourceRoot":"","sources":["../../../src/model/assets/AssetHealthEvent.ts"],"names":[],"mappings":";;;AAAA,6DAAwD;AAGxD,MAAa,gBAAiB,SAAQ,+BAAc;IAEhD,YAAmB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACrF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAIM,MAAM,CAAC,WAAW,GAAY;;;;;;;;;;;;;;;;;;;;;;;;;KAyBpC,CAAC;IAEF,kBAAkB;IACX,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC9E;QACD,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;YACxC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;IACM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,MAAM;QACT,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,gBAAgB;QACnB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC7B,CAAC;IACM,kBAAkB;QACrB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC/B,CAAC;;AAlEL,4CAmEC"}
+{"version":3,"file":"AssetHealthEvent.js","sourceRoot":"","sources":["../../../src/model/assets/AssetHealthEvent.ts"],"names":[],"mappings":";;;AAAA,6DAAwD;AAGxD,MAAa,gBAAiB,SAAQ,+BAAc;IAEhD,YAAmB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACrF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IA+BD,kBAAkB;IACX,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC9E;QACD,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACxC,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,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;YACxC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;IACM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,MAAM;QACT,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,gBAAgB;QACnB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC7B,CAAC;IACM,kBAAkB;QACrB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC/B,CAAC;;AAlEL,4CAmEC;AA3DiB,4BAAW,GAAY;;;;;;;;;;;;;;;;;;;;;;;;;KAyBpC,CAAC"}

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

@@ -1,6 +1,6 @@
 import { OrganisationRole } from '../common/OrganisationRole.js';
 import { Asset } from './Asset.js';
-import { ModelContainer } from '../../index.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class AssetOrganisationRole extends OrganisationRole {
     assets: Map<string, Asset>;
     assetUUIDs: string[];

package/dist/model/assets/AssetOrganisationRole.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetOrganisationRole = void 0;
 const OrganisationRole_1 = require("../common/OrganisationRole.js");
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class AssetOrganisationRole extends OrganisationRole_1.OrganisationRole {
-    assets = new Map(); // für Parser
-    assetUUIDs = [];
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
+        this.assets = new Map(); // für Parser
+        this.assetUUIDs = [];
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.assetUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'assetUUIDs'), ',');
+        this.assetUUIDs = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'assetUUIDs'), ',');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);

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

@@ -1 +1 @@
-{"version":3,"file":"AssetOrganisationRole.js","sourceRoot":"","sources":["../../../src/model/assets/AssetOrganisationRole.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAE5D,4CAAiE;AAGjE,MAAa,qBAAsB,SAAQ,mCAAgB;IAEzD,MAAM,GAAuB,IAAI,GAAG,EAAE,CAAC,CAAC,aAAa;IACrD,UAAU,GAAa,EAAE,CAAC;IAE1B,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,IAAA,6BAAqB,EAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9E,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,oBAAoB;QACpB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAU,CAAC;YACrD,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;aACtC;SACF;QACD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACtH,kGAAkG;YAClG,uGAAuG;SACxG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,WAAW,CAAC,QAAe;QACzB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzH,qGAAqG;SACtG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA7CD,sDA6CC"}
+{"version":3,"file":"AssetOrganisationRole.js","sourceRoot":"","sources":["../../../src/model/assets/AssetOrganisationRole.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAE5D,4DAAwD;AAGxD,MAAa,qBAAsB,SAAQ,mCAAgB;IAKzD,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAJ5C,WAAM,GAAuB,IAAI,GAAG,EAAE,CAAC,CAAC,aAAa;QACrD,eAAU,GAAa,EAAE,CAAC;IAI1B,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,0BAAW,CAAC,qBAAqB,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;IACtG,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,oBAAoB;QACpB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAU,CAAC;YACrD,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;aACtC;SACF;QACD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACtH,kGAAkG;YAClG,uGAAuG;SACxG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,WAAW,CAAC,QAAe;QACzB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzH,qGAAqG;SACtG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA7CD,sDA6CC"}

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

@@ -1,5 +1,5 @@
 import { AssetOrganisationRole } from './AssetOrganisationRole.js';
-import { ModelContainer } from '../../index.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class AssetOwner extends AssetOrganisationRole {
     protected constructor(mrid?: string, name?: string, shortName?: string, description?: string);
     /** SPARQL */

package/dist/model/assets/AssetOwner.js

@@ -6,8 +6,26 @@ class AssetOwner extends AssetOrganisationRole_1.AssetOrganisationRole {
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
-    /** SPARQL */
-    static sparqlQuery = `
+    /** SPARQL/JSON */
+    static getQuerySPARQL(graphURI) {
+        if (graphURI.length > 0) {
+            return AssetOwner.sparqlQuery.replace('<http://default/>', graphURI);
+        }
+        return AssetOwner.sparqlQuery;
+    }
+    /** Fuseki JSON Parser */
+    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 AssetOwner();
+            newClass.resolveAttributesFusekiJSON(value);
+            cimModel.addAssetOwner(newClass);
+        });
+    }
+}
+exports.AssetOwner = AssetOwner;
+/** SPARQL */
+AssetOwner.sparqlQuery = `
         PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#> 
         PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#> 
         PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
@@ -31,21 +49,4 @@ class AssetOwner extends AssetOrganisationRole_1.AssetOrganisationRole {
         }
         GROUP BY ?aoUUID ?baseIRI ?name ?description ?oUUID
     `;
-    /** SPARQL/JSON */
-    static getQuerySPARQL(graphURI) {
-        if (graphURI.length > 0) {
-            return AssetOwner.sparqlQuery.replace('<http://default/>', graphURI);
-        }
-        return AssetOwner.sparqlQuery;
-    }
-    /** Fuseki JSON Parser */
-    static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
-            const newClass = new AssetOwner();
-            newClass.resolveAttributesFusekiJSON(value);
-            cimModel.addAssetOwner(newClass);
-        });
-    }
-}
-exports.AssetOwner = AssetOwner;
 //# sourceMappingURL=AssetOwner.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"AssetOwner.js","sourceRoot":"","sources":["../../../src/model/assets/AssetOwner.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAG9D,MAAa,UAAW,SAAQ,6CAAqB;IAEjD,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACxF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAGL,aAAa;IACF,MAAM,CAAC,WAAW,GAAY;;;;;;;;;;;;;;;;;;;;;;;KAuBpC,CAAC;IAEF,kBAAkB;IACX,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACxE;QACD,OAAO,UAAU,CAAC,WAAW,CAAC;IAClC,CAAC;IACL,yBAAyB;IACd,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAC;YAClC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACP,CAAC;;AA/CL,gCAkDC"}
+{"version":3,"file":"AssetOwner.js","sourceRoot":"","sources":["../../../src/model/assets/AssetOwner.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAG9D,MAAa,UAAW,SAAQ,6CAAqB;IAEjD,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACxF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IA6BD,kBAAkB;IACX,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACxE;QACD,OAAO,UAAU,CAAC,WAAW,CAAC;IAClC,CAAC;IACL,yBAAyB;IACd,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,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAC;YAClC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACP,CAAC;;AA/CL,gCAkDC;AA3CD,aAAa;AACK,sBAAW,GAAY;;;;;;;;;;;;;;;;;;;;;;;KAuBpC,CAAC"}

package/dist/model/assets/AssetUser.js

@@ -6,8 +6,26 @@ class AssetUser extends AssetOrganisationRole_1.AssetOrganisationRole {
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
-    /** SPARQL */
-    static sparqlQuery = `
+    /** SPARQL/JSON */
+    static getQuerySPARQL(graphURI) {
+        if (graphURI.length > 0) {
+            return AssetUser.sparqlQuery.replace('<http://default/>', graphURI);
+        }
+        return AssetUser.sparqlQuery;
+    }
+    /** Fuseki JSON Parser */
+    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 AssetUser();
+            newClass.resolveAttributesFusekiJSON(value);
+            cimModel.addAssetUser(newClass);
+        });
+    }
+}
+exports.AssetUser = AssetUser;
+/** SPARQL */
+AssetUser.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#> 
@@ -32,21 +50,4 @@ class AssetUser extends AssetOrganisationRole_1.AssetOrganisationRole {
         }
         GROUP BY ?aoUUID ?baseIRI ?name ?shortName ?oUUID
     `;
-    /** SPARQL/JSON */
-    static getQuerySPARQL(graphURI) {
-        if (graphURI.length > 0) {
-            return AssetUser.sparqlQuery.replace('<http://default/>', graphURI);
-        }
-        return AssetUser.sparqlQuery;
-    }
-    /** Fuseki JSON Parser */
-    static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
-            const newClass = new AssetUser();
-            newClass.resolveAttributesFusekiJSON(value);
-            cimModel.addAssetUser(newClass);
-        });
-    }
-}
-exports.AssetUser = AssetUser;
 //# sourceMappingURL=AssetUser.js.map