Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: Support local exports in TS declare modules #14941

Merged
merged 6 commits into from Sep 19, 2022
Merged

fix: Support local exports in TS declare modules #14941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52b1899
fix
liuxingbaoyu Sep 16, 2022
71b9f61
fix
liuxingbaoyu Sep 16, 2022
83c123d
fix
liuxingbaoyu Sep 16, 2022
99699ac
Update packages/babel-parser/src/plugins/typescript/scope.ts
liuxingbaoyu Sep 19, 2022
d252922
update allowlist
liuxingbaoyu Sep 19, 2022
1422ea8
Update packages/babel-parser/src/plugins/typescript/scope.ts
nicolo-ribaudo Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions packages/babel-parser/src/plugins/typescript/scope.ts
View file
Open in desktop
Expand Up @@ -143,14 +143,16 @@ export default class TypeScriptScopeHandler extends ScopeHandler<TypeScriptScope
}

checkLocalExport(id: N.Identifier) {
const topLevelScope = this.scopeStack[0];
const { name } = id;
if (
!topLevelScope.types.has(name) &&
!topLevelScope.exportOnlyBindings.has(name) &&
!this.hasImport(name)
) {
super.checkLocalExport(id);

if (this.hasImport(name)) return;

const len = this.scopeStack.length;
for (let i = len - 1; i >= 0; i--) {
const scope = this.scopeStack[i];
if (scope.types.has(name) || scope.exportOnlyBindings.has(name)) return;
}

super.checkLocalExport(id);
}
}
12 changes: 12 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/scope/export-func-in-declare-module/input.ts
View file
Open in desktop
@@ -0,0 +1,12 @@
declare module "m2" {
export module X {
interface I { }
}
function Y();
export { Y as X };
function Z(): X.I;
}

declare module "m2" {
function Z2(): X.I;
}
193 changes: 193 additions & 0 deletions ...ges/babel-parser/test/fixtures/typescript/scope/export-func-in-declare-module/output.json
View file
Open in desktop
@@ -0,0 +1,193 @@
{
"type": "File",
"start":0,"end":188,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":12,"column":1,"index":188}},
"program": {
"type": "Program",
"start":0,"end":188,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":12,"column":1,"index":188}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "TSModuleDeclaration",
"start":0,"end":139,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":8,"column":1,"index":139}},
"id": {
"type": "StringLiteral",
"start":15,"end":19,"loc":{"start":{"line":1,"column":15,"index":15},"end":{"line":1,"column":19,"index":19}},
"extra": {
"rawValue": "m2",
"raw": "\"m2\""
},
"value": "m2"
},
"body": {
"type": "TSModuleBlock",
"start":20,"end":139,"loc":{"start":{"line":1,"column":20,"index":20},"end":{"line":8,"column":1,"index":139}},
"body": [
{
"type": "ExportNamedDeclaration",
"start":26,"end":73,"loc":{"start":{"line":2,"column":4,"index":26},"end":{"line":4,"column":5,"index":73}},
"exportKind": "value",
"specifiers": [],
"source": null,
"declaration": {
"type": "TSModuleDeclaration",
"start":33,"end":73,"loc":{"start":{"line":2,"column":11,"index":33},"end":{"line":4,"column":5,"index":73}},
"id": {
"type": "Identifier",
"start":40,"end":41,"loc":{"start":{"line":2,"column":18,"index":40},"end":{"line":2,"column":19,"index":41},"identifierName":"X"},
"name": "X"
},
"body": {
"type": "TSModuleBlock",
"start":42,"end":73,"loc":{"start":{"line":2,"column":20,"index":42},"end":{"line":4,"column":5,"index":73}},
"body": [
{
"type": "TSInterfaceDeclaration",
"start":52,"end":67,"loc":{"start":{"line":3,"column":8,"index":52},"end":{"line":3,"column":23,"index":67}},
"id": {
"type": "Identifier",
"start":62,"end":63,"loc":{"start":{"line":3,"column":18,"index":62},"end":{"line":3,"column":19,"index":63},"identifierName":"I"},
"name": "I"
},
"body": {
"type": "TSInterfaceBody",
"start":64,"end":67,"loc":{"start":{"line":3,"column":20,"index":64},"end":{"line":3,"column":23,"index":67}},
"body": []
}
}
]
}
}
},
{
"type": "TSDeclareFunction",
"start":78,"end":91,"loc":{"start":{"line":5,"column":4,"index":78},"end":{"line":5,"column":17,"index":91}},
"id": {
"type": "Identifier",
"start":87,"end":88,"loc":{"start":{"line":5,"column":13,"index":87},"end":{"line":5,"column":14,"index":88},"identifierName":"Y"},
"name": "Y"
},
"generator": false,
"async": false,
"params": []
},
{
"type": "ExportNamedDeclaration",
"start":96,"end":114,"loc":{"start":{"line":6,"column":4,"index":96},"end":{"line":6,"column":22,"index":114}},
"exportKind": "value",
"specifiers": [
{
"type": "ExportSpecifier",
"start":105,"end":111,"loc":{"start":{"line":6,"column":13,"index":105},"end":{"line":6,"column":19,"index":111}},
"local": {
"type": "Identifier",
"start":105,"end":106,"loc":{"start":{"line":6,"column":13,"index":105},"end":{"line":6,"column":14,"index":106},"identifierName":"Y"},
"name": "Y"
},
"exportKind": "value",
"exported": {
"type": "Identifier",
"start":110,"end":111,"loc":{"start":{"line":6,"column":18,"index":110},"end":{"line":6,"column":19,"index":111},"identifierName":"X"},
"name": "X"
}
}
],
"source": null,
"declaration": null
},
{
"type": "TSDeclareFunction",
"start":119,"end":137,"loc":{"start":{"line":7,"column":4,"index":119},"end":{"line":7,"column":22,"index":137}},
"id": {
"type": "Identifier",
"start":128,"end":129,"loc":{"start":{"line":7,"column":13,"index":128},"end":{"line":7,"column":14,"index":129},"identifierName":"Z"},
"name": "Z"
},
"generator": false,
"async": false,
"params": [],
"returnType": {
"type": "TSTypeAnnotation",
"start":131,"end":136,"loc":{"start":{"line":7,"column":16,"index":131},"end":{"line":7,"column":21,"index":136}},
"typeAnnotation": {
"type": "TSTypeReference",
"start":133,"end":136,"loc":{"start":{"line":7,"column":18,"index":133},"end":{"line":7,"column":21,"index":136}},
"typeName": {
"type": "TSQualifiedName",
"start":133,"end":136,"loc":{"start":{"line":7,"column":18,"index":133},"end":{"line":7,"column":21,"index":136}},
"left": {
"type": "Identifier",
"start":133,"end":134,"loc":{"start":{"line":7,"column":18,"index":133},"end":{"line":7,"column":19,"index":134},"identifierName":"X"},
"name": "X"
},
"right": {
"type": "Identifier",
"start":135,"end":136,"loc":{"start":{"line":7,"column":20,"index":135},"end":{"line":7,"column":21,"index":136},"identifierName":"I"},
"name": "I"
}
}
}
}
}
]
},
"declare": true
},
{
"type": "TSModuleDeclaration",
"start":141,"end":188,"loc":{"start":{"line":10,"column":0,"index":141},"end":{"line":12,"column":1,"index":188}},
"id": {
"type": "StringLiteral",
"start":156,"end":160,"loc":{"start":{"line":10,"column":15,"index":156},"end":{"line":10,"column":19,"index":160}},
"extra": {
"rawValue": "m2",
"raw": "\"m2\""
},
"value": "m2"
},
"body": {
"type": "TSModuleBlock",
"start":161,"end":188,"loc":{"start":{"line":10,"column":20,"index":161},"end":{"line":12,"column":1,"index":188}},
"body": [
{
"type": "TSDeclareFunction",
"start":167,"end":186,"loc":{"start":{"line":11,"column":4,"index":167},"end":{"line":11,"column":23,"index":186}},
"id": {
"type": "Identifier",
"start":176,"end":178,"loc":{"start":{"line":11,"column":13,"index":176},"end":{"line":11,"column":15,"index":178},"identifierName":"Z2"},
"name": "Z2"
},
"generator": false,
"async": false,
"params": [],
"returnType": {
"type": "TSTypeAnnotation",
"start":180,"end":185,"loc":{"start":{"line":11,"column":17,"index":180},"end":{"line":11,"column":22,"index":185}},
"typeAnnotation": {
"type": "TSTypeReference",
"start":182,"end":185,"loc":{"start":{"line":11,"column":19,"index":182},"end":{"line":11,"column":22,"index":185}},
"typeName": {
"type": "TSQualifiedName",
"start":182,"end":185,"loc":{"start":{"line":11,"column":19,"index":182},"end":{"line":11,"column":22,"index":185}},
"left": {
"type": "Identifier",
"start":182,"end":183,"loc":{"start":{"line":11,"column":19,"index":182},"end":{"line":11,"column":20,"index":183},"identifierName":"X"},
"name": "X"
},
"right": {
"type": "Identifier",
"start":184,"end":185,"loc":{"start":{"line":11,"column":21,"index":184},"end":{"line":11,"column":22,"index":185},"identifierName":"I"},
"name": "I"
}
}
}
}
}
]
},
"declare": true
}
],
"directives": []
}
}
4 changes: 4 additions & 0 deletions ...ages/babel-parser/test/fixtures/typescript/scope/export-import-in-declare-module/input.ts
View file
Open in desktop
@@ -0,0 +1,4 @@
declare module '~popsicle/dist/common' {
import { Request } from '~popsicle/dist/request';
export { Request };
}
88 changes: 88 additions & 0 deletions ...s/babel-parser/test/fixtures/typescript/scope/export-import-in-declare-module/output.json
View file
Open in desktop
@@ -0,0 +1,88 @@
{
"type": "File",
"start":0,"end":120,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":4,"column":1,"index":120}},
"program": {
"type": "Program",
"start":0,"end":120,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":4,"column":1,"index":120}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "TSModuleDeclaration",
"start":0,"end":120,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":4,"column":1,"index":120}},
"id": {
"type": "StringLiteral",
"start":15,"end":38,"loc":{"start":{"line":1,"column":15,"index":15},"end":{"line":1,"column":38,"index":38}},
"extra": {
"rawValue": "~popsicle/dist/common",
"raw": "'~popsicle/dist/common'"
},
"value": "~popsicle/dist/common"
},
"body": {
"type": "TSModuleBlock",
"start":39,"end":120,"loc":{"start":{"line":1,"column":39,"index":39},"end":{"line":4,"column":1,"index":120}},
"body": [
{
"type": "ImportDeclaration",
"start":45,"end":94,"loc":{"start":{"line":2,"column":4,"index":45},"end":{"line":2,"column":53,"index":94}},
"importKind": "value",
"specifiers": [
{
"type": "ImportSpecifier",
"start":54,"end":61,"loc":{"start":{"line":2,"column":13,"index":54},"end":{"line":2,"column":20,"index":61}},
"imported": {
"type": "Identifier",
"start":54,"end":61,"loc":{"start":{"line":2,"column":13,"index":54},"end":{"line":2,"column":20,"index":61},"identifierName":"Request"},
"name": "Request"
},
"importKind": "value",
"local": {
"type": "Identifier",
"start":54,"end":61,"loc":{"start":{"line":2,"column":13,"index":54},"end":{"line":2,"column":20,"index":61},"identifierName":"Request"},
"name": "Request"
}
}
],
"source": {
"type": "StringLiteral",
"start":69,"end":93,"loc":{"start":{"line":2,"column":28,"index":69},"end":{"line":2,"column":52,"index":93}},
"extra": {
"rawValue": "~popsicle/dist/request",
"raw": "'~popsicle/dist/request'"
},
"value": "~popsicle/dist/request"
}
},
{
"type": "ExportNamedDeclaration",
"start":99,"end":118,"loc":{"start":{"line":3,"column":4,"index":99},"end":{"line":3,"column":23,"index":118}},
"exportKind": "value",
"specifiers": [
{
"type": "ExportSpecifier",
"start":108,"end":115,"loc":{"start":{"line":3,"column":13,"index":108},"end":{"line":3,"column":20,"index":115}},
"local": {
"type": "Identifier",
"start":108,"end":115,"loc":{"start":{"line":3,"column":13,"index":108},"end":{"line":3,"column":20,"index":115},"identifierName":"Request"},
"name": "Request"
},
"exportKind": "value",
"exported": {
"type": "Identifier",
"start":108,"end":115,"loc":{"start":{"line":3,"column":13,"index":108},"end":{"line":3,"column":20,"index":115},"identifierName":"Request"},
"name": "Request"
}
}
],
"source": null,
"declaration": null
}
]
},
"declare": true
}
],
"directives": []
}
}
5 changes: 1 addition & 4 deletions scripts/parser-tests/typescript/allowlist.txt
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ exportDeclarationsInAmbientNamespaces2.ts
multipleExports.ts


# 134 valid programs produced a parsing error
# 131 valid programs produced a parsing error

ArrowFunctionExpression1.ts
MemberAccessorDeclaration15.ts
Expand Down Expand Up @@ -71,12 +71,9 @@ exportAssignmentWithDeclareAndExportModifiers.ts
exportAssignmentWithDeclareModifier.ts
exportAssignmentWithExportModifier.ts
exportClassWithoutName.ts
exportDeclarationsInAmbientNamespaces.ts
exportDefaultAsyncFunction2.ts
exportInterfaceClassAndValue.ts
exportSameNameFuncVar.ts
exportSpecifierAndExportedMemberDeclaration.ts
exportSpecifierAndLocalMemberDeclaration.ts
exportSpecifierForAGlobal.ts # We handle this fine, but it doesn't consider the different files together
exportSpecifierReferencingOuterDeclaration2.ts # We handle this fine, but it doesn't consider the different files together
expressionsForbiddenInParameterInitializers.ts
Expand Down