@twin.org/identity-connector-entity-storage 0.0.1-next.4 → 0.0.1-next.5

package/dist/cjs/index.cjs

@@ -3,6 +3,7 @@
 var entity = require('@twin.org/entity');
 var core = require('@twin.org/core');
 var crypto = require('@twin.org/crypto');
+var dataJsonLd = require('@twin.org/data-json-ld');
 var entityStorageModels = require('@twin.org/entity-storage-models');
 var identityModels = require('@twin.org/identity-models');
 var standardsW3cDid = require('@twin.org/standards-w3c-did');
@@ -440,15 +441,9 @@ class EntityStorageIdentityConnector {
             else if (core.Is.stringValue(types)) {
                 finalTypes.push(types);
             }
-            const finalContexts = ["https://www.w3.org/2018/credentials/v1"];
-            if (core.Is.array(contexts)) {
-                finalContexts.push(...contexts);
-            }
-            else if (core.Is.stringValue(contexts)) {
-                finalContexts.push(contexts);
-            }
             const verifiableCredential = {
-                "@context": finalContexts,
+                "@context": dataJsonLd.JsonLdProcessor.combineContexts("https://www.w3.org/2018/credentials/v1", contexts) ??
+                    null,
                 id: credentialId,
                 type: finalTypes,
                 credentialSubject: subject,
@@ -720,15 +715,9 @@ class EntityStorageIdentityConnector {
             else if (core.Is.stringValue(types)) {
                 finalTypes.push(types);
             }
-            const finalContexts = ["https://www.w3.org/2018/credentials/v1"];
-            if (core.Is.array(contexts)) {
-                finalContexts.push(...contexts);
-            }
-            else if (core.Is.stringValue(contexts)) {
-                finalContexts.push(contexts);
-            }
             const verifiablePresentation = {
-                "@context": finalContexts,
+                "@context": dataJsonLd.JsonLdProcessor.combineContexts("https://www.w3.org/2018/credentials/v1", contexts) ??
+                    null,
                 type: finalTypes,
                 verifiableCredential: verifiableCredentials,
                 holder: idParts.id

package/dist/esm/index.mjs

@@ -1,6 +1,7 @@
 import { property, entity, ComparisonOperator, EntitySchemaFactory, EntitySchemaHelper } from '@twin.org/entity';
 import { Guards, Converter, RandomHelper, BitString, Compression, CompressionType, GeneralError, Is, NotFoundError, ObjectHelper, Coerce, JsonHelper, AlreadyExistsError, BaseError } from '@twin.org/core';
 import { Sha256 } from '@twin.org/crypto';
+import { JsonLdProcessor } from '@twin.org/data-json-ld';
 import { EntityStorageConnectorFactory } from '@twin.org/entity-storage-models';
 import { DocumentHelper } from '@twin.org/identity-models';
 import { DidVerificationMethodType } from '@twin.org/standards-w3c-did';
@@ -438,15 +439,9 @@ class EntityStorageIdentityConnector {
             else if (Is.stringValue(types)) {
                 finalTypes.push(types);
             }
-            const finalContexts = ["https://www.w3.org/2018/credentials/v1"];
-            if (Is.array(contexts)) {
-                finalContexts.push(...contexts);
-            }
-            else if (Is.stringValue(contexts)) {
-                finalContexts.push(contexts);
-            }
             const verifiableCredential = {
-                "@context": finalContexts,
+                "@context": JsonLdProcessor.combineContexts("https://www.w3.org/2018/credentials/v1", contexts) ??
+                    null,
                 id: credentialId,
                 type: finalTypes,
                 credentialSubject: subject,
@@ -718,15 +713,9 @@ class EntityStorageIdentityConnector {
             else if (Is.stringValue(types)) {
                 finalTypes.push(types);
             }
-            const finalContexts = ["https://www.w3.org/2018/credentials/v1"];
-            if (Is.array(contexts)) {
-                finalContexts.push(...contexts);
-            }
-            else if (Is.stringValue(contexts)) {
-                finalContexts.push(contexts);
-            }
             const verifiablePresentation = {
-                "@context": finalContexts,
+                "@context": JsonLdProcessor.combineContexts("https://www.w3.org/2018/credentials/v1", contexts) ??
+                    null,
                 type: finalTypes,
                 verifiableCredential: verifiableCredentials,
                 holder: idParts.id

package/dist/types/entityStorageIdentityConnector.d.ts

@@ -1,3 +1,4 @@
+import { type IJsonLdContextDefinitionRoot } from "@twin.org/data-json-ld";
 import { type IIdentityConnector } from "@twin.org/identity-models";
 import { DidVerificationMethodType, type IDidDocument, type IDidDocumentVerificationMethod, type IDidService, type IDidVerifiableCredential, type IDidVerifiablePresentation } from "@twin.org/standards-w3c-did";
 /**
@@ -86,7 +87,7 @@ export declare class EntityStorageIdentityConnector implements IIdentityConnecto
      * @returns The created verifiable credential and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    createVerifiableCredential<T>(controller: string, verificationMethodId: string, credentialId: string | undefined, types: string | string[] | undefined, subject: T | T[], contexts?: string | string[], revocationIndex?: number): Promise<{
+    createVerifiableCredential<T>(controller: string, verificationMethodId: string, credentialId: string | undefined, types: string | string[] | undefined, subject: T | T[], contexts?: IJsonLdContextDefinitionRoot, revocationIndex?: number): Promise<{
         verifiableCredential: IDidVerifiableCredential<T>;
         jwt: string;
     }>;
@@ -126,7 +127,7 @@ export declare class EntityStorageIdentityConnector implements IIdentityConnecto
      * @returns The created verifiable presentation and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    createVerifiablePresentation(controller: string, presentationMethodId: string, types: string | string[] | undefined, verifiableCredentials: string[], contexts?: string | string[], expiresInMinutes?: number): Promise<{
+    createVerifiablePresentation(controller: string, presentationMethodId: string, types: string | string[] | undefined, verifiableCredentials: string[], contexts?: IJsonLdContextDefinitionRoot, expiresInMinutes?: number): Promise<{
         verifiablePresentation: IDidVerifiablePresentation;
         jwt: string;
     }>;

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/identity-connector-entity-storage- Changelog
 
-## v0.0.1-next.4
+## v0.0.1-next.5
 
 - Initial Release

package/docs/reference/classes/EntityStorageIdentityConnector.md

@@ -294,7 +294,7 @@ The type for the data stored in the verifiable credential.
 
 The subject data to store for the credential.
 
-• **contexts?**: `string` \| `string`[]
+• **contexts?**: `IJsonLdContextDefinitionRoot`
 
 Additional contexts to include in the credential.
 
@@ -450,7 +450,7 @@ The types for the data stored in the verifiable credential.
 
 The credentials to use for creating the presentation in jwt format.
 
-• **contexts?**: `string` \| `string`[]
+• **contexts?**: `IJsonLdContextDefinitionRoot`
 
 Additional contexts to include in the presentation.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/identity-connector-entity-storage",
-	"version": "0.0.1-next.4",
+	"version": "0.0.1-next.5",
 	"description": "Identity connector implementation using entity storage",
 	"repository": {
 		"type": "git",
@@ -19,7 +19,7 @@
 		"@twin.org/data-core": "next",
 		"@twin.org/data-json-ld": "next",
 		"@twin.org/entity": "next",
-		"@twin.org/identity-models": "0.0.1-next.4",
+		"@twin.org/identity-models": "0.0.1-next.5",
 		"@twin.org/nameof": "next",
 		"@twin.org/standards-w3c-did": "next",
 		"@twin.org/vault-models": "next",