Skip to content

🤖 Cherry-pick PR #33847 into release-3.7 #34720

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions src/compiler/binder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2003,7 +2003,12 @@ namespace ts {
switch (getAssignmentDeclarationPropertyAccessKind(declName.parent)) {
case AssignmentDeclarationKind.ExportsProperty:
case AssignmentDeclarationKind.ModuleExports:
container = file;
if (!isExternalOrCommonJsModule(file)) {
container = undefined!;
}
else {
container = file;
}
break;
case AssignmentDeclarationKind.ThisProperty:
container = declName.parent.expression;
Expand All @@ -2017,7 +2022,9 @@ namespace ts {
case AssignmentDeclarationKind.None:
return Debug.fail("Shouldn't have detected typedef or enum on non-assignment declaration");
}
declareModuleMember(typeAlias, SymbolFlags.TypeAlias, SymbolFlags.TypeAliasExcludes);
if (container) {
declareModuleMember(typeAlias, SymbolFlags.TypeAlias, SymbolFlags.TypeAliasExcludes);
}
container = oldContainer;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
tests/cases/conformance/jsdoc/0.js(10,20): error TS2694: Namespace 'exports' has no exported member 'SomeName'.


==== tests/cases/conformance/jsdoc/0.js (1 errors) ====
// @ts-check

var exports = {};

/**
* @typedef {string}
*/
exports.SomeName;

/** @type {exports.SomeName} */
~~~~~~~~
!!! error TS2694: Namespace 'exports' has no exported member 'SomeName'.
const myString = 'str';

23 changes: 23 additions & 0 deletions tests/baselines/reference/checkJsdocTypedefOnlySourceFile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//// [0.js]
// @ts-check

var exports = {};

/**
* @typedef {string}
*/
exports.SomeName;

/** @type {exports.SomeName} */
const myString = 'str';


//// [0.js]
// @ts-check
var exports = {};
/**
* @typedef {string}
*/
exports.SomeName;
/** @type {exports.SomeName} */
var myString = 'str';
16 changes: 16 additions & 0 deletions tests/baselines/reference/checkJsdocTypedefOnlySourceFile.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
=== tests/cases/conformance/jsdoc/0.js ===
// @ts-check

var exports = {};
>exports : Symbol(exports, Decl(0.js, 2, 3))

/**
* @typedef {string}
*/
exports.SomeName;
>exports : Symbol(exports, Decl(0.js, 2, 3))

/** @type {exports.SomeName} */
const myString = 'str';
>myString : Symbol(myString, Decl(0.js, 10, 5))

20 changes: 20 additions & 0 deletions tests/baselines/reference/checkJsdocTypedefOnlySourceFile.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
=== tests/cases/conformance/jsdoc/0.js ===
// @ts-check

var exports = {};
>exports : {}
>{} : {}

/**
* @typedef {string}
*/
exports.SomeName;
>exports.SomeName : any
>exports : {}
>SomeName : any

/** @type {exports.SomeName} */
const myString = 'str';
>myString : any
>'str' : "str"

15 changes: 15 additions & 0 deletions tests/cases/conformance/jsdoc/checkJsdocTypedefOnlySourceFile.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// @allowJS: true
// @suppressOutputPathCheck: true

// @filename: 0.js
// @ts-check

var exports = {};

/**
* @typedef {string}
*/
exports.SomeName;

/** @type {exports.SomeName} */
const myString = 'str';