@effect-app/infra 0.62.0 → 0.63.1

package/dist/errorReporter.js

@@ -1,40 +1,40 @@
 import * as tsplus_module_1 from "@effect/io/Cause";
-import * as tsplus_module_2 from "@effect-app/prelude/utils";
-import * as tsplus_module_3 from "@effect/io/Effect";
+import * as tsplus_module_2 from "@effect/io/Effect";
+import * as tsplus_module_3 from "@effect/data/Debug";
 import * as tsplus_module_4 from "@effect-app/core/Option";
-import * as tsplus_module_5 from "@effect/data/Debug";
 import * as Sentry from "@sentry/node";
 import { RequestContextContainer } from "./services/RequestContextContainer.js";
 export function reportError(makeError) {
-    return (cause, extras) => tsplus_module_5.untraced(() => tsplus_module_3.gen(function* ($) {
-        const context = yield* $(RequestContextContainer.getOption);
+    return (cause, extras) => tsplus_module_3.untraced(() => tsplus_module_2.gen(function* ($) {
         if (tsplus_module_1.isInterrupted(cause)) {
-            const data = { context, ...extras };
-            yield* $(tsplus_module_3.logDebug("Interrupted: " + (data ? tsplus_module_2.RecordPretty(tsplus_module_2.object$(data)) : "")));
+            yield* $(tsplus_module_2.logAnnotate(tsplus_module_2.logDebug("Interrupted"), "extras", JSON.stringify(extras ?? {})));
             return;
         }
         const error = makeError(cause);
-        reportSentry(error, tsplus_module_4.getOrUndefined(context), extras);
-        yield* $(tsplus_module_3.logAnnotate(tsplus_module_3.logErrorCause(cause), "extras", JSON.stringify({ context, extras, error: { _tag: error._tag, message: error.message } })));
+        yield* $(reportSentry(error, extras));
+        yield* $(tsplus_module_2.logAnnotate(tsplus_module_2.logErrorCause(cause), "extras", JSON.stringify({ ...extras, __error__: { _tag: error._tag, message: error.message } })));
     }));
 }
-function reportSentry(error, context, extras) {
-    const scope = new Sentry.Scope();
-    if (context)
-        scope.setContext("context", context);
-    if (extras)
-        scope.setContext("extras", extras);
-    scope.setContext("error", error.toJSON());
-    Sentry.captureException(error, scope);
+function reportSentry(error, extras) {
+    return tsplus_module_2.map(RequestContextContainer.getOption, (ctx) => {
+        const context = tsplus_module_4.getOrUndefined(ctx);
+        const scope = new Sentry.Scope();
+        if (context)
+            scope.setContext("context", context);
+        if (extras)
+            scope.setContext("extras", extras);
+        scope.setContext("error", error.toJSON());
+        Sentry.captureException(error, scope);
+    });
 }
 export function logError(makeError) {
-    return (cause, context) => tsplus_module_5.untraced(() => tsplus_module_3.gen(function* ($) {
+    return (cause, extras) => tsplus_module_3.untraced(() => tsplus_module_2.gen(function* ($) {
         if (tsplus_module_1.isInterrupted(cause)) {
-            yield* $(tsplus_module_3.logDebug("Interrupted: " + (context ? tsplus_module_2.RecordPretty(tsplus_module_2.object$(context)) : "")));
+            yield* $(tsplus_module_2.logAnnotate(tsplus_module_2.logDebug("Interrupted"), "extras", JSON.stringify(extras ?? {})));
             return;
         }
         const error = makeError(cause);
-        yield* $(tsplus_module_3.logAnnotate(tsplus_module_3.logWarningCause(cause), "extras", JSON.stringify({ context, error: { _tag: error._tag, message: error.message } })));
+        yield* $(tsplus_module_2.logAnnotate(tsplus_module_2.logWarningCause(cause), "extras", JSON.stringify({ ...extras, __error__: { _tag: error._tag, message: error.message } })));
     }));
 }
 export function captureException(error) {
@@ -46,6 +46,6 @@ export function reportMessage(message) {
     console.warn(message);
 }
 export function reportMessageM(message) {
-    return tsplus_module_3.sync(() => reportMessage(message));
+    return tsplus_module_2.sync(() => reportMessage(message));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sY0FBYyxDQUFBO0FBR3RDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFBO0FBRS9FLE1BQU0sVUFBVSxXQUFXLENBQ3pCLFNBQWtDO0lBRWxDLE9BQU8sQ0FBQyxLQUFlLEVBQUUsTUFBZ0MsRUFBRSxFQUFFLENBQzNELHlCQUFlLEdBQUcsRUFBRSxDQUNsQixvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUMzRCxJQUFJLDhCQUFBLEtBQUssQ0FBZ0IsRUFBRTtZQUN6QixNQUFNLElBQUksR0FBRyxFQUFFLE9BQU8sRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUFBO1lBQ25DLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx5QkFBZ0IsZUFBZSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsc0RBQUMsSUFBSSxHQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDekUsT0FBTTtTQUNQO1FBQ0QsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzlCLFlBQVksQ0FBQyxLQUFLLGlDQUFFLE9BQU8sR0FBUSxNQUFNLENBQUMsQ0FBQTtRQUMxQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sMERBQUEsS0FBSyxHQUNILFFBQVEsRUFDUixJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FDekYsQ0FDRixDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtBQUNMLENBQUM7QUFFRCxTQUFTLFlBQVksQ0FDbkIsS0FBUyxFQUNULE9BQW1DLEVBQ25DLE1BQTJDO0lBRTNDLE1BQU0sS0FBSyxHQUFHLElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQ2hDLElBQUksT0FBTztRQUFFLEtBQUssQ0FBQyxVQUFVLENBQUMsU0FBUyxFQUFFLE9BQTZDLENBQUMsQ0FBQTtJQUN2RixJQUFJLE1BQU07UUFBRSxLQUFLLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUM5QyxLQUFLLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQTtJQUN6QyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFBO0FBQ3ZDLENBQUM7QUFFRCxNQUFNLFVBQVUsUUFBUSxDQUN0QixTQUFrQztJQUVsQyxPQUFPLENBQUMsS0FBZSxFQUFFLE9BQWlDLEVBQUUsRUFBRSxDQUM1RCx5QkFBZSxHQUFHLEVBQUUsQ0FDbEIsb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUNwQixJQUFJLDhCQUFBLEtBQUssQ0FBZ0IsRUFBRTtZQUN6QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMseUJBQWdCLGVBQWUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLHNEQUFDLE9BQU8sR0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQy9FLE9BQU07U0FDUDtRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sNERBQUEsS0FBSyxHQUNILFFBQVEsRUFDUixJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUNqRixDQUNGLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FDSCxDQUFBO0FBQ0wsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0IsQ0FBQyxLQUFjO0lBQzdDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUM5QixPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO0FBQ3RCLENBQUM7QUFFRCxNQUFNLFVBQVUsYUFBYSxDQUFDLE9BQWU7SUFDM0MsTUFBTSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUU5QixPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBQ3ZCLENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFDLE9BQWU7SUFDNUMsT0FBTywyQkFBTyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtBQUN2QyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxLQUFLLE1BQU0sTUFBTSxjQUFjLENBQUE7QUFFdEMsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sdUNBQXVDLENBQUE7QUFFL0UsTUFBTSxVQUFVLFdBQVcsQ0FDekIsU0FBa0M7SUFFbEMsT0FBTyxDQUFDLEtBQWUsRUFBRSxNQUFnQyxFQUFFLEVBQUUsQ0FDM0QseUJBQWUsR0FBRyxFQUFFLENBQ2xCLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDcEIsSUFBSSw4QkFBQSxLQUFLLENBQWdCLEVBQUU7WUFDekIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLDRCQUFBLHlCQUFnQixhQUFhLENBQUMsRUFBYSxRQUFRLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQzVGLE9BQU07U0FDUDtRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFBO1FBQ3JDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDTiwwREFBQSxLQUFLLEdBQ0gsUUFBUSxFQUNSLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxHQUFHLE1BQU0sRUFBRSxTQUFTLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FDdkYsQ0FDRixDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtBQUNMLENBQUM7QUFFRCxTQUFTLFlBQVksQ0FDbkIsS0FBUyxFQUNULE1BQTJDO0lBRTNDLE9BQU8sb0JBQUEsdUJBQXVCLENBQUMsU0FBUyxFQUFLLENBQUMsR0FBRyxFQUFFLEVBQUU7UUFDbkQsTUFBTSxPQUFPLEdBQUcsK0JBQUEsR0FBRyxDQUFPLENBQUE7UUFDMUIsTUFBTSxLQUFLLEdBQUcsSUFBSSxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDaEMsSUFBSSxPQUFPO1lBQUUsS0FBSyxDQUFDLFVBQVUsQ0FBQyxTQUFTLEVBQUUsT0FBNkMsQ0FBQyxDQUFBO1FBQ3ZGLElBQUksTUFBTTtZQUFFLEtBQUssQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQzlDLEtBQUssQ0FBQyxVQUFVLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFBO1FBQ3pDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUE7SUFDdkMsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLFFBQVEsQ0FDdEIsU0FBa0M7SUFFbEMsT0FBTyxDQUFDLEtBQWUsRUFBRSxNQUFnQyxFQUFFLEVBQUUsQ0FDM0QseUJBQWUsR0FBRyxFQUFFLENBQ2xCLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDcEIsSUFBSSw4QkFBQSxLQUFLLENBQWdCLEVBQUU7WUFDekIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLDRCQUFBLHlCQUFnQixhQUFhLENBQUMsRUFBYSxRQUFRLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQzVGLE9BQU07U0FDUDtRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sNERBQUEsS0FBSyxHQUNILFFBQVEsRUFDUixJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsR0FBRyxNQUFNLEVBQUUsU0FBUyxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQ3ZGLENBQ0YsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUNILENBQUE7QUFDTCxDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLEtBQWM7SUFDN0MsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsT0FBZTtJQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBRTlCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDdkIsQ0FBQztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZTtJQUM1QyxPQUFPLDJCQUFPLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFBO0FBQ3ZDLENBQUMifQ==

package/dist/logger/jsonLogger.d.ts

@@ -0,0 +1,3 @@
+export declare const jsonLogger: import("@effect/io/Logger").Logger<string, void>;
+export declare const logJson: import("@effect/io/Layer").Layer<never, never, never>;
+//# sourceMappingURL=jsonLogger.d.ts.map

package/dist/logger/jsonLogger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../_src/logger/jsonLogger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,kDA2BtB,CAAA;AAED,eAAO,MAAM,OAAO,uDAAmD,CAAA"}

package/dist/logger/jsonLogger.js

@@ -0,0 +1,32 @@
+import * as tsplus_module_1 from "@effect/io/Fiber/Id";
+import * as tsplus_module_2 from "@effect-app/core/Option";
+import * as tsplus_module_3 from "@effect/io/Cause";
+import * as tsplus_module_4 from "@effect/data/Chunk";
+import * as tsplus_module_5 from "@effect-app/core/Chunk";
+import * as tsplus_module_6 from "@effect/data/HashMap";
+import * as tsplus_module_7 from "@effect/io/Logger";
+import { getRequestContext } from "./shared.js";
+export const jsonLogger = tsplus_module_7.make((fiberId, logLevel, message, cause, context, spans, annotations) => {
+    const now = new Date();
+    const nowMillis = now.getTime();
+    const c = getRequestContext(context);
+    const data = {
+        timestamp: now,
+        level: logLevel.label,
+        fiber: tsplus_module_1.threadName(fiberId),
+        message,
+        request: tsplus_module_2.getOrUndefined(c),
+        cause: cause != null && cause != tsplus_module_3.empty ? tsplus_module_3.pretty(cause) : undefined,
+        spans: tsplus_module_4.isNonEmpty(spans)
+            ? tsplus_module_5.toArray(tsplus_module_4.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime }))) : undefined,
+        annotations: tsplus_module_6.size(annotations) > 0
+            ? [...annotations].reduce((prev, [k, v]) => {
+                prev[k] = v;
+                return prev;
+            }, {})
+            : undefined
+    };
+    globalThis.console.log(JSON.stringify(data));
+});
+export const logJson = tsplus_module_7.replace(tsplus_module_7.defaultLogger, jsonLogger);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvbG9nZ2VyL2pzb25Mb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUUvQyxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcscUJBQ3hCLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLEVBQUU7SUFDakUsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUN0QixNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUE7SUFFL0IsTUFBTSxDQUFDLEdBQUcsaUJBQWlCLENBQUMsT0FBTyxDQUFDLENBQUE7SUFFcEMsTUFBTSxJQUFJLEdBQUc7UUFDWCxTQUFTLEVBQUUsR0FBRztRQUNkLEtBQUssRUFBRSxRQUFRLENBQUMsS0FBSztRQUNyQixLQUFLLDZCQUFFLE9BQU8sQ0FBVztRQUN6QixPQUFPO1FBQ1AsT0FBTyxpQ0FBRSxDQUFDLENBQU07UUFDaEIsS0FBSyxFQUFFLEtBQUssSUFBSSxJQUFJLElBQUksS0FBSyx5QkFBZSxDQUFDLENBQUMsd0JBQUMsS0FBSyxFQUFRLENBQUMsQ0FBQyxTQUFTO1FBQ3ZFLEtBQUssRUFBRSwyQkFBaUIsS0FBSyxDQUFDO1lBQzVCLENBQUMseUJBQUMsb0JBQUEsS0FBSyxFQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxFQUN6RSxDQUFDLENBQUMsU0FBUztRQUNiLFdBQVcsRUFBRSxxQkFBQSxXQUFXLElBQVEsQ0FBQztZQUMvQixDQUFDLENBQUMsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUN6QyxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNYLE9BQU8sSUFBSSxDQUFBO1lBQ2IsQ0FBQyxFQUFFLEVBQTRCLENBQUM7WUFDaEMsQ0FBQyxDQUFDLFNBQVM7S0FDZCxDQUFBO0lBRUQsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0FBQzlDLENBQUMsQ0FDRixDQUFBO0FBRUQsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLHVEQUFxQyxVQUFVLENBQUMsQ0FBQSJ9

package/dist/logger/logFmtLogger.d.ts

@@ -0,0 +1,3 @@
+export declare const logfmtLogger: import("@effect/io/Logger").Logger<string, void>;
+export declare const logFmt: import("@effect/io/Layer").Layer<never, never, never>;
+//# sourceMappingURL=logFmtLogger.d.ts.map

package/dist/logger/logFmtLogger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logFmtLogger.d.ts","sourceRoot":"","sources":["../../_src/logger/logFmtLogger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY,kDAoBxB,CAAA;AAED,eAAO,MAAM,MAAM,uDAAqD,CAAA"}

package/dist/logger/logFmtLogger.js

@@ -0,0 +1,24 @@
+import * as tsplus_module_1 from "@effect-app/core/Option";
+import * as tsplus_module_2 from "@effect-app/prelude/utils";
+import * as tsplus_module_3 from "@effect/data/HashMap";
+import * as tsplus_module_4 from "@effect/io/Logger";
+import { getRequestContext } from "./shared.js";
+export const logfmtLogger = tsplus_module_4.make((fiberId, logLevel, message, cause, context, spans, annotations) => {
+    const c = getRequestContext(context);
+    const requestContext = tsplus_module_1.getOrUndefined(c);
+    if (requestContext) {
+        annotations = tsplus_module_3.make(...[
+            ...annotations,
+            ...tsplus_module_2.RecordEntries(tsplus_module_2.object$({
+                requestRootId: requestContext.rootId,
+                requestId: requestContext.id,
+                requestName: requestContext.name,
+                ...requestContext.userProfile?.sub ? { requestUserSub: requestContext.userProfile.sub } : {}
+            }))
+        ]);
+    }
+    const formatted = tsplus_module_4.logfmtLogger.log(fiberId, logLevel, message, cause, context, spans, annotations);
+    globalThis.console.log(formatted);
+});
+export const logFmt = tsplus_module_4.replace(tsplus_module_4.defaultLogger, logfmtLogger);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nRm10TG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9sb2dnZXIvbG9nRm10TG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFL0MsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLHFCQUMxQixDQUFDLE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxFQUFFO0lBQ2pFLE1BQU0sQ0FBQyxHQUFHLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3BDLE1BQU0sY0FBYyxrQ0FBRyxDQUFDLENBQU0sQ0FBQTtJQUM5QixJQUFJLGNBQWMsRUFBRTtRQUNsQixXQUFXLEdBQUcscUJBQWEsR0FBRztZQUM1QixHQUFHLFdBQVc7WUFDZCx5REFBRztnQkFDRCxhQUFhLEVBQUUsY0FBYyxDQUFDLE1BQU07Z0JBQ3BDLFNBQVMsRUFBRSxjQUFjLENBQUMsRUFBRTtnQkFDNUIsV0FBVyxFQUFFLGNBQWMsQ0FBQyxJQUFJO2dCQUNoQyxHQUFHLGNBQWMsQ0FBQyxXQUFXLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLGNBQWMsRUFBRSxjQUFjLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFO2FBQzdGLEVBRVM7U0FDWCxDQUFDLENBQUE7S0FDSDtJQUNELE1BQU0sU0FBUyxHQUFHLDZCQUFvQixHQUFHLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDekcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsdURBQXFDLFlBQVksQ0FBQyxDQUFBIn0=

package/dist/logger/shared.d.ts

@@ -0,0 +1,3 @@
+import * as FiberRefs from "@effect/io/FiberRefs";
+export declare function getRequestContext(context: FiberRefs.FiberRefs): import("@effect/data/Option").Option<import("../RequestContext.js").RequestContext>;
+//# sourceMappingURL=shared.d.ts.map

package/dist/logger/shared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../_src/logger/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAA;AAGjD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,uFAM7D"}

package/dist/logger/shared.js

@@ -0,0 +1,14 @@
+import * as tsplus_module_1 from "@effect/io/FiberRef";
+import * as tsplus_module_2 from "@effect/data/Context";
+import * as tsplus_module_3 from "@effect/io/Effect";
+import * as tsplus_module_4 from "@effect/data/Option";
+import * as FiberRefs from "@effect/io/FiberRefs";
+import { RequestContextContainer } from "../services/RequestContextContainer.js";
+export function getRequestContext(context) {
+    const ctx = FiberRefs.getOrDefault(context, tsplus_module_1.currentContext);
+    // TODO: use `RequestContext.Tag` once switched?
+    const a = tsplus_module_2.getOption(ctx, RequestContextContainer);
+    const c = tsplus_module_4.map(a, (_) => tsplus_module_3.runSync(_.requestContext));
+    return c;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9sb2dnZXIvc2hhcmVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEtBQUssU0FBUyxNQUFNLHNCQUFzQixDQUFBO0FBQ2pELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBRWhGLE1BQU0sVUFBVSxpQkFBaUIsQ0FBQyxPQUE0QjtJQUM1RCxNQUFNLEdBQUcsR0FBRyxTQUFTLENBQUMsWUFBWSxDQUFDLE9BQU8saUNBQTBCLENBQUE7SUFDcEUsZ0RBQWdEO0lBQ2hELE1BQU0sQ0FBQyxHQUFHLDBCQUFBLEdBQUcsRUFBVyx1QkFBdUIsQ0FBQyxDQUFBO0lBQ2hELE1BQU0sQ0FBQyxHQUFHLG9CQUFBLENBQUMsRUFBSyxDQUFDLENBQUMsRUFBRSxFQUFFLHlCQUFDLENBQUMsQ0FBQyxjQUFjLENBQVEsQ0FBQyxDQUFBO0lBQ2hELE9BQU8sQ0FBQyxDQUFBO0FBQ1YsQ0FBQyJ9

package/dist/services/RequestContextContainer.d.ts

@@ -29,5 +29,10 @@ export declare class RequestContextContainerImpl extends RequestContextContainer
  * @tsplus location "@effect-app/infra/services/RequestContextContainer"
  */
 export declare function live(inp: RequestContext.ConstructorInput): RequestContextContainerImpl;
+/**
+ * @tsplus static RequestContext.Ops Tag
+ * @tsplus location "@effect-app/infra/services/RequestContextContainer"
+ */
+export declare const RCTag: import("@effect/data/Context").Tag<RequestContext, RequestContext>;
 export {};
 //# sourceMappingURL=RequestContextContainer.d.ts.map

package/dist/services/RequestContextContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../_src/services/RequestContextContainer.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;;AAErD;;GAEG;AACH,8BAAsB,uBAAwB,SAAQ,4BAAmC;IACvF,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IACtE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnG,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAAE,cAAc,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,2GAQnB;CACF;AAED,qBAAa,2BAA4B,SAAQ,uBAAuB;;gBAE1D,GAAG,EAAE,cAAc,CAAC,gBAAgB;IAKhD,IAAa,cAAc,qEAE1B;IAEQ,MAAM,UAAW,cAAc,KAAK,cAAc,sEAA8B;CAC1F;;;;;AAKD,wBAAgB,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,gBAAgB,+BAExD"}
+{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../_src/services/RequestContextContainer.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;;AAErD;;GAEG;AACH,8BAAsB,uBAAwB,SAAQ,4BAAmC;IACvF,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IACtE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnG,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAAE,cAAc,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,2GAQnB;CACF;AAED,qBAAa,2BAA4B,SAAQ,uBAAuB;;gBAE1D,GAAG,EAAE,cAAc,CAAC,gBAAgB;IAKhD,IAAa,cAAc,qEAE1B;IAEQ,MAAM,UAAW,cAAc,KAAK,cAAc,sEAA8B;CAC1F;;;;;AAKD,wBAAgB,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,gBAAgB,+BAExD;;;;;AAGD,eAAO,MAAM,KAAK,oEAAwB,CAAA"}

package/dist/services/RequestContextContainer.js

@@ -48,4 +48,6 @@ _RequestContextContainerImpl_ref = new WeakMap();
 export function live(inp) {
     return new RequestContextContainerImpl(inp);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUVyRDs7R0FFRztBQUNILE1BQU0sT0FBZ0IsdUJBQXdCLFNBQVEsZ0JBQUEsUUFBUSxFQUEyQjtJQUd2RixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sdUJBQXVCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDakUsQ0FBQztJQUNELE1BQU0sS0FBSyxTQUFTO1FBQ2xCLE9BQU8sd0JBQUEsNEJBQ1EsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQywwQkFBa0IsQ0FBQyxFQUFFLHVCQUF1QixDQUFDLENBQUMsRUFDekUsQ0FBQyxjQUFjLEVBQUUsRUFBRSxDQUMxQix1QkFBQSxjQUFjLENBQVM7WUFDckIsQ0FBQyxDQUFDLG9CQUFBLGNBQWMsQ0FBQyxLQUFLLENBQUMsY0FBYyx1QkFBaUI7WUFDdEQsQ0FBQyxDQUFDLGdEQUFtQixDQUN4QixDQUFBO0lBQ0wsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLDJCQUE0QixTQUFRLHVCQUF1QjtJQUV0RSxZQUFZLEdBQW9DO1FBQzlDLEtBQUssRUFBRSxDQUFBO1FBRlQsbURBQXlCO1FBVWhCLFdBQU0sR0FBRyxDQUFDLENBQXdDLEVBQUUsRUFBRSxDQUFDLDZCQUFBLHVCQUFBLElBQUksd0NBQUssRUFBYyxDQUFDLENBQUMsQ0FBQTtRQVB2Rix1QkFBQSxJQUFJLG9DQUFRLDJCQUErQixJQUFJLGNBQWMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFBLENBQUE7SUFDckUsQ0FBQztJQUVELElBQWEsY0FBYztRQUN6QiwyQkFBTyx1QkFBQSxJQUFJLHdDQUFLLEVBQUk7SUFDdEIsQ0FBQztDQUdGOztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLElBQUksQ0FBQyxHQUFvQztJQUN2RCxPQUFPLElBQUksMkJBQTJCLENBQUMsR0FBRyxDQUFDLENBQUE7QUFDN0MsQ0FBQyJ9
+/** @tsplus static RequestContext.Ops Tag */
+export const RCTag = tsplus_module_5.Tag();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUVyRDs7R0FFRztBQUNILE1BQU0sT0FBZ0IsdUJBQXdCLFNBQVEsZ0JBQUEsUUFBUSxFQUEyQjtJQUd2RixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sdUJBQXVCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDakUsQ0FBQztJQUNELE1BQU0sS0FBSyxTQUFTO1FBQ2xCLE9BQU8sd0JBQUEsNEJBQ1EsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQywwQkFBa0IsQ0FBQyxFQUFFLHVCQUF1QixDQUFDLENBQUMsRUFDekUsQ0FBQyxjQUFjLEVBQUUsRUFBRSxDQUMxQix1QkFBQSxjQUFjLENBQVM7WUFDckIsQ0FBQyxDQUFDLG9CQUFBLGNBQWMsQ0FBQyxLQUFLLENBQUMsY0FBYyx1QkFBaUI7WUFDdEQsQ0FBQyxDQUFDLGdEQUFtQixDQUN4QixDQUFBO0lBQ0wsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLDJCQUE0QixTQUFRLHVCQUF1QjtJQUV0RSxZQUFZLEdBQW9DO1FBQzlDLEtBQUssRUFBRSxDQUFBO1FBRlQsbURBQXlCO1FBVWhCLFdBQU0sR0FBRyxDQUFDLENBQXdDLEVBQUUsRUFBRSxDQUFDLDZCQUFBLHVCQUFBLElBQUksd0NBQUssRUFBYyxDQUFDLENBQUMsQ0FBQTtRQVB2Rix1QkFBQSxJQUFJLG9DQUFRLDJCQUErQixJQUFJLGNBQWMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFBLENBQUE7SUFDckUsQ0FBQztJQUVELElBQWEsY0FBYztRQUN6QiwyQkFBTyx1QkFBQSxJQUFJLHdDQUFLLEVBQUk7SUFDdEIsQ0FBQztDQUdGOztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLElBQUksQ0FBQyxHQUFvQztJQUN2RCxPQUFPLElBQUksMkJBQTJCLENBQUMsR0FBRyxDQUFDLENBQUE7QUFDN0MsQ0FBQztBQUVELDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsZ0JBQUEsR0FBRyxFQUFrQixDQUFBIn0=

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.62.0",
+  "version": "0.63.1",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@azure/cosmos": "^3.17.3",
     "@azure/service-bus": "^7.9.0",
     "@effect/data": "^0.12.2",
-    "@effect/io": "^0.25.7",
+    "@effect/io": "^0.25.8",
     "@sendgrid/helpers": "^7.7.0",
     "@sendgrid/mail": "^7.7.0",
     "change-case": "^4.1.2",
@@ -19,16 +19,16 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "^6.0.2",
     "redlock": "^4.2.0",
-    "@effect-app/prelude": "0.51.0",
     "@effect-app/core": "0.51.0",
     "@effect-app/infra-adapters": "0.44.0",
+    "@effect-app/prelude": "0.51.0",
     "@effect-app/schema": "0.45.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.0",
-    "@sentry/node": "^7.49.0",
+    "@babel/cli": "^7.21.5",
+    "@sentry/node": "^7.50.0",
     "@types/express": "^4.17.17",
-    "@types/node": "~18.16.1",
+    "@types/node": "~18.16.3",
     "@types/proper-lockfile": "^4.1.2",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.4",
@@ -362,6 +362,36 @@
         "default": "./_cjs/instrument.cjs"
       }
     },
+    "./logger/jsonLogger": {
+      "import": {
+        "types": "./dist/logger/jsonLogger.d.ts",
+        "default": "./dist/logger/jsonLogger.js"
+      },
+      "require": {
+        "types": "./dist/logger/jsonLogger.d.ts",
+        "default": "./_cjs/logger/jsonLogger.cjs"
+      }
+    },
+    "./logger/logFmtLogger": {
+      "import": {
+        "types": "./dist/logger/logFmtLogger.d.ts",
+        "default": "./dist/logger/logFmtLogger.js"
+      },
+      "require": {
+        "types": "./dist/logger/logFmtLogger.d.ts",
+        "default": "./_cjs/logger/logFmtLogger.cjs"
+      }
+    },
+    "./logger/shared": {
+      "import": {
+        "types": "./dist/logger/shared.d.ts",
+        "default": "./dist/logger/shared.js"
+      },
+      "require": {
+        "types": "./dist/logger/shared.d.ts",
+        "default": "./_cjs/logger/shared.cjs"
+      }
+    },
     "./rateLimit": {
       "import": {
         "types": "./dist/rateLimit.d.ts",