From 3104a635d00d32a6821f3cb5a5a4b769f5c29cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=A7=91=F0=9F=8F=BB=E2=80=8D=F0=9F=92=BB=20Romain=20M?=
 =?UTF-8?q?arcadier?= <rmuller@amazon.com>
Date: Mon, 19 Sep 2022 12:23:37 +0200
Subject: [PATCH 1/2] fix(jsii): unable to return Promise<void>

The void-check only accounted for the literal `void` type, but failed
to account for the `Promise<void>` case. This is now fixed.

Fixes #51
---
 packages/jsii/lib/assembler.ts     | 23 +++++++++++++++--
 packages/jsii/test/promise.test.ts | 40 ++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 packages/jsii/test/promise.test.ts

diff --git a/packages/jsii/lib/assembler.ts b/packages/jsii/lib/assembler.ts
index 46816f1a36..94342d2ed0 100644
--- a/packages/jsii/lib/assembler.ts
+++ b/packages/jsii/lib/assembler.ts
@@ -2222,7 +2222,11 @@ export class Assembler implements Emitter {
         protected: _isProtected(symbol) || undefined,
         returns: _isVoid(returnType)
           ? undefined
-          : this._optionalValue(returnType, declaration.name, 'return type'),
+          : this._optionalValue(
+              returnType,
+              declaration.type ?? declaration.name,
+              'return type',
+            ),
         async: _isPromise(returnType) || undefined,
         static: _isStatic(symbol) || undefined,
         locationInModule: this.declarationLocation(declaration),
@@ -2435,7 +2439,7 @@ export class Assembler implements Emitter {
       {
         ...this._optionalValue(
           this._typeChecker.getTypeAtLocation(paramDeclaration),
-          paramDeclaration.name,
+          paramDeclaration.type ?? paramDeclaration.name,
           'parameter type',
         ),
         name: paramSymbol.name,
@@ -2969,7 +2973,22 @@ function _isStatic(symbol: ts.Symbol): boolean {
   );
 }
 
+/**
+ * Determines whether a given type is void or Promise<void>.
+ *
+ * @param type the tested type
+ *
+ * @returns `true` if the type is void or Promise<void>
+ */
 function _isVoid(type: ts.Type): boolean {
+  if (_isPromise(type)) {
+    const typeRef = type as ts.TypeReference;
+    return (
+      typeRef.typeArguments != null &&
+      typeRef.typeArguments.length === 1 &&
+      _isVoid(typeRef.typeArguments[0])
+    );
+  }
   return (type.flags & ts.TypeFlags.Void) !== 0;
 }
 
diff --git a/packages/jsii/test/promise.test.ts b/packages/jsii/test/promise.test.ts
new file mode 100644
index 0000000000..bdb6255c8c
--- /dev/null
+++ b/packages/jsii/test/promise.test.ts
@@ -0,0 +1,40 @@
+import { sourceToAssemblyHelper } from '../lib';
+
+// ----------------------------------------------------------------------
+test('Promise<void> is a valid return type', () => {
+  const assembly = sourceToAssemblyHelper(`
+    export class PromiseMaker {
+      public static staticPromise(): Promise<void> {
+        return Promise.resolve();
+      }
+
+      public instancePromise(): Promise<void> {
+        return Promise.resolve();
+      }
+
+      private constructor() {}
+    }
+  `);
+
+  expect(assembly.types!['testpkg.PromiseMaker']).toEqual({
+    assembly: 'testpkg',
+    fqn: 'testpkg.PromiseMaker',
+    kind: 'class',
+    methods: [
+      {
+        async: true,
+        locationInModule: { filename: 'index.ts', line: 3 },
+        name: 'staticPromise',
+        static: true,
+      },
+      {
+        async: true,
+        locationInModule: { filename: 'index.ts', line: 7 },
+        name: 'instancePromise',
+      },
+    ],
+    locationInModule: { filename: 'index.ts', line: 2 },
+    name: 'PromiseMaker',
+    symbolId: 'index:PromiseMaker',
+  });
+});

From 35c1476c4b9fe28938b10d1c53e475f42996e90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=A7=91=F0=9F=8F=BB=E2=80=8D=F0=9F=92=BB=20Romain=20M?=
 =?UTF-8?q?arcadier?= <rmuller@amazon.com>
Date: Mon, 19 Sep 2022 18:44:46 +0200
Subject: [PATCH 2/2] fix snapshots for error messages with improved locality

---
 packages/jsii/test/__snapshots__/negatives.test.js.snap | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/jsii/test/__snapshots__/negatives.test.js.snap b/packages/jsii/test/__snapshots__/negatives.test.js.snap
index 64b86cf3fc..c0036ba4fa 100644
--- a/packages/jsii/test/__snapshots__/negatives.test.js.snap
+++ b/packages/jsii/test/__snapshots__/negatives.test.js.snap
@@ -624,19 +624,19 @@ neg.omit.2.ts:7:32 - error JSII3004: Illegal implements clause for an exported A
 `;
 
 exports[`omit.3 1`] = `
-neg.omit.3.ts:8:3 - error JSII1003: Only string-indexed map types are supported
+neg.omit.3.ts:8:10 - error JSII1003: Only string-indexed map types are supported
 
 8   bar(): Omit<FooBar, 'foo'>;
-    ~~~
+           ~~~~~~~~~~~~~~~~~~~
 
 
 `;
 
 exports[`omit.4 1`] = `
-neg.omit.4.ts:8:7 - error JSII1003: Only string-indexed map types are supported
+neg.omit.4.ts:8:13 - error JSII1003: Only string-indexed map types are supported
 
 8   bar(opts: Omit<FooBar, 'foo'>): void;
-        ~~~~
+              ~~~~~~~~~~~~~~~~~~~
 
 
 `;