npm - sonamu - Versions diffs - 0.10.1 → 0.10.3 - Mend

sonamu 0.10.1 → 0.10.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/dist/api/sonamu.js +1 -1
package/dist/bin/build-config.d.ts.map +1 -1
package/dist/bin/build-config.js +3 -3
package/dist/database/puri.types.d.ts +4 -1
package/dist/database/puri.types.d.ts.map +1 -1
package/dist/database/puri.types.js +1 -1
package/dist/ui-web/assets/index-CDd6xT-F.js +170 -0
package/dist/ui-web/index.html +1 -1
package/package.json +3 -3
package/src/api/__tests__/sonamu.websocket.test.ts +100 -2
package/src/api/sonamu.ts +3 -3
package/src/bin/build-config.ts +3 -2
package/src/database/puri.types.ts +7 -2
package/src/template/generated.template.test-d.ts +21 -1
package/dist/ui-web/assets/index-DFStGyd0.js +0 -202

package/dist/ui-web/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/sonamu-ui/setting.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{{projectName}}: Sonamu UI</title>
-    <script type="module" crossorigin src="/sonamu-ui/assets/index-DFStGyd0.js"></script>
+    <script type="module" crossorigin src="/sonamu-ui/assets/index-CDd6xT-F.js"></script>
     <link rel="stylesheet" crossorigin href="/sonamu-ui/assets/index-Dx4ap5i4.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "sonamu",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "description": "Sonamu — TypeScript Fullstack API Framework",
   "keywords": [
     "framework",
@@ -131,8 +131,8 @@
     "vitest": "^4.1.9",
     "@sonamu-kit/hmr-hook": "^0.5.1",
     "@sonamu-kit/hmr-runner": "^0.2.0",
-    "@sonamu-kit/tasks": "^0.3.1",
-    "@sonamu-kit/ts-loader": "^2.2.0"
+    "@sonamu-kit/ts-loader": "^2.2.0",
+    "@sonamu-kit/tasks": "^0.3.1"
   },
   "devDependencies": {
     "@types/bcrypt": "^6",

package/src/api/__tests__/sonamu.websocket.test.ts CHANGED Viewed

@@ -1,11 +1,109 @@
-import { describe, expect, it } from "vitest";
+import { type FastifyRequest } from "fastify";
+import { describe, expect, it, vi } from "vitest";
+import { type WebSocket } from "ws";
+import { z } from "zod";
-import { type AnyWebSocketConnection } from "../../stream/ws";
+import { type AnyWebSocketConnection, WebSocketRuntime } from "../../stream/ws";
 import { type WebSocketTelemetryConnectionContext } from "../../stream/ws-telemetry";
+import { type SonamuFastifyConfig } from "../config";
 import { type WebSocketContext } from "../context";
+import { type ExtendedApi } from "../decorators";
 import { Sonamu } from "../sonamu";
 describe("Sonamu websocket context scoping", () => {
+  it("웹소켓 컨텍스트를 생성한 뒤 해당 컨텍스트 안에서 guard를 실행한다", async () => {
+    const executionOrder: string[] = [];
+    const rawWs = {
+      id: "ws-guard",
+      namespace: "chat",
+      transport: "ws" as const,
+      closed: false,
+      publishUntyped() {},
+      close() {},
+      onClose() {},
+      onMessage() {},
+      publish() {},
+      waitForClose() {
+        return Promise.resolve();
+      },
+      join() {},
+      leave() {},
+      setUserId() {},
+      clearUserId() {},
+    } satisfies AnyWebSocketConnection;
+    const runtime = new WebSocketRuntime({ nodeId: "websocket-guard-test" });
+    const originalRuntime = Reflect.get(Sonamu, "_websocketRuntime");
+    const originalSyncer = Reflect.get(Sonamu, "_syncer");
+    let contextCreated: WebSocketContext | null = null;
+    let guardContext: WebSocketContext | null = null;
+    vi.spyOn(runtime, "registerConnection").mockReturnValue(rawWs);
+    vi.spyOn(runtime, "activateConnection").mockImplementation(() => {
+      executionOrder.push("activate");
+    });
+    vi.spyOn(Sonamu, "createWebSocketContext").mockImplementation(async (_config, request, ws) => {
+      executionOrder.push("context");
+      contextCreated = {
+        transport: "ws",
+        request,
+        headers: request.headers,
+        ws,
+        naiteStore: new Map(),
+        locale: "ko",
+        user: null,
+        session: null,
+      };
+      return contextCreated;
+    });
+    vi.spyOn(Sonamu, "invokeModelMethod").mockImplementation(async () => {
+      executionOrder.push("handler");
+    });
+    const config = {
+      guardHandler() {
+        executionOrder.push("guard");
+        guardContext = Sonamu.getContext<WebSocketContext>();
+      },
+    } as SonamuFastifyConfig;
+    const api: ExtendedApi = {
+      modelName: "ChatFrame",
+      methodName: "subscribe",
+      path: "/chat/subscribe",
+      options: { guards: ["user"] },
+      websocketOptions: {
+        outEvents: z.object({}),
+        inEvents: z.object({}),
+      },
+      typeParameters: [],
+      parameters: [],
+      returnType: "void",
+    };
+    const request = {
+      headers: {},
+      query: {},
+    } as FastifyRequest;
+    const createWebSocketHandler: (
+      api: ExtendedApi,
+      config: SonamuFastifyConfig,
+    ) => (connection: { socket: WebSocket }, request: FastifyRequest) => Promise<void> =
+      Reflect.get(Sonamu, "createWebSocketHandler");
+    try {
+      Sonamu.websocketRuntime = runtime;
+      Reflect.set(Sonamu, "_syncer", { types: {} });
+      await createWebSocketHandler.call(Sonamu, api, config)({ socket: {} as WebSocket }, request);
+      expect(executionOrder).toEqual(["context", "guard", "activate", "handler"]);
+      expect(guardContext).toBe(contextCreated);
+      expect(guardContext?.transport).toBe("ws");
+    } finally {
+      Reflect.set(Sonamu, "_websocketRuntime", originalRuntime);
+      Reflect.set(Sonamu, "_syncer", originalSyncer);
+      vi.restoreAllMocks();
+    }
+  });
   it("restores websocket context inside deferred message handlers", async () => {
     const messageHandlers = new Map<
       string,

package/src/api/sonamu.ts CHANGED Viewed

@@ -1095,9 +1095,9 @@ class SonamuClass {
   }
   // WS route 핸들러의 실행 순서를 고정함:
-  // 1) guard를 connection 등록 이전에 돌려 인증 실패 시 부분 등록 상태를 남기지 않음
-  // 2) query param 파싱도 activation 전에 끝내 handshake 실패가 registry에 노출되지 않게 함
-  // 3) `active: false`로 먼저 등록하고, context 준비가 끝난 뒤 `activate()`해 브로드캐스트가 초기화 중간 상태를 보지 못하게 함
+  // 1) query param 파싱을 activation 전에 끝내 handshake 실패가 registry에 노출되지 않게 함
+  // 2) `active: false`로 먼저 등록한 뒤 context 안에서 guard를 실행해 인증 정보를 참조할 수 있게 함
+  // 3) context/guard 준비가 끝난 뒤 `activate()`해 브로드캐스트가 초기화 중간 상태를 보지 못하게 함
   // 에러 발생 시에는 resolveWebSocketCloseDescriptor 정책에 따라 close code를 매핑함
   private createWebSocketHandler(api: ExtendedApi, config: SonamuFastifyConfig) {
     return async (

package/src/bin/build-config.ts CHANGED Viewed

@@ -32,7 +32,8 @@ export const WEB_ARTIFACTS: BuildArtifact[] = [
     description: "Web 프로젝트 클라이언트 빌드 산출물",
     projectPath: "web",
     preBuildCommand: () => "rm -rf dist/client",
-    buildCommand: () => "tsc --noEmit && vite build --config vite.config.ts --outDir dist/client",
+    buildCommand: () =>
+      "tsc -b --noEmit && vite build --config vite.config.ts --outDir dist/client",
   },
   {
     name: "Web Server",
@@ -40,7 +41,7 @@ export const WEB_ARTIFACTS: BuildArtifact[] = [
     projectPath: "web",
     preBuildCommand: () => "rm -rf dist/server",
     buildCommand: () =>
-      "tsc --noEmit && vite build --config vite.config.ts --ssr src/entry-server.generated.tsx --outDir dist/server",
+      "tsc -b --noEmit && vite build --config vite.config.ts --ssr src/entry-server.generated.tsx --outDir dist/server",
     postBuildCommand: () =>
       "rm -rf ../api/web-dist && mkdir -p ../api/web-dist && cp -r dist/* ../api/web-dist",
   },

package/src/database/puri.types.ts CHANGED Viewed

@@ -340,10 +340,15 @@ type GeneratedKeys<T> = T extends { __generated__: readonly (infer K)[] }
   ? Extract<K, keyof PuriTable<T>>
   : never;
-// Insert 타입: 메타데이터 제거 후, __hasDefault__ 컬럼들만 optional로 처리, __generated__ 컬럼은 완전히 제외
+// __virtual_query__에 포함된 키들 (INSERT 시 제외해야 함)
+type VirtualQueryKeys<T> = T extends { __virtual_query__: readonly (infer K)[] }
+  ? Extract<K, keyof PuriTable<T>>
+  : never;
+// Insert 타입: 메타데이터 제거 후, __hasDefault__ 컬럼들만 optional로 처리, generated/virtualQuery 컬럼은 완전히 제외
 export type InsertData<T> = Omit<
   PuriTable<T>,
-  InternalTypeKeys | HasDefaultKeys<T> | GeneratedKeys<T>
+  InternalTypeKeys | HasDefaultKeys<T> | GeneratedKeys<T> | VirtualQueryKeys<T>
 > & {
   [K in HasDefaultKeys<T>]?: PuriTable<T>[K];
 };

package/src/template/generated.template.test-d.ts CHANGED Viewed

@@ -13,11 +13,20 @@ type GeneratedTemplateRow = {
   __generated__: readonly ["slug", "search_text"];
 };
+type VirtualQueryTemplateRow = {
+  id: number;
+  title: string;
+  required_virtual_value: string;
+  nullable_virtual_value: string | null;
+  __hasDefault__: readonly ["id"];
+  __virtual_query__: readonly ["required_virtual_value", "nullable_virtual_value"];
+};
 describe("generated template __generated__ metadata", () => {
   it("searchText와 기존 generated 컬럼을 write payload에서 제외해야 한다", () => {
     type Result = InsertData<GeneratedTemplateRow>;
-    expectTypeOf<Result>().toEqualTypeOf<{
+    expectTypeOf<Result>().branded.toEqualTypeOf<{
       id?: number;
       title: string;
       code: string;
@@ -45,3 +54,14 @@ describe("generated template __generated__ metadata", () => {
     }>();
   });
 });
+describe("generated template __virtual_query__ metadata", () => {
+  it("virtualQuery 컬럼을 nullability와 무관하게 write payload에서 제외해야 한다", () => {
+    type Result = InsertData<VirtualQueryTemplateRow>;
+    expectTypeOf<Result>().branded.toEqualTypeOf<{
+      id?: number;
+      title: string;
+    }>();
+  });
+});