gdc-common-utils-ts 2.6.3 → 2.7.0

package/README.md

@@ -59,6 +59,11 @@ It is intentionally not a full backend orchestration layer.
 - Only define custom names when no canonical FHIR SearchParameter exists.
 - `resource.meta.claims` is the canonical project-specific claims container and must be preserved across conversions/transports.
 - `resource.meta.claims` is not part of base FHIR; it is a claims-first extension carried by FHIR-like resources in GDC contracts.
+- Claims-first aggregates may intentionally mix related resource families. A
+  Digital Twin `ResearchSubject.meta.claims` contains both `ResearchSubject.*`
+  and `Composition.*`; strict FHIR R4/R5 translates the Composition into
+  `ResearchSubject.contained[]`. Producers never invent a
+  `ResearchSubject.composition` wire property.
 - Native FHIR resources received from EHR systems do not need that extension:
   normalize them with `normalizeClaimsFromFhirResource(...)` at the processing
   boundary before indexed storage. Existing `resource.meta.claims` take

package/dist/utils/authority-resolution.js

@@ -4,7 +4,9 @@ function normalizeString(value) {
     return typeof value === 'string' ? value.trim() : '';
 }
 function encodeDidWebAuthority(authority) {
-    return authority.replace(/:/g, '%3A').toLowerCase();
+    // DNS hostnames are case-insensitive, while the canonical did:web spelling
+    // keeps URI percent escapes uppercase for exact DID-document comparisons.
+    return authority.toLowerCase().replace(/:/g, '%3A');
 }
 function normalizeAuthorityHost(value) {
     const raw = normalizeString(value).replace(/\/+$/, '');

package/dist/utils/bundle-document-builder.d.ts

@@ -51,6 +51,14 @@ export declare function getBundleDocumentPatientFullName(bundle: Record<string,
  * equal by accident.
  */
 export declare function normalizeFullNameForComparison(value: unknown): string;
+/**
+ * Detects the native FHIR resource represented by one version-neutral claims
+ * map. A Composition-only map is a complete resource input: it is not merely
+ * metadata for another resource and must remain translatable for strict FHIR
+ * `contained[]` output. When another resource prefix is present,
+ * `Composition.*` remains section-membership metadata and cannot replace that
+ * resource's type.
+ */
 export declare function detectClaimsResourceType(claims: BundleDocumentClaims): string | undefined;
 export declare function convertClaimsToFhirResource(claims: BundleDocumentClaims, version?: 'r4'): FhirResource;
 /**

package/dist/utils/bundle-document-builder.js

@@ -328,6 +328,14 @@ function mergeContainedResourceReferenceList(claims, references) {
         [claimKey]: next.join(','),
     };
 }
+/**
+ * Detects the native FHIR resource represented by one version-neutral claims
+ * map. A Composition-only map is a complete resource input: it is not merely
+ * metadata for another resource and must remain translatable for strict FHIR
+ * `contained[]` output. When another resource prefix is present,
+ * `Composition.*` remains section-membership metadata and cannot replace that
+ * resource's type.
+ */
 export function detectClaimsResourceType(claims) {
     const keys = Object.keys(claims || {});
     if (keys.some((key) => key.startsWith('MedicationStatement.')))
@@ -338,9 +346,10 @@ export function detectClaimsResourceType(claims) {
         return ResourceTypesFhirR4.Condition;
     if (keys.some((key) => key.startsWith('DocumentReference.')))
         return ResourceTypesFhirR4.DocumentReference;
-    const firstContextualized = keys
+    const qualifiedKeys = keys
         .map((key) => getSimpleClaimAttributeName(key))
-        .find((key) => key.includes('.') && !key.startsWith(`${ResourceTypesFhirR4.Composition}.`));
+        .filter((key) => key.includes('.') && !key.startsWith('@'));
+    const firstContextualized = qualifiedKeys.find((key) => !key.startsWith(`${ResourceTypesFhirR4.Composition}.`)) || qualifiedKeys.find((key) => key.startsWith(`${ResourceTypesFhirR4.Composition}.`));
     if (firstContextualized) {
         return firstContextualized.split('.')[0];
     }

package/dist/utils/did.js

@@ -224,12 +224,25 @@ export function getBaseUrlFromDidWeb(did) {
     const domainPart = didParts[0];
     const pathParts = didParts.slice(1);
     const decodedDomain = decodeURIComponent(domainPart);
-    const protocol = decodedDomain.startsWith('localhost') ? 'http' : 'https';
+    const protocol = isLoopbackDidWebAuthority(decodedDomain) ? 'http' : 'https';
     const path = pathParts.join('/').replace(/cds-(es|us|gb)/, (match, p1) => `cds-${p1.toUpperCase()}`);
     // Ensure a trailing slash for the base URL, without double slashes when no path is present.
     const normalizedPath = path ? `${path}/` : '';
     return `${protocol}://${decodedDomain}/${normalizedPath}`;
 }
+/** Keeps local did:web discovery usable without weakening non-loopback HTTPS. */
+function isLoopbackDidWebAuthority(authority) {
+    try {
+        const hostname = new URL(`http://${authority}`).hostname.toLowerCase().replace(/^\[|\]$/g, '');
+        return hostname === 'localhost'
+            || hostname.endsWith('.localhost')
+            || hostname === '::1'
+            || /^127(?:\.\d{1,3}){3}$/.test(hostname);
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Builds the canonical hosted organization/tenant DID in the data space.
  *

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

@@ -179,15 +179,23 @@ export function readLicenseListRecords(body) {
     return data
         .filter((entry) => !!entry && typeof entry === 'object')
         .map((entry) => {
-        const claims = extractClaims(entry);
-        const meta = entry.meta && typeof entry.meta === 'object' ? entry.meta : {};
+        // Canonical search responses place one license row in `entry.resource`;
+        // deprecated aggregate responses placed rows in `resource.data[]`.
+        const primaryResource = entry.resource && typeof entry.resource === 'object' && !Array.isArray(entry.resource)
+            ? entry.resource
+            : undefined;
+        const row = primaryResource && !Array.isArray(primaryResource.data) && isLicenseListEntry(primaryResource)
+            ? primaryResource
+            : entry;
+        const claims = extractClaims(row);
+        const meta = row.meta && typeof row.meta === 'object' ? row.meta : {};
         return {
             id: normalizeText(claims[ClaimsIndividualProductSchemaorg.serialNumber]
                 || claims[ClaimsOfferSchemaorg.serialNumber]
-                || entry.id),
-            status: normalizeText(meta.status || entry.status),
-            subjectId: normalizeText(meta.subjectId || entry.subjectId),
-            ownerOrganizationId: normalizeText(meta.ownerOrganizationId || entry.ownerOrganizationId || claims['License.ownerOrganizationId']),
+                || row.id),
+            status: normalizeText(meta.status || row.status),
+            subjectId: normalizeText(meta.subjectId || row.subjectId),
+            ownerOrganizationId: normalizeText(meta.ownerOrganizationId || row.ownerOrganizationId || claims['License.ownerOrganizationId']),
             email: normalizeText(claims[ClaimsPersonSchemaorg.email]),
             telephone: normalizeText(claims[ClaimsPersonSchemaorg.telephone]),
             role: normalizeText(claims[ClaimsPersonSchemaorg.hasOccupationalRoleValue]),

package/dist/utils/organization-employee-lifecycle.js

@@ -39,6 +39,7 @@ export function extractBundleSearchResources(value) {
         const entries = candidate.data.map(record).filter(isRecord);
         if (entries.length === 0)
             return [];
+        let recognizedSearchEnvelope = false;
         const resources = entries.flatMap((entry) => {
             const resource = record(entry.resource);
             if (!resource)
@@ -46,10 +47,14 @@ export function extractBundleSearchResources(value) {
             const legacyRows = resource.total !== undefined && Array.isArray(resource.data)
                 ? resource.data.map(record).filter(isRecord)
                 : undefined;
+            if (legacyRows)
+                recognizedSearchEnvelope = true;
             return legacyRows ?? [resource];
         });
         if (resources.length > 0)
             return resources;
+        if (recognizedSearchEnvelope)
+            return [];
         // Compatibility for older SDK fixtures that passed already-extracted rows.
         return entries;
     }

package/package.json

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