@animo-id/eudi-wallet-functionality 0.0.0-alpha-20260112191822 → 0.0.0-alpha-20260118230323

package/dist/index.mjs

@@ -17,16 +17,152 @@ var Ts12IntegrityError = class Ts12IntegrityError extends EudiWalletExtensionsEr
 	}
 };
 
+//#endregion
+//#region src/merge-json.ts
+/**
+* Default validator that enforces:
+* 1. Non-null/undefined values cannot be set to null/undefined.
+* 2. Non-null/undefined types must match (e.g. cannot change string to number, or object to array).
+*/
+const defaultValidator = (path, target, source) => {
+	if (source === void 0) return;
+	if (target === void 0) return;
+	if (source === null) {
+		if (target !== null) throw new Error(`Invalid value change at path "${path}": cannot set non-nullable value to null`);
+		return;
+	}
+	if (target === null) return;
+	const targetType = getType(target);
+	const sourceType = getType(source);
+	if (targetType !== sourceType) throw new Error(`Type mismatch at path "${path}": expected ${targetType}, got ${sourceType}`);
+	if (targetType === "primitive") {
+		if (typeof target !== typeof source) throw new Error(`Type mismatch at path "${path}": expected ${typeof target}, got ${typeof source}`);
+	}
+};
+/**
+* Merges two JSON values based on a configuration.
+*
+* @param target The original object (will not be mutated).
+* @param source The object to merge into the target.
+* @param config Configuration for the merge behavior.
+* @returns The merged object.
+*/
+function mergeJson(target, source, config = {}) {
+	return mergeRecursive(target, source, config, {
+		objectStrategy: config.objectStrategy,
+		arrayStrategy: config.arrayStrategy,
+		validator: config.validator ?? defaultValidator
+	}, "");
+}
+function mergeRecursive(target, source, nodeConfig, parentDefaults, path) {
+	if (source === void 0) return target;
+	const currentDefaults = {
+		objectStrategy: nodeConfig?.objectStrategy ?? parentDefaults.objectStrategy,
+		arrayStrategy: nodeConfig?.arrayStrategy ?? parentDefaults.arrayStrategy,
+		validator: nodeConfig?.validator ?? parentDefaults.validator
+	};
+	if (nodeConfig?.validate) nodeConfig.validate(target, source);
+	if (currentDefaults.validator) currentDefaults.validator(path, target, source);
+	if (target === void 0) return source;
+	if (source === null) return null;
+	if (target === null) return source;
+	const targetType = getType(target);
+	const sourceType = getType(source);
+	if (targetType !== sourceType) return source;
+	if (targetType === "primitive") {
+		if (typeof target !== typeof source) return source;
+		return source;
+	}
+	const strategy = nodeConfig?.strategy;
+	if (sourceType === "array") {
+		const targetArray = target;
+		const sourceArray = source;
+		const arrayStrategy = strategy || currentDefaults.arrayStrategy || "replace";
+		if (arrayStrategy === "replace") return [...sourceArray];
+		if (arrayStrategy === "append") return [...targetArray, ...sourceArray];
+		if (arrayStrategy === "merge") return mergeArrays(targetArray, sourceArray, nodeConfig, currentDefaults, path, nodeConfig?.arrayDiscriminant);
+	}
+	if (sourceType === "object") {
+		const targetObj = target;
+		const sourceObj = source;
+		const objectStrategy = strategy || currentDefaults.objectStrategy || "merge";
+		if (objectStrategy === "replace") return { ...sourceObj };
+		if (objectStrategy === "merge") {
+			const result = { ...targetObj };
+			const keys = new Set([...Object.keys(targetObj), ...Object.keys(sourceObj)]);
+			for (const key of keys) {
+				const keyPart = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key) ? `.${key}` : `["${key}"]`;
+				const newPath = path ? `${path}${keyPart}` : key;
+				const specificConfig = nodeConfig?.fields?.[key];
+				const wildcardConfig = nodeConfig?.items;
+				const childNodeConfig = specificConfig && wildcardConfig ? {
+					...wildcardConfig,
+					...specificConfig
+				} : specificConfig ?? wildcardConfig;
+				result[key] = mergeRecursive(targetObj[key], sourceObj[key], childNodeConfig, currentDefaults, newPath);
+			}
+			return result;
+		}
+	}
+	return source;
+}
+function mergeArrays(target, source, arrayNodeConfig, defaults, path, discriminant) {
+	const itemNodeConfig = arrayNodeConfig?.items;
+	if (!discriminant) {
+		const result$1 = [...target];
+		for (let i = 0; i < source.length; i++) if (i < result$1.length) result$1[i] = mergeRecursive(result$1[i], source[i], itemNodeConfig, defaults, `${path}[${i}]`);
+		else result$1.push(source[i]);
+		return result$1;
+	}
+	const result = [...target];
+	const discriminants = Array.isArray(discriminant) ? discriminant : [discriminant];
+	for (const sourceItem of source) {
+		const matchIndex = result.findIndex((targetItem) => {
+			if (getType(targetItem) !== "object" || getType(sourceItem) !== "object") return false;
+			const t = targetItem;
+			const s = sourceItem;
+			return discriminants.every((d) => deepEqual(t[d], s[d]));
+		});
+		if (matchIndex !== -1) result[matchIndex] = mergeRecursive(result[matchIndex], sourceItem, itemNodeConfig, defaults, `${path}[${matchIndex}]`);
+		else result.push(sourceItem);
+	}
+	return result;
+}
+function getType(value) {
+	if (Array.isArray(value)) return "array";
+	if (value !== null && typeof value === "object") return "object";
+	return "primitive";
+}
+function deepEqual(a, b) {
+	if (a === b) return true;
+	const typeA = getType(a);
+	if (typeA !== getType(b)) return false;
+	if (typeA === "array") {
+		const arrA = a;
+		const arrB = b;
+		if (arrA.length !== arrB.length) return false;
+		for (let i = 0; i < arrA.length; i++) if (!deepEqual(arrA[i], arrB[i])) return false;
+		return true;
+	}
+	if (typeA === "object") {
+		const objA = a;
+		const objB = b;
+		const keysA = Object.keys(objA);
+		const keysB = Object.keys(objB);
+		if (keysA.length !== keysB.length) return false;
+		for (const key of keysA) {
+			if (!Object.hasOwn(objB, key)) return false;
+			if (!deepEqual(objA[key], objB[key])) return false;
+		}
+		return true;
+	}
+	return false;
+}
+
 //#endregion
 //#region src/validation/z-sca-attestation-ext.ts
 const zScaTransactionDataTypeClaims = z.array(z.object({
 	path: z.array(z.string()),
-	visualisation: z.union([
-		z.literal(1),
-		z.literal(2),
-		z.literal(3),
-		z.literal(4)
-	]).default(3),
 	display: z.array(z.object({
 		name: z.string(),
 		locale: z.string().optional(),
@@ -35,23 +171,23 @@ const zScaTransactionDataTypeClaims = z.array(z.object({
 }));
 const zScaTransactionDataTypeUiLabels = z.object({
 	affirmative_action_label: z.array(z.object({
-		lang: z.string(),
+		locale: z.string(),
 		value: z.string().max(30)
 	})).min(1),
 	denial_action_label: z.array(z.object({
-		lang: z.string(),
+		locale: z.string(),
 		value: z.string().max(30)
 	})).min(1).optional(),
 	transaction_title: z.array(z.object({
-		lang: z.string(),
+		locale: z.string(),
 		value: z.string().max(50)
 	})).min(1).optional(),
 	security_hint: z.array(z.object({
-		lang: z.string(),
+		locale: z.string(),
 		value: z.string().max(250)
 	})).min(1).optional()
 }).catchall(z.array(z.object({
-	lang: z.string(),
+	locale: z.string(),
 	value: z.string()
 })));
 /**
@@ -63,10 +199,11 @@ const zScaTransactionDataTypeUiLabels = z.object({
 */
 const zScaAttestationExt = z.object({
 	category: z.string().optional(),
-	transaction_data_types: z.record(z.string().describe("Transaction Type URI (e.g., urn:eudi:sca:payment:1). Must be collision resistant."), z.intersection(z.union([z.object({ schema: z.string() }), z.object({
-		schema_uri: z.url(),
-		"schema_uri#integrity": z.string().optional()
-	})]), z.intersection(z.union([z.object({ claims: zScaTransactionDataTypeClaims }), z.object({
+	transaction_data_types: z.array(z.intersection(z.object({
+		type: z.string(),
+		"type#integrity": z.string().optional(),
+		subtype: z.string().optional()
+	}), z.intersection(z.union([z.object({ claims: zScaTransactionDataTypeClaims }), z.object({
 		claims_uri: z.url(),
 		"claims_uri#integrity": z.string().optional()
 	})]), z.union([z.object({ ui_labels: zScaTransactionDataTypeUiLabels }), z.object({
@@ -167,61 +304,40 @@ const zPaymentPayload = z.object({
 	path: ["execution_date"]
 });
 /**
-* **TS12 Login / Risk Payload**
+* **TS12 Generic Payload**
 * * @see EUDI TS12 Section 4.3.2
 */
-const zLoginPayload = z.object({
+const zGenericPayload = z.object({
 	transaction_id: z.string().min(1).max(36),
-	date_time: z.iso.datetime().optional(),
-	service: z.string().max(100).optional(),
-	action: z.string().max(140).describe("Description of the action to be authorized")
+	payment_payload: zPaymentPayload.optional()
+}).catchall(z.string().max(40).nullable()).refine((data) => {
+	return Object.keys(data).length <= 11;
+}, { message: "Total number of properties is limited to 11" });
+const URN_SCA_PAYMENT = "urn:eudi:sca:payment:1";
+const URN_SCA_GENERIC = "urn:eudi:sca:generic:1";
+const zTs12PaymentTransaction = zBaseTransaction.extend({
+	type: z.literal(URN_SCA_PAYMENT),
+	subtype: z.undefined(),
+	payload: zPaymentPayload
 });
-/**
-* **TS12 Account Access Payload**
-* * @see EUDI TS12 Section 4.3.3
-*/
-const zAccountAccessPayload = z.object({
-	transaction_id: z.string().min(1).max(36),
-	date_time: z.iso.datetime().optional(),
-	aisp: z.object({
-		legal_name: z.string(),
-		brand_name: z.string(),
-		domain_name: z.string()
-	}).optional(),
-	description: z.string().max(140).optional()
+const zTs12GenericTransaction = zBaseTransaction.extend({
+	type: z.literal(URN_SCA_GENERIC),
+	subtype: z.string(),
+	payload: zGenericPayload
 });
-/**
-* **TS12 E-Mandate Payload**
-* * @see EUDI TS12 Section 4.3.4
-*/
-const zEMandatePayload = z.object({
-	transaction_id: z.string().min(1).max(36),
-	date_time: z.iso.datetime().optional(),
-	start_date: z.iso.datetime().optional(),
-	end_date: z.iso.datetime().optional(),
-	reference_number: z.string().min(1).max(50).optional(),
-	creditor_id: z.string().min(1).max(50).optional(),
-	purpose: z.string().max(1e3).optional(),
-	payment_payload: zPaymentPayload.optional()
-}).refine((data) => data.payment_payload || data.purpose, {
-	message: "Purpose is required if payment_payload is missing",
-	path: ["purpose"]
+const zTs12FallbackTransaction = zBaseTransaction.extend({
+	subtype: z.string().optional(),
+	payload: z.unknown()
 });
-const URN_SCA_PAYMENT = "urn:eudi:sca:payment:1";
-const URN_SCA_LOGIN_RISK = "urn:eudi:sca:login_risk_transaction:1";
-const URN_SCA_ACCOUNT_ACCESS = "urn:eudi:sca:account_access:1";
-const URN_SCA_EMANDATE = "urn:eudi:sca:emandate:1";
 /**
 * **TS12 Transaction**
 * @see TS12 Section 4.3
 */
-const zTs12Transaction = zBaseTransaction.extend({ payload: z.union([
-	zPaymentPayload,
-	zLoginPayload,
-	zAccountAccessPayload,
-	zEMandatePayload,
-	z.unknown()
-]) });
+const zTs12Transaction = z.union([
+	zTs12PaymentTransaction,
+	zTs12GenericTransaction,
+	zTs12FallbackTransaction
+]);
 
 //#endregion
 //#region src/validation/z-transaction-data.ts
@@ -229,9 +345,7 @@ const zTransactionDataEntry = zTs12Transaction.or(zFunkeQesTransaction);
 const zTransactionData = z.array(zTransactionDataEntry);
 const ts12BuiltinSchemaValidators = {
 	[URN_SCA_PAYMENT]: zPaymentPayload,
-	[URN_SCA_LOGIN_RISK]: zLoginPayload,
-	[URN_SCA_ACCOUNT_ACCESS]: zAccountAccessPayload,
-	[URN_SCA_EMANDATE]: zEMandatePayload
+	[URN_SCA_GENERIC]: zGenericPayload
 };
 
 //#endregion
@@ -242,14 +356,13 @@ async function fetchVerified(uri, schema, integrity, validateIntegrity) {
 	if (integrity && validateIntegrity && !validateIntegrity(await response.clone().arrayBuffer(), integrity)) throw new Ts12IntegrityError(uri, integrity);
 	return schema.parse(await response.json());
 }
-async function resolveTs12TransactionDisplayMetadata(metadata, type, validateIntegrity) {
-	if (!metadata.transaction_data_types || !metadata.transaction_data_types[type]) return;
-	const typeMetadata = metadata.transaction_data_types[type];
+async function resolveTs12TransactionDisplayMetadata(metadata, type, subtype, validateIntegrity) {
+	if (!metadata.transaction_data_types) return;
+	const typeMetadata = metadata.transaction_data_types.find((t) => t.type === type && t.subtype === subtype);
+	if (!typeMetadata) return;
 	const resolved = {};
-	if ("schema" in typeMetadata && typeMetadata.schema) {
-		if (!(typeMetadata.schema in ts12BuiltinSchemaValidators)) throw new Error(`unknown builtin schema: ${typeMetadata.schema}`);
-		resolved.schema = typeMetadata.schema;
-	} else if ("schema_uri" in typeMetadata && typeMetadata.schema_uri) resolved.schema = await fetchVerified(typeMetadata.schema_uri, z.object({}), typeMetadata["schema_uri#integrity"], validateIntegrity);
+	if (typeMetadata.type in ts12BuiltinSchemaValidators) resolved.schema = typeMetadata.type;
+	else if (typeMetadata.type.startsWith("http")) resolved.schema = await fetchVerified(typeMetadata.type, z.object({}), typeMetadata["type#integrity"], validateIntegrity);
 	else throw new Error(`Unknown schema type for ${typeMetadata}`);
 	if ("claims" in typeMetadata && typeMetadata.claims) resolved.claims = typeMetadata.claims;
 	else if ("claims_uri" in typeMetadata && typeMetadata.claims_uri) resolved.claims = await fetchVerified(typeMetadata.claims_uri, zScaTransactionDataTypeClaims, typeMetadata["claims_uri#integrity"], validateIntegrity);
@@ -259,6 +372,44 @@ async function resolveTs12TransactionDisplayMetadata(metadata, type, validateInt
 	else throw new Error(`Unknown ui_labels for ${typeMetadata}`);
 	return resolved;
 }
+const baseMergeConfig = { fields: {
+	display: { strategy: "replace" },
+	claims: {
+		strategy: "merge",
+		arrayDiscriminant: "path",
+		items: { fields: {
+			sd: { validate: (target, source) => {
+				if (target === "always" && source !== "always") throw new Error("Constraint violation: 'sd' cannot change from 'always'");
+				if (target === "never" && source !== "never") throw new Error("Constraint violation: 'sd' cannot change from 'never'");
+			} },
+			mandatory: { validate: (target, source) => {
+				if (target === true && source !== true) throw new Error("Constraint violation: 'mandatory' cannot change from true to false");
+			} }
+		} }
+	}
+} };
+const ts12MergeConfig = mergeJson(baseMergeConfig, { fields: { transaction_data_types: {
+	arrayStrategy: "append",
+	strategy: "merge",
+	arrayDiscriminant: ["type", "subtype"],
+	items: { fields: {
+		claims: {
+			strategy: "merge",
+			arrayDiscriminant: "path",
+			items: { fields: { display: {
+				strategy: "merge",
+				arrayDiscriminant: "locale"
+			} } }
+		},
+		ui_labels: {
+			strategy: "merge",
+			items: {
+				strategy: "merge",
+				arrayDiscriminant: "locale"
+			}
+		}
+	} }
+} } });
 
 //#endregion
 //#region src/isDcqlQueryEqualOrSubset.ts
@@ -337,9 +488,9 @@ const verifyOpenid4VpAuthorizationRequest = async (agentContext, { resolvedAutho
 		const registrationCertificateHeaderSchema = z$1.object({
 			typ: z$1.literal("rc-rp+jwt"),
 			alg: z$1.string(),
-			x5u: z$1.string().url().optional(),
+			x5u: z$1.url().optional(),
 			"x5t#s256": z$1.string().optional()
-		}).passthrough();
+		}).loose();
 		const registrationCertificatePayloadSchema = z$1.object({
 			credentials: z$1.array(z$1.object({
 				format: z$1.string(),
@@ -361,8 +512,8 @@ const verifyOpenid4VpAuthorizationRequest = async (agentContext, { resolvedAutho
 				claim_sets: z$1.array(z$1.array(z$1.string())).nonempty().optional()
 			})),
 			contact: z$1.object({
-				website: z$1.string().url(),
-				"e-mail": z$1.string().email(),
+				website: z$1.url(),
+				"e-mail": z$1.email(),
 				phone: z$1.string()
 			}),
 			sub: z$1.string(),
@@ -376,7 +527,7 @@ const verifyOpenid4VpAuthorizationRequest = async (agentContext, { resolvedAutho
 				format: z$1.string(),
 				meta: z$1.any()
 			})).optional(),
-			privacy_policy: z$1.string().url(),
+			privacy_policy: z$1.url(),
 			iat: z$1.number().optional(),
 			exp: z$1.number().optional(),
 			purpose: z$1.array(z$1.object({
@@ -385,7 +536,7 @@ const verifyOpenid4VpAuthorizationRequest = async (agentContext, { resolvedAutho
 				name: z$1.string()
 			})).optional(),
 			status: z$1.any()
-		}).passthrough();
+		}).loose();
 		registrationCertificateHeaderSchema.parse(jwt.header);
 		const parsedPayload = registrationCertificatePayloadSchema.parse(jwt.payload.toJson());
 		const [rpCertEncoded] = signedAuthorizationRequest.signer.x5c;
@@ -405,5 +556,5 @@ const verifyOpenid4VpAuthorizationRequest = async (agentContext, { resolvedAutho
 };
 
 //#endregion
-export { EudiWalletExtensionsError, Ts12IntegrityError, URN_SCA_ACCOUNT_ACCESS, URN_SCA_EMANDATE, URN_SCA_LOGIN_RISK, URN_SCA_PAYMENT, resolveTs12TransactionDisplayMetadata, ts12BuiltinSchemaValidators, verifyOpenid4VpAuthorizationRequest, zAccountAccessPayload, zEMandatePayload, zFunkeQesTransaction, zLoginPayload, zPaymentPayload, zScaAttestationExt, zScaTransactionDataTypeClaims, zScaTransactionDataTypeUiLabels, zTransactionData, zTransactionDataEntry, zTs12Transaction };
+export { EudiWalletExtensionsError, Ts12IntegrityError, URN_SCA_GENERIC, URN_SCA_PAYMENT, baseMergeConfig, defaultValidator, mergeJson, resolveTs12TransactionDisplayMetadata, ts12BuiltinSchemaValidators, ts12MergeConfig, verifyOpenid4VpAuthorizationRequest, zFunkeQesTransaction, zGenericPayload, zPaymentPayload, zScaAttestationExt, zScaTransactionDataTypeClaims, zScaTransactionDataTypeUiLabels, zTransactionData, zTransactionDataEntry, zTs12FallbackTransaction, zTs12GenericTransaction, zTs12PaymentTransaction, zTs12Transaction };
 //# sourceMappingURL=index.mjs.map