autotel 6.5.0 → 7.0.1

package/dist/{canonical-log-line-processor-B0vq_QR6.js → canonical-log-line-processor-hFUmS__K.js}

@@ -1,3 +1,4 @@
+import { i as asNumber, l as asString, p as hasProcess, s as asRecord, t as asBoolean, x as toError } from "./values-BenyvWKz.js";
 import { SeverityNumber, logs } from "@opentelemetry/api-logs";
 
 //#region src/pretty-log-formatter.ts
@@ -8,12 +9,12 @@ const RED = "\x1B[31m";
 const YELLOW = "\x1B[33m";
 const GREEN = "\x1B[32m";
 const CYAN = "\x1B[36m";
-const LEVEL_COLORS = {
-	debug: "\x1B[90m",
-	info: GREEN,
-	warn: YELLOW,
-	error: RED
-};
+const LEVEL_COLORS = /* @__PURE__ */ new Map([
+	["debug", "\x1B[90m"],
+	["info", GREEN],
+	["warn", YELLOW],
+	["error", RED]
+]);
 /** Internal OTel attributes to skip in pretty output. */
 const SKIP_PREFIXES = [
 	"telemetry.",
@@ -40,12 +41,10 @@ const SKIP_KEYS = /* @__PURE__ */ new Set([
 	"http.response.status_code"
 ]);
 function useColor() {
-	if (typeof process !== "undefined") {
-		if (process.env.NO_COLOR) return false;
-		if (process.env.FORCE_COLOR) return true;
-		if (process.stdout?.isTTY) return true;
-	}
-	return false;
+	if (!hasProcess()) return false;
+	if (process.env.NO_COLOR) return false;
+	if (process.env.FORCE_COLOR) return true;
+	return process.stdout?.isTTY === true;
 }
 function c(color, text) {
 	return useColor() ? `${color}${text}${RESET}` : text;
@@ -76,8 +75,10 @@ function formatTime(iso) {
 	}
 }
 function formatValue(value) {
-	if (typeof value === "string") return value;
-	if (typeof value === "number" || typeof value === "boolean") return String(value);
+	const text = asString(value);
+	if (text !== void 0) return text;
+	const scalar = asNumber(value) ?? asBoolean(value);
+	if (scalar !== void 0) return String(scalar);
 	if (value == null) return "";
 	try {
 		return JSON.stringify(value);
@@ -101,8 +102,13 @@ function groupAttributes(event) {
 			let current = tree;
 			for (let i = 0; i < parts.length - 1; i++) {
 				const part = parts[i];
-				if (!(part in current) || typeof current[part] !== "object") current[part] = {};
-				current = current[part];
+				const branch = asRecord(current[part]);
+				if (branch) current = branch;
+				else {
+					const created = {};
+					current[part] = created;
+					current = created;
+				}
 			}
 			current[parts.at(-1)] = value;
 		}
@@ -115,10 +121,11 @@ function renderTree(obj, indent, isLast) {
 	for (const [idx, [key, value]] of entries.entries()) {
 		const last = idx === entries.length - 1;
 		const prefix = indent + (last ? "└─" : "├─") + " ";
-		if (value && typeof value === "object" && !Array.isArray(value)) {
-			const nested = value;
-			const flatValues = Object.entries(nested).filter(([, v]) => typeof v !== "object" || v === null);
-			if (Object.entries(nested).filter(([, v]) => typeof v === "object" && v !== null && !Array.isArray(v)).length === 0) {
+		const nested = asRecord(value);
+		if (nested) {
+			const nestedObjs = Object.entries(nested).filter(([, v]) => asRecord(v));
+			const flatValues = Object.entries(nested).filter(([, v]) => asRecord(v) === void 0);
+			if (nestedObjs.length === 0) {
 				const inline = flatValues.map(([k, v]) => `${c(CYAN, k)}=${formatValue(v)}`).join(" ");
 				lines.push(`${prefix}${c(BOLD, key)}: ${inline}`);
 			} else {
@@ -141,7 +148,7 @@ function formatPrettyLogLine(ctx) {
 	const path = event["http.route"] || event["url.path"] || "";
 	const status = event["http.response.status_code"] || "";
 	const duration = formatDuration(Number(event.duration_ms ?? 0));
-	const levelStr = c(LEVEL_COLORS[level] ?? "", level.toUpperCase().padEnd(5));
+	const levelStr = c(LEVEL_COLORS.get(level) ?? "", level.toUpperCase().padEnd(5));
 	const parts = [c(DIM, timestamp), levelStr];
 	if (service) parts.push(c(DIM, `[${service}]`));
 	if (method) parts.push(c(BOLD, String(method)));
@@ -162,6 +169,12 @@ function formatPrettyLogLine(ctx) {
 
 //#endregion
 //#region src/processors/canonical-log-line-processor.ts
+const SEVERITY_NUMBERS = /* @__PURE__ */ new Map([
+	["debug", SeverityNumber.DEBUG],
+	["info", SeverityNumber.INFO],
+	["warn", SeverityNumber.WARN],
+	["error", SeverityNumber.ERROR]
+]);
 /**
 * Span processor that automatically emits spans as canonical log lines
 *
@@ -241,7 +254,7 @@ var CanonicalLogLineProcessor = class {
 		this.shouldEmit = options.shouldEmit ?? this.buildKeepPredicate(options.keep);
 		this.drain = options.drain;
 		this.onDrainError = options.onDrainError;
-		this.pretty = options.pretty ?? (typeof process !== "undefined" && process.env.NODE_ENV === "development");
+		this.pretty = options.pretty ?? (hasProcess() && process.env.NODE_ENV === "development");
 		if (!this.logger) this.getOTelLogger = () => logs.getLogger("autotel.canonical-log-line");
 	}
 	buildKeepPredicate(keep) {
@@ -319,8 +332,11 @@ var CanonicalLogLineProcessor = class {
 	}
 	emitViaOTel(level, message, canonicalLogLine, otelLogger) {
 		const otelAttributes = {};
-		for (const [key, value] of Object.entries(canonicalLogLine)) if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") otelAttributes[key] = value;
-		else if (value !== null && value !== void 0) otelAttributes[key] = String(value);
+		for (const [key, value] of Object.entries(canonicalLogLine)) {
+			const scalar = asString(value) ?? asNumber(value) ?? asBoolean(value);
+			if (scalar !== void 0) otelAttributes[key] = scalar;
+			else if (value !== null && value !== void 0) otelAttributes[key] = String(value);
+		}
 		otelLogger.emit({
 			severityNumber: this.getSeverityNumber(level),
 			severityText: level.toUpperCase(),
@@ -344,15 +360,10 @@ var CanonicalLogLineProcessor = class {
 		return levels.indexOf(level) >= levels.indexOf(this.minLevel);
 	}
 	getSeverityNumber(level) {
-		return {
-			debug: SeverityNumber.DEBUG,
-			info: SeverityNumber.INFO,
-			warn: SeverityNumber.WARN,
-			error: SeverityNumber.ERROR
-		}[level] ?? SeverityNumber.INFO;
+		return SEVERITY_NUMBERS.get(level) ?? SeverityNumber.INFO;
 	}
-	reportInternalWarning(message, error) {
-		const err = error instanceof Error ? error.message : String(error ?? "unknown error");
+	reportInternalWarning(message, cause) {
+		const err = cause === void 0 ? "unknown error" : toError(cause).message;
 		if (this.logger) {
 			this.logger.warn({ error: err }, `[autotel] ${message}`);
 			return;

package/dist/{canonical-log-line-processor-CL_J7gb5.d.ts → canonical-log-line-processor-l0Aqe6yp.d.cts}

@@ -1,4 +1,5 @@
-import { s as Logger } from "./logger-CN4xpzMd.js";
+import { t as UnknownRecord } from "./values-CeMH-mYG.cjs";
+import { s as Logger } from "./logger-S1Fgl0g3.cjs";
 import { ReadableSpan, SpanProcessor } from "@opentelemetry/sdk-trace-base";
 import { AttributeValue } from "@opentelemetry/api";
 //#region src/processors/canonical-log-line-processor.d.ts
@@ -10,7 +11,7 @@ interface CanonicalLogLineEvent {
   span: ReadableSpan;
   level: 'debug' | 'info' | 'warn' | 'error';
   message: string;
-  event: Record<string, unknown>;
+  event: UnknownRecord;
 }
 interface KeepCondition {
   /** Keep events where HTTP status >= this value. */
@@ -50,7 +51,7 @@ interface CanonicalLogLineOptions {
   /** Callback invoked after emit for custom fan-out. */
   drain?: (ctx: CanonicalLogLineEvent) => void | Promise<void>;
   /** Handler for drain failures. */
-  onDrainError?: (error: unknown, ctx: CanonicalLogLineEvent) => void;
+  onDrainError?: (cause: unknown, ctx: CanonicalLogLineEvent) => void;
   /**
    * Pretty-print canonical log lines to console in a tree format.
    * Defaults to true when NODE_ENV is 'development'.

package/dist/config.d.cts

@@ -1,4 +1,4 @@
-import { t as ILogger } from "./logger-CN4xpzMd.cjs";
+import { t as ILogger } from "./logger-S1Fgl0g3.cjs";
 import { Meter, Tracer } from "@opentelemetry/api";
 //#region src/config.d.ts
 declare const FEATURE_FLAGS: {

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import { t as ILogger } from "./logger-CN4xpzMd.js";
+import { t as ILogger } from "./logger-S1Fgl0g3.js";
 import { Meter, Tracer } from "@opentelemetry/api";
 //#region src/config.d.ts
 declare const FEATURE_FLAGS: {

package/dist/{correlated-events-kSwLo3mi.cjs → correlated-events-CcuknWnU.cjs}

@@ -1,3 +1,4 @@
+const require_values = require('./values-DApyq53y.cjs');
 
 //#region src/correlated-events.ts
 function sanitizeEventKey(input) {
@@ -11,7 +12,7 @@ function nextSequence(target) {
 }
 function emitCorrelatedEvent(ctx, name, attrs = {}) {
 	const eventName = sanitizeEventKey(name);
-	if (typeof ctx.addEvent === "function") {
+	if (require_values.isFunction(ctx.addEvent)) {
 		ctx.addEvent.call(ctx, eventName, attrs);
 		return;
 	}

package/dist/{correlated-events-Bzh5y-UB.js → correlated-events-DwMMbItg.js}

@@ -1,3 +1,5 @@
+import { h as isFunction } from "./values-BenyvWKz.js";
+
 //#region src/correlated-events.ts
 function sanitizeEventKey(input) {
 	return input.replaceAll(/[^a-zA-Z0-9_.-]/g, "_");
@@ -10,7 +12,7 @@ function nextSequence(target) {
 }
 function emitCorrelatedEvent(ctx, name, attrs = {}) {
 	const eventName = sanitizeEventKey(name);
-	if (typeof ctx.addEvent === "function") {
+	if (isFunction(ctx.addEvent)) {
 		ctx.addEvent.call(ctx, eventName, attrs);
 		return;
 	}

package/dist/correlation-id.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_init = require('./init-CTtHITlX.cjs');
+const require_init = require('./init-C5aHRqi2.cjs');
 
 exports.CORRELATION_ID_BAGGAGE_KEY = require_init.CORRELATION_ID_BAGGAGE_KEY;
 exports.generateCorrelationId = require_init.generateCorrelationId;

package/dist/correlation-id.js

@@ -1,3 +1,3 @@
-import { C as setCorrelationId, S as runWithCorrelationId, _ as CORRELATION_ID_BAGGAGE_KEY, b as getCorrelationStorage, v as generateCorrelationId, w as setCorrelationIdInBaggage, x as getOrCreateCorrelationId, y as getCorrelationId } from "./init-WHYwyItd.js";
+import { C as setCorrelationId, S as runWithCorrelationId, _ as CORRELATION_ID_BAGGAGE_KEY, b as getCorrelationStorage, v as generateCorrelationId, w as setCorrelationIdInBaggage, x as getOrCreateCorrelationId, y as getCorrelationId } from "./init-DDyaLzeg.js";
 
 export { CORRELATION_ID_BAGGAGE_KEY, generateCorrelationId, getCorrelationId, getCorrelationStorage, getOrCreateCorrelationId, runWithCorrelationId, setCorrelationId, setCorrelationIdInBaggage };

package/dist/db.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_values = require('./values-DApyq53y.cjs');
 const require_config = require('./config.cjs');
 let _opentelemetry_api = require("@opentelemetry/api");
 
@@ -167,7 +168,8 @@ const INSTRUMENTED_SYMBOL = Symbol.for("autotel.db.instrumented");
 * ```
 */
 function instrumentDatabase(client, options) {
-	if (client[INSTRUMENTED_SYMBOL]) return client;
+	const target = clientMembers(client);
+	if (target[INSTRUMENTED_SYMBOL]) return client;
 	const { dbSystem, dbName, methods, skipMethods = [], sanitizeQuery = true, slowQueryThresholdMs = 1e3 } = options;
 	const tracer = require_config.getConfig().tracer;
 	const methodsToInstrument = methods || extractDatabaseMethods(client);
@@ -175,10 +177,10 @@ function instrumentDatabase(client, options) {
 	for (const methodName of methodsToInstrument) {
 		if (skipSet.has(methodName)) continue;
 		if (methodName.startsWith("_")) continue;
-		const method = client[methodName];
-		if (typeof method !== "function") continue;
+		const method = require_values.asFunction(target[methodName]);
+		if (!method) continue;
 		const originalMethod = method;
-		client[methodName] = async function(...args) {
+		target[methodName] = async function(...args) {
 			const operation = inferDbOperation(methodName);
 			const table = inferTableName(methodName);
 			const spanName = table ? `${dbSystem}.${operation} ${table}` : `${dbSystem}.${operation}`;
@@ -221,12 +223,24 @@ function instrumentDatabase(client, options) {
 				}
 			});
 		};
-		Object.defineProperty(client[methodName], "name", {
+		Object.defineProperty(target[methodName], "name", {
 			value: methodName,
 			configurable: true
 		});
 	}
-	client[INSTRUMENTED_SYMBOL] = true;
+	target[INSTRUMENTED_SYMBOL] = true;
+	return client;
+}
+/**
+* A client's members, so the wrapper can read a method off it and write the
+* wrapped one back.
+*
+* SAFETY: instrumentDatabase's whole job is to replace named methods on a
+* client it was handed. TypeScript describes that client by the methods the
+* caller declared, which is precisely the set being rewritten - so this says
+* once that the client is being addressed by name.
+*/
+function clientMembers(client) {
 	return client;
 }
 /**
@@ -234,11 +248,10 @@ function instrumentDatabase(client, options) {
 */
 function extractDatabaseMethods(client) {
 	const methods = [];
-	const proto = Object.getPrototypeOf(client);
-	for (const key of Object.getOwnPropertyNames(client)) if (typeof client[key] === "function" && !key.startsWith("_")) methods.push(key);
-	if (proto) {
-		for (const key of Object.getOwnPropertyNames(proto)) if (typeof proto[key] === "function" && !key.startsWith("_") && key !== "constructor") methods.push(key);
-	}
+	const own = clientMembers(client);
+	const proto = clientMembers(Object.getPrototypeOf(client) ?? {});
+	for (const key of Object.getOwnPropertyNames(client)) if (require_values.isFunction(own[key]) && !key.startsWith("_")) methods.push(key);
+	for (const key of Object.getOwnPropertyNames(proto)) if (require_values.isFunction(proto[key]) && !key.startsWith("_") && key !== "constructor") methods.push(key);
 	return [...new Set(methods)];
 }
 /**
@@ -247,14 +260,16 @@ function extractDatabaseMethods(client) {
 function extractQueryFromArgs(args) {
 	if (args.length === 0) return void 0;
 	const firstArg = args[0];
-	if (typeof firstArg === "string") return firstArg;
-	if (firstArg && typeof firstArg === "object") {
-		if ("sql" in firstArg && typeof firstArg.sql === "string") return firstArg.sql;
-		if ("text" in firstArg && typeof firstArg.text === "string") return firstArg.text;
-		if ("toQuery" in firstArg && typeof firstArg.toQuery === "function") try {
-			const queryResult = firstArg.toQuery();
-			if (typeof queryResult === "string") return queryResult;
-			if (queryResult && typeof queryResult === "object" && "sql" in queryResult) return queryResult.sql;
+	const rawSql = require_values.asString(firstArg);
+	if (rawSql !== void 0) return rawSql;
+	const query = require_values.asRecord(firstArg);
+	if (query) {
+		const stated = require_values.asString(query.sql) ?? require_values.asString(query.text);
+		if (stated !== void 0) return stated;
+		if (require_values.isFunction(query.toQuery)) try {
+			const queryResult = query.toQuery();
+			const built = require_values.asString(queryResult) ?? require_values.asString(require_values.readProperty(queryResult, "sql"));
+			if (built !== void 0) return built;
 		} catch {}
 	}
 }

package/dist/db.js

@@ -1,3 +1,4 @@
+import { _ as readProperty, h as isFunction, l as asString, r as asFunction, s as asRecord } from "./values-BenyvWKz.js";
 import { getConfig } from "./config.js";
 import { SpanStatusCode } from "@opentelemetry/api";
 
@@ -166,7 +167,8 @@ const INSTRUMENTED_SYMBOL = Symbol.for("autotel.db.instrumented");
 * ```
 */
 function instrumentDatabase(client, options) {
-	if (client[INSTRUMENTED_SYMBOL]) return client;
+	const target = clientMembers(client);
+	if (target[INSTRUMENTED_SYMBOL]) return client;
 	const { dbSystem, dbName, methods, skipMethods = [], sanitizeQuery = true, slowQueryThresholdMs = 1e3 } = options;
 	const tracer = getConfig().tracer;
 	const methodsToInstrument = methods || extractDatabaseMethods(client);
@@ -174,10 +176,10 @@ function instrumentDatabase(client, options) {
 	for (const methodName of methodsToInstrument) {
 		if (skipSet.has(methodName)) continue;
 		if (methodName.startsWith("_")) continue;
-		const method = client[methodName];
-		if (typeof method !== "function") continue;
+		const method = asFunction(target[methodName]);
+		if (!method) continue;
 		const originalMethod = method;
-		client[methodName] = async function(...args) {
+		target[methodName] = async function(...args) {
 			const operation = inferDbOperation(methodName);
 			const table = inferTableName(methodName);
 			const spanName = table ? `${dbSystem}.${operation} ${table}` : `${dbSystem}.${operation}`;
@@ -220,12 +222,24 @@ function instrumentDatabase(client, options) {
 				}
 			});
 		};
-		Object.defineProperty(client[methodName], "name", {
+		Object.defineProperty(target[methodName], "name", {
 			value: methodName,
 			configurable: true
 		});
 	}
-	client[INSTRUMENTED_SYMBOL] = true;
+	target[INSTRUMENTED_SYMBOL] = true;
+	return client;
+}
+/**
+* A client's members, so the wrapper can read a method off it and write the
+* wrapped one back.
+*
+* SAFETY: instrumentDatabase's whole job is to replace named methods on a
+* client it was handed. TypeScript describes that client by the methods the
+* caller declared, which is precisely the set being rewritten - so this says
+* once that the client is being addressed by name.
+*/
+function clientMembers(client) {
 	return client;
 }
 /**
@@ -233,11 +247,10 @@ function instrumentDatabase(client, options) {
 */
 function extractDatabaseMethods(client) {
 	const methods = [];
-	const proto = Object.getPrototypeOf(client);
-	for (const key of Object.getOwnPropertyNames(client)) if (typeof client[key] === "function" && !key.startsWith("_")) methods.push(key);
-	if (proto) {
-		for (const key of Object.getOwnPropertyNames(proto)) if (typeof proto[key] === "function" && !key.startsWith("_") && key !== "constructor") methods.push(key);
-	}
+	const own = clientMembers(client);
+	const proto = clientMembers(Object.getPrototypeOf(client) ?? {});
+	for (const key of Object.getOwnPropertyNames(client)) if (isFunction(own[key]) && !key.startsWith("_")) methods.push(key);
+	for (const key of Object.getOwnPropertyNames(proto)) if (isFunction(proto[key]) && !key.startsWith("_") && key !== "constructor") methods.push(key);
 	return [...new Set(methods)];
 }
 /**
@@ -246,14 +259,16 @@ function extractDatabaseMethods(client) {
 function extractQueryFromArgs(args) {
 	if (args.length === 0) return void 0;
 	const firstArg = args[0];
-	if (typeof firstArg === "string") return firstArg;
-	if (firstArg && typeof firstArg === "object") {
-		if ("sql" in firstArg && typeof firstArg.sql === "string") return firstArg.sql;
-		if ("text" in firstArg && typeof firstArg.text === "string") return firstArg.text;
-		if ("toQuery" in firstArg && typeof firstArg.toQuery === "function") try {
-			const queryResult = firstArg.toQuery();
-			if (typeof queryResult === "string") return queryResult;
-			if (queryResult && typeof queryResult === "object" && "sql" in queryResult) return queryResult.sql;
+	const rawSql = asString(firstArg);
+	if (rawSql !== void 0) return rawSql;
+	const query = asRecord(firstArg);
+	if (query) {
+		const stated = asString(query.sql) ?? asString(query.text);
+		if (stated !== void 0) return stated;
+		if (isFunction(query.toQuery)) try {
+			const queryResult = query.toQuery();
+			const built = asString(queryResult) ?? asString(readProperty(queryResult, "sql"));
+			if (built !== void 0) return built;
 		} catch {}
 	}
 }

package/dist/decorators.cjs

@@ -1,11 +1,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_values = require('./values-DApyq53y.cjs');
 const require_config = require('./config.cjs');
-const require_init = require('./init-CTtHITlX.cjs');
+const require_init = require('./init-C5aHRqi2.cjs');
 let _opentelemetry_api = require("@opentelemetry/api");
 
 //#region src/decorators.ts
 function Trace(nameOrOptions, maybeOptions) {
-	const name = typeof nameOrOptions === "string" ? nameOrOptions : nameOrOptions?.name;
+	const { name: nameArgument, options } = require_values.splitNameOrOptions(nameOrOptions);
+	const name = nameArgument ?? options?.name;
 	return function(originalMethod, context) {
 		const methodName = String(context.name);
 		const methodStr = originalMethod?.toString() || "";

package/dist/decorators.d.cts

@@ -1,5 +1,5 @@
-import { n as TraceContext } from "./trace-context-IuyoPyNq.cjs";
-import { m as TracingOptions } from "./functional-e6jw5zQj.cjs";
+import { n as TraceContext } from "./trace-context-C1Cn1q0y.cjs";
+import { m as TracingOptions } from "./functional-CJn2zY4o.cjs";
 //#region src/decorators.d.ts
 /**
  * Options for @Trace method decorator
@@ -10,6 +10,15 @@ interface TraceDecoratorOptions extends Omit<TracingOptions, 'name'> {
    */
   name?: string;
 }
+/**
+ * The receiver of a decorated method. `@Trace` lends the method its span's
+ * context for the duration of the call, and puts back whatever was there.
+ */
+interface WithTraceContext {
+  ctx?: TraceContext;
+}
+/** The decorator a `@Trace(...)` call produces. */
+type TraceDecorator = <TArgs extends unknown[], TResult>(originalMethod: (...args: TArgs) => Promise<TResult>, context: ClassMethodDecoratorContext) => (...args: TArgs) => Promise<TResult>;
 /**
  * @Trace - Method decorator for fine-grained tracing
  *
@@ -39,15 +48,11 @@ interface TraceDecoratorOptions extends Omit<TracingOptions, 'name'> {
  *
  * @example Accessing ctx
  * ```typescript
- * interface WithTraceContext {
- *   ctx?: TraceContext
- * }
- *
  * class UserService {
  *   @Trace()
- *   async createUser(data: UserData) {
+ *   async createUser(this: WithTraceContext, data: UserData) {
  *     // Access ctx via this.ctx (available during execution)
- *     const ctx = (this as unknown as WithTraceContext).ctx
+ *     const ctx = this.ctx
  *     if (ctx) {
  *       ctx.setAttribute('user.id', data.id)
  *     }
@@ -56,7 +61,7 @@ interface TraceDecoratorOptions extends Omit<TracingOptions, 'name'> {
  * }
  * ```
  */
-declare function Trace(options?: TraceDecoratorOptions): <T extends (...args: unknown[]) => Promise<unknown>>(originalMethod: T, context: ClassMethodDecoratorContext) => T;
-declare function Trace(name?: string, options?: TraceDecoratorOptions): <T extends (...args: unknown[]) => Promise<unknown>>(originalMethod: T, context: ClassMethodDecoratorContext) => T;
+declare function Trace(options?: TraceDecoratorOptions): TraceDecorator;
+declare function Trace(name?: string, options?: TraceDecoratorOptions): TraceDecorator;
 //#endregion
-export { Trace, type TraceContext, TraceDecoratorOptions, type TracingOptions };
+export { Trace, type TraceContext, TraceDecorator, TraceDecoratorOptions, type TracingOptions, WithTraceContext };

package/dist/decorators.d.ts

@@ -1,5 +1,5 @@
-import { n as TraceContext } from "./trace-context-IuyoPyNq.js";
-import { m as TracingOptions } from "./functional-AT22vCw6.js";
+import { n as TraceContext } from "./trace-context-f89xPJbK.js";
+import { m as TracingOptions } from "./functional-DXy1cHFF.js";
 //#region src/decorators.d.ts
 /**
  * Options for @Trace method decorator
@@ -10,6 +10,15 @@ interface TraceDecoratorOptions extends Omit<TracingOptions, 'name'> {
    */
   name?: string;
 }
+/**
+ * The receiver of a decorated method. `@Trace` lends the method its span's
+ * context for the duration of the call, and puts back whatever was there.
+ */
+interface WithTraceContext {
+  ctx?: TraceContext;
+}
+/** The decorator a `@Trace(...)` call produces. */
+type TraceDecorator = <TArgs extends unknown[], TResult>(originalMethod: (...args: TArgs) => Promise<TResult>, context: ClassMethodDecoratorContext) => (...args: TArgs) => Promise<TResult>;
 /**
  * @Trace - Method decorator for fine-grained tracing
  *
@@ -39,15 +48,11 @@ interface TraceDecoratorOptions extends Omit<TracingOptions, 'name'> {
  *
  * @example Accessing ctx
  * ```typescript
- * interface WithTraceContext {
- *   ctx?: TraceContext
- * }
- *
  * class UserService {
  *   @Trace()
- *   async createUser(data: UserData) {
+ *   async createUser(this: WithTraceContext, data: UserData) {
  *     // Access ctx via this.ctx (available during execution)
- *     const ctx = (this as unknown as WithTraceContext).ctx
+ *     const ctx = this.ctx
  *     if (ctx) {
  *       ctx.setAttribute('user.id', data.id)
  *     }
@@ -56,7 +61,7 @@ interface TraceDecoratorOptions extends Omit<TracingOptions, 'name'> {
  * }
  * ```
  */
-declare function Trace(options?: TraceDecoratorOptions): <T extends (...args: unknown[]) => Promise<unknown>>(originalMethod: T, context: ClassMethodDecoratorContext) => T;
-declare function Trace(name?: string, options?: TraceDecoratorOptions): <T extends (...args: unknown[]) => Promise<unknown>>(originalMethod: T, context: ClassMethodDecoratorContext) => T;
+declare function Trace(options?: TraceDecoratorOptions): TraceDecorator;
+declare function Trace(name?: string, options?: TraceDecoratorOptions): TraceDecorator;
 //#endregion
-export { Trace, type TraceContext, TraceDecoratorOptions, type TracingOptions };
+export { Trace, type TraceContext, TraceDecorator, TraceDecoratorOptions, type TracingOptions, WithTraceContext };

package/dist/decorators.js

@@ -1,10 +1,12 @@
+import { y as splitNameOrOptions } from "./values-BenyvWKz.js";
 import { getConfig } from "./config.js";
-import { T as createTraceContext } from "./init-WHYwyItd.js";
+import { T as createTraceContext } from "./init-DDyaLzeg.js";
 import { SpanStatusCode } from "@opentelemetry/api";
 
 //#region src/decorators.ts
 function Trace(nameOrOptions, maybeOptions) {
-	const name = typeof nameOrOptions === "string" ? nameOrOptions : nameOrOptions?.name;
+	const { name: nameArgument, options } = splitNameOrOptions(nameOrOptions);
+	const name = nameArgument ?? options?.name;
 	return function(originalMethod, context) {
 		const methodName = String(context.name);
 		const methodStr = originalMethod?.toString() || "";

package/dist/{define-event-CGG048HE.d.cts → define-event-BNeuKUPv.d.cts}

@@ -1,4 +1,4 @@
-import { i as EventSchemaMetadata } from "./event-subscriber-CWh8sTGh.cjs";
+import { a as EventSchemaMetadata } from "./event-subscriber-DMACQA-1.cjs";
 //#region src/define-event.d.ts
 type SafeParseResult<T> = {
   success: true;

package/dist/{define-event-B2z1SBe7.d.ts → define-event-Bd8f8mST.d.ts}

@@ -1,4 +1,4 @@
-import { i as EventSchemaMetadata } from "./event-subscriber-CWh8sTGh.js";
+import { a as EventSchemaMetadata } from "./event-subscriber-DMACQA-1.js";
 //#region src/define-event.d.ts
 type SafeParseResult<T> = {
   success: true;