Merge pull request #62 from jycouet/feat-ts-improvements

fix: decorator expression & fn return type

Author: Rich-Harris

.changeset/big-forks-learn.md

@@ -0,0 +1,5 @@
+---
+'esrap': patch
+---
+
+fix: support function return type

.changeset/cold-grapes-sit.md

@@ -0,0 +1,5 @@
+---
+'esrap': patch
+---
+
+fix: support decorator expression

src/handlers.js

@@ -475,6 +475,15 @@ function handle_type_annotation(node, state) {
 		case 'TSNeverKeyword':
 			state.commands.push('never');
 			break;
+		case 'TSSymbolKeyword':
+			state.commands.push('symbol');
+			break;
+		case 'TSNullKeyword':
+			state.commands.push('null');
+			break;
+		case 'TSUndefinedKeyword':
+			state.commands.push('undefined');
+			break;
 		case 'TSArrayType':
 			handle_type_annotation(node.elementType, state);
 			state.commands.push('[]');
@@ -1273,7 +1282,11 @@ const handlers = {
 
 		state.commands.push('(');
 		sequence(node.value.params, state, false, handle);
-		state.commands.push(') ');
+		state.commands.push(')');
+
+		if (node.value.returnType) handle_type_annotation(node.value.returnType, state);
+
+		state.commands.push(' ');
 
 		if (node.value.body) handle(node.value.body, state);
 	},
@@ -1352,6 +1365,12 @@ const handlers = {
 	},
 
 	PropertyDefinition(node, state) {
+		if (node.decorators) {
+			for (const decorator of node.decorators) {
+				handle(decorator, state);
+			}
+		}
+
 		if (node.accessibility) {
 			state.commands.push(node.accessibility, ' ');
 		}

test/samples/ts-decorators-expression/expected.ts

@@ -0,0 +1,16 @@
+class Fields {
+	static uuid() {
+		return function (target: any, propertyKey: string | symbol) {
+			Object.defineProperty(target, propertyKey, { value: 'random uuid...', writable: true });
+		};
+	}
+}
+
+class User {
+	@Fields.uuid()
+	id: string;
+}
+
+const u = new User();
+
+console.log(u.id); // will print "random uuid..."

test/samples/ts-decorators-expression/expected.ts.map

@@ -0,0 +1,11 @@
+{
+  "version": 3,
+  "names": [],
+  "sources": [
+    "input.js"
+  ],
+  "sourcesContent": [
+    "class Fields {\n\tstatic uuid() {\n\t\treturn function (target: any, propertyKey: string | symbol) {\n\t\t\tObject.defineProperty(target, propertyKey, { value: 'random uuid...', writable: true });\n\t\t};\n\t}\n}\n\nclass User {\n\t@Fields.uuid()\n\tid: string;\n}\n\nconst u = new User();\nconsole.log(u.id); // will print \"random uuid...\"\n"
+  ],
+  "mappings": "MAAM,MAAM,CAAC,CAAC;QACN,IAAI,GAAG,CAAC;mBACG,MAAW,OAAE,WAA4B,mBAAE,CAAC;GAC5D,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,IAAI,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI;EACrF,CAAC;CACF,CAAC;AACF,CAAC;;MAEK,IAAI,CAAC,CAAC;EACV,MAAM,CAAC,IAAI;CACZ,EAAE;AACH,CAAC;;MAEK,CAAC,OAAO,IAAI;;AAClB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE"
+}

test/samples/ts-decorators-expression/input.ts

@@ -0,0 +1,15 @@
+class Fields {
+	static uuid() {
+		return function (target: any, propertyKey: string | symbol) {
+			Object.defineProperty(target, propertyKey, { value: 'random uuid...', writable: true });
+		};
+	}
+}
+
+class User {
+	@Fields.uuid()
+	id: string;
+}
+
+const u = new User();
+console.log(u.id); // will print "random uuid..."

test/samples/ts-null-keyword/expected.ts

@@ -0,0 +1 @@
+let a: string | null = null;

test/samples/ts-null-keyword/expected.ts.map

@@ -0,0 +1,11 @@
+{
+  "version": 3,
+  "names": [],
+  "sources": [
+    "input.js"
+  ],
+  "sourcesContent": [
+    "let a: string | null = null"
+  ],
+  "mappings": "IAAI,CAAgB,kBAAG,IAAI"
+}

test/samples/ts-null-keyword/input.ts

@@ -0,0 +1 @@
+let a: string | null = null

test/samples/ts-return-type/expected.ts

@@ -0,0 +1,5 @@
+class Fields {
+	static cuid(): string {
+		return 'random cuid...';
+	}
+}