Skip to content

bundle: a relation that names a field makes that field listed (#890) #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
swapnilpaliwal-sd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bundle: a relation that names a field makes that field listed (#890) #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions graph/bundle/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,15 @@ export async function buildCore(inp: BuildInputs): Promise<CoreTables> {
wantMethods.add(r[1] as string);
if (r[2] !== null) wantFields.add(r[2] as string);
}
// A relation may NAME a field without being a field access, and such a row is exactly a
// statement that the field matters. Counting only field_access left those ids resolving
// to nothing in `fields` (#890). Which relations do this is declared by the adapter.
for (const fr of inp.adapter.raw.fieldRefs ?? []) {
for await (const r of readRaw(path.join(inp.rawDir, fr.file))) {
const id = r[fr.column];
if (id && id !== NONE) wantFields.add(id);
}
}

// ── 3. client entities (all of them — the client is the subject) ──────────
const methods = new Map<string, Row>();
Expand Down
15 changes: 15 additions & 0 deletions graph/bundle/languages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,17 @@ export interface LanguageAdapter {
fieldAccess?: RawSource;
/** (ref, owner, ownerKind, enclType, enclMethod, type, prov, context, depth, tier) — #663 */
typeUse?: RawSource;
/**
* Relations that NAME a field without being a field access. `fields` lists every client
* field, but a LIBRARY field only when something references it, and that something was
* `fieldAccess` alone. A relation like a config binding says the field matters and then
* could not resolve it, so its rows pointed at ids the table does not hold (#890).
*
* Each entry is a raw relation plus the column holding the field id. Declared per
* language because which relations name a field is a language's own business, and
* build.ts stays neutral.
*/
fieldRefs?: { file: string; column: number }[];
};
ir: {
methods: MethodsIR;
Expand Down Expand Up @@ -126,6 +137,10 @@ const JAVA: LanguageAdapter = {
fieldAccess: { file: 'field-access.csv', columns: [0, 1, 2, 3, 4, 5] },
// ref, type, context, depth, ownerKind, owner, enclMethod, enclType, typeProv, tier
typeUse: { file: 'type-use.csv', columns: [0, 5, 7, 8, 2, 1, 4, 3, 6, 9] },
// config_binding(Key, Mechanism, TargetKind, Target, Owner): column 3 is the bound
// field when TargetKind is "field". A row naming a library field is why that field
// has to be listed at all.
fieldRefs: [{ file: 'config-binding.csv', column: 3 }],
},
ir: {
methods: {
Expand Down