gdc-common-utils-ts 2.3.2 → 2.3.3

package/dist/convert/convert-allergy-intolerance.js

@@ -22,11 +22,12 @@ export function allergyIntoleranceFlatToFhirR4(claims) {
 }
 export function allergyIntoleranceFhirR4ToFlat(resource) {
     const subject = resource.patient?.reference;
+    const code = resource.code;
     return {
         [AllergyIntoleranceClaim.Identifier]: resource.identifier?.[0]?.value,
         [AllergyIntoleranceClaim.Subject]: subject,
         [AllergyIntoleranceClaim.Patient]: subject,
-        [AllergyIntoleranceClaim.Code]: codingToValue(resource.code?.coding?.[0]),
+        [AllergyIntoleranceClaim.Code]: codingToValue(code?.coding?.[0]) || code?.text,
         [AllergyIntoleranceClaim.ClinicalStatus]: resource.clinicalStatus?.coding?.[0]?.code,
         [AllergyIntoleranceClaim.VerificationStatus]: resource.verificationStatus?.coding?.[0]?.code,
         [AllergyIntoleranceClaim.Recorder]: resource.recorder?.reference,

package/dist/convert/convert-condition.js

@@ -14,10 +14,11 @@ export function conditionFlatToFhirR4(claims) {
     };
 }
 export function conditionFhirR4ToFlat(resource) {
+    const code = resource.code;
     return {
         [ConditionClaim.Identifier]: resource.identifier?.[0]?.value,
         [ConditionClaim.Subject]: resource.subject?.reference,
-        [ConditionClaim.Code]: codingToValue(resource.code?.coding?.[0]),
+        [ConditionClaim.Code]: codingToValue(code?.coding?.[0]) || code?.text,
         [ConditionClaim.ClinicalStatus]: resource.clinicalStatus?.coding?.[0]?.code,
         [ConditionClaim.VerificationStatus]: resource.verificationStatus?.coding?.[0]?.code,
     };

package/dist/convert/schemaorg-to-gaia-x.d.ts

@@ -57,7 +57,6 @@ export declare function buildGaiaXLegalPersonProjectionFromOrganizationCredentia
     credentialId?: string;
     issuerId: string;
     legalRegistrationNumberCredentialId: string;
-    addressSubdivisionCode?: string;
     addressCountryCode?: string;
     validFrom: string;
 }>): Readonly<{

package/dist/convert/schemaorg-to-gaia-x.js

@@ -67,14 +67,8 @@ export function resolveSchemaOrgOrganizationRegistrationIdentifier(credentialSub
  * @see https://docs.gaia-x.eu/technical-committee/identity-credential-access-management/25.11/semantic_model/
  */
 export function buildGaiaXLegalPersonCredentialDraft(input) {
-    const subdivision = optionalClaim(input.claims, ClaimsOrganizationSchemaorg.addressRegion);
-    const country = optionalClaim(input.claims, ClaimsOrganizationSchemaorg.addressCountry);
-    if (!subdivision && !country) {
-        throw new Error('Missing organization ISO 3166-2 address subdivision or ISO 3166-1 country.');
-    }
-    const gaiaXAddress = subdivision
-        ? { 'gx:countrySubdivisionCode': subdivision }
-        : { 'gx:countryCode': country };
+    const country = requiredClaim(input.claims, ClaimsOrganizationSchemaorg.addressCountry, 'organization ISO 3166-1 country code').toUpperCase();
+    const gaiaXAddress = { 'gx:countryCode': country };
     const website = optionalClaim(input.claims, ClaimsOrganizationSchemaorg.url);
     return {
         '@context': [W3C_VC_V2_CONTEXT],
@@ -117,7 +111,6 @@ export function buildGaiaXLegalPersonProjectionFromOrganizationCredential(input)
     const claims = {
         [ClaimsOrganizationSchemaorg.legalName]: asString(subject.legalName || subject.name),
         [ClaimsOrganizationSchemaorg.url]: asString(subject.url),
-        [ClaimsOrganizationSchemaorg.addressRegion]: input.addressSubdivisionCode || asString(address?.addressRegion),
         [ClaimsOrganizationSchemaorg.addressCountry]: input.addressCountryCode || asString(address?.addressCountry),
         [ClaimsOrganizationSchemaorg.identifierType]: registrationIdentifier.additionalType,
         [ClaimsOrganizationSchemaorg.identifierValue]: registrationIdentifier.value,
@@ -148,6 +141,10 @@ export function buildGaiaXServiceOfferingCredentialDraft(input) {
     const name = optionalClaim(input.claims, ClaimsServiceSchemaorg.name);
     const description = optionalClaim(input.claims, ClaimsServiceSchemaorg.description);
     const endpointUrl = optionalClaim(input.claims, ClaimsServiceSchemaorg.url);
+    const termsHash = requiredInput(input.termsAndConditionsHash, 'terms and conditions SHA-256 hash');
+    if (!/^[a-f0-9]{64}$/i.test(termsHash)) {
+        throw new Error('Gaia-X terms and conditions hash must be a 64-character SHA-256 hexadecimal digest of the published document bytes.');
+    }
     return {
         '@context': [W3C_VC_V2_CONTEXT],
         type: ['VerifiableCredential', 'ServiceOffering'],
@@ -160,7 +157,7 @@ export function buildGaiaXServiceOfferingCredentialDraft(input) {
             'gx:providedBy': { id: requiredInput(input.providedByCredentialId, 'providedBy credential id') },
             'gx:serviceOfferingTermsAndConditions': [{
                     'gx:url': requiredInput(input.termsAndConditionsUrl, 'terms and conditions URL'),
-                    'gx:hash': requiredInput(input.termsAndConditionsHash, 'terms and conditions hash'),
+                    'gx:hash': termsHash.toLowerCase(),
                 }],
             ...(name ? { 'gx:name': name } : {}),
             ...(description ? { 'gx:description': description } : {}),

package/dist/models/gaia-x.d.ts

@@ -94,13 +94,9 @@ export interface GaiaXLegalPersonCredentialSubject extends JsonObject {
         id: string;
     };
     'gx:headquarterAddress': {
-        'gx:countrySubdivisionCode': string;
-    } | {
         'gx:countryCode': string;
     };
     'gx:legalAddress': {
-        'gx:countrySubdivisionCode': string;
-    } | {
         'gx:countryCode': string;
     };
     'gx:website'?: string;

package/package.json

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