@twin.org/standards-dataspace-protocol 0.0.3-next.53 → 0.0.3-next.55

package/dist/es/schemas/DataspaceProtocolTransferProcess.json

@@ -1,61 +1,15 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolTransferProcess",
-    "description": "Interface for Dataspace Protocol Transfer Messages. https://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#ack-transfer-process",
+    "title": "DataspaceProtocolTransferProcess",
+    "description": "Interface for Dataspace Protocol Transfer Messages.\nhttps://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#ack-transfer-process",
     "type": "object",
     "properties": {
         "@context": {
-            "description": "The Dataspace Protocol JSON-LD context type.",
-            "anyOf": [
-                {
-                    "type": "string",
-                    "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                },
-                {
-                    "type": "array",
-                    "items": {
-                        "type": "string",
-                        "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                    },
-                    "minItems": 1,
-                    "maxItems": 1
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        },
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        },
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                }
-            ]
+            "$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolContextType",
+            "description": "LD Context"
         },
         "@type": {
-            "type": "string",
             "const": "TransferProcess",
             "description": "LD Type"
         },

package/dist/es/schemas/DataspaceProtocolTransferRequestMessage.json

@@ -1,61 +1,15 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolTransferRequestMessage",
-    "description": "Interface for Dataspace Protocol Transfer Messages. https://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#transfer-request-message",
+    "title": "DataspaceProtocolTransferRequestMessage",
+    "description": "Interface for Dataspace Protocol Transfer Messages.\nhttps://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#transfer-request-message",
     "type": "object",
     "properties": {
         "@context": {
-            "description": "The Dataspace Protocol JSON-LD context type.",
-            "anyOf": [
-                {
-                    "type": "string",
-                    "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                },
-                {
-                    "type": "array",
-                    "items": {
-                        "type": "string",
-                        "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                    },
-                    "minItems": 1,
-                    "maxItems": 1
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        },
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        },
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                }
-            ]
+            "$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolContextType",
+            "description": "LD Context"
         },
         "@type": {
-            "type": "string",
             "const": "TransferRequestMessage",
             "description": "LD Type"
         },
@@ -73,11 +27,11 @@
         },
         "format": {
             "type": "string",
-            "description": "The format property is a format specified by a Distribution for the Dataset associated with the Agreement. This is generally obtained from the Provider's Catalog."
+            "description": "The format property is a format specified by a Distribution for the Dataset associated with the Agreement.\nThis is generally obtained from the Provider's Catalog."
         },
         "dataAddress": {
             "$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolDataAddress",
-            "description": "If defined MUST contain a transport-specific set of properties for pushing the data. It MAY include an endpoint, a temporary authorization via the endpointProperties property - depending on the endpointType."
+            "description": "If defined MUST contain a transport-specific set of properties for pushing the data.\nIt MAY include an endpoint, a temporary authorization via the endpointProperties property - depending on the endpointType."
         }
     },
     "required": [

package/dist/es/schemas/DataspaceProtocolTransferStartMessage.json

@@ -1,61 +1,15 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolTransferStartMessage",
-    "description": "Interface for Dataspace Protocol Transfer Messages. https://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#transfer-start-message",
+    "title": "DataspaceProtocolTransferStartMessage",
+    "description": "Interface for Dataspace Protocol Transfer Messages.\nhttps://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#transfer-start-message",
     "type": "object",
     "properties": {
         "@context": {
-            "description": "The Dataspace Protocol JSON-LD context type.",
-            "anyOf": [
-                {
-                    "type": "string",
-                    "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                },
-                {
-                    "type": "array",
-                    "items": {
-                        "type": "string",
-                        "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                    },
-                    "minItems": 1,
-                    "maxItems": 1
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        },
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        },
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                }
-            ]
+            "$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolContextType",
+            "description": "LD Context"
         },
         "@type": {
-            "type": "string",
             "const": "TransferStartMessage",
             "description": "LD Type"
         },
@@ -69,7 +23,7 @@
         },
         "dataAddress": {
             "$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolDataAddress",
-            "description": "MUST be provided if the current transfer is a pull transfer and contains a transport-specific endpoint address for obtaining the data."
+            "description": "MUST be provided if the current transfer is a pull transfer and\ncontains a transport-specific endpoint address for obtaining the data."
         }
     },
     "required": [

package/dist/es/schemas/DataspaceProtocolTransferSuspensionMessage.json

@@ -1,61 +1,15 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolTransferSuspensionMessage",
-    "description": "Interface for Dataspace Protocol Transfer Messages. https://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#transfer-suspension-message",
+    "title": "DataspaceProtocolTransferSuspensionMessage",
+    "description": "Interface for Dataspace Protocol Transfer Messages.\nhttps://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#transfer-suspension-message",
     "type": "object",
     "properties": {
         "@context": {
-            "description": "The Dataspace Protocol JSON-LD context type.",
-            "anyOf": [
-                {
-                    "type": "string",
-                    "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                },
-                {
-                    "type": "array",
-                    "items": {
-                        "type": "string",
-                        "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                    },
-                    "minItems": 1,
-                    "maxItems": 1
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        },
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        },
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                }
-            ]
+            "$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolContextType",
+            "description": "LD Context"
         },
         "@type": {
-            "type": "string",
             "const": "TransferSuspensionMessage",
             "description": "LD Type"
         },

package/dist/es/schemas/DataspaceProtocolTransferTerminationMessage.json

@@ -1,61 +1,15 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolTransferTerminationMessage",
-    "description": "Interface for Dataspace Protocol Transfer Messages. https://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#transfer-termination-message",
+    "title": "DataspaceProtocolTransferTerminationMessage",
+    "description": "Interface for Dataspace Protocol Transfer Messages.\nhttps://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/#transfer-termination-message",
     "type": "object",
     "properties": {
         "@context": {
-            "description": "The Dataspace Protocol JSON-LD context type.",
-            "anyOf": [
-                {
-                    "type": "string",
-                    "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                },
-                {
-                    "type": "array",
-                    "items": {
-                        "type": "string",
-                        "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                    },
-                    "minItems": 1,
-                    "maxItems": 1
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        },
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                },
-                {
-                    "type": "array",
-                    "minItems": 2,
-                    "prefixItems": [
-                        {
-                            "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                        },
-                        {
-                            "type": "string",
-                            "const": "https://w3id.org/dspace/2025/1/context.jsonld"
-                        }
-                    ],
-                    "items": {
-                        "$ref": "https://schema.twindev.org/json-ld/JsonLdContextDefinitionElement"
-                    }
-                }
-            ]
+            "$ref": "https://schema.twindev.org/dataspace-protocol/DataspaceProtocolContextType",
+            "description": "LD Context"
         },
         "@type": {
-            "type": "string",
             "const": "TransferTerminationMessage",
             "description": "LD Type"
         },

package/dist/es/utils/dataspaceProtocolHelper.js

@@ -18,41 +18,39 @@ export class DataspaceProtocolHelper {
     /**
      * Checks whether the object passed as parameter is conformant to the DS Protocol definitions.
      * @param object The object to check
-     * @param validationFailures the Validation failures obtained during the conformance checking.
-     * @returns true or false depending whether the object is conformant or not
+     * @returns An array of validation failures, empty if the object is conformant
      */
-    static async checkConformance(object, validationFailures) {
-        let result = false;
+    static async validate(object) {
         const dcatNamespace = DcatContexts.Namespace;
+        const validationFailures = [];
         const objectTypes = await JsonLdHelper.getType(object);
-        for (const type of objectTypes) {
-            let dataTypeIdentifier = type;
-            // If the DCAT3 types are used, convert to the DS Protocol equivalent
-            // which have the enhancements and constraints defined by the DS Protocol
-            if (type.startsWith(dcatNamespace)) {
-                const nonQualifiedType = type.replace(dcatNamespace, "");
-                dataTypeIdentifier = `${DataspaceProtocolContexts.Namespace}${nonQualifiedType}`;
-            }
-            const schema = await DataTypeHelper.getSchemaForType(dataTypeIdentifier);
-            if (!schema) {
-                throw new GeneralError(DataspaceProtocolHelper.CLASS_NAME, "schemaNotRegistered", {
-                    schemaId: dataTypeIdentifier
-                });
-            }
-            const normalizedObject = await DataspaceProtocolHelper.normalize(object);
-            const validationResult = await JsonSchemaHelper.validate(schema, normalizedObject);
-            result = validationResult.result;
-            if (!result && Is.array(validationResult.error)) {
-                for (const aError of validationResult.error) {
-                    const validationFailure = {
-                        property: aError.instancePath,
-                        reason: aError.message
-                    };
-                    validationFailures.push(validationFailure);
+        if (objectTypes.length === 0) {
+            validationFailures.push({
+                property: "@type",
+                reason: "validation.missingType"
+            });
+        }
+        else {
+            for (const type of objectTypes) {
+                let dataTypeIdentifier = type;
+                // If the DCAT3 types are used, convert to the DS Protocol equivalent
+                // which have the enhancements and constraints defined by the DS Protocol
+                if (type.startsWith(dcatNamespace)) {
+                    const nonQualifiedType = type.replace(dcatNamespace, "");
+                    dataTypeIdentifier = `${DataspaceProtocolContexts.Namespace}${nonQualifiedType}`;
                 }
+                const schema = await DataTypeHelper.getSchemaForType(dataTypeIdentifier);
+                if (!schema) {
+                    throw new GeneralError(DataspaceProtocolHelper.CLASS_NAME, "schemaNotRegistered", {
+                        schemaId: dataTypeIdentifier
+                    });
+                }
+                const normalizedObject = await DataspaceProtocolHelper.normalize(object);
+                const validationResult = await JsonSchemaHelper.validate(schema, normalizedObject);
+                validationFailures.push(...validationResult);
             }
         }
-        return result;
+        return validationFailures;
     }
     /**
      * Normalizes the input object making it compliant with the DS Protocol specifications.

package/dist/es/utils/dataspaceProtocolHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"dataspaceProtocolHelper.js","sourceRoot":"","sources":["../../../src/utils/dataspaceProtocolHelper.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2025 IOTA Stiftung.\n// SPDX-License-Identifier: Apache-2.0.\n\nimport { GeneralError, Is, ObjectHelper, type IValidationFailure } from \"@twin.org/core\";\nimport { DataTypeHelper, JsonSchemaHelper } from \"@twin.org/data-core\";\nimport {\n\tJsonLdHelper,\n\tJsonLdProcessor,\n\ttype IJsonLdContextDefinitionRoot,\n\ttype IJsonLdNodeObject\n} from \"@twin.org/data-json-ld\";\nimport { nameof } from \"@twin.org/nameof\";\nimport { DcatContexts } from \"@twin.org/standards-w3c-dcat\";\nimport { DataspaceProtocolContexts } from \"../models/dataspaceProtocolContexts.js\";\nimport { DataspaceProtocolTransferProcessTypes } from \"../models/transferProcess/dataspaceProtocolTransferProcessTypes.js\";\n\n/**\n * Dataspace protocol helper.\n */\nexport abstract class DataspaceProtocolHelper {\n\t/**\n\t * The class name.\n\t * @internal\n\t */\n\tpublic static readonly CLASS_NAME = nameof<DataspaceProtocolHelper>();\n\n\t/**\n\t * Checks whether the object passed as parameter is conformant to the DS Protocol definitions.\n\t * @param object The object to check\n\t * @param validationFailures the Validation failures obtained during the conformance checking.\n\t * @returns true or false depending whether the object is conformant or not\n\t */\n\tpublic static async checkConformance(\n\t\tobject: IJsonLdNodeObject,\n\t\tvalidationFailures: IValidationFailure[]\n\t): Promise<boolean> {\n\t\tlet result = false;\n\n\t\tconst dcatNamespace = DcatContexts.Namespace;\n\n\t\tconst objectTypes = await JsonLdHelper.getType(object);\n\n\t\tfor (const type of objectTypes) {\n\t\t\tlet dataTypeIdentifier = type;\n\n\t\t\t// If the DCAT3 types are used, convert to the DS Protocol equivalent\n\t\t\t// which have the enhancements and constraints defined by the DS Protocol\n\t\t\tif (type.startsWith(dcatNamespace)) {\n\t\t\t\tconst nonQualifiedType = type.replace(dcatNamespace, \"\");\n\t\t\t\tdataTypeIdentifier = `${DataspaceProtocolContexts.Namespace}${nonQualifiedType}`;\n\t\t\t}\n\n\t\t\tconst schema = await DataTypeHelper.getSchemaForType(dataTypeIdentifier);\n\t\t\tif (!schema) {\n\t\t\t\tthrow new GeneralError(DataspaceProtocolHelper.CLASS_NAME, \"schemaNotRegistered\", {\n\t\t\t\t\tschemaId: dataTypeIdentifier\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tconst normalizedObject = await DataspaceProtocolHelper.normalize(object);\n\n\t\t\tconst validationResult = await JsonSchemaHelper.validate(schema, normalizedObject);\n\t\t\tresult = validationResult.result;\n\n\t\t\tif (!result && Is.array(validationResult.error)) {\n\t\t\t\tfor (const aError of validationResult.error) {\n\t\t\t\t\tconst validationFailure: IValidationFailure = {\n\t\t\t\t\t\tproperty: aError.instancePath,\n\t\t\t\t\t\treason: aError.message as string\n\t\t\t\t\t};\n\t\t\t\t\tvalidationFailures.push(validationFailure);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n\n\t/**\n\t * Normalizes the input object making it compliant with the DS Protocol specifications.\n\t * @param object The input object.\n\t * @returns The input object normalized.\n\t */\n\tpublic static async normalize(object: IJsonLdNodeObject): Promise<IJsonLdNodeObject> {\n\t\tconst annotatedObject = DataspaceProtocolHelper.annotateLDContextForFormat(object);\n\n\t\t// Determine if this is a message/transfer type (which expects Context) or a catalog type (which expects JsonLdContext)\n\t\tconst objectType = ObjectHelper.propertyGet<string | string[]>(object, \"@type\");\n\t\tconst isTransferProcessType =\n\t\t\tIs.string(objectType) &&\n\t\t\t(objectType.includes(\"Message\") ||\n\t\t\t\tobjectType === DataspaceProtocolTransferProcessTypes.TransferProcess ||\n\t\t\t\tobjectType === DataspaceProtocolTransferProcessTypes.TransferError);\n\n\t\tconst contextToUse = isTransferProcessType\n\t\t\t? DataspaceProtocolContexts.Context\n\t\t\t: DataspaceProtocolContexts.JsonLdContext;\n\n\t\tconst compactedObject = await JsonLdProcessor.compact(annotatedObject, [contextToUse]);\n\n\t\tif (!Is.array(compactedObject[\"@context\"])) {\n\t\t\tObjectHelper.propertySet(compactedObject, \"@context\", [\n\t\t\t\tObjectHelper.propertyGet(compactedObject, \"@context\")\n\t\t\t]);\n\t\t}\n\n\t\treturn compactedObject;\n\t}\n\n\t/**\n\t * Ensures format property has a proper LD Context.\n\t * @param object The object.\n\t * @returns a copy of the object annotated with the proper LD Context.\n\t * @internal\n\t */\n\tprivate static annotateLDContextForFormat(object: IJsonLdNodeObject): IJsonLdNodeObject {\n\t\tconst result = ObjectHelper.clone<IJsonLdNodeObject>(object);\n\n\t\t// This step is needed before compaction as 'dcterms:format' is not defined originally as '@vocab'\n\t\t// but it is in the DSP LD Context\n\t\tconst EXTRA_ANNOTATION = {\n\t\t\t\"dcterms:format\": {\n\t\t\t\t\"@id\": \"dcterms:format\",\n\t\t\t\t\"@type\": \"@vocab\"\n\t\t\t}\n\t\t};\n\t\tconst ldContext = ObjectHelper.propertyGet<IJsonLdContextDefinitionRoot>(result, \"@context\");\n\t\tif (Is.array(ldContext)) {\n\t\t\tldContext.push(EXTRA_ANNOTATION);\n\t\t} else if (Is.object(ldContext)) {\n\t\t\tObjectHelper.propertySet(result, \"@context\", { ...ldContext, ...EXTRA_ANNOTATION });\n\t\t} else if (Is.string(ldContext)) {\n\t\t\tObjectHelper.propertySet(result, \"@context\", [ldContext, EXTRA_ANNOTATION]);\n\t\t}\n\n\t\treturn result;\n\t}\n}\n"]}
+{"version":3,"file":"dataspaceProtocolHelper.js","sourceRoot":"","sources":["../../../src/utils/dataspaceProtocolHelper.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2025 IOTA Stiftung.\n// SPDX-License-Identifier: Apache-2.0.\n\nimport { GeneralError, Is, ObjectHelper, type IValidationFailure } from \"@twin.org/core\";\nimport { DataTypeHelper, JsonSchemaHelper } from \"@twin.org/data-core\";\nimport {\n\tJsonLdHelper,\n\tJsonLdProcessor,\n\ttype IJsonLdContextDefinitionRoot,\n\ttype IJsonLdNodeObject\n} from \"@twin.org/data-json-ld\";\nimport { nameof } from \"@twin.org/nameof\";\nimport { DcatContexts } from \"@twin.org/standards-w3c-dcat\";\nimport { DataspaceProtocolContexts } from \"../models/dataspaceProtocolContexts.js\";\nimport { DataspaceProtocolTransferProcessTypes } from \"../models/transferProcess/dataspaceProtocolTransferProcessTypes.js\";\n\n/**\n * Dataspace protocol helper.\n */\nexport abstract class DataspaceProtocolHelper {\n\t/**\n\t * The class name.\n\t * @internal\n\t */\n\tpublic static readonly CLASS_NAME = nameof<DataspaceProtocolHelper>();\n\n\t/**\n\t * Checks whether the object passed as parameter is conformant to the DS Protocol definitions.\n\t * @param object The object to check\n\t * @returns An array of validation failures, empty if the object is conformant\n\t */\n\tpublic static async validate(object: IJsonLdNodeObject): Promise<IValidationFailure[]> {\n\t\tconst dcatNamespace = DcatContexts.Namespace;\n\t\tconst validationFailures: IValidationFailure[] = [];\n\n\t\tconst objectTypes = await JsonLdHelper.getType(object);\n\t\tif (objectTypes.length === 0) {\n\t\t\tvalidationFailures.push({\n\t\t\t\tproperty: \"@type\",\n\t\t\t\treason: \"validation.missingType\"\n\t\t\t});\n\t\t} else {\n\t\t\tfor (const type of objectTypes) {\n\t\t\t\tlet dataTypeIdentifier = type;\n\n\t\t\t\t// If the DCAT3 types are used, convert to the DS Protocol equivalent\n\t\t\t\t// which have the enhancements and constraints defined by the DS Protocol\n\t\t\t\tif (type.startsWith(dcatNamespace)) {\n\t\t\t\t\tconst nonQualifiedType = type.replace(dcatNamespace, \"\");\n\t\t\t\t\tdataTypeIdentifier = `${DataspaceProtocolContexts.Namespace}${nonQualifiedType}`;\n\t\t\t\t}\n\n\t\t\t\tconst schema = await DataTypeHelper.getSchemaForType(dataTypeIdentifier);\n\t\t\t\tif (!schema) {\n\t\t\t\t\tthrow new GeneralError(DataspaceProtocolHelper.CLASS_NAME, \"schemaNotRegistered\", {\n\t\t\t\t\t\tschemaId: dataTypeIdentifier\n\t\t\t\t\t});\n\t\t\t\t}\n\n\t\t\t\tconst normalizedObject = await DataspaceProtocolHelper.normalize(object);\n\n\t\t\t\tconst validationResult = await JsonSchemaHelper.validate(schema, normalizedObject);\n\t\t\t\tvalidationFailures.push(...validationResult);\n\t\t\t}\n\t\t}\n\n\t\treturn validationFailures;\n\t}\n\n\t/**\n\t * Normalizes the input object making it compliant with the DS Protocol specifications.\n\t * @param object The input object.\n\t * @returns The input object normalized.\n\t */\n\tpublic static async normalize(object: IJsonLdNodeObject): Promise<IJsonLdNodeObject> {\n\t\tconst annotatedObject = DataspaceProtocolHelper.annotateLDContextForFormat(object);\n\n\t\t// Determine if this is a message/transfer type (which expects Context) or a catalog type (which expects JsonLdContext)\n\t\tconst objectType = ObjectHelper.propertyGet<string | string[]>(object, \"@type\");\n\t\tconst isTransferProcessType =\n\t\t\tIs.string(objectType) &&\n\t\t\t(objectType.includes(\"Message\") ||\n\t\t\t\tobjectType === DataspaceProtocolTransferProcessTypes.TransferProcess ||\n\t\t\t\tobjectType === DataspaceProtocolTransferProcessTypes.TransferError);\n\n\t\tconst contextToUse = isTransferProcessType\n\t\t\t? DataspaceProtocolContexts.Context\n\t\t\t: DataspaceProtocolContexts.JsonLdContext;\n\n\t\tconst compactedObject = await JsonLdProcessor.compact(annotatedObject, [contextToUse]);\n\n\t\tif (!Is.array(compactedObject[\"@context\"])) {\n\t\t\tObjectHelper.propertySet(compactedObject, \"@context\", [\n\t\t\t\tObjectHelper.propertyGet(compactedObject, \"@context\")\n\t\t\t]);\n\t\t}\n\n\t\treturn compactedObject;\n\t}\n\n\t/**\n\t * Ensures format property has a proper LD Context.\n\t * @param object The object.\n\t * @returns a copy of the object annotated with the proper LD Context.\n\t * @internal\n\t */\n\tprivate static annotateLDContextForFormat(object: IJsonLdNodeObject): IJsonLdNodeObject {\n\t\tconst result = ObjectHelper.clone<IJsonLdNodeObject>(object);\n\n\t\t// This step is needed before compaction as 'dcterms:format' is not defined originally as '@vocab'\n\t\t// but it is in the DSP LD Context\n\t\tconst EXTRA_ANNOTATION = {\n\t\t\t\"dcterms:format\": {\n\t\t\t\t\"@id\": \"dcterms:format\",\n\t\t\t\t\"@type\": \"@vocab\"\n\t\t\t}\n\t\t};\n\t\tconst ldContext = ObjectHelper.propertyGet<IJsonLdContextDefinitionRoot>(result, \"@context\");\n\t\tif (Is.array(ldContext)) {\n\t\t\tldContext.push(EXTRA_ANNOTATION);\n\t\t} else if (Is.object(ldContext)) {\n\t\t\tObjectHelper.propertySet(result, \"@context\", { ...ldContext, ...EXTRA_ANNOTATION });\n\t\t} else if (Is.string(ldContext)) {\n\t\t\tObjectHelper.propertySet(result, \"@context\", [ldContext, EXTRA_ANNOTATION]);\n\t\t}\n\n\t\treturn result;\n\t}\n}\n"]}

package/dist/types/index.d.ts

@@ -1,27 +1,24 @@
+export * from "./dataTypes/catalogDataTypes.js";
+export * from "./dataTypes/dataspaceProtocolDataTypes.js";
 export * from "./models/dataspaceProtocolContexts.js";
 export * from "./models/dataspaceProtocolContextType.js";
-export * from "./dataTypes/dataspaceProtocolDataTypes.js";
-export * from "./dataTypes/catalogDataTypes.js";
 export * from "./models/catalog/dataspaceProtocolCatalogTypes.js";
 export * from "./models/catalog/IDataspaceProtocolCatalogError.js";
 export * from "./models/catalog/IDataspaceProtocolCatalogRequestMessage.js";
 export * from "./models/catalog/IDataspaceProtocolDatasetRequestMessage.js";
-export * from "./models/dcat3/IDataspaceProtocolDataset.js";
-export * from "./models/dcat3/IDataspaceProtocolDatasetNoContext.js";
 export * from "./models/dcat3/IDataspaceProtocolCatalog.js";
-export * from "./models/dcat3/IDataspaceProtocolCatalogNoContext.js";
-export * from "./models/dcat3/IDataspaceProtocolDistribution.js";
-export * from "./models/dcat3/IDataspaceProtocolDistributionNoContext.js";
+export * from "./models/dcat3/IDataspaceProtocolCatalogBase.js";
 export * from "./models/dcat3/IDataspaceProtocolDataService.js";
-export * from "./models/dcat3/IDataspaceProtocolDataServiceNoContext.js";
+export * from "./models/dcat3/IDataspaceProtocolDataServiceBase.js";
+export * from "./models/dcat3/IDataspaceProtocolDataset.js";
+export * from "./models/dcat3/IDataspaceProtocolDatasetBase.js";
+export * from "./models/dcat3/IDataspaceProtocolDistribution.js";
+export * from "./models/dcat3/IDataspaceProtocolDistributionBase.js";
 export * from "./models/odrl/IDataspaceProtocolAgreement.js";
-export * from "./models/odrl/IDataspaceProtocolAgreementNoContext.js";
 export * from "./models/odrl/IDataspaceProtocolOffer.js";
-export * from "./models/odrl/IDataspaceProtocolOfferNoContext.js";
+export * from "./models/odrl/IDataspaceProtocolOfferBase.js";
 export * from "./models/odrl/IDataspaceProtocolPolicy.js";
-export * from "./models/odrl/IDataspaceProtocolPolicyNoContext.js";
 export * from "./models/odrl/IDataspaceProtocolSet.js";
-export * from "./models/odrl/IDataspaceProtocolSetNoContext.js";
 export * from "./models/contractNegotiation/dataspaceProtocolContractNegotiationTypes.js";
 export * from "./models/contractNegotiation/IDataspaceProtocolContractAgreementMessage.js";
 export * from "./models/contractNegotiation/IDataspaceProtocolContractAgreementVerificationMessage.js";
@@ -44,7 +41,7 @@ export * from "./models/transferProcess/IDataspaceProtocolTransferRequestMessage
 export * from "./models/transferProcess/IDataspaceProtocolTransferStartMessage.js";
 export * from "./models/transferProcess/IDataspaceProtocolTransferSuspensionMessage.js";
 export * from "./models/transferProcess/IDataspaceProtocolTransferTerminationMessage.js";
-export * from "./models/transferProcess/types/dataspaceProtocolTransferProcessStateType.js";
 export * from "./models/transferProcess/types/dataspaceProtocolEndpointType.js";
+export * from "./models/transferProcess/types/dataspaceProtocolTransferProcessStateType.js";
 export * from "./dataTypes/transferProcessDataTypes.js";
 export * from "./utils/dataspaceProtocolHelper.js";

package/dist/types/models/catalog/dataspaceProtocolCatalogTypes.d.ts

@@ -19,66 +19,34 @@ export declare const DataspaceProtocolCatalogTypes: {
      * Dataset.
      */
     readonly Dataset: "Dataset";
-    /**
-     * Dataset without JSON-LD context.
-     */
-    readonly DatasetNoContext: "DatasetNoContext";
     /**
      * Data Service.
      */
     readonly DataService: "DataService";
-    /**
-     * Data Service without JSON-LD context.
-     */
-    readonly DataServiceNoContext: "DataServiceNoContext";
     /**
      * Distribution.
      */
     readonly Distribution: "Distribution";
-    /**
-     * Distribution without JSON-LD context.
-     */
-    readonly DistributionNoContext: "DistributionNoContext";
     /**
      * Catalog.
      */
     readonly Catalog: "Catalog";
-    /**
-     * Catalog without JSON-LD context.
-     */
-    readonly CatalogNoContext: "CatalogNoContext";
     /**
      * Policy.
      */
     readonly Policy: "Policy";
-    /**
-     * Policy without JSON-LD context.
-     */
-    readonly PolicyNoContext: "PolicyNoContext";
     /**
      * Offer.
      */
     readonly Offer: "Offer";
-    /**
-     * Offer without JSON-LD context.
-     */
-    readonly OfferNoContext: "OfferNoContext";
     /**
      * Agreement.
      */
     readonly Agreement: "Agreement";
-    /**
-     * Agreement without JSON-LD context.
-     */
-    readonly AgreementNoContext: "AgreementNoContext";
     /**
      * Set.
      */
     readonly Set: "Set";
-    /**
-     * Set without JSON-LD context.
-     */
-    readonly SetNoContext: "SetNoContext";
 };
 /**
  * The types for Dataspace Protocol Catalog Protocol.

package/dist/types/models/contractNegotiation/IDataspaceProtocolContractAgreementMessage.d.ts

@@ -1,6 +1,7 @@
+import type { JsonLdObjectWithNoContext } from "@twin.org/data-json-ld";
 import type { DataspaceProtocolContextType } from "../dataspaceProtocolContextType.js";
 import type { DataspaceProtocolContractNegotiationTypes } from "./dataspaceProtocolContractNegotiationTypes.js";
-import type { IDataspaceProtocolAgreementNoContext } from "../odrl/IDataspaceProtocolAgreementNoContext.js";
+import type { IDataspaceProtocolAgreement } from "../odrl/IDataspaceProtocolAgreement.js";
 /**
  * Interface for Dataspace Protocol Contract Agreement Messages.
  * https://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/2025-1/#contract-agreement-message
@@ -25,7 +26,7 @@ export interface IDataspaceProtocolContractAgreementMessage {
     /**
      * The agreement being sent.
      */
-    agreement: IDataspaceProtocolAgreementNoContext;
+    agreement: JsonLdObjectWithNoContext<IDataspaceProtocolAgreement>;
     /**
      * The base callback address for the provider to update the consumer on the state of the negotiation.
      */

package/dist/types/models/contractNegotiation/IDataspaceProtocolContractOfferMessage.d.ts

@@ -1,6 +1,6 @@
 import type { DataspaceProtocolContextType } from "../dataspaceProtocolContextType.js";
 import type { DataspaceProtocolContractNegotiationTypes } from "./dataspaceProtocolContractNegotiationTypes.js";
-import type { IDataspaceProtocolOfferNoContext } from "../odrl/IDataspaceProtocolOfferNoContext.js";
+import type { IDataspaceProtocolOfferBase } from "../odrl/IDataspaceProtocolOfferBase.js";
 /**
  * Interface for Dataspace Protocol Contract Offer Messages.
  * https://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/2025-1/#contract-offer-message
@@ -25,7 +25,7 @@ export interface IDataspaceProtocolContractOfferMessage {
     /**
      * The offer being requested.
      */
-    offer: IDataspaceProtocolOfferNoContext;
+    offer: IDataspaceProtocolOfferBase;
     /**
      * The base callback address for the provider to update the consumer on the state of the negotiation.
      */

package/dist/types/models/contractNegotiation/IDataspaceProtocolContractRequestMessage.d.ts

@@ -1,6 +1,6 @@
 import type { DataspaceProtocolContextType } from "../dataspaceProtocolContextType.js";
 import type { DataspaceProtocolContractNegotiationTypes } from "./dataspaceProtocolContractNegotiationTypes.js";
-import type { IDataspaceProtocolOfferNoContext } from "../odrl/IDataspaceProtocolOfferNoContext.js";
+import type { IDataspaceProtocolOfferBase } from "../odrl/IDataspaceProtocolOfferBase.js";
 /**
  * Interface for Dataspace Protocol Contract Request Messages.
  * https://eclipse-dataspace-protocol-base.github.io/DataspaceProtocol/2025-1/#contract-request-message
@@ -25,7 +25,7 @@ export interface IDataspaceProtocolContractRequestMessage {
     /**
      * The offer being requested.
      */
-    offer: IDataspaceProtocolOfferNoContext;
+    offer: IDataspaceProtocolOfferBase;
     /**
      * The base callback address for the provider to update the consumer on the state of the negotiation.
      */