Cover prototype property assignments

Amp-Thread-ID: https://ampcode.com/threads/T-01a029e2-5095-710a-9cce-0c6d8645c173

Author: eseliger

snapshots/input/prototype-members/src/connection.mjs

@@ -4,4 +4,8 @@ Connection.prototype = {
   getSchemaVersion() {
     return 0
   },
+  getVersion: function () {
+    return 1
+  },
+  version: 1,
 }

snapshots/input/prototype-members/src/use.mjs

@@ -2,5 +2,9 @@
 
 /** @param {Connection} connection */
 export function schemaVersion(connection) {
-  return connection.getSchemaVersion()
+  return [
+    connection.getSchemaVersion(),
+    connection.getVersion(),
+    connection.version,
+  ]
 }

snapshots/output/prototype-members/src/connection.mjs

@@ -6,11 +6,16 @@ export function Connection() {}
 
 Connection.prototype = {
 //^^^^^^^^^ reference prototype-members 1.0.0 src/`connection.mjs`/Connection().
-//^^^^^^^^^ reference local 3
-//         ^^^^^^^^^ reference local 2
+//         ^^^^^^^^^ reference prototype-members 1.0.0 src/`connection.mjs`/Connection().
   getSchemaVersion() {
 //^^^^^^^^^^^^^^^^ definition prototype-members 1.0.0 src/`connection.mjs`/Connection().getSchemaVersion().
     return 0
   },
+  getVersion: function () {
+//^^^^^^^^^^ definition prototype-members 1.0.0 src/`connection.mjs`/Connection().getVersion.
+    return 1
+  },
+  version: 1,
+//^^^^^^^ definition prototype-members 1.0.0 src/`connection.mjs`/Connection().version.
 }
 

snapshots/output/prototype-members/src/use.mjs

@@ -7,8 +7,16 @@
 export function schemaVersion(connection) {
 //              ^^^^^^^^^^^^^ definition prototype-members 1.0.0 src/`use.mjs`/schemaVersion().
 //                            ^^^^^^^^^^ definition prototype-members 1.0.0 src/`use.mjs`/schemaVersion().(connection)
-  return connection.getSchemaVersion()
-//       ^^^^^^^^^^ reference prototype-members 1.0.0 src/`use.mjs`/schemaVersion().(connection)
-//                  ^^^^^^^^^^^^^^^^ reference prototype-members 1.0.0 src/`connection.mjs`/Connection().getSchemaVersion().
+  return [
+    connection.getSchemaVersion(),
+//  ^^^^^^^^^^ reference prototype-members 1.0.0 src/`use.mjs`/schemaVersion().(connection)
+//             ^^^^^^^^^^^^^^^^ reference prototype-members 1.0.0 src/`connection.mjs`/Connection().getSchemaVersion().
+    connection.getVersion(),
+//  ^^^^^^^^^^ reference prototype-members 1.0.0 src/`use.mjs`/schemaVersion().(connection)
+//             ^^^^^^^^^^ reference prototype-members 1.0.0 src/`connection.mjs`/Connection().getVersion.
+    connection.version,
+//  ^^^^^^^^^^ reference prototype-members 1.0.0 src/`use.mjs`/schemaVersion().(connection)
+//             ^^^^^^^ reference prototype-members 1.0.0 src/`connection.mjs`/Connection().version.
+  ]
 }
 

src/FileIndexer.ts

@@ -426,14 +426,24 @@ export class FileIndexer {
   }
 
   private prototypeAssignmentOwner(node: ts.Node): ts.Declaration | undefined {
-    if (!ts.isObjectLiteralExpression(node)) {
-      return
-    }
-    const assignment = node.parent
+    const assignment = ts.isBinaryExpression(node)
+      ? node
+      : ts.isObjectLiteralExpression(node)
+        ? node.parent
+        : ts.isPropertyAccessExpression(node)
+          ? node.parent
+          : ts.isIdentifier(node) && ts.isPropertyAccessExpression(node.parent)
+            ? node.parent.parent
+            : (ts.isPropertyAssignment(node) ||
+                  ts.isShorthandPropertyAssignment(node)) &&
+                ts.isObjectLiteralExpression(node.parent)
+              ? node.parent.parent
+              : undefined
     if (
+      !assignment ||
       !ts.isBinaryExpression(assignment) ||
       assignment.operatorToken.kind !== ts.SyntaxKind.EqualsToken ||
-      assignment.right !== node ||
+      !ts.isObjectLiteralExpression(assignment.right) ||
       !ts.isPropertyAccessExpression(assignment.left) ||
       assignment.left.name.text !== 'prototype'
     ) {
@@ -462,6 +472,20 @@ export class FileIndexer {
       }
       return this.cached(node, package_)
     }
+
+    const prototypeOwner = this.prototypeAssignmentOwner(node)
+    if (prototypeOwner) {
+      // Declarations attached to the assignment and its object literal belong
+      // to the constructor. Property assignments need their own stable member
+      // descriptor instead of the counter-based object-property fallback.
+      const owner = this.scipSymbol(prototypeOwner)
+      const symbol =
+        ts.isPropertyAssignment(node) || ts.isShorthandPropertyAssignment(node)
+          ? ScipSymbol.global(owner, termDescriptor(node.name.getText()))
+          : owner
+      return this.cached(node, symbol)
+    }
+
     if (
       ts.isPropertyAssignment(node) ||
       ts.isShorthandPropertyAssignment(node)
@@ -512,14 +536,6 @@ export class FileIndexer {
       }
     }
 
-    const prototypeOwner = this.prototypeAssignmentOwner(node)
-    if (prototypeOwner) {
-      // Methods in `Constructor.prototype = { ... }` belong to the constructor,
-      // not to an anonymous object local to this file. Giving that object the
-      // constructor's identity makes its members stable across files.
-      return this.cached(node, this.scipSymbol(prototypeOwner))
-    }
-
     const owner = this.scipSymbol(node.parent)
     if (owner.isEmpty() || owner.isLocal()) {
       return this.newLocalSymbol(node)