@smoothbricks/lmao 0.2.2 → 0.2.3

package/dist/lib/sqlite/sqlite-common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite-common.d.ts","sourceRoot":"","sources":["../../../src/lib/sqlite/sqlite-common.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,eAAO,MAAM,oBAAoB,sdAchC,CAAC;AAEF,eAAO,MAAM,oBAAoB,6BAA6B,CAAC;AAI/D,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAqID,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKvD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAExE;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAMxF;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,sBAAsB,EAAE,EAC1C,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,GAChC,sBAAsB,EAAE,CAQ1B;AAED,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,GAAG,sBAAsB,EAAE,CAKlH;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,SAAS,OAAO,EAAE,EACxB,QAAQ,SAA6B,GACpC,kBAAkB,EAAE,CAEtB;AA8BD,wBAAiB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC,CAEnF;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,GAChC,sBAAsB,EAAE,CAW1B;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAElG;AAED,wBAAgB,0BAA0B,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAEtF;AAED,wBAAgB,cAAc,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAS1E;AAED,8FAA8F;AAC9F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAEjG;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,EAAE,CAgBnH"}
+{"version":3,"file":"sqlite-common.d.ts","sourceRoot":"","sources":["../../../src/lib/sqlite/sqlite-common.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,eAAO,MAAM,oBAAoB,sdAchC,CAAC;AAEF,eAAO,MAAM,oBAAoB,6BAA6B,CAAC;AAI/D,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAqID,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKvD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAExE;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAMxF;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,sBAAsB,EAAE,EAC1C,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,GAChC,sBAAsB,EAAE,CAQ1B;AAED,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,GAAG,sBAAsB,EAAE,CAKlH;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,SAAS,OAAO,EAAE,EACxB,QAAQ,SAA6B,GACpC,kBAAkB,EAAE,CAEtB;AAED,wBAAiB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC,CAiBnF;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,GAChC,sBAAsB,EAAE,CAW1B;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAElG;AAED,wBAAgB,0BAA0B,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAEtF;AAED,wBAAgB,cAAc,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAS1E;AAED,8FAA8F;AAC9F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAEjG;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,EAAE,CAgBnH"}

package/dist/lib/sqlite/sqlite-common.js

@@ -1,5 +1,7 @@
 import { hasOwn, hasOwnString, isRecord } from '@smoothbricks/validation';
+import { resolveEntryType, resolveMessage } from '../resolveMessage.js';
 import { getSchemaType } from '../schema/typeGuards.js';
+import { iterateSpanTree, NO_NODE } from '../traceTopology.js';
 export const SPANS_TABLE_INIT_SQL = `
   CREATE TABLE IF NOT EXISTS spans (
     trace_id TEXT NOT NULL,
@@ -147,26 +149,23 @@ export function extractSqliteColumnsFromTableInfo(columns) {
 export function parseSqliteTableInfoRows(rows, boundary = 'PRAGMA table_info(spans)') {
     return rows.map((row, rowIndex) => parseSqliteTableInfoRow(row, boundary, rowIndex));
 }
-function* walkOverflowSegments(buffer, traceId, spanId, parentSpanId, rowOffset) {
-    yield {
-        buffer,
-        traceId,
-        spanId,
-        parentSpanId,
-        rowOffset,
-    };
-    if (buffer._overflow) {
-        yield* walkOverflowSegments(buffer._overflow, traceId, spanId, parentSpanId, rowOffset + buffer._writeIndex);
-    }
-}
-function* walkTree(buffer) {
-    yield* walkOverflowSegments(buffer, buffer.trace_id, buffer.span_id, buffer.parent_span_id, 0);
-    for (const child of buffer._children) {
-        yield* walkTree(child);
-    }
-}
 export function* walkSpanSegments(rootBuffer) {
-    yield* walkTree(rootBuffer);
+    let logicalNode = NO_NODE;
+    let rowOffset = 0;
+    for (const buffer of iterateSpanTree(rootBuffer)) {
+        if (buffer._nodeIndex !== logicalNode) {
+            logicalNode = buffer._nodeIndex;
+            rowOffset = 0;
+        }
+        yield {
+            buffer,
+            traceId: buffer.trace_id,
+            spanId: buffer.span_id,
+            parentSpanId: buffer.parent_span_id,
+            rowOffset,
+        };
+        rowOffset += buffer._writeIndex;
+    }
 }
 export function getMissingSchemaColumns(schema, knownColumns) {
     const schemaColumns = [];
@@ -200,9 +199,9 @@ export function readSpanFieldValue(buffer, fieldName, row) {
 }
 export function buildInsertParams(segment, row, activeUserFields) {
     const { buffer, traceId, spanId, parentSpanId, rowOffset } = segment;
-    const entryType = buffer.entry_type[row];
+    const entryType = resolveEntryType(buffer, row);
     const timestampNs = Number(buffer.timestamp[row]);
-    const message = buffer.message_values[row] ?? null;
+    const message = resolveMessage(buffer, row);
     const userValues = activeUserFields.map((fieldName) => {
         const directValue = readUserValue(buffer, fieldName, row);
         const val = directValue ?? readScopeValue(buffer, fieldName);

package/dist/lib/testing/bun-harness.d.ts

@@ -44,9 +44,14 @@ export interface BunTestSuiteTracer<B extends OpContextBinding> {
     useTestSpan(): HarnessSpanContext<B>;
     setupBunTestSuiteTracing(): void;
 }
-export type BunTestSuiteUseTestTracer<B extends OpContextBinding, TExt extends SchemaFields = Record<never, never>> = ReturnType<typeof makeBunTestSuiteTracer<B, TExt>>['useTestTracer'];
+export type BunTestSuiteUseTestTracer<B extends OpContextBinding, TExt extends SchemaFields = Record<never, never>> = BunTestTracerInstance<ExtendBindingLogSchema<B, HarnessSchema<TExt>>>;
 export type TestTracer<B extends OpContextBinding, TExt extends SchemaFields = Record<never, never>> = BunTestSuiteUseTestTracer<B, TExt>;
-type ActiveBunTestTracer = BunTestTracerInstance<OpContextBinding>;
+export interface ActiveBunTestTracer {
+    setup(): void;
+    useTestSpan(): unknown;
+    getTracer(): unknown;
+    createBunTestMock<TModule extends BunTestModuleShape>(bunTestModule: TModule): TModule;
+}
 /** Returns the active suite tracer set by installBunTestTracing(), or null if none is active. */
 export declare function getActiveSuiteTracer(): ActiveBunTestTracer | null;
 export declare function installBunTestTracing(tracer: ActiveBunTestTracer): void;
@@ -97,7 +102,7 @@ export declare function createBunTestMock<TModule extends BunTestModuleShape>(bu
  * `useTestSpan()` preserves the suite-local schema extension instead of falling
  * back to the erased global singleton shape.
  */
-export declare function useTestSpan<TCtx extends SpanContext<OpContextOf<OpContextBinding>>>(): TCtx;
+export declare function useTestSpan<B extends OpContextBinding>(): SpanContext<OpContextOf<B>>;
 /**
  * Get the root tracer instance.
  *

package/dist/lib/testing/bun-harness.d.ts.map

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

package/dist/lib/testing/bun-harness.js

@@ -101,6 +101,12 @@ function extendBindingLogSchema(binding, extension) {
     };
     return extendedBinding;
 }
+function createRuntimeHarnessBinding(binding, options) {
+    const harnessSchema = options?.extraTestColumns === undefined
+        ? buildHarnessSchemaExtensions(binding, undefined)
+        : buildHarnessSchemaExtensions(binding, options.extraTestColumns);
+    return extendBindingLogSchema(binding, harnessSchema);
+}
 function isTruthyEnvFlag(value) {
     return value === true || value === '1' || value === 'true';
 }
@@ -119,6 +125,12 @@ function isTracerForBinding(value, binding) {
         logBinding !== null &&
         Reflect.get(logBinding, 'logSchema') === binding.logBinding.logSchema);
 }
+function isTracerInstance(value) {
+    return (typeof value === 'object' &&
+        value !== null &&
+        typeof Reflect.get(value, 'trace') === 'function' &&
+        typeof Reflect.get(value, 'flush') === 'function');
+}
 function isVerboseTraceEnabled(explicitVerbose) {
     if (explicitVerbose !== undefined) {
         return explicitVerbose;
@@ -201,11 +213,6 @@ export function defineTestTracer(binding, options) {
     return {
         opContext: binding,
         extraTestColumns: options?.extraTestColumns,
-        // WHY no re-validation: the global useTestSpan() already validates against
-        // the active suite tracer's (extended) binding. Re-checking against the
-        // original binding fails when extraTestColumns extend the schema, because
-        // the span's _schema is the extended LogSchema, not the original.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- WHY: useTestSpan() returns SpanContext typed to the suite binding; narrowing to OpContextOf<B> is safe because initTraceTestRun validates the binding matches
         useTestSpan: () => useTestSpan(),
     };
 }
@@ -319,10 +326,7 @@ function createTestTracerInstance(binding, options) {
                 return;
             }
             isSetup = true;
-            const harnessSchema = options?.extraTestColumns === undefined
-                ? buildHarnessSchemaExtensions(binding, undefined)
-                : buildHarnessSchemaExtensions(binding, options.extraTestColumns);
-            const extendedBinding = extendBindingLogSchema(binding, harnessSchema);
+            const extendedBinding = createRuntimeHarnessBinding(binding, options);
             activeBinding = extendedBinding;
             verboseTrace = isVerboseTraceEnabled(options?.verbose);
             const activeTracer = createRootTracer({
@@ -421,13 +425,13 @@ export function initTraceTestRun(opContext, options) {
         logBinding: { ...opContext.logBinding, logSchema: extendedSchema },
     };
     _verboseTrace = isVerboseTraceEnabled(options?.verbose);
-    _tracer = createRootTracer({
+    const tracer = createRootTracer({
         binding: extendedBinding,
         sqlite: options?.sqlite,
         verbose: _verboseTrace,
     });
+    _tracer = tracer;
     // Create the single root trace — a long-lived promise keeps it alive
-    const tracer = _tracer;
     _rootTracePromise = tracer.trace('test-run', (ctx) => {
         _rootCtx = ctx;
         return new Promise((resolve) => {
@@ -451,12 +455,12 @@ export function initTraceTestRun(opContext, options) {
             cleanupDebug('global.rootTrace:await:end');
             _rootTracePromise = null;
         }
-        if (_tracer) {
+        if (isTracerInstance(_tracer)) {
             try {
                 cleanupDebug('global.tracer.flush:start', { tracer: _tracer.constructor.name });
                 await _tracer.flush();
                 cleanupDebug('global.tracer.flush:end', { tracer: _tracer.constructor.name });
-                if (options?.sqlite && _rootCtx) {
+                if (options?.sqlite && isSpanContext(_rootCtx)) {
                     const traceId = _rootCtx.buffer.trace_id;
                     const dbPath = options.sqlite.dbPath ?? '.trace-results.db';
                     console.log(`\n[trace] trace_id: ${traceId} → ${dbPath}`);
@@ -484,7 +488,7 @@ export function initTraceTestRun(opContext, options) {
  * @param bunTestModule - The original bun:test namespace (`import * as bunTest from 'bun:test'`)
  */
 export function createBunTestMock(bunTestModule) {
-    if (!_rootCtx) {
+    if (!isSpanContext(_rootCtx)) {
         if (_activeSuiteTracer) {
             return _activeSuiteTracer.createBunTestMock(bunTestModule);
         }
@@ -554,7 +558,11 @@ export function createBunTestMock(bunTestModule) {
 }
 export function useTestSpan() {
     if (_activeSuiteTracer) {
-        return _activeSuiteTracer.useTestSpan();
+        const ctx = _activeSuiteTracer.useTestSpan();
+        if (!isSpanContext(ctx)) {
+            throw new TypeError('Active test tracer returned an invalid span context');
+        }
+        return ctx;
     }
     const ctx = _als.getStore();
     if (!ctx)
@@ -570,9 +578,13 @@ export function useTestSpan() {
  */
 export function getTracer() {
     if (_activeSuiteTracer) {
-        return _activeSuiteTracer.getTracer();
+        const tracer = _activeSuiteTracer.getTracer();
+        if (!isTracerInstance(tracer)) {
+            throw new TypeError('Active test tracer returned an invalid tracer');
+        }
+        return tracer;
     }
-    if (!_tracer)
+    if (!isTracerInstance(_tracer))
         throw new Error('Call initTraceTestRun() in preload before tests');
     return _tracer;
 }
@@ -653,7 +665,7 @@ assignOptionalBoundTestFunction(describe, 'if', _describe, _describe);
 export function it(name, fn) {
     const describePath = _standaloneDescribeStack.length > 0 ? _standaloneDescribeStack.join(' > ') : null;
     _it(name, () => {
-        if (!_rootCtx)
+        if (!isSpanContext(_rootCtx))
             throw new Error('Call initTraceTestRun() in preload before tests');
         return _rootCtx.span(name, async (ctx) => {
             writeDescribeTag(ctx.tag, describePath);

package/dist/lib/testing/extractFacts.d.ts

@@ -49,7 +49,7 @@ export interface ExtractFactsOptions {
  *
  * Walks the buffer tree depth-first and produces facts for:
  * - Span lifecycle (started, ok, err, exception)
- * - Log entries (info, warn, error, debug)
+ * - Log entries (trace, debug, info, warn, error)
  * - Tag values (from row 0 of each span)
  * - Scope values (propagated through tree)
  * - Feature flag accesses

package/dist/lib/testing/extractFacts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractFacts.d.ts","sourceRoot":"","sources":["../../../src/lib/testing/extractFacts.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAYxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAEL,KAAK,SAAS,EAYf,MAAM,YAAY,CAAC;AAsBpB;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAWD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAC9C,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,EACzB,OAAO,GAAE,mBAAwB,GAChC,SAAS,CAOX"}
+{"version":3,"file":"extractFacts.d.ts","sourceRoot":"","sources":["../../../src/lib/testing/extractFacts.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAcxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAEL,KAAK,SAAS,EAYf,MAAM,YAAY,CAAC;AAsBpB;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAgBD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAC9C,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,EACzB,OAAO,GAAE,mBAAwB,GAChC,SAAS,CA6BX"}

package/dist/lib/testing/extractFacts.js

@@ -6,7 +6,9 @@
  *
  * @module testing/extractFacts
  */
-import { ENTRY_TYPE_DEBUG, ENTRY_TYPE_ERROR, ENTRY_TYPE_FF_ACCESS, ENTRY_TYPE_FF_USAGE, ENTRY_TYPE_INFO, ENTRY_TYPE_SPAN_ERR, ENTRY_TYPE_SPAN_EXCEPTION, ENTRY_TYPE_SPAN_OK, ENTRY_TYPE_WARN, } from '../schema/systemSchema.js';
+import { resolveEntryType, resolveMessage } from '../resolveMessage.js';
+import { ENTRY_TYPE_DEBUG, ENTRY_TYPE_ERROR, ENTRY_TYPE_FF_ACCESS, ENTRY_TYPE_FF_USAGE, ENTRY_TYPE_INFO, ENTRY_TYPE_SPAN_ERR, ENTRY_TYPE_SPAN_EXCEPTION, ENTRY_TYPE_SPAN_OK, ENTRY_TYPE_TRACE, ENTRY_TYPE_WARN, } from '../schema/systemSchema.js';
+import { iterateSpanChildren } from '../traceTopology.js';
 import { createFactArray, ffFact, logFact, metricFact, scopeFact, spanErr, spanException, spanOk, spanStarted, tagFact, } from './facts.js';
 function isUint8Array(value) {
     return value instanceof Uint8Array;
@@ -36,7 +38,7 @@ const DEFAULT_OPTIONS = {
  *
  * Walks the buffer tree depth-first and produces facts for:
  * - Span lifecycle (started, ok, err, exception)
- * - Log entries (info, warn, error, debug)
+ * - Log entries (trace, debug, info, warn, error)
  * - Tag values (from row 0 of each span)
  * - Scope values (propagated through tree)
  * - Feature flag accesses
@@ -59,100 +61,89 @@ const DEFAULT_OPTIONS = {
 export function extractFacts(rootBuffer, options = {}) {
     const opts = { ...DEFAULT_OPTIONS, ...options };
     const facts = [];
-    walkBuffer(rootBuffer, facts, opts);
+    const stack = [{ buffer: rootBuffer }];
+    while (stack.length > 0) {
+        const frame = stack[stack.length - 1];
+        if (!frame)
+            break;
+        if (!frame.children) {
+            if (frame.buffer._writeIndex === 0) {
+                stack.pop();
+                continue;
+            }
+            enterBuffer(frame.buffer, facts, opts);
+            frame.children = iterateSpanChildren(frame.buffer);
+        }
+        const next = frame.children.next();
+        if (!next.done) {
+            stack.push({ buffer: next.value });
+            continue;
+        }
+        leaveBuffer(frame.buffer, facts, opts);
+        stack.pop();
+    }
     return createFactArray(facts);
 }
 /**
  * Walk a buffer and its children, extracting facts.
  */
-function walkBuffer(buffer, facts, opts) {
-    // Span name is in message_values[0] (written by writeSpanStart)
-    const spanName = buffer.message_values[0];
+function enterBuffer(buffer, facts, opts) {
+    const spanName = resolveMessage(buffer, 0) ?? '';
     const writeIndex = buffer._writeIndex;
-    if (writeIndex === 0) {
-        // Empty buffer - no facts to extract
+    if (writeIndex === 0)
         return;
-    }
-    // Always emit span:started as first fact for this span
     facts.push(spanStarted(spanName));
-    // Extract scope facts (from buffer's scope values)
     if (opts.includeScope && buffer._scopeValues) {
         for (const [key, value] of Object.entries(buffer._scopeValues)) {
-            if (value !== undefined && value !== null) {
+            if (value !== undefined && value !== null)
                 facts.push(scopeFact(key, String(value)));
-            }
         }
     }
-    // Extract tag facts from row 0 (ctx.tag writes here)
-    // Also check row 1 (completion row - .with() on ok()/err())
-    // And rows 2+ (log rows - .with() on log.*)
     if (opts.includeTags) {
-        for (let row = 0; row < writeIndex; row++) {
+        for (let row = 0; row < writeIndex; row++)
             extractTagFacts(buffer, row, facts, opts);
-        }
     }
-    // Buffer layout per specs/lmao/01h_entry_types_and_logging_primitives.md:
-    // - Row 0: span-start (tags overwrite this row's attribute columns)
-    // - Row 1: span-ok/err/exception (completion status)
-    // - Row 2+: log entries (info/debug/warn/error), ff entries
-    const entryTypes = buffer.entry_type;
-    const messages = buffer.message_values;
-    // Process log/ff entries from row 2 onwards
     for (let row = 2; row < writeIndex; row++) {
-        const entryType = entryTypes[row];
+        const entryType = resolveEntryType(buffer, row);
         switch (entryType) {
             case ENTRY_TYPE_INFO:
             case ENTRY_TYPE_DEBUG:
             case ENTRY_TYPE_WARN:
-            case ENTRY_TYPE_ERROR: {
-                if (opts.includeLogs) {
-                    const level = entryTypeToLogLevel(entryType);
-                    const rowMessage = messages[row];
-                    const message = typeof rowMessage === 'string' ? rowMessage : '';
-                    facts.push(logFact(level, message));
-                }
+            case ENTRY_TYPE_ERROR:
+            case ENTRY_TYPE_TRACE:
+                if (opts.includeLogs)
+                    facts.push(logFact(entryTypeToLogLevel(entryType), resolveMessage(buffer, row) ?? ''));
                 break;
-            }
             case ENTRY_TYPE_FF_ACCESS:
-            case ENTRY_TYPE_FF_USAGE: {
-                if (opts.includeFF) {
+            case ENTRY_TYPE_FF_USAGE:
+                if (opts.includeFF)
                     extractFFfacts(buffer, row, facts);
-                }
                 break;
-            }
         }
     }
-    // Recurse into children BEFORE completing this span
-    // This maintains the natural execution order in facts
-    for (const child of buffer._children) {
-        walkBuffer(child, facts, opts);
-    }
-    // Completion status is ALWAYS at row 1 (not last row)
-    // Row 1 is pre-initialized as span-exception, overwritten by ok()/err()
+}
+function leaveBuffer(buffer, facts, opts) {
+    const writeIndex = buffer._writeIndex;
+    if (writeIndex === 0)
+        return;
+    const spanName = resolveMessage(buffer, 0) ?? '';
     if (writeIndex >= 2) {
-        const completionEntryType = entryTypes[1];
-        switch (completionEntryType) {
+        switch (resolveEntryType(buffer, 1)) {
             case ENTRY_TYPE_SPAN_OK:
                 facts.push(spanOk(spanName));
                 break;
-            case ENTRY_TYPE_SPAN_ERR: {
-                const errorCode = getErrorCode(buffer, 1);
-                facts.push(spanErr(spanName, errorCode));
+            case ENTRY_TYPE_SPAN_ERR:
+                facts.push(spanErr(spanName, getErrorCode(buffer, 1)));
                 break;
-            }
-            case ENTRY_TYPE_SPAN_EXCEPTION: {
-                const message = getExceptionMessage(buffer, 1);
-                facts.push(spanException(spanName, message));
+            case ENTRY_TYPE_SPAN_EXCEPTION:
+                facts.push(spanException(spanName, getExceptionMessage(buffer, 1)));
                 break;
-            }
         }
     }
-    // Extract duration metric if requested
     if (opts.includeMetrics) {
         const duration = getSpanDuration(buffer);
-        if (duration !== undefined) {
+        if (duration !== undefined)
             facts.push(metricFact(`${spanName}:duration_ns`, Number(duration)));
-        }
     }
 }
 /**
@@ -163,7 +154,7 @@ function extractTagFacts(buffer, row, facts, opts) {
     const fields = opts.tagFields.length > 0 ? opts.tagFields : Object.keys(schema.fields);
     for (const fieldName of fields) {
         // Skip system fields
-        if (fieldName.startsWith('_'))
+        if (fieldName === 'message' || fieldName.startsWith('_'))
             continue;
         const nullsKey = `${fieldName}_nulls`;
         const valuesKey = `${fieldName}_values`;
@@ -185,9 +176,9 @@ function extractTagFacts(buffer, row, facts, opts) {
  */
 function extractFFfacts(buffer, row, facts) {
     // Feature flag entries store the flag name in message_values and the resolved value in ff_value_values.
-    const name = buffer.message_values[row];
+    const name = resolveMessage(buffer, row);
     const value = buffer.ff_value_values[row];
-    if (typeof name === 'string' && typeof value === 'string') {
+    if (name !== undefined && typeof value === 'string') {
         facts.push(ffFact(name, value));
     }
 }
@@ -204,6 +195,8 @@ function isNull(nulls, index) {
  */
 function entryTypeToLogLevel(entryType) {
     switch (entryType) {
+        case ENTRY_TYPE_TRACE:
+            return 'trace';
         case ENTRY_TYPE_DEBUG:
             return 'debug';
         case ENTRY_TYPE_INFO:
@@ -227,8 +220,7 @@ function getErrorCode(buffer, row) {
  * Get exception message from a span-exception row.
  */
 function getExceptionMessage(buffer, row) {
-    const message = buffer.message_values[row];
-    return typeof message === 'string' ? message : 'Unknown exception';
+    return resolveMessage(buffer, row) ?? 'Unknown exception';
 }
 /**
  * Calculate span duration from timestamps.

package/dist/lib/testing/facts.d.ts

@@ -57,7 +57,7 @@ export declare function spanException<N extends string, M extends string>(name:
 /**
  * Log levels.
  */
-export type LogLevel = 'debug' | 'info' | 'warn' | 'error';
+export type LogLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error';
 /**
  * A log fact: `log:${level}: ${message}`
  *

package/dist/lib/testing/facts.d.ts.map

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

package/dist/lib/testing/queryable-span.d.ts

@@ -19,7 +19,7 @@ import type { SpanBuffer } from '../types.js';
 import { type ExtractFactsOptions } from './extractFacts.js';
 import type { FactArray } from './facts.js';
 export interface QueryableSpan<T extends LogSchema = LogSchema> {
-    /** Span name (from message_values[0]) */
+    /** Resolved span name. */
     readonly name: string;
     /** Extract all facts from this span and its children */
     facts(options?: ExtractFactsOptions): FactArray;

package/dist/lib/testing/queryable-span.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryable-span.d.ts","sourceRoot":"","sources":["../../../src/lib/testing/queryable-span.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,KAAK,mBAAmB,EAAgB,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IAC5D,yCAAyC;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,wDAAwD;IACxD,KAAK,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAEhD,kDAAkD;IAClD,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAEjD,iDAAiD;IACjD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IAE1C,yBAAyB;IACzB,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IAEtC,yDAAyD;IACzD,KAAK,IAAI,MAAM,EAAE,CAAC;IAElB,sCAAsC;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CAChC;AAED,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAEtF"}
+{"version":3,"file":"queryable-span.d.ts","sourceRoot":"","sources":["../../../src/lib/testing/queryable-span.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,KAAK,mBAAmB,EAAgB,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IAC5D,0BAA0B;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,wDAAwD;IACxD,KAAK,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAEhD,kDAAkD;IAClD,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAEjD,iDAAiD;IACjD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IAE1C,yBAAyB;IACzB,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IAEtC,yDAAyD;IACzD,KAAK,IAAI,MAAM,EAAE,CAAC;IAElB,sCAAsC;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CAChC;AAED,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAEtF"}

package/dist/lib/testing/queryable-span.js

@@ -14,6 +14,8 @@
  *
  * @module queryable-span
  */
+import { resolveMessage } from '../resolveMessage.js';
+import { iterateSpanChildren, iterateSpanTree } from '../traceTopology.js';
 import { extractFacts } from './extractFacts.js';
 /** Wrap a SpanBuffer as a QueryableSpan for ergonomic test assertions */
 export function querySpan(buffer) {
@@ -25,50 +27,46 @@ class QueryableSpanImpl {
         this.buffer = buffer;
     }
     get name() {
-        return this.buffer.message_values[0];
+        return resolveMessage(this.buffer, 0) ?? '';
     }
     facts(options) {
         return extractFacts(this.buffer, options);
     }
     find(name) {
-        return findInChildren(this.buffer._children, name);
+        for (const descendant of iterateDescendantSpans(this.buffer)) {
+            if (resolveMessage(descendant, 0) === name)
+                return new QueryableSpanImpl(descendant);
+        }
+        return undefined;
     }
     findAll(name) {
         const results = [];
-        collectAll(this.buffer._children, name, results);
+        for (const descendant of iterateDescendantSpans(this.buffer)) {
+            if (resolveMessage(descendant, 0) === name)
+                results.push(new QueryableSpanImpl(descendant));
+        }
         return results;
     }
     get children() {
-        return this.buffer._children.map((child) => new QueryableSpanImpl(child));
-    }
-    names() {
         const result = [];
-        collectNames(this.buffer._children, result);
+        for (const child of iterateSpanChildren(this.buffer))
+            result.push(new QueryableSpanImpl(child));
         return result;
     }
-}
-function findInChildren(children, name) {
-    for (const child of children) {
-        if (child.message_values[0] === name) {
-            return new QueryableSpanImpl(child);
-        }
-        const found = findInChildren(child._children, name);
-        if (found)
-            return found;
-    }
-    return undefined;
-}
-function collectAll(children, name, results) {
-    for (const child of children) {
-        if (child.message_values[0] === name) {
-            results.push(new QueryableSpanImpl(child));
+    names() {
+        const result = [];
+        for (const descendant of iterateDescendantSpans(this.buffer)) {
+            result.push(resolveMessage(descendant, 0) ?? '');
         }
-        collectAll(child._children, name, results);
+        return result;
     }
 }
-function collectNames(children, result) {
-    for (const child of children) {
-        result.push(child.message_values[0]);
-        collectNames(child._children, result);
+function* iterateDescendantSpans(root) {
+    let previousNodeIndex = root._nodeIndex;
+    for (const buffer of iterateSpanTree(root)) {
+        if (buffer._nodeIndex === previousNodeIndex)
+            continue;
+        previousNodeIndex = buffer._nodeIndex;
+        yield buffer;
     }
 }

package/dist/lib/testing/span-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"span-query.d.ts","sourceRoot":"","sources":["../../../src/lib/testing/span-query.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,KAAK,mBAAmB,EAAgB,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,uDAAuD;AACvD,wBAAgB,QAAQ,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAQ1G;AAED,4DAA4D;AAC5D,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,CAIpG;AAED,wEAAwE;AACxE,wBAAgB,eAAe,CAAC,CAAC,SAAS,SAAS,EACjD,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EACnB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,SAAS,GAAG,SAAS,CAIvB;AAED,iEAAiE;AACjE,wBAAgB,SAAS,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,CAI5E"}
+{"version":3,"file":"span-query.d.ts","sourceRoot":"","sources":["../../../src/lib/testing/span-query.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,KAAK,mBAAmB,EAAgB,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,uDAAuD;AACvD,wBAAgB,QAAQ,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAK1G;AAED,4DAA4D;AAC5D,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,CAMpG;AAED,wEAAwE;AACxE,wBAAgB,eAAe,CAAC,CAAC,SAAS,SAAS,EACjD,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EACnB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,SAAS,GAAG,SAAS,CAIvB;AAED,iEAAiE;AACjE,wBAAgB,SAAS,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,CAM5E"}