gdc-common-utils-ts 1.6.0 → 1.7.0

package/dist/utils/consent.js

@@ -1,4 +1,5 @@
 // Copyright 2026 Antifraud Services Inc. under the Apache License, Version 2.0.
+import { ClaimConsent } from '../models/consent-rule.js';
 import { assignCidToClaimsId } from './fhir-cid.js';
 /**
  * Normalizes a phone string into a compact token form.
@@ -160,16 +161,16 @@ export function buildConsentClaimsSimple(input, options = {}) {
         subjectIdentifier,
         consentClaims: {
             '@context': 'org.hl7.fhir.api',
-            'Consent.decision': input.decision || 'permit',
-            'Consent.subject': subjectIdentifier,
-            'Consent.identifier': consentIdentifier,
-            'Consent.date': consentDate,
-            'Consent.purpose': input.purpose,
-            'Consent.action': (input.actions || []).join(','),
-            'Consent.actor-identifier': actorIdentifier,
-            'Consent.actor-role': input.actorRole,
-            'Consent.attachment-contentType': input.attachmentContentType || 'application/odrl+json',
-            'Consent.attachment-data': input.attachmentBase64 || 'e30=',
+            [ClaimConsent.decision]: input.decision || 'permit',
+            [ClaimConsent.subject]: subjectIdentifier,
+            [ClaimConsent.identifier]: consentIdentifier,
+            [ClaimConsent.date]: consentDate,
+            [ClaimConsent.purpose]: input.purpose,
+            [ClaimConsent.action]: (input.actions || []).join(','),
+            [ClaimConsent.actorIdentifier]: actorIdentifier,
+            [ClaimConsent.actorRole]: input.actorRole,
+            [ClaimConsent.attachmentContentType]: input.attachmentContentType || 'application/odrl+json',
+            [ClaimConsent.attachmentData]: input.attachmentBase64 || 'e30=',
         },
     };
 }
@@ -441,7 +442,7 @@ export function resolveConsentActor(actor) {
  * @param options.now Optional evaluation timestamp.
  */
 export function isConsentRuleActive(rule, options = {}) {
-    if (options.subject && String(rule['Consent.subject'] || '').trim() !== String(options.subject || '').trim()) {
+    if (options.subject && String(rule[ClaimConsent.subject] || '').trim() !== String(options.subject || '').trim()) {
         return false;
     }
     const now = options.now instanceof Date
@@ -449,8 +450,8 @@ export function isConsentRuleActive(rule, options = {}) {
         : options.now
             ? new Date(options.now).getTime()
             : Date.now();
-    const periodStart = String(rule['Consent.period-start'] || '').trim();
-    const periodEnd = String(rule['Consent.period-end'] || '').trim();
+    const periodStart = String(rule[ClaimConsent.periodStart] || '').trim();
+    const periodEnd = String(rule[ClaimConsent.periodEnd] || '').trim();
     if (periodStart && !Number.isNaN(Date.parse(periodStart)) && Date.parse(periodStart) > now)
         return false;
     if (periodEnd && !Number.isNaN(Date.parse(periodEnd)) && Date.parse(periodEnd) < now)
@@ -460,7 +461,7 @@ export function isConsentRuleActive(rule, options = {}) {
 function groupRulesBy(rules, predicate) {
     const groups = {};
     for (const rule of rules) {
-        for (const token of splitCsv(rule['Consent.actor-identifier'])) {
+        for (const token of splitCsv(rule[ClaimConsent.actorIdentifier])) {
             const normalized = normalizeConsentTarget(token, { preferOrganizationDid: true });
             if (!predicate(normalized))
                 continue;
@@ -493,7 +494,7 @@ function normalizeRequestedList(values, wildcard = '*') {
 }
 function extractRuleResourceTypes(rule) {
     const candidates = [
-        rule['Consent.resourceType'],
+        rule[ClaimConsent.resourceType],
         rule['Consent.resource-type'],
         rule['Consent.resource'],
         rule['Consent.data-type'],
@@ -506,14 +507,14 @@ function extractRuleResourceTypes(rule) {
     return [];
 }
 function ruleMatchesRole(rule, actorRole) {
-    const ruleRoles = splitCsv(rule['Consent.actor-role']).map(normalizeConsentRoleValue).filter(Boolean);
+    const ruleRoles = splitCsv(rule[ClaimConsent.actorRole]).map(normalizeConsentRoleValue).filter(Boolean);
     if (ruleRoles.length === 0 || ruleRoles.includes('*'))
         return true;
     const requestedRole = normalizeConsentRoleValue(String(actorRole || ''));
     return !!requestedRole && ruleRoles.includes(requestedRole);
 }
 function ruleMatchesPurpose(rule, purpose) {
-    const rulePurpose = String(rule['Consent.purpose'] || '').trim();
+    const rulePurpose = String(rule[ClaimConsent.purpose] || '').trim();
     if (!purpose || !rulePurpose)
         return true;
     return rulePurpose === purpose;
@@ -522,7 +523,7 @@ function ruleMatchesSection(rule, section) {
     if (!section || section === '*')
         return true;
     const requestedSection = normalizeSectionToken(section);
-    const actions = splitCsv(rule['Consent.action']).map(normalizeSectionToken);
+    const actions = splitCsv(rule[ClaimConsent.action]).map(normalizeSectionToken);
     if (actions.length === 0)
         return false;
     return actions.includes(requestedSection) || actions.includes('*');
@@ -536,7 +537,7 @@ function ruleMatchesResourceType(rule, resourceType) {
     return resourceTypes.includes(resourceType) || resourceTypes.includes('*');
 }
 function resolveRuleMatch(rule, actor) {
-    for (const token of splitCsv(rule['Consent.actor-identifier'])) {
+    for (const token of splitCsv(rule[ClaimConsent.actorIdentifier])) {
         const normalized = normalizeConsentTarget(token, { preferOrganizationDid: true });
         if (actor.directTargets.some((target) => target.canonicalValue === normalized.canonicalValue)) {
             return { matchKind: 'direct', target: normalized, precedenceBase: 10 };
@@ -554,7 +555,7 @@ function toRuleMatch(rule, actor, section, resourceType) {
     const resolved = resolveRuleMatch(rule, actor);
     if (!resolved.target || resolved.matchKind === 'none' || resolved.precedenceBase === undefined)
         return undefined;
-    const decision = rule['Consent.decision'];
+    const decision = rule[ClaimConsent.decision];
     const precedence = resolved.precedenceBase + (decision === 'deny' ? 0 : 1);
     return {
         rule,

package/dist/utils/vp-token.js

@@ -1,4 +1,6 @@
+// Always create JSDoc, do not use strings inline in keys nor values, use types instead, and reuse the data test examples.
 import { Content } from './content.js';
+import { ORGANIZATION_ACTIVATION_VC_TYPES, REPRESENTATIVE_ACTIVATION_VC_TYPES, W3cCredentialContexts, W3cCredentialTypes, } from '../constants/verifiable-credentials.js';
 function fallbackId() {
     const rand = Math.random().toString(36).slice(2, 10);
     return `id-${Date.now()}-${rand}`;
@@ -26,8 +28,8 @@ export function createVP(input) {
         exp: input?.exp ?? ttl?.exp,
         nonce,
         vp: {
-            '@context': ['https://www.w3.org/2018/credentials/v1'],
-            type: ['VerifiablePresentation'],
+            '@context': [W3cCredentialContexts.V1],
+            type: [W3cCredentialTypes.VerifiablePresentation],
             holder: input?.vp?.holder || input?.iss || '',
             verifiableCredential: [],
             ...(input?.vp || {}),
@@ -145,7 +147,7 @@ export function getVpCredentialByAnyType(vpToken, acceptedTypes) {
  * @param vpToken Compact VP token or raw JSON string.
  */
 export function getOrganizationCredentialFromVpToken(vpToken) {
-    return getVpCredentialByAnyType(vpToken, ['OrganizationCredential', 'LegalOrganizationCredential']);
+    return getVpCredentialByAnyType(vpToken, [...ORGANIZATION_ACTIVATION_VC_TYPES]);
 }
 /**
  * Extracts the legal representative credential from a VP token when present.
@@ -153,7 +155,7 @@ export function getOrganizationCredentialFromVpToken(vpToken) {
  * @param vpToken Compact VP token or raw JSON string.
  */
 export function getLegalRepresentativeCredentialFromVpToken(vpToken) {
-    return getVpCredentialByAnyType(vpToken, ['LegalRepresentativeCredential', 'PersonCredential']);
+    return getVpCredentialByAnyType(vpToken, [...REPRESENTATIVE_ACTIVATION_VC_TYPES]);
 }
 function vcHasAnyType(vcPayload, acceptedTypes) {
     if (!vcPayload)
@@ -172,10 +174,10 @@ function addTypedVC(vpPayload, vc, acceptedTypes, label) {
     return addVC(vpPayload, vc);
 }
 export function addOrganizationCredential(vpPayload, vc) {
-    return addTypedVC(vpPayload, vc, ['OrganizationCredential', 'LegalOrganizationCredential'], 'Organization');
+    return addTypedVC(vpPayload, vc, [...ORGANIZATION_ACTIVATION_VC_TYPES], 'Organization');
 }
 export function addLegalRepresentativeCredential(vpPayload, vc) {
-    return addTypedVC(vpPayload, vc, ['LegalRepresentativeCredential', 'PersonCredential'], 'LegalRepresentative');
+    return addTypedVC(vpPayload, vc, [...REPRESENTATIVE_ACTIVATION_VC_TYPES], 'LegalRepresentative');
 }
 export function prepareForSignature(header, payload) {
     const encodedHeader = Content.objectToRawBase64UrlSafe(header);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdc-common-utils-ts",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public"
   },