@intentius/chant 0.124.45 → 0.124.46

package/dist/observation.js

@@ -69,13 +69,15 @@ export function isObservationResult(value) {
  * Build an {@link ObservationResult}. Lexicons use this rather than writing the
  * discriminant by hand.
  */
-export function observation(resources, unobserved, queried, notes, stackExports, sources) {
+export function observation(resources, unobserved, queried, notes, stackExports, sources, annotations, rootReads) {
     return {
         observation: "v1",
         resources,
         ...(unobserved && Object.keys(unobserved).length > 0 ? { unobserved } : {}),
         ...(queried && Object.keys(queried).length > 0 ? { queried } : {}),
         ...(sources && Object.keys(sources).length > 0 ? { sources } : {}),
+        ...(annotations && Object.keys(annotations).length > 0 ? { annotations } : {}),
+        ...(rootReads && Object.keys(rootReads).length > 0 ? { rootReads } : {}),
         ...(notes && notes.length > 0 ? { notes } : {}),
         ...(stackExports && Object.keys(stackExports).length > 0 ? { stackExports } : {}),
     };
@@ -96,6 +98,8 @@ export function normalizeObservation(value) {
             queried: value.queried ?? {},
             sources: value.sources ?? {},
             notes: [...new Set(value.notes ?? [])],
+            ...(value.annotations && Object.keys(value.annotations).length > 0 ? { annotations: value.annotations } : {}),
+            ...(value.rootReads && Object.keys(value.rootReads).length > 0 ? { rootReads: value.rootReads } : {}),
             ...(value.stackExports && Object.keys(value.stackExports).length > 0 ? { stackExports: value.stackExports } : {}),
         };
     }
@@ -142,11 +146,16 @@ export function mergeObservations(parts) {
     // is one note (#1265).
     const notes = new Set();
     const stackExports = {};
+    // Annotations (#4372) merge like `sources`: per entity, disjoint parts.
+    const annotations = {};
+    const rootReads = {};
     for (const part of parts) {
         Object.assign(resources, part.resources);
         Object.assign(unobserved, part.unobserved);
         Object.assign(queried, part.queried);
         Object.assign(sources, part.sources);
+        Object.assign(annotations, part.annotations ?? {});
+        Object.assign(rootReads, part.rootReads ?? {});
         for (const n of part.notes)
             notes.add(n);
         Object.assign(stackExports, part.stackExports ?? {});
@@ -161,6 +170,8 @@ export function mergeObservations(parts) {
         queried,
         sources,
         notes: [...notes],
+        ...(Object.keys(annotations).length > 0 ? { annotations } : {}),
+        ...(Object.keys(rootReads).length > 0 ? { rootReads } : {}),
         ...(Object.keys(stackExports).length > 0 ? { stackExports } : {}),
     };
 }
@@ -232,6 +243,7 @@ export async function observeEntities(declared, adapter) {
     const resources = {};
     const unobserved = {};
     const queried = {};
+    const annotations = {};
     const run = adapter.concurrently ?? ((items, fn) => boundedConcurrently(items, fn));
     await run(declared, async (entity) => {
         let result;
@@ -258,9 +270,13 @@ export async function observeEntities(declared, adapter) {
                 ...(result.queried ? { queried: result.queried } : {}),
             };
         }
-        // `absent`: the verdict records nothing — in neither map is how the
-        // contract spells absence — but its address, when the adapter supplied
-        // one, lands in `queried` (#1620) so the absence can explain itself.
+        else if (result.annotations && Object.keys(result.annotations).length > 0) {
+            // `absent`: the verdict records nothing — in neither map is how the
+            // contract spells absence — but its address, when the adapter supplied
+            // one, lands in `queried` (#1620) so the absence can explain itself, and
+            // what the read learned about it lands in `annotations` (#4372).
+            annotations[entity.name] = result.annotations;
+        }
     });
-    return observation(resources, unobserved, queried);
+    return observation(resources, unobserved, queried, undefined, undefined, undefined, annotations);
 }

package/dist/op/activities/activity-contracts.d.ts

@@ -354,11 +354,11 @@ export declare const decideContract: import("../index.js").ActivityContract<{
     backends?: Record<string, {
         url: string;
         key?: {
-            env: string;
-        } | {
             capability: string;
             member?: string | undefined;
             env?: string | undefined;
+        } | {
+            env: string;
         } | undefined;
         timeoutMs?: number | undefined;
     }> | undefined;
@@ -447,11 +447,11 @@ export declare const factoryAskContract: import("../index.js").ActivityContract<
     backends?: Record<string, {
         url: string;
         key?: {
-            env: string;
-        } | {
             capability: string;
             member?: string | undefined;
             env?: string | undefined;
+        } | {
+            env: string;
         } | undefined;
         timeoutMs?: number | undefined;
     }> | undefined;