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

[parser] Add support for private fields in TypeScript #10483

Merged
merged 2 commits into from Oct 29, 2019
Merged

[parser] Add support for private fields in TypeScript #10483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fe150a
[parser] Add support for private fields in TypeScript
nicolo-ribaudo Sep 23, 2019
89aed83
Fix flow
nicolo-ribaudo Sep 23, 2019
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
33 changes: 31 additions & 2 deletions packages/babel-parser/src/plugins/typescript/index.js
View file
Open in desktop
Expand Up @@ -1863,7 +1863,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}

parsePostMemberNameModifiers(
methodOrProp: N.ClassMethod | N.ClassProperty,
methodOrProp: N.ClassMethod | N.ClassProperty | N.ClassPrivateProperty,
): void {
const optional = this.eat(tt.question);
if (optional) methodOrProp.optional = true;
Expand Down Expand Up @@ -2002,16 +2002,45 @@ export default (superClass: Class<Parser>): Class<Parser> =>
if (typeParameters) node.typeParameters = typeParameters;
}

parseClassProperty(node: N.ClassProperty): N.ClassProperty {
parseClassPropertyAnnotation(
node: N.ClassProperty | N.ClassPrivateProperty,
): void {
if (!node.optional && this.eat(tt.bang)) {
node.definite = true;
}

const type = this.tsTryParseTypeAnnotation();
if (type) node.typeAnnotation = type;
}

parseClassProperty(node: N.ClassProperty): N.ClassProperty {
this.parseClassPropertyAnnotation(node);
return super.parseClassProperty(node);
}

parseClassPrivateProperty(
node: N.ClassPrivateProperty,
): N.ClassPrivateProperty {
// $FlowIgnore
if (node.abstract) {
this.raise(
node.start,
"Private elements cannot have the 'abstract' modifier.",
);
}

// $FlowIgnore
if (node.accessibility) {
this.raise(
node.start,
`Private elements cannot have an accessibility modifier ('${node.accessibility}')`,
);
}

this.parseClassPropertyAnnotation(node);
return super.parseClassPrivateProperty(node);
}

pushClassMethod(
classBody: N.ClassBody,
method: N.ClassMethod,
Expand Down
9 changes: 8 additions & 1 deletion packages/babel-parser/src/types.js
View file
Open in desktop
Expand Up @@ -762,7 +762,14 @@ export type ClassPrivateProperty = NodeBase & {
value: ?Expression, // TODO: Not in spec that this is nullable.
static: boolean,
computed: false,
typeAnnotation?: ?TypeAnnotation, // TODO: Not in spec

// Flow and Typescript
typeAnnotation?: ?TypeAnnotationBase,

// TypeScript only
optional?: true,
definite?: true,
readonly?: true,
};

export type OptClassDeclaration = ClassBase &
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-parser/test/fixtures/typescript/class/options.json
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"sourceType": "module",
"plugins": ["typescript", "classProperties"]
"plugins": ["typescript", "classProperties", "classPrivateProperties"]
}
3 changes: 3 additions & 0 deletions ...ges/babel-parser/test/fixtures/typescript/class/private-fields-modifier-abstract/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
abstract class A {
abstract #a;
}
3 changes: 3 additions & 0 deletions ...babel-parser/test/fixtures/typescript/class/private-fields-modifier-abstract/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "Private elements cannot have the 'abstract' modifier. (2:2)"
}
3 changes: 3 additions & 0 deletions ...ages/babel-parser/test/fixtures/typescript/class/private-fields-modifier-private/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class A {
private #a;
}
3 changes: 3 additions & 0 deletions .../babel-parser/test/fixtures/typescript/class/private-fields-modifier-private/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "Private elements cannot have an accessibility modifier ('private') (2:2)"
}
3 changes: 3 additions & 0 deletions ...es/babel-parser/test/fixtures/typescript/class/private-fields-modifier-protected/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class A {
protected #a;
}
3 changes: 3 additions & 0 deletions ...abel-parser/test/fixtures/typescript/class/private-fields-modifier-protected/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "Private elements cannot have an accessibility modifier ('protected') (2:2)"
}
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/class/private-fields-modifier-public/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
class A {
public #a;
}
3 changes: 3 additions & 0 deletions ...s/babel-parser/test/fixtures/typescript/class/private-fields-modifier-public/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "Private elements cannot have an accessibility modifier ('public') (2:2)"
}
4 changes: 4 additions & 0 deletions ...ges/babel-parser/test/fixtures/typescript/class/private-fields-modifier-readonly/input.ts
View file
Open in desktop
@@ -0,0 +1,4 @@
class A {
readonly #a;
readonly #b: string;
}
215 changes: 215 additions & 0 deletions .../babel-parser/test/fixtures/typescript/class/private-fields-modifier-readonly/output.json
View file
Open in desktop
@@ -0,0 +1,215 @@
{
"type": "File",
"start": 0,
"end": 49,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 4,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 49,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 4,
"column": 1
}
},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start": 0,
"end": 49,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 4,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 6,
"end": 7,
"loc": {
"start": {
"line": 1,
"column": 6
},
"end": {
"line": 1,
"column": 7
},
"identifierName": "A"
},
"name": "A"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start": 8,
"end": 49,
"loc": {
"start": {
"line": 1,
"column": 8
},
"end": {
"line": 4,
"column": 1
}
},
"body": [
{
"type": "ClassProperty",
"start": 12,
"end": 24,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 14
}
},
"readonly": true,
"static": false,
"key": {
"type": "PrivateName",
"start": 21,
"end": 23,
"loc": {
"start": {
"line": 2,
"column": 11
},
"end": {
"line": 2,
"column": 13
}
},
"id": {
"type": "Identifier",
"start": 22,
"end": 23,
"loc": {
"start": {
"line": 2,
"column": 12
},
"end": {
"line": 2,
"column": 13
},
"identifierName": "a"
},
"name": "a"
}
},
"value": null
},
{
"type": "ClassProperty",
"start": 27,
"end": 47,
"loc": {
"start": {
"line": 3,
"column": 2
},
"end": {
"line": 3,
"column": 22
}
},
"readonly": true,
"static": false,
"key": {
"type": "PrivateName",
"start": 36,
"end": 38,
"loc": {
"start": {
"line": 3,
"column": 11
},
"end": {
"line": 3,
"column": 13
}
},
"id": {
"type": "Identifier",
"start": 37,
"end": 38,
"loc": {
"start": {
"line": 3,
"column": 12
},
"end": {
"line": 3,
"column": 13
},
"identifierName": "b"
},
"name": "b"
}
},
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start": 38,
"end": 46,
"loc": {
"start": {
"line": 3,
"column": 13
},
"end": {
"line": 3,
"column": 21
}
},
"typeAnnotation": {
"type": "TSStringKeyword",
"start": 40,
"end": 46,
"loc": {
"start": {
"line": 3,
"column": 15
},
"end": {
"line": 3,
"column": 21
}
}
}
},
"value": null
}
]
}
}
],
"directives": []
}
}
4 changes: 4 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/class/private-fields-static/input.ts
View file
Open in desktop
@@ -0,0 +1,4 @@
class A {
static #x;
static #y: string;
}