@twin.org/federated-catalogue-service 0.0.2-next.4 → 0.0.2-next.6

package/dist/cjs/index.cjs

@@ -12,8 +12,6 @@ var identityModels = require('@twin.org/identity-models');
 var crypto = require('@twin.org/crypto');
 var standardsW3cDid = require('@twin.org/standards-w3c-did');
 
-// Copyright 2024 IOTA Stiftung.
-// SPDX-License-Identifier: Apache-2.0.
 /**
  * Data Resource Entry.
  */
@@ -71,6 +69,10 @@ exports.DataResourceEntry = class DataResourceEntry {
      * Evidences
      */
     evidence;
+    /**
+     * Extended data of a Data Resource entry.
+     */
+    extraData;
 };
 __decorate([
     entity.property({ type: "string", isPrimary: true }),
@@ -124,12 +126,14 @@ __decorate([
     entity.property({ type: "array" }),
     __metadata("design:type", Array)
 ], exports.DataResourceEntry.prototype, "evidence", void 0);
+__decorate([
+    entity.property({ type: "object", optional: true }),
+    __metadata("design:type", Object)
+], exports.DataResourceEntry.prototype, "extraData", void 0);
 exports.DataResourceEntry = __decorate([
     entity.entity()
 ], exports.DataResourceEntry);
 
-// Copyright 2024 IOTA Stiftung.
-// SPDX-License-Identifier: Apache-2.0.
 /**
  * Data Space Connector Entry.
  */
@@ -194,6 +198,10 @@ exports.DataSpaceConnectorEntry = class DataSpaceConnectorEntry {
      * Evidences
      */
     evidence;
+    /**
+     * Extended data of a DS Connector entry.
+     */
+    extraData;
 };
 __decorate([
     entity.property({ type: "string", isPrimary: true }),
@@ -255,12 +263,14 @@ __decorate([
     entity.property({ type: "array" }),
     __metadata("design:type", Array)
 ], exports.DataSpaceConnectorEntry.prototype, "evidence", void 0);
+__decorate([
+    entity.property({ type: "object", optional: true }),
+    __metadata("design:type", Object)
+], exports.DataSpaceConnectorEntry.prototype, "extraData", void 0);
 exports.DataSpaceConnectorEntry = __decorate([
     entity.entity()
 ], exports.DataSpaceConnectorEntry);
 
-// Copyright 2024 IOTA Stiftung.
-// SPDX-License-Identifier: Apache-2.0.
 /**
  * Participant entry.
  */
@@ -301,6 +311,10 @@ exports.ParticipantEntry = class ParticipantEntry {
      * Evidences
      */
     evidence;
+    /**
+     * Extended data of a Participant entry.
+     */
+    extraData;
 };
 __decorate([
     entity.property({ type: "string", isPrimary: true }),
@@ -338,12 +352,14 @@ __decorate([
     entity.property({ type: "array" }),
     __metadata("design:type", Array)
 ], exports.ParticipantEntry.prototype, "evidence", void 0);
+__decorate([
+    entity.property({ type: "object", optional: true }),
+    __metadata("design:type", Object)
+], exports.ParticipantEntry.prototype, "extraData", void 0);
 exports.ParticipantEntry = __decorate([
     entity.entity()
 ], exports.ParticipantEntry);
 
-// Copyright 2024 IOTA Stiftung.
-// SPDX-License-Identifier: Apache-2.0.
 /**
  * Service Offering Entry.
  */
@@ -396,6 +412,10 @@ exports.ServiceOfferingEntry = class ServiceOfferingEntry {
      * Evidences
      */
     evidence;
+    /**
+     * Extended data of a Service Offering entry.
+     */
+    extraData;
 };
 __decorate([
     entity.property({ type: "string", isPrimary: true }),
@@ -445,6 +465,10 @@ __decorate([
     entity.property({ type: "array" }),
     __metadata("design:type", Array)
 ], exports.ServiceOfferingEntry.prototype, "evidence", void 0);
+__decorate([
+    entity.property({ type: "object", optional: true }),
+    __metadata("design:type", Object)
+], exports.ServiceOfferingEntry.prototype, "extraData", void 0);
 exports.ServiceOfferingEntry = __decorate([
     entity.entity()
 ], exports.ServiceOfferingEntry);
@@ -1047,7 +1071,7 @@ async function complianceCredentialPresentation(baseRouteName, httpRequestContex
  */
 async function participantList(httpRequestContext, factoryServiceName, request) {
     const service = core.ComponentFactory.get(factoryServiceName);
-    const itemsAndCursor = await service.queryParticipants(request?.query?.id, request?.query?.registrationNumber, request?.query?.lrnType, request?.query?.cursor, core.Coerce.integer(request?.query?.pageSize));
+    const itemsAndCursor = await service.queryParticipants(request?.query?.id, request?.query?.registrationNumber, request?.query?.lrnType, request?.query?.cursor, core.Coerce.integer(request?.query?.limit));
     return {
         body: itemsAndCursor
     };
@@ -1101,7 +1125,7 @@ async function serviceOfferingCredentialPresentation(baseRouteName, httpRequestC
  */
 async function serviceOfferingList(httpRequestContext, factoryServiceName, request) {
     const service = core.ComponentFactory.get(factoryServiceName);
-    const itemsAndCursor = await service.queryServiceOfferings(request?.query?.id, request?.query?.providedBy, request?.query?.cursor, core.Coerce.integer(request?.query?.pageSize));
+    const itemsAndCursor = await service.queryServiceOfferings(request?.query?.id, request?.query?.providedBy, request?.query?.cursor, core.Coerce.integer(request?.query?.limit));
     return {
         body: itemsAndCursor
     };
@@ -1155,7 +1179,7 @@ async function dataResourceCredentialPresentation(baseRouteName, httpRequestCont
  */
 async function dataResourceList(httpRequestContext, factoryServiceName, request) {
     const service = core.ComponentFactory.get(factoryServiceName);
-    const itemsAndCursor = await service.queryDataResources(request?.query?.id, request?.query?.producedBy, request?.query?.cursor, core.Coerce.integer(request?.query?.pageSize));
+    const itemsAndCursor = await service.queryDataResources(request?.query?.id, request?.query?.producedBy, request?.query?.cursor, core.Coerce.integer(request?.query?.limit));
     return {
         body: itemsAndCursor
     };
@@ -1206,7 +1230,7 @@ async function dataSpaceConnectorCredentialPresentation(baseRouteName, httpReque
  */
 async function dataSpaceConnectorList(httpRequestContext, factoryServiceName, request) {
     const service = core.ComponentFactory.get(factoryServiceName);
-    const itemsAndCursor = await service.queryDataSpaceConnectors(request?.query?.id, request?.query?.maintainedBy, request?.query?.cursor, core.Coerce.integer(request?.query?.pageSize));
+    const itemsAndCursor = await service.queryDataSpaceConnectors(request?.query?.id, request?.query?.maintainedBy, request?.query?.cursor, core.Coerce.integer(request?.query?.limit));
     return {
         body: itemsAndCursor
     };
@@ -1234,9 +1258,9 @@ async function dataSpaceConnectorGet(httpRequestContext, factoryServiceName, req
  */
 class ComplianceCredentialVerificationService {
     /**
-     * Class name
+     * Runtime name for the class.
      */
-    CLASS_NAME = "ComplianceCredentialVerificationService";
+    static CLASS_NAME = "ComplianceCredentialVerificationService";
     /**
      * Resolver component.
      * @internal
@@ -1367,10 +1391,10 @@ class ComplianceCredentialVerificationService {
      */
     async verifyEvidence(evidence) {
         // The credential associated to the evidence has to be retrieved, then verified
-        core.Guards.object(this.CLASS_NAME, "IComplianceEvidence", evidence);
+        core.Guards.object(ComplianceCredentialVerificationService.CLASS_NAME, "IComplianceEvidence", evidence);
         const credentialUrl = evidence.id;
         this._logger?.log({
-            source: this.CLASS_NAME,
+            source: ComplianceCredentialVerificationService.CLASS_NAME,
             level: "info",
             message: "verifyingEvidenceCredential",
             ts: Date.now(),
@@ -1378,10 +1402,10 @@ class ComplianceCredentialVerificationService {
                 credentialUrl
             }
         });
-        const credentialResponse = await web.FetchHelper.fetch(this.CLASS_NAME, credentialUrl, "GET", undefined, { cacheTtlMs: this._subResourceCacheTtlMs });
+        const credentialResponse = await web.FetchHelper.fetch(ComplianceCredentialVerificationService.CLASS_NAME, credentialUrl, "GET", undefined, { cacheTtlMs: this._subResourceCacheTtlMs });
         if (!credentialResponse.ok) {
             this._logger?.log({
-                source: this.CLASS_NAME,
+                source: ComplianceCredentialVerificationService.CLASS_NAME,
                 level: "error",
                 message: "credentialCannotBeRetrieved",
                 ts: Date.now(),
@@ -1412,7 +1436,7 @@ class ComplianceCredentialVerificationService {
             hashToCheck = core.Converter.bytesToBase64(crypto.Sha512.sum512(core.Converter.utf8ToBytes(canonicalized)));
         }
         else {
-            throw new core.UnprocessableError(this.CLASS_NAME, "unknownHashingAlgorithm", { hashingAlg });
+            throw new core.UnprocessableError(ComplianceCredentialVerificationService.CLASS_NAME, "unknownHashingAlgorithm", { hashingAlg });
         }
         if (hashToCheck !== hash) {
             return {
@@ -1422,7 +1446,7 @@ class ComplianceCredentialVerificationService {
         }
         const { id } = identityModels.DocumentHelper.parseId(proof.verificationMethod);
         const documentId = theCredential.issuer ?? id;
-        core.Guards.stringValue(this.CLASS_NAME, "documentId", documentId);
+        core.Guards.stringValue(ComplianceCredentialVerificationService.CLASS_NAME, "documentId", documentId);
         let verified = false;
         try {
             const document = await this._resolver.identityResolve(documentId);
@@ -1431,7 +1455,7 @@ class ComplianceCredentialVerificationService {
         }
         catch (error) {
             this._logger?.log({
-                source: this.CLASS_NAME,
+                source: ComplianceCredentialVerificationService.CLASS_NAME,
                 level: "error",
                 message: "credentialVerificationError",
                 ts: Date.now(),
@@ -1446,7 +1470,7 @@ class ComplianceCredentialVerificationService {
             };
         }
         this._logger?.log({
-            source: this.CLASS_NAME,
+            source: ComplianceCredentialVerificationService.CLASS_NAME,
             level: "info",
             message: "credentialEvidenceVerified",
             ts: Date.now(),
@@ -1467,15 +1491,15 @@ class ComplianceCredentialVerificationService {
  * Service for performing logging operations to a connector.
  */
 class FederatedCatalogueService {
+    /**
+     * Runtime name for the class.
+     */
+    static CLASS_NAME = "FederatedCatalogueService";
     /**
      * Fields to skip when persisting entries to the Catalogue
      * @internal
      */
     static _FIELDS_TO_SKIP = ["@context", "type"];
-    /**
-     * Runtime name for the class.
-     */
-    CLASS_NAME = "FederatedCatalogueService";
     /**
      * The identity resolver used to dereference DIDs.
      * @internal
@@ -1531,32 +1555,34 @@ class FederatedCatalogueService {
      * @returns The Id of the Participant (DID usually).
      */
     async registerComplianceCredential(credentialJwt) {
-        core.Guards.string(this.CLASS_NAME, "credentialJwt", credentialJwt);
+        core.Guards.string(FederatedCatalogueService.CLASS_NAME, "credentialJwt", credentialJwt);
         // This will raise exceptions as it has been coded reusing code from Gaia-X
         const complianceCredential = await this.decodeJwt(credentialJwt);
         const result = await this._complianceCredentialVerifier.verify(complianceCredential);
         if (!result.verified) {
             this._logging?.log({
                 level: "error",
-                source: this.CLASS_NAME,
+                source: FederatedCatalogueService.CLASS_NAME,
                 ts: Date.now(),
                 message: "complianceCredentialNotVerified",
                 data: { result }
             });
-            throw new core.UnprocessableError(this.CLASS_NAME, "complianceCredentialNotVerified", {
+            throw new core.UnprocessableError(FederatedCatalogueService.CLASS_NAME, "complianceCredentialNotVerified", {
                 reason: result.verificationFailureReason
             });
         }
         const targetCredential = result.credentials.find(credential => credential.credentialSubject.type === standardsGaiaX.GaiaXTypes.LegalPerson);
         if (core.Is.undefined(targetCredential)) {
-            throw new core.UnprocessableError(this.CLASS_NAME, "noEvidence");
+            throw new core.UnprocessableError(FederatedCatalogueService.CLASS_NAME, "noEvidence");
         }
-        const participantEntry = this.extractParticipantEntry(complianceCredential, targetCredential);
+        const { participantEntry, extraData } = this.extractParticipantEntry(complianceCredential, targetCredential);
         const theEntry = core.ObjectHelper.omit(participantEntry, FederatedCatalogueService._FIELDS_TO_SKIP);
-        await this._entityStorageParticipants.set(theEntry);
+        const extended = theEntry;
+        extended.extraData = extraData;
+        await this._entityStorageParticipants.set(extended);
         await this._logging?.log({
             level: "info",
-            source: this.CLASS_NAME,
+            source: FederatedCatalogueService.CLASS_NAME,
             ts: Date.now(),
             message: "complianceCredentialVerified",
             data: {
@@ -1571,13 +1597,13 @@ class FederatedCatalogueService {
      * @param id The identity of the participant.
      * @param legalRegistrationNumber The legal registration number.
      * @param lrnType The legal registration number type (EORI, VATID, GLEIF, KENYA_PIN, etc.)
-     * @param cursor The cursor to request the next page of entities.
-     * @param pageSize The maximum number of entities in a page.
+     * @param cursor The cursor to request the next chunk of entities.
+     * @param limit Limit the number of entities to return.
      * @returns All the entities for the storage matching the conditions,
      * and a cursor which can be used to request more entities.
      * @throws NotImplementedError if the implementation does not support retrieval.
      */
-    async queryParticipants(id, legalRegistrationNumber, lrnType, cursor, pageSize) {
+    async queryParticipants(id, legalRegistrationNumber, lrnType, cursor, limit) {
         const conditions = [];
         if (core.Is.stringValue(id)) {
             const condition = {
@@ -1603,15 +1629,16 @@ class FederatedCatalogueService {
             };
             conditions.push(condition);
         }
-        const entries = await this._entityStorageParticipants.query({ conditions }, undefined, undefined, cursor, pageSize);
+        const entries = await this._entityStorageParticipants.query({ conditions }, undefined, undefined, cursor, limit);
         const itemList = entries.entities.map(entry => {
             entry.type = standardsGaiaX.GaiaXTypes.LegalPerson;
             return entry;
         });
+        const { finalItemList, extraDataLdContext } = this.normalizeExtraData(itemList);
         const result = {
-            "@context": federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY_LIST,
+            "@context": dataJsonLd.JsonLdProcessor.combineContexts(federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY_LIST, extraDataLdContext),
             type: standardsSchemaOrg.SchemaOrgTypes.ItemList,
-            itemListElement: itemList,
+            itemListElement: finalItemList,
             nextItem: entries.cursor
         };
         return dataJsonLd.JsonLdProcessor.compact(result, result["@context"]);
@@ -1624,7 +1651,7 @@ class FederatedCatalogueService {
      * @throws NotFoundError if not found.
      */
     async getEntry(entryType, entryId) {
-        core.Guards.stringValue(this.CLASS_NAME, "entryId", entryId);
+        core.Guards.stringValue(FederatedCatalogueService.CLASS_NAME, "entryId", entryId);
         let itemsAndCursor;
         switch (entryType) {
             case standardsGaiaX.GaiaXTypes.LegalPerson:
@@ -1641,17 +1668,19 @@ class FederatedCatalogueService {
                 itemsAndCursor = await this.queryDataResources(entryId);
                 break;
             default:
-                throw new core.GeneralError(this.CLASS_NAME, "unknownEntryType", { entryType });
+                throw new core.GeneralError(FederatedCatalogueService.CLASS_NAME, "unknownEntryType", {
+                    entryType
+                });
         }
         if (core.Is.arrayValue(itemsAndCursor?.itemListElement)) {
             const entry = {
                 ...itemsAndCursor.itemListElement[0],
-                "@context": federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY
+                "@context": dataJsonLd.JsonLdProcessor.combineContexts(federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY, itemsAndCursor["@context"])
             };
             const result = await dataJsonLd.JsonLdProcessor.compact(entry, entry["@context"]);
             return result;
         }
-        throw new core.NotFoundError(this.CLASS_NAME, "entryNotFound", entryId);
+        throw new core.NotFoundError(FederatedCatalogueService.CLASS_NAME, "entryNotFound", entryId);
     }
     /**
      * Registers a compliance Credential concerning a Data Space Connector.
@@ -1659,19 +1688,19 @@ class FederatedCatalogueService {
      * @returns The identifier of the Data Space Connector registered.
      */
     async registerDataSpaceConnectorCredential(credentialJwt) {
-        core.Guards.string(this.CLASS_NAME, "credentialJwt", credentialJwt);
+        core.Guards.string(FederatedCatalogueService.CLASS_NAME, "credentialJwt", credentialJwt);
         // This will raise exceptions as it has been coded reusing code from Gaia-X
         const complianceCredential = await this.decodeJwt(credentialJwt);
         const result = await this._complianceCredentialVerifier.verify(complianceCredential);
         if (!result.verified) {
             this._logging?.log({
                 level: "error",
-                source: this.CLASS_NAME,
+                source: FederatedCatalogueService.CLASS_NAME,
                 ts: Date.now(),
                 message: "complianceCredentialNotVerified",
                 data: { result }
             });
-            throw new core.UnprocessableError(this.CLASS_NAME, "complianceCredentialNotVerified", {
+            throw new core.UnprocessableError(FederatedCatalogueService.CLASS_NAME, "complianceCredentialNotVerified", {
                 reason: result.verificationFailureReason
             });
         }
@@ -1683,21 +1712,25 @@ class FederatedCatalogueService {
         });
         const dataResourceCredentials = result.credentials.filter(credential => credential.credentialSubject.type === standardsGaiaX.GaiaXTypes.DataResource);
         if (core.Is.undefined(targetCredential)) {
-            throw new core.UnprocessableError(this.CLASS_NAME, "noEvidence");
+            throw new core.UnprocessableError(FederatedCatalogueService.CLASS_NAME, "noEvidence");
         }
         await this.checkParticipantExists(targetCredential.issuer);
-        const dataSpaceConnectorEntry = this.extractDataSpaceConnectorEntry(complianceCredential, result.credentials[0]);
+        const { dataSpaceConnectorEntry, extraData } = this.extractDataSpaceConnectorEntry(complianceCredential, result.credentials[0]);
         const theEntry = core.ObjectHelper.omit(dataSpaceConnectorEntry, FederatedCatalogueService._FIELDS_TO_SKIP);
-        await this._entityStorageDataSpaceConnectors.set(theEntry);
+        const extended = theEntry;
+        extended.extraData = extraData;
+        await this._entityStorageDataSpaceConnectors.set(extended);
         for (const dataResourceCredential of dataResourceCredentials) {
             await this.checkParticipantExists(dataResourceCredential.issuer);
-            const dataResourceEntry = this.extractDataResourceEntry(complianceCredential, dataResourceCredential);
-            const drEntry = core.ObjectHelper.omit(dataResourceEntry, FederatedCatalogueService._FIELDS_TO_SKIP);
-            await this._entityStorageDataResources.set(drEntry);
+            const { dataResourceEntry, extraData: extraDataResourceData } = this.extractDataResourceEntry(complianceCredential, dataResourceCredential);
+            const finalDataResourceEntry = core.ObjectHelper.omit(dataResourceEntry, FederatedCatalogueService._FIELDS_TO_SKIP);
+            const extendedDataResourceEntry = finalDataResourceEntry;
+            extendedDataResourceEntry.extraData = extraDataResourceData;
+            await this._entityStorageDataResources.set(extendedDataResourceEntry);
         }
         await this._logging?.log({
             level: "info",
-            source: this.CLASS_NAME,
+            source: FederatedCatalogueService.CLASS_NAME,
             ts: Date.now(),
             message: "complianceCredentialVerified",
             data: {
@@ -1713,36 +1746,38 @@ class FederatedCatalogueService {
      * @returns The list of Data Resources created.
      */
     async registerDataResourceCredential(credentialJwt) {
-        core.Guards.string(this.CLASS_NAME, "credentialJwt", credentialJwt);
+        core.Guards.string(FederatedCatalogueService.CLASS_NAME, "credentialJwt", credentialJwt);
         const complianceCredential = await this.decodeJwt(credentialJwt);
         const result = await this._complianceCredentialVerifier.verify(complianceCredential);
         if (!result.verified) {
             this._logging?.log({
                 level: "error",
-                source: this.CLASS_NAME,
+                source: FederatedCatalogueService.CLASS_NAME,
                 ts: Date.now(),
                 message: "complianceCredentialNotVerified",
                 data: { result }
             });
-            throw new core.UnprocessableError(this.CLASS_NAME, "complianceCredentialNotVerified", {
+            throw new core.UnprocessableError(FederatedCatalogueService.CLASS_NAME, "complianceCredentialNotVerified", {
                 reason: result.verificationFailureReason
             });
         }
         const dataResourceCredentials = result.credentials.filter(credential => credential.credentialSubject.type === standardsGaiaX.GaiaXTypes.DataResource);
         if (dataResourceCredentials.length === 0) {
-            throw new core.UnprocessableError(this.CLASS_NAME, "noEvidence");
+            throw new core.UnprocessableError(FederatedCatalogueService.CLASS_NAME, "noEvidence");
         }
         const dataResourceIds = [];
         for (const dataResourceCredential of dataResourceCredentials) {
             await this.checkParticipantExists(dataResourceCredential.issuer);
-            const dataResourceEntry = this.extractDataResourceEntry(complianceCredential, dataResourceCredential);
+            const { dataResourceEntry, extraData } = this.extractDataResourceEntry(complianceCredential, dataResourceCredential);
             const theEntry = core.ObjectHelper.omit(dataResourceEntry, FederatedCatalogueService._FIELDS_TO_SKIP);
-            await this._entityStorageDataResources.set(theEntry);
+            const extended = theEntry;
+            extended.extraData = extraData;
+            await this._entityStorageDataResources.set(extended);
             dataResourceIds.push(dataResourceEntry.id);
         }
         await this._logging?.log({
             level: "info",
-            source: this.CLASS_NAME,
+            source: FederatedCatalogueService.CLASS_NAME,
             ts: Date.now(),
             message: "complianceCredentialVerified",
             data: {
@@ -1756,13 +1791,13 @@ class FederatedCatalogueService {
      * Query the federated catalogue.
      * @param id The identity of the participant.
      * @param maintainer The DS Connector maintainer.
-     * @param cursor The cursor to request the next page of entities.
-     * @param pageSize The maximum number of entities in a page.
+     * @param cursor The cursor to request the next chunk of entities.
+     * @param limit Limit the number of entities to return.
      * @returns All the entities for the storage matching the conditions,
      * and a cursor which can be used to request more entities.
      * @throws NotImplementedError if the implementation does not support retrieval.
      */
-    async queryDataSpaceConnectors(id, maintainer, cursor, pageSize) {
+    async queryDataSpaceConnectors(id, maintainer, cursor, limit) {
         const conditions = [];
         if (core.Is.stringValue(id)) {
             const condition = {
@@ -1780,7 +1815,7 @@ class FederatedCatalogueService {
             };
             conditions.push(condition);
         }
-        const entries = await this._entityStorageDataSpaceConnectors.query({ conditions }, undefined, undefined, cursor, pageSize);
+        const entries = await this._entityStorageDataSpaceConnectors.query({ conditions }, undefined, undefined, cursor, limit);
         const itemList = entries.entities.map(entry => {
             entry.type = [
                 standardsGaiaX.GaiaXTypes.DataExchangeComponent,
@@ -1788,10 +1823,11 @@ class FederatedCatalogueService {
             ];
             return entry;
         });
+        const { finalItemList, extraDataLdContext } = this.normalizeExtraData(itemList);
         const result = {
-            "@context": federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY_LIST,
+            "@context": dataJsonLd.JsonLdProcessor.combineContexts(federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY_LIST, extraDataLdContext),
             type: standardsSchemaOrg.SchemaOrgTypes.ItemList,
-            itemListElement: itemList,
+            itemListElement: finalItemList,
             nextItem: entries.cursor
         };
         return dataJsonLd.JsonLdProcessor.compact(result, result["@context"]);
@@ -1802,44 +1838,48 @@ class FederatedCatalogueService {
      * @returns Nothing.
      */
     async registerServiceOfferingCredential(credentialJwt) {
-        core.Guards.string(this.CLASS_NAME, "credentialJwt", credentialJwt);
+        core.Guards.string(FederatedCatalogueService.CLASS_NAME, "credentialJwt", credentialJwt);
         // This will raise exceptions as it has been coded reusing code from Gaia-X
         const sdComplianceCredential = await this.decodeJwt(credentialJwt);
         const result = await this._complianceCredentialVerifier.verify(sdComplianceCredential);
         if (!result.verified) {
             this._logging?.log({
                 level: "error",
-                source: this.CLASS_NAME,
+                source: FederatedCatalogueService.CLASS_NAME,
                 ts: Date.now(),
                 message: "complianceCredentialNotVerified",
                 data: { result }
             });
-            throw new core.UnprocessableError(this.CLASS_NAME, "complianceCredentialNotVerified", {
+            throw new core.UnprocessableError(FederatedCatalogueService.CLASS_NAME, "complianceCredentialNotVerified", {
                 reason: result.verificationFailureReason
             });
         }
         const serviceOfferingCredentials = result.credentials.filter(credential => credential.credentialSubject.type === standardsGaiaX.GaiaXTypes.ServiceOffering);
         const dataResourceCredentials = result.credentials.filter(credential => credential.credentialSubject.type === standardsGaiaX.GaiaXTypes.DataResource);
         if (serviceOfferingCredentials.length === 0) {
-            throw new core.UnprocessableError(this.CLASS_NAME, "noEvidence");
+            throw new core.UnprocessableError(FederatedCatalogueService.CLASS_NAME, "noEvidence");
         }
         const serviceOfferingIds = [];
         for (const serviceOfferingCredential of serviceOfferingCredentials) {
             const serviceIssuer = serviceOfferingCredential.issuer;
             await this.checkParticipantExists(serviceIssuer);
-            const serviceOfferingEntry = this.extractServiceOfferingEntry(sdComplianceCredential, serviceOfferingCredential);
+            const { serviceOfferingEntry, extraData } = this.extractServiceOfferingEntry(sdComplianceCredential, serviceOfferingCredential);
             const theEntry = core.ObjectHelper.omit(serviceOfferingEntry, FederatedCatalogueService._FIELDS_TO_SKIP);
-            await this._entityStorageServiceOfferings.set(theEntry);
+            const extended = theEntry;
+            extended.extraData = extraData;
+            await this._entityStorageServiceOfferings.set(extended);
             serviceOfferingIds.push(serviceOfferingEntry.id);
         }
         for (const dataResourceCredential of dataResourceCredentials) {
             await this.checkParticipantExists(dataResourceCredential.issuer);
-            const dataResourceEntry = this.extractDataResourceEntry(sdComplianceCredential, dataResourceCredential);
-            await this._entityStorageDataResources.set(dataResourceEntry);
+            const { dataResourceEntry, extraData } = this.extractDataResourceEntry(sdComplianceCredential, dataResourceCredential);
+            const extended = core.ObjectHelper.omit(dataResourceEntry, FederatedCatalogueService._FIELDS_TO_SKIP);
+            extended.extraData = extraData;
+            await this._entityStorageDataResources.set(extended);
         }
         await this._logging?.log({
             level: "info",
-            source: this.CLASS_NAME,
+            source: FederatedCatalogueService.CLASS_NAME,
             ts: Date.now(),
             message: "complianceCredentialVerified",
             data: {
@@ -1853,13 +1893,13 @@ class FederatedCatalogueService {
      * Query the federated catalogue.
      * @param id Service Id.
      * @param providedBy The identity of the participant.
-     * @param cursor The cursor to request the next page of entities.
-     * @param pageSize The maximum number of entities in a page.
+     * @param cursor The cursor to request the next chunk of entities.
+     * @param limit Limit the number of entities to return.
      * @returns All the entities for the storage matching the conditions,
      * and a cursor which can be used to request more entities.
      * @throws NotImplementedError if the implementation does not support retrieval.
      */
-    async queryServiceOfferings(id, providedBy, cursor, pageSize) {
+    async queryServiceOfferings(id, providedBy, cursor, limit) {
         const conditions = [];
         if (core.Is.stringValue(providedBy)) {
             const condition = {
@@ -1877,15 +1917,16 @@ class FederatedCatalogueService {
             };
             conditions.push(condition);
         }
-        const entries = await this._entityStorageServiceOfferings.query({ conditions }, undefined, undefined, cursor, pageSize);
+        const entries = await this._entityStorageServiceOfferings.query({ conditions }, undefined, undefined, cursor, limit);
         const itemList = entries.entities.map(entry => {
             entry.type = standardsGaiaX.GaiaXTypes.ServiceOffering;
             return entry;
         });
+        const { finalItemList, extraDataLdContext } = this.normalizeExtraData(itemList);
         const result = {
-            "@context": federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY_LIST,
+            "@context": dataJsonLd.JsonLdProcessor.combineContexts(federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY_LIST, extraDataLdContext),
             type: standardsSchemaOrg.SchemaOrgTypes.ItemList,
-            itemListElement: itemList,
+            itemListElement: finalItemList,
             nextItem: entries.cursor
         };
         return dataJsonLd.JsonLdProcessor.compact(result, result["@context"]);
@@ -1894,13 +1935,13 @@ class FederatedCatalogueService {
      * Query the federated catalogue.
      * @param id The identity of the DataResource.
      * @param producedBy The identity of the participant.
-     * @param cursor The cursor to request the next page of entities.
-     * @param pageSize The maximum number of entities in a page.
+     * @param cursor The cursor to request the next chunk of entities.
+     * @param limit Limit the number of entities to return.
      * @returns All the entities for the storage matching the conditions,
      * and a cursor which can be used to request more entities.
      * @throws NotImplementedError if the implementation does not support retrieval.
      */
-    async queryDataResources(id, producedBy, cursor, pageSize) {
+    async queryDataResources(id, producedBy, cursor, limit) {
         const conditions = [];
         if (core.Is.stringValue(producedBy)) {
             const condition = {
@@ -1918,23 +1959,44 @@ class FederatedCatalogueService {
             };
             conditions.push(condition);
         }
-        const entries = await this._entityStorageDataResources.query({ conditions }, undefined, undefined, cursor, pageSize);
+        const entries = await this._entityStorageDataResources.query({ conditions }, undefined, undefined, cursor, limit);
         const itemList = entries.entities.map(entry => {
             entry.type = standardsGaiaX.GaiaXTypes.DataResource;
             return entry;
         });
+        const { finalItemList, extraDataLdContext } = this.normalizeExtraData(itemList);
         const result = {
-            "@context": federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY_LIST,
+            "@context": dataJsonLd.JsonLdProcessor.combineContexts(federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY_LIST, extraDataLdContext),
             type: standardsSchemaOrg.SchemaOrgTypes.ItemList,
-            itemListElement: itemList,
+            itemListElement: finalItemList,
             nextItem: entries.cursor
         };
         return dataJsonLd.JsonLdProcessor.compact(result, result["@context"]);
     }
+    /**
+     * Normalizes the extra data adding it to each entry.
+     * @param itemList The item list.
+     * @returns the final item list plus the additional LD Context
+     * @internal
+     */
+    normalizeExtraData(itemList) {
+        let extraDataLdContext;
+        const finalItemList = itemList.map(entry => {
+            const extraData = core.ObjectHelper.extractProperty(entry, "extraData", true);
+            if (!core.Is.undefined(extraData?.["@context"])) {
+                const ldContext = extraData["@context"];
+                extraDataLdContext = dataJsonLd.JsonLdProcessor.combineContexts(extraDataLdContext, ldContext);
+                return core.ObjectHelper.merge(entry, extraData);
+            }
+            return entry;
+        });
+        return { finalItemList, extraDataLdContext };
+    }
     /**
      * Decodes the JWT.
      * @param jwt JWT.
      * @returns Decoded.
+     * @internal
      */
     async decodeJwt(jwt) {
         const { payload } = await identityModels.VerificationHelper.verifyJwt(this._resolver, jwt);
@@ -1944,6 +2006,7 @@ class FederatedCatalogueService {
      * Returns the trusted Issuer id.
      * @param complianceCredential The compliance credential.
      * @returns The trusted issuer.
+     * @internal
      */
     getTrustedIssuerId(complianceCredential) {
         const trustedIssuerId = core.Is.object(complianceCredential.issuer)
@@ -1956,16 +2019,18 @@ class FederatedCatalogueService {
      * @param complianceCredential Compliance credential
      * @param participantCredential The Participant credential extracted.
      * @returns Participant Entry to be saved on the Database.
+     * @internal
      */
     extractParticipantEntry(complianceCredential, participantCredential) {
         const participantData = participantCredential.credentialSubject;
-        core.Guards.objectValue(this.CLASS_NAME, "participantData", participantData);
+        core.Guards.objectValue(FederatedCatalogueService.CLASS_NAME, "participantData", participantData);
         const evidences = [];
         for (const evidence of complianceCredential.evidence) {
             evidences.push(evidence.id);
         }
+        const { data, extraData } = this.extractExtraData(participantData, entity.EntitySchemaFactory.get("ParticipantEntry"));
         const result = {
-            ...participantData,
+            ...data,
             "@context": federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY,
             issuer: this.getTrustedIssuerId(complianceCredential),
             validFrom: complianceCredential.validFrom,
@@ -1973,18 +2038,20 @@ class FederatedCatalogueService {
             dateCreated: new Date().toISOString(),
             evidence: evidences
         };
-        return result;
+        return { participantEntry: result, extraData };
     }
     /**
      * Extracts Data Space Connector description entry from the credentials.
      * @param complianceCredential Compliance Credential.
      * @param dataSpaceConnectorCredential Evidence Credential.
      * @returns Service Description Entry to be saved on the Database.
+     * @internal
      */
     extractDataSpaceConnectorEntry(complianceCredential, dataSpaceConnectorCredential) {
         const credentialData = dataSpaceConnectorCredential.credentialSubject;
-        core.Guards.objectValue(this.CLASS_NAME, "credentialData", credentialData);
-        const { offeredResource, ...deStructuredData } = credentialData;
+        core.Guards.objectValue(FederatedCatalogueService.CLASS_NAME, "credentialData", credentialData);
+        const { extraData, data } = this.extractExtraData(credentialData, entity.EntitySchemaFactory.get("DataSpaceConnectorEntry"));
+        const { offeredResource, ...deStructuredData } = data;
         const result = {
             ...deStructuredData,
             "@context": federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY,
@@ -1995,18 +2062,20 @@ class FederatedCatalogueService {
             dateCreated: new Date().toISOString(),
             evidence: [dataSpaceConnectorCredential.id]
         };
-        return result;
+        return { dataSpaceConnectorEntry: result, extraData };
     }
     /**
      * Extracts service offering entry from the credentials.
      * @param complianceCredential The Compliance Credential.
      * @param serviceOfferingCredential Service Offering credential (evidence).
      * @returns Service Offering Entry to be saved on the Database.
+     * @internal
      */
     extractServiceOfferingEntry(complianceCredential, serviceOfferingCredential) {
         const credentialData = serviceOfferingCredential.credentialSubject;
-        core.Guards.objectValue(this.CLASS_NAME, "credentialData", credentialData);
-        const { providedBy, aggregationOfResources, servicePolicy, ...deStructuredData } = credentialData;
+        core.Guards.objectValue(FederatedCatalogueService.CLASS_NAME, "credentialData", credentialData);
+        const { data, extraData } = this.extractExtraData(credentialData, entity.EntitySchemaFactory.get("ServiceOfferingEntry"));
+        const { providedBy, aggregationOfResources, servicePolicy, ...deStructuredData } = data;
         const result = {
             ...deStructuredData,
             "@context": federatedCatalogueModels.FederatedCatalogueContextInstances.DEFAULT_LD_CONTEXT_ENTRY,
@@ -2019,18 +2088,20 @@ class FederatedCatalogueService {
             evidence: [serviceOfferingCredential.id],
             servicePolicy: core.ArrayHelper.fromObjectOrArray(servicePolicy)
         };
-        return result;
+        return { serviceOfferingEntry: result, extraData };
     }
     /**
      * Extracts data resource entry from the credentials.
      * @param complianceCredential The Compliance Credential.
      * @param dataResourceCredential Data Resource credential.
      * @returns DataResource Entry to be saved on the Database.
+     * @internal
      */
     extractDataResourceEntry(complianceCredential, dataResourceCredential) {
         const credentialData = dataResourceCredential.credentialSubject;
-        core.Guards.objectValue(this.CLASS_NAME, "credentialData", credentialData);
-        const { producedBy, copyrightOwnedBy, exposedThrough, resourcePolicy, ...deStructuredData } = credentialData;
+        core.Guards.objectValue(FederatedCatalogueService.CLASS_NAME, "credentialData", credentialData);
+        const { data, extraData } = this.extractExtraData(credentialData, entity.EntitySchemaFactory.get("DataResourceEntry"));
+        const { producedBy, copyrightOwnedBy, exposedThrough, resourcePolicy, ...deStructuredData } = data;
         let producedByValue = producedBy;
         if (core.Is.object(producedByValue)) {
             producedByValue = producedByValue.id;
@@ -2052,27 +2123,50 @@ class FederatedCatalogueService {
             evidence: [dataResourceCredential.id],
             resourcePolicy: core.ArrayHelper.fromObjectOrArray(resourcePolicy)
         };
-        return result;
+        return { dataResourceEntry: result, extraData };
     }
     /**
      * Checks whether the Participant exists.
      * @param participantId The Participant identifier
+     * @internal
      */
     async checkParticipantExists(participantId) {
         const participantData = await this._entityStorageParticipants.get(participantId);
         if (!participantData) {
             this._logging?.log({
                 level: "error",
-                source: this.CLASS_NAME,
+                source: FederatedCatalogueService.CLASS_NAME,
                 ts: Date.now(),
                 message: "providerIsNotParticipant",
                 data: { providedBy: participantId }
             });
-            throw new core.UnprocessableError(this.CLASS_NAME, "providerIsNotParticipant", {
+            throw new core.UnprocessableError(FederatedCatalogueService.CLASS_NAME, "providerIsNotParticipant", {
                 providedBy: participantId
             });
         }
     }
+    /**
+     * Extracts extra data from an object.
+     * @param originalData The original data to extract from
+     * @param schema The entity storage that is used to store
+     * @returns The extraData and the data.
+     * @internal
+     */
+    extractExtraData(originalData, schema) {
+        const entityProperties = schema.properties ?? [];
+        // Type and @context is also an extra known property
+        const knownProperties = entityProperties.map(property => property.property).concat(["type", "@context"]);
+        const splitObjects = core.ObjectHelper.split(originalData, knownProperties);
+        return {
+            data: splitObjects.picked,
+            extraData: core.Is.objectValue(splitObjects.omitted)
+                ? {
+                    "@context": originalData["@context"],
+                    ...splitObjects.omitted
+                }
+                : undefined
+        };
+    }
 }
 
 const restEntryPoints = [