Matcher refactor

README.md

@@ -68,12 +68,12 @@ python3 -m google.adk.scope.extractors.python.extractor \
 
 ```
 
-### Feature Matching
+### Feature Matching & Reporting
 
-Once you have extracted features from two languages (e.g., Python and TypeScript), you can compare them using the `match.sh` script.
+Once you have extracted features from two languages (e.g., Python and TypeScript), you can compare them using the `report.sh` script.
 
 ```bash
-./match.sh \
+./report.sh \
   --base output/py.txtpb \
   --target output/ts.txtpb \
   --output output/ \

proto/features.proto

@@ -15,6 +15,7 @@ enum ParamType {
   MAP = 5;
   SET = 6;
   UNKNOWN = 7;
+  NULL = 8;
 }
 
 
@@ -60,7 +61,7 @@ message Feature {
 
   repeated string original_return_types = 12;   // Raw returns (e.g., "Future<String>").
   repeated string normalized_return_types = 13; // Canonical returns (e.g., "STRING").
-  
+
   optional bool async = 14;                     // true if it is an async call. 
 }
 

match.sh → report.sh

@@ -76,7 +76,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 export PYTHONPATH="${SCRIPT_DIR}/src:${PYTHONPATH}"
 
 # Run the python matcher
-python3 "${SCRIPT_DIR}/src/google/adk/scope/matcher/matcher.py" \
+python3 "${SCRIPT_DIR}/src/google/adk/scope/reporter/reporter.py" \
     --base "${BASE_FILE}" \
     --target "${TARGET_FILE}" \
     --output "${FULL_OUTPUT_PATH}" \

run.sh

@@ -5,10 +5,10 @@ echo "Extracting TypeScript features..."
 ./extract.sh --language typescript --input-repo ../adk-js  ./output
 
 echo "Generating symmetric reports..."
-./match.sh --base output/py.txtpb --target output/ts.txtpb --output ./output --report-type symmetric
+./report.sh --base output/py.txtpb --target output/ts.txtpb --output ./output --report-type symmetric
 
 echo "Generating directional reports..  ."
-./match.sh --base output/py.txtpb --target output/ts.txtpb --output ./output --report-type directional
+./report.sh --base output/py.txtpb --target output/ts.txtpb --output ./output --report-type directional
 
 echo "Generating raw reports..."
-./match.sh --base output/py.txtpb --target output/ts.txtpb --output ./output --report-type raw
+./report.sh --base output/py.txtpb --target output/ts.txtpb --output ./output --report-type raw

src/google/adk/scope/extractors/converter_py.py

@@ -382,11 +382,9 @@ def _process_param_node(self, node: Node) -> Optional[feature_pb2.Param]:
             # Protocol Buffer enums don't have NULL usually.
             # Let's drop "null" from the enum list for now, or map to
             # UNKNOWN if forced.
-            if s == "null":
-                continue
-
             try:
-                enum_val = getattr(feature_pb2.ParamType, s)
+                # s is lowercase from normalizer, enum is uppercase
+                enum_val = getattr(feature_pb2.ParamType, s.upper())
                 normalized_enums.append(enum_val)
             except AttributeError:
                 # Fallback to OBJECT or UNKNOWN?

src/google/adk/scope/extractors/converter_ts.py

@@ -566,7 +566,7 @@ def _create_single_param(
         normalized_enums = []
         for s in normalized_strings:
             try:
-                enum_val = getattr(feature_pb2.ParamType, s)
+                enum_val = getattr(feature_pb2.ParamType, s.upper())
                 normalized_enums.append(enum_val)
             except AttributeError:
                 normalized_enums.append(feature_pb2.ParamType.OBJECT)
@@ -613,7 +613,8 @@ def _extract_return_types(self, node: Node) -> Tuple[List[str], List[str]]:
             # logically T for async?
             # Schema says "original_return_types".
             # normalized usually unwrap?
-            return [raw], self.normalizer.normalize(raw, "typescript")
+            normalized = self.normalizer.normalize(raw, "typescript")
+            return [raw], normalized
         return [], []
 
     def _is_blocking(self, node: Node, return_types: List[str]) -> bool: