feat(s2dm): simplify vspec metadata annotation with sidecar lookup spec file

Signed-off-by: JD Alvarez <8550265+jdacoello@users.noreply.github.com>

Author: jdacoello

src/vss_tools/exporters/s2dm/graphql_directive_processor.py

@@ -246,11 +246,16 @@ def _process_field_directives(self, lines: list[str], vspec_comments: dict) -> l
 
                     # Add extended attributes metadata
                     for key, value in vss_info.items():
-                        if key not in ["element", "fqn", "instantiate"]:
+                        if key not in ["element", "fqn", "instantiate", "metadata"]:
                             # Escape quotes in value
                             escaped_value = str(value).replace('"', '\\\\"')
                             metadata_entries.append(f'{{key: "{key}", value: "{escaped_value}"}}')
 
+                    # Add structured metadata list entries (e.g. unit)
+                    for entry in vss_info.get("metadata", []):
+                        escaped_value = str(entry["value"]).replace('"', '\\\\"')
+                        metadata_entries.append(f'{{key: "{entry["key"]}", value: "{escaped_value}"}}')
+
                     # Build directive
                     if metadata_entries:
                         metadata_str = ", ".join(metadata_entries)

src/vss_tools/exporters/s2dm/predefined_elements/directives.graphql

@@ -35,13 +35,6 @@ enum VspecElement {
 }
 
 
-#enum FuelTypeEnum @vspec(element:"ATTRIBUTE", fqn:"Vehicle.Powertrain.FuelType", metadata:[{key:"allowed", value:"[GASOLINE, DIESEL, ELECTRIC, HYBRID]"}]) {
-#  GASOLINE
-#  DIESEL
-#  ELECTRIC
-#  HYBRID
-#}
-
 directive @range(min: Float, max: Float) on FIELD_DEFINITION
 
 directive @instanceTag on OBJECT

src/vss_tools/exporters/s2dm/type_builders.py

@@ -29,7 +29,6 @@
     GraphQLEnumType,
     GraphQLEnumValue,
     GraphQLField,
-    GraphQLID,
     GraphQLList,
     GraphQLNonNull,
     GraphQLObjectType,
@@ -513,8 +512,6 @@ def get_fields() -> dict[str, GraphQLField]:
         fields = {}
 
         # System fields
-        if type_name == "Vehicle" or branch_row.get("instances"):
-            fields["id"] = GraphQLField(GraphQLNonNull(GraphQLID))
         if instance_tag_type := vspec_comments.get("instance_tag_types", {}).get(type_name):
             if instance_tag_type in types_registry:
                 fields["instanceTag"] = GraphQLField(types_registry[instance_tag_type])
@@ -537,10 +534,7 @@ def get_fields() -> dict[str, GraphQLField]:
 
             if leaf_type := _get_vss_type_if_valid(leaf_row):
                 field_metadata = {"element": leaf_type, "fqn": child_fqn}
-
-                # Capture extended attributes if present
                 field_metadata.update(_extract_extended_attributes(leaf_row, extended_attributes))
-
                 vspec_comments["field_vss_types"][field_path] = field_metadata
 
             if pd.notna(leaf_row.get("min")) or pd.notna(leaf_row.get("max")):
@@ -597,8 +591,12 @@ def get_fields() -> dict[str, GraphQLField]:
                     {"fqn": child_fqn, "plural_field_name": plural_field_name, "path_in_graphql_model": field_path}
                 )
             else:
+                field_path = build_field_path(type_name, field_name)
                 fields[field_name] = GraphQLField(child_type)
 
+            # Annotate field with @vspec directive (shared for both cases)
+            vspec_comments["field_vss_types"][field_path] = {"element": "BRANCH", "fqn": child_fqn}
+
         return fields
 
     # Store type-level metadata including extended attributes
@@ -652,10 +650,7 @@ def get_hoisted_fields(
                     "fqn": leaf_fqn,
                     "instantiate": False,
                 }
-
-                # Capture extended attributes if present
                 field_metadata.update(_extract_extended_attributes(leaf_row, extended_attributes))
-
                 vspec_comments["field_vss_types"][field_path] = field_metadata
 
             if pd.notna(leaf_row.get("min")) or pd.notna(leaf_row.get("max")):