trickle-observe 0.2.75 → 0.2.77

package/dist/vite-plugin.js

@@ -629,6 +629,139 @@ function findCatchVars(source) {
     }
     return results;
 }
+/**
+ * Find simple JSX text expressions and return insertions for tracing.
+ * Only traces simple expressions in text content positions (after > or between tags):
+ *   <p>{count}</p>              → trace count
+ *   <span>{user.name}</span>    → trace user.name
+ *   <div>{a + b}</div>          → trace a + b (simple binary)
+ *   <p>{x ? 'a' : 'b'}</p>     → trace ternary
+ * Skips: attribute expressions, .map() calls, JSX elements, spread, complex calls.
+ * Uses comma operator: {(__trickle_tv(expr, name, line), expr)} — safe, returns original value.
+ */
+function findJsxExpressions(source) {
+    const results = [];
+    // Find JSX text expressions: characters `>` followed (with optional whitespace/text) by `{expr}`
+    // We look for `{` that follows `>` (possibly with whitespace or text between)
+    // and is NOT preceded by `=` (which would be an attribute value)
+    const jsxExprRegex = /\{/g;
+    let match;
+    while ((match = jsxExprRegex.exec(source)) !== null) {
+        const bracePos = match.index;
+        // Skip if inside a string or comment
+        // Simple check: look at the character before `{`
+        const charBefore = bracePos > 0 ? source[bracePos - 1] : '';
+        // Skip if this is an attribute value: preceded by `=` (with optional whitespace)
+        const beforeSlice = source.slice(Math.max(0, bracePos - 5), bracePos).trimEnd();
+        if (beforeSlice.endsWith('='))
+            continue;
+        // Skip if this looks like a template literal expression `${`
+        if (charBefore === '$')
+            continue;
+        // Skip if preceded by `(` or `,` (function arguments, not JSX)
+        if (charBefore === '(' || charBefore === ',')
+            continue;
+        // Must be in a JSX context: look backward for `>` or `}` (closing tag bracket or prev expression)
+        // before hitting structural JS characters like `{`, `(`, `;`
+        let inJsx = false;
+        let scanPos = bracePos - 1;
+        while (scanPos >= 0) {
+            const ch = source[scanPos];
+            if (ch === '>') {
+                inJsx = true;
+                break;
+            }
+            if (ch === '}') {
+                inJsx = true;
+                break;
+            } // After a previous JSX expression
+            if (ch === '{' || ch === '(' || ch === ';')
+                break;
+            // `=` only breaks if NOT preceded by other text (could be JSX text like "count = 5")
+            if (ch === '=' && scanPos > 0 && /\s/.test(source[scanPos - 1])) {
+                // Check if this `=` is a JSX attribute assignment: look further back for tag
+                const attrCheck = source.slice(Math.max(0, scanPos - 30), scanPos).trim();
+                if (/^[a-zA-Z]/.test(attrCheck))
+                    break; // Likely an attribute
+            }
+            if (ch === '\n') {
+                // Check context of previous lines
+                const lineAbove = source.slice(Math.max(0, scanPos - 100), scanPos);
+                if (/<|>|\}/.test(lineAbove)) {
+                    inJsx = true;
+                    break;
+                }
+                break;
+            }
+            scanPos--;
+        }
+        if (!inJsx)
+            continue;
+        // Find the matching closing `}` for this expression
+        let depth = 1;
+        let pos = bracePos + 1;
+        while (pos < source.length && depth > 0) {
+            const ch = source[pos];
+            if (ch === '{')
+                depth++;
+            else if (ch === '}')
+                depth--;
+            else if (ch === '"' || ch === "'" || ch === '`') {
+                const q = ch;
+                pos++;
+                while (pos < source.length && source[pos] !== q) {
+                    if (source[pos] === '\\')
+                        pos++;
+                    pos++;
+                }
+            }
+            pos++;
+        }
+        if (depth !== 0)
+            continue;
+        const exprEnd = pos - 1; // position of closing `}`
+        const exprText = source.slice(bracePos + 1, exprEnd).trim();
+        // Skip empty expressions
+        if (!exprText)
+            continue;
+        // Skip complex expressions that we don't want to trace:
+        // - JSX elements: contains `<` (could be a component)
+        // - .map/.filter/.reduce calls (return arrays of elements)
+        // - Spread: starts with `...`
+        // - Arrow functions: contains `=>`
+        // - Already traced: starts with `__trickle`
+        if (exprText.includes('<') || exprText.includes('=>'))
+            continue;
+        if (exprText.startsWith('...'))
+            continue;
+        if (exprText.startsWith('__trickle'))
+            continue;
+        if (/\.(map|filter|reduce|forEach|flatMap)\s*\(/.test(exprText))
+            continue;
+        // Skip function calls with parens (complex expressions) — but allow property access
+        // Allow: user.name, count, x ? 'a' : 'b', a + b
+        // Skip: fn(), obj.method(), Component()
+        if (/\w\s*\(/.test(exprText) && !exprText.includes('?'))
+            continue;
+        // Only trace if it's a "simple" expression:
+        // - Identifier: count, name
+        // - Property access: user.name, item.price.formatted
+        // - Simple ternary: x ? 'a' : 'b'
+        // - Simple arithmetic: count * 2, price + tax
+        const isSimple = /^[a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*)*$/.test(exprText) || // identifier/property
+            /^[a-zA-Z_$]/.test(exprText); // starts with identifier (covers ternary, arithmetic)
+        if (!isSimple)
+            continue;
+        // Calculate line number
+        let lineNo = 1;
+        for (let i = 0; i < bracePos; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        results.push({ exprStart: bracePos + 1, exprEnd, exprText, lineNo });
+    }
+    return results;
+}
 function findForLoopVars(source) {
     const results = [];
     // Match: for (const/let/var ...
@@ -1260,7 +1393,9 @@ ingestUrl) {
     const catchInsertions = traceVars ? findCatchVars(source) : [];
     // Find function parameter names for tracing
     const funcParamInsertions = traceVars ? findFunctionParams(source, isReactFile) : [];
-    if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && funcParamInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0)
+    // Find JSX text expressions for tracing (React files only)
+    const jsxExprInsertions = (traceVars && isReactFile) ? findJsxExpressions(source) : [];
+    if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && funcParamInsertions.length === 0 && jsxExprInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0)
         return source;
     // Fix line numbers: Vite transforms (TypeScript stripping) may change line numbers.
     // Map transformed line numbers to original source line numbers.
@@ -1329,7 +1464,7 @@ ingestUrl) {
         }
     }
     // Build prefix — ALL imports first (ESM requires imports before any statements)
-    const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
+    const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0 || jsxExprInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
     const importLines = [];
     if (isSSR) {
         // SSR/Node.js — import trickle-observe for function wrapping + file system for writing
@@ -1364,8 +1499,8 @@ ingestUrl) {
         }
     }
     // Add variable tracing if needed — inlined to avoid import resolution issues in Vite SSR.
-    if (varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0) {
-        prefixLines.push(`if (!globalThis.__trickle_var_tracer) {`, `  const _cache = new Set();`, `  function _inferType(v, d) {`, `    if (d <= 0) return { kind: 'primitive', name: 'unknown' };`, `    if (v === null) return { kind: 'primitive', name: 'null' };`, `    if (v === undefined) return { kind: 'primitive', name: 'undefined' };`, `    const t = typeof v;`, `    if (t === 'string' || t === 'number' || t === 'boolean' || t === 'bigint' || t === 'symbol') return { kind: 'primitive', name: t };`, `    if (t === 'function') return { kind: 'function' };`, `    if (Array.isArray(v)) { return v.length === 0 ? { kind: 'array', element: { kind: 'primitive', name: 'unknown' } } : { kind: 'array', element: _inferType(v[0], d-1) }; }`, `    if (t === 'object') {`, `      if (v instanceof Date) return { kind: 'object', properties: { __date: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof RegExp) return { kind: 'object', properties: { __regexp: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Error) return { kind: 'object', properties: { __error: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Promise) return { kind: 'promise', resolved: { kind: 'primitive', name: 'unknown' } };`, `      const props = {}; const keys = Object.keys(v).slice(0, 20);`, `      for (const k of keys) { try { props[k] = _inferType(v[k], d-1); } catch(e) { props[k] = { kind: 'primitive', name: 'unknown' }; } }`, `      return { kind: 'object', properties: props };`, `    }`, `    return { kind: 'primitive', name: 'unknown' };`, `  }`, `  function _sanitize(v, d) {`, `    if (d <= 0) return '[truncated]'; if (v === null || v === undefined) return v; const t = typeof v;`, `    if (t === 'string') return v.length > 100 ? v.substring(0, 100) + '...' : v;`, `    if (t === 'number' || t === 'boolean') return v; if (t === 'bigint') return String(v);`, `    if (t === 'function') return '[Function: ' + (v.name || 'anonymous') + ']';`, `    if (Array.isArray(v)) return v.slice(0, 3).map(i => _sanitize(i, d-1));`, `    if (t === 'object') { if (v instanceof Date) return v.toISOString(); if (v instanceof RegExp) return String(v); if (v instanceof Error) return { error: v.message }; if (v instanceof Promise) return '[Promise]';`, `      const r = {}; const keys = Object.keys(v).slice(0, 10); for (const k of keys) { try { r[k] = _sanitize(v[k], d-1); } catch(e) { r[k] = '[unreadable]'; } } return r; }`, `    return String(v);`, `  }`, `  globalThis.__trickle_var_tracer = function(v, n, l, mod, file) {`, `    try {`, `      const type = _inferType(v, 3);`, `      const th = JSON.stringify(type).substring(0, 32);`, `      const ck = file + ':' + l + ':' + n + ':' + th;`, `      if (_cache.has(ck)) return;`, `      _cache.add(ck);`, `      __trickle_send(JSON.stringify({ kind: 'variable', varName: n, line: l, module: mod, file: file, type: type, typeHash: th, sample: _sanitize(v, 2) }));`, `    } catch(e) {}`, `  };`, `}`, `function __trickle_tv(v, n, l) { try { globalThis.__trickle_var_tracer(v, n, l, ${JSON.stringify(moduleName)}, ${JSON.stringify(filename)}); } catch(e) {} }`);
+    if (varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0 || jsxExprInsertions.length > 0) {
+        prefixLines.push(`if (!globalThis.__trickle_var_tracer) {`, `  const _cache = new Map();`, `  function _inferType(v, d) {`, `    if (d <= 0) return { kind: 'primitive', name: 'unknown' };`, `    if (v === null) return { kind: 'primitive', name: 'null' };`, `    if (v === undefined) return { kind: 'primitive', name: 'undefined' };`, `    const t = typeof v;`, `    if (t === 'string' || t === 'number' || t === 'boolean' || t === 'bigint' || t === 'symbol') return { kind: 'primitive', name: t };`, `    if (t === 'function') return { kind: 'function' };`, `    if (Array.isArray(v)) { return v.length === 0 ? { kind: 'array', element: { kind: 'primitive', name: 'unknown' } } : { kind: 'array', element: _inferType(v[0], d-1) }; }`, `    if (t === 'object') {`, `      if (v instanceof Date) return { kind: 'object', properties: { __date: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof RegExp) return { kind: 'object', properties: { __regexp: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Error) return { kind: 'object', properties: { __error: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Promise) return { kind: 'promise', resolved: { kind: 'primitive', name: 'unknown' } };`, `      const props = {}; const keys = Object.keys(v).slice(0, 20);`, `      for (const k of keys) { try { props[k] = _inferType(v[k], d-1); } catch(e) { props[k] = { kind: 'primitive', name: 'unknown' }; } }`, `      return { kind: 'object', properties: props };`, `    }`, `    return { kind: 'primitive', name: 'unknown' };`, `  }`, `  function _sanitize(v, d) {`, `    if (d <= 0) return '[truncated]'; if (v === null || v === undefined) return v; const t = typeof v;`, `    if (t === 'string') return v.length > 100 ? v.substring(0, 100) + '...' : v;`, `    if (t === 'number' || t === 'boolean') return v; if (t === 'bigint') return String(v);`, `    if (t === 'function') return '[Function: ' + (v.name || 'anonymous') + ']';`, `    if (Array.isArray(v)) return v.slice(0, 3).map(i => _sanitize(i, d-1));`, `    if (t === 'object') { if (v instanceof Date) return v.toISOString(); if (v instanceof RegExp) return String(v); if (v instanceof Error) return { error: v.message }; if (v instanceof Promise) return '[Promise]';`, `      const r = {}; const keys = Object.keys(v).slice(0, 10); for (const k of keys) { try { r[k] = _sanitize(v[k], d-1); } catch(e) { r[k] = '[unreadable]'; } } return r; }`, `    return String(v);`, `  }`, `  globalThis.__trickle_var_tracer = function(v, n, l, mod, file) {`, `    try {`, `      const type = _inferType(v, 3);`, `      const th = JSON.stringify(type).substring(0, 32);`, `      const sample = _sanitize(v, 2);`, `      const sv = typeof v === 'object' && v !== null ? JSON.stringify(sample).substring(0, 60) : String(v).substring(0, 60);`, `      const ck = file + ':' + l + ':' + n;`, `      const prev = _cache.get(ck);`, `      const now = Date.now();`, `      if (prev && prev.sv === sv && now - prev.ts < 5000) return;`, `      _cache.set(ck, { sv: sv, ts: now });`, `      __trickle_send(JSON.stringify({ kind: 'variable', varName: n, line: l, module: mod, file: file, type: type, typeHash: th, sample: sample }));`, `    } catch(e) {}`, `  };`, `}`, `function __trickle_tv(v, n, l) { try { globalThis.__trickle_var_tracer(v, n, l, ${JSON.stringify(moduleName)}, ${JSON.stringify(filename)}); } catch(e) {} }`);
     }
     // Add React component render tracker if needed
     if (bodyInsertions.length > 0 || conciseBodyInsertions.length > 0) {
@@ -1433,6 +1568,20 @@ ingestUrl) {
             code: `\ntry{${calls}}catch(__e){}\n`,
         });
     }
+    // JSX expression insertions: wrap with comma operator to trace without changing value
+    // {expr} → {(__trickle_tv(expr, "expr", lineNo), expr)}
+    for (const { exprStart, exprEnd, exprText, lineNo } of jsxExprInsertions) {
+        // Use a display name: truncate long expressions, use the raw text
+        const displayName = exprText.length > 30 ? exprText.slice(0, 27) + '...' : exprText;
+        allInsertions.push({
+            position: exprStart,
+            code: `(__trickle_tv(`,
+        });
+        allInsertions.push({
+            position: exprEnd,
+            code: `,${JSON.stringify(displayName)},${lineNo}),${exprText})`,
+        });
+    }
     for (const { position, name, lineNo, propsExpr } of bodyInsertions) {
         allInsertions.push({
             position,

package/dist-esm/vite-plugin.js

@@ -622,6 +622,139 @@ function findCatchVars(source) {
     }
     return results;
 }
+/**
+ * Find simple JSX text expressions and return insertions for tracing.
+ * Only traces simple expressions in text content positions (after > or between tags):
+ *   <p>{count}</p>              → trace count
+ *   <span>{user.name}</span>    → trace user.name
+ *   <div>{a + b}</div>          → trace a + b (simple binary)
+ *   <p>{x ? 'a' : 'b'}</p>     → trace ternary
+ * Skips: attribute expressions, .map() calls, JSX elements, spread, complex calls.
+ * Uses comma operator: {(__trickle_tv(expr, name, line), expr)} — safe, returns original value.
+ */
+function findJsxExpressions(source) {
+    const results = [];
+    // Find JSX text expressions: characters `>` followed (with optional whitespace/text) by `{expr}`
+    // We look for `{` that follows `>` (possibly with whitespace or text between)
+    // and is NOT preceded by `=` (which would be an attribute value)
+    const jsxExprRegex = /\{/g;
+    let match;
+    while ((match = jsxExprRegex.exec(source)) !== null) {
+        const bracePos = match.index;
+        // Skip if inside a string or comment
+        // Simple check: look at the character before `{`
+        const charBefore = bracePos > 0 ? source[bracePos - 1] : '';
+        // Skip if this is an attribute value: preceded by `=` (with optional whitespace)
+        const beforeSlice = source.slice(Math.max(0, bracePos - 5), bracePos).trimEnd();
+        if (beforeSlice.endsWith('='))
+            continue;
+        // Skip if this looks like a template literal expression `${`
+        if (charBefore === '$')
+            continue;
+        // Skip if preceded by `(` or `,` (function arguments, not JSX)
+        if (charBefore === '(' || charBefore === ',')
+            continue;
+        // Must be in a JSX context: look backward for `>` or `}` (closing tag bracket or prev expression)
+        // before hitting structural JS characters like `{`, `(`, `;`
+        let inJsx = false;
+        let scanPos = bracePos - 1;
+        while (scanPos >= 0) {
+            const ch = source[scanPos];
+            if (ch === '>') {
+                inJsx = true;
+                break;
+            }
+            if (ch === '}') {
+                inJsx = true;
+                break;
+            } // After a previous JSX expression
+            if (ch === '{' || ch === '(' || ch === ';')
+                break;
+            // `=` only breaks if NOT preceded by other text (could be JSX text like "count = 5")
+            if (ch === '=' && scanPos > 0 && /\s/.test(source[scanPos - 1])) {
+                // Check if this `=` is a JSX attribute assignment: look further back for tag
+                const attrCheck = source.slice(Math.max(0, scanPos - 30), scanPos).trim();
+                if (/^[a-zA-Z]/.test(attrCheck))
+                    break; // Likely an attribute
+            }
+            if (ch === '\n') {
+                // Check context of previous lines
+                const lineAbove = source.slice(Math.max(0, scanPos - 100), scanPos);
+                if (/<|>|\}/.test(lineAbove)) {
+                    inJsx = true;
+                    break;
+                }
+                break;
+            }
+            scanPos--;
+        }
+        if (!inJsx)
+            continue;
+        // Find the matching closing `}` for this expression
+        let depth = 1;
+        let pos = bracePos + 1;
+        while (pos < source.length && depth > 0) {
+            const ch = source[pos];
+            if (ch === '{')
+                depth++;
+            else if (ch === '}')
+                depth--;
+            else if (ch === '"' || ch === "'" || ch === '`') {
+                const q = ch;
+                pos++;
+                while (pos < source.length && source[pos] !== q) {
+                    if (source[pos] === '\\')
+                        pos++;
+                    pos++;
+                }
+            }
+            pos++;
+        }
+        if (depth !== 0)
+            continue;
+        const exprEnd = pos - 1; // position of closing `}`
+        const exprText = source.slice(bracePos + 1, exprEnd).trim();
+        // Skip empty expressions
+        if (!exprText)
+            continue;
+        // Skip complex expressions that we don't want to trace:
+        // - JSX elements: contains `<` (could be a component)
+        // - .map/.filter/.reduce calls (return arrays of elements)
+        // - Spread: starts with `...`
+        // - Arrow functions: contains `=>`
+        // - Already traced: starts with `__trickle`
+        if (exprText.includes('<') || exprText.includes('=>'))
+            continue;
+        if (exprText.startsWith('...'))
+            continue;
+        if (exprText.startsWith('__trickle'))
+            continue;
+        if (/\.(map|filter|reduce|forEach|flatMap)\s*\(/.test(exprText))
+            continue;
+        // Skip function calls with parens (complex expressions) — but allow property access
+        // Allow: user.name, count, x ? 'a' : 'b', a + b
+        // Skip: fn(), obj.method(), Component()
+        if (/\w\s*\(/.test(exprText) && !exprText.includes('?'))
+            continue;
+        // Only trace if it's a "simple" expression:
+        // - Identifier: count, name
+        // - Property access: user.name, item.price.formatted
+        // - Simple ternary: x ? 'a' : 'b'
+        // - Simple arithmetic: count * 2, price + tax
+        const isSimple = /^[a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*)*$/.test(exprText) || // identifier/property
+            /^[a-zA-Z_$]/.test(exprText); // starts with identifier (covers ternary, arithmetic)
+        if (!isSimple)
+            continue;
+        // Calculate line number
+        let lineNo = 1;
+        for (let i = 0; i < bracePos; i++) {
+            if (source[i] === '\n')
+                lineNo++;
+        }
+        results.push({ exprStart: bracePos + 1, exprEnd, exprText, lineNo });
+    }
+    return results;
+}
 function findForLoopVars(source) {
     const results = [];
     // Match: for (const/let/var ...
@@ -1253,7 +1386,9 @@ ingestUrl) {
     const catchInsertions = traceVars ? findCatchVars(source) : [];
     // Find function parameter names for tracing
     const funcParamInsertions = traceVars ? findFunctionParams(source, isReactFile) : [];
-    if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && funcParamInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0)
+    // Find JSX text expressions for tracing (React files only)
+    const jsxExprInsertions = (traceVars && isReactFile) ? findJsxExpressions(source) : [];
+    if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && funcParamInsertions.length === 0 && jsxExprInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0)
         return source;
     // Fix line numbers: Vite transforms (TypeScript stripping) may change line numbers.
     // Map transformed line numbers to original source line numbers.
@@ -1322,7 +1457,7 @@ ingestUrl) {
         }
     }
     // Build prefix — ALL imports first (ESM requires imports before any statements)
-    const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
+    const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0 || jsxExprInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
     const importLines = [];
     if (isSSR) {
         // SSR/Node.js — import trickle-observe for function wrapping + file system for writing
@@ -1357,8 +1492,8 @@ ingestUrl) {
         }
     }
     // Add variable tracing if needed — inlined to avoid import resolution issues in Vite SSR.
-    if (varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0) {
-        prefixLines.push(`if (!globalThis.__trickle_var_tracer) {`, `  const _cache = new Set();`, `  function _inferType(v, d) {`, `    if (d <= 0) return { kind: 'primitive', name: 'unknown' };`, `    if (v === null) return { kind: 'primitive', name: 'null' };`, `    if (v === undefined) return { kind: 'primitive', name: 'undefined' };`, `    const t = typeof v;`, `    if (t === 'string' || t === 'number' || t === 'boolean' || t === 'bigint' || t === 'symbol') return { kind: 'primitive', name: t };`, `    if (t === 'function') return { kind: 'function' };`, `    if (Array.isArray(v)) { return v.length === 0 ? { kind: 'array', element: { kind: 'primitive', name: 'unknown' } } : { kind: 'array', element: _inferType(v[0], d-1) }; }`, `    if (t === 'object') {`, `      if (v instanceof Date) return { kind: 'object', properties: { __date: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof RegExp) return { kind: 'object', properties: { __regexp: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Error) return { kind: 'object', properties: { __error: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Promise) return { kind: 'promise', resolved: { kind: 'primitive', name: 'unknown' } };`, `      const props = {}; const keys = Object.keys(v).slice(0, 20);`, `      for (const k of keys) { try { props[k] = _inferType(v[k], d-1); } catch(e) { props[k] = { kind: 'primitive', name: 'unknown' }; } }`, `      return { kind: 'object', properties: props };`, `    }`, `    return { kind: 'primitive', name: 'unknown' };`, `  }`, `  function _sanitize(v, d) {`, `    if (d <= 0) return '[truncated]'; if (v === null || v === undefined) return v; const t = typeof v;`, `    if (t === 'string') return v.length > 100 ? v.substring(0, 100) + '...' : v;`, `    if (t === 'number' || t === 'boolean') return v; if (t === 'bigint') return String(v);`, `    if (t === 'function') return '[Function: ' + (v.name || 'anonymous') + ']';`, `    if (Array.isArray(v)) return v.slice(0, 3).map(i => _sanitize(i, d-1));`, `    if (t === 'object') { if (v instanceof Date) return v.toISOString(); if (v instanceof RegExp) return String(v); if (v instanceof Error) return { error: v.message }; if (v instanceof Promise) return '[Promise]';`, `      const r = {}; const keys = Object.keys(v).slice(0, 10); for (const k of keys) { try { r[k] = _sanitize(v[k], d-1); } catch(e) { r[k] = '[unreadable]'; } } return r; }`, `    return String(v);`, `  }`, `  globalThis.__trickle_var_tracer = function(v, n, l, mod, file) {`, `    try {`, `      const type = _inferType(v, 3);`, `      const th = JSON.stringify(type).substring(0, 32);`, `      const ck = file + ':' + l + ':' + n + ':' + th;`, `      if (_cache.has(ck)) return;`, `      _cache.add(ck);`, `      __trickle_send(JSON.stringify({ kind: 'variable', varName: n, line: l, module: mod, file: file, type: type, typeHash: th, sample: _sanitize(v, 2) }));`, `    } catch(e) {}`, `  };`, `}`, `function __trickle_tv(v, n, l) { try { globalThis.__trickle_var_tracer(v, n, l, ${JSON.stringify(moduleName)}, ${JSON.stringify(filename)}); } catch(e) {} }`);
+    if (varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0 || jsxExprInsertions.length > 0) {
+        prefixLines.push(`if (!globalThis.__trickle_var_tracer) {`, `  const _cache = new Map();`, `  function _inferType(v, d) {`, `    if (d <= 0) return { kind: 'primitive', name: 'unknown' };`, `    if (v === null) return { kind: 'primitive', name: 'null' };`, `    if (v === undefined) return { kind: 'primitive', name: 'undefined' };`, `    const t = typeof v;`, `    if (t === 'string' || t === 'number' || t === 'boolean' || t === 'bigint' || t === 'symbol') return { kind: 'primitive', name: t };`, `    if (t === 'function') return { kind: 'function' };`, `    if (Array.isArray(v)) { return v.length === 0 ? { kind: 'array', element: { kind: 'primitive', name: 'unknown' } } : { kind: 'array', element: _inferType(v[0], d-1) }; }`, `    if (t === 'object') {`, `      if (v instanceof Date) return { kind: 'object', properties: { __date: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof RegExp) return { kind: 'object', properties: { __regexp: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Error) return { kind: 'object', properties: { __error: { kind: 'primitive', name: 'string' } } };`, `      if (v instanceof Promise) return { kind: 'promise', resolved: { kind: 'primitive', name: 'unknown' } };`, `      const props = {}; const keys = Object.keys(v).slice(0, 20);`, `      for (const k of keys) { try { props[k] = _inferType(v[k], d-1); } catch(e) { props[k] = { kind: 'primitive', name: 'unknown' }; } }`, `      return { kind: 'object', properties: props };`, `    }`, `    return { kind: 'primitive', name: 'unknown' };`, `  }`, `  function _sanitize(v, d) {`, `    if (d <= 0) return '[truncated]'; if (v === null || v === undefined) return v; const t = typeof v;`, `    if (t === 'string') return v.length > 100 ? v.substring(0, 100) + '...' : v;`, `    if (t === 'number' || t === 'boolean') return v; if (t === 'bigint') return String(v);`, `    if (t === 'function') return '[Function: ' + (v.name || 'anonymous') + ']';`, `    if (Array.isArray(v)) return v.slice(0, 3).map(i => _sanitize(i, d-1));`, `    if (t === 'object') { if (v instanceof Date) return v.toISOString(); if (v instanceof RegExp) return String(v); if (v instanceof Error) return { error: v.message }; if (v instanceof Promise) return '[Promise]';`, `      const r = {}; const keys = Object.keys(v).slice(0, 10); for (const k of keys) { try { r[k] = _sanitize(v[k], d-1); } catch(e) { r[k] = '[unreadable]'; } } return r; }`, `    return String(v);`, `  }`, `  globalThis.__trickle_var_tracer = function(v, n, l, mod, file) {`, `    try {`, `      const type = _inferType(v, 3);`, `      const th = JSON.stringify(type).substring(0, 32);`, `      const sample = _sanitize(v, 2);`, `      const sv = typeof v === 'object' && v !== null ? JSON.stringify(sample).substring(0, 60) : String(v).substring(0, 60);`, `      const ck = file + ':' + l + ':' + n;`, `      const prev = _cache.get(ck);`, `      const now = Date.now();`, `      if (prev && prev.sv === sv && now - prev.ts < 5000) return;`, `      _cache.set(ck, { sv: sv, ts: now });`, `      __trickle_send(JSON.stringify({ kind: 'variable', varName: n, line: l, module: mod, file: file, type: type, typeHash: th, sample: sample }));`, `    } catch(e) {}`, `  };`, `}`, `function __trickle_tv(v, n, l) { try { globalThis.__trickle_var_tracer(v, n, l, ${JSON.stringify(moduleName)}, ${JSON.stringify(filename)}); } catch(e) {} }`);
     }
     // Add React component render tracker if needed
     if (bodyInsertions.length > 0 || conciseBodyInsertions.length > 0) {
@@ -1426,6 +1561,20 @@ ingestUrl) {
             code: `\ntry{${calls}}catch(__e){}\n`,
         });
     }
+    // JSX expression insertions: wrap with comma operator to trace without changing value
+    // {expr} → {(__trickle_tv(expr, "expr", lineNo), expr)}
+    for (const { exprStart, exprEnd, exprText, lineNo } of jsxExprInsertions) {
+        // Use a display name: truncate long expressions, use the raw text
+        const displayName = exprText.length > 30 ? exprText.slice(0, 27) + '...' : exprText;
+        allInsertions.push({
+            position: exprStart,
+            code: `(__trickle_tv(`,
+        });
+        allInsertions.push({
+            position: exprEnd,
+            code: `,${JSON.stringify(displayName)},${lineNo}),${exprText})`,
+        });
+    }
     for (const { position, name, lineNo, propsExpr } of bodyInsertions) {
         allInsertions.push({
             position,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trickle-observe",
-  "version": "0.2.75",
+  "version": "0.2.77",
   "description": "Runtime type observability for JavaScript applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/vite-plugin.ts

@@ -599,6 +599,127 @@ function findCatchVars(source: string): Array<{ bodyStart: number; varNames: str
   return results;
 }
 
+/**
+ * Find simple JSX text expressions and return insertions for tracing.
+ * Only traces simple expressions in text content positions (after > or between tags):
+ *   <p>{count}</p>              → trace count
+ *   <span>{user.name}</span>    → trace user.name
+ *   <div>{a + b}</div>          → trace a + b (simple binary)
+ *   <p>{x ? 'a' : 'b'}</p>     → trace ternary
+ * Skips: attribute expressions, .map() calls, JSX elements, spread, complex calls.
+ * Uses comma operator: {(__trickle_tv(expr, name, line), expr)} — safe, returns original value.
+ */
+function findJsxExpressions(source: string): Array<{ exprStart: number; exprEnd: number; exprText: string; lineNo: number }> {
+  const results: Array<{ exprStart: number; exprEnd: number; exprText: string; lineNo: number }> = [];
+
+  // Find JSX text expressions: characters `>` followed (with optional whitespace/text) by `{expr}`
+  // We look for `{` that follows `>` (possibly with whitespace or text between)
+  // and is NOT preceded by `=` (which would be an attribute value)
+  const jsxExprRegex = /\{/g;
+  let match;
+
+  while ((match = jsxExprRegex.exec(source)) !== null) {
+    const bracePos = match.index;
+
+    // Skip if inside a string or comment
+    // Simple check: look at the character before `{`
+    const charBefore = bracePos > 0 ? source[bracePos - 1] : '';
+
+    // Skip if this is an attribute value: preceded by `=` (with optional whitespace)
+    const beforeSlice = source.slice(Math.max(0, bracePos - 5), bracePos).trimEnd();
+    if (beforeSlice.endsWith('=')) continue;
+
+    // Skip if this looks like a template literal expression `${`
+    if (charBefore === '$') continue;
+
+    // Skip if preceded by `(` or `,` (function arguments, not JSX)
+    if (charBefore === '(' || charBefore === ',') continue;
+
+    // Must be in a JSX context: look backward for `>` or `}` (closing tag bracket or prev expression)
+    // before hitting structural JS characters like `{`, `(`, `;`
+    let inJsx = false;
+    let scanPos = bracePos - 1;
+    while (scanPos >= 0) {
+      const ch = source[scanPos];
+      if (ch === '>') { inJsx = true; break; }
+      if (ch === '}') { inJsx = true; break; } // After a previous JSX expression
+      if (ch === '{' || ch === '(' || ch === ';') break;
+      // `=` only breaks if NOT preceded by other text (could be JSX text like "count = 5")
+      if (ch === '=' && scanPos > 0 && /\s/.test(source[scanPos - 1])) {
+        // Check if this `=` is a JSX attribute assignment: look further back for tag
+        const attrCheck = source.slice(Math.max(0, scanPos - 30), scanPos).trim();
+        if (/^[a-zA-Z]/.test(attrCheck)) break; // Likely an attribute
+      }
+      if (ch === '\n') {
+        // Check context of previous lines
+        const lineAbove = source.slice(Math.max(0, scanPos - 100), scanPos);
+        if (/<|>|\}/.test(lineAbove)) { inJsx = true; break; }
+        break;
+      }
+      scanPos--;
+    }
+    if (!inJsx) continue;
+
+    // Find the matching closing `}` for this expression
+    let depth = 1;
+    let pos = bracePos + 1;
+    while (pos < source.length && depth > 0) {
+      const ch = source[pos];
+      if (ch === '{') depth++;
+      else if (ch === '}') depth--;
+      else if (ch === '"' || ch === "'" || ch === '`') {
+        const q = ch; pos++;
+        while (pos < source.length && source[pos] !== q) {
+          if (source[pos] === '\\') pos++;
+          pos++;
+        }
+      }
+      pos++;
+    }
+    if (depth !== 0) continue;
+
+    const exprEnd = pos - 1; // position of closing `}`
+    const exprText = source.slice(bracePos + 1, exprEnd).trim();
+
+    // Skip empty expressions
+    if (!exprText) continue;
+
+    // Skip complex expressions that we don't want to trace:
+    // - JSX elements: contains `<` (could be a component)
+    // - .map/.filter/.reduce calls (return arrays of elements)
+    // - Spread: starts with `...`
+    // - Arrow functions: contains `=>`
+    // - Already traced: starts with `__trickle`
+    if (exprText.includes('<') || exprText.includes('=>')) continue;
+    if (exprText.startsWith('...')) continue;
+    if (exprText.startsWith('__trickle')) continue;
+    if (/\.(map|filter|reduce|forEach|flatMap)\s*\(/.test(exprText)) continue;
+    // Skip function calls with parens (complex expressions) — but allow property access
+    // Allow: user.name, count, x ? 'a' : 'b', a + b
+    // Skip: fn(), obj.method(), Component()
+    if (/\w\s*\(/.test(exprText) && !exprText.includes('?')) continue;
+
+    // Only trace if it's a "simple" expression:
+    // - Identifier: count, name
+    // - Property access: user.name, item.price.formatted
+    // - Simple ternary: x ? 'a' : 'b'
+    // - Simple arithmetic: count * 2, price + tax
+    const isSimple = /^[a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*)*$/.test(exprText) || // identifier/property
+      /^[a-zA-Z_$]/.test(exprText); // starts with identifier (covers ternary, arithmetic)
+    if (!isSimple) continue;
+
+    // Calculate line number
+    let lineNo = 1;
+    for (let i = 0; i < bracePos; i++) {
+      if (source[i] === '\n') lineNo++;
+    }
+
+    results.push({ exprStart: bracePos + 1, exprEnd, exprText, lineNo });
+  }
+
+  return results;
+}
+
 function findForLoopVars(source: string): Array<{ bodyStart: number; varNames: string[]; lineNo: number }> {
   const results: Array<{ bodyStart: number; varNames: string[]; lineNo: number }> = [];
 
@@ -1250,7 +1371,10 @@ export function transformEsmSource(
   // Find function parameter names for tracing
   const funcParamInsertions = traceVars ? findFunctionParams(source, isReactFile) : [];
 
-  if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && funcParamInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0) return source;
+  // Find JSX text expressions for tracing (React files only)
+  const jsxExprInsertions = (traceVars && isReactFile) ? findJsxExpressions(source) : [];
+
+  if (funcInsertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && funcParamInsertions.length === 0 && jsxExprInsertions.length === 0 && bodyInsertions.length === 0 && hookInsertions.length === 0 && stateInsertions.length === 0 && conciseBodyInsertions.length === 0) return source;
 
   // Fix line numbers: Vite transforms (TypeScript stripping) may change line numbers.
   // Map transformed line numbers to original source line numbers.
@@ -1318,7 +1442,7 @@ export function transformEsmSource(
   }
 
   // Build prefix — ALL imports first (ESM requires imports before any statements)
-  const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
+  const needsTracing = varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0 || jsxExprInsertions.length > 0 || bodyInsertions.length > 0 || hookInsertions.length > 0 || stateInsertions.length > 0 || conciseBodyInsertions.length > 0;
   const importLines: string[] = [];
 
   if (isSSR) {
@@ -1420,10 +1544,10 @@ export function transformEsmSource(
   }
 
   // Add variable tracing if needed — inlined to avoid import resolution issues in Vite SSR.
-  if (varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0) {
+  if (varInsertions.length > 0 || destructInsertions.length > 0 || reassignInsertions.length > 0 || forLoopInsertions.length > 0 || catchInsertions.length > 0 || funcParamInsertions.length > 0 || jsxExprInsertions.length > 0) {
     prefixLines.push(
       `if (!globalThis.__trickle_var_tracer) {`,
-      `  const _cache = new Set();`,
+      `  const _cache = new Map();`,
       `  function _inferType(v, d) {`,
       `    if (d <= 0) return { kind: 'primitive', name: 'unknown' };`,
       `    if (v === null) return { kind: 'primitive', name: 'null' };`,
@@ -1457,10 +1581,14 @@ export function transformEsmSource(
       `    try {`,
       `      const type = _inferType(v, 3);`,
       `      const th = JSON.stringify(type).substring(0, 32);`,
-      `      const ck = file + ':' + l + ':' + n + ':' + th;`,
-      `      if (_cache.has(ck)) return;`,
-      `      _cache.add(ck);`,
-      `      __trickle_send(JSON.stringify({ kind: 'variable', varName: n, line: l, module: mod, file: file, type: type, typeHash: th, sample: _sanitize(v, 2) }));`,
+      `      const sample = _sanitize(v, 2);`,
+      `      const sv = typeof v === 'object' && v !== null ? JSON.stringify(sample).substring(0, 60) : String(v).substring(0, 60);`,
+      `      const ck = file + ':' + l + ':' + n;`,
+      `      const prev = _cache.get(ck);`,
+      `      const now = Date.now();`,
+      `      if (prev && prev.sv === sv && now - prev.ts < 5000) return;`,
+      `      _cache.set(ck, { sv: sv, ts: now });`,
+      `      __trickle_send(JSON.stringify({ kind: 'variable', varName: n, line: l, module: mod, file: file, type: type, typeHash: th, sample: sample }));`,
       `    } catch(e) {}`,
       `  };`,
       `}`,
@@ -1626,6 +1754,21 @@ export function transformEsmSource(
     });
   }
 
+  // JSX expression insertions: wrap with comma operator to trace without changing value
+  // {expr} → {(__trickle_tv(expr, "expr", lineNo), expr)}
+  for (const { exprStart, exprEnd, exprText, lineNo } of jsxExprInsertions) {
+    // Use a display name: truncate long expressions, use the raw text
+    const displayName = exprText.length > 30 ? exprText.slice(0, 27) + '...' : exprText;
+    allInsertions.push({
+      position: exprStart,
+      code: `(__trickle_tv(`,
+    });
+    allInsertions.push({
+      position: exprEnd,
+      code: `,${JSON.stringify(displayName)},${lineNo}),${exprText})`,
+    });
+  }
+
   for (const { position, name, lineNo, propsExpr } of bodyInsertions) {
     allInsertions.push({
       position,