@lzehrung/codegraph 2.3.31 → 3.0.0

package/dist/util/member-access-tables.d.ts

@@ -1,8 +1,8 @@
 /**
- * Per-language member-access and receiver-shape tables for `./member-access.ts` and the receiver
- * pass in `../graphs/symbol-graph-detailed/receiver-calls.ts`. Rows are keyed by language id,
- * following the trivia-table precedent in `./trivia-tables.ts`: the walkers keep the algorithm,
- * the table keeps the per-language node types, extraction shapes, and receiver keywords.
+ * Per-language member-access, receiver, and ancestry tables for `./member-access.ts`, keyword
+ * navigation, and the detailed graph passes. Rows are keyed by language id, following the
+ * trivia-table precedent in `./trivia-tables.ts`: walkers keep the algorithms; this table keeps
+ * the per-language node types, extraction shapes, receiver keywords, and ancestry forms.
  *
  * Every registered language has a row. A document, style, or data format row carries only
  * `omittedReason`; a source-language row declares each capability it has and names a one-line
@@ -14,6 +14,8 @@
 export type ReceiverKeywords = {
     /** Keywords naming the type that declares the calling member. */
     own: readonly string[];
+    /** Own-type keywords that name an instance rather than the type itself. */
+    instanceOwn: readonly string[];
     /** Keywords naming a supertype of the declaring type. */
     supertype: readonly string[];
 };
@@ -41,6 +43,35 @@ export type MemberAccessShape = {
         navigation: true;
     };
 };
+export type ReceiverAncestryRelation = "extends" | "implements" | "trait" | "mixin";
+export type ReceiverAncestorClause = {
+    /** Syntax node that contains one or more declared ancestors. */
+    nodeType: string;
+    /** Detailed-graph edge label, or superclass-first classification for mixed base lists. */
+    relation: ReceiverAncestryRelation | "superclass-first";
+    /** Descend into this field before collecting ancestors. */
+    field?: string;
+    /** Treat every matching clause separately. */
+    each?: boolean;
+    /**
+     * Which ancestors a `super`/`parent`/`base` receiver may address. Own-type receivers use every
+     * declaration in the clause.
+     */
+    supertype?: "all" | "first-child" | "first-match";
+};
+export type ReceiverAncestorEmbed = {
+    body: string;
+    memberList?: string;
+    member: string;
+    typeField?: string;
+    nameless?: boolean;
+};
+export type ReceiverAncestry = {
+    clauses: readonly ReceiverAncestorClause[];
+    embeds?: readonly ReceiverAncestorEmbed[];
+    /** Call names that add mixins to the declaring type, such as Ruby `include` and `prepend`. */
+    mixinCalls?: readonly string[];
+};
 export type MemberAccessRow = {
     /** Why the language has no member-access capability at all; only document, style, and data formats set it. */
     omittedReason?: string;
@@ -58,8 +89,25 @@ export type MemberAccessRow = {
     navigationFallbackLastChild?: true;
     /** Identifiers that name the type declaring the calling member. */
     receiverKeywords?: ReceiverKeywords;
+    /**
+     * A receiver keyword may also be spelled as a zero-argument call to that keyword identifier
+     * (Python's `super()`, which has no bare-name form unlike `self`/`cls`). Absent for every
+     * language whose receiver keywords are always bare names.
+     */
+    receiverKeywordCallShape?: true;
     /** Why the language declares no receiver keywords. */
     receiverKeywordsOmittedReason?: string;
+    /** Language syntax that declares ancestors visible to own-type and supertype receivers. */
+    receiverAncestry?: ReceiverAncestry;
+    /**
+     * Member syntax can name a free function (`!isMember`): Kotlin extensions
+     * (`fun Widget.describe()`) and Go methods, which are indexed as free functions.
+     * Swift extensions, Rust methods, and C# extension methods are `isMember`, so they
+     * stay on the member path and do not set this flag.
+     */
+    memberCallNamesFreeFunction?: true;
+    /** Why a member call cannot name a free function in this language. */
+    memberCallNamesFreeFunctionOmittedReason?: string;
 };
 export declare const MEMBER_ACCESS_ROWS: Record<string, MemberAccessRow>;
 /** Every language that declares receiver keywords, guarded by the registry-consistency test. */
@@ -68,5 +116,14 @@ export declare const receiverKeywordLanguageIds: readonly string[];
 export declare function supportsReceiverCallEdges(languageId: string): boolean;
 /** Languages where goto and references require proven receivers and do not fall back to a bare name. */
 export declare function supportsReceiverMemberNavigation(languageId: string): boolean;
+export declare function keywordReceiverKind(languageId: string, receiverName: string): "own" | "supertype" | null;
+/**
+ * Instance-own keywords (`this`, `$this`) require instance members.
+ * Other own keywords name the declaring type and may still bind instance members
+ * (PHP `self::` / `static::` late static binding), so they do not force a static-only filter.
+ */
+export declare function ownReceiverMemberScope(languageId: string, receiverName: string): "instance" | "any" | null;
 export declare function isKeywordReceiver(languageId: string, receiverName: string): boolean;
+/** Whether `receiver.name()` can refer to a free function rather than only a member. */
+export declare function memberSyntaxNamesFreeFunction(languageId: string): boolean;
 //# sourceMappingURL=member-access-tables.d.ts.map

package/dist/util/member-access-tables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"member-access-tables.d.ts","sourceRoot":"","sources":["../../src/util/member-access-tables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,0FAA0F;AAC1F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,iEAAiE;IACjE,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;IACvB,yDAAyD;IACzD,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtH,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,mGAAmG;IACnG,QAAQ,EAAE,iBAAiB,GAAG;QAAE,UAAU,EAAE,IAAI,CAAA;KAAE,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,8GAA8G;IAC9G,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yGAAyG;IACzG,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,yFAAyF;IACzF,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,yFAAyF;IACzF,sBAAsB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,sGAAsG;IACtG,kBAAkB,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAClD,oGAAoG;IACpG,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,gHAAgH;IAChH,2BAA2B,CAAC,EAAE,IAAI,CAAC;IACnC,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,sDAAsD;IACtD,6BAA6B,CAAC,EAAE,MAAM,CAAC;CACxC,CAAC;AAkBF,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAgI9D,CAAC;AAEF,gGAAgG;AAChG,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAEvD,CAAC;AAEF,uFAAuF;AACvF,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,wGAAwG;AACxG,wBAAgB,gCAAgC,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE5E;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAInF"}
+{"version":3,"file":"member-access-tables.d.ts","sourceRoot":"","sources":["../../src/util/member-access-tables.ts"],"names":[],"mappings":"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"}

package/dist/util/member-access-tables.js

@@ -1,8 +1,8 @@
 /**
- * Per-language member-access and receiver-shape tables for `./member-access.ts` and the receiver
- * pass in `../graphs/symbol-graph-detailed/receiver-calls.ts`. Rows are keyed by language id,
- * following the trivia-table precedent in `./trivia-tables.ts`: the walkers keep the algorithm,
- * the table keeps the per-language node types, extraction shapes, and receiver keywords.
+ * Per-language member-access, receiver, and ancestry tables for `./member-access.ts`, keyword
+ * navigation, and the detailed graph passes. Rows are keyed by language id, following the
+ * trivia-table precedent in `./trivia-tables.ts`: walkers keep the algorithms; this table keeps
+ * the per-language node types, extraction shapes, receiver keywords, and ancestry forms.
  *
  * Every registered language has a row. A document, style, or data format row carries only
  * `omittedReason`; a source-language row declares each capability it has and names a one-line
@@ -21,23 +21,39 @@ const CPP_QUALIFIED_ACCESS_SHAPE = {
     object: { field: "scope", fallbackIndex: 0 },
     property: { field: "name", fallbackIndex: 2 },
 };
-const THIS_SUPER_RECEIVERS = { own: ["this"], supertype: ["super"] };
-const SELF_RECEIVERS = { own: ["self"], supertype: ["super"] };
+const THIS_SUPER_RECEIVERS = { own: ["this"], instanceOwn: ["this"], supertype: ["super"] };
+const SELF_RECEIVERS = { own: ["self"], instanceOwn: ["self"], supertype: ["super"] };
 export const MEMBER_ACCESS_ROWS = {
     adoc: { omittedReason: "AsciiDoc document format; embedded code blocks parse as their own language." },
     astro: { omittedReason: "Astro document format; scripts parse as js/ts and templates as html." },
     c: {
         memberAccessShapes: [C_FIELD_ACCESS_SHAPE],
         receiverKeywordsOmittedReason: "C has no receiver keyword; member access always names an explicit object or pointer.",
+        memberCallNamesFreeFunctionOmittedReason: "A member expression names a field of an object, not a free function.",
     },
     cpp: {
         memberAccessShapes: [C_FIELD_ACCESS_SHAPE, CPP_QUALIFIED_ACCESS_SHAPE],
-        receiverKeywords: { own: ["this"], supertype: [] },
+        receiverKeywords: { own: ["this"], instanceOwn: ["this"], supertype: [] },
+        receiverAncestry: { clauses: [{ nodeType: "base_class_clause", relation: "extends" }] },
+        memberCallNamesFreeFunctionOmittedReason: "A member call on an object or parameter cannot name a namespace free function.",
     },
     css: { omittedReason: "Style language; no member-access concept." },
     csharp: {
-        memberAccessShapes: [{ object: { index: 0 }, property: { index: 2 } }],
-        receiverKeywords: { own: ["this"], supertype: ["base"] },
+        extraTraversalTypes: ["qualified_name", "alias_qualified_name"],
+        extraMemberAccessTypes: ["alias_qualified_name"],
+        memberAccessShapes: [
+            {
+                nodeTypes: ["alias_qualified_name"],
+                object: { field: "alias", fallbackIndex: 0 },
+                property: { field: "name", fallbackIndex: 2 },
+            },
+            { object: { index: 0 }, property: { index: 2 } },
+        ],
+        receiverKeywords: { own: ["this"], instanceOwn: ["this"], supertype: ["base"] },
+        receiverAncestry: {
+            clauses: [{ nodeType: "base_list", relation: "superclass-first", supertype: "first-child" }],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "Extension methods are members; a free function is not called with member syntax.",
     },
     go: {
         extraTraversalTypes: ["qualified_type"],
@@ -45,11 +61,26 @@ export const MEMBER_ACCESS_ROWS = {
         memberAccessShapes: [{ nodeTypes: ["qualified_type"], object: { namedIndex: 0 }, property: { namedIndex: 1 } }],
         // Go has no receiver keyword: a method call's receiver is an ordinary value. The row still
         // exists so go receivers must be proven rather than falling back to a bare name.
-        receiverKeywords: { own: [], supertype: [] },
+        receiverKeywords: { own: [], instanceOwn: [], supertype: [] },
+        receiverAncestry: {
+            clauses: [],
+            embeds: [
+                { body: "interface_type", member: "type_elem" },
+                {
+                    body: "struct_type",
+                    memberList: "field_declaration_list",
+                    member: "field_declaration",
+                    typeField: "type",
+                    nameless: true,
+                },
+            ],
+        },
+        memberCallNamesFreeFunction: true,
     },
     hbs: { omittedReason: "Handlebars document format; embedded scripts parse as their own language." },
     html: { omittedReason: "Document format; embedded scripts parse as their own language." },
     java: {
+        extraTraversalTypes: ["field_access", "scoped_identifier", "scoped_type_identifier"],
         memberAccessShapes: [
             {
                 nodeTypes: ["method_invocation"],
@@ -63,10 +94,19 @@ export const MEMBER_ACCESS_ROWS = {
             },
         ],
         receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: {
+            clauses: [
+                { nodeType: "superclass", relation: "extends", supertype: "all" },
+                { nodeType: "super_interfaces", relation: "implements" },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "A method call names a member of the receiver type, not a free function.",
     },
     js: {
         memberAccessOmittedReason: "The shared generic default already reads member_expression's object and property fields.",
         receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: { clauses: [{ nodeType: "class_heritage", relation: "extends", supertype: "all" }] },
+        memberCallNamesFreeFunctionOmittedReason: "Member syntax names an object property; a free function is not called that way.",
     },
     kotlin: {
         memberAccessShapes: [
@@ -74,12 +114,21 @@ export const MEMBER_ACCESS_ROWS = {
         ],
         navigationFallbackLastChild: true,
         receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: {
+            clauses: [{ nodeType: "delegation_specifiers", relation: "superclass-first", supertype: "first-child" }],
+        },
+        memberCallNamesFreeFunction: true,
     },
     less: { omittedReason: "Style language; no member-access concept." },
     markdown: { omittedReason: "Document format; fenced code blocks parse as their own language." },
     mdx: { omittedReason: "MDX document format; scripts parse as js/ts and templates as html." },
     php: {
-        extraMemberAccessTypes: ["member_call_expression", "nullsafe_member_call_expression", "scoped_call_expression"],
+        extraMemberAccessTypes: [
+            "member_call_expression",
+            "nullsafe_member_call_expression",
+            "scoped_call_expression",
+            "class_constant_access_expression",
+        ],
         memberAccessShapes: [
             {
                 nodeTypes: ["member_call_expression", "nullsafe_member_call_expression"],
@@ -91,15 +140,31 @@ export const MEMBER_ACCESS_ROWS = {
                 object: { field: "scope", fallbackIndex: 0 },
                 property: { field: "name", fallbackIndex: 2 },
             },
+            {
+                nodeTypes: ["class_constant_access_expression"],
+                object: { namedIndex: 0 },
+                property: { namedIndex: 1 },
+            },
         ],
-        receiverKeywords: { own: ["$this", "self", "static"], supertype: ["parent"] },
+        receiverKeywords: { own: ["$this", "self", "static"], instanceOwn: ["$this"], supertype: ["parent"] },
+        receiverAncestry: {
+            clauses: [
+                { nodeType: "base_clause", relation: "extends", supertype: "all" },
+                { nodeType: "class_interface_clause", relation: "implements" },
+                { nodeType: "use_declaration", relation: "trait", each: true },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "A member or scoped call names a class member, not a free function.",
     },
     python: {
         memberExpressionType: "attribute",
         memberAccessShapes: [
             { object: { field: "object", fallbackIndex: 0 }, property: { field: "attribute", fallbackIndex: 2 } },
         ],
-        receiverKeywords: { own: ["self", "cls"], supertype: [] },
+        receiverKeywords: { own: ["self", "cls"], instanceOwn: ["self"], supertype: ["super"] },
+        receiverKeywordCallShape: true,
+        receiverAncestry: { clauses: [{ nodeType: "argument_list", relation: "extends" }] },
+        memberCallNamesFreeFunctionOmittedReason: "Attribute access names a member; a free function is not called that way.",
     },
     rst: { omittedReason: "reStructuredText document format; embedded code blocks parse as their own language." },
     ruby: {
@@ -113,9 +178,15 @@ export const MEMBER_ACCESS_ROWS = {
             // Ruby models every other member access as a `call` node with receiver and method fields.
             { object: { field: "receiver", fallbackIndex: 0 }, property: { field: "method", fallbackIndex: 2 } },
         ],
-        receiverKeywords: { own: ["self"], supertype: [] },
+        receiverKeywords: { own: ["self"], instanceOwn: ["self"], supertype: [] },
+        receiverAncestry: {
+            clauses: [{ nodeType: "superclass", relation: "extends", supertype: "all" }],
+            mixinCalls: ["include", "extend", "prepend"],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "A call with a receiver names a method, not a free function.",
     },
     rust: {
+        extraTraversalTypes: ["scoped_identifier"],
         memberAccessShapes: [
             {
                 nodeTypes: ["scoped_identifier"],
@@ -123,7 +194,8 @@ export const MEMBER_ACCESS_ROWS = {
                 property: { field: "name", fallbackIndex: 2 },
             },
         ],
-        receiverKeywords: { own: ["self", "Self"], supertype: [] },
+        receiverKeywords: { own: ["self", "Self"], instanceOwn: ["self"], supertype: [] },
+        memberCallNamesFreeFunctionOmittedReason: "Methods are members; a free function is not invoked with member syntax.",
     },
     scss: { omittedReason: "Style language; no member-access concept." },
     svelte: { omittedReason: "Svelte component format; script blocks parse as js/ts and templates as html." },
@@ -133,19 +205,45 @@ export const MEMBER_ACCESS_ROWS = {
             { nodeTypes: ["navigation_expression"], object: { namedIndex: 0 }, property: { navigation: true } },
         ],
         receiverKeywords: SELF_RECEIVERS,
+        receiverAncestry: {
+            clauses: [
+                {
+                    nodeType: "inheritance_specifier",
+                    relation: "superclass-first",
+                    each: true,
+                    supertype: "first-match",
+                },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "Extension methods are members; a free function is not called with member syntax.",
     },
     ts: {
         memberAccessOmittedReason: "The shared generic default already reads member_expression's object and property fields.",
         receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: {
+            clauses: [
+                { nodeType: "extends_clause", relation: "extends", field: "value", supertype: "all" },
+                { nodeType: "implements_clause", relation: "implements" },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "Member syntax names an object property; a free function is not called that way.",
     },
     tsx: {
         memberAccessOmittedReason: "The shared generic default already reads member_expression's object and property fields.",
         receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: {
+            clauses: [
+                { nodeType: "extends_clause", relation: "extends", field: "value", supertype: "all" },
+                { nodeType: "implements_clause", relation: "implements" },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "Member syntax names an object property; a free function is not called that way.",
     },
     vue: { omittedReason: "Vue component format; script blocks parse as js/ts and templates as html." },
     zig: {
         memberAccessOmittedReason: "No per-language extraction today; the shared generic default is zig's behavior.",
-        receiverKeywords: { own: ["self"], supertype: [] },
+        receiverKeywords: { own: ["self"], instanceOwn: ["self"], supertype: [] },
+        memberCallNamesFreeFunctionOmittedReason: "A member call names a container member, not a free function.",
     },
 };
 /** Every language that declares receiver keywords, guarded by the registry-consistency test. */
@@ -158,10 +256,32 @@ export function supportsReceiverCallEdges(languageId) {
 export function supportsReceiverMemberNavigation(languageId) {
     return MEMBER_ACCESS_ROWS[languageId]?.receiverKeywords !== undefined;
 }
-export function isKeywordReceiver(languageId, receiverName) {
+export function keywordReceiverKind(languageId, receiverName) {
     const keywords = MEMBER_ACCESS_ROWS[languageId]?.receiverKeywords;
     if (!keywords)
-        return false;
-    return keywords.own.includes(receiverName) || keywords.supertype.includes(receiverName);
+        return null;
+    if (keywords.own.includes(receiverName))
+        return "own";
+    if (keywords.supertype.includes(receiverName))
+        return "supertype";
+    return null;
+}
+/**
+ * Instance-own keywords (`this`, `$this`) require instance members.
+ * Other own keywords name the declaring type and may still bind instance members
+ * (PHP `self::` / `static::` late static binding), so they do not force a static-only filter.
+ */
+export function ownReceiverMemberScope(languageId, receiverName) {
+    const keywords = MEMBER_ACCESS_ROWS[languageId]?.receiverKeywords;
+    if (!keywords?.own.includes(receiverName))
+        return null;
+    return keywords.instanceOwn.includes(receiverName) ? "instance" : "any";
+}
+export function isKeywordReceiver(languageId, receiverName) {
+    return keywordReceiverKind(languageId, receiverName) !== null;
+}
+/** Whether `receiver.name()` can refer to a free function rather than only a member. */
+export function memberSyntaxNamesFreeFunction(languageId) {
+    return !!MEMBER_ACCESS_ROWS[languageId]?.memberCallNamesFreeFunction;
 }
 //# sourceMappingURL=member-access-tables.js.map

package/dist/util/member-access-tables.js.map

@@ -1 +1 @@
-{"version":3,"file":"member-access-tables.js","sourceRoot":"","sources":["../../src/util/member-access-tables.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"member-access-tables.js","sourceRoot":"","sources":["../../src/util/member-access-tables.ts"],"names":[],"mappings":"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"}

package/dist/util/member-access.d.ts

@@ -17,6 +17,14 @@ export declare function isMemberObjectIdentifier(nodeType: string): boolean;
 /** Identifier-like nodes that can name a receiver, including Ruby `@ivar`/`@@cvar`. */
 export declare function isReceiverNameNode(sup: LanguageSupport, nodeType: string): boolean;
 export declare function isMemberReferencePropertyIdentifier(sup: LanguageSupport, nodeType: string): boolean;
+/**
+ * The text used to classify a receiver as an own-type or supertype keyword. Ordinarily this is
+ * the receiver node's own source spelling, but a language whose row sets `receiverKeywordCallShape`
+ * may also spell a keyword receiver as a zero-argument call to that keyword - Python's `super()`,
+ * which (unlike `self`/`cls`) has no bare-name form. Only unwrap that call when its callee is
+ * not shadowed by a visible lexical binding.
+ */
+export declare function receiverKeywordText(sup: LanguageSupport, node: SyntaxNodeLike, source: string, hasLexicalBinding: (callee: SyntaxNodeLike) => boolean): string;
 export declare function getNavigationExpressionProperty(sup: LanguageSupport, expr: SyntaxNodeLike): SyntaxNodeLike | null;
 export declare function getMemberAccessParts(sup: LanguageSupport, memberNode: SyntaxNodeLike): MemberAccessParts;
 export declare function collectMemberAccessChain(args: {
@@ -25,4 +33,13 @@ export declare function collectMemberAccessChain(args: {
     chainNode: SyntaxNodeLike;
     constStringOf?: Map<string, string>;
 }): MemberAccessChain | null;
+/**
+ * Whether a name inside a Rust macro token tree follows a `.` or `::` separator, ignoring comments:
+ * `counter.bump()` with a block comment after the dot is still a member call, and `m::run()` with
+ * one after the `::` is still a path call. Raw
+ * tokens cannot prove such a receiver, so both consumers stay conservative there.
+ */
+export declare function rustTokenTreeNameFollowsSeparator(name: SyntaxNodeLike): boolean;
+/** Whether a Rust token tree is (nested in) the arguments of a standard expression macro. */
+export declare function rustTokenTreeHoldsExpressions(tokenTree: SyntaxNodeLike): boolean;
 //# sourceMappingURL=member-access.d.ts.map

package/dist/util/member-access.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"member-access.d.ts","sourceRoot":"","sources":["../../src/util/member-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAsBF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAGpE;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,EAAE,CAE5E;AAED,wBAAgB,sCAAsC,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,EAAE,CAErF;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,CAS5E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAMtF;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAWlE;AAED,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAElF;AAED,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEnG;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,cAAc,GAAG,IAAI,CAajH;AAgBD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,GAAG,iBAAiB,CAiBxG;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,eAAe,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,cAAc,CAAC;IAC1B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,GAAG,iBAAiB,GAAG,IAAI,CA0C3B"}
+{"version":3,"file":"member-access.d.ts","sourceRoot":"","sources":["../../src/util/member-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAsBF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAGpE;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,EAAE,CAE5E;AAED,wBAAgB,sCAAsC,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,EAAE,CAErF;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,CAS5E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAMtF;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAWlE;AAED,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAElF;AAED,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEnG;AAID;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,GACrD,MAAM,CAUR;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,cAAc,GAAG,IAAI,CAajH;AAgBD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,GAAG,iBAAiB,CAiBxG;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,eAAe,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,cAAc,CAAC;IAC1B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,GAAG,iBAAiB,GAAG,IAAI,CAmD3B;AAID;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAU/E;AAgCD,6FAA6F;AAC7F,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAYhF"}

package/dist/util/member-access.js

@@ -1,5 +1,5 @@
 import { sliceText, unquote } from "./ast.js";
-import { MEMBER_ACCESS_ROWS } from "./member-access-tables.js";
+import { isKeywordReceiver, MEMBER_ACCESS_ROWS } from "./member-access-tables.js";
 /**
  * Member-access node types accepted for every language. The list is deliberately wider than any
  * one grammar: node types are language-scoped in practice, so an over-broad shared list cannot
@@ -63,6 +63,26 @@ export function isReceiverNameNode(sup, nodeType) {
 export function isMemberReferencePropertyIdentifier(sup, nodeType) {
     return memberReferencePropertyIdentifierTypes(sup).includes(nodeType);
 }
+const RECEIVER_KEYWORD_CALL_NODE_TYPES = { call: true, call_expression: true };
+/**
+ * The text used to classify a receiver as an own-type or supertype keyword. Ordinarily this is
+ * the receiver node's own source spelling, but a language whose row sets `receiverKeywordCallShape`
+ * may also spell a keyword receiver as a zero-argument call to that keyword - Python's `super()`,
+ * which (unlike `self`/`cls`) has no bare-name form. Only unwrap that call when its callee is
+ * not shadowed by a visible lexical binding.
+ */
+export function receiverKeywordText(sup, node, source, hasLexicalBinding) {
+    const text = sliceText(node, source).trim();
+    if (!MEMBER_ACCESS_ROWS[sup.id]?.receiverKeywordCallShape || !RECEIVER_KEYWORD_CALL_NODE_TYPES[node.type]) {
+        return text;
+    }
+    const callee = node.childForFieldName("function") ?? node.namedChildren[0] ?? null;
+    const args = node.childForFieldName("arguments") ?? node.childForFieldName("argument_list");
+    if (!callee || (args && args.namedChildren.length))
+        return text;
+    const calleeText = sliceText(callee, source).trim();
+    return isKeywordReceiver(sup.id, calleeText) && !hasLexicalBinding(callee) ? calleeText : text;
+}
 export function getNavigationExpressionProperty(sup, expr) {
     const suffix = expr.namedChildren.find((child) => child.type === "navigation_suffix") ?? expr.child(1);
     if (!suffix)
@@ -124,12 +144,21 @@ export function collectMemberAccessChain(args) {
             names.push(unquote(sliceText(propNode, args.source)));
             return;
         }
-        if (propNode.type !== "identifier")
+        let nameNode = propNode;
+        if (args.sup.id === "csharp" && nameNode.type === "generic_name") {
+            nameNode = nameNode.childForFieldName("name") ?? nameNode.namedChildren[0] ?? nameNode;
+        }
+        if (nameNode.type !== "identifier" && !(args.sup.id === "java" && nameNode.type === "type_identifier"))
             return;
-        const keyName = sliceText(propNode, args.source);
+        const keyName = sliceText(nameNode, args.source);
         const value = args.constStringOf?.get(keyName);
         if (typeof value === "string")
             names.push(value);
+        // C#/Java qualified names, Rust's `mod::item` path, and Ruby's `receiver.method` call node
+        // all spell every segment as a plain `identifier`, with no dedicated property-identifier
+        // node type to tell a name from a value.
+        else if (args.sup.id === "csharp" || args.sup.id === "java" || args.sup.id === "rust" || args.sup.id === "ruby")
+            names.push(keyName);
     };
     while (current && traversalTypes.has(current.type)) {
         if (current.type === "subscript_expression") {
@@ -151,4 +180,70 @@ export function collectMemberAccessChain(args) {
         return null;
     return { base: current, names };
 }
+const RUST_COMMENT_NODE_TYPES = new Set(["line_comment", "block_comment"]);
+/**
+ * Whether a name inside a Rust macro token tree follows a `.` or `::` separator, ignoring comments:
+ * `counter.bump()` with a block comment after the dot is still a member call, and `m::run()` with
+ * one after the `::` is still a path call. Raw
+ * tokens cannot prove such a receiver, so both consumers stay conservative there.
+ */
+export function rustTokenTreeNameFollowsSeparator(name) {
+    const tree = name.parent;
+    if (tree?.type !== "token_tree")
+        return false;
+    let previous = null;
+    for (let index = 0;; index += 1) {
+        const child = tree.child(index);
+        if (!child || child.startIndex >= name.startIndex)
+            break;
+        if (!RUST_COMMENT_NODE_TYPES.has(child.type))
+            previous = child;
+    }
+    return previous?.type === "." || previous?.type === "::";
+}
+/**
+ * Standard Rust macros whose arguments are ordinary expressions (after an optional format string
+ * or target). Any other macro, and every `macro_rules!` definition, takes raw tokens whose meaning
+ * depends on its expansion, so `name(...)` inside them is not a proven call.
+ */
+const RUST_EXPRESSION_ARGUMENT_MACROS = new Set([
+    "assert",
+    "assert_eq",
+    "assert_ne",
+    "debug_assert",
+    "debug_assert_eq",
+    "debug_assert_ne",
+    "dbg",
+    "eprint",
+    "eprintln",
+    "format",
+    "format_args",
+    "panic",
+    "print",
+    "println",
+    "todo",
+    "unimplemented",
+    "unreachable",
+    "vec",
+    "write",
+    "writeln",
+]);
+const RUST_STANDARD_CRATES = new Set(["std", "core", "alloc"]);
+/** Whether a Rust token tree is (nested in) the arguments of a standard expression macro. */
+export function rustTokenTreeHoldsExpressions(tokenTree) {
+    let current = tokenTree;
+    while (current?.type === "token_tree")
+        current = current.parent;
+    if (current?.type !== "macro_invocation")
+        return false;
+    const macro = current.childForFieldName("macro");
+    if (!macro)
+        return false;
+    // `my_dsl::println!` is a custom macro that only shares a name; a path proves a standard macro
+    // only when it is rooted at a standard crate (`std::println!`, `::core::assert!`).
+    const segments = macro.text.replace(/\s+/g, "").replace(/^::/, "").split("::");
+    const name = segments.pop();
+    const standardPath = !segments.length || (segments.length === 1 && RUST_STANDARD_CRATES.has(segments[0]));
+    return standardPath && RUST_EXPRESSION_ARGUMENT_MACROS.has(name);
+}
 //# sourceMappingURL=member-access.js.map

package/dist/util/member-access.js.map

@@ -1 +1 @@
-{"version":3,"file":"member-access.js","sourceRoot":"","sources":["../../src/util/member-access.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAA0B,MAAM,2BAA2B,CAAC;AAYvF;;;;GAIG;AACH,MAAM,2BAA2B,GAAyB;IACxD,wBAAwB,EAAE,IAAI;IAC9B,cAAc,EAAE,IAAI;IACpB,YAAY,EAAE,IAAI;IAClB,iBAAiB,EAAE,IAAI;IACvB,iBAAiB,EAAE,IAAI;IACvB,sBAAsB,EAAE,IAAI;IAC5B,oBAAoB,EAAE,IAAI;IAC1B,IAAI,EAAE,IAAI;IACV,gBAAgB,EAAE,IAAI;IACtB,gBAAgB,EAAE,IAAI;IACtB,SAAS,EAAE,IAAI;IACf,qBAAqB,EAAE,IAAI;CAC5B,CAAC;AAEF,MAAM,UAAU,uBAAuB,CAAC,GAAoB;IAC1D,IAAI,GAAG,CAAC,SAAS,CAAC,gBAAgB;QAAE,OAAO,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC;IAC1E,OAAO,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,oBAAoB,IAAI,mBAAmB,CAAC;AACjF,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,GAAoB;IAChE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,kBAAkB,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,sCAAsC,CAAC,GAAoB;IACzE,OAAO,CAAC,GAAG,6BAA6B,CAAC,GAAG,CAAC,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;AAClH,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,GAAoB;IAC7D,MAAM,KAAK,GAAG,IAAI,GAAG,CAAS;QAC5B,uBAAuB,CAAC,GAAG,CAAC;QAC5B,4BAA4B;QAC5B,sBAAsB;QACtB,gBAAgB;KACjB,CAAC,CAAC;IACH,KAAK,MAAM,QAAQ,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,mBAAmB,IAAI,EAAE;QAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClG,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAoB,EAAE,IAAoB;IAC3E,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,uBAAuB,CAAC,GAAG,CAAC;QAC1C,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC;QACtC,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,sBAAsB,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CACnF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,QAAgB;IACvD,OAAO,CACL,QAAQ,KAAK,YAAY;QACzB,QAAQ,KAAK,iBAAiB;QAC9B,QAAQ,KAAK,oBAAoB;QACjC,QAAQ,KAAK,UAAU;QACvB,QAAQ,KAAK,sBAAsB;QACnC,QAAQ,KAAK,mBAAmB;QAChC,QAAQ,KAAK,mBAAmB;QAChC,QAAQ,KAAK,gBAAgB,CAC9B,CAAC;AACJ,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,kBAAkB,CAAC,GAAoB,EAAE,QAAgB;IACvE,OAAO,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,wBAAwB,CAAC,QAAQ,CAAC,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,mCAAmC,CAAC,GAAoB,EAAE,QAAgB;IACxF,OAAO,sCAAsC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,GAAoB,EAAE,IAAoB;IACxF,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,mBAAmB,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvG,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,UAAU,GACd,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC;QAClC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC;QAChC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QACvB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC;IAClC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,2BAA2B,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,UAAU,CAAC,UAA0B,EAAE,KAAwB;IACtE,IAAI,OAAO,IAAI,KAAK;QAAE,OAAO,UAAU,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAChH,IAAI,OAAO,IAAI,KAAK;QAAE,OAAO,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3D,OAAO,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AAC1F,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAoB,EAAE,UAA0B;IACnF,4FAA4F;IAC5F,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,kBAAkB,EAAE,IAAI,CAChE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAClG,CAAC;IACF,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GACZ,YAAY,IAAI,KAAK,CAAC,QAAQ;YAC5B,CAAC,CAAC,+BAA+B,CAAC,GAAG,EAAE,UAAU,CAAC;YAClD,CAAC,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;IACpE,CAAC;IACD,OAAO;QACL,MAAM,EAAE,UAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,QAAQ,EACN,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;KAC/G,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,IAKxC;IACC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,OAAO,GAA0B,IAAI,CAAC,SAAS,CAAC;IACpD,IAAI,IAAI,GAA0B,IAAI,CAAC;IACvC,MAAM,cAAc,GAAG,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE9D,MAAM,gBAAgB,GAAG,CAAC,QAA+B,EAAQ,EAAE;QACjE,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,IAAI,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QACD,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QACD,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY;YAAE,OAAO;QAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC;IAEF,OAAO,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,IAAI,OAAO,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;YAC5C,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;YAChC,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,OAAO,GAAG,IAAI,CAAC;YACf,SAAS;QACX,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACtC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC3B,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC;QAC5B,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjC,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC;IAED,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAC3C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAClC,CAAC"}
+{"version":3,"file":"member-access.js","sourceRoot":"","sources":["../../src/util/member-access.ts"],"names":[],"mappings":"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"}