fix(core): resolve api constructor

swordev · May 10, 2022 · c85dfae · c85dfae
1 parent 0fd78a8
commit c85dfae
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/.changeset/silver-kids-nail.md b/.changeset/silver-kids-nail.md
@@ -0,0 +1,5 @@
+---
+"@smcp/core": patch
+---
+
+Fix `api` option
diff --git a/packages/core/src/ServerController.ts b/packages/core/src/ServerController.ts
@@ -1,5 +1,5 @@
 import { ConfigsType, DataType } from "./utils/ejson";
-import { getObjectValue, merge } from "./utils/object";
+import { getObjectValue, isClass, merge } from "./utils/object";
 import { parsePath } from "./utils/proxy";
 import {
   MessageType,
@@ -44,7 +44,7 @@ export class ServerController<TApi, TClientKey> {
       const [classLevels, method] = parsePath(path);
       const api = this.options.api;
       const Constructor = getObjectValue(
-        typeof api === "function"
+        typeof api === "function" && !isClass(api)
           ? (api as () => Record<string, unknown>)()
           : (api as Record<string, unknown>),
         classLevels

diff --git a/packages/core/src/utils/object.ts b/packages/core/src/utils/object.ts
@@ -6,6 +6,10 @@ export enum IterationTypeEnum {
   Object,
 }
 
+export function isClass(value: unknown) {
+  return typeof value === "function" && /^\s*class\s+/.test(value.toString());
+}
+
 export function isInstanceObject(
   value: unknown
 ): value is Record<string, unknown> {

diff --git a/packages/core/test/Server.test.ts b/packages/core/test/Server.test.ts
@@ -96,3 +96,26 @@ describe("Server.options.container", () => {
     await server.stop();
   });
 });
+
+describe("Server.options.api", () => {
+  it("resolves constructor", async () => {
+    class Api {
+      get() {
+        return true;
+      }
+    }
+    const server = new Server({
+      container,
+      api: Api,
+    });
+
+    await server.start(0);
+
+    const client = new Client<Api>({
+      url: { port: server.port },
+    });
+
+    expect(await client.api.get()).toBe(true);
+    await server.stop();
+  });
+});