vet-data-utils-ts 0.5.1 → 0.5.3

package/README.md

@@ -10,10 +10,11 @@ veterinary assistant intents.
 
 FHIR R5 ResearchStudy screens consume the exact 25 resource-specific search
 parameters and the separate associated-party projection from
-`vet-data-utils-ts/research-study`. The complete `associatedParty` object stays
-beside each flat projection so repeating roles, periods and classifiers cannot
-be attributed to the wrong party. A party classifier describes an organization
-category; it never represents Consent or CRUDS authorization. See
+`vet-data-utils-ts/research-study`. GW persistence receives only
+`resourceType`, `id` and flat `resource.meta.claims`; each party uses its own
+`ResearchStudy.party-*` claim map so repeating roles, periods and classifiers
+cannot be attributed to the wrong party. A party classifier describes an
+organization category; it never represents Consent or CRUDS authorization. See
 [`docs/research-study-r5-contract.md`](docs/research-study-r5-contract.md).
 
 ResearchStudy professional teams use native FHIR R5 Group resources from
@@ -23,6 +24,13 @@ enumerated PractitionerRole member normalization. Group membership is
 descriptive and never carries authorization, permission or scope. See
 [`docs/group-r5-contract.md`](docs/group-r5-contract.md).
 
+`projectResearchStudyR5FlatClaimsResource()` and
+`projectGroupR5FlatClaimsResource()` create the minimal claims-first resource;
+their repeating-party/member companions return one correlated resource per
+future PATCH. The matching `normalize*FlatClaimsResource()` functions reject
+nested FHIR persistence fields and unknown claims. Native FHIR JSON remains an
+explicit import, projection or export boundary.
+
 Reusable Communication screens receive immutable workflow presets from
 `vet-data-utils-ts/communication`. The research-agreement screen is fixed to
 FHIR `notification` plus HL7 v3 ActReason `HRESCH` and does not expose a topic

package/dist/group.d.ts

@@ -42,6 +42,13 @@ export declare const GroupFlatClaimCatalog: Readonly<{
 }>;
 export type GroupR5SearchClaim = (typeof standardSearchClaims)[number];
 export type GroupR5SearchClaims = Readonly<Partial<Record<GroupR5SearchClaim, readonly string[]>>>;
+export type GroupR5FlatClaimsResource = Readonly<{
+    resourceType: 'Group';
+    id: string;
+    meta: Readonly<{
+        claims: Readonly<Record<string, readonly string[]>>;
+    }>;
+}>;
 export type GroupR5Reference = Readonly<{
     reference: string;
     type?: string;
@@ -87,4 +94,13 @@ export declare function normalizeGroupR5ResearchTeam(input: unknown): GroupR5Res
  * @see https://hl7.org/fhir/R5/group-search.html
  */
 export declare function projectGroupR5SearchClaims(input: unknown): GroupR5SearchClaims;
+/** Projects native-shaped Group input to the claims-only GW persistence shape. */
+export declare function projectGroupR5FlatClaimsResource(input: unknown): GroupR5FlatClaimsResource;
+/** Projects one correlated claims-only GW resource per PractitionerRole member. */
+export declare function projectGroupPractitionerRoleMemberFlatClaimResources(input: Readonly<{
+    groupId: string;
+    members: unknown;
+}>): readonly GroupR5FlatClaimsResource[];
+/** Validates and freezes a claims-only Group GW resource. */
+export declare function normalizeGroupR5FlatClaimsResource(input: unknown): GroupR5FlatClaimsResource;
 export {};

package/dist/group.js

@@ -151,6 +151,59 @@ export function projectGroupR5SearchClaims(input) {
     addClaim(claims, 'Group.value', characteristicValues);
     return Object.freeze(claims);
 }
+/** Projects native-shaped Group input to the claims-only GW persistence shape. */
+export function projectGroupR5FlatClaimsResource(input) {
+    if (!isRecord(input) || input.resourceType !== 'Group')
+        throw new TypeError('group_resource_invalid');
+    const id = fhirId(input.id, 'group_flat_resource_invalid');
+    if (Array.isArray(input.member) && input.member.length > 0)
+        throw new TypeError('group_members_require_separate_resources');
+    return normalizeGroupR5FlatClaimsResource({
+        resourceType: 'Group',
+        id,
+        meta: { claims: projectGroupR5SearchClaims(input) },
+    });
+}
+/** Projects one correlated claims-only GW resource per PractitionerRole member. */
+export function projectGroupPractitionerRoleMemberFlatClaimResources(input) {
+    const id = fhirId(input.groupId, 'group_flat_resource_invalid');
+    const members = normalizeGroupPractitionerRoleMembers(input.members);
+    return Object.freeze(members.map(member => normalizeGroupR5FlatClaimsResource({
+        resourceType: 'Group',
+        id,
+        meta: {
+            claims: projectGroupR5SearchClaims({
+                resourceType: 'Group',
+                id,
+                type: 'practitioner',
+                membership: 'enumerated',
+                member: [member],
+            }),
+        },
+    })));
+}
+/** Validates and freezes a claims-only Group GW resource. */
+export function normalizeGroupR5FlatClaimsResource(input) {
+    if (!isRecord(input)
+        || input.resourceType !== 'Group'
+        || Object.keys(input).some(key => !['resourceType', 'id', 'meta'].includes(key))) {
+        throw new TypeError('group_flat_resource_invalid');
+    }
+    const id = fhirId(input.id, 'group_flat_resource_invalid');
+    if (!isRecord(input.meta) || !isRecord(input.meta.claims))
+        throw new TypeError('group_flat_resource_invalid');
+    const claims = {};
+    for (const [name, rawValues] of Object.entries(input.meta.claims)) {
+        if (!GroupFlatClaimCatalog.all.includes(name)
+            || !Array.isArray(rawValues)
+            || rawValues.length === 0
+            || rawValues.some(value => typeof value !== 'string' || !value.trim())) {
+            throw new TypeError('group_flat_claim_invalid');
+        }
+        claims[name] = Object.freeze(rawValues.map(value => value.trim()));
+    }
+    return Object.freeze({ resourceType: 'Group', id, meta: Object.freeze({ claims: Object.freeze(claims) }) });
+}
 function addClaim(claims, name, values) {
     const normalized = [...new Set(values.flatMap(value => strings(value)))];
     if (normalized.length > 0)
@@ -225,3 +278,9 @@ function isFhirDateTime(value) {
 function isRecord(value) {
     return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
+function fhirId(value, error) {
+    const id = optionalString(value);
+    if (!id || !/^[A-Za-z0-9.-]{1,64}$/.test(id))
+        throw new TypeError(error);
+    return id;
+}

package/dist/research-study.d.ts

@@ -42,7 +42,7 @@ export type ResearchStudyR5SearchParameter = Readonly<{
 /** Exact resource-specific SearchParameters published by FHIR R5 5.0.0. */
 export declare const ResearchStudyR5SearchParameterCatalog: readonly ResearchStudyR5SearchParameter[];
 declare const standardSearchClaims: readonly `ResearchStudy.${string}`[];
-declare const associatedPartyClaims: readonly ["ResearchStudy.associated-party-name", "ResearchStudy.associated-party-role", "ResearchStudy.associated-party-period-start", "ResearchStudy.associated-party-period-end", "ResearchStudy.associated-party-classifier", "ResearchStudy.associated-party-party"];
+declare const associatedPartyClaims: readonly ["ResearchStudy.party-name", "ResearchStudy.party-role", "ResearchStudy.party-period-start", "ResearchStudy.party-period-end", "ResearchStudy.party-classifier", "ResearchStudy.party"];
 /**
  * Governed flat claims for ResearchStudy.
  *
@@ -53,7 +53,7 @@ declare const associatedPartyClaims: readonly ["ResearchStudy.associated-party-n
  */
 export declare const ResearchStudyFlatClaimCatalog: Readonly<{
     standardSearch: readonly `ResearchStudy.${string}`[];
-    associatedParty: readonly ["ResearchStudy.associated-party-name", "ResearchStudy.associated-party-role", "ResearchStudy.associated-party-period-start", "ResearchStudy.associated-party-period-end", "ResearchStudy.associated-party-classifier", "ResearchStudy.associated-party-party"];
+    associatedParty: readonly ["ResearchStudy.party-name", "ResearchStudy.party-role", "ResearchStudy.party-period-start", "ResearchStudy.party-period-end", "ResearchStudy.party-classifier", "ResearchStudy.party"];
     all: readonly `ResearchStudy.${string}`[];
 }>;
 export type ResearchStudyCoding = Readonly<{
@@ -89,6 +89,13 @@ export type ResearchStudyAssociatedPartyClaimProjection = Readonly<{
 }>;
 export type ResearchStudyR5SearchClaim = (typeof standardSearchClaims)[number];
 export type ResearchStudyR5SearchClaims = Readonly<Partial<Record<ResearchStudyR5SearchClaim, readonly string[]>>>;
+export type ResearchStudyR5FlatClaimsResource = Readonly<{
+    resourceType: 'ResearchStudy';
+    id: string;
+    meta: Readonly<{
+        claims: Readonly<Record<string, readonly string[]>>;
+    }>;
+}>;
 /**
  * Projects the official resource-specific R5 SearchParameters from one native
  * ResearchStudy into flat `resource.meta.claims`. Composite values use FHIR's
@@ -110,4 +117,13 @@ export declare function normalizeResearchStudyAssociatedParties(input: unknown):
  * required when a later Bundle PATCH changes one party.
  */
 export declare function projectResearchStudyAssociatedPartyClaims(input: unknown): readonly ResearchStudyAssociatedPartyClaimProjection[];
+/** Projects native-shaped study input to the claims-only GW persistence shape. */
+export declare function projectResearchStudyR5FlatClaimsResource(input: unknown): ResearchStudyR5FlatClaimsResource;
+/** Projects one correlated claims-only GW resource per associated party. */
+export declare function projectResearchStudyAssociatedPartyFlatClaimResources(input: Readonly<{
+    researchStudyId: string;
+    associatedParties: unknown;
+}>): readonly ResearchStudyR5FlatClaimsResource[];
+/** Validates and freezes a claims-only ResearchStudy GW resource. */
+export declare function normalizeResearchStudyR5FlatClaimsResource(input: unknown): ResearchStudyR5FlatClaimsResource;
 export {};

package/dist/research-study.js

@@ -90,12 +90,12 @@ export const ResearchStudyR5SearchParameterCatalog = Object.freeze([
 ]);
 const standardSearchClaims = Object.freeze(ResearchStudyR5SearchParameterCatalog.map(parameter => `ResearchStudy.${parameter.code}`));
 const associatedPartyClaims = Object.freeze([
-    'ResearchStudy.associated-party-name',
-    'ResearchStudy.associated-party-role',
-    'ResearchStudy.associated-party-period-start',
-    'ResearchStudy.associated-party-period-end',
-    'ResearchStudy.associated-party-classifier',
-    'ResearchStudy.associated-party-party',
+    'ResearchStudy.party-name',
+    'ResearchStudy.party-role',
+    'ResearchStudy.party-period-start',
+    'ResearchStudy.party-period-end',
+    'ResearchStudy.party-classifier',
+    'ResearchStudy.party',
 ]);
 /**
  * Governed flat claims for ResearchStudy.
@@ -171,15 +171,58 @@ export function projectResearchStudyAssociatedPartyClaims(input) {
     return Object.freeze(parties.map(party => Object.freeze({
         associatedParty: party,
         claims: Object.freeze({
-            'ResearchStudy.associated-party-name': Object.freeze(party.name ? [party.name] : []),
-            'ResearchStudy.associated-party-role': Object.freeze(conceptValues([party.role])),
-            'ResearchStudy.associated-party-period-start': Object.freeze((party.period || []).flatMap(period => period.start ? [period.start] : [])),
-            'ResearchStudy.associated-party-period-end': Object.freeze((party.period || []).flatMap(period => period.end ? [period.end] : [])),
-            'ResearchStudy.associated-party-classifier': Object.freeze(conceptValues(party.classifier || [])),
-            'ResearchStudy.associated-party-party': Object.freeze(party.party ? [party.party.reference] : []),
+            'ResearchStudy.party-name': Object.freeze(party.name ? [party.name] : []),
+            'ResearchStudy.party-role': Object.freeze(conceptValues([party.role])),
+            'ResearchStudy.party-period-start': Object.freeze((party.period || []).flatMap(period => period.start ? [period.start] : [])),
+            'ResearchStudy.party-period-end': Object.freeze((party.period || []).flatMap(period => period.end ? [period.end] : [])),
+            'ResearchStudy.party-classifier': Object.freeze(conceptValues(party.classifier || [])),
+            'ResearchStudy.party': Object.freeze(party.party ? [party.party.reference] : []),
         }),
     })));
 }
+/** Projects native-shaped study input to the claims-only GW persistence shape. */
+export function projectResearchStudyR5FlatClaimsResource(input) {
+    if (!isRecord(input) || input.resourceType !== 'ResearchStudy')
+        throw new TypeError('research_study_resource_invalid');
+    const id = fhirId(input.id, 'research_study_flat_resource_invalid');
+    if (input.associatedParty !== undefined)
+        throw new TypeError('research_study_parties_require_separate_resources');
+    return normalizeResearchStudyR5FlatClaimsResource({
+        resourceType: 'ResearchStudy',
+        id,
+        meta: { claims: projectResearchStudyR5SearchClaims(input) },
+    });
+}
+/** Projects one correlated claims-only GW resource per associated party. */
+export function projectResearchStudyAssociatedPartyFlatClaimResources(input) {
+    const id = fhirId(input.researchStudyId, 'research_study_flat_resource_invalid');
+    return Object.freeze(projectResearchStudyAssociatedPartyClaims(input.associatedParties).map(projection => {
+        const claims = Object.fromEntries(Object.entries(projection.claims).filter(([, values]) => values.length > 0));
+        return normalizeResearchStudyR5FlatClaimsResource({ resourceType: 'ResearchStudy', id, meta: { claims } });
+    }));
+}
+/** Validates and freezes a claims-only ResearchStudy GW resource. */
+export function normalizeResearchStudyR5FlatClaimsResource(input) {
+    if (!isRecord(input)
+        || input.resourceType !== 'ResearchStudy'
+        || Object.keys(input).some(key => !['resourceType', 'id', 'meta'].includes(key))) {
+        throw new TypeError('research_study_flat_resource_invalid');
+    }
+    const id = fhirId(input.id, 'research_study_flat_resource_invalid');
+    if (!isRecord(input.meta) || !isRecord(input.meta.claims))
+        throw new TypeError('research_study_flat_resource_invalid');
+    const claims = {};
+    for (const [name, rawValues] of Object.entries(input.meta.claims)) {
+        if (!ResearchStudyFlatClaimCatalog.all.includes(name)
+            || !Array.isArray(rawValues)
+            || rawValues.length === 0
+            || rawValues.some(value => typeof value !== 'string' || !value.trim())) {
+            throw new TypeError('research_study_flat_claim_invalid');
+        }
+        claims[name] = Object.freeze(rawValues.map(value => value.trim()));
+    }
+    return Object.freeze({ resourceType: 'ResearchStudy', id, meta: Object.freeze({ claims: Object.freeze(claims) }) });
+}
 function normalizeAssociatedParty(value, index) {
     if (!isRecord(value))
         throw new TypeError(`research_study_associated_party_${index}_invalid`);
@@ -399,3 +442,9 @@ function isFhirDateTime(value) {
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
+function fhirId(value, error) {
+    const id = optionalString(value);
+    if (!id || !/^[A-Za-z0-9.-]{1,64}$/.test(id))
+        throw new TypeError(error);
+    return id;
+}

package/dist/sectors.d.ts

@@ -8,14 +8,17 @@
 export declare const ExtendedDataspaceSectors: Readonly<{
     readonly PublicSafety: "public-safety";
     readonly HealthCare: "health-care";
+    readonly HealthLab: "health-lab";
     readonly HealthResearch: "health-research";
     readonly HealthTech: "health-tech";
     readonly HealthInsurance: "health-insurance";
     readonly AnimalCare: "animal-care";
+    readonly AnimalLab: "animal-lab";
     readonly AnimalResearch: "animal-research";
     readonly AnimalInsurance: "animal-insurance";
     readonly AnimalTech: "animal-tech";
     readonly OneHealthResearch: "onehealth-research";
+    readonly OneHealthLab: "onehealth-lab";
     readonly OneHealthTech: "onehealth-tech";
 }>;
 export type ExtendedDataspaceSector = typeof ExtendedDataspaceSectors[keyof typeof ExtendedDataspaceSectors];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vet-data-utils-ts",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Browser-safe governed VetChain data contracts",
   "license": "Apache-2.0",
   "author": "Connecting Solution & Applications Ltd",
@@ -84,7 +84,7 @@
     "typescript": "^5.5.4"
   },
   "dependencies": {
-    "gdc-common-utils-ts": "2.8.8"
+    "gdc-common-utils-ts": "2.9.4"
   },
   "engines": {
     "node": ">=20"