Merge pull request #420 from vim-denops/fix-service

🐛 fix delay in resolving `waitLoaded()`

Author: lambdalisue

denops/@denops-private/service.ts

@@ -92,12 +92,16 @@ export class Service implements HostService, AsyncDisposable {
     }
   }
 
-  async waitLoaded(name: string): Promise<void> {
-    if (this.#closed) {
-      throw new Error("Service closed");
+  waitLoaded(name: string): Promise<void> {
+    try {
+      if (this.#closed) {
+        throw new Error("Service closed");
+      }
+      assertValidPluginName(name);
+    } catch (e) {
+      return Promise.reject(e);
     }
-    assertValidPluginName(name);
-    await this.#getWaiter(name).promise;
+    return this.#getWaiter(name).promise;
   }
 
   interrupt(reason?: unknown): void {

denops/@denops-private/service_test.ts

@@ -10,7 +10,6 @@ import {
   assertRejects,
   assertStrictEquals,
   assertStringIncludes,
-  assertThrows,
 } from "jsr:@std/assert@^1.0.1";
 import {
   assertSpyCall,
@@ -1236,22 +1235,23 @@ Deno.test("Service", async (t) => {
   });
 
   await t.step(".interrupt()", async (t) => {
-    await t.step("sends signal to `interrupted` attribute", () => {
+    await t.step("sends signal to `interrupted` property", () => {
       const service = new Service(meta);
       const signal = service.interrupted;
 
       service.interrupt();
 
-      assertThrows(() => signal.throwIfAborted());
+      assert(signal.aborted);
     });
 
-    await t.step("sends signal to `interrupted` attribute with reason", () => {
+    await t.step("sends signal to `interrupted` property with reason", () => {
       const service = new Service(meta);
       const signal = service.interrupted;
 
       service.interrupt("test");
 
-      assertThrows(() => signal.throwIfAborted(), "test");
+      assert(signal.aborted);
+      assertEquals(signal.reason, "test");
     });
   });