gdc-common-utils-ts 2.7.4 → 2.7.6

package/dist/utils/individual-organization-lifecycle.d.ts

@@ -31,9 +31,6 @@ export type IndividualOrganizationLifecycleDataEntry = Readonly<{
     request: {
         method: typeof IndividualOrganizationLifecycleRequestMethods.Post;
     };
-    meta: {
-        claims: IndividualOrganizationLifecycleClaims;
-    };
     resource: {
         id?: string;
         meta: {
@@ -63,7 +60,7 @@ export type IndividualOrganizationLifecycleEditorState = Readonly<{
  * - `purge` still goes through the explicit `/_purge` route
  * - both current routes expect `request.method = POST`
  * - both use canonical flat `org.schema.Organization.*` claims in
- *   `meta.claims` and `resource.meta.claims`
+ *   `resource.meta.claims`
  */
 export declare function buildCurrentIndividualOrganizationLifecycleDataEntry(input: IndividualOrganizationLifecycleDataEntryInput): IndividualOrganizationLifecycleDataEntry;
 /**

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

@@ -45,7 +45,7 @@ function createLifecycleThreadId(operation) {
  * - `purge` still goes through the explicit `/_purge` route
  * - both current routes expect `request.method = POST`
  * - both use canonical flat `org.schema.Organization.*` claims in
- *   `meta.claims` and `resource.meta.claims`
+ *   `resource.meta.claims`
  */
 export function buildCurrentIndividualOrganizationLifecycleDataEntry(input) {
     const claims = cloneClaims(input.claims);
@@ -54,7 +54,6 @@ export function buildCurrentIndividualOrganizationLifecycleDataEntry(input) {
         request: {
             method: input.requestMethod || IndividualOrganizationLifecycleRequestMethods.Post,
         },
-        meta: { claims },
         resource: {
             ...(normalizeText(input.resourceId) ? { id: normalizeText(input.resourceId) } : {}),
             meta: { claims },

package/dist/utils/license-commercial-search.d.ts

@@ -56,7 +56,6 @@ export declare class LicenseOfferSearchEditor {
             method: 'POST';
         };
         meta: {
-            claims: LicenseClaims;
             status?: string;
         };
         resource: {
@@ -85,7 +84,6 @@ export declare class LicenseOrderSearchEditor {
             method: 'POST';
         };
         meta: {
-            claims: LicenseClaims;
             status?: string;
         };
         resource: {

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

@@ -81,13 +81,7 @@ export class LicenseOfferSearchEditor {
         return {
             type: LicenseCommercialSearchEntryType.Offer,
             request: { method: 'POST' },
-            meta: {
-                claims: {
-                    ...claims,
-                    '@type': LicenseCommercialSearchOperation.Offer,
-                },
-                ...(this.draft.status ? { status: this.draft.status } : {}),
-            },
+            meta: { ...(this.draft.status ? { status: this.draft.status } : {}) },
             resource: {
                 meta: {
                     claims: {
@@ -144,13 +138,7 @@ export class LicenseOrderSearchEditor {
         return {
             type: LicenseCommercialSearchEntryType.Order,
             request: { method: 'POST' },
-            meta: {
-                claims: {
-                    ...claims,
-                    '@type': LicenseCommercialSearchOperation.Order,
-                },
-                ...(this.draft.status ? { status: this.draft.status } : {}),
-            },
+            meta: { ...(this.draft.status ? { status: this.draft.status } : {}) },
             resource: {
                 meta: {
                     claims: {
@@ -177,7 +165,7 @@ function extractClaims(entry) {
     const resourceMeta = resource.meta && typeof resource.meta === 'object' ? resource.meta : {};
     const metaClaims = meta.claims && typeof meta.claims === 'object' ? meta.claims : undefined;
     const resourceClaims = resourceMeta.claims && typeof resourceMeta.claims === 'object' ? resourceMeta.claims : undefined;
-    return { ...(resourceClaims || {}), ...(metaClaims || {}) };
+    return { ...(metaClaims || {}), ...(resourceClaims || {}) };
 }
 /**
  * Reads normalized offer rows from one GW-style search/list response body.
@@ -188,7 +176,7 @@ export function readLicenseOfferRecords(body) {
         return {
             id: normalizeText(entry.id) || normalizeText(claims[ClaimsOfferSchemaorg.identifier]),
             status: normalizeText(entry.meta?.status),
-            offer: readLicenseOfferPreviewFromResponseBody({ data: [{ meta: { claims } }] }),
+            offer: readLicenseOfferPreviewFromResponseBody({ data: [{ resource: { meta: { claims } } }] }),
             claims,
         };
     });
@@ -203,7 +191,7 @@ export function readLicenseOrderRecords(body) {
         return {
             id: normalizeText(entry.id) || normalizeText(claims[ClaimsOrderSchemaorg.acceptedOfferIdentifier]),
             status: normalizeText(entry.meta?.status),
-            order: readLicenseOrderSummaryFromResponseBody({ data: [{ meta: { claims } }] }),
+            order: readLicenseOrderSummaryFromResponseBody({ data: [{ resource: { meta: { claims } } }] }),
             claims,
         };
     });

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

@@ -137,7 +137,7 @@ function extractClaims(entry) {
     const resourceMeta = resource.meta && typeof resource.meta === 'object' ? resource.meta : {};
     const metaClaims = meta.claims && typeof meta.claims === 'object' ? meta.claims : undefined;
     const resourceClaims = resourceMeta.claims && typeof resourceMeta.claims === 'object' ? resourceMeta.claims : undefined;
-    return { ...(resourceClaims || {}), ...(metaClaims || {}) };
+    return { ...(metaClaims || {}), ...(resourceClaims || {}) };
 }
 function isLicenseListEntry(entry) {
     const meta = entry.meta && typeof entry.meta === 'object'

package/dist/utils/license-offer-order.js

@@ -65,7 +65,7 @@ export function extractPrimaryClaims(body) {
     const firstMeta = asRecord(first.meta) || {};
     const resource = asRecord(first.resource) || {};
     const resourceMeta = asRecord(resource.meta) || {};
-    return asRecord(firstMeta.claims) || asRecord(resourceMeta.claims) || {};
+    return asRecord(resourceMeta.claims) || asRecord(firstMeta.claims) || {};
 }
 /**
  * Reads the current public/persisted `Offer.*` claim family from one GW poll

package/dist/utils/license.d.ts

@@ -157,13 +157,17 @@ export declare function buildLicenseIssueEntry(input: LicenseIssueInput): {
         method: 'POST';
     };
     meta: {
-        claims: LicenseClaims;
         ownerOrganizationId?: string;
         subjectDid?: string;
         subjectId?: string;
         relatedPersonId?: string;
         invitationId?: string;
     };
+    resource: {
+        meta: {
+            claims: LicenseClaims;
+        };
+    };
 };
 /**
  * Builds canonical schema.org claims for a license purchase / seat-creation
@@ -186,15 +190,19 @@ export declare function buildLicensePurchaseEntry(input: LicensePurchaseInput):
         method: 'POST';
     };
     meta: {
-        claims: LicenseClaims;
         ownerOrganizationId?: string;
     };
+    resource: {
+        meta: {
+            claims: LicenseClaims;
+        };
+    };
 };
 /**
  * Builds the canonical search envelope for license listing.
  *
  * Split of concerns:
- * - schema.org-compatible selectors stay in `meta.claims`
+ * - schema.org-compatible selectors stay in `resource.meta.claims`
  * - document lifecycle stays in `meta.status`, mirroring the current
  *   `ConfidentialStorageDoc.status` usage
  * - `subjectId` remains an explicit side-field until a canonical indexed claim
@@ -206,9 +214,13 @@ export declare function buildLicenseSearchEntry(input: LicenseSearchInput): {
         method: 'POST';
     };
     meta: {
-        claims: LicenseClaims;
         status?: LicenseStatus;
         subjectId?: string;
         ownerOrganizationId?: string;
     };
+    resource: {
+        meta: {
+            claims: LicenseClaims;
+        };
+    };
 };

package/dist/utils/license.js

@@ -191,14 +191,14 @@ export function buildLicenseIssueClaims(input) {
  * Builds the canonical batch entry for `License/_issue`.
  */
 export function buildLicenseIssueEntry(input) {
+    const claims = {
+        ...buildLicenseIssueClaims(input),
+        '@type': LicenseEntryOperations.Issue,
+    };
     return {
         type: LicenseEntryTypes.Issue,
         request: { method: LicenseRequestMethods.Post },
         meta: {
-            claims: {
-                ...buildLicenseIssueClaims(input),
-                '@type': LicenseEntryOperations.Issue,
-            },
             ...(String(input.ownerOrganizationId || '').trim()
                 ? { ownerOrganizationId: String(input.ownerOrganizationId).trim() }
                 : {}),
@@ -215,6 +215,7 @@ export function buildLicenseIssueEntry(input) {
                 ? { invitationId: String(input.invitationId).trim() }
                 : {}),
         },
+        resource: { meta: { claims } },
     };
 }
 /**
@@ -252,25 +253,26 @@ export function buildLicensePurchaseClaims(input) {
  * request.
  */
 export function buildLicensePurchaseEntry(input) {
+    const claims = {
+        ...buildLicensePurchaseClaims(input),
+        '@type': LicenseEntryOperations.Purchase,
+    };
     return {
         type: LicenseEntryTypes.Purchase,
         request: { method: LicenseRequestMethods.Post },
         meta: {
-            claims: {
-                ...buildLicensePurchaseClaims(input),
-                '@type': LicenseEntryOperations.Purchase,
-            },
             ...(String(input.ownerOrganizationId || '').trim()
                 ? { ownerOrganizationId: String(input.ownerOrganizationId).trim() }
                 : {}),
         },
+        resource: { meta: { claims } },
     };
 }
 /**
  * Builds the canonical search envelope for license listing.
  *
  * Split of concerns:
- * - schema.org-compatible selectors stay in `meta.claims`
+ * - schema.org-compatible selectors stay in `resource.meta.claims`
  * - document lifecycle stays in `meta.status`, mirroring the current
  *   `ConfidentialStorageDoc.status` usage
  * - `subjectId` remains an explicit side-field until a canonical indexed claim
@@ -300,10 +302,6 @@ export function buildLicenseSearchEntry(input) {
         type: LicenseEntryTypes.Search,
         request: { method: LicenseRequestMethods.Post },
         meta: {
-            claims: {
-                ...claims,
-                '@type': LicenseEntryOperations.Search,
-            },
             ...(input.status ? { status: input.status } : {}),
             ...(typeof input.subjectId === 'string' && input.subjectId.trim()
                 ? { subjectId: input.subjectId.trim() }
@@ -312,5 +310,13 @@ export function buildLicenseSearchEntry(input) {
                 ? { ownerOrganizationId: input.ownerOrganizationId.trim() }
                 : {}),
         },
+        resource: {
+            meta: {
+                claims: {
+                    ...claims,
+                    '@type': LicenseEntryOperations.Search,
+                },
+            },
+        },
     };
 }

package/dist/utils/organization-lifecycle.d.ts

@@ -16,9 +16,6 @@ export type OrganizationLifecycleDataEntry = Readonly<{
     request: {
         method: 'POST';
     };
-    meta: {
-        claims: OrganizationLifecycleClaims;
-    };
     resource: {
         resourceType: 'Organization';
         meta: {

package/dist/utils/organization-lifecycle.js

@@ -147,7 +147,6 @@ export class OrganizationLifecycleEditor {
         return {
             type: requestType,
             request: { method: 'POST' },
-            meta: { claims },
             resource: {
                 resourceType: 'Organization',
                 meta: { claims },

package/package.json

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