@effect-app/infra 4.0.0-beta.197 → 4.0.0-beta.199

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @effect-app/infra
 
+## 4.0.0-beta.199
+
+### Patch Changes
+
+- de9fb83: Annotate Cosmos read spans with response size, resource count, and request charge.
+
+  `Cosmos.queryRaw`, `Cosmos.all`, `Cosmos.filter`, and `Cosmos.find` now set `db.cosmos.request_charge`, `db.cosmos.response_bytes`, and (where applicable) `db.cosmos.resource_count` on the active span. Bytes are sourced from `diagnostics.clientSideRequestStatistics.totalResponsePayloadLengthInBytes` — no payload stringification.
+
+  - effect-app@4.0.0-beta.199
+
+## 4.0.0-beta.198
+
+### Patch Changes
+
+- 32dbc54: fix stream type when no success specified
+- Updated dependencies [32dbc54]
+  - effect-app@4.0.0-beta.198
+
 ## 4.0.0-beta.197
 
 ### Minor Changes

package/dist/Store/Cosmos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Cosmos.d.ts","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,EAA8D,MAAM,YAAY,CAAA;AAUvH,OAAO,EAA8C,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,cAAc,CAAA;AAyiBvI,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,yCAIlD"}
+{"version":3,"file":"Cosmos.d.ts","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,EAA8D,MAAM,YAAY,CAAA;AAUvH,OAAO,EAA8C,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,cAAc,CAAA;AAyjBvI,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,yCAIlD"}

package/dist/Store/Cosmos.js

@@ -21,6 +21,16 @@ class CosmosDbOperationError {
         this.raw = raw;
     }
 } // TODO: Retry operation when running into RU limit.
+const respBytes = (resp) => resp.diagnostics?.clientSideRequestStatistics?.totalResponsePayloadLengthInBytes ?? 0;
+const annotateFeed = (resp) => Effect.annotateCurrentSpan({
+    "db.cosmos.request_charge": resp.requestCharge ?? 0,
+    "db.cosmos.resource_count": resp.resources.length,
+    "db.cosmos.response_bytes": respBytes(resp)
+});
+const annotateItem = (resp) => Effect.annotateCurrentSpan({
+    "db.cosmos.request_charge": resp.requestCharge ?? 0,
+    "db.cosmos.response_bytes": respBytes(resp)
+});
 const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
     const { db } = yield* CosmosClient;
     return {
@@ -221,11 +231,11 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                 queryRaw: (query) => Effect
                     .all({ q: Effect.sync(() => query.cosmos({ name })), ns: resolveNamespace })
                     .pipe(Effect.tap(({ q }) => logQuery(q)), Effect.flatMap(({ ns, q }) => Effect
-                    .promise(() => container
-                    .items
-                    .query(q, { partitionKey: nsBasePartitionKey(ns) })
-                    .fetchAll()
-                    .then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))
+                    .gen(function* () {
+                    const response = yield* Effect.promise(() => container.items.query(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll());
+                    yield* annotateFeed(response);
+                    return response.resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }));
+                })
                     .pipe(Effect.withSpan("Cosmos.queryRaw [effect-app/infra/Store]", {
                     attributes: {
                         "repository.container_id": containerId,
@@ -256,11 +266,11 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                     ns: resolveNamespace
                 })
                     .pipe(Effect.tap(({ q }) => logQuery(q)), Effect.flatMap(({ ns, q }) => Effect
-                    .promise(() => container
-                    .items
-                    .query(q, { partitionKey: nsBasePartitionKey(ns) })
-                    .fetchAll()
-                    .then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))
+                    .gen(function* () {
+                    const response = yield* Effect.promise(() => container.items.query(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll());
+                    yield* annotateFeed(response);
+                    return response.resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }));
+                })
                     .pipe(Effect.withSpan("Cosmos.all [effect-app/infra/Store]", {
                     attributes: {
                         "repository.container_id": containerId,
@@ -282,20 +292,19 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                     })
                         .pipe(Effect.tap(({ q }) => logQuery(q)), Effect
                         .flatMap(({ ns, q }) => Effect
-                        .promise(() => f.select
-                        ? container
-                            .items
-                            .query(q, { partitionKey: nsBasePartitionKey(ns) })
-                            .fetchAll()
-                            .then(({ resources }) => resources.map((_) => ({
-                            ...pipe(defaultValues, Struct.pick(f.select.filter((_) => typeof _ === "string"))),
-                            ...mapReverseId(_)
-                        })))
-                        : container
-                            .items
-                            .query(q, { partitionKey: nsBasePartitionKey(ns) })
-                            .fetchAll()
-                            .then(({ resources }) => resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f) }))))
+                        .gen(function* () {
+                        if (f.select) {
+                            const response = yield* Effect.promise(() => container.items.query(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll());
+                            yield* annotateFeed(response);
+                            return response.resources.map((_) => ({
+                                ...pipe(defaultValues, Struct.pick(f.select.filter((_) => typeof _ === "string"))),
+                                ...mapReverseId(_)
+                            }));
+                        }
+                        const response = yield* Effect.promise(() => container.items.query(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll());
+                        yield* annotateFeed(response);
+                        return response.resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f) }));
+                    })
                         .pipe(Effect.withSpan("Cosmos.filter [effect-app/infra/Store]", {
                         attributes: {
                             "repository.container_id": containerId,
@@ -305,10 +314,13 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                     }, { captureStackTrace: false }))));
                 },
                 find: (id) => resolveNamespace.pipe(Effect.flatMap((ns) => Effect
-                    .promise(() => container
-                    .item(id, nsPartitionValue(ns, { [idKey]: id }))
-                    .read()
-                    .then(({ resource }) => Option.fromNullishOr(resource).pipe(Option.map((_) => ({ ...defaultValues, ...mapReverseId(_) })))))
+                    .gen(function* () {
+                    const response = yield* Effect.promise(() => container
+                        .item(id, nsPartitionValue(ns, { [idKey]: id }))
+                        .read());
+                    yield* annotateItem(response);
+                    return Option.fromNullishOr(response.resource).pipe(Option.map((_) => ({ ...defaultValues, ...mapReverseId(_) })));
+                })
                     .pipe(Effect
                     .withSpan("Cosmos.find [effect-app/infra/Store]", {
                     attributes: {
@@ -368,4 +380,4 @@ export function CosmosStoreLayer(cfg) {
         .toLayer(makeCosmosStore(cfg))
         .pipe(Layer.provide(CosmosClientLayer(Redacted.value(cfg.url), cfg.dbName)));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAA8B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACvH,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAA;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAG1C,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EAAgG,UAAU,EAAE,MAAM,cAAc,CAAA;AAEvI,MAAM,SAAS,GACb,CAA2D,KAAY,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAW,EAAE,EAAE,CAAC,CAAC;IAC/G,GAAG,CAAC;IACJ,EAAE;CACH,CAAC,CAAA;AACJ,MAAM,gBAAgB,GACpB,CAA2D,KAAY,EAAE,EAAE,CAC3E,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAA+D,EAAE,EAAE,CAC5E,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAyC,CAAA;AAEnE,MAAM,sBAAsB;IACL,OAAO;IAAmB,GAAG;IAAlD,YAAqB,OAAe,EAAW,GAAa;uBAAvC,OAAO;mBAAmB,GAAG;IAAa,CAAC;CACjE,CAAC,oDAAoD;AAEtD,MAAM,SAAS,GAAG,CAChB,IAAwG,EACxG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,2BAA2B,EAAE,iCAAiC,IAAI,CAAC,CAAA;AAE1F,MAAM,YAAY,GAAG,CAAC,IAIrB,EAAE,EAAE,CACH,MAAM,CAAC,mBAAmB,CAAC;IACzB,0BAA0B,EAAE,IAAI,CAAC,aAAa,IAAI,CAAC;IACnD,0BAA0B,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM;IACjD,0BAA0B,EAAE,SAAS,CAAC,IAAI,CAAC;CAC5C,CAAC,CAAA;AAEJ,MAAM,YAAY,GAAG,CAAC,IAGrB,EAAE,EAAE,CACH,MAAM,CAAC,mBAAmB,CAAC;IACzB,0BAA0B,EAAE,IAAI,CAAC,aAAa,IAAI,CAAC;IACnD,0BAA0B,EAAE,SAAS,CAAC,IAAI,CAAC;CAC5C,CAAC,CAAA;AAEJ,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,EAAE,MAAM,EAAiB;IAC3E,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,YAAY,CAAA;IAClC,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC/B,IAAY,EACZ,KAAY,EACZ,IAA6C,EAC7C,MAA6B;YAE7B,MAAM,KAAK,GAAG,SAAS,CAAiB,KAAK,CAAC,CAAA;YAC9C,MAAM,YAAY,GAAG,gBAAgB,CAAiB,KAAK,CAAC,CAAA;YAG5D,MAAM,WAAW,GAAG,GAAG,MAAM,GAAG,IAAI,EAAE,CAAA;YACtC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CACzB,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,cAAc,CAAC;gBAC7C,EAAE,EAAE,WAAW;gBACf,eAAe,EAAE,MAAM,EAAE,UAAU;oBACjC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE;oBACnC,CAAC,CAAC,SAAS;gBACb,YAAY,EAAE;oBACZ,KAAK,EAAE,CAAC,gBAAgB,CAAC;oBACzB,OAAO,EAAE,CAAC,CAAC,yFAAyF;iBACrG;aACF,CAAC,CAAC,CACJ,CAAA;YAED,MAAM,gBAAgB,GAAG,MAAM,EAAE,cAAc,EAAE,IAAI,SAAS,CAAA;YAC9D,MAAM,QAAQ,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAA;YAClE,MAAM,gBAAgB,GAAG,CAAC,EAAU,EAAE,CAAW,EAAE,EAAE;gBACnD,MAAM,IAAI,GAAG,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;gBACnD,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAA;YACjC,CAAC,CAAA;YACD,MAAM,kBAAkB,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,gBAAgB,EAAE,CAAA;YAC/E,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,cAAc;gBAC9C,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;gBAC3B,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;oBACjD,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,cAAe,CAAC,SAAS,CAAC,EAAE,CAAC;wBAClE,MAAM,IAAI,KAAK,CAAC,aAAa,SAAS,eAAe,CAAC,CAAA;oBACxD,CAAC;oBACD,OAAO,SAAS,CAAA;gBAClB,CAAC,CAAC,CAAC,CAAA;YAEL,MAAM,aAAa,GAAG,MAAM,EAAE,aAAa,IAAI,EAAE,CAAA;YACjD,MAAM,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;YAC3C,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YACvD,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAC7D,yFAAyF;YACzF,oGAAoG;YACpG,MAAM,gBAAgB,GAAG,WAAW,CAAA;YAEpC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAK,CAAA;YACtC,MAAM,SAAS,GAAG,IAAI,GAAG,EAA+B,CAAA;YACxD,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAE;gBACpC,MAAM,QAAQ,GAAG,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,KAAK,EAAE,EAAE,CAAA;gBACnF,OAAO,MAAM;qBACV,OAAO,CAAC,GAAG,EAAE,CACZ,SAAS;qBACN,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC;qBACxB,IAAI,EAAkB;qBACtB,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAC1D;qBACA,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBACxB,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;wBAAE,OAAO,MAAM,CAAC,IAAI,CAAA;oBAC7C,OAAO,WAAW,CAAC,OAAO,CAAC,0BAA0B,IAAI,gBAAgB,EAAE,GAAG,CAAC,CAAC,IAAI,CAClF,MAAM,CAAC,OAAO,CAAC,IAAK,CAAC,EACrB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,MAAM,CAAC,aAAa,CAClB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACvC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CACjD,CACF,EACD,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;wBACrB,aAAa,EAAE,QAAQ;wBACvB,EAAE,EAAE,QAAQ;wBACZ,GAAG,EAAE,CAAC,CAAC;qBACR,CAAC,CACH,CACF,EACD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EACnB,MAAM,CAAC,KAAK,CACb,CAAA;gBACH,CAAC,CAAC,EACF,MAAM,CAAC,WAAW,CAAC,oBAAoB,IAAI,OAAO,EAAE,2BAA2B,CAAC,EAChF,MAAM,CAAC,QAAQ,CAAC,sCAAsC,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CACjG,CAAA;YACL,CAAC,CAAA;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAU;gBACnE,IAAI,CAAC,IAAI;oBAAE,OAAM;gBACjB,IAAI,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBAC9B,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;oBACzE,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;gBAC3B,CAAC;gBACD,KAAK,CAAC,CAAC,MAAM,CAAA;YACf,CAAC,CAAC,CAAA;YACF,MAAM,eAAe,GAAG,CAAC,KAAgC,EAAE,EAAU,EAAE,EAAE,CACvE,MAAM;iBACH,GAAG,CAAC,QAAQ,CAAC;gBACZ,2CAA2C;gBAC3C,+CAA+C;gBAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;qBACjB,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ;oBACE,CAAC;oBACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;wBAC1C,MAAM,EAAE,GAAG,EAAE,CACX,cAAc,CAAC;4BACb,aAAa,EAAE,QAAiB;4BAChC,YAAY,EAAE;gCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gCACnC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;gCACZ,aAAa,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;6BACvC;4BACD,8GAA8G;4BAC9G,0CAA0C;yBAC3C,CAAC;wBACJ,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACf,cAAc,CAAC;4BACb,aAAa,EAAE,SAAkB;4BACjC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;4BACZ,YAAY,EAAE;gCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gCACnC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;gCACZ,aAAa,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;6BACvC;4BACD,OAAO,EAAE,IAAI;4BACb,8GAA8G;4BAC9G,0CAA0C;yBAC3C,CAAC;qBACL,CAAC;iBACM,CACb,CAAA;gBACH,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,IAAI,EAAE,CAAC,CAAA;gBAE5D,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACvC,OAAO;qBACJ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAU,CAAC,EACjC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CACb,MAAM;qBACH,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;qBAC9C,IAAI,CACH,MAAM;qBACH,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5C,MAAM;qBACH,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAClB,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC7B,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,CACrE,CAAA;oBACD,IAAI,CAAC,EAAE,CAAC;wBACN,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,8BAA8B,CAChC;4BACE,IAAI,EAAE,IAAI;4BACV,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC;4BAC1C,IAAI,EAAE,CAAC,CAAC,UAAU;4BAClB,GAAG,EAAE,SAAS;yBACf,CACF,CACF,CAAA;oBACH,CAAC;oBACD,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,CAC1E,CAAA;oBACD,IAAI,EAAE,EAAE,CAAC;wBACP,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACtB,IAAI,sBAAsB,CACxB,8BAA8B,GAAG,EAAE,CAAC,UAAU,EAC9C,SAAS,CACV,CACF,CAAA;oBACH,CAAC;oBACD,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,CAChD,CAAA;oBACD,IAAI,EAAE,EAAE,CAAC;wBACP,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACtB,IAAI,sBAAsB,CACxB,8BAA8B,GAAG,EAAE,CAAC,UAAU,EAC9C,SAAS,CACV,CACF,CAAA;oBACH,CAAC;oBACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC5B,GAAG,CAAC;wBACJ,oEAAoE;wBACpE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAE,CAAC,IAAI;qBAC1B,CAAC,CAAC,CAAA;gBACL,CAAC,CAAC,CACH,CACJ,CACN,CAAA;gBAED,OAAO,WAAW,CAAC,IAAI,EAA+C,CAAA;YACxE,CAAC,CAAC;iBACD,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,yCAAyC,EAAE;gBACzD,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE;aACrG,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CAAA;YAEL,MAAM,OAAO,GAAG,CAAC,KAAgC,EAAE,EAAE,CACnD,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;YAE3E,MAAM,QAAQ,GAAG,CAAC,KAAgC,EAAE,EAAE;gBACpD,OAAO,gBAAgB;qBACpB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC1B,MAAM;qBACH,OAAO,CAAC,GAAG,EAAE;oBACZ,MAAM,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAC1B,CAAC,CAAC,EAAE,EAAE,CACJ;wBACE,CAAC;wBACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;4BAC1C,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;gCACb,aAAa,EAAE,QAAiB;gCAChC,YAAY,EAAE;oCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oCACnC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;oCACZ,aAAa,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;iCACvC;gCACD,8GAA8G;gCAC9G,0CAA0C;6BAC3C,CAAC;4BACF,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gCACjB,aAAa,EAAE,SAAkB;gCACjC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;gCACZ,YAAY,EAAE;oCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oCACnC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;oCACZ,aAAa,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;iCACvC;gCACD,8GAA8G;gCAC9G,0CAA0C;gCAC1C,OAAO,EAAE,IAAI;6BACd,CAAC;yBACH,CAAC;qBACM,CACb,CAAA;oBAED,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;oBAElC,OAAO,MAAM;yBACV,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;yBAC/D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,CAAC;wBAChD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,CAAA;wBAC7B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAC7B,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,CACrD,CAAA;wBACD,IAAI,WAAW,EAAE,CAAC;4BAChB,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,IAAI,CAAC,CAAA;4BACxC,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gCACjD,OAAO,KAAK,CAAC,CAAC,IAAI,8BAA8B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;4BACrF,CAAC;4BAED,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACtB,IAAI,sBAAsB,CAAC,6BAA6B,GAAG,IAAI,CAAC,CACjE,CAAA;wBACH,CAAC;wBAED,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;4BAC5B,GAAG,CAAC;4BACJ,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI;yBACvB,CAAC,CAA8C,CAAA;oBAClD,CAAC,CAAC,CAAC,CAAC,CAAA;gBACR,CAAC,CAAC;qBACD,IAAI,CAAC,MAAM;qBACT,QAAQ,CAAC,0CAA0C,EAAE;oBACpD,UAAU,EAAE;wBACV,yBAAyB,EAAE,WAAW;wBACtC,uBAAuB,EAAE,IAAI;wBAC7B,SAAS,EAAE,EAAE;qBACd;iBACF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC,CACtC,CAAC,CAAA;YACN,CAAC,CAAA;YAED,MAAM,CAAC,GAA0B;gBAC/B,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;gBAExC,QAAQ,EAAE,CAAM,KAA6B,EAAE,EAAE,CAC/C,MAAM;qBACH,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,gBAAgB,EAAE,CAAC;qBAC3E,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAC3B,MAAM;qBACH,GAAG,CAAC,QAAQ,CAAC;oBACZ,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAC1C,SAAS,CAAC,KAAK,CAAC,KAAK,CAAM,CAAC,EAAE,EAAE,YAAY,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CACnF,CAAA;oBACD,KAAK,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;oBAC7B,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,CAC3B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,CAAQ,CAAC,EAAE,CAAQ,CAChE,CAAA;gBACH,CAAC,CAAC;qBACD,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,0CAA0C,EAAE;oBAC1D,UAAU,EAAE;wBACV,yBAAyB,EAAE,WAAW;wBACtC,uBAAuB,EAAE,IAAI;wBAC7B,SAAS,EAAE,EAAE;qBACd;iBACF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CACJ,CACF;gBACL,WAAW,EAAE,CAAC,GAAG,EAAE,YAAqB,EAAE,EAAE,CAC1C,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC1C,MAAM;qBACH,OAAO,CAAC,GAAG,EAAE,CACZ,SAAS,CACP,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CACrB,cAAc,CAAC;oBACb,aAAa,EAAE,QAAiB;oBAChC,EAAE;oBACF,8GAA8G;oBAC9G,mEAAmE;iBACpE,CAAC,CACH,CAAC,EACF,YAAY,IAAI,kBAAkB,CAAC,EAAE,CAAC,CACvC,CACF;qBACA,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,6CAA6C,EAAE;oBAC7D,UAAU,EAAE;wBACV,yBAAyB,EAAE,WAAW;wBACtC,uBAAuB,EAAE,IAAI;wBAC7B,SAAS,EAAE,EAAE;qBACd;iBACF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CACJ,CAAC;gBACJ,GAAG,EAAE,MAAM;qBACR,GAAG,CAAC;oBACH,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;wBACpB,KAAK,EAAE,iBAAiB,IAAI,EAAE;wBAC9B,UAAU,EAAE,EAAE;qBACf,CAAC,CAAC;oBACH,EAAE,EAAE,gBAAgB;iBACrB,CAAC;qBACD,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAC3B,MAAM;qBACH,GAAG,CAAC,QAAQ,CAAC;oBACZ,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAC1C,SAAS,CAAC,KAAK,CAAC,KAAK,CAAW,CAAC,EAAE,EAAE,YAAY,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CACxF,CAAA;oBACD,KAAK,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;oBAC7B,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBAClF,CAAC,CAAC;qBACD,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,qCAAqC,EAAE;oBACrD,UAAU,EAAE;wBACV,yBAAyB,EAAE,WAAW;wBACtC,uBAAuB,EAAE,IAAI;wBAC7B,SAAS,EAAE,EAAE;qBACd;iBACF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CACJ,CACF;gBACH;;mBAEG;gBACH,MAAM,EAAE,CACN,CAAyB,EACzB,EAAE;oBACF,MAAM,IAAI,GAAG,CAAC,EAAE,IAAI,CAAA;oBACpB,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,CAAA;oBACtB,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAA;oBAEvB,OAAO,MAAM;yBACV,GAAG,CAAC;wBACH,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAClB,sBAAsB,CACpB,KAAK,EACL,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EACtE,IAAI,EACJ,aAAa,EACb,CAAC,CAAC,MAEW,EACb,CAAC,CAAC,KAAsF,EACxF,IAAI,EACJ,KAAK,CACN,CACF;wBACD,EAAE,EAAE,gBAAgB;qBACrB,CAAC;yBACD,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAClC,MAAM;yBACH,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CACrB,MAAM;yBACH,GAAG,CAAC,QAAQ,CAAC;wBACZ,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;4BACb,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAC1C,SAAS,CAAC,KAAK,CAAC,KAAK,CAAI,CAAC,EAAE,EAAE,YAAY,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CACjF,CAAA;4BACD,KAAK,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;4BAC7B,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gCACpC,GAAG,IAAI,CACL,aAAa,EACb,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAY,CAAC,CACvE;gCACD,GAAG,YAAY,CAAC,CAAQ,CAAC;6BAC1B,CAAC,CAAC,CAAA;wBACL,CAAC;wBACD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAC1C,SAAS,CAAC,KAAK,CAAC,KAAK,CAAW,CAAC,EAAE,EAAE,YAAY,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CACxF,CAAA;wBACD,KAAK,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;wBAC7B,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,CAAQ,CAAC,EAAE,CAAQ,CAAC,CAAA;oBACpG,CAAC,CAAC;yBACD,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,wCAAwC,EAAE;wBACxD,UAAU,EAAE;4BACV,yBAAyB,EAAE,WAAW;4BACtC,uBAAuB,EAAE,IAAI;4BAC7B,SAAS,EAAE,EAAE;yBACd;qBACF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACjC,CACJ,CACJ,CAAA;gBACL,CAAC;gBACD,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CACX,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC1C,MAAM;qBACH,GAAG,CAAC,QAAQ,CAAC;oBACZ,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAC1C,SAAS;yBACN,IAAI,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAa,CAAC,CAAC;yBAC1D,IAAI,EAAW,CACnB,CAAA;oBACD,KAAK,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;oBAC7B,OAAO,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CACjD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAC9D,CAAA;gBACH,CAAC,CAAC;qBACD,IAAI,CAAC,MAAM;qBACT,QAAQ,CAAC,sCAAsC,EAAE;oBAChD,UAAU,EAAE;wBACV,yBAAyB,EAAE,WAAW;wBACtC,uBAAuB,EAAE,IAAI;wBAC7B,cAAc,EAAE,gBAAgB,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAa,CAAC;wBAChE,SAAS,EAAE,EAAE;wBACb,EAAE;qBACH;iBACF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC,CACtC,CAAC;gBACJ,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CACT,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC1C,MAAM;qBACH,KAAK,CACJ,MAAM;qBACH,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,EACzB;oBACE,MAAM,EAAE,GAAG,EAAE,CACX,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;wBACrB,GAAG,KAAK,CAAC,CAAC,CAAC;wBACX,aAAa,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;qBACvC,CAAC,CACH;oBACH,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACf,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CACvD,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EACvD;wBACE,eAAe,EAAE;4BACf,IAAI,EAAE,SAAS;4BACf,SAAS,EAAE,IAAI;yBAChB;qBACF,CACF,CACF;iBACJ,CACF;qBACA,IAAI,CACH,MAAM;qBACH,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACb,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;wBACzE,OAAO,MAAM,CAAC,IAAI,CAChB,IAAI,8BAA8B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CACrF,CAAA;oBACH,CAAC;oBACD,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;wBAC7C,OAAO,MAAM,CAAC,GAAG,CACf,IAAI,sBAAsB,CACxB,6BAA6B,GAAG,CAAC,CAAC,UAAU,CAC7C,CACF,CAAA;oBACH,CAAC;oBACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;wBACxB,GAAG,CAAC;wBACJ,KAAK,EAAE,CAAC,CAAC,IAAI;qBACd,CAAC,CAAC,CAAA;gBACL,CAAC,CAAC,EACJ,MAAM;qBACH,QAAQ,CAAC,qCAAqC,EAAE;oBAC/C,UAAU,EAAE;wBACV,yBAAyB,EAAE,WAAW;wBACtC,uBAAuB,EAAE,IAAI;wBAC7B,SAAS,EAAE,EAAE;wBACb,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;qBACb;iBACF,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACnC,CACJ,CAAC;gBACJ,QAAQ;gBACR,OAAO;aACR,CAAA;YAED,mDAAmD;YACnD,KAAK,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;YAE/B,OAAO,CAAC,CAAA;QACV,CAAC,CAAC;KACH,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,UAAU,gBAAgB,CAAC,GAAkB;IACjD,OAAO,UAAU;SACd,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;SAC7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AAChF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.197",
+  "version": "4.0.0-beta.199",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "8.4.0",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.197"
+    "effect-app": "4.0.0-beta.199"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.3",

package/src/Store/Cosmos.ts

@@ -26,6 +26,30 @@ class CosmosDbOperationError {
   constructor(readonly message: string, readonly raw?: unknown) {}
 } // TODO: Retry operation when running into RU limit.
 
+const respBytes = (
+  resp: { diagnostics?: { clientSideRequestStatistics?: { totalResponsePayloadLengthInBytes?: number } } }
+) => resp.diagnostics?.clientSideRequestStatistics?.totalResponsePayloadLengthInBytes ?? 0
+
+const annotateFeed = (resp: {
+  resources: readonly unknown[]
+  requestCharge?: number
+  diagnostics?: { clientSideRequestStatistics?: { totalResponsePayloadLengthInBytes?: number } }
+}) =>
+  Effect.annotateCurrentSpan({
+    "db.cosmos.request_charge": resp.requestCharge ?? 0,
+    "db.cosmos.resource_count": resp.resources.length,
+    "db.cosmos.response_bytes": respBytes(resp)
+  })
+
+const annotateItem = (resp: {
+  requestCharge?: number
+  diagnostics?: { clientSideRequestStatistics?: { totalResponsePayloadLengthInBytes?: number } }
+}) =>
+  Effect.annotateCurrentSpan({
+    "db.cosmos.request_charge": resp.requestCharge ?? 0,
+    "db.cosmos.response_bytes": respBytes(resp)
+  })
+
 const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
   const { db } = yield* CosmosClient
   return {
@@ -318,17 +342,15 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
               Effect.tap(({ q }) => logQuery(q)),
               Effect.flatMap(({ ns, q }) =>
                 Effect
-                  .promise(() =>
-                    container
-                      .items
-                      .query<Out>(q, { partitionKey: nsBasePartitionKey(ns) })
-                      .fetchAll()
-                      .then(({ resources }) =>
-                        resources.map(
-                          (_) => ({ ...defaultValues, ...mapReverseId(_ as any) }) as Out
-                        )
-                      )
-                  )
+                  .gen(function*() {
+                    const response = yield* Effect.promise(() =>
+                      container.items.query<Out>(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll()
+                    )
+                    yield* annotateFeed(response)
+                    return response.resources.map(
+                      (_) => ({ ...defaultValues, ...mapReverseId(_ as any) }) as Out
+                    )
+                  })
                   .pipe(
                     Effect.withSpan("Cosmos.queryRaw [effect-app/infra/Store]", {
                       attributes: {
@@ -378,17 +400,13 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
             Effect.tap(({ q }) => logQuery(q)),
             Effect.flatMap(({ ns, q }) =>
               Effect
-                .promise(() =>
-                  container
-                    .items
-                    .query<PMCosmos>(q, { partitionKey: nsBasePartitionKey(ns) })
-                    .fetchAll()
-                    .then(({ resources }) =>
-                      resources.map(
-                        (_) => ({ ...defaultValues, ...mapReverseId(_) })
-                      )
-                    )
-                )
+                .gen(function*() {
+                  const response = yield* Effect.promise(() =>
+                    container.items.query<PMCosmos>(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll()
+                  )
+                  yield* annotateFeed(response)
+                  return response.resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))
+                })
                 .pipe(
                   Effect.withSpan("Cosmos.all [effect-app/infra/Store]", {
                     attributes: {
@@ -433,29 +451,26 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
               Effect
                 .flatMap(({ ns, q }) =>
                   Effect
-                    .promise(() =>
-                      f.select
-                        ? container
-                          .items
-                          .query<M>(q, { partitionKey: nsBasePartitionKey(ns) })
-                          .fetchAll()
-                          .then(({ resources }) =>
-                            resources.map((_) => ({
-                              ...pipe(
-                                defaultValues,
-                                Struct.pick(f.select!.filter((_) => typeof _ === "string") as never[])
-                              ),
-                              ...mapReverseId(_ as any)
-                            }))
-                          )
-                        : container
-                          .items
-                          .query<{ f: M }>(q, { partitionKey: nsBasePartitionKey(ns) })
-                          .fetchAll()
-                          .then(({ resources }) =>
-                            resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f as any) }) as any)
-                          )
-                    )
+                    .gen(function*() {
+                      if (f.select) {
+                        const response = yield* Effect.promise(() =>
+                          container.items.query<M>(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll()
+                        )
+                        yield* annotateFeed(response)
+                        return response.resources.map((_) => ({
+                          ...pipe(
+                            defaultValues,
+                            Struct.pick(f.select!.filter((_) => typeof _ === "string") as never[])
+                          ),
+                          ...mapReverseId(_ as any)
+                        }))
+                      }
+                      const response = yield* Effect.promise(() =>
+                        container.items.query<{ f: M }>(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll()
+                      )
+                      yield* annotateFeed(response)
+                      return response.resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f as any) }) as any)
+                    })
                     .pipe(
                       Effect.withSpan("Cosmos.filter [effect-app/infra/Store]", {
                         attributes: {
@@ -471,16 +486,17 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
         find: (id) =>
           resolveNamespace.pipe(Effect.flatMap((ns) =>
             Effect
-              .promise(() =>
-                container
-                  .item(id, nsPartitionValue(ns, { [idKey]: id } as Encoded))
-                  .read<Encoded>()
-                  .then(({ resource }) =>
-                    Option.fromNullishOr(resource).pipe(
-                      Option.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))
-                    )
-                  )
-              )
+              .gen(function*() {
+                const response = yield* Effect.promise(() =>
+                  container
+                    .item(id, nsPartitionValue(ns, { [idKey]: id } as Encoded))
+                    .read<Encoded>()
+                )
+                yield* annotateItem(response)
+                return Option.fromNullishOr(response.resource).pipe(
+                  Option.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))
+                )
+              })
               .pipe(Effect
                 .withSpan("Cosmos.find [effect-app/infra/Store]", {
                   attributes: {

package/test/dist/controller.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"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"}

package/test/rpc-stream-fullstack.test.ts

@@ -92,7 +92,12 @@ class StreamFailStream extends Req.Command<StreamFailStream>()("StreamFailStream
   error: StreamBoom
 }) {}
 
-const StreamyRsc = { StreamTicks, StreamCountTo, StreamRealtime, StreamFailEffect, StreamFailStream }
+class StreamNoSuccess extends Req.Command<StreamNoSuccess>()("StreamNoSuccess", {}, {
+  stream: true,
+  allowAnonymous: true
+}) {}
+
+const StreamyRsc = { StreamTicks, StreamCountTo, StreamRealtime, StreamFailEffect, StreamFailStream, StreamNoSuccess }
 
 // ---------------------------------------------------------------------------
 // Controllers / router — Stream impls returned from the match callback.
@@ -117,7 +122,8 @@ const router = Router(StreamyRsc)({
       // returning Effect.fail from a stream handler should surface as a failing
       // stream on the client (not a protocol error)
       StreamFailEffect: () => Effect.fail(new StreamBoom({ reason: "from-effect" })),
-      StreamFailStream: () => Stream.fail(new StreamBoom({ reason: "from-stream" }))
+      StreamFailStream: () => Stream.fail(new StreamBoom({ reason: "from-stream" })),
+      StreamNoSuccess: () => Stream.empty
     })
   }
 })
@@ -236,3 +242,13 @@ it.live(
   }, Effect.provide(TestLayer)),
   { timeout: 10_000 }
 )
+
+it.live(
+  "stream resource without `success` exposes handler as a Stream on the client",
+  Effect.fnUntraced(function*() {
+    const client = yield* ApiClientFactory.makeFor(Layer.empty)(StreamyRsc)
+    const exit = yield* Stream.runCollect(client.StreamNoSuccess.handler()).pipe(Effect.exit)
+    expect(Exit.isSuccess(exit)).toBe(true)
+  }, Effect.provide(TestLayer)),
+  { timeout: 10_000 }
+)