trickle-observe 0.2.86 → 0.2.87

package/dist/observe-register.js

@@ -390,6 +390,11 @@ function findVarDeclarations(source, lineOffset = 0) {
         const restOfLine = source.slice(vmatch.index + vmatch[0].length - 1, vmatch.index + vmatch[0].length + 200);
         if (/^\s*require\s*\(/.test(restOfLine))
             continue;
+        // Skip variable declarations inside for-loop headers (for (let x = ...; ...; ...))
+        // The semicolon inside for(...) is NOT a statement end
+        const beforeDecl = source.slice(Math.max(0, vmatch.index - 50), vmatch.index);
+        if (/\bfor\s*\(\s*$/.test(beforeDecl))
+            continue;
         // Calculate line number (count newlines before this position)
         // Subtract lineOffset to map compiled line numbers back to original source lines
         let lineNo = 1;
@@ -421,8 +426,17 @@ function findVarDeclarations(source, lineOffset = 0) {
             else if (ch === '\n' && depth === 0) {
                 // For semicolon-free code, the newline is the end
                 // But only if the next non-whitespace isn't a continuation (., +, etc.)
+                // AND the previous non-whitespace isn't an operator expecting more (=, +, -, etc.)
                 const nextNonWs = source.slice(pos + 1).match(/^\s*(\S)/);
                 if (nextNonWs && !'.+=-|&?:,'.includes(nextNonWs[1])) {
+                    // Also check if the line ends with an operator that expects a value on the next line
+                    const prevOnLine = source.slice(source.lastIndexOf('\n', pos - 1) + 1, pos).trimEnd();
+                    const lastChar = prevOnLine[prevOnLine.length - 1];
+                    if (lastChar && '=+-*/%&|^~<>?:,({['.includes(lastChar)) {
+                        // Line ends with operator — this is a continuation, don't end the statement
+                        pos++;
+                        continue;
+                    }
                     foundEnd = pos;
                     break;
                 }
@@ -644,9 +658,14 @@ function transformCjsSource(source, filename, moduleName, env, sourceMap) {
         while ((methodMatch = methodRegex.exec(classBody)) !== null) {
             const isStatic = !!methodMatch[1];
             const methodName = methodMatch[2];
-            // Skip constructor and private methods
+            // Skip constructor, private methods, and JS keywords that look like method calls
             if (methodName === 'constructor' || methodName.startsWith('_'))
                 continue;
+            if (['if', 'else', 'for', 'while', 'do', 'switch', 'case', 'return', 'throw',
+                'try', 'catch', 'finally', 'with', 'new', 'delete', 'typeof', 'void',
+                'yield', 'await', 'import', 'export', 'super', 'this', 'class',
+                'break', 'continue', 'debugger', 'in', 'of', 'instanceof'].includes(methodName))
+                continue;
             // Extract param names
             const mParamStr = methodMatch[3].trim();
             const mParamNames = mParamStr

package/dist/trace-var.js

@@ -177,8 +177,11 @@ function flushVarBuffer() {
  * More aggressive truncation than function samples since there are many more variables.
  */
 function sanitizeVarSample(value, depth = 3) {
-    if (value === null || value === undefined)
-        return value;
+    if (value === null)
+        return null;
+    // JSON.stringify drops undefined values, so use null to preserve the field
+    if (value === undefined)
+        return null;
     const t = typeof value;
     // Primitives are always safe to return at any depth
     if (t === 'string') {

package/package.json

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

package/src/observe-register.ts

@@ -391,6 +391,11 @@ function findVarDeclarations(source: string, lineOffset: number = 0): Array<{ li
     const restOfLine = source.slice(vmatch.index + vmatch[0].length - 1, vmatch.index + vmatch[0].length + 200);
     if (/^\s*require\s*\(/.test(restOfLine)) continue;
 
+    // Skip variable declarations inside for-loop headers (for (let x = ...; ...; ...))
+    // The semicolon inside for(...) is NOT a statement end
+    const beforeDecl = source.slice(Math.max(0, vmatch.index - 50), vmatch.index);
+    if (/\bfor\s*\(\s*$/.test(beforeDecl)) continue;
+
     // Calculate line number (count newlines before this position)
     // Subtract lineOffset to map compiled line numbers back to original source lines
     let lineNo = 1;
@@ -419,8 +424,17 @@ function findVarDeclarations(source: string, lineOffset: number = 0): Array<{ li
       } else if (ch === '\n' && depth === 0) {
         // For semicolon-free code, the newline is the end
         // But only if the next non-whitespace isn't a continuation (., +, etc.)
+        // AND the previous non-whitespace isn't an operator expecting more (=, +, -, etc.)
         const nextNonWs = source.slice(pos + 1).match(/^\s*(\S)/);
         if (nextNonWs && !'.+=-|&?:,'.includes(nextNonWs[1])) {
+          // Also check if the line ends with an operator that expects a value on the next line
+          const prevOnLine = source.slice(source.lastIndexOf('\n', pos - 1) + 1, pos).trimEnd();
+          const lastChar = prevOnLine[prevOnLine.length - 1];
+          if (lastChar && '=+-*/%&|^~<>?:,({['.includes(lastChar)) {
+            // Line ends with operator — this is a continuation, don't end the statement
+            pos++;
+            continue;
+          }
           foundEnd = pos;
           break;
         }
@@ -627,8 +641,12 @@ function transformCjsSource(source: string, filename: string, moduleName: string
     while ((methodMatch = methodRegex.exec(classBody)) !== null) {
       const isStatic = !!methodMatch[1];
       const methodName = methodMatch[2];
-      // Skip constructor and private methods
+      // Skip constructor, private methods, and JS keywords that look like method calls
       if (methodName === 'constructor' || methodName.startsWith('_')) continue;
+      if (['if', 'else', 'for', 'while', 'do', 'switch', 'case', 'return', 'throw',
+           'try', 'catch', 'finally', 'with', 'new', 'delete', 'typeof', 'void',
+           'yield', 'await', 'import', 'export', 'super', 'this', 'class',
+           'break', 'continue', 'debugger', 'in', 'of', 'instanceof'].includes(methodName)) continue;
       // Extract param names
       const mParamStr = methodMatch[3].trim();
       const mParamNames = mParamStr

package/src/trace-var.ts

@@ -167,7 +167,9 @@ function flushVarBuffer(): void {
  * More aggressive truncation than function samples since there are many more variables.
  */
 function sanitizeVarSample(value: unknown, depth: number = 3): unknown {
-  if (value === null || value === undefined) return value;
+  if (value === null) return null;
+  // JSON.stringify drops undefined values, so use null to preserve the field
+  if (value === undefined) return null;
 
   const t = typeof value;
   // Primitives are always safe to return at any depth