@credo-ts/openid4vc 0.6.0-pr-2134-20241217213340 → 0.6.0-pr-2195-20250217170804

package/build/shared/issuerMetadataUtils.d.ts

@@ -1,5 +1,5 @@
 import type { OpenId4VciCredentialConfigurationsSupported, OpenId4VciCredentialConfigurationsSupportedWithFormats } from './models';
-import { type CredentialConfigurationsSupported } from '@animo-id/oid4vci';
+import { type CredentialConfigurationsSupported } from '@openid4vc/oid4vci';
 /**
  * Returns all entries from the credential offer with the associated metadata resolved.
  */
@@ -12,147 +12,105 @@ export declare function getAllowedAndRequestedScopeValues(options: {
     allowedScopes: string[];
 }): string[];
 export declare function getCredentialConfigurationsSupportedForScopes(credentialConfigurationsSupported: CredentialConfigurationsSupported, scopes: string[]): {
-    [k: string]: ({
-        format: "vc+sd-jwt";
-        vct: string;
-        claims?: ({
-            mandatory?: boolean | undefined;
-            value_type?: string | undefined;
-            display?: ({
-                name?: string | undefined;
-                locale?: string | undefined;
-            } & {
-                [key: string]: unknown;
-            }) | undefined;
-        } & {
-            [key: string]: unknown;
-        }) | undefined;
-        order?: string[] | undefined;
-    } | {
-        format: "mso_mdoc";
-        doctype: string;
-        claims?: ({
-            mandatory?: boolean | undefined;
-            value_type?: string | undefined;
-            display?: ({
-                name?: string | undefined;
-                locale?: string | undefined;
-            } & {
-                [key: string]: unknown;
-            }) | undefined;
-        } & {
-            [key: string]: unknown;
-        }) | undefined;
-        order?: string[] | undefined;
-    } | {
-        format: "jwt_vc_json-ld";
-        credential_definition: {
-            type: string[];
-            '@context': string[];
-            credentialSubject?: {
-                [x: string]: any[] | {
-                    [x: string]: any;
-                } | ({
-                    mandatory: boolean;
-                    value_type?: string | undefined;
-                    display?: ({
-                        name?: string | undefined;
-                        locale?: string | undefined;
-                    } & {
-                        [key: string]: unknown;
-                    })[] | undefined;
-                } & {
-                    [key: string]: unknown;
-                });
-            } | undefined;
-        } & {
-            [key: string]: unknown;
-        };
-        order?: string[] | undefined;
-    } | {
-        format: "ldp_vc";
-        credential_definition: {
-            type: string[];
-            '@context': string[];
-            credentialSubject?: {
-                [x: string]: any[] | {
-                    [x: string]: any;
-                } | ({
-                    mandatory: boolean;
-                    value_type?: string | undefined;
-                    display?: ({
-                        name?: string | undefined;
-                        locale?: string | undefined;
-                    } & {
-                        [key: string]: unknown;
-                    })[] | undefined;
-                } & {
-                    [key: string]: unknown;
-                });
-            } | undefined;
-        } & {
-            [key: string]: unknown;
-        };
-        order?: string[] | undefined;
-    } | {
-        format: "jwt_vc_json";
-        credential_definition: {
-            type: string[];
-            credentialSubject?: {
-                [x: string]: any[] | {
-                    [x: string]: any;
-                } | ({
-                    mandatory: boolean;
-                    value_type?: string | undefined;
-                    display?: ({
-                        name?: string | undefined;
-                        locale?: string | undefined;
-                    } & {
-                        [key: string]: unknown;
-                    })[] | undefined;
-                } & {
-                    [key: string]: unknown;
-                });
-            } | undefined;
-        } & {
-            [key: string]: unknown;
-        };
-        order?: string[] | undefined;
-    } | ({
-        format: string;
-    } & {
-        [key: string]: unknown;
-    })) & {
-        format: string;
-        display?: ({
-            name: string;
-            description?: string | undefined;
-            locale?: string | undefined;
-            logo?: ({
-                uri?: string | undefined;
-                alt_text?: string | undefined;
-            } & {
-                [key: string]: unknown;
-            }) | undefined;
-            background_color?: string | undefined;
-            background_image?: ({
-                uri?: string | undefined;
-            } & {
-                [key: string]: unknown;
-            }) | undefined;
-            text_color?: string | undefined;
-        } & {
-            [key: string]: unknown;
-        })[] | undefined;
-        scope?: string | undefined;
-        cryptographic_binding_methods_supported?: string[] | undefined;
-        credential_signing_alg_values_supported?: string[] | undefined;
-        proof_types_supported?: {
-            [x: string]: {
-                proof_signing_alg_values_supported: string[];
-            };
-        } | undefined;
-    } & {
-        [key: string]: unknown;
-    };
+    [k: string]: import("zod").objectOutputType<{
+        format: import("zod").ZodString;
+        scope: import("zod").ZodOptional<import("zod").ZodString>;
+        cryptographic_binding_methods_supported: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
+        credential_signing_alg_values_supported: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
+        proof_types_supported: import("zod").ZodOptional<import("zod").ZodRecord<import("zod").ZodUnion<[import("zod").ZodLiteral<"jwt">, import("zod").ZodLiteral<"attestation">, import("zod").ZodString]>, import("zod").ZodObject<{
+            proof_signing_alg_values_supported: import("zod").ZodArray<import("zod").ZodString, "many">;
+            key_attestations_required: import("zod").ZodOptional<import("zod").ZodObject<{
+                key_storage: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+                user_authentication: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+            }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
+                key_storage: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+                user_authentication: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+            }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
+                key_storage: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+                user_authentication: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+            }, import("zod").ZodTypeAny, "passthrough">>>;
+        }, "strip", import("zod").ZodTypeAny, {
+            proof_signing_alg_values_supported: string[];
+            key_attestations_required?: import("zod").objectOutputType<{
+                key_storage: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+                user_authentication: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+            }, import("zod").ZodTypeAny, "passthrough"> | undefined;
+        }, {
+            proof_signing_alg_values_supported: string[];
+            key_attestations_required?: import("zod").objectInputType<{
+                key_storage: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+                user_authentication: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodUnion<[import("zod").ZodEnum<["iso_18045_high", "iso_18045_moderate", "iso_18045_enhanced-basic", "iso_18045_basic"]>, import("zod").ZodString]>, "many">>;
+            }, import("zod").ZodTypeAny, "passthrough"> | undefined;
+        }>>>;
+        display: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
+            name: import("zod").ZodString;
+            locale: import("zod").ZodOptional<import("zod").ZodString>;
+            logo: import("zod").ZodOptional<import("zod").ZodObject<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+                alt_text: import("zod").ZodOptional<import("zod").ZodString>;
+            }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+                alt_text: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+                alt_text: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">>>;
+            description: import("zod").ZodOptional<import("zod").ZodString>;
+            background_color: import("zod").ZodOptional<import("zod").ZodString>;
+            background_image: import("zod").ZodOptional<import("zod").ZodObject<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+            }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">>>;
+            text_color: import("zod").ZodOptional<import("zod").ZodString>;
+        }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
+            name: import("zod").ZodString;
+            locale: import("zod").ZodOptional<import("zod").ZodString>;
+            logo: import("zod").ZodOptional<import("zod").ZodObject<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+                alt_text: import("zod").ZodOptional<import("zod").ZodString>;
+            }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+                alt_text: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+                alt_text: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">>>;
+            description: import("zod").ZodOptional<import("zod").ZodString>;
+            background_color: import("zod").ZodOptional<import("zod").ZodString>;
+            background_image: import("zod").ZodOptional<import("zod").ZodObject<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+            }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">>>;
+            text_color: import("zod").ZodOptional<import("zod").ZodString>;
+        }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
+            name: import("zod").ZodString;
+            locale: import("zod").ZodOptional<import("zod").ZodString>;
+            logo: import("zod").ZodOptional<import("zod").ZodObject<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+                alt_text: import("zod").ZodOptional<import("zod").ZodString>;
+            }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+                alt_text: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+                alt_text: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">>>;
+            description: import("zod").ZodOptional<import("zod").ZodString>;
+            background_color: import("zod").ZodOptional<import("zod").ZodString>;
+            background_image: import("zod").ZodOptional<import("zod").ZodObject<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+            }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
+                uri: import("zod").ZodOptional<import("zod").ZodString>;
+            }, import("zod").ZodTypeAny, "passthrough">>>;
+            text_color: import("zod").ZodOptional<import("zod").ZodString>;
+        }, import("zod").ZodTypeAny, "passthrough">>, "many">>;
+    }, import("zod").ZodTypeAny, "passthrough">;
 };

package/build/shared/models/index.d.ts

@@ -1,7 +1,9 @@
-import type { AccessTokenResponse } from '@animo-id/oauth2';
-import type { CredentialConfigurationSupported, CredentialConfigurationSupportedWithFormats, CredentialIssuerMetadata, CredentialIssuerMetadataDisplayEntry, CredentialOfferPreAuthorizedCodeGrantTxCode, CredentialRequest, CredentialRequestFormatSpecific, CredentialRequestWithFormats, IssuerMetadataResult, ParseCredentialRequestReturn, CredentialOfferObject } from '@animo-id/oid4vci';
-import type { VerifiedAuthorizationRequest, AuthorizationRequestPayload, AuthorizationResponsePayload, IDTokenPayload } from '@sphereon/did-auth-siop';
-export { preAuthorizedCodeGrantIdentifier, authorizationCodeGrantIdentifier } from '@animo-id/oauth2';
+import type { AccessTokenResponse } from '@openid4vc/oauth2';
+import type { CredentialConfigurationSupported, CredentialConfigurationSupportedWithFormats, CredentialIssuerMetadata, CredentialIssuerMetadataDisplayEntry, CredentialOfferObject, CredentialOfferPreAuthorizedCodeGrantTxCode, CredentialRequest, CredentialRequestFormatSpecific, CredentialRequestWithFormats, IssuerMetadataResult, ParseCredentialRequestReturn } from '@openid4vc/oid4vci';
+import { Openid4vpAuthorizationResponse, Openid4vpAuthorizationResponseDcApi, ResolvedOpenid4vpAuthRequest } from '@openid4vc/oid4vp';
+import type { AuthorizationRequestPayload, IDTokenPayload } from '@sphereon/did-auth-siop';
+export { authorizationCodeGrantIdentifier, preAuthorizedCodeGrantIdentifier } from '@openid4vc/oauth2';
+export { Openid4vpAuthorizationRequest } from '@openid4vc/oid4vp';
 export type OpenId4VciCredentialConfigurationSupportedWithFormats = CredentialConfigurationSupportedWithFormats;
 export type OpenId4VciCredentialConfigurationSupported = CredentialConfigurationSupported;
 export type OpenId4VciCredentialConfigurationsSupported = Record<string, OpenId4VciCredentialConfigurationSupported>;
@@ -16,11 +18,11 @@ export type OpenId4VciCredentialIssuerMetadataDisplay = CredentialIssuerMetadata
 export type OpenId4VciCredentialRequest = CredentialRequest;
 export type OpenId4VciCredentialRequestWithFormats = CredentialRequestWithFormats;
 export type OpenId4VciCredentialOfferPayload = CredentialOfferObject;
-export type OpenId4VcSiopVerifiedAuthorizationRequest = VerifiedAuthorizationRequest;
+export type OpenId4VcSiopVerifiedAuthorizationRequest = ResolvedOpenid4vpAuthRequest;
 export type OpenId4VcSiopAuthorizationRequestPayload = AuthorizationRequestPayload;
-export type OpenId4VcSiopAuthorizationResponsePayload = AuthorizationResponsePayload;
+export type OpenId4VcSiopAuthorizationResponsePayload = Openid4vpAuthorizationResponse | Openid4vpAuthorizationResponseDcApi['data'];
 export type OpenId4VcSiopIdTokenPayload = IDTokenPayload;
-export * from './OpenId4VcJwtIssuer';
 export * from './CredentialHolderBinding';
-export * from './OpenId4VciCredentialFormatProfile';
 export * from './OpenId4VciAuthorizationServerConfig';
+export * from './OpenId4VciCredentialFormatProfile';
+export * from './OpenId4VcJwtIssuer';

package/build/shared/models/index.js

@@ -14,12 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.authorizationCodeGrantIdentifier = exports.preAuthorizedCodeGrantIdentifier = void 0;
-var oauth2_1 = require("@animo-id/oauth2");
-Object.defineProperty(exports, "preAuthorizedCodeGrantIdentifier", { enumerable: true, get: function () { return oauth2_1.preAuthorizedCodeGrantIdentifier; } });
+exports.preAuthorizedCodeGrantIdentifier = exports.authorizationCodeGrantIdentifier = void 0;
+var oauth2_1 = require("@openid4vc/oauth2");
 Object.defineProperty(exports, "authorizationCodeGrantIdentifier", { enumerable: true, get: function () { return oauth2_1.authorizationCodeGrantIdentifier; } });
-__exportStar(require("./OpenId4VcJwtIssuer"), exports);
+Object.defineProperty(exports, "preAuthorizedCodeGrantIdentifier", { enumerable: true, get: function () { return oauth2_1.preAuthorizedCodeGrantIdentifier; } });
 __exportStar(require("./CredentialHolderBinding"), exports);
-__exportStar(require("./OpenId4VciCredentialFormatProfile"), exports);
 __exportStar(require("./OpenId4VciAuthorizationServerConfig"), exports);
+__exportStar(require("./OpenId4VciCredentialFormatProfile"), exports);
+__exportStar(require("./OpenId4VcJwtIssuer"), exports);
 //# sourceMappingURL=index.js.map

package/build/shared/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/shared/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAqBA,2CAAqG;AAA5F,0HAAA,gCAAgC,OAAA;AAAE,0HAAA,gCAAgC,OAAA;AAgC3E,uDAAoC;AACpC,4DAAyC;AACzC,sEAAmD;AACnD,wEAAqD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/shared/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAiBA,4CAAsG;AAA7F,0HAAA,gCAAgC,OAAA;AAAE,0HAAA,gCAAgC,OAAA;AAiC3E,4DAAyC;AACzC,wEAAqD;AACrD,sEAAmD;AACnD,uDAAoC"}

package/build/shared/router/context.d.ts

@@ -1,7 +1,7 @@
-import type { Oauth2ErrorCodes, Oauth2ServerErrorResponseError } from '@animo-id/oauth2';
+import type { Oauth2ErrorCodes, Oauth2ServerErrorResponseError } from '@openid4vc/oauth2';
 import type { AgentContext, Logger } from '@credo-ts/core';
 import type { Response, Request, NextFunction } from 'express';
-import { Oauth2ResourceUnauthorizedError } from '@animo-id/oauth2';
+import { Oauth2ResourceUnauthorizedError } from '@openid4vc/oauth2';
 export interface OpenId4VcRequest<RC extends Record<string, unknown> = Record<string, never>> extends Request {
     requestContext?: RC & OpenId4VcRequestContext;
 }

package/build/shared/router/context.js

@@ -7,7 +7,7 @@ exports.sendNotFoundResponse = sendNotFoundResponse;
 exports.sendErrorResponse = sendErrorResponse;
 exports.sendJsonResponse = sendJsonResponse;
 exports.getRequestContext = getRequestContext;
-const oauth2_1 = require("@animo-id/oauth2");
+const oauth2_1 = require("@openid4vc/oauth2");
 const core_1 = require("@credo-ts/core");
 function sendUnauthorizedError(response, next, logger, error, status) {
     const errorMessage = error instanceof Error ? error.message : error;
@@ -22,7 +22,7 @@ function sendUnauthorizedError(response, next, logger, error, status) {
         ]);
     response
         .setHeader('WWW-Authenticate', unauhorizedError.toHeaderValue())
-        .status(status !== null && status !== void 0 ? status : 403)
+        .status(status ?? 403)
         .send();
     next(error);
 }
@@ -49,7 +49,7 @@ function sendNotFoundResponse(response, next, logger, internalReason) {
     next(new core_1.CredoError(internalReason));
 }
 function sendErrorResponse(response, next, logger, status, message, error, additionalPayload) {
-    const body = Object.assign(Object.assign({ error: message }, (error instanceof Error && { cause: error.message })), additionalPayload);
+    const body = { error: message, ...(error instanceof Error && { cause: error.message }), ...additionalPayload };
     logger.warn(`[OID4VC] Sending error response: ${JSON.stringify(body)}`, {
         error,
     });
@@ -61,8 +61,8 @@ function sendJsonResponse(response, next,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 body, contentType, status) {
     response
-        .setHeader('Content-Type', contentType !== null && contentType !== void 0 ? contentType : 'application/json')
-        .status(status !== null && status !== void 0 ? status : 200)
+        .setHeader('Content-Type', contentType ?? 'application/json')
+        .status(status ?? 200)
         .send(JSON.stringify(body));
     next();
 }

package/build/shared/router/context.js.map

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

package/build/shared/router/tenants.js

@@ -31,7 +31,6 @@ async function getAgentContextForActorId(rootAgentContext, actorId) {
  * the same agent.
  */
 async function storeActorIdForContextCorrelationId(agentContext, actorId) {
-    var _a;
     // It's kind of hacky, but we add support for the tenants module specifically here to map an actorId to
     // a specific tenant. Otherwise we have to expose /:contextCorrelationId/:actorId in all the public URLs
     // which is of course not so nice.
@@ -39,7 +38,7 @@ async function storeActorIdForContextCorrelationId(agentContext, actorId) {
     // We don't want to query the tenant record if the current context is the root context
     if (tenantsApi && tenantsApi.rootAgentContext.contextCorrelationId !== agentContext.contextCorrelationId) {
         const tenantRecord = await tenantsApi.getTenantById(agentContext.contextCorrelationId);
-        const currentOpenId4VcActorIds = (_a = tenantRecord.metadata.get(OPENID4VC_ACTOR_IDS_METADATA_KEY)) !== null && _a !== void 0 ? _a : [];
+        const currentOpenId4VcActorIds = tenantRecord.metadata.get(OPENID4VC_ACTOR_IDS_METADATA_KEY) ?? [];
         const openId4VcActorIds = [...currentOpenId4VcActorIds, actorId];
         tenantRecord.metadata.set(OPENID4VC_ACTOR_IDS_METADATA_KEY, openId4VcActorIds);
         tenantRecord.setTag(OPENID4VC_ACTOR_IDS_METADATA_KEY, openId4VcActorIds);

package/build/shared/router/tenants.js.map

@@ -1 +1 @@
-{"version":3,"file":"tenants.js","sourceRoot":"","sources":["../../../src/shared/router/tenants.ts"],"names":[],"mappings":";;AAOA,8DAmBC;AAYD,kFAiBC;AApDD,yCAAwE;AAExE,MAAM,gCAAgC,GAAG,8BAA8B,CAAA;AAEhE,KAAK,UAAU,yBAAyB,CAAC,gBAA8B,EAAE,OAAe;IAC7F,uFAAuF;IACvF,oFAAoF;IACpF,uFAAuF;IACvF,MAAM,UAAU,GAAG,IAAA,4BAAqB,EAAgB,gBAAgB,EAAE,eAAe,CAAC,CAAA;IAC1F,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC;YACnD,CAAC,gCAAgC,CAAC,EAAE,CAAC,OAAO,CAAC;SAC9C,CAAC,CAAA;QAEF,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CACrE,uBAAgB,CAAC,oBAAoB,CACtC,CAAA;YACD,OAAO,oBAAoB,CAAC,sCAAsC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC/E,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,mCAAmC,CAAC,YAA0B,EAAE,OAAe;;IACnG,uGAAuG;IACvG,wGAAwG;IACxG,kCAAkC;IAClC,MAAM,UAAU,GAAG,IAAA,4BAAqB,EAAgB,YAAY,EAAE,eAAe,CAAC,CAAA;IAEtF,sFAAsF;IACtF,IAAI,UAAU,IAAI,UAAU,CAAC,gBAAgB,CAAC,oBAAoB,KAAK,YAAY,CAAC,oBAAoB,EAAE,CAAC;QACzG,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAA;QAEtF,MAAM,wBAAwB,GAAG,MAAA,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAW,gCAAgC,CAAC,mCAAI,EAAE,CAAA;QAC5G,MAAM,iBAAiB,GAAG,CAAC,GAAG,wBAAwB,EAAE,OAAO,CAAC,CAAA;QAEhE,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,gCAAgC,EAAE,iBAAiB,CAAC,CAAA;QAC9E,YAAY,CAAC,MAAM,CAAC,gCAAgC,EAAE,iBAAiB,CAAC,CAAA;QACxE,MAAM,UAAU,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;IAC7C,CAAC;AACH,CAAC"}
+{"version":3,"file":"tenants.js","sourceRoot":"","sources":["../../../src/shared/router/tenants.ts"],"names":[],"mappings":";;AAOA,8DAmBC;AAYD,kFAiBC;AApDD,yCAAwE;AAExE,MAAM,gCAAgC,GAAG,8BAA8B,CAAA;AAEhE,KAAK,UAAU,yBAAyB,CAAC,gBAA8B,EAAE,OAAe;IAC7F,uFAAuF;IACvF,oFAAoF;IACpF,uFAAuF;IACvF,MAAM,UAAU,GAAG,IAAA,4BAAqB,EAAgB,gBAAgB,EAAE,eAAe,CAAC,CAAA;IAC1F,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC;YACnD,CAAC,gCAAgC,CAAC,EAAE,CAAC,OAAO,CAAC;SAC9C,CAAC,CAAA;QAEF,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CACrE,uBAAgB,CAAC,oBAAoB,CACtC,CAAA;YACD,OAAO,oBAAoB,CAAC,sCAAsC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC/E,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,mCAAmC,CAAC,YAA0B,EAAE,OAAe;IACnG,uGAAuG;IACvG,wGAAwG;IACxG,kCAAkC;IAClC,MAAM,UAAU,GAAG,IAAA,4BAAqB,EAAgB,YAAY,EAAE,eAAe,CAAC,CAAA;IAEtF,sFAAsF;IACtF,IAAI,UAAU,IAAI,UAAU,CAAC,gBAAgB,CAAC,oBAAoB,KAAK,YAAY,CAAC,oBAAoB,EAAE,CAAC;QACzG,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAA;QAEtF,MAAM,wBAAwB,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAW,gCAAgC,CAAC,IAAI,EAAE,CAAA;QAC5G,MAAM,iBAAiB,GAAG,CAAC,GAAG,wBAAwB,EAAE,OAAO,CAAC,CAAA;QAEhE,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,gCAAgC,EAAE,iBAAiB,CAAC,CAAA;QAC9E,YAAY,CAAC,MAAM,CAAC,gCAAgC,EAAE,iBAAiB,CAAC,CAAA;QACxE,MAAM,UAAU,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;IAC7C,CAAC;AACH,CAAC"}

package/build/shared/utils.d.ts

@@ -1,7 +1,6 @@
-import type { OpenId4VcIssuerX5c, OpenId4VcJwtIssuer } from './models';
 import type { AgentContext, DidPurpose, JwaSignatureAlgorithm, Key } from '@credo-ts/core';
-import type { JwtIssuerWithContext as VpJwtIssuerWithContext, VerifyJwtCallback } from '@sphereon/did-auth-siop';
-import type { DPoPJwtIssuerWithContext, CreateJwtCallback, JwtIssuer } from '@sphereon/oid4vc-common';
+import type { OpenId4VcIssuerX5c, OpenId4VcJwtIssuer } from './models';
+import { JwtSigner, JwtSignerX5c } from '@openid4vc/oauth2';
 /**
  * Returns the JWA Signature Algorithms that are supported by the wallet.
  *
@@ -12,11 +11,12 @@ import type { DPoPJwtIssuerWithContext, CreateJwtCallback, JwtIssuer } from '@sp
  */
 export declare function getSupportedJwaSignatureAlgorithms(agentContext: AgentContext): JwaSignatureAlgorithm[];
 export declare function getKeyFromDid(agentContext: AgentContext, didUrl: string, allowedPurposes?: DidPurpose[]): Promise<Key>;
-export declare function getVerifyJwtCallback(agentContext: AgentContext): VerifyJwtCallback;
-export declare function getCreateJwtCallback(agentContext: AgentContext): CreateJwtCallback<DPoPJwtIssuerWithContext | VpJwtIssuerWithContext>;
 export declare function openIdTokenIssuerToJwtIssuer(agentContext: AgentContext, openId4VcTokenIssuer: Exclude<OpenId4VcJwtIssuer, OpenId4VcIssuerX5c> | (OpenId4VcIssuerX5c & {
     issuer: string;
-})): Promise<JwtIssuer>;
+})): Promise<Exclude<JwtSigner, JwtSignerX5c> | (JwtSignerX5c & {
+    issuer: string;
+})>;
 export declare function getProofTypeFromKey(agentContext: AgentContext, key: Key): string;
 export declare function addSecondsToDate(date: Date, seconds: number): Date;
 export declare function dateToSeconds(date: Date): number;
+export declare function parseIfJson<T>(input: T): T | Record<string, unknown>;

package/build/shared/utils.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSupportedJwaSignatureAlgorithms = getSupportedJwaSignatureAlgorithms;
 exports.getKeyFromDid = getKeyFromDid;
-exports.getVerifyJwtCallback = getVerifyJwtCallback;
-exports.getCreateJwtCallback = getCreateJwtCallback;
 exports.openIdTokenIssuerToJwtIssuer = openIdTokenIssuerToJwtIssuer;
 exports.getProofTypeFromKey = getProofTypeFromKey;
 exports.addSecondsToDate = addSecondsToDate;
 exports.dateToSeconds = dateToSeconds;
+exports.parseIfJson = parseIfJson;
 const core_1 = require("@credo-ts/core");
 /**
  * Returns the JWA Signature Algorithms that are supported by the wallet.
@@ -35,66 +34,10 @@ async function getKeyFromDid(agentContext, didUrl, allowedPurposes = ['authentic
     const verificationMethod = didDocument.dereferenceKey(didUrl, allowedPurposes);
     return (0, core_1.getKeyFromVerificationMethod)(verificationMethod);
 }
-function getVerifyJwtCallback(agentContext) {
-    return async (jwtVerifier, jwt) => {
-        const jwsService = agentContext.dependencyManager.resolve(core_1.JwsService);
-        if (jwtVerifier.method === 'did') {
-            const key = await getKeyFromDid(agentContext, jwtVerifier.didUrl);
-            const jwk = (0, core_1.getJwkFromKey)(key);
-            const res = await jwsService.verifyJws(agentContext, { jws: jwt.raw, jwkResolver: () => jwk });
-            return res.isValid;
-        }
-        else if (jwtVerifier.method === 'x5c' || jwtVerifier.method === 'jwk') {
-            const res = await jwsService.verifyJws(agentContext, { jws: jwt.raw });
-            return res.isValid;
-        }
-        else {
-            throw new Error(`Unsupported jwt verifier method: '${jwtVerifier.method}'`);
-        }
-    };
-}
-function getCreateJwtCallback(agentContext) {
-    return async (jwtIssuer, jwt) => {
-        const jwsService = agentContext.dependencyManager.resolve(core_1.JwsService);
-        if (jwtIssuer.method === 'did') {
-            const key = await getKeyFromDid(agentContext, jwtIssuer.didUrl);
-            const jws = await jwsService.createJwsCompact(agentContext, {
-                protectedHeaderOptions: Object.assign(Object.assign({}, jwt.header), { alg: jwtIssuer.alg, jwk: undefined }),
-                payload: core_1.JwtPayload.fromJson(jwt.payload),
-                key,
-            });
-            return jws;
-        }
-        else if (jwtIssuer.method === 'jwk') {
-            if (!jwtIssuer.jwk.kty) {
-                throw new core_1.CredoError('Missing required key type (kty) in the jwk.');
-            }
-            const jwk = (0, core_1.getJwkFromJson)(jwtIssuer.jwk);
-            const key = jwk.key;
-            const jws = await jwsService.createJwsCompact(agentContext, {
-                protectedHeaderOptions: Object.assign(Object.assign({}, jwt.header), { jwk, alg: jwtIssuer.alg }),
-                payload: core_1.JwtPayload.fromJson(jwt.payload),
-                key,
-            });
-            return jws;
-        }
-        else if (jwtIssuer.method === 'x5c') {
-            const leafCertificate = core_1.X509Service.getLeafCertificate(agentContext, { certificateChain: jwtIssuer.x5c });
-            const jws = await jwsService.createJwsCompact(agentContext, {
-                protectedHeaderOptions: Object.assign(Object.assign({}, jwt.header), { alg: jwtIssuer.alg, jwk: undefined }),
-                payload: core_1.JwtPayload.fromJson(jwt.payload),
-                key: leafCertificate.publicKey,
-            });
-            return jws;
-        }
-        throw new Error(`Unsupported jwt issuer method '${jwtIssuer.method}'`);
-    };
-}
 async function openIdTokenIssuerToJwtIssuer(agentContext, openId4VcTokenIssuer) {
-    var _a;
     if (openId4VcTokenIssuer.method === 'did') {
         const key = await getKeyFromDid(agentContext, openId4VcTokenIssuer.didUrl);
-        const alg = (_a = (0, core_1.getJwkClassFromKeyType)(key.keyType)) === null || _a === void 0 ? void 0 : _a.supportedSignatureAlgorithms[0];
+        const alg = (0, core_1.getJwkClassFromKeyType)(key.keyType)?.supportedSignatureAlgorithms[0];
         if (!alg)
             throw new core_1.CredoError(`No supported signature algorithms for key type: ${key.keyType}`);
         return {
@@ -126,14 +69,21 @@ async function openIdTokenIssuerToJwtIssuer(agentContext, openId4VcTokenIssuer)
                 : 'there are no SAN-DNS names';
             throw new Error(`The 'iss' claim in the payload does not match a 'SAN-URI' or 'SAN-DNS' name in the x5c certificate. 'iss' value is '${openId4VcTokenIssuer.issuer}', ${sanUriMessage}, ${sanDnsMessage} (for SAN-DNS only domain has to match)`);
         }
-        return Object.assign(Object.assign({}, openId4VcTokenIssuer), { alg });
+        return {
+            ...openId4VcTokenIssuer,
+            alg,
+        };
     }
     else if (openId4VcTokenIssuer.method === 'jwk') {
         const alg = openId4VcTokenIssuer.jwk.supportedSignatureAlgorithms[0];
         if (!alg) {
             throw new core_1.CredoError(`No supported signature algorithms for key type: '${openId4VcTokenIssuer.jwk.keyType}'`);
         }
-        return Object.assign(Object.assign({}, openId4VcTokenIssuer), { jwk: openId4VcTokenIssuer.jwk.toJson(), alg });
+        return {
+            ...openId4VcTokenIssuer,
+            publicJwk: openId4VcTokenIssuer.jwk.toJson(),
+            alg,
+        };
     }
     throw new core_1.CredoError(`Unsupported jwt issuer method '${openId4VcTokenIssuer.method}'`);
 }
@@ -151,4 +101,15 @@ function addSecondsToDate(date, seconds) {
 function dateToSeconds(date) {
     return Math.floor(date.getTime() / 1000);
 }
+function parseIfJson(input) {
+    if (typeof input !== 'string') {
+        return input;
+    }
+    try {
+        // Try to parse the string as JSON
+        return JSON.parse(input);
+    }
+    catch (error) { }
+    return input;
+}
 //# sourceMappingURL=utils.js.map

package/build/shared/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":";;AA2BA,gFAaC;AAED,sCAUC;AAED,oDAgBC;AAED,oDA0CC;AAED,oEAkEC;AAED,kDASC;AAED,4CAEC;AAED,sCAEC;AApMD,yCAYuB;AAEvB;;;;;;;GAOG;AACH,SAAgB,kCAAkC,CAAC,YAA0B;IAC3E,MAAM,iBAAiB,GAAG,YAAY,CAAC,MAAM,CAAC,iBAAiB,CAAA;IAE/D,4EAA4E;IAC5E,MAAM,+BAA+B,GAAG,iBAAiB;QACvD,yDAAyD;SACxD,GAAG,CAAC,6BAAsB,CAAC;QAC5B,kCAAkC;SACjC,MAAM,CAAC,CAAC,QAAQ,EAAmD,EAAE,CAAC,QAAQ,KAAK,SAAS,CAAC;QAC9F,oEAAoE;SACnE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAA;IAE/D,OAAO,+BAA+B,CAAA;AACxC,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,YAA0B,EAC1B,MAAc,EACd,kBAAgC,CAAC,gBAAgB,CAAC;IAElD,MAAM,OAAO,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,cAAO,CAAC,CAAA;IAC/D,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;IAC5D,MAAM,kBAAkB,GAAG,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAE9E,OAAO,IAAA,mCAA4B,EAAC,kBAAkB,CAAC,CAAA;AACzD,CAAC;AAED,SAAgB,oBAAoB,CAAC,YAA0B;IAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE;QAChC,MAAM,UAAU,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,iBAAU,CAAC,CAAA;QACrE,IAAI,WAAW,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;YACjE,MAAM,GAAG,GAAG,IAAA,oBAAa,EAAC,GAAG,CAAC,CAAA;YAE9B,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAA;YAC9F,OAAO,GAAG,CAAC,OAAO,CAAA;QACpB,CAAC;aAAM,IAAI,WAAW,CAAC,MAAM,KAAK,KAAK,IAAI,WAAW,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACxE,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA;YACtE,OAAO,GAAG,CAAC,OAAO,CAAA;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,qCAAqC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAA;QAC7E,CAAC;IACH,CAAC,CAAA;AACH,CAAC;AAED,SAAgB,oBAAoB,CAClC,YAA0B;IAE1B,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE;QAC9B,MAAM,UAAU,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,iBAAU,CAAC,CAAA;QAErE,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;YAC/D,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,gBAAgB,CAAC,YAAY,EAAE;gBAC1D,sBAAsB,kCAAO,GAAG,CAAC,MAAM,KAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,GAAE;gBAC7E,OAAO,EAAE,iBAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;gBACzC,GAAG;aACJ,CAAC,CAAA;YAEF,OAAO,GAAG,CAAA;QACZ,CAAC;aAAM,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACtC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,IAAI,iBAAU,CAAC,6CAA6C,CAAC,CAAA;YACrE,CAAC;YACD,MAAM,GAAG,GAAG,IAAA,qBAAc,EAAC,SAAS,CAAC,GAAc,CAAC,CAAA;YACpD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAA;YACnB,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,gBAAgB,CAAC,YAAY,EAAE;gBAC1D,sBAAsB,kCAAO,GAAG,CAAC,MAAM,KAAE,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,GAAE;gBAClE,OAAO,EAAE,iBAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;gBACzC,GAAG;aACJ,CAAC,CAAA;YAEF,OAAO,GAAG,CAAA;QACZ,CAAC;aAAM,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACtC,MAAM,eAAe,GAAG,kBAAW,CAAC,kBAAkB,CAAC,YAAY,EAAE,EAAE,gBAAgB,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAA;YAEzG,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,gBAAgB,CAAC,YAAY,EAAE;gBAC1D,sBAAsB,kCAAO,GAAG,CAAC,MAAM,KAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,GAAE;gBAC7E,OAAO,EAAE,iBAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;gBACzC,GAAG,EAAE,eAAe,CAAC,SAAS;aAC/B,CAAC,CAAA;YAEF,OAAO,GAAG,CAAA;QACZ,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;IACxE,CAAC,CAAA;AACH,CAAC;AAEM,KAAK,UAAU,4BAA4B,CAChD,YAA0B,EAC1B,oBAAiH;;IAEjH,IAAI,oBAAoB,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,YAAY,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAA;QAC1E,MAAM,GAAG,GAAG,MAAA,IAAA,6BAAsB,EAAC,GAAG,CAAC,OAAO,CAAC,0CAAE,4BAA4B,CAAC,CAAC,CAAC,CAAA;QAChF,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,iBAAU,CAAC,mDAAmD,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;QAEhG,OAAO;YACL,MAAM,EAAE,oBAAoB,CAAC,MAAM;YACnC,MAAM,EAAE,oBAAoB,CAAC,MAAM;YACnC,GAAG;SACJ,CAAA;IACH,CAAC;SAAM,IAAI,oBAAoB,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QACjD,MAAM,eAAe,GAAG,kBAAW,CAAC,kBAAkB,CAAC,YAAY,EAAE;YACnE,gBAAgB,EAAE,oBAAoB,CAAC,GAAG;SAC3C,CAAC,CAAA;QAEF,MAAM,GAAG,GAAG,IAAA,oBAAa,EAAC,eAAe,CAAC,SAAS,CAAC,CAAA;QACpD,MAAM,GAAG,GAAG,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAA;QAC/C,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,iBAAU,CAAC,sDAAsD,GAAG,CAAC,OAAO,GAAG,CAAC,CAAA;QAC5F,CAAC;QAED,IACE,CAAC,oBAAoB,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;YACnD,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,qBAAqB,CAAC,EACjG,CAAC;YACD,MAAM,IAAI,iBAAU,CAAC,kDAAkD,CAAC,CAAA;QAC1E,CAAC;QAED,IACE,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC;YAClE,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAA,uBAAgB,EAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,EACpF,CAAC;YACD,MAAM,aAAa,GACjB,eAAe,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;gBACpC,CAAC,CAAC,qBAAqB,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC/D,CAAC,CAAC,4BAA4B,CAAA;YAClC,MAAM,aAAa,GACjB,eAAe,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;gBACpC,CAAC,CAAC,qBAAqB,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC/D,CAAC,CAAC,4BAA4B,CAAA;YAClC,MAAM,IAAI,KAAK,CACb,uHAAuH,oBAAoB,CAAC,MAAM,MAAM,aAAa,KAAK,aAAa,yCAAyC,CACjO,CAAA;QACH,CAAC;QAED,uCACK,oBAAoB,KACvB,GAAG,IACJ;IACH,CAAC;SAAM,IAAI,oBAAoB,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QACjD,MAAM,GAAG,GAAG,oBAAoB,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAA;QACpE,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,iBAAU,CAAC,oDAAoD,oBAAoB,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,CAAA;QAC/G,CAAC;QACD,uCACK,oBAAoB,KACvB,GAAG,EAAE,oBAAoB,CAAC,GAAG,CAAC,MAAM,EAAE,EACtC,GAAG,IACJ;IACH,CAAC;IAED,MAAM,IAAI,iBAAU,CAAC,kCAAmC,oBAA2C,CAAC,MAAM,GAAG,CAAC,CAAA;AAChH,CAAC;AAED,SAAgB,mBAAmB,CAAC,YAA0B,EAAE,GAAQ;IACtE,MAAM,sBAAsB,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,6BAAsB,CAAC,CAAA;IAE7F,MAAM,wBAAwB,GAAG,sBAAsB,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACpF,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,iBAAU,CAAC,qEAAqE,GAAG,CAAC,OAAO,IAAI,CAAC,CAAA;IAC5G,CAAC;IAED,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAC9C,CAAC;AAED,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;IAC1D,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,GAAG,IAAI,CAAC,CAAA;AAClD,CAAC;AAED,SAAgB,aAAa,CAAC,IAAU;IACtC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;AAC1C,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"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"}