gdc-common-utils-ts 2.5.9 → 2.5.10

package/dist/utils/did.d.ts

@@ -36,7 +36,10 @@ export declare function generateServiceId(selector: ServiceEndpointSelector): st
  * due to case sensitivity in the path component of the underlying URL.
  *
  * The rule is:
- * - All segments are lowercased, EXCEPT the final segment.
+ * - The DNS authority and ordinary non-final path segments are lowercased.
+ * - A hosted VAT tenant segment is uppercased (`vates-b...` -> `VATES-B...`).
+ * - A `cds-<jurisdiction>` segment uses an uppercase ISO jurisdiction.
+ * - The final segment is preserved.
  * - If the final segment represents a `system|code` pair (e.g., for a role),
  *   the `system` part is lowercased, but the `code` is preserved as-is.
  * - If the final segment is a unique identifier (like a Tax ID), it is preserved as-is.

package/dist/utils/did.js

@@ -56,7 +56,10 @@ export function generateServiceId(selector) {
  * due to case sensitivity in the path component of the underlying URL.
  *
  * The rule is:
- * - All segments are lowercased, EXCEPT the final segment.
+ * - The DNS authority and ordinary non-final path segments are lowercased.
+ * - A hosted VAT tenant segment is uppercased (`vates-b...` -> `VATES-B...`).
+ * - A `cds-<jurisdiction>` segment uses an uppercase ISO jurisdiction.
+ * - The final segment is preserved.
  * - If the final segment represents a `system|code` pair (e.g., for a role),
  *   the `system` part is lowercased, but the `code` is preserved as-is.
  * - If the final segment is a unique identifier (like a Tax ID), it is preserved as-is.
@@ -70,16 +73,30 @@ export function normalizeDidWeb(did) {
         // Not a valid did:web, return as is.
         return did;
     }
-    // Lowercase all parts except the very last one.
-    const lowercasedParts = parts.slice(0, -1).map(part => part.toLowerCase());
-    let lastPart = parts[parts.length - 1];
-    // Special handling for the last part if it contains a role descriptor.
-    if (lastPart.includes('|')) {
-        const [system, ...codeParts] = lastPart.split('|');
-        const code = codeParts.join('|'); // Re-join in case the code itself has a pipe.
-        lastPart = `${system.toLowerCase()}|${code}`;
-    }
-    return [...lowercasedParts, lastPart].join(':');
+    const lastIndex = parts.length - 1;
+    return parts.map((part, index) => {
+        if (index < 2)
+            return part.toLowerCase();
+        if (index === 2)
+            return part.toLowerCase().replace(/%3a/gi, '%3A');
+        // Hosted tenant identifiers use the canonical VAT + ISO country prefix.
+        // Keep this deliberately narrow so unrelated opaque DID path identifiers
+        // are not modified merely because they contain the letters "vat".
+        if (/^vat[a-z]{2}[-a-z0-9._]+$/i.test(part)) {
+            return part.toUpperCase();
+        }
+        const jurisdictionMatch = /^cds-([a-z]{2})$/i.exec(part);
+        if (jurisdictionMatch) {
+            return `cds-${jurisdictionMatch[1].toUpperCase()}`;
+        }
+        if (index === lastIndex) {
+            if (!part.includes('|'))
+                return part;
+            const [system, ...codeParts] = part.split('|');
+            return `${system.toLowerCase()}|${codeParts.join('|')}`;
+        }
+        return part.toLowerCase();
+    }).join(':');
 }
 /**
 * Encodes a hostname according to did:web spec (percent-encodes port colons).

package/dist/utils/license-list-search.js

@@ -139,6 +139,35 @@ function extractClaims(entry) {
     const resourceClaims = resourceMeta.claims && typeof resourceMeta.claims === 'object' ? resourceMeta.claims : undefined;
     return { ...(resourceClaims || {}), ...(metaClaims || {}) };
 }
+function isLicenseListEntry(entry) {
+    const meta = entry.meta && typeof entry.meta === 'object'
+        ? entry.meta
+        : {};
+    const claims = extractClaims(entry);
+    return !!(normalizeText(meta.status)
+        || normalizeText(entry.status)
+        || normalizeText(entry.id)
+        || normalizeText(claims[ClaimsIndividualProductSchemaorg.serialNumber])
+        || normalizeText(claims[ClaimsOfferSchemaorg.serialNumber]));
+}
+function extractLicenseListEntries(node) {
+    if (!node || typeof node !== 'object')
+        return [];
+    if (Array.isArray(node)) {
+        return node.flatMap((entry) => extractLicenseListEntries(entry));
+    }
+    const entry = node;
+    const resource = entry.resource && typeof entry.resource === 'object'
+        ? entry.resource
+        : undefined;
+    if (resource && Array.isArray(resource.data)) {
+        return extractLicenseListEntries(resource.data);
+    }
+    if (Array.isArray(entry.data)) {
+        return extractLicenseListEntries(entry.data);
+    }
+    return isLicenseListEntry(entry) ? [entry] : [];
+}
 /**
  * Reads license-like search/list records from one current GW-style response
  * body without exposing raw claim access to frontend code.
@@ -146,7 +175,7 @@ function extractClaims(entry) {
 export function readLicenseListRecords(body) {
     const root = body && typeof body === 'object' ? body : {};
     const bodyNode = root.body && typeof root.body === 'object' ? root.body : root;
-    const data = Array.isArray(bodyNode.data) ? bodyNode.data : [];
+    const data = extractLicenseListEntries(bodyNode);
     return data
         .filter((entry) => !!entry && typeof entry === 'object')
         .map((entry) => {
@@ -156,9 +185,9 @@ export function readLicenseListRecords(body) {
             id: normalizeText(claims[ClaimsIndividualProductSchemaorg.serialNumber]
                 || claims[ClaimsOfferSchemaorg.serialNumber]
                 || entry.id),
-            status: normalizeText(meta.status),
-            subjectId: normalizeText(meta.subjectId),
-            ownerOrganizationId: normalizeText(meta.ownerOrganizationId || claims['License.ownerOrganizationId']),
+            status: normalizeText(meta.status || entry.status),
+            subjectId: normalizeText(meta.subjectId || entry.subjectId),
+            ownerOrganizationId: normalizeText(meta.ownerOrganizationId || entry.ownerOrganizationId || claims['License.ownerOrganizationId']),
             email: normalizeText(claims[ClaimsPersonSchemaorg.email]),
             telephone: normalizeText(claims[ClaimsPersonSchemaorg.telephone]),
             role: normalizeText(claims[ClaimsPersonSchemaorg.hasOccupationalRoleValue]),

package/package.json

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