unified: Declare exposed fields on supertypes by asgerf · Pull Request #22536 · github/codeql

asgerf · 2026-09-09T19:06:23Z

Supertypes in ast_nodes.yml can now have a list of fields to expose in the generated QL class. This replaces the previous rule from #22507 where fields that were common among all subtypes were automatically hoisted to supertypes.

Compared to automatic hoisting, manually-declared supertype fields work better in a few scenarios:

There are some subtypes where the field has a more precise type thus failing an exact signature match
Adding a new subtype that lacks a previously-common field can cause a breaking AST change.
Sometimes it's just nice to have getters for fields that are present in the common case, but some subtypes are lacking it.

This PR uses the feature for the callable supertype:

  callable:
    subtypes:
      - top_level
      - function_expr
      - function_declaration
      - constructor_declaration
      - destructor_declaration
      - accessor_declaration
      - initializer_declaration
    fields:
      parameter*: parameter
      body?: block

Previously the body field was hoisted automatically, but not parameter, because some callables can't have parameters (like top-level).


    /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getParameter(int i) {
+    final override F::Parameter getParameter(int i) {



    /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getParameter(int i) {
+    final override F::Parameter getParameter(int i) {



    /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getParameter(int i) {
+    final override F::Parameter getParameter(int i) {



    /** Gets the node corresponding to the field `parameter`. */
-    final F::Parameter getParameter(int i) { unified_function_expr_parameter(this, i, result) }
+    final override F::Parameter getParameter(int i) {


Copilot

Copilot review overview

🟡 Changes recommended

The generated unified Callable now declares abstract parameter accessors, but some concrete Callable subtypes don’t implement them, and the generator change likely breaks supertypes that have subtypes but no declared fields.

Once you've addressed the issues Copilot identified, you can request another Copilot review.

Review tier: Lite
Findings: 1 · 1

New issues introduced by this change (2)

Severity	Finding
	`unified/ql/lib/codeql/unified/internal/Ast.qll` — `Callable` now declares `getParameter`/`getAParameter` as `abstract`, but several concrete…
	`shared/tree-sitter-extractor/src/generator/ql_gen.rs` — `compute_exposed_predicates` now makes union (supertype) classes expose only the predicates derived…

What changed in this PR

This PR extends the Yeast/unified AST schema format so supertypes can explicitly declare a set of exposed fields, and updates the tree-sitter QL generator and unified AST output to surface those fields (notably callable.parameter) on the generated supertype class.

Changes:

Add a “detailed” supertypes YAML form supporting subtypes + fields, with JSON round-tripping and tests.
Update tree-sitter extractor data structures and QL generator to carry/emit supertype-declared field predicates.
Regenerate unified Ast.qll so Callable exposes parameter accessors and members override them.

File	Description
unified/ql/lib/codeql/unified/internal/Ast.qll	Regenerated unified AST QL classes; adds `Callable.getParameter/getAParameter` and marks member implementations as `override`.
unified/extractor/tests/corpus_tests.rs	Minor Rust formatting cleanup for Bazel `RUNFILES_DIR` handling.
unified/extractor/ast_types.yml	Switch `callable` supertype to detailed form and declare exposed `parameter*` and `body?` fields.
shared/yeast/doc/node-types-yaml.md	Document the new detailed supertype syntax and field semantics.
shared/yeast-schema/src/schema.rs	Formatting-only refactor of `field_types` accessor signature.
shared/yeast-schema/src/node_types_yaml.rs	Parse/convert detailed supertypes, factor field conversion, add YAML↔JSON round-trip tests for supertype fields.
shared/tree-sitter-extractor/src/node_types.rs	Extend union (supertype) entries to retain declared fields/children for codegen.
shared/tree-sitter-extractor/src/generator/ql_gen.rs	Change how exposed predicates are computed/hoisted, and add tests for “expose only declared supertype fields”.
shared/tree-sitter-extractor/src/generator/mod.rs	Update pattern matches for the expanded `EntryKind::Union` shape.
shared/tree-sitter-extractor/src/extractor/mod.rs	Update pattern matches for the expanded `EntryKind::Union` shape in type matching.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

+    F::Block getBody() { none() }
+
+    /** Gets the node corresponding to the field `parameter`. */
+    F::Parameter getParameter(int i) { none() }


Supertypes in ast_nodes.yml can now have a list of fields to expose in the generated QL class. Callable.parameter is then exposed, which was previously not exposed because some callables cannot have parameters, but it's useful to have the getter available anyway.

Copilot

Copilot review overview

🟡 Changes recommended

Nested inheritance, refined return overrides, and in-memory schema registration are currently incomplete.

Get a fresh assessment by requesting another Copilot review.

Review effort: Balanced
Findings: 2

Open (2)

Propagate inherited field predicates through nested supertypes · New
Support refined return types when detecting predicate overrides · New

Resolved since last review (2)

Callable now declares getParameter/getAParameter as abstract, but several concrete…
compute_exposed_predicates now makes union (supertype) classes expose only the predicates derived…

+            Some(node_types::EntryKind::Union { .. }) => {
+                field_predicates.get(type_name).cloned().unwrap_or_default()


                // A field getter that's identically defined (in signature) by
                // every member of one of this node's direct supertypes is an
-                // override of the corresponding `abstract` predicate declared
-                // there.
+                // override of the corresponding predicate declared there.


asgerf added the no-change-note-required This PR does not need a change note label Sep 9, 2026

asgerf requested a balanced review from Copilot September 9, 2026 19:06

Copilot started reviewing on behalf of asgerf September 9, 2026 19:06 View session

github-advanced-security Bot found potential problems Sep 9, 2026

View reviewed changes

Copilot AI reviewed Sep 9, 2026

View reviewed changes

Comment thread unified/ql/lib/codeql/unified/internal/Ast.qll Outdated

Comment thread shared/tree-sitter-extractor/src/generator/ql_gen.rs

github-actions Bot added the documentation label Sep 9, 2026

github-advanced-security Bot found potential problems Sep 10, 2026

View reviewed changes

Comment thread unified/ql/lib/codeql/unified/internal/Ast.qll

F::Block getBody() { none() }

/** Gets the node corresponding to the field `parameter`. */

F::Parameter getParameter(int i) { none() }

asgerf added 2 commits September 24, 2026 14:55

unified: Declare with default implementation

218aa65

asgerf force-pushed the unified/supertype-fields branch from 2d3cecb to 218aa65 Compare September 24, 2026 13:03

tree-sitter: auto format

e25aafa

asgerf requested a balanced review from Copilot September 24, 2026 13:21

Copilot started reviewing on behalf of asgerf September 24, 2026 13:21 View session

Copilot AI reviewed Sep 24, 2026

View reviewed changes

Navigation Menu

unified: Declare exposed fields on supertypes - #22536

unified: Declare exposed fields on supertypes#22536
asgerf wants to merge 3 commits into
github:mainfrom
asgerf:unified/supertype-fields

asgerf commented Sep 9, 2026 •

edited

Loading

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		Some(node_types::EntryKind::Union { .. }) => {
		field_predicates.get(type_name).cloned().unwrap_or_default()

Conversation

asgerf commented Sep 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🟡 Changes recommended

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🟡 Changes recommended

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

asgerf commented Sep 9, 2026 •

edited

Loading