npm - sonamu - Versions diffs - 0.7.16 → 0.7.18 - Mend

sonamu 0.7.16 → 0.7.18

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 (64) hide show

package/dist/ai/providers/rtzr/error.d.ts +1 -1
package/dist/ai/providers/rtzr/error.d.ts.map +1 -1
package/dist/api/config.d.ts +1 -0
package/dist/api/config.d.ts.map +1 -1
package/dist/api/config.js +1 -1
package/dist/api/decorators.d.ts +1 -1
package/dist/api/decorators.d.ts.map +1 -1
package/dist/api/decorators.js +1 -1
package/dist/api/sonamu.d.ts +3 -1
package/dist/api/sonamu.d.ts.map +1 -1
package/dist/api/sonamu.js +48 -38
package/dist/syncer/checksum.d.ts +8 -3
package/dist/syncer/checksum.d.ts.map +1 -1
package/dist/syncer/checksum.js +17 -9
package/dist/syncer/code-generator.js +7 -2
package/dist/syncer/syncer.d.ts +6 -6
package/dist/syncer/syncer.d.ts.map +1 -1
package/dist/syncer/syncer.js +27 -13
package/dist/template/implementations/model.template.js +5 -5
package/dist/template/implementations/services.template.d.ts +17 -0
package/dist/template/implementations/services.template.d.ts.map +1 -0
package/dist/template/implementations/services.template.js +180 -0
package/dist/template/implementations/view_form.template.js +2 -2
package/dist/template/implementations/view_id_async_select.template.js +2 -2
package/dist/template/implementations/view_list.template.js +5 -5
package/dist/types/types.d.ts +2 -14
package/dist/types/types.d.ts.map +1 -1
package/dist/types/types.js +3 -15
package/dist/ui/ai-api.d.ts +2 -0
package/dist/ui/ai-api.d.ts.map +1 -1
package/dist/ui/ai-api.js +43 -49
package/dist/ui/ai-client.d.ts +10 -0
package/dist/ui/ai-client.d.ts.map +1 -1
package/dist/ui/ai-client.js +457 -437
package/dist/ui/api.d.ts.map +1 -1
package/dist/ui/api.js +3 -1
package/dist/ui-web/assets/index-DFqVuxOB.js +92 -0
package/dist/ui-web/index.html +1 -1
package/package.json +9 -5
package/src/api/config.ts +3 -0
package/src/api/decorators.ts +6 -1
package/src/api/sonamu.ts +68 -50
package/src/shared/app.shared.ts.txt +1 -1
package/src/shared/web.shared.ts.txt +0 -43
package/src/syncer/checksum.ts +31 -9
package/src/syncer/code-generator.ts +8 -1
package/src/syncer/syncer.ts +38 -26
package/src/template/implementations/model.template.ts +4 -4
package/src/template/implementations/services.template.ts +265 -0
package/src/template/implementations/view_form.template.ts +1 -1
package/src/template/implementations/view_id_async_select.template.ts +1 -1
package/src/template/implementations/view_list.template.ts +4 -4
package/src/types/types.ts +2 -14
package/src/ui/ai-api.ts +61 -60
package/src/ui/ai-client.ts +535 -499
package/src/ui/api.ts +3 -0
package/src/ui/entity.instructions.md +536 -0
package/dist/template/implementations/service.template.d.ts +0 -29
package/dist/template/implementations/service.template.d.ts.map +0 -1
package/dist/template/implementations/service.template.js +0 -202
package/dist/ui-web/assets/index-BcbbB-BB.js +0 -95
package/dist/ui-web/assets/provider-utils_false-BKJD46kk.js +0 -1
package/dist/ui-web/assets/provider-utils_false-Bu5lmX18.js +0 -1
package/src/template/implementations/service.template.ts +0 -328

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

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <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-BcbbB-BB.js"></script>
+    <script type="module" crossorigin src="/sonamu-ui/assets/index-DFqVuxOB.js"></script>
     <link rel="stylesheet" crossorigin href="/sonamu-ui/assets/index-CpaB9P6g.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "sonamu",
-  "version": "0.7.16",
+  "version": "0.7.18",
   "description": "Sonamu — TypeScript Fullstack API Framework",
   "keywords": [
     "typescript",
@@ -100,12 +100,13 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@ai-sdk/openai": "3.0.0-beta.75",
-    "@ai-sdk/provider": "3.0.0-beta.22",
-    "@ai-sdk/provider-utils": "4.0.0-beta.40",
+    "@ai-sdk/openai": "3.0.0",
+    "@ai-sdk/provider": "3.0.0",
+    "@ai-sdk/provider-utils": "4.0.0",
+    "@ai-sdk/anthropic": "3.0.0",
     "@swc/cli": "^0.7.8",
     "@swc/core": "^1.13.5",
-    "ai": "6.0.0-beta.138",
+    "ai": "6.0.1",
     "fastify": "^4.23.2",
     "knex": "^3.1.0",
     "pgvector": "^0.2.1",
@@ -122,6 +123,9 @@
     "@ai-sdk/provider-utils": {
       "optional": true
     },
+    "@ai-sdk/anthropic": {
+      "optional": true
+    },
     "ai": {
       "optional": true
     },

package/src/api/config.ts CHANGED Viewed

@@ -53,6 +53,9 @@ export type SonamuConfig = {
 };
 export type SonamuServerOptions = {
+  // 프로젝트 외부에서 접근할 수 있는 URL. 기본값은 {server.listen.host}:{server.listen.port} 입니다.
+  baseUrl?: string;
   fastify?: FastifyServerOptions;
   listen?: {

package/src/api/decorators.ts CHANGED Viewed

@@ -21,7 +21,12 @@ export interface GuardKeys {
   user: true;
 }
 export type GuardKey = keyof GuardKeys;
-export type ServiceClient = "axios" | "axios-multipart" | "swr" | "window-fetch";
+export type ServiceClient =
+  | "axios"
+  | "axios-multipart"
+  | "tanstack-query"
+  | "tanstack-mutation"
+  | "window-fetch";
 export type ApiDecoratorOptions = {
   httpMethod?: HTTPMethods;
   contentType?:

package/src/api/sonamu.ts CHANGED Viewed

@@ -363,7 +363,7 @@ class SonamuClass {
             (api.options.httpMethod ?? "GET") === request.method.toUpperCase(),
         );
         if (found) {
-          return this.getApiHandler(found, config)(request, reply);
+          return this.createApiHandler(found, config)(request, reply);
         }
         if (request.url.startsWith("/api/")) {
@@ -385,13 +385,13 @@ class SonamuClass {
         server.route({
           method: api.options.httpMethod ?? "GET",
           url: this.config.api.route.prefix + api.path,
-          handler: this.getApiHandler(api, config),
+          handler: this.createApiHandler(api, config),
         }); // END server.route
       }
     }
   }
-  getApiHandler(
+  createApiHandler(
     api: ExtendedApi,
     config: SonamuFastifyConfig,
   ): (request: FastifyRequest, reply: FastifyReply) => Promise<unknown> {
@@ -429,56 +429,74 @@ class SonamuClass {
       // Content-Type
       reply.type(api.options.contentType ?? "application/json");
-      // createSSEFactory 함수에 미리 request의 socket과 reply를 바인딩.
-      const { createSSEFactory } = await import("../stream/sse");
-      const createSSE = (<T extends ZodObject>(
-        _request: FastifyRequest,
-        _reply: FastifyReply,
-        _events: T,
-      ) => createSSEFactory(_request.socket, _reply, _events)).bind(null, request, reply);
-      const context: Context = {
-        ...(await Promise.resolve(
-          config.contextProvider(
-            {
-              request,
-              reply,
-              headers: request.headers,
-              createSSE,
-              naiteStore: Naite.createStore(),
-              // auth
-              user: request.user ?? null,
-              passport: {
-                login: request.login.bind(request) as AuthContext["passport"]["login"],
-                logout: request.logout.bind(request) as AuthContext["passport"]["logout"],
-              },
-            },
-            request,
-            reply,
-          ),
-        )),
-      };
-      const model = this.syncer.models[api.modelName];
-      return this.asyncLocalStorage.run({ context }, async () => {
-        const { ApiParamType } = await import("../types/types");
-        // biome-ignore lint/suspicious/noExplicitAny: model은 모델 인스턴스이므로 메서드 호출 가능
-        const result = await (model as any)[api.methodName].apply(
-          model,
-          api.parameters.map((param) => {
-            // Context 인젝션
-            if (ApiParamType.isContext(param.type)) {
-              return context;
-            } else {
-              return reqBody[param.name];
-            }
-          }),
-        );
-        reply.type(api.options.contentType ?? "application/json");
+      // Context 생성
+      const context: Context = await this.createContext(config, request, reply);
-        return result;
+      // 모델 메소드 args 생성하여 호출
+      const { ApiParamType } = await import("../types/types");
+      const args = api.parameters.map((param) => {
+        // Context 인젝션
+        if (ApiParamType.isContext(param.type)) {
+          return context;
+        } else {
+          return reqBody[param.name];
+        }
       });
+      return this.invokeModelMethod(api, args, context, reply);
+    };
+  }
+  async invokeModelMethod(
+    api: ExtendedApi,
+    args: unknown[],
+    context: Context,
+    reply: FastifyReply,
+  ): Promise<unknown> {
+    const model = this.syncer.models[api.modelName];
+    return this.asyncLocalStorage.run({ context }, async () => {
+      // biome-ignore lint/suspicious/noExplicitAny: model은 모델 인스턴스이므로 메서드 호출 가능
+      const result = await (model as any)[api.methodName].apply(model, args);
+      reply.type(api.options.contentType ?? "application/json");
+      return result;
+    });
+  }
+  async createContext(
+    config: SonamuFastifyConfig,
+    request: FastifyRequest,
+    reply: FastifyReply,
+  ): Promise<Context> {
+    // createSSEFactory 함수에 미리 request의 socket과 reply를 바인딩.
+    const { createSSEFactory } = await import("../stream/sse");
+    const createSSE = (<T extends ZodObject>(
+      _request: FastifyRequest,
+      _reply: FastifyReply,
+      _events: T,
+    ) => createSSEFactory(_request.socket, _reply, _events)).bind(null, request, reply);
+    const context: Context = {
+      ...(await Promise.resolve(
+        config.contextProvider(
+          {
+            request,
+            reply,
+            headers: request.headers,
+            createSSE,
+            naiteStore: Naite.createStore(),
+            // auth
+            user: request.user ?? null,
+            passport: {
+              login: request.login.bind(request) as AuthContext["passport"]["login"],
+              logout: request.logout.bind(request) as AuthContext["passport"]["logout"],
+            },
+          },
+          request,
+          reply,
+        ),
+      )),
     };
+    return context;
   }
   async startWatcher(): Promise<void> {

package/src/shared/app.shared.ts.txt CHANGED Viewed

@@ -322,7 +322,7 @@ export function useSSEStream<T extends Record<string, any>>(
       // URL에 파라미터 추가 - 절대 URL로 변환
       const queryString = qs.stringify(params);
-      const baseUrl = url.startsWith("http") ? url : `https://dev.amrintl.com${url}`;
+      const baseUrl = url.startsWith("http") ? url : `$[[baseUrl]]${url}`;
       const fullUrl = queryString ? `${baseUrl}?${queryString}` : baseUrl;
       const eventSource = new EventSource(fullUrl);

package/src/shared/web.shared.ts.txt CHANGED Viewed

@@ -108,49 +108,6 @@ export const SonamuSemanticParams = z
   .partial();
 export type SonamuSemanticParams = z.infer<typeof SonamuSemanticParams>;
-/*
-  SWR
-*/
-export type SwrOptions = {
-  conditional?: () => boolean;
-};
-export type SWRError = {
-  name: string;
-  message: string;
-  statusCode: number;
-};
-export async function swrFetcher(args: [string, object]): Promise<any> {
-  try {
-    const [url, params] = args;
-    const res = await axios.get(`${url}?${qs.stringify(params)}`);
-    return res.data;
-  } catch (e: any) {
-    const error: any = new Error(e.response.data.message ?? e.response.message ?? "Unknown");
-    error.statusCode = e.response?.data.statusCode ?? e.response.status;
-    throw error;
-  }
-}
-export async function swrPostFetcher(args: [string, object]): Promise<any> {
-  try {
-    const [url, params] = args;
-    const res = await axios.post(url, params);
-    return res.data;
-  } catch (e: any) {
-    const error: any = new Error(e.response.data.message ?? e.response.message ?? "Unknown");
-    error.statusCode = e.response?.data.statusCode ?? e.response.status;
-    throw error;
-  }
-}
-export function handleConditional(
-  args: [string, object],
-  conditional?: () => boolean,
-): [string, object] | null {
-  if (conditional) {
-    return conditional() ? args : null;
-  }
-  return args;
-}
 /*
   Utils
 */

package/src/syncer/checksum.ts CHANGED Viewed

@@ -48,22 +48,38 @@ export async function renewChecksums(): Promise<void> {
   await saveChecksums(calculatedChecksums);
 }
+export type FileOrData =
+  | {
+      path: PathLike;
+    }
+  | {
+      data: string;
+    };
 /**
  * 두 파일의 내용이 같은지 체크섬으로 비교합니다.
  * 만약 파일이 둘 중 하나라도 없다면 비교 불가로 false 반환합니다.
- * @param one 파일 경로
- * @param two 파일 경로
+ * @param one 파일 경로 혹은 데이터
+ * @param two 파일 경로 혹은 데이터
  * @returns boolean
  */
-export async function areFilesSame(one: PathLike, two: PathLike): Promise<boolean> {
-  if (!(await exists(one)) || !(await exists(two))) {
-    return false;
-  }
+export async function areFilesSame(...files: FileOrData[]): Promise<boolean> {
+  const checksums: string[] = [];
-  const oneChecksum = await getChecksumOfFile(one);
-  const twoChecksum = await getChecksumOfFile(two);
+  for (const file of files) {
+    if ("path" in file && !(await exists(file.path))) {
+      return false;
+    }
+    checksums.push(
+      "path" in file ? await getChecksumOfFile(file.path) : getChecksumOfData(file.data),
+    );
+  }
-  return oneChecksum === twoChecksum;
+  return checksums.every(
+    // 다음 체크섬과 비교, 만약 마지막 체크섬일 때는 첫 번째 체크섬과 비교
+    (checksum, index) => checksum === checksums[index === checksums.length - 1 ? 0 : index + 1],
+  );
 }
 async function getCurrentChecksums(): Promise<PathAndChecksum[]> {
@@ -125,6 +141,12 @@ async function saveChecksums(checksums: PathAndChecksum[]): Promise<void> {
   console.log("checksum saved", checksumFilePath);
 }
+function getChecksumOfData(data: string): string {
+  const hash = crypto.createHash("sha1");
+  hash.update(data);
+  return hash.digest("hex");
+}
 async function getChecksumOfFile(filePath: PathLike): Promise<string> {
   return new Promise<string>((resolve, reject) => {
     const hash = crypto.createHash("sha1");

package/src/syncer/code-generator.ts CHANGED Viewed

@@ -115,7 +115,14 @@ async function resolveRenderedTemplate(
   const importDefs = importKeys
     .reduce(
       (r, importKey) => {
-        const modulePath = EntityManager.getModulePath(importKey);
+        let modulePath = importKey;
+        try {
+          modulePath = EntityManager.getModulePath(importKey);
+        } catch (error) {
+          throw new Error(
+            `[resolveRenderedTemplate:${key}] ${importKey} 모듈 경로 찾기 실패: ${error}`,
+          );
+        }
         let importPath = modulePath;
         if (modulePath.includes("/") || modulePath.includes(".")) {
           importPath = wrapIf(path.relative(path.dirname(filePath), modulePath), (p) => [

package/src/syncer/syncer.ts CHANGED Viewed

@@ -161,6 +161,13 @@ export class Syncer {
   }
   async copySharedToTargets(targets: string[]): Promise<void> {
+    // 특정 변수 치환을 위해서 사용합니다.
+    const convertMap = {
+      baseUrl:
+        Sonamu.config.server.baseUrl ??
+        `http://${Sonamu.config.server.listen?.host ?? "localhost"}:${Sonamu.config.server.listen?.port ?? 3000}`,
+    };
     for (const target of targets) {
       // 지금 가져가려는 이 파일은 Sonamu 코드베이스의 일부입니다.
       // 그런데 dist 속 빌드된 소스 코드 파일이 필요한 것이 아니고, src에만 있는 텍스트 파일이 필요합니다.
@@ -178,6 +185,12 @@ export class Syncer {
         );
       }
+      const fullText = await readFile(srcPath, "utf-8");
+      const convertedText = Object.entries(convertMap).reduce(
+        (acc, [key, value]) => acc.replace(`$[[${key}]]`, value),
+        fullText,
+      );
       // 이건 프로젝트에 .ts 소스 코드 파일을 생성하는 것이므로 src의 .ts 경로로 갑니다.
       const destPath = path.join(Sonamu.appRootPath, target, "src/services/sonamu.shared.ts");
@@ -187,12 +200,11 @@ export class Syncer {
         console.warn(`Created directory '${path.dirname(destPath)}' because it did not exist.`);
       }
-      if (await areFilesSame(srcPath, destPath)) {
+      if (await areFilesSame({ data: convertedText }, { path: destPath })) {
         continue;
       }
-      await writeFile(destPath, await readFile(srcPath));
+      await writeFile(destPath, convertedText);
       !isTest() &&
         console.log(
           chalk.bold("Copied: ") + chalk.blue(path.relative(Sonamu.appRootPath, destPath)),
@@ -375,22 +387,7 @@ export class Syncer {
   }
   /**
-   * sonamu.generated.ts와 sonamu.generated.sso.ts를 생성합니다.
-   * @returns 생성된 파일 경로 배열.
-   */
-  async actionGenerateSchemas(): Promise<AbsolutePath[]> {
-    return (
-      await Promise.all([
-        generateTemplate("generated_sso", {}, { overwrite: true }),
-        generateTemplate("generated", {}, { overwrite: true }),
-      ])
-    )
-      .flat()
-      .flat();
-  }
-  /**
-   * *.service.ts를 생성합니다.
+   * services.generated.ts를 생성합니다.
    * @param paramsArray
    * @returns 생성된 파일 경로 배열.
    */
@@ -400,14 +397,29 @@ export class Syncer {
     }[],
   ): Promise<string[]> {
     Naite.t("actionGenerateServices", paramsArray);
+    // services.generated.ts 통합 파일 생성
+    const servicesFile = await generateTemplate(
+      "services",
+      {},
+      {
+        overwrite: true,
+      },
+    );
+    return [...servicesFile];
+  }
+  /**
+   * sonamu.generated.ts와 sonamu.generated.sso.ts를 생성합니다.
+   * @returns 생성된 파일 경로 배열.
+   */
+  async actionGenerateSchemas(): Promise<AbsolutePath[]> {
     return (
-      await Promise.all(
-        paramsArray.map(async (params) =>
-          generateTemplate("service", params as TemplateOptions["service"], {
-            overwrite: true,
-          }),
-        ),
-      )
+      await Promise.all([
+        generateTemplate("generated_sso", {}, { overwrite: true }),
+        generateTemplate("generated", {}, { overwrite: true }),
+      ])
     )
       .flat()
       .flat();

package/src/template/implementations/model.template.ts CHANGED Viewed

@@ -63,7 +63,7 @@ class ${entityId}ModelClass extends BaseModelClass<
 > {
   modelName = "${entityId}";
-  @api({ httpMethod: "GET", clients: ["axios", "swr"], resourceName: "${entityId}" })
+  @api({ httpMethod: "GET", clients: ["axios", "tanstack-query"], resourceName: "${entityId}" })
   async findById<T extends ${entityId}SubsetKey>(
     subset: T,
     id: number
@@ -93,7 +93,7 @@ class ${entityId}ModelClass extends BaseModelClass<
     return rows[0] ?? null;
   }
-  @api({ httpMethod: "GET", clients: ["axios", "swr"], resourceName: "${names.capitalPlural}" })
+  @api({ httpMethod: "GET", clients: ["axios", "tanstack-query"], resourceName: "${names.capitalPlural}" })
   async findMany<T extends ${entityId}SubsetKey, LP extends ${entityId}ListParams>(
     subset: T,
     rawParams?: LP,
@@ -156,7 +156,7 @@ class ${entityId}ModelClass extends BaseModelClass<
     });
   }
-  @api({ httpMethod: "POST" })
+  @api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
   async save(
     spa: ${entityId}SaveParams[]
   ): Promise<number[]> {
@@ -175,7 +175,7 @@ class ${entityId}ModelClass extends BaseModelClass<
     });
   }
-  @api({ httpMethod: "POST", guards: [ "admin" ] })
+  @api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"], guards: [ "admin" ] })
   async del(ids: number[]): Promise<number> {
     const wdb = this.getPuri("w");