trickle-observe 0.2.79 → 0.2.81

package/dist/observe-register.js

@@ -396,9 +396,10 @@ function transformCjsSource(source, filename, moduleName, env) {
         // Skip common false positives
         if (name === 'require' || name === 'exports' || name === 'module')
             continue;
-        // Find the opening brace of the function body
+        // Find the opening brace of the function body, correctly skipping
+        // default parameter values like `headers = {}` which contain braces
         const afterMatch = match.index + match[0].length;
-        const openBrace = source.indexOf('{', afterMatch);
+        const openBrace = (0, vite_plugin_1.findFunctionBodyBrace)(source, afterMatch);
         if (openBrace === -1)
             continue;
         // Extract parameter names from the source between ( and {
@@ -539,12 +540,13 @@ function transformCjsSource(source, filename, moduleName, env) {
             destructInsertions = findDestructuredDeclarations(source);
         }
     }
-    // Additional variable patterns: reassignments, for-loops, catch clauses, function params
+    // Additional variable patterns: reassignments, for-loops, catch clauses
+    // Note: function params are NOT traced here because observe-register already
+    // wraps functions with __trickle_wrap which captures param types via wrapFunction.
     const reassignInsertions = (0, vite_plugin_1.findReassignments)(source);
     const forLoopInsertions = (0, vite_plugin_1.findForLoopVars)(source);
     const catchInsertions = (0, vite_plugin_1.findCatchVars)(source);
-    const funcParamInsertions = (0, vite_plugin_1.findFunctionParams)(source, false);
-    if (insertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && funcParamInsertions.length === 0 && classInsertions.length === 0)
+    if (insertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && classInsertions.length === 0)
         return source;
     // Resolve the path to the wrap helper (compiled JS)
     const wrapHelperPath = path_1.default.join(__dirname, 'wrap.js');
@@ -567,7 +569,7 @@ function transformCjsSource(source, filename, moduleName, env) {
         `};`,
     ];
     // Add variable tracing helper if we have var insertions
-    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) {
         const traceVarPath = path_1.default.join(__dirname, 'trace-var.js');
         prefixLines.push(`var __trickle_tv_mod = require(${JSON.stringify(traceVarPath)});`, `var __trickle_tv = function(v, n, l) { try { __trickle_tv_mod.traceVar(v, n, l, ${JSON.stringify(moduleName)}, ${JSON.stringify(filename)}); } catch(e){} };`);
     }
@@ -617,14 +619,6 @@ function transformCjsSource(source, filename, moduleName, env) {
             code: `\ntry{${calls}}catch(__e2){}\n`,
         });
     }
-    // Function parameter insertions
-    for (const { bodyStart, paramNames, lineNo } of funcParamInsertions) {
-        const calls = paramNames.map(n => `__trickle_tv(${n},${JSON.stringify(n)},${lineNo})`).join(';');
-        allInsertions.push({
-            position: bodyStart,
-            code: `\ntry{${calls}}catch(__e){}\n`,
-        });
-    }
     // Add class method wrappings
     for (const ci of classInsertions) {
         allInsertions.push(ci);

package/dist/vite-plugin.d.ts

@@ -40,6 +40,13 @@ export declare function tricklePlugin(options?: TricklePluginOptions): {
         map: null;
     } | null;
 };
+/**
+ * Find the opening brace of a function body, skipping the parameter list.
+ * Starting from the character right after the opening `(` of the parameter list,
+ * scans forward matching parens to find the closing `)`, then finds the `{` after it.
+ * Returns -1 if not found.
+ */
+export declare function findFunctionBodyBrace(source: string, afterOpenParen: number): number;
 /**
  * Find variable reassignments (not declarations) and return insertions for tracing.
  * Handles: x = newValue; x += 1; x ||= fallback; etc.

package/dist/vite-plugin.js

@@ -23,6 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tricklePlugin = tricklePlugin;
+exports.findFunctionBodyBrace = findFunctionBodyBrace;
 exports.findReassignments = findReassignments;
 exports.findCatchVars = findCatchVars;
 exports.findForLoopVars = findForLoopVars;

package/dist-esm/vite-plugin.js

@@ -114,7 +114,7 @@ export function tricklePlugin(options = {}) {
  * scans forward matching parens to find the closing `)`, then finds the `{` after it.
  * Returns -1 if not found.
  */
-function findFunctionBodyBrace(source, afterOpenParen) {
+export function findFunctionBodyBrace(source, afterOpenParen) {
     let depth = 1;
     let pos = afterOpenParen;
     // Skip the parameter list (matching parens)

package/package.json

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

package/src/observe-register.ts

@@ -40,7 +40,7 @@ import {
   findReassignments,
   findForLoopVars,
   findCatchVars,
-  findFunctionParams,
+  findFunctionBodyBrace,
 } from './vite-plugin';
 
 const M = Module as any;
@@ -371,9 +371,10 @@ function transformCjsSource(source: string, filename: string, moduleName: string
     // Skip common false positives
     if (name === 'require' || name === 'exports' || name === 'module') continue;
 
-    // Find the opening brace of the function body
+    // Find the opening brace of the function body, correctly skipping
+    // default parameter values like `headers = {}` which contain braces
     const afterMatch = match.index + match[0].length;
-    const openBrace = source.indexOf('{', afterMatch);
+    const openBrace = findFunctionBodyBrace(source, afterMatch);
     if (openBrace === -1) continue;
 
     // Extract parameter names from the source between ( and {
@@ -514,13 +515,14 @@ function transformCjsSource(source: string, filename: string, moduleName: string
     }
   }
 
-  // Additional variable patterns: reassignments, for-loops, catch clauses, function params
+  // Additional variable patterns: reassignments, for-loops, catch clauses
+  // Note: function params are NOT traced here because observe-register already
+  // wraps functions with __trickle_wrap which captures param types via wrapFunction.
   const reassignInsertions = findReassignments(source);
   const forLoopInsertions = findForLoopVars(source);
   const catchInsertions = findCatchVars(source);
-  const funcParamInsertions = findFunctionParams(source, false);
 
-  if (insertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && funcParamInsertions.length === 0 && classInsertions.length === 0) return source;
+  if (insertions.length === 0 && varInsertions.length === 0 && destructInsertions.length === 0 && reassignInsertions.length === 0 && forLoopInsertions.length === 0 && catchInsertions.length === 0 && classInsertions.length === 0) return source;
 
   // Resolve the path to the wrap helper (compiled JS)
   const wrapHelperPath = path.join(__dirname, 'wrap.js');
@@ -545,7 +547,7 @@ function transformCjsSource(source: string, filename: string, moduleName: string
   ];
 
   // Add variable tracing helper if we have var insertions
-  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) {
     const traceVarPath = path.join(__dirname, 'trace-var.js');
     prefixLines.push(
       `var __trickle_tv_mod = require(${JSON.stringify(traceVarPath)});`,
@@ -609,15 +611,6 @@ function transformCjsSource(source: string, filename: string, moduleName: string
     });
   }
 
-  // Function parameter insertions
-  for (const { bodyStart, paramNames, lineNo } of funcParamInsertions) {
-    const calls = paramNames.map(n => `__trickle_tv(${n},${JSON.stringify(n)},${lineNo})`).join(';');
-    allInsertions.push({
-      position: bodyStart,
-      code: `\ntry{${calls}}catch(__e){}\n`,
-    });
-  }
-
   // Add class method wrappings
   for (const ci of classInsertions) {
     allInsertions.push(ci);

package/src/vite-plugin.ts

@@ -134,7 +134,7 @@ export function tricklePlugin(options: TricklePluginOptions = {}) {
  * scans forward matching parens to find the closing `)`, then finds the `{` after it.
  * Returns -1 if not found.
  */
-function findFunctionBodyBrace(source: string, afterOpenParen: number): number {
+export function findFunctionBodyBrace(source: string, afterOpenParen: number): number {
   let depth = 1;
   let pos = afterOpenParen;
   // Skip the parameter list (matching parens)