@tracecode/harness 0.7.0-beta7 → 0.7.0-beta8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tracecode/harness",
-  "version": "0.7.0-beta7",
+  "version": "0.7.0-beta8",
   "license": "AGPL-3.0-only",
   "homepage": "https://tracecode.app",
   "repository": {

package/workers/cpp/tracecode_runtime.hpp

@@ -1265,6 +1265,7 @@ std::string to_json(const std::unordered_map<K, V, Hash, Equal, Allocator>& valu
 inline void write_trace_event_json(const std::string& event_json, int line = 1);
 inline void write_trace_event_json_raw(const std::string& event_json);
 inline bool check_trace_budget(int line);
+inline void emit_line(int line, const char* function_name);
 
 inline std::string target_json(const std::string& name) {
   return std::string("{\"variable\":") + to_json(name) + "}";
@@ -1532,8 +1533,8 @@ class IndexedRangeReadIterator {
   using pointer = typename std::iterator_traits<RawIterator>::pointer;
   using iterator_category = std::input_iterator_tag;
 
-  IndexedRangeReadIterator(Container& container, RawIterator iterator, std::size_t index, int line, const char* binding_name)
-      : container_(container), iterator_(iterator), index_(index), line_(line), binding_name_(binding_name) {}
+  IndexedRangeReadIterator(Container& container, RawIterator iterator, std::size_t index, int line, const char* binding_name, bool is_end = false)
+      : container_(container), iterator_(iterator), index_(index), line_(line), binding_name_(binding_name), is_end_(is_end) {}
 
   reference operator*() const {
     if (binding_name_ && *binding_name_) {
@@ -1566,7 +1567,9 @@ class IndexedRangeReadIterator {
   }
 
   bool operator==(const IndexedRangeReadIterator& other) const {
-    return iterator_ == other.iterator_;
+    const bool equal = iterator_ == other.iterator_;
+    if (equal && (is_end_ || other.is_end_)) emit_line(line_, "");
+    return equal;
   }
 
   bool operator!=(const IndexedRangeReadIterator& other) const {
@@ -1579,6 +1582,7 @@ class IndexedRangeReadIterator {
   std::size_t index_;
   int line_;
   const char* binding_name_;
+  bool is_end_;
 };
 
 template <typename Container>
@@ -1588,11 +1592,11 @@ class IndexedRangeReadable {
       : container_(container), line_(line), binding_name_(binding_name) {}
 
   auto begin() {
-    return IndexedRangeReadIterator<Container>(container_, container_.raw().begin(), 0, line_, binding_name_);
+    return IndexedRangeReadIterator<Container>(container_, container_.raw().begin(), 0, line_, binding_name_, false);
   }
 
   auto end() {
-    return IndexedRangeReadIterator<Container>(container_, container_.raw().end(), container_.raw().size(), line_, binding_name_);
+    return IndexedRangeReadIterator<Container>(container_, container_.raw().end(), container_.raw().size(), line_, binding_name_, true);
   }
 
  private:
@@ -1612,8 +1616,8 @@ class IndexedNestedRangeReadIterator {
   using pointer = typename std::iterator_traits<RawIterator>::pointer;
   using iterator_category = std::input_iterator_tag;
 
-  IndexedNestedRangeReadIterator(Row& row, RawIterator iterator, const std::string& name, std::size_t outer, std::size_t inner, int line, const char* outer_source, const char* binding_name)
-      : row_(row), iterator_(iterator), name_(name), outer_(outer), inner_(inner), line_(line), outer_source_(outer_source), binding_name_(binding_name) {}
+  IndexedNestedRangeReadIterator(Row& row, RawIterator iterator, const std::string& name, std::size_t outer, std::size_t inner, int line, const char* outer_source, const char* binding_name, bool is_end = false)
+      : row_(row), iterator_(iterator), name_(name), outer_(outer), inner_(inner), line_(line), outer_source_(outer_source), binding_name_(binding_name), is_end_(is_end) {}
 
   reference operator*() const {
     emit_iteration_bind_read();
@@ -1638,7 +1642,9 @@ class IndexedNestedRangeReadIterator {
   }
 
   bool operator==(const IndexedNestedRangeReadIterator& other) const {
-    return iterator_ == other.iterator_;
+    const bool equal = iterator_ == other.iterator_;
+    if (equal && (is_end_ || other.is_end_)) emit_line(line_, "");
+    return equal;
   }
 
   bool operator!=(const IndexedNestedRangeReadIterator& other) const {
@@ -1668,6 +1674,7 @@ class IndexedNestedRangeReadIterator {
   int line_;
   const char* outer_source_;
   const char* binding_name_;
+  bool is_end_;
 };
 
 template <typename T>
@@ -1677,11 +1684,11 @@ class IndexedNestedRangeReadable {
       : row_(row), name_(name), outer_(outer), line_(line), outer_source_(outer_source), binding_name_(binding_name) {}
 
   auto begin() {
-    return IndexedNestedRangeReadIterator<T>(row_, row_.begin(), name_, outer_, 0, line_, outer_source_, binding_name_);
+    return IndexedNestedRangeReadIterator<T>(row_, row_.begin(), name_, outer_, 0, line_, outer_source_, binding_name_, false);
   }
 
   auto end() {
-    return IndexedNestedRangeReadIterator<T>(row_, row_.end(), name_, outer_, row_.size(), line_, outer_source_, binding_name_);
+    return IndexedNestedRangeReadIterator<T>(row_, row_.end(), name_, outer_, row_.size(), line_, outer_source_, binding_name_, true);
   }
 
  private:
@@ -1703,8 +1710,8 @@ class KeyedRangeReadIterator {
   using pointer = typename std::iterator_traits<RawIterator>::pointer;
   using iterator_category = std::input_iterator_tag;
 
-  KeyedRangeReadIterator(Container& container, RawIterator iterator, int line, const char* key_binding_name)
-      : container_(container), iterator_(iterator), line_(line), key_binding_name_(key_binding_name) {}
+  KeyedRangeReadIterator(Container& container, RawIterator iterator, int line, const char* key_binding_name, bool is_end = false)
+      : container_(container), iterator_(iterator), line_(line), key_binding_name_(key_binding_name), is_end_(is_end) {}
 
   reference operator*() const {
     emit_iteration_bind_read();
@@ -1728,7 +1735,9 @@ class KeyedRangeReadIterator {
   }
 
   bool operator==(const KeyedRangeReadIterator& other) const {
-    return iterator_ == other.iterator_;
+    const bool equal = iterator_ == other.iterator_;
+    if (equal && (is_end_ || other.is_end_)) emit_line(line_, "");
+    return equal;
   }
 
   bool operator!=(const KeyedRangeReadIterator& other) const {
@@ -1748,6 +1757,7 @@ class KeyedRangeReadIterator {
   RawIterator iterator_;
   int line_;
   const char* key_binding_name_;
+  bool is_end_;
 };
 
 template <typename Container>
@@ -1757,11 +1767,11 @@ class KeyedRangeReadable {
       : container_(container), line_(line), key_binding_name_(key_binding_name) {}
 
   auto begin() {
-    return KeyedRangeReadIterator<Container>(container_, container_.raw().begin(), line_, key_binding_name_);
+    return KeyedRangeReadIterator<Container>(container_, container_.raw().begin(), line_, key_binding_name_, false);
   }
 
   auto end() {
-    return KeyedRangeReadIterator<Container>(container_, container_.raw().end(), line_, key_binding_name_);
+    return KeyedRangeReadIterator<Container>(container_, container_.raw().end(), line_, key_binding_name_, true);
   }
 
  private:
@@ -1779,8 +1789,8 @@ class IndexedStringRangeReadIterator {
   using pointer = typename std::iterator_traits<RawIterator>::pointer;
   using iterator_category = std::input_iterator_tag;
 
-  IndexedStringRangeReadIterator(std::string& value, RawIterator iterator, std::size_t index, int line, const char* binding_name, const char* source_name)
-      : value_(value), iterator_(iterator), index_(index), line_(line), binding_name_(binding_name), source_name_(source_name) {}
+  IndexedStringRangeReadIterator(std::string& value, RawIterator iterator, std::size_t index, int line, const char* binding_name, const char* source_name, bool is_end = false)
+      : value_(value), iterator_(iterator), index_(index), line_(line), binding_name_(binding_name), source_name_(source_name), is_end_(is_end) {}
 
   reference operator*() const {
     emit_read();
@@ -1805,7 +1815,9 @@ class IndexedStringRangeReadIterator {
   }
 
   bool operator==(const IndexedStringRangeReadIterator& other) const {
-    return iterator_ == other.iterator_;
+    const bool equal = iterator_ == other.iterator_;
+    if (equal && (is_end_ || other.is_end_)) emit_line(line_, "");
+    return equal;
   }
 
   bool operator!=(const IndexedStringRangeReadIterator& other) const {
@@ -1819,6 +1831,7 @@ class IndexedStringRangeReadIterator {
   int line_;
   const char* binding_name_;
   const char* source_name_;
+  bool is_end_;
 
   void emit_read() const {
     const char item = *iterator_;
@@ -1841,11 +1854,11 @@ class IndexedStringRangeReadable {
       : value_(value), line_(line), binding_name_(binding_name), source_name_(source_name) {}
 
   auto begin() {
-    return IndexedStringRangeReadIterator(value_, value_.begin(), 0, line_, binding_name_, source_name_);
+    return IndexedStringRangeReadIterator(value_, value_.begin(), 0, line_, binding_name_, source_name_, false);
   }
 
   auto end() {
-    return IndexedStringRangeReadIterator(value_, value_.end(), value_.size(), line_, binding_name_, source_name_);
+    return IndexedStringRangeReadIterator(value_, value_.end(), value_.size(), line_, binding_name_, source_name_, true);
   }
 
  private:
@@ -1864,8 +1877,8 @@ class IndexedConstStringRangeReadIterator {
   using pointer = const char*;
   using iterator_category = std::input_iterator_tag;
 
-  IndexedConstStringRangeReadIterator(const std::string& value, RawIterator iterator, std::size_t index, int line, const char* binding_name, const char* source_name)
-      : value_(value), iterator_(iterator), index_(index), line_(line), binding_name_(binding_name), source_name_(source_name) {}
+  IndexedConstStringRangeReadIterator(const std::string& value, RawIterator iterator, std::size_t index, int line, const char* binding_name, const char* source_name, bool is_end = false)
+      : value_(value), iterator_(iterator), index_(index), line_(line), binding_name_(binding_name), source_name_(source_name), is_end_(is_end) {}
 
   char operator*() const {
     emit_read();
@@ -1885,7 +1898,9 @@ class IndexedConstStringRangeReadIterator {
   }
 
   bool operator==(const IndexedConstStringRangeReadIterator& other) const {
-    return iterator_ == other.iterator_;
+    const bool equal = iterator_ == other.iterator_;
+    if (equal && (is_end_ || other.is_end_)) emit_line(line_, "");
+    return equal;
   }
 
   bool operator!=(const IndexedConstStringRangeReadIterator& other) const {
@@ -1899,6 +1914,7 @@ class IndexedConstStringRangeReadIterator {
   int line_;
   const char* binding_name_;
   const char* source_name_;
+  bool is_end_;
 
   void emit_read() const {
     const char item = *iterator_;
@@ -1921,11 +1937,11 @@ class IndexedConstStringRangeReadable {
       : value_(value), line_(line), binding_name_(binding_name), source_name_(source_name) {}
 
   auto begin() const {
-    return IndexedConstStringRangeReadIterator(value_, value_.begin(), 0, line_, binding_name_, source_name_);
+    return IndexedConstStringRangeReadIterator(value_, value_.begin(), 0, line_, binding_name_, source_name_, false);
   }
 
   auto end() const {
-    return IndexedConstStringRangeReadIterator(value_, value_.end(), value_.size(), line_, binding_name_, source_name_);
+    return IndexedConstStringRangeReadIterator(value_, value_.end(), value_.size(), line_, binding_name_, source_name_, true);
   }
 
  private:
@@ -3179,6 +3195,12 @@ inline StdNestedVectorElementRef<T> trace_nested_index_ref(std::vector<std::vect
   );
 }
 
+template <typename Map, typename OuterIndex, typename Key>
+inline std::enable_if_t<is_std_unordered_map<Map>::value || is_std_map<Map>::value, NestedMapElementRef<Map>>
+trace_nested_index_ref(Vector<Map>& container, const std::string&, OuterIndex outer, const Key& key, const char* = nullptr, const char* = nullptr) {
+  return NestedMapElementRef<Map>(container, static_cast<std::size_t>(outer), key);
+}
+
 template <typename T, typename Index>
 inline VectorElementRef<T> trace_index_ref(Vector<T>& container, const std::string&, Index index, const char* source = nullptr) {
   return container.with_index_source(static_cast<std::size_t>(index), source);

package/workers/java/java-source-augmentations.js

@@ -132,18 +132,31 @@
 
   function indexSourceArgument(source) {
     const value = String(source).trim();
+    const tracedReadSource = tracedIndexedReadSource(value);
+    if (tracedReadSource) return JSON.stringify(tracedReadSource);
     const charAtIndexMatch = value.match(/^[A-Za-z_][A-Za-z0-9_]*\.charAt\(\s*([\s\S]+)\s*\)$/);
     if (charAtIndexMatch?.[1]) {
       const charAtSource = safeIndexSourceExpression(charAtIndexMatch[1]) ?? singleIdentifierIndexSource(charAtIndexMatch[1]);
       if (charAtSource) return JSON.stringify(charAtSource);
     }
-    const tracedReadSourceMatch = value.match(/^TraceHooks\.read[A-Za-z0-9_]*AtLine\([\s\S]*,\s*"([A-Za-z_][A-Za-z0-9_]*)"\s*\)$/);
-    if (tracedReadSourceMatch?.[1]) return `"${tracedReadSourceMatch[1]}"`;
     const expressionSource = safeIndexSourceExpression(value) ?? singleIdentifierIndexSource(value);
     if (expressionSource) return JSON.stringify(expressionSource);
     return isSimpleIdentifierExpression(value) ? JSON.stringify(value) : 'null';
   }
 
+  function tracedIndexedReadSource(source) {
+    const value = String(source).trim();
+    if (!value.startsWith('TraceHooks.read')) return null;
+    const open = value.indexOf('(');
+    if (open < 0 || !value.endsWith(')')) return null;
+    const args = splitTopLevelJavaList(value.slice(open + 1, -1));
+    if (args.length < 2) return null;
+    const name = String(args[1]).trim().match(/^"([A-Za-z_][A-Za-z0-9_]*)"$/)?.[1];
+    if (!name) return null;
+    const explicitSource = String(args[args.length - 1] ?? '').trim().match(/^"([^"]+)"$/)?.[1];
+    return explicitSource || name;
+  }
+
   function indexSourceArgumentSourceFirst(source) {
     const value = String(source).trim();
     const tracedIndexedRead = value.match(/^TraceHooks\.read[A-Za-z0-9_]*AtLine\(\s*\d+\s*,\s*"([A-Za-z_][A-Za-z0-9_]*)"\s*,[\s\S]*,\s*"([^"]+)"\s*\)$/);
@@ -462,10 +475,24 @@
     let currentTraceLine = null;
     let pendingScalarDeclarationWrites = null;
     let methodDepth = 0;
+    let generatedExportsClassDepth = null;
     const methodStartPattern =
       /^(\s*)(?:(?:public|private|protected|static|final|synchronized)\s+)*(?:[A-Za-z_][A-Za-z0-9_<>\[\], ?]*\s+)+([A-Za-z_][A-Za-z0-9_]*)\s*\(([^)]*)\)\s*\{\s*$/;
+    const generatedExportsClassPattern = /^\s*(?:(?:public|private|protected|static|final)\s+)*class\s+Exports[A-Za-z0-9_]*\s*\{/;
 
     for (const line of lines) {
+      if (generatedExportsClassDepth !== null) {
+        output.push(line);
+        generatedExportsClassDepth += braceDelta(line);
+        if (generatedExportsClassDepth <= 0) generatedExportsClassDepth = null;
+        continue;
+      }
+      if (generatedExportsClassPattern.test(line)) {
+        output.push(line);
+        generatedExportsClassDepth = Math.max(0, braceDelta(line));
+        if (generatedExportsClassDepth <= 0) generatedExportsClassDepth = null;
+        continue;
+      }
       if (methodDepth <= 0) {
         const methodMatch = line.match(methodStartPattern);
         if (methodMatch) {

package/workers/java/java-worker.js

@@ -1507,7 +1507,6 @@ function augmentTraceCallArgumentSnapshots(source) {
   const methodStack = [];
   const methodStartPattern =
     /^(\s*)(?:(?:public|private|protected|static|final|synchronized)\s+)*(?:[A-Za-z_][A-Za-z0-9_<>\[\], ?]*\s+)+([A-Za-z_][A-Za-z0-9_]*)\s*\(([^)]*)\)\s*\{\s*$/;
-
   return lines.map((line) => {
     const methodMatch = line.match(methodStartPattern);
     if (methodMatch) {
@@ -1673,10 +1672,24 @@ function augmentJavaLocalSnapshots(source) {
   let currentTraceLine = null;
   let pendingScalarDeclarationWrites = null;
   let methodDepth = 0;
+  let generatedExportsClassDepth = null;
   const methodStartPattern =
     /^(\s*)(?:(?:public|private|protected|static|final|synchronized)\s+)*(?:[A-Za-z_][A-Za-z0-9_<>\[\], ?]*\s+)+([A-Za-z_][A-Za-z0-9_]*)\s*\(([^)]*)\)\s*\{\s*$/;
+  const generatedExportsClassPattern = /^\s*(?:(?:public|private|protected|static|final)\s+)*class\s+Exports[A-Za-z0-9_]*\s*\{/;
 
   for (const line of lines) {
+    if (generatedExportsClassDepth !== null) {
+      output.push(line);
+      generatedExportsClassDepth += braceDelta(line);
+      if (generatedExportsClassDepth <= 0) generatedExportsClassDepth = null;
+      continue;
+    }
+    if (generatedExportsClassPattern.test(line)) {
+      output.push(line);
+      generatedExportsClassDepth = Math.max(0, braceDelta(line));
+      if (generatedExportsClassDepth <= 0) generatedExportsClassDepth = null;
+      continue;
+    }
     if (methodDepth <= 0) {
       const methodMatch = line.match(methodStartPattern);
       if (methodMatch) {

package/workers/java/src/harness/browser/JavaRewriteLibrary.java

@@ -74,8 +74,8 @@ public final class JavaRewriteLibrary {
   private static final Pattern OBJECT_FIELD_MAP_GET_CALL = Pattern.compile("(?<!\\.)\\b(?!this\\b)([A-Za-z_][A-Za-z0-9_]*)\\.([A-Za-z_][A-Za-z0-9_]*)\\.get\\(([^()\\n;]+)\\)");
   private static final Pattern OBJECT_FIELD_MAP_GET_OR_DEFAULT_CALL = Pattern.compile("(?<!\\.)\\b(?!this\\b)([A-Za-z_][A-Za-z0-9_]*)\\.([A-Za-z_][A-Za-z0-9_]*)\\.getOrDefault\\(([^()\\n;]+)\\)");
   private static final Pattern OBJECT_FIELD_MAP_CONTAINS_KEY_CALL = Pattern.compile("(?<!\\.)\\b(?!this\\b)([A-Za-z_][A-Za-z0-9_]*)\\.([A-Za-z_][A-Za-z0-9_]*)\\.containsKey\\(([^()\\n;]+)\\)");
-  private static final Pattern MATRIX_READ = Pattern.compile("(?<!\\.)\\b([A-Za-z_][A-Za-z0-9_]*)\\s*\\[([^;\\]\\[]+)\\]\\s*\\[([^;\\]\\[]+)\\]");
-  private static final Pattern ARRAY_READ = Pattern.compile("(?<!\\.)\\b([A-Za-z_][A-Za-z0-9_]*)\\s*\\[([^;\\]\\[]+)\\]");
+  private static final Pattern MATRIX_READ = Pattern.compile("(?<!\\.)\\b([A-Za-z_][A-Za-z0-9_]*)\\s*\\[((?:[^\\]\\[()]|\\([^()]*\\))+)\\]\\s*\\[((?:[^\\]\\[()]|\\([^()]*\\))+)\\]");
+  private static final Pattern ARRAY_READ = Pattern.compile("(?<!\\.)\\b([A-Za-z_][A-Za-z0-9_]*)\\s*\\[((?:[^\\]\\[()]|\\([^()]*\\))+)\\]");
 
   private JavaRewriteLibrary() {}
 
@@ -1529,6 +1529,8 @@ public final class JavaRewriteLibrary {
 
   private static String indexSourceArgument(String value) {
     if (value != null) {
+      String tracedSource = tracedIndexedReadSource(value.trim());
+      if (tracedSource != null) return quote(tracedSource);
       java.util.regex.Matcher charAtIndex = java.util.regex.Pattern
         .compile("^[A-Za-z_][A-Za-z0-9_]*\\.charAt\\(\\s*([\\s\\S]+)\\s*\\)$")
         .matcher(value.trim());
@@ -1537,10 +1539,6 @@ public final class JavaRewriteLibrary {
         if (charAtSource == null) charAtSource = singleIdentifierIndexSource(charAtIndex.group(1));
         if (charAtSource != null) return quote(charAtSource);
       }
-      java.util.regex.Matcher tracedReadSource = java.util.regex.Pattern
-        .compile("^TraceHooks\\.read[A-Za-z0-9_]*AtLine\\([\\s\\S]*,\\s*\"([A-Za-z_][A-Za-z0-9_]*)\"\\s*\\)$")
-        .matcher(value.trim());
-      if (tracedReadSource.matches()) return quote(tracedReadSource.group(1));
       String expressionSource = safeIndexSourceExpression(value.trim());
       if (expressionSource == null) expressionSource = singleIdentifierIndexSource(value.trim());
       if (expressionSource != null) return quote(expressionSource);
@@ -1548,6 +1546,22 @@ public final class JavaRewriteLibrary {
     return isSimpleIdentifierExpression(value) ? quote(value) : "null";
   }
 
+  private static String tracedIndexedReadSource(String value) {
+    if (value == null || !value.startsWith("TraceHooks.read")) return null;
+    int open = value.indexOf('(');
+    if (open < 0 || !value.endsWith(")")) return null;
+    java.util.List<String> args = splitTopLevel(value.substring(open + 1, value.length() - 1));
+    if (args.size() < 2) return null;
+    java.util.regex.Matcher name = java.util.regex.Pattern
+      .compile("^\"([A-Za-z_][A-Za-z0-9_]*)\"$")
+      .matcher(args.get(1).trim());
+    if (!name.matches()) return null;
+    java.util.regex.Matcher explicitSource = java.util.regex.Pattern
+      .compile("^\"([^\"]+)\"$")
+      .matcher(args.get(args.size() - 1).trim());
+    return explicitSource.matches() ? explicitSource.group(1) : name.group(1);
+  }
+
   private static String escapedIndexSourcesTargetSegment(String... values) {
     StringBuilder out = new StringBuilder(",\\\"indexSources\\\":[");
     for (int index = 0; index < values.length; index++) {

package/workers/java/src/tracecode/user/TraceHooks.java

@@ -611,7 +611,11 @@ public final class TraceHooks {
 
           @Override
           public boolean hasNext() {
-            return iterator.hasNext();
+            boolean hasNext = iterator.hasNext();
+            if (!hasNext) {
+              emitLineAtLine(line);
+            }
+            return hasNext;
           }
 
           @Override
@@ -636,7 +640,11 @@ public final class TraceHooks {
 
           @Override
           public boolean hasNext() {
-            return iterator.hasNext();
+            boolean hasNext = iterator.hasNext();
+            if (!hasNext) {
+              emitLineAtLine(line);
+            }
+            return hasNext;
           }
 
           @Override

package/workers/javascript/javascript-worker.js

@@ -3582,6 +3582,7 @@ function rewriteForOfStatementForTracing(ts, sourceFile, context, forOfStatement
         tracedExpression,
         bodyBlock
       ),
+      createHeaderLine(),
       createAttachPendingAccessesStatement(ts),
     ],
     true