trickle-observe 0.2.87 → 0.2.89

package/dist/observe-register.js

@@ -327,6 +327,33 @@ function findClosingBrace(source, openBrace) {
                 pos++;
             pos++; // skip past /
         }
+        else if (ch === '/' && pos + 1 < source.length && source[pos + 1] !== '/' && source[pos + 1] !== '*') {
+            // Possible regex literal — check preceding context
+            let p = pos - 1;
+            while (p >= 0 && (source[p] === ' ' || source[p] === '\t'))
+                p--;
+            const prevCh = p >= 0 ? source[p] : '';
+            if ('=(!,;:?[{&|^~+-><%'.includes(prevCh) || source.slice(Math.max(0, p - 5), p + 1).match(/\b(return|typeof|instanceof|in|of|void|delete|throw|new|case)\s*$/)) {
+                pos++;
+                while (pos < source.length) {
+                    if (source[pos] === '\\')
+                        pos++;
+                    else if (source[pos] === '[') {
+                        pos++;
+                        while (pos < source.length && source[pos] !== ']') {
+                            if (source[pos] === '\\')
+                                pos++;
+                            pos++;
+                        }
+                    }
+                    else if (source[pos] === '/')
+                        break;
+                    pos++;
+                }
+                while (pos + 1 < source.length && /[gimsuy]/.test(source[pos + 1]))
+                    pos++;
+            }
+        }
         pos++;
     }
     return -1; // not found
@@ -429,9 +456,21 @@ function findVarDeclarations(source, lineOffset = 0) {
                 // 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];
+                    // Also check if a recent line ends with an operator that expects a value on the next line
+                    // Walk backwards through empty lines to find the last non-empty line
+                    let checkPos = pos;
+                    let lastChar = '';
+                    for (let back = 0; back < 5; back++) {
+                        const prevNL = source.lastIndexOf('\n', checkPos - 1);
+                        const prevLine = source.slice(prevNL + 1, checkPos).trimEnd();
+                        if (prevLine.length > 0) {
+                            lastChar = prevLine[prevLine.length - 1];
+                            break;
+                        }
+                        checkPos = prevNL;
+                        if (prevNL <= 0)
+                            break;
+                    }
                     if (lastChar && '=+-*/%&|^~<>?:,({['.includes(lastChar)) {
                         // Line ends with operator — this is a continuation, don't end the statement
                         pos++;
@@ -454,6 +493,38 @@ function findVarDeclarations(source, lineOffset = 0) {
                     pos++;
                 }
             }
+            else if (ch === '/' && pos + 1 < source.length && source[pos + 1] !== '/' && source[pos + 1] !== '*') {
+                // Possible regex literal — check if the preceding non-whitespace indicates regex context
+                // (after =, (, ,, ;, !, &, |, ^, ~, ?, :, [, {, return, typeof, etc.)
+                let p = pos - 1;
+                while (p >= 0 && (source[p] === ' ' || source[p] === '\t'))
+                    p--;
+                const prevCh = p >= 0 ? source[p] : '';
+                if ('=(!,;:?[{&|^~+-><%'.includes(prevCh) || source.slice(Math.max(0, p - 5), p + 1).match(/\b(return|typeof|instanceof|in|of|void|delete|throw|new|case)\s*$/)) {
+                    // This is a regex literal — skip to the closing /
+                    pos++; // skip past opening /
+                    while (pos < source.length) {
+                        if (source[pos] === '\\') {
+                            pos++;
+                        } // skip escaped char
+                        else if (source[pos] === '[') {
+                            // Character class — skip to ]
+                            pos++;
+                            while (pos < source.length && source[pos] !== ']') {
+                                if (source[pos] === '\\')
+                                    pos++;
+                                pos++;
+                            }
+                        }
+                        else if (source[pos] === '/')
+                            break;
+                        pos++;
+                    }
+                    // Skip regex flags
+                    while (pos + 1 < source.length && /[gimsuy]/.test(source[pos + 1]))
+                        pos++;
+                }
+            }
             else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '/') {
                 // Skip line comment
                 while (pos < source.length && source[pos] !== '\n')

package/dist/vite-plugin.js

@@ -632,13 +632,25 @@ function findReassignments(source) {
         const beforeOnLine = source.slice(lineStart, match.index).trim();
         if (beforeOnLine.endsWith(':') || beforeOnLine.endsWith(','))
             continue;
+        // Skip comma-separated multi-variable declaration continuations:
+        //   var X = 'foo',
+        //       Y = 'bar';  ← Y looks like a reassignment but is actually a declaration
+        // Detect by checking if the previous non-empty line ends with ','
+        if (beforeOnLine.length === 0) {
+            const prevLineEnd = source.lastIndexOf('\n', lineStart - 1);
+            if (prevLineEnd >= 0) {
+                const prevLine = source.slice(source.lastIndexOf('\n', prevLineEnd - 1) + 1, prevLineEnd).trimEnd();
+                if (prevLine.endsWith(','))
+                    continue;
+            }
+        }
         // Calculate line number
         let lineNo = 1;
         for (let i = 0; i < match.index; i++) {
             if (source[i] === '\n')
                 lineNo++;
         }
-        // Find end of statement (same logic as findVarDeclarations)
+        // Find end of statement
         const startPos = match.index + match[0].length - 1;
         let pos = startPos;
         let depth = 0;
@@ -660,6 +672,24 @@ function findReassignments(source) {
             else if (ch === '\n' && depth === 0) {
                 const nextNonWs = source.slice(pos + 1).match(/^\s*(\S)/);
                 if (nextNonWs && !'.+=-|&?:,'.includes(nextNonWs[1])) {
+                    // Check if a recent non-empty line ends with an operator
+                    let checkPos2 = pos;
+                    let lastCh2 = '';
+                    for (let back = 0; back < 5; back++) {
+                        const prevNL2 = source.lastIndexOf('\n', checkPos2 - 1);
+                        const prevLine2 = source.slice(prevNL2 + 1, checkPos2).trimEnd();
+                        if (prevLine2.length > 0) {
+                            lastCh2 = prevLine2[prevLine2.length - 1];
+                            break;
+                        }
+                        checkPos2 = prevNL2;
+                        if (prevNL2 <= 0)
+                            break;
+                    }
+                    if (lastCh2 && '=+-*/%&|^~<>?:,({['.includes(lastCh2)) {
+                        pos++;
+                        continue;
+                    }
                     foundEnd = pos;
                     break;
                 }
@@ -676,6 +706,33 @@ function findReassignments(source) {
                     pos++;
                 }
             }
+            else if (ch === '/' && pos + 1 < source.length && source[pos + 1] !== '/' && source[pos + 1] !== '*') {
+                // Possible regex literal
+                let rp = pos - 1;
+                while (rp >= 0 && (source[rp] === ' ' || source[rp] === '\t'))
+                    rp--;
+                const rpCh = rp >= 0 ? source[rp] : '';
+                if ('=(!,;:?[{&|^~+-><%'.includes(rpCh) || source.slice(Math.max(0, rp - 5), rp + 1).match(/\b(return|typeof|instanceof|in|of|void|delete|throw|new|case)\s*$/)) {
+                    pos++;
+                    while (pos < source.length) {
+                        if (source[pos] === '\\')
+                            pos++;
+                        else if (source[pos] === '[') {
+                            pos++;
+                            while (pos < source.length && source[pos] !== ']') {
+                                if (source[pos] === '\\')
+                                    pos++;
+                                pos++;
+                            }
+                        }
+                        else if (source[pos] === '/')
+                            break;
+                        pos++;
+                    }
+                    while (pos + 1 < source.length && /[gimsuy]/.test(source[pos + 1]))
+                        pos++;
+                }
+            }
             else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '/') {
                 while (pos < source.length && source[pos] !== '\n')
                     pos++;

package/dist-esm/vite-plugin.js

@@ -619,13 +619,25 @@ export function findReassignments(source) {
         const beforeOnLine = source.slice(lineStart, match.index).trim();
         if (beforeOnLine.endsWith(':') || beforeOnLine.endsWith(','))
             continue;
+        // Skip comma-separated multi-variable declaration continuations:
+        //   var X = 'foo',
+        //       Y = 'bar';  ← Y looks like a reassignment but is actually a declaration
+        // Detect by checking if the previous non-empty line ends with ','
+        if (beforeOnLine.length === 0) {
+            const prevLineEnd = source.lastIndexOf('\n', lineStart - 1);
+            if (prevLineEnd >= 0) {
+                const prevLine = source.slice(source.lastIndexOf('\n', prevLineEnd - 1) + 1, prevLineEnd).trimEnd();
+                if (prevLine.endsWith(','))
+                    continue;
+            }
+        }
         // Calculate line number
         let lineNo = 1;
         for (let i = 0; i < match.index; i++) {
             if (source[i] === '\n')
                 lineNo++;
         }
-        // Find end of statement (same logic as findVarDeclarations)
+        // Find end of statement
         const startPos = match.index + match[0].length - 1;
         let pos = startPos;
         let depth = 0;
@@ -647,6 +659,24 @@ export function findReassignments(source) {
             else if (ch === '\n' && depth === 0) {
                 const nextNonWs = source.slice(pos + 1).match(/^\s*(\S)/);
                 if (nextNonWs && !'.+=-|&?:,'.includes(nextNonWs[1])) {
+                    // Check if a recent non-empty line ends with an operator
+                    let checkPos2 = pos;
+                    let lastCh2 = '';
+                    for (let back = 0; back < 5; back++) {
+                        const prevNL2 = source.lastIndexOf('\n', checkPos2 - 1);
+                        const prevLine2 = source.slice(prevNL2 + 1, checkPos2).trimEnd();
+                        if (prevLine2.length > 0) {
+                            lastCh2 = prevLine2[prevLine2.length - 1];
+                            break;
+                        }
+                        checkPos2 = prevNL2;
+                        if (prevNL2 <= 0)
+                            break;
+                    }
+                    if (lastCh2 && '=+-*/%&|^~<>?:,({['.includes(lastCh2)) {
+                        pos++;
+                        continue;
+                    }
                     foundEnd = pos;
                     break;
                 }
@@ -663,6 +693,33 @@ export function findReassignments(source) {
                     pos++;
                 }
             }
+            else if (ch === '/' && pos + 1 < source.length && source[pos + 1] !== '/' && source[pos + 1] !== '*') {
+                // Possible regex literal
+                let rp = pos - 1;
+                while (rp >= 0 && (source[rp] === ' ' || source[rp] === '\t'))
+                    rp--;
+                const rpCh = rp >= 0 ? source[rp] : '';
+                if ('=(!,;:?[{&|^~+-><%'.includes(rpCh) || source.slice(Math.max(0, rp - 5), rp + 1).match(/\b(return|typeof|instanceof|in|of|void|delete|throw|new|case)\s*$/)) {
+                    pos++;
+                    while (pos < source.length) {
+                        if (source[pos] === '\\')
+                            pos++;
+                        else if (source[pos] === '[') {
+                            pos++;
+                            while (pos < source.length && source[pos] !== ']') {
+                                if (source[pos] === '\\')
+                                    pos++;
+                                pos++;
+                            }
+                        }
+                        else if (source[pos] === '/')
+                            break;
+                        pos++;
+                    }
+                    while (pos + 1 < source.length && /[gimsuy]/.test(source[pos + 1]))
+                        pos++;
+                }
+            }
             else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '/') {
                 while (pos < source.length && source[pos] !== '\n')
                     pos++;

package/observe-esm-hooks.mjs

@@ -236,6 +236,10 @@ function findVarDeclarationsESM(source) {
     const restOfLine = source.slice(match.index + match[0].length - 1, match.index + match[0].length + 200);
     if (/^\s*require\s*\(/.test(restOfLine)) continue;
 
+    // Skip variable declarations inside for-loop headers
+    const beforeDecl = source.slice(Math.max(0, match.index - 50), match.index);
+    if (/\bfor\s*\(\s*$/.test(beforeDecl)) continue;
+
     // Calculate line number where the declaration starts
     let lineNo = 1;
     for (let i = 0; i < match.index; i++) {
@@ -260,6 +264,19 @@ function findVarDeclarationsESM(source) {
       } else if (ch === '\n' && depth === 0) {
         const nextNonWs = source.slice(pos + 1).match(/^\s*(\S)/);
         if (nextNonWs && !'.+=-|&?:,'.includes(nextNonWs[1])) {
+          // Check if a recent non-empty line ends with an operator (continuation across empty lines)
+          let checkPos = pos;
+          let lastCh = '';
+          for (let back = 0; back < 5; back++) {
+            const prevNL = source.lastIndexOf('\n', checkPos - 1);
+            const prevLine = source.slice(prevNL + 1, checkPos).trimEnd();
+            if (prevLine.length > 0) { lastCh = prevLine[prevLine.length - 1]; break; }
+            checkPos = prevNL;
+            if (prevNL <= 0) break;
+          }
+          if (lastCh && '=+-*/%&|^~<>?:,({['.includes(lastCh)) {
+            pos++; continue;
+          }
           foundEnd = pos;
           break;
         }
@@ -270,6 +287,21 @@ function findVarDeclarationsESM(source) {
           else if (source[pos] === quote) break;
           pos++;
         }
+      } else if (ch === '/' && pos + 1 < source.length && source[pos + 1] !== '/' && source[pos + 1] !== '*') {
+        // Possible regex literal
+        let rp = pos - 1;
+        while (rp >= 0 && (source[rp] === ' ' || source[rp] === '\t')) rp--;
+        const rpCh = rp >= 0 ? source[rp] : '';
+        if ('=(!,;:?[{&|^~+-><%'.includes(rpCh) || source.slice(Math.max(0, rp - 5), rp + 1).match(/\b(return|typeof|instanceof|in|of|void|delete|throw|new|case)\s*$/)) {
+          pos++;
+          while (pos < source.length) {
+            if (source[pos] === '\\') pos++;
+            else if (source[pos] === '[') { pos++; while (pos < source.length && source[pos] !== ']') { if (source[pos] === '\\') pos++; pos++; } }
+            else if (source[pos] === '/') break;
+            pos++;
+          }
+          while (pos + 1 < source.length && /[gimsuy]/.test(source[pos + 1])) pos++;
+        }
       } else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '/') {
         while (pos < source.length && source[pos] !== '\n') pos++;
         continue;

package/package.json

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

package/src/observe-register.ts

@@ -334,6 +334,21 @@ function findClosingBrace(source: string, openBrace: number): number {
       pos += 2;
       while (pos < source.length - 1 && !(source[pos] === '*' && source[pos + 1] === '/')) pos++;
       pos++; // skip past /
+    } else if (ch === '/' && pos + 1 < source.length && source[pos + 1] !== '/' && source[pos + 1] !== '*') {
+      // Possible regex literal — check preceding context
+      let p = pos - 1;
+      while (p >= 0 && (source[p] === ' ' || source[p] === '\t')) p--;
+      const prevCh = p >= 0 ? source[p] : '';
+      if ('=(!,;:?[{&|^~+-><%'.includes(prevCh) || source.slice(Math.max(0, p - 5), p + 1).match(/\b(return|typeof|instanceof|in|of|void|delete|throw|new|case)\s*$/)) {
+        pos++;
+        while (pos < source.length) {
+          if (source[pos] === '\\') pos++;
+          else if (source[pos] === '[') { pos++; while (pos < source.length && source[pos] !== ']') { if (source[pos] === '\\') pos++; pos++; } }
+          else if (source[pos] === '/') break;
+          pos++;
+        }
+        while (pos + 1 < source.length && /[gimsuy]/.test(source[pos + 1])) pos++;
+      }
     }
     pos++;
   }
@@ -427,9 +442,20 @@ function findVarDeclarations(source: string, lineOffset: number = 0): Array<{ li
         // 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];
+          // Also check if a recent line ends with an operator that expects a value on the next line
+          // Walk backwards through empty lines to find the last non-empty line
+          let checkPos = pos;
+          let lastChar = '';
+          for (let back = 0; back < 5; back++) {
+            const prevNL = source.lastIndexOf('\n', checkPos - 1);
+            const prevLine = source.slice(prevNL + 1, checkPos).trimEnd();
+            if (prevLine.length > 0) {
+              lastChar = prevLine[prevLine.length - 1];
+              break;
+            }
+            checkPos = prevNL;
+            if (prevNL <= 0) break;
+          }
           if (lastChar && '=+-*/%&|^~<>?:,({['.includes(lastChar)) {
             // Line ends with operator — this is a continuation, don't end the statement
             pos++;
@@ -447,6 +473,30 @@ function findVarDeclarations(source: string, lineOffset: number = 0): Array<{ li
           else if (source[pos] === quote) break;
           pos++;
         }
+      } else if (ch === '/' && pos + 1 < source.length && source[pos + 1] !== '/' && source[pos + 1] !== '*') {
+        // Possible regex literal — check if the preceding non-whitespace indicates regex context
+        // (after =, (, ,, ;, !, &, |, ^, ~, ?, :, [, {, return, typeof, etc.)
+        let p = pos - 1;
+        while (p >= 0 && (source[p] === ' ' || source[p] === '\t')) p--;
+        const prevCh = p >= 0 ? source[p] : '';
+        if ('=(!,;:?[{&|^~+-><%'.includes(prevCh) || source.slice(Math.max(0, p - 5), p + 1).match(/\b(return|typeof|instanceof|in|of|void|delete|throw|new|case)\s*$/)) {
+          // This is a regex literal — skip to the closing /
+          pos++; // skip past opening /
+          while (pos < source.length) {
+            if (source[pos] === '\\') { pos++; } // skip escaped char
+            else if (source[pos] === '[') {
+              // Character class — skip to ]
+              pos++;
+              while (pos < source.length && source[pos] !== ']') {
+                if (source[pos] === '\\') pos++;
+                pos++;
+              }
+            } else if (source[pos] === '/') break;
+            pos++;
+          }
+          // Skip regex flags
+          while (pos + 1 < source.length && /[gimsuy]/.test(source[pos + 1])) pos++;
+        }
       } else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '/') {
         // Skip line comment
         while (pos < source.length && source[pos] !== '\n') pos++;

package/src/vite-plugin.ts

@@ -578,13 +578,25 @@ export function findReassignments(source: string): Array<{ lineEnd: number; varN
     const beforeOnLine = source.slice(lineStart, match.index).trim();
     if (beforeOnLine.endsWith(':') || beforeOnLine.endsWith(',')) continue;
 
+    // Skip comma-separated multi-variable declaration continuations:
+    //   var X = 'foo',
+    //       Y = 'bar';  ← Y looks like a reassignment but is actually a declaration
+    // Detect by checking if the previous non-empty line ends with ','
+    if (beforeOnLine.length === 0) {
+      const prevLineEnd = source.lastIndexOf('\n', lineStart - 1);
+      if (prevLineEnd >= 0) {
+        const prevLine = source.slice(source.lastIndexOf('\n', prevLineEnd - 1) + 1, prevLineEnd).trimEnd();
+        if (prevLine.endsWith(',')) continue;
+      }
+    }
+
     // Calculate line number
     let lineNo = 1;
     for (let i = 0; i < match.index; i++) {
       if (source[i] === '\n') lineNo++;
     }
 
-    // Find end of statement (same logic as findVarDeclarations)
+    // Find end of statement
     const startPos = match.index + match[0].length - 1;
     let pos = startPos;
     let depth = 0;
@@ -603,6 +615,19 @@ export function findReassignments(source: string): Array<{ lineEnd: number; varN
       } else if (ch === '\n' && depth === 0) {
         const nextNonWs = source.slice(pos + 1).match(/^\s*(\S)/);
         if (nextNonWs && !'.+=-|&?:,'.includes(nextNonWs[1])) {
+          // Check if a recent non-empty line ends with an operator
+          let checkPos2 = pos;
+          let lastCh2 = '';
+          for (let back = 0; back < 5; back++) {
+            const prevNL2 = source.lastIndexOf('\n', checkPos2 - 1);
+            const prevLine2 = source.slice(prevNL2 + 1, checkPos2).trimEnd();
+            if (prevLine2.length > 0) { lastCh2 = prevLine2[prevLine2.length - 1]; break; }
+            checkPos2 = prevNL2;
+            if (prevNL2 <= 0) break;
+          }
+          if (lastCh2 && '=+-*/%&|^~<>?:,({['.includes(lastCh2)) {
+            pos++; continue;
+          }
           foundEnd = pos;
           break;
         }
@@ -614,6 +639,21 @@ export function findReassignments(source: string): Array<{ lineEnd: number; varN
           else if (source[pos] === quote) break;
           pos++;
         }
+      } else if (ch === '/' && pos + 1 < source.length && source[pos + 1] !== '/' && source[pos + 1] !== '*') {
+        // Possible regex literal
+        let rp = pos - 1;
+        while (rp >= 0 && (source[rp] === ' ' || source[rp] === '\t')) rp--;
+        const rpCh = rp >= 0 ? source[rp] : '';
+        if ('=(!,;:?[{&|^~+-><%'.includes(rpCh) || source.slice(Math.max(0, rp - 5), rp + 1).match(/\b(return|typeof|instanceof|in|of|void|delete|throw|new|case)\s*$/)) {
+          pos++;
+          while (pos < source.length) {
+            if (source[pos] === '\\') pos++;
+            else if (source[pos] === '[') { pos++; while (pos < source.length && source[pos] !== ']') { if (source[pos] === '\\') pos++; pos++; } }
+            else if (source[pos] === '/') break;
+            pos++;
+          }
+          while (pos + 1 < source.length && /[gimsuy]/.test(source[pos + 1])) pos++;
+        }
       } else if (ch === '/' && pos + 1 < source.length && source[pos + 1] === '/') {
         while (pos < source.length && source[pos] !== '\n') pos++;
         continue;