Add diagnostic context for expando property declarations

src/compiler/transformers/declarations.ts

@@ -1006,7 +1006,9 @@ namespace ts {
                             if (!isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined;
                             }
+                            getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
                             const type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            getSymbolAccessibilityDiagnostic = oldDiag;
                             const varDecl = createVariableDeclaration(unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined);
                             return createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([varDecl]));
                         });

src/compiler/transformers/declarations/diagnostics.ts

@@ -26,7 +26,8 @@ namespace ts {
         | ImportEqualsDeclaration
         | TypeAliasDeclaration
         | ConstructorDeclaration
-        | IndexSignatureDeclaration;
+        | IndexSignatureDeclaration
+        | PropertyAccessExpression;
 
     export function canProduceDiagnostics(node: Node): node is DeclarationDiagnosticProducing {
         return isVariableDeclaration(node) ||
@@ -46,7 +47,8 @@ namespace ts {
             isImportEqualsDeclaration(node) ||
             isTypeAliasDeclaration(node) ||
             isConstructorDeclaration(node) ||
-            isIndexSignatureDeclaration(node);
+            isIndexSignatureDeclaration(node) ||
+            isPropertyAccessExpression(node);
     }
 
     export function createGetSymbolAccessibilityDiagnosticForNodeName(node: DeclarationDiagnosticProducing) {
@@ -123,7 +125,7 @@ namespace ts {
     }
 
     export function createGetSymbolAccessibilityDiagnosticForNode(node: DeclarationDiagnosticProducing): (symbolAccessibilityResult: SymbolAccessibilityResult) => SymbolAccessibilityDiagnostic | undefined {
-        if (isVariableDeclaration(node) || isPropertyDeclaration(node) || isPropertySignature(node) || isBindingElement(node) || isConstructorDeclaration(node)) {
+        if (isVariableDeclaration(node) || isPropertyDeclaration(node) || isPropertySignature(node) || isPropertyAccessExpression(node) || isBindingElement(node) || isConstructorDeclaration(node)) {
             return getVariableDeclarationTypeVisibilityError;
         }
         else if (isSetAccessor(node) || isGetAccessor(node)) {
@@ -164,7 +166,7 @@ namespace ts {
             }
             // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
             // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all.
-            else if (node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature ||
+            else if (node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertyAccessExpression || node.kind === SyntaxKind.PropertySignature ||
                 (node.kind === SyntaxKind.Parameter && hasModifier(node.parent, ModifierFlags.Private))) {
                 // TODO(jfreeman): Deal with computed properties in error reporting.
                 if (hasModifier(node, ModifierFlags.Static)) {

tests/baselines/reference/declarationEmitExpandoPropertyPrivateName.errors.txt

@@ -0,0 +1,14 @@
+tests/cases/compiler/b.ts(4,1): error TS4032: Property 'val' of exported interface has or is using name 'I' from private module '"tests/cases/compiler/a"'.
+
+
+==== tests/cases/compiler/a.ts (0 errors) ====
+    interface I {}
+    export function f(): I { return null as I; }
+==== tests/cases/compiler/b.ts (1 errors) ====
+    import {f} from "./a";
+
+    export function q() {}
+    q.val = f();
+    ~~~~~
+!!! error TS4032: Property 'val' of exported interface has or is using name 'I' from private module '"tests/cases/compiler/a"'.
+

tests/baselines/reference/declarationEmitExpandoPropertyPrivateName.js

@@ -0,0 +1,31 @@
+//// [tests/cases/compiler/declarationEmitExpandoPropertyPrivateName.ts] ////
+
+//// [a.ts]
+interface I {}
+export function f(): I { return null as I; }
+//// [b.ts]
+import {f} from "./a";
+
+export function q() {}
+q.val = f();
+
+
+//// [a.js]
+"use strict";
+exports.__esModule = true;
+function f() { return null; }
+exports.f = f;
+//// [b.js]
+"use strict";
+exports.__esModule = true;
+var a_1 = require("./a");
+function q() { }
+exports.q = q;
+q.val = a_1.f();
+
+
+//// [a.d.ts]
+interface I {
+}
+export declare function f(): I;
+export {};

tests/baselines/reference/declarationEmitExpandoPropertyPrivateName.symbols

@@ -0,0 +1,22 @@
+=== tests/cases/compiler/a.ts ===
+interface I {}
+>I : Symbol(I, Decl(a.ts, 0, 0))
+
+export function f(): I { return null as I; }
+>f : Symbol(f, Decl(a.ts, 0, 14))
+>I : Symbol(I, Decl(a.ts, 0, 0))
+>I : Symbol(I, Decl(a.ts, 0, 0))
+
+=== tests/cases/compiler/b.ts ===
+import {f} from "./a";
+>f : Symbol(f, Decl(b.ts, 0, 8))
+
+export function q() {}
+>q : Symbol(q, Decl(b.ts, 0, 22), Decl(b.ts, 2, 22))
+
+q.val = f();
+>q.val : Symbol(q.val, Decl(b.ts, 2, 22))
+>q : Symbol(q, Decl(b.ts, 0, 22), Decl(b.ts, 2, 22))
+>val : Symbol(q.val, Decl(b.ts, 2, 22))
+>f : Symbol(f, Decl(b.ts, 0, 8))
+

tests/baselines/reference/declarationEmitExpandoPropertyPrivateName.types

@@ -0,0 +1,22 @@
+=== tests/cases/compiler/a.ts ===
+interface I {}
+export function f(): I { return null as I; }
+>f : () => I
+>null as I : I
+>null : null
+
+=== tests/cases/compiler/b.ts ===
+import {f} from "./a";
+>f : () => I
+
+export function q() {}
+>q : typeof q
+
+q.val = f();
+>q.val = f() : I
+>q.val : I
+>q : typeof q
+>val : I
+>f() : I
+>f : () => I
+

tests/cases/compiler/declarationEmitExpandoPropertyPrivateName.ts

@@ -0,0 +1,9 @@
+// @declaration: true
+// @filename: a.ts
+interface I {}
+export function f(): I { return null as I; }
+// @filename: b.ts
+import {f} from "./a";
+
+export function q() {}
+q.val = f();