ff-serv 0.0.2 → 0.1.1

package/dist/index.cjs

@@ -58,7 +58,8 @@ var LoggerType;
   function create(params) {
     const logger = (0, import_pino.default)(
       {
-        level: params?.level ?? "info",
+        level: "trace",
+        // Level is managed by Effect, so we set the lowest here
         serializers: {
           error: import_pino.default.stdSerializers.errWithCause,
           err: import_pino.default.stdSerializers.errWithCause
@@ -79,7 +80,7 @@ var LoggerType;
   }
   LoggerType2.is = is;
 })(LoggerType || (LoggerType = {}));
-var createInstance = import_effect.Effect.fn(function* (params) {
+var createInstance = (params) => import_effect.Effect.gen(function* () {
   const isDev = import_effect.Option.getOrNull(
     yield* import_effect.Config.boolean("DEV").pipe(import_effect.Config.option)
   );
@@ -104,71 +105,135 @@ var createInstance = import_effect.Effect.fn(function* (params) {
     }
   });
 });
-var tag = "ff-serv/logger";
-var Logger = class _Logger extends import_effect.Effect.Service()(tag, {
-  effect: createInstance()
-}) {
-  static create(params) {
-    return _Logger.make(LoggerType.create(params));
+function extractParams(...[obj, msg]) {
+  if (typeof obj === "string") {
+    return { message: obj };
   }
-  static layer = (params) => import_effect.Layer.effect(
-    _Logger,
+  return { message: msg, attributes: obj };
+}
+function callPino({
+  annotations,
+  message
+}, call) {
+  const entries = import_effect.HashMap.toEntries(annotations);
+  if (entries.length > 0) {
+    return call(Object.fromEntries(entries), String(message));
+  }
+  return call(String(message));
+}
+var PinoCtx;
+((PinoCtx2) => {
+  const tag = "ff-serv/Pino";
+  function is(obj) {
+    return typeof obj === "object" && obj != null && "_tag" in obj && obj._tag === tag;
+  }
+  PinoCtx2.is = is;
+  function create(pino2) {
+    return {
+      _tag: tag,
+      pino: pino2,
+      effectLogger: import_effect.Logger.make(({ logLevel, ...input }) => {
+        switch (logLevel) {
+          case import_effect.LogLevel.Info:
+            return callPino(input, pino2.info);
+          case import_effect.LogLevel.Debug:
+            return callPino(input, pino2.debug);
+          case import_effect.LogLevel.Warning:
+            return callPino(input, pino2.warn);
+          case import_effect.LogLevel.Error:
+          case import_effect.LogLevel.Fatal:
+            return callPino(input, pino2.error);
+          default:
+            return callPino(input, pino2.info);
+        }
+      })
+    };
+  }
+  PinoCtx2.create = create;
+})(PinoCtx || (PinoCtx = {}));
+var Pino = class extends import_effect.Context.Tag("ff-serv/Pino")() {
+};
+var Logger;
+((Logger2) => {
+  Logger2.layer = (opts) => import_effect.Logger.replaceEffect(
+    import_effect.Logger.defaultLogger,
     import_effect.Effect.gen(function* () {
-      return _Logger.make(yield* createInstance(params));
+      return (yield* Pino).effectLogger;
     })
+  ).pipe(
+    import_effect.Layer.provideMerge(
+      import_effect.Layer.effect(
+        Pino,
+        import_effect.Effect.gen(function* () {
+          return PinoCtx.create(yield* createInstance(opts));
+        })
+      )
+    )
   );
-  //
-  static get = import_effect.Effect.fn(function* () {
-    const logger = yield* import_effect.Effect.serviceOption(_Logger);
-    if (import_effect.Option.isNone(logger)) return void 0;
-    return logger.value;
+  Logger2.Default = (0, Logger2.layer)();
+  Logger2.sync = () => import_effect.Effect.gen(function* () {
+    const pino2 = yield* Pino;
+    const runtime = import_effect.ManagedRuntime.make(
+      import_effect.Logger.replace(import_effect.Logger.defaultLogger, pino2.effectLogger)
+    );
+    return {
+      info: (...params) => Logger2.info(...params).pipe((e) => runtime.runSync(e)),
+      debug: (...params) => Logger2.debug(...params).pipe((e) => runtime.runSync(e)),
+      warn: (...params) => Logger2.warn(...params).pipe((e) => runtime.runSync(e)),
+      error: (...params) => Logger2.error(...params).pipe((e) => runtime.runSync(e))
+    };
   });
-  static replace = (logger) => (e) => {
-    if (logger == null) return e;
-    if (logger instanceof _Logger)
-      return import_effect.Effect.provideService(e, _Logger, logger);
-    if (LoggerType.is(logger)) {
-      return import_effect.Effect.provideService(e, _Logger, _Logger.make(logger));
-    }
-    return import_effect.Effect.provideService(
+  Logger2.get = () => Logger2.sync();
+  Logger2.replace = (logger) => (e) => import_effect.Effect.gen(function* () {
+    const oldPinoCtx = yield* Pino;
+    const pino2 = LoggerType.is(logger) ? logger : LoggerType.fromPino(logger);
+    const pinoCtx = PinoCtx.create(pino2);
+    return yield* import_effect.Effect.provide(
       e,
-      _Logger,
-      _Logger.make(LoggerType.fromPino(logger))
+      import_effect.Layer.mergeAll(
+        import_effect.Logger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger),
+        import_effect.Layer.succeed(Pino, pinoCtx)
+      )
     );
-  };
-  static replaceChild = (...params) => (e) => import_effect.Effect.gen(function* () {
-    const logger = yield* _Logger.get();
-    if (logger == null) return yield* e;
-    const child = logger.child(...params);
-    return yield* import_effect.Effect.provideService(e, _Logger, _Logger.make(child));
   });
-  // --
-  static info = import_effect.Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.info(...params);
+  Logger2.replaceChild = (...params) => (e) => import_effect.Effect.gen(function* () {
+    const oldPinoCtx = yield* Pino;
+    const pino2 = oldPinoCtx.pino.child(...params);
+    const pinoCtx = PinoCtx.create(pino2);
+    return yield* import_effect.Effect.provide(
+      import_effect.Effect.provide(
+        e,
+        import_effect.Logger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger)
+      ),
+      import_effect.Layer.succeed(Pino, pinoCtx)
+    );
   });
-  static debug = import_effect.Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.debug(...params);
+  Logger2.info = (...params) => import_effect.Effect.gen(function* () {
+    const { message, attributes } = extractParams(...params);
+    yield* import_effect.Effect.logInfo(message).pipe(
+      attributes ? import_effect.Effect.annotateLogs(attributes) : (e) => e
+    );
   });
-  static warn = import_effect.Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.warn(...params);
+  Logger2.debug = (...params) => import_effect.Effect.gen(function* () {
+    const { message, attributes } = extractParams(...params);
+    yield* import_effect.Effect.logDebug(message).pipe(
+      attributes ? import_effect.Effect.annotateLogs(attributes) : (e) => e
+    );
   });
-  static error = import_effect.Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.error(...params);
+  Logger2.warn = (...params) => import_effect.Effect.gen(function* () {
+    const { message, attributes } = extractParams(...params);
+    yield* import_effect.Effect.logWarning(message).pipe(
+      attributes ? import_effect.Effect.annotateLogs(attributes) : (e) => e
+    );
   });
-  static flush = import_effect.Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.flush(...params);
+  Logger2.error = (...params) => import_effect.Effect.gen(function* () {
+    const { message, attributes } = extractParams(...params);
+    yield* import_effect.Effect.logError(message).pipe(
+      attributes ? import_effect.Effect.annotateLogs(attributes) : (e) => e
+    );
   });
-};
+  Logger2.flush = (..._params) => import_effect.Effect.void;
+})(Logger || (Logger = {}));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Logger

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/logger.ts"],"sourcesContent":["export { Logger } from './logger.js';\n","import { Config, Effect, Layer, Option } from 'effect';\nimport pino from 'pino';\n\n// Base logger\n\nnamespace LoggerType {\n\texport function fromPino(x: pino.Logger<never, boolean>) {\n\t\treturn {\n\t\t\tinfo: x.info.bind(x),\n\t\t\terror: x.error.bind(x),\n\t\t\twarn: x.warn.bind(x),\n\t\t\tdebug: x.debug.bind(x),\n\t\t\tchild: (...params: Parameters<typeof x.child>) => {\n\t\t\t\treturn fromPino(\n\t\t\t\t\tx.child(...params) as unknown as pino.Logger<never, boolean>,\n\t\t\t\t);\n\t\t\t},\n\t\t\tflush: x.flush.bind(x),\n\t\t\t_pino: x,\n\t\t};\n\t}\n\n\texport type CreateParams = {\n\t\tlevel?: pino.Level;\n\t\tstream?: pino.DestinationStream;\n\t};\n\n\texport function create(params?: CreateParams) {\n\t\tconst logger = pino(\n\t\t\t{\n\t\t\t\tlevel: params?.level ?? 'info',\n\t\t\t\tserializers: {\n\t\t\t\t\terror: pino.stdSerializers.errWithCause,\n\t\t\t\t\terr: pino.stdSerializers.errWithCause,\n\t\t\t\t},\n\t\t\t\tformatters: {\n\t\t\t\t\tlevel: (label) => {\n\t\t\t\t\t\treturn { level: label };\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t},\n\t\t\tparams?.stream,\n\t\t);\n\t\treturn fromPino(logger);\n\t}\n\n\texport function is(x: object): x is LoggerType {\n\t\treturn '_pino' in x;\n\t}\n}\ntype LoggerType = ReturnType<typeof LoggerType.create>;\n\n// Effect service\nconst createInstance = Effect.fn(function* (params?: LoggerType.CreateParams) {\n\tconst isDev = Option.getOrNull(\n\t\tyield* Config.boolean('DEV').pipe(Config.option),\n\t);\n\tconst logFile = Option.getOrNull(\n\t\tyield* Config.boolean('LOGGER_LOGFILE').pipe(Config.option),\n\t);\n\n\treturn LoggerType.create({\n\t\t...params,\n\t\t...(isDev && {\n\t\t\tstream: logFile\n\t\t\t\t? pino.transport({\n\t\t\t\t\t\ttarget: 'pino/file',\n\t\t\t\t\t\toptions: {\n\t\t\t\t\t\t\tdestination: './logs/server.log',\n\t\t\t\t\t\t\tmkdir: true,\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t: pino.transport({\n\t\t\t\t\t\ttarget: 'pino-pretty',\n\t\t\t\t\t\toptions: {\n\t\t\t\t\t\t\tignore: 'pid,hostname',\n\t\t\t\t\t\t},\n\t\t\t\t\t}),\n\t\t}),\n\t});\n});\n\nconst tag = 'ff-serv/logger' as const;\nexport class Logger extends Effect.Service<Logger>()(tag, {\n\teffect: createInstance(),\n}) {\n\tstatic create(params?: LoggerType.CreateParams) {\n\t\treturn Logger.make(LoggerType.create(params));\n\t}\n\n\tstatic layer = (params?: Parameters<typeof createInstance>[0]) =>\n\t\tLayer.effect(\n\t\t\tLogger,\n\t\t\tEffect.gen(function* () {\n\t\t\t\treturn Logger.make(yield* createInstance(params));\n\t\t\t}),\n\t\t);\n\n\t//\n\n\tstatic get = Effect.fn(function* () {\n\t\tconst logger = yield* Effect.serviceOption(Logger);\n\t\tif (Option.isNone(logger)) return undefined;\n\t\treturn logger.value;\n\t});\n\n\tstatic replace =\n\t\t(logger: Logger | LoggerType | pino.Logger | undefined) =>\n\t\t<A, E, R>(e: Effect.Effect<A, E, R>) => {\n\t\t\tif (logger == null) return e;\n\t\t\tif (logger instanceof Logger)\n\t\t\t\treturn Effect.provideService(e, Logger, logger);\n\n\t\t\tif (LoggerType.is(logger)) {\n\t\t\t\treturn Effect.provideService(e, Logger, Logger.make(logger));\n\t\t\t}\n\n\t\t\treturn Effect.provideService(\n\t\t\t\te,\n\t\t\t\tLogger,\n\t\t\t\tLogger.make(LoggerType.fromPino(logger)),\n\t\t\t);\n\t\t};\n\n\tstatic replaceChild =\n\t\t(...params: Parameters<LoggerType['child']>) =>\n\t\t<A, E, R>(e: Effect.Effect<A, E, R>) =>\n\t\t\tEffect.gen(function* () {\n\t\t\t\tconst logger = yield* Logger.get();\n\t\t\t\tif (logger == null) return yield* e;\n\n\t\t\t\tconst child = logger.child(...params);\n\t\t\t\treturn yield* Effect.provideService(e, Logger, Logger.make(child));\n\t\t\t});\n\n\t// --\n\n\tstatic info = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['info']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.info(...params);\n\t});\n\n\tstatic debug = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['debug']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.debug(...params);\n\t});\n\n\tstatic warn = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['warn']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.warn(...params);\n\t});\n\n\tstatic error = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['error']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.error(...params);\n\t});\n\n\tstatic flush = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['flush']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.flush(...params);\n\t});\n}\n"],"mappings":"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","names":["LoggerType","pino"]}
+{"version":3,"sources":["../src/index.ts","../src/logger.ts"],"sourcesContent":["export { Logger } from './logger.js';\n","import {\n\tConfig,\n\tContext,\n\tEffect,\n\tLogger as EffectLogger,\n\tHashMap,\n\tLayer,\n\tLogLevel,\n\tManagedRuntime,\n\tOption,\n} from 'effect';\nimport pino from 'pino';\n\n// Pino Instance\n\nnamespace LoggerType {\n\texport function fromPino(x: pino.Logger<never, boolean>) {\n\t\treturn {\n\t\t\tinfo: x.info.bind(x),\n\t\t\terror: x.error.bind(x),\n\t\t\twarn: x.warn.bind(x),\n\t\t\tdebug: x.debug.bind(x),\n\t\t\tchild: (...params: Parameters<typeof x.child>) => {\n\t\t\t\treturn fromPino(\n\t\t\t\t\tx.child(...params) as unknown as pino.Logger<never, boolean>,\n\t\t\t\t);\n\t\t\t},\n\t\t\tflush: x.flush.bind(x),\n\t\t\t_pino: x,\n\t\t};\n\t}\n\n\texport type CreateParams = {\n\t\tstream?: pino.DestinationStream;\n\t};\n\n\texport function create(params?: CreateParams) {\n\t\tconst logger = pino(\n\t\t\t{\n\t\t\t\tlevel: 'trace', // Level is managed by Effect, so we set the lowest here\n\t\t\t\tserializers: {\n\t\t\t\t\terror: pino.stdSerializers.errWithCause,\n\t\t\t\t\terr: pino.stdSerializers.errWithCause,\n\t\t\t\t},\n\t\t\t\tformatters: {\n\t\t\t\t\tlevel: (label) => {\n\t\t\t\t\t\treturn { level: label };\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t},\n\t\t\tparams?.stream,\n\t\t);\n\t\treturn fromPino(logger);\n\t}\n\n\texport type Type = ReturnType<typeof LoggerType.create>;\n\n\texport function is(x: object): x is Type {\n\t\treturn '_pino' in x;\n\t}\n}\ntype LoggerType = LoggerType.Type;\n\n// The Gist\n\nconst createInstance = (params?: LoggerType.CreateParams) =>\n\tEffect.gen(function* () {\n\t\tconst isDev = Option.getOrNull(\n\t\t\tyield* Config.boolean('DEV').pipe(Config.option),\n\t\t);\n\t\tconst logFile = Option.getOrNull(\n\t\t\tyield* Config.boolean('LOGGER_LOGFILE').pipe(Config.option),\n\t\t);\n\n\t\treturn LoggerType.create({\n\t\t\t...params,\n\t\t\t...(isDev && {\n\t\t\t\tstream: logFile\n\t\t\t\t\t? pino.transport({\n\t\t\t\t\t\t\ttarget: 'pino/file',\n\t\t\t\t\t\t\toptions: {\n\t\t\t\t\t\t\t\tdestination: './logs/server.log',\n\t\t\t\t\t\t\t\tmkdir: true,\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t})\n\t\t\t\t\t: pino.transport({\n\t\t\t\t\t\t\ttarget: 'pino-pretty',\n\t\t\t\t\t\t\toptions: {\n\t\t\t\t\t\t\t\tignore: 'pid,hostname',\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t}),\n\t\t\t}),\n\t\t});\n\t});\n\n// Pino Context and Effect Logger integration\n\ntype LogParams = [obj: unknown, msg?: string];\nfunction extractParams(...[obj, msg]: LogParams) {\n\tif (typeof obj === 'string') {\n\t\treturn { message: obj };\n\t}\n\treturn { message: msg, attributes: obj as Record<string, any> };\n}\n\n/** A simple helper for calling pino log functions */\nfunction callPino(\n\t{\n\t\tannotations,\n\t\tmessage,\n\t}: Pick<EffectLogger.Logger.Options<unknown>, 'annotations' | 'message'>,\n\tcall: (...params: [obj: unknown, msg?: string]) => void,\n) {\n\tconst entries = HashMap.toEntries(annotations);\n\tif (entries.length > 0) {\n\t\treturn call(Object.fromEntries(entries), String(message));\n\t}\n\n\treturn call(String(message));\n}\n\nnamespace PinoCtx {\n\tconst tag = 'ff-serv/Pino';\n\texport type Type = ReturnType<typeof create>;\n\n\texport function is(obj: unknown): obj is Type {\n\t\treturn (\n\t\t\ttypeof obj === 'object' &&\n\t\t\tobj != null &&\n\t\t\t'_tag' in obj &&\n\t\t\tobj._tag === tag\n\t\t);\n\t}\n\n\texport function create(pino: LoggerType) {\n\t\treturn {\n\t\t\t_tag: tag,\n\t\t\tpino,\n\t\t\teffectLogger: EffectLogger.make(({ logLevel, ...input }) => {\n\t\t\t\tswitch (logLevel) {\n\t\t\t\t\tcase LogLevel.Info:\n\t\t\t\t\t\treturn callPino(input, pino.info);\n\t\t\t\t\tcase LogLevel.Debug:\n\t\t\t\t\t\treturn callPino(input, pino.debug);\n\t\t\t\t\tcase LogLevel.Warning:\n\t\t\t\t\t\treturn callPino(input, pino.warn);\n\t\t\t\t\tcase LogLevel.Error:\n\t\t\t\t\tcase LogLevel.Fatal:\n\t\t\t\t\t\treturn callPino(input, pino.error);\n\t\t\t\t\tdefault:\n\t\t\t\t\t\treturn callPino(input, pino.info);\n\t\t\t\t}\n\t\t\t}),\n\t\t};\n\t}\n}\ntype PinoCtx = PinoCtx.Type;\n\nclass Pino extends Context.Tag('ff-serv/Pino')<Pino, PinoCtx>() {}\n\n// Facade\n\nexport namespace Logger {\n\texport const layer = (opts?: Parameters<typeof createInstance>[0]) =>\n\t\tEffectLogger.replaceEffect(\n\t\t\tEffectLogger.defaultLogger,\n\t\t\tEffect.gen(function* () {\n\t\t\t\treturn (yield* Pino).effectLogger;\n\t\t\t}),\n\t\t).pipe(\n\t\t\tLayer.provideMerge(\n\t\t\t\tLayer.effect(\n\t\t\t\t\tPino,\n\t\t\t\t\tEffect.gen(function* () {\n\t\t\t\t\t\treturn PinoCtx.create(yield* createInstance(opts));\n\t\t\t\t\t}),\n\t\t\t\t),\n\t\t\t),\n\t\t);\n\n\texport const Default = layer();\n\n\t//\n\n\texport const sync = () =>\n\t\tEffect.gen(function* () {\n\t\t\tconst pino = yield* Pino;\n\t\t\tconst runtime = ManagedRuntime.make(\n\t\t\t\tEffectLogger.replace(EffectLogger.defaultLogger, pino.effectLogger),\n\t\t\t);\n\t\t\treturn {\n\t\t\t\tinfo: (...params: Parameters<typeof Logger.info>) =>\n\t\t\t\t\tLogger.info(...params).pipe((e) => runtime.runSync(e)),\n\t\t\t\tdebug: (...params: Parameters<typeof Logger.debug>) =>\n\t\t\t\t\tLogger.debug(...params).pipe((e) => runtime.runSync(e)),\n\t\t\t\twarn: (...params: Parameters<typeof Logger.warn>) =>\n\t\t\t\t\tLogger.warn(...params).pipe((e) => runtime.runSync(e)),\n\t\t\t\terror: (...params: Parameters<typeof Logger.error>) =>\n\t\t\t\t\tLogger.error(...params).pipe((e) => runtime.runSync(e)),\n\t\t\t};\n\t\t});\n\n\t/** @deprecated — will be renamed to `sync` */\n\texport const get = () => Logger.sync();\n\n\texport const replace =\n\t\t(logger: LoggerType | pino.Logger) =>\n\t\t<A, E, R>(e: Effect.Effect<A, E, R>) =>\n\t\t\tEffect.gen(function* () {\n\t\t\t\tconst oldPinoCtx = yield* Pino;\n\t\t\t\tconst pino = LoggerType.is(logger)\n\t\t\t\t\t? logger\n\t\t\t\t\t: LoggerType.fromPino(logger);\n\t\t\t\tconst pinoCtx = PinoCtx.create(pino);\n\n\t\t\t\treturn yield* Effect.provide(\n\t\t\t\t\te,\n\t\t\t\t\tLayer.mergeAll(\n\t\t\t\t\t\tEffectLogger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger),\n\t\t\t\t\t\tLayer.succeed(Pino, pinoCtx),\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t});\n\n\texport const replaceChild =\n\t\t(...params: Parameters<LoggerType['child']>) =>\n\t\t<A, E, R>(e: Effect.Effect<A, E, R>) =>\n\t\t\tEffect.gen(function* () {\n\t\t\t\tconst oldPinoCtx = yield* Pino;\n\t\t\t\tconst pino = oldPinoCtx.pino.child(...params);\n\t\t\t\tconst pinoCtx = PinoCtx.create(pino);\n\n\t\t\t\treturn yield* Effect.provide(\n\t\t\t\t\tEffect.provide(\n\t\t\t\t\t\te,\n\t\t\t\t\t\tEffectLogger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger),\n\t\t\t\t\t),\n\t\t\t\t\tLayer.succeed(Pino, pinoCtx),\n\t\t\t\t);\n\t\t\t});\n\n\t// --\n\n\texport const info = (...params: LogParams) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst { message, attributes } = extractParams(...params);\n\t\t\tyield* Effect.logInfo(message).pipe(\n\t\t\t\tattributes ? Effect.annotateLogs(attributes) : (e) => e,\n\t\t\t);\n\t\t});\n\n\texport const debug = (...params: LogParams) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst { message, attributes } = extractParams(...params);\n\t\t\tyield* Effect.logDebug(message).pipe(\n\t\t\t\tattributes ? Effect.annotateLogs(attributes) : (e) => e,\n\t\t\t);\n\t\t});\n\n\texport const warn = (...params: LogParams) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst { message, attributes } = extractParams(...params);\n\t\t\tyield* Effect.logWarning(message).pipe(\n\t\t\t\tattributes ? Effect.annotateLogs(attributes) : (e) => e,\n\t\t\t);\n\t\t});\n\n\texport const error = (...params: LogParams) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst { message, attributes } = extractParams(...params);\n\t\t\tyield* Effect.logError(message).pipe(\n\t\t\t\tattributes ? Effect.annotateLogs(attributes) : (e) => e,\n\t\t\t);\n\t\t});\n\n\t/** @deprecated */\n\texport const flush = (..._params: Parameters<LoggerType['flush']>) =>\n\t\tEffect.void;\n}\n"],"mappings":"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","names":["LoggerType","pino","PinoCtx","EffectLogger","Logger"]}

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as effect_ConfigError from 'effect/ConfigError';
-import { Effect, Layer } from 'effect';
+import { Effect, Layer, Context, Logger as Logger$1 } from 'effect';
 import pino from 'pino';
 
 declare namespace LoggerType {
@@ -13,7 +13,6 @@ declare namespace LoggerType {
         _pino: pino.Logger<never, boolean>;
     };
     type CreateParams = {
-        level?: pino.Level;
         stream?: pino.DestinationStream;
     };
     function create(params?: CreateParams): {
@@ -25,10 +24,11 @@ declare namespace LoggerType {
         flush: (cb?: (err?: Error) => void) => void;
         _pino: pino.Logger<never, boolean>;
     };
-    function is(x: object): x is LoggerType;
+    type Type = ReturnType<typeof LoggerType.create>;
+    function is(x: object): x is Type;
 }
-type LoggerType = ReturnType<typeof LoggerType.create>;
-declare const createInstance: (params?: LoggerType.CreateParams | undefined) => Effect.Effect<{
+type LoggerType = LoggerType.Type;
+declare const createInstance: (params?: LoggerType.CreateParams) => Effect.Effect<{
     info: pino.LogFn;
     error: pino.LogFn;
     warn: pino.LogFn;
@@ -37,8 +37,10 @@ declare const createInstance: (params?: LoggerType.CreateParams | undefined) =>
     flush: (cb?: (err?: Error) => void) => void;
     _pino: pino.Logger<never, boolean>;
 }, effect_ConfigError.ConfigError, never>;
-declare const Logger_base: Effect.Service.Class<Logger, "ff-serv/logger", {
-    readonly effect: Effect.Effect<{
+type LogParams = [obj: unknown, msg?: string];
+declare const Pino_base: Context.TagClass<Pino, "ff-serv/Pino", {
+    _tag: string;
+    pino: {
         info: pino.LogFn;
         error: pino.LogFn;
         warn: pino.LogFn;
@@ -46,19 +48,35 @@ declare const Logger_base: Effect.Service.Class<Logger, "ff-serv/logger", {
         child: (bindings: pino.Bindings, options?: pino.ChildLoggerOptions<string> | undefined) => /*elided*/ any;
         flush: (cb?: (err?: Error) => void) => void;
         _pino: pino.Logger<never, boolean>;
-    }, effect_ConfigError.ConfigError, never>;
+    };
+    effectLogger: Logger$1.Logger<unknown, void>;
 }>;
-declare class Logger extends Logger_base {
-    static create(params?: LoggerType.CreateParams): Logger;
-    static layer: (params?: Parameters<typeof createInstance>[0]) => Layer.Layer<Logger, effect_ConfigError.ConfigError, never>;
-    static get: () => Effect.Effect<Logger | undefined, never, never>;
-    static replace: (logger: Logger | LoggerType | pino.Logger | undefined) => <A, E, R>(e: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
-    static replaceChild: (...params: Parameters<LoggerType["child"]>) => <A, E, R>(e: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
-    static info: (obj: unknown, msg?: string | undefined, ...args: unknown[]) => Effect.Effect<void, never, never>;
-    static debug: (obj: unknown, msg?: string | undefined, ...args: unknown[]) => Effect.Effect<void, never, never>;
-    static warn: (obj: unknown, msg?: string | undefined, ...args: unknown[]) => Effect.Effect<void, never, never>;
-    static error: (obj: unknown, msg?: string | undefined, ...args: unknown[]) => Effect.Effect<void, never, never>;
-    static flush: (cb?: ((err?: Error) => void) | undefined) => Effect.Effect<void, never, never>;
+declare class Pino extends Pino_base {
+}
+declare namespace Logger {
+    const layer: (opts?: Parameters<typeof createInstance>[0]) => Layer.Layer<Pino, effect_ConfigError.ConfigError, never>;
+    const Default: Layer.Layer<Pino, effect_ConfigError.ConfigError, never>;
+    const sync: () => Effect.Effect<{
+        info: (obj: unknown, msg?: string | undefined) => void;
+        debug: (obj: unknown, msg?: string | undefined) => void;
+        warn: (obj: unknown, msg?: string | undefined) => void;
+        error: (obj: unknown, msg?: string | undefined) => void;
+    }, never, Pino>;
+    /** @deprecated — will be renamed to `sync` */
+    const get: () => Effect.Effect<{
+        info: (obj: unknown, msg?: string | undefined) => void;
+        debug: (obj: unknown, msg?: string | undefined) => void;
+        warn: (obj: unknown, msg?: string | undefined) => void;
+        error: (obj: unknown, msg?: string | undefined) => void;
+    }, never, Pino>;
+    const replace: (logger: LoggerType | pino.Logger) => <A, E, R>(e: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Pino | Exclude<R, Pino>>;
+    const replaceChild: (...params: Parameters<LoggerType["child"]>) => <A, E, R>(e: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Pino | Exclude<Exclude<R, never>, Pino>>;
+    const info: (...params: LogParams) => Effect.Effect<void, never, never>;
+    const debug: (...params: LogParams) => Effect.Effect<void, never, never>;
+    const warn: (...params: LogParams) => Effect.Effect<void, never, never>;
+    const error: (...params: LogParams) => Effect.Effect<void, never, never>;
+    /** @deprecated */
+    const flush: (..._params: Parameters<LoggerType["flush"]>) => Effect.Effect<void, never, never>;
 }
 
 export { Logger };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as effect_ConfigError from 'effect/ConfigError';
-import { Effect, Layer } from 'effect';
+import { Effect, Layer, Context, Logger as Logger$1 } from 'effect';
 import pino from 'pino';
 
 declare namespace LoggerType {
@@ -13,7 +13,6 @@ declare namespace LoggerType {
         _pino: pino.Logger<never, boolean>;
     };
     type CreateParams = {
-        level?: pino.Level;
         stream?: pino.DestinationStream;
     };
     function create(params?: CreateParams): {
@@ -25,10 +24,11 @@ declare namespace LoggerType {
         flush: (cb?: (err?: Error) => void) => void;
         _pino: pino.Logger<never, boolean>;
     };
-    function is(x: object): x is LoggerType;
+    type Type = ReturnType<typeof LoggerType.create>;
+    function is(x: object): x is Type;
 }
-type LoggerType = ReturnType<typeof LoggerType.create>;
-declare const createInstance: (params?: LoggerType.CreateParams | undefined) => Effect.Effect<{
+type LoggerType = LoggerType.Type;
+declare const createInstance: (params?: LoggerType.CreateParams) => Effect.Effect<{
     info: pino.LogFn;
     error: pino.LogFn;
     warn: pino.LogFn;
@@ -37,8 +37,10 @@ declare const createInstance: (params?: LoggerType.CreateParams | undefined) =>
     flush: (cb?: (err?: Error) => void) => void;
     _pino: pino.Logger<never, boolean>;
 }, effect_ConfigError.ConfigError, never>;
-declare const Logger_base: Effect.Service.Class<Logger, "ff-serv/logger", {
-    readonly effect: Effect.Effect<{
+type LogParams = [obj: unknown, msg?: string];
+declare const Pino_base: Context.TagClass<Pino, "ff-serv/Pino", {
+    _tag: string;
+    pino: {
         info: pino.LogFn;
         error: pino.LogFn;
         warn: pino.LogFn;
@@ -46,19 +48,35 @@ declare const Logger_base: Effect.Service.Class<Logger, "ff-serv/logger", {
         child: (bindings: pino.Bindings, options?: pino.ChildLoggerOptions<string> | undefined) => /*elided*/ any;
         flush: (cb?: (err?: Error) => void) => void;
         _pino: pino.Logger<never, boolean>;
-    }, effect_ConfigError.ConfigError, never>;
+    };
+    effectLogger: Logger$1.Logger<unknown, void>;
 }>;
-declare class Logger extends Logger_base {
-    static create(params?: LoggerType.CreateParams): Logger;
-    static layer: (params?: Parameters<typeof createInstance>[0]) => Layer.Layer<Logger, effect_ConfigError.ConfigError, never>;
-    static get: () => Effect.Effect<Logger | undefined, never, never>;
-    static replace: (logger: Logger | LoggerType | pino.Logger | undefined) => <A, E, R>(e: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
-    static replaceChild: (...params: Parameters<LoggerType["child"]>) => <A, E, R>(e: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
-    static info: (obj: unknown, msg?: string | undefined, ...args: unknown[]) => Effect.Effect<void, never, never>;
-    static debug: (obj: unknown, msg?: string | undefined, ...args: unknown[]) => Effect.Effect<void, never, never>;
-    static warn: (obj: unknown, msg?: string | undefined, ...args: unknown[]) => Effect.Effect<void, never, never>;
-    static error: (obj: unknown, msg?: string | undefined, ...args: unknown[]) => Effect.Effect<void, never, never>;
-    static flush: (cb?: ((err?: Error) => void) | undefined) => Effect.Effect<void, never, never>;
+declare class Pino extends Pino_base {
+}
+declare namespace Logger {
+    const layer: (opts?: Parameters<typeof createInstance>[0]) => Layer.Layer<Pino, effect_ConfigError.ConfigError, never>;
+    const Default: Layer.Layer<Pino, effect_ConfigError.ConfigError, never>;
+    const sync: () => Effect.Effect<{
+        info: (obj: unknown, msg?: string | undefined) => void;
+        debug: (obj: unknown, msg?: string | undefined) => void;
+        warn: (obj: unknown, msg?: string | undefined) => void;
+        error: (obj: unknown, msg?: string | undefined) => void;
+    }, never, Pino>;
+    /** @deprecated — will be renamed to `sync` */
+    const get: () => Effect.Effect<{
+        info: (obj: unknown, msg?: string | undefined) => void;
+        debug: (obj: unknown, msg?: string | undefined) => void;
+        warn: (obj: unknown, msg?: string | undefined) => void;
+        error: (obj: unknown, msg?: string | undefined) => void;
+    }, never, Pino>;
+    const replace: (logger: LoggerType | pino.Logger) => <A, E, R>(e: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Pino | Exclude<R, Pino>>;
+    const replaceChild: (...params: Parameters<LoggerType["child"]>) => <A, E, R>(e: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Pino | Exclude<Exclude<R, never>, Pino>>;
+    const info: (...params: LogParams) => Effect.Effect<void, never, never>;
+    const debug: (...params: LogParams) => Effect.Effect<void, never, never>;
+    const warn: (...params: LogParams) => Effect.Effect<void, never, never>;
+    const error: (...params: LogParams) => Effect.Effect<void, never, never>;
+    /** @deprecated */
+    const flush: (..._params: Parameters<LoggerType["flush"]>) => Effect.Effect<void, never, never>;
 }
 
 export { Logger };

package/dist/index.js

@@ -1,5 +1,15 @@
 // src/logger.ts
-import { Config, Effect, Layer, Option } from "effect";
+import {
+  Config,
+  Context,
+  Effect,
+  Logger as EffectLogger,
+  HashMap,
+  Layer,
+  LogLevel,
+  ManagedRuntime,
+  Option
+} from "effect";
 import pino from "pino";
 var LoggerType;
 ((LoggerType2) => {
@@ -22,7 +32,8 @@ var LoggerType;
   function create(params) {
     const logger = pino(
       {
-        level: params?.level ?? "info",
+        level: "trace",
+        // Level is managed by Effect, so we set the lowest here
         serializers: {
           error: pino.stdSerializers.errWithCause,
           err: pino.stdSerializers.errWithCause
@@ -43,7 +54,7 @@ var LoggerType;
   }
   LoggerType2.is = is;
 })(LoggerType || (LoggerType = {}));
-var createInstance = Effect.fn(function* (params) {
+var createInstance = (params) => Effect.gen(function* () {
   const isDev = Option.getOrNull(
     yield* Config.boolean("DEV").pipe(Config.option)
   );
@@ -68,71 +79,135 @@ var createInstance = Effect.fn(function* (params) {
     }
   });
 });
-var tag = "ff-serv/logger";
-var Logger = class _Logger extends Effect.Service()(tag, {
-  effect: createInstance()
-}) {
-  static create(params) {
-    return _Logger.make(LoggerType.create(params));
+function extractParams(...[obj, msg]) {
+  if (typeof obj === "string") {
+    return { message: obj };
   }
-  static layer = (params) => Layer.effect(
-    _Logger,
+  return { message: msg, attributes: obj };
+}
+function callPino({
+  annotations,
+  message
+}, call) {
+  const entries = HashMap.toEntries(annotations);
+  if (entries.length > 0) {
+    return call(Object.fromEntries(entries), String(message));
+  }
+  return call(String(message));
+}
+var PinoCtx;
+((PinoCtx2) => {
+  const tag = "ff-serv/Pino";
+  function is(obj) {
+    return typeof obj === "object" && obj != null && "_tag" in obj && obj._tag === tag;
+  }
+  PinoCtx2.is = is;
+  function create(pino2) {
+    return {
+      _tag: tag,
+      pino: pino2,
+      effectLogger: EffectLogger.make(({ logLevel, ...input }) => {
+        switch (logLevel) {
+          case LogLevel.Info:
+            return callPino(input, pino2.info);
+          case LogLevel.Debug:
+            return callPino(input, pino2.debug);
+          case LogLevel.Warning:
+            return callPino(input, pino2.warn);
+          case LogLevel.Error:
+          case LogLevel.Fatal:
+            return callPino(input, pino2.error);
+          default:
+            return callPino(input, pino2.info);
+        }
+      })
+    };
+  }
+  PinoCtx2.create = create;
+})(PinoCtx || (PinoCtx = {}));
+var Pino = class extends Context.Tag("ff-serv/Pino")() {
+};
+var Logger;
+((Logger2) => {
+  Logger2.layer = (opts) => EffectLogger.replaceEffect(
+    EffectLogger.defaultLogger,
     Effect.gen(function* () {
-      return _Logger.make(yield* createInstance(params));
+      return (yield* Pino).effectLogger;
     })
+  ).pipe(
+    Layer.provideMerge(
+      Layer.effect(
+        Pino,
+        Effect.gen(function* () {
+          return PinoCtx.create(yield* createInstance(opts));
+        })
+      )
+    )
   );
-  //
-  static get = Effect.fn(function* () {
-    const logger = yield* Effect.serviceOption(_Logger);
-    if (Option.isNone(logger)) return void 0;
-    return logger.value;
+  Logger2.Default = (0, Logger2.layer)();
+  Logger2.sync = () => Effect.gen(function* () {
+    const pino2 = yield* Pino;
+    const runtime = ManagedRuntime.make(
+      EffectLogger.replace(EffectLogger.defaultLogger, pino2.effectLogger)
+    );
+    return {
+      info: (...params) => Logger2.info(...params).pipe((e) => runtime.runSync(e)),
+      debug: (...params) => Logger2.debug(...params).pipe((e) => runtime.runSync(e)),
+      warn: (...params) => Logger2.warn(...params).pipe((e) => runtime.runSync(e)),
+      error: (...params) => Logger2.error(...params).pipe((e) => runtime.runSync(e))
+    };
   });
-  static replace = (logger) => (e) => {
-    if (logger == null) return e;
-    if (logger instanceof _Logger)
-      return Effect.provideService(e, _Logger, logger);
-    if (LoggerType.is(logger)) {
-      return Effect.provideService(e, _Logger, _Logger.make(logger));
-    }
-    return Effect.provideService(
+  Logger2.get = () => Logger2.sync();
+  Logger2.replace = (logger) => (e) => Effect.gen(function* () {
+    const oldPinoCtx = yield* Pino;
+    const pino2 = LoggerType.is(logger) ? logger : LoggerType.fromPino(logger);
+    const pinoCtx = PinoCtx.create(pino2);
+    return yield* Effect.provide(
       e,
-      _Logger,
-      _Logger.make(LoggerType.fromPino(logger))
+      Layer.mergeAll(
+        EffectLogger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger),
+        Layer.succeed(Pino, pinoCtx)
+      )
     );
-  };
-  static replaceChild = (...params) => (e) => Effect.gen(function* () {
-    const logger = yield* _Logger.get();
-    if (logger == null) return yield* e;
-    const child = logger.child(...params);
-    return yield* Effect.provideService(e, _Logger, _Logger.make(child));
   });
-  // --
-  static info = Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.info(...params);
+  Logger2.replaceChild = (...params) => (e) => Effect.gen(function* () {
+    const oldPinoCtx = yield* Pino;
+    const pino2 = oldPinoCtx.pino.child(...params);
+    const pinoCtx = PinoCtx.create(pino2);
+    return yield* Effect.provide(
+      Effect.provide(
+        e,
+        EffectLogger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger)
+      ),
+      Layer.succeed(Pino, pinoCtx)
+    );
   });
-  static debug = Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.debug(...params);
+  Logger2.info = (...params) => Effect.gen(function* () {
+    const { message, attributes } = extractParams(...params);
+    yield* Effect.logInfo(message).pipe(
+      attributes ? Effect.annotateLogs(attributes) : (e) => e
+    );
   });
-  static warn = Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.warn(...params);
+  Logger2.debug = (...params) => Effect.gen(function* () {
+    const { message, attributes } = extractParams(...params);
+    yield* Effect.logDebug(message).pipe(
+      attributes ? Effect.annotateLogs(attributes) : (e) => e
+    );
   });
-  static error = Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.error(...params);
+  Logger2.warn = (...params) => Effect.gen(function* () {
+    const { message, attributes } = extractParams(...params);
+    yield* Effect.logWarning(message).pipe(
+      attributes ? Effect.annotateLogs(attributes) : (e) => e
+    );
   });
-  static flush = Effect.fn(function* (...params) {
-    const logger = yield* _Logger.get();
-    if (logger == null) return;
-    logger.flush(...params);
+  Logger2.error = (...params) => Effect.gen(function* () {
+    const { message, attributes } = extractParams(...params);
+    yield* Effect.logError(message).pipe(
+      attributes ? Effect.annotateLogs(attributes) : (e) => e
+    );
   });
-};
+  Logger2.flush = (..._params) => Effect.void;
+})(Logger || (Logger = {}));
 export {
   Logger
 };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/logger.ts"],"sourcesContent":["import { Config, Effect, Layer, Option } from 'effect';\nimport pino from 'pino';\n\n// Base logger\n\nnamespace LoggerType {\n\texport function fromPino(x: pino.Logger<never, boolean>) {\n\t\treturn {\n\t\t\tinfo: x.info.bind(x),\n\t\t\terror: x.error.bind(x),\n\t\t\twarn: x.warn.bind(x),\n\t\t\tdebug: x.debug.bind(x),\n\t\t\tchild: (...params: Parameters<typeof x.child>) => {\n\t\t\t\treturn fromPino(\n\t\t\t\t\tx.child(...params) as unknown as pino.Logger<never, boolean>,\n\t\t\t\t);\n\t\t\t},\n\t\t\tflush: x.flush.bind(x),\n\t\t\t_pino: x,\n\t\t};\n\t}\n\n\texport type CreateParams = {\n\t\tlevel?: pino.Level;\n\t\tstream?: pino.DestinationStream;\n\t};\n\n\texport function create(params?: CreateParams) {\n\t\tconst logger = pino(\n\t\t\t{\n\t\t\t\tlevel: params?.level ?? 'info',\n\t\t\t\tserializers: {\n\t\t\t\t\terror: pino.stdSerializers.errWithCause,\n\t\t\t\t\terr: pino.stdSerializers.errWithCause,\n\t\t\t\t},\n\t\t\t\tformatters: {\n\t\t\t\t\tlevel: (label) => {\n\t\t\t\t\t\treturn { level: label };\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t},\n\t\t\tparams?.stream,\n\t\t);\n\t\treturn fromPino(logger);\n\t}\n\n\texport function is(x: object): x is LoggerType {\n\t\treturn '_pino' in x;\n\t}\n}\ntype LoggerType = ReturnType<typeof LoggerType.create>;\n\n// Effect service\nconst createInstance = Effect.fn(function* (params?: LoggerType.CreateParams) {\n\tconst isDev = Option.getOrNull(\n\t\tyield* Config.boolean('DEV').pipe(Config.option),\n\t);\n\tconst logFile = Option.getOrNull(\n\t\tyield* Config.boolean('LOGGER_LOGFILE').pipe(Config.option),\n\t);\n\n\treturn LoggerType.create({\n\t\t...params,\n\t\t...(isDev && {\n\t\t\tstream: logFile\n\t\t\t\t? pino.transport({\n\t\t\t\t\t\ttarget: 'pino/file',\n\t\t\t\t\t\toptions: {\n\t\t\t\t\t\t\tdestination: './logs/server.log',\n\t\t\t\t\t\t\tmkdir: true,\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t: pino.transport({\n\t\t\t\t\t\ttarget: 'pino-pretty',\n\t\t\t\t\t\toptions: {\n\t\t\t\t\t\t\tignore: 'pid,hostname',\n\t\t\t\t\t\t},\n\t\t\t\t\t}),\n\t\t}),\n\t});\n});\n\nconst tag = 'ff-serv/logger' as const;\nexport class Logger extends Effect.Service<Logger>()(tag, {\n\teffect: createInstance(),\n}) {\n\tstatic create(params?: LoggerType.CreateParams) {\n\t\treturn Logger.make(LoggerType.create(params));\n\t}\n\n\tstatic layer = (params?: Parameters<typeof createInstance>[0]) =>\n\t\tLayer.effect(\n\t\t\tLogger,\n\t\t\tEffect.gen(function* () {\n\t\t\t\treturn Logger.make(yield* createInstance(params));\n\t\t\t}),\n\t\t);\n\n\t//\n\n\tstatic get = Effect.fn(function* () {\n\t\tconst logger = yield* Effect.serviceOption(Logger);\n\t\tif (Option.isNone(logger)) return undefined;\n\t\treturn logger.value;\n\t});\n\n\tstatic replace =\n\t\t(logger: Logger | LoggerType | pino.Logger | undefined) =>\n\t\t<A, E, R>(e: Effect.Effect<A, E, R>) => {\n\t\t\tif (logger == null) return e;\n\t\t\tif (logger instanceof Logger)\n\t\t\t\treturn Effect.provideService(e, Logger, logger);\n\n\t\t\tif (LoggerType.is(logger)) {\n\t\t\t\treturn Effect.provideService(e, Logger, Logger.make(logger));\n\t\t\t}\n\n\t\t\treturn Effect.provideService(\n\t\t\t\te,\n\t\t\t\tLogger,\n\t\t\t\tLogger.make(LoggerType.fromPino(logger)),\n\t\t\t);\n\t\t};\n\n\tstatic replaceChild =\n\t\t(...params: Parameters<LoggerType['child']>) =>\n\t\t<A, E, R>(e: Effect.Effect<A, E, R>) =>\n\t\t\tEffect.gen(function* () {\n\t\t\t\tconst logger = yield* Logger.get();\n\t\t\t\tif (logger == null) return yield* e;\n\n\t\t\t\tconst child = logger.child(...params);\n\t\t\t\treturn yield* Effect.provideService(e, Logger, Logger.make(child));\n\t\t\t});\n\n\t// --\n\n\tstatic info = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['info']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.info(...params);\n\t});\n\n\tstatic debug = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['debug']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.debug(...params);\n\t});\n\n\tstatic warn = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['warn']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.warn(...params);\n\t});\n\n\tstatic error = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['error']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.error(...params);\n\t});\n\n\tstatic flush = Effect.fn(function* (\n\t\t...params: Parameters<LoggerType['flush']>\n\t) {\n\t\tconst logger = yield* Logger.get();\n\t\tif (logger == null) return;\n\t\tlogger.flush(...params);\n\t});\n}\n"],"mappings":"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","names":["LoggerType"]}
+{"version":3,"sources":["../src/logger.ts"],"sourcesContent":["import {\n\tConfig,\n\tContext,\n\tEffect,\n\tLogger as EffectLogger,\n\tHashMap,\n\tLayer,\n\tLogLevel,\n\tManagedRuntime,\n\tOption,\n} from 'effect';\nimport pino from 'pino';\n\n// Pino Instance\n\nnamespace LoggerType {\n\texport function fromPino(x: pino.Logger<never, boolean>) {\n\t\treturn {\n\t\t\tinfo: x.info.bind(x),\n\t\t\terror: x.error.bind(x),\n\t\t\twarn: x.warn.bind(x),\n\t\t\tdebug: x.debug.bind(x),\n\t\t\tchild: (...params: Parameters<typeof x.child>) => {\n\t\t\t\treturn fromPino(\n\t\t\t\t\tx.child(...params) as unknown as pino.Logger<never, boolean>,\n\t\t\t\t);\n\t\t\t},\n\t\t\tflush: x.flush.bind(x),\n\t\t\t_pino: x,\n\t\t};\n\t}\n\n\texport type CreateParams = {\n\t\tstream?: pino.DestinationStream;\n\t};\n\n\texport function create(params?: CreateParams) {\n\t\tconst logger = pino(\n\t\t\t{\n\t\t\t\tlevel: 'trace', // Level is managed by Effect, so we set the lowest here\n\t\t\t\tserializers: {\n\t\t\t\t\terror: pino.stdSerializers.errWithCause,\n\t\t\t\t\terr: pino.stdSerializers.errWithCause,\n\t\t\t\t},\n\t\t\t\tformatters: {\n\t\t\t\t\tlevel: (label) => {\n\t\t\t\t\t\treturn { level: label };\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t},\n\t\t\tparams?.stream,\n\t\t);\n\t\treturn fromPino(logger);\n\t}\n\n\texport type Type = ReturnType<typeof LoggerType.create>;\n\n\texport function is(x: object): x is Type {\n\t\treturn '_pino' in x;\n\t}\n}\ntype LoggerType = LoggerType.Type;\n\n// The Gist\n\nconst createInstance = (params?: LoggerType.CreateParams) =>\n\tEffect.gen(function* () {\n\t\tconst isDev = Option.getOrNull(\n\t\t\tyield* Config.boolean('DEV').pipe(Config.option),\n\t\t);\n\t\tconst logFile = Option.getOrNull(\n\t\t\tyield* Config.boolean('LOGGER_LOGFILE').pipe(Config.option),\n\t\t);\n\n\t\treturn LoggerType.create({\n\t\t\t...params,\n\t\t\t...(isDev && {\n\t\t\t\tstream: logFile\n\t\t\t\t\t? pino.transport({\n\t\t\t\t\t\t\ttarget: 'pino/file',\n\t\t\t\t\t\t\toptions: {\n\t\t\t\t\t\t\t\tdestination: './logs/server.log',\n\t\t\t\t\t\t\t\tmkdir: true,\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t})\n\t\t\t\t\t: pino.transport({\n\t\t\t\t\t\t\ttarget: 'pino-pretty',\n\t\t\t\t\t\t\toptions: {\n\t\t\t\t\t\t\t\tignore: 'pid,hostname',\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t}),\n\t\t\t}),\n\t\t});\n\t});\n\n// Pino Context and Effect Logger integration\n\ntype LogParams = [obj: unknown, msg?: string];\nfunction extractParams(...[obj, msg]: LogParams) {\n\tif (typeof obj === 'string') {\n\t\treturn { message: obj };\n\t}\n\treturn { message: msg, attributes: obj as Record<string, any> };\n}\n\n/** A simple helper for calling pino log functions */\nfunction callPino(\n\t{\n\t\tannotations,\n\t\tmessage,\n\t}: Pick<EffectLogger.Logger.Options<unknown>, 'annotations' | 'message'>,\n\tcall: (...params: [obj: unknown, msg?: string]) => void,\n) {\n\tconst entries = HashMap.toEntries(annotations);\n\tif (entries.length > 0) {\n\t\treturn call(Object.fromEntries(entries), String(message));\n\t}\n\n\treturn call(String(message));\n}\n\nnamespace PinoCtx {\n\tconst tag = 'ff-serv/Pino';\n\texport type Type = ReturnType<typeof create>;\n\n\texport function is(obj: unknown): obj is Type {\n\t\treturn (\n\t\t\ttypeof obj === 'object' &&\n\t\t\tobj != null &&\n\t\t\t'_tag' in obj &&\n\t\t\tobj._tag === tag\n\t\t);\n\t}\n\n\texport function create(pino: LoggerType) {\n\t\treturn {\n\t\t\t_tag: tag,\n\t\t\tpino,\n\t\t\teffectLogger: EffectLogger.make(({ logLevel, ...input }) => {\n\t\t\t\tswitch (logLevel) {\n\t\t\t\t\tcase LogLevel.Info:\n\t\t\t\t\t\treturn callPino(input, pino.info);\n\t\t\t\t\tcase LogLevel.Debug:\n\t\t\t\t\t\treturn callPino(input, pino.debug);\n\t\t\t\t\tcase LogLevel.Warning:\n\t\t\t\t\t\treturn callPino(input, pino.warn);\n\t\t\t\t\tcase LogLevel.Error:\n\t\t\t\t\tcase LogLevel.Fatal:\n\t\t\t\t\t\treturn callPino(input, pino.error);\n\t\t\t\t\tdefault:\n\t\t\t\t\t\treturn callPino(input, pino.info);\n\t\t\t\t}\n\t\t\t}),\n\t\t};\n\t}\n}\ntype PinoCtx = PinoCtx.Type;\n\nclass Pino extends Context.Tag('ff-serv/Pino')<Pino, PinoCtx>() {}\n\n// Facade\n\nexport namespace Logger {\n\texport const layer = (opts?: Parameters<typeof createInstance>[0]) =>\n\t\tEffectLogger.replaceEffect(\n\t\t\tEffectLogger.defaultLogger,\n\t\t\tEffect.gen(function* () {\n\t\t\t\treturn (yield* Pino).effectLogger;\n\t\t\t}),\n\t\t).pipe(\n\t\t\tLayer.provideMerge(\n\t\t\t\tLayer.effect(\n\t\t\t\t\tPino,\n\t\t\t\t\tEffect.gen(function* () {\n\t\t\t\t\t\treturn PinoCtx.create(yield* createInstance(opts));\n\t\t\t\t\t}),\n\t\t\t\t),\n\t\t\t),\n\t\t);\n\n\texport const Default = layer();\n\n\t//\n\n\texport const sync = () =>\n\t\tEffect.gen(function* () {\n\t\t\tconst pino = yield* Pino;\n\t\t\tconst runtime = ManagedRuntime.make(\n\t\t\t\tEffectLogger.replace(EffectLogger.defaultLogger, pino.effectLogger),\n\t\t\t);\n\t\t\treturn {\n\t\t\t\tinfo: (...params: Parameters<typeof Logger.info>) =>\n\t\t\t\t\tLogger.info(...params).pipe((e) => runtime.runSync(e)),\n\t\t\t\tdebug: (...params: Parameters<typeof Logger.debug>) =>\n\t\t\t\t\tLogger.debug(...params).pipe((e) => runtime.runSync(e)),\n\t\t\t\twarn: (...params: Parameters<typeof Logger.warn>) =>\n\t\t\t\t\tLogger.warn(...params).pipe((e) => runtime.runSync(e)),\n\t\t\t\terror: (...params: Parameters<typeof Logger.error>) =>\n\t\t\t\t\tLogger.error(...params).pipe((e) => runtime.runSync(e)),\n\t\t\t};\n\t\t});\n\n\t/** @deprecated — will be renamed to `sync` */\n\texport const get = () => Logger.sync();\n\n\texport const replace =\n\t\t(logger: LoggerType | pino.Logger) =>\n\t\t<A, E, R>(e: Effect.Effect<A, E, R>) =>\n\t\t\tEffect.gen(function* () {\n\t\t\t\tconst oldPinoCtx = yield* Pino;\n\t\t\t\tconst pino = LoggerType.is(logger)\n\t\t\t\t\t? logger\n\t\t\t\t\t: LoggerType.fromPino(logger);\n\t\t\t\tconst pinoCtx = PinoCtx.create(pino);\n\n\t\t\t\treturn yield* Effect.provide(\n\t\t\t\t\te,\n\t\t\t\t\tLayer.mergeAll(\n\t\t\t\t\t\tEffectLogger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger),\n\t\t\t\t\t\tLayer.succeed(Pino, pinoCtx),\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t});\n\n\texport const replaceChild =\n\t\t(...params: Parameters<LoggerType['child']>) =>\n\t\t<A, E, R>(e: Effect.Effect<A, E, R>) =>\n\t\t\tEffect.gen(function* () {\n\t\t\t\tconst oldPinoCtx = yield* Pino;\n\t\t\t\tconst pino = oldPinoCtx.pino.child(...params);\n\t\t\t\tconst pinoCtx = PinoCtx.create(pino);\n\n\t\t\t\treturn yield* Effect.provide(\n\t\t\t\t\tEffect.provide(\n\t\t\t\t\t\te,\n\t\t\t\t\t\tEffectLogger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger),\n\t\t\t\t\t),\n\t\t\t\t\tLayer.succeed(Pino, pinoCtx),\n\t\t\t\t);\n\t\t\t});\n\n\t// --\n\n\texport const info = (...params: LogParams) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst { message, attributes } = extractParams(...params);\n\t\t\tyield* Effect.logInfo(message).pipe(\n\t\t\t\tattributes ? Effect.annotateLogs(attributes) : (e) => e,\n\t\t\t);\n\t\t});\n\n\texport const debug = (...params: LogParams) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst { message, attributes } = extractParams(...params);\n\t\t\tyield* Effect.logDebug(message).pipe(\n\t\t\t\tattributes ? Effect.annotateLogs(attributes) : (e) => e,\n\t\t\t);\n\t\t});\n\n\texport const warn = (...params: LogParams) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst { message, attributes } = extractParams(...params);\n\t\t\tyield* Effect.logWarning(message).pipe(\n\t\t\t\tattributes ? Effect.annotateLogs(attributes) : (e) => e,\n\t\t\t);\n\t\t});\n\n\texport const error = (...params: LogParams) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst { message, attributes } = extractParams(...params);\n\t\t\tyield* Effect.logError(message).pipe(\n\t\t\t\tattributes ? Effect.annotateLogs(attributes) : (e) => e,\n\t\t\t);\n\t\t});\n\n\t/** @deprecated */\n\texport const flush = (..._params: Parameters<LoggerType['flush']>) =>\n\t\tEffect.void;\n}\n"],"mappings":"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","names":["LoggerType","PinoCtx","pino","Logger"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ff-serv",
-	"version": "0.0.2",
+	"version": "0.1.1",
 	"type": "module",
 	"exports": {
 		".": {
@@ -25,7 +25,8 @@
 	},
 	"peerDependencies": {
 		"effect": "^3.19.3",
-		"pino": "^9"
+		"pino": "^9",
+		"@effect/opentelemetry": "^0.60.0"
 	},
 	"publishConfig": {
 		"access": "public"

package/src/logger.ts

@@ -1,7 +1,17 @@
-import { Config, Effect, Layer, Option } from 'effect';
+import {
+	Config,
+	Context,
+	Effect,
+	Logger as EffectLogger,
+	HashMap,
+	Layer,
+	LogLevel,
+	ManagedRuntime,
+	Option,
+} from 'effect';
 import pino from 'pino';
 
-// Base logger
+// Pino Instance
 
 namespace LoggerType {
 	export function fromPino(x: pino.Logger<never, boolean>) {
@@ -21,14 +31,13 @@ namespace LoggerType {
 	}
 
 	export type CreateParams = {
-		level?: pino.Level;
 		stream?: pino.DestinationStream;
 	};
 
 	export function create(params?: CreateParams) {
 		const logger = pino(
 			{
-				level: params?.level ?? 'info',
+				level: 'trace', // Level is managed by Effect, so we set the lowest here
 				serializers: {
 					error: pino.stdSerializers.errWithCause,
 					err: pino.stdSerializers.errWithCause,
@@ -44,134 +53,227 @@ namespace LoggerType {
 		return fromPino(logger);
 	}
 
-	export function is(x: object): x is LoggerType {
+	export type Type = ReturnType<typeof LoggerType.create>;
+
+	export function is(x: object): x is Type {
 		return '_pino' in x;
 	}
 }
-type LoggerType = ReturnType<typeof LoggerType.create>;
-
-// Effect service
-const createInstance = Effect.fn(function* (params?: LoggerType.CreateParams) {
-	const isDev = Option.getOrNull(
-		yield* Config.boolean('DEV').pipe(Config.option),
-	);
-	const logFile = Option.getOrNull(
-		yield* Config.boolean('LOGGER_LOGFILE').pipe(Config.option),
-	);
-
-	return LoggerType.create({
-		...params,
-		...(isDev && {
-			stream: logFile
-				? pino.transport({
-						target: 'pino/file',
-						options: {
-							destination: './logs/server.log',
-							mkdir: true,
-						},
-					})
-				: pino.transport({
-						target: 'pino-pretty',
-						options: {
-							ignore: 'pid,hostname',
-						},
-					}),
-		}),
+type LoggerType = LoggerType.Type;
+
+// The Gist
+
+const createInstance = (params?: LoggerType.CreateParams) =>
+	Effect.gen(function* () {
+		const isDev = Option.getOrNull(
+			yield* Config.boolean('DEV').pipe(Config.option),
+		);
+		const logFile = Option.getOrNull(
+			yield* Config.boolean('LOGGER_LOGFILE').pipe(Config.option),
+		);
+
+		return LoggerType.create({
+			...params,
+			...(isDev && {
+				stream: logFile
+					? pino.transport({
+							target: 'pino/file',
+							options: {
+								destination: './logs/server.log',
+								mkdir: true,
+							},
+						})
+					: pino.transport({
+							target: 'pino-pretty',
+							options: {
+								ignore: 'pid,hostname',
+							},
+						}),
+			}),
+		});
 	});
-});
-
-const tag = 'ff-serv/logger' as const;
-export class Logger extends Effect.Service<Logger>()(tag, {
-	effect: createInstance(),
-}) {
-	static create(params?: LoggerType.CreateParams) {
-		return Logger.make(LoggerType.create(params));
+
+// Pino Context and Effect Logger integration
+
+type LogParams = [obj: unknown, msg?: string];
+function extractParams(...[obj, msg]: LogParams) {
+	if (typeof obj === 'string') {
+		return { message: obj };
+	}
+	return { message: msg, attributes: obj as Record<string, any> };
+}
+
+/** A simple helper for calling pino log functions */
+function callPino(
+	{
+		annotations,
+		message,
+	}: Pick<EffectLogger.Logger.Options<unknown>, 'annotations' | 'message'>,
+	call: (...params: [obj: unknown, msg?: string]) => void,
+) {
+	const entries = HashMap.toEntries(annotations);
+	if (entries.length > 0) {
+		return call(Object.fromEntries(entries), String(message));
 	}
 
-	static layer = (params?: Parameters<typeof createInstance>[0]) =>
-		Layer.effect(
-			Logger,
+	return call(String(message));
+}
+
+namespace PinoCtx {
+	const tag = 'ff-serv/Pino';
+	export type Type = ReturnType<typeof create>;
+
+	export function is(obj: unknown): obj is Type {
+		return (
+			typeof obj === 'object' &&
+			obj != null &&
+			'_tag' in obj &&
+			obj._tag === tag
+		);
+	}
+
+	export function create(pino: LoggerType) {
+		return {
+			_tag: tag,
+			pino,
+			effectLogger: EffectLogger.make(({ logLevel, ...input }) => {
+				switch (logLevel) {
+					case LogLevel.Info:
+						return callPino(input, pino.info);
+					case LogLevel.Debug:
+						return callPino(input, pino.debug);
+					case LogLevel.Warning:
+						return callPino(input, pino.warn);
+					case LogLevel.Error:
+					case LogLevel.Fatal:
+						return callPino(input, pino.error);
+					default:
+						return callPino(input, pino.info);
+				}
+			}),
+		};
+	}
+}
+type PinoCtx = PinoCtx.Type;
+
+class Pino extends Context.Tag('ff-serv/Pino')<Pino, PinoCtx>() {}
+
+// Facade
+
+export namespace Logger {
+	export const layer = (opts?: Parameters<typeof createInstance>[0]) =>
+		EffectLogger.replaceEffect(
+			EffectLogger.defaultLogger,
 			Effect.gen(function* () {
-				return Logger.make(yield* createInstance(params));
+				return (yield* Pino).effectLogger;
 			}),
+		).pipe(
+			Layer.provideMerge(
+				Layer.effect(
+					Pino,
+					Effect.gen(function* () {
+						return PinoCtx.create(yield* createInstance(opts));
+					}),
+				),
+			),
 		);
 
-	//
+	export const Default = layer();
 
-	static get = Effect.fn(function* () {
-		const logger = yield* Effect.serviceOption(Logger);
-		if (Option.isNone(logger)) return undefined;
-		return logger.value;
-	});
+	//
 
-	static replace =
-		(logger: Logger | LoggerType | pino.Logger | undefined) =>
-		<A, E, R>(e: Effect.Effect<A, E, R>) => {
-			if (logger == null) return e;
-			if (logger instanceof Logger)
-				return Effect.provideService(e, Logger, logger);
-
-			if (LoggerType.is(logger)) {
-				return Effect.provideService(e, Logger, Logger.make(logger));
-			}
-
-			return Effect.provideService(
-				e,
-				Logger,
-				Logger.make(LoggerType.fromPino(logger)),
+	export const sync = () =>
+		Effect.gen(function* () {
+			const pino = yield* Pino;
+			const runtime = ManagedRuntime.make(
+				EffectLogger.replace(EffectLogger.defaultLogger, pino.effectLogger),
 			);
-		};
+			return {
+				info: (...params: Parameters<typeof Logger.info>) =>
+					Logger.info(...params).pipe((e) => runtime.runSync(e)),
+				debug: (...params: Parameters<typeof Logger.debug>) =>
+					Logger.debug(...params).pipe((e) => runtime.runSync(e)),
+				warn: (...params: Parameters<typeof Logger.warn>) =>
+					Logger.warn(...params).pipe((e) => runtime.runSync(e)),
+				error: (...params: Parameters<typeof Logger.error>) =>
+					Logger.error(...params).pipe((e) => runtime.runSync(e)),
+			};
+		});
+
+	/** @deprecated — will be renamed to `sync` */
+	export const get = () => Logger.sync();
+
+	export const replace =
+		(logger: LoggerType | pino.Logger) =>
+		<A, E, R>(e: Effect.Effect<A, E, R>) =>
+			Effect.gen(function* () {
+				const oldPinoCtx = yield* Pino;
+				const pino = LoggerType.is(logger)
+					? logger
+					: LoggerType.fromPino(logger);
+				const pinoCtx = PinoCtx.create(pino);
+
+				return yield* Effect.provide(
+					e,
+					Layer.mergeAll(
+						EffectLogger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger),
+						Layer.succeed(Pino, pinoCtx),
+					),
+				);
+			});
 
-	static replaceChild =
+	export const replaceChild =
 		(...params: Parameters<LoggerType['child']>) =>
 		<A, E, R>(e: Effect.Effect<A, E, R>) =>
 			Effect.gen(function* () {
-				const logger = yield* Logger.get();
-				if (logger == null) return yield* e;
+				const oldPinoCtx = yield* Pino;
+				const pino = oldPinoCtx.pino.child(...params);
+				const pinoCtx = PinoCtx.create(pino);
 
-				const child = logger.child(...params);
-				return yield* Effect.provideService(e, Logger, Logger.make(child));
+				return yield* Effect.provide(
+					Effect.provide(
+						e,
+						EffectLogger.replace(oldPinoCtx.effectLogger, pinoCtx.effectLogger),
+					),
+					Layer.succeed(Pino, pinoCtx),
+				);
 			});
 
 	// --
 
-	static info = Effect.fn(function* (
-		...params: Parameters<LoggerType['info']>
-	) {
-		const logger = yield* Logger.get();
-		if (logger == null) return;
-		logger.info(...params);
-	});
+	export const info = (...params: LogParams) =>
+		Effect.gen(function* () {
+			const { message, attributes } = extractParams(...params);
+			yield* Effect.logInfo(message).pipe(
+				attributes ? Effect.annotateLogs(attributes) : (e) => e,
+			);
+		});
 
-	static debug = Effect.fn(function* (
-		...params: Parameters<LoggerType['debug']>
-	) {
-		const logger = yield* Logger.get();
-		if (logger == null) return;
-		logger.debug(...params);
-	});
+	export const debug = (...params: LogParams) =>
+		Effect.gen(function* () {
+			const { message, attributes } = extractParams(...params);
+			yield* Effect.logDebug(message).pipe(
+				attributes ? Effect.annotateLogs(attributes) : (e) => e,
+			);
+		});
 
-	static warn = Effect.fn(function* (
-		...params: Parameters<LoggerType['warn']>
-	) {
-		const logger = yield* Logger.get();
-		if (logger == null) return;
-		logger.warn(...params);
-	});
+	export const warn = (...params: LogParams) =>
+		Effect.gen(function* () {
+			const { message, attributes } = extractParams(...params);
+			yield* Effect.logWarning(message).pipe(
+				attributes ? Effect.annotateLogs(attributes) : (e) => e,
+			);
+		});
 
-	static error = Effect.fn(function* (
-		...params: Parameters<LoggerType['error']>
-	) {
-		const logger = yield* Logger.get();
-		if (logger == null) return;
-		logger.error(...params);
-	});
+	export const error = (...params: LogParams) =>
+		Effect.gen(function* () {
+			const { message, attributes } = extractParams(...params);
+			yield* Effect.logError(message).pipe(
+				attributes ? Effect.annotateLogs(attributes) : (e) => e,
+			);
+		});
 
-	static flush = Effect.fn(function* (
-		...params: Parameters<LoggerType['flush']>
-	) {
-		const logger = yield* Logger.get();
-		if (logger == null) return;
-		logger.flush(...params);
-	});
+	/** @deprecated */
+	export const flush = (..._params: Parameters<LoggerType['flush']>) =>
+		Effect.void;
 }