fix: don't mark invalid symbols as companion objects

ts-plus · Nov 1, 2022 · 87b8df8 · 87b8df8
1 parent 10d2a52
commit 87b8df8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/effect/packages/package1/src/companions-everywhere.ts b/effect/packages/package1/src/companions-everywhere.ts
@@ -13,8 +13,3 @@ export const get: A = {}
  * @tsplus static companions-everywhere/AOps __call
  */
 export const callA = (): A => ({})
-
-class X {}
-
-new X()
-X
diff --git a/effect/packages/package2/src/external-definitions.ts b/effect/packages/package2/src/external-definitions.ts
@@ -1,4 +1,3 @@
 import { Async } from '@fp-ts/core/Async'
 
 Async.fromSync(() => console.log("Fluent in fp-ts!")).delay(1)
-
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2790,16 +2790,19 @@ namespace ts {
                             if (symbol) {
                                 if (companionSymbolCache.has(symbol)) {
                                     result = symbol;
+                                    getSymbolLinks(symbol).isPossibleCompanionReference = true;
                                     break loop;
                                 }
                                 if (symbol.exportSymbol && companionSymbolCache.has(symbol.exportSymbol)) {
                                     result = symbol.exportSymbol;
+                                    getSymbolLinks(symbol.exportSymbol).isPossibleCompanionReference = true;
                                     break loop;
                                 }
                                 if (symbol.declarations && symbol.declarations[0] && isImportSpecifier(symbol.declarations[0])) {
                                     const originalSymbol = getTargetOfImportSpecifier(symbol.declarations[0], false);
                                     if (originalSymbol && companionSymbolCache.has(originalSymbol)) {
                                         result = originalSymbol;
+                                        getSymbolLinks(originalSymbol).isPossibleCompanionReference = true;
                                         symbol.isReferenced = SymbolFlags.Value;
                                         break loop;
                                     }
@@ -5837,8 +5840,21 @@ namespace ts {
             if (!type) {
                 return false
             }
-            return !!(getObjectFlags(type) & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & SymbolFlags.Class)
-                || (!!symbol?.declarations?.[0] && (isInterfaceDeclaration(symbol.declarations[0]) || isTypeAliasDeclaration(symbol.declarations[0])))
+
+            // Class companion object
+            if (getObjectFlags(type) & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & SymbolFlags.Class) {
+                return true
+            }
+
+            // Synthetic Interface or TypeAlias companion object
+            if (symbol && symbol.declarations && symbol.declarations.length > 0) {
+                const declaration = symbol.declarations[0]
+                if (isInterfaceDeclaration(declaration) || isTypeAliasDeclaration(declaration)) {
+                    return !!getSymbolLinks(symbol).isPossibleCompanionReference;
+                }
+            }
+
+            return false
         }
         // TSPLUS EXTENSION END
 

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -5817,6 +5817,7 @@ namespace ts {
             type: Type,
             tags: Set<string>
         }
+        isPossibleCompanionReference?: boolean
         // TSPLUS END
     }