sonamu 0.9.2 → 0.9.4

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

@@ -3,8 +3,8 @@
  * 최초 1회 생성되며, 이후에는 덮어쓰지 않습니다.
  * 필요시 직접 수정할 수 있습니다.
  */
+
 /* oxlint-disable react-hooks/exhaustive-deps */ // shared
-/* oxlint-disable @typescript-eslint/no-explicit-any */ // shared
 
 /*
   fetch
@@ -15,7 +15,7 @@ import { EventSource } from "eventsource";
 import qs from "qs";
 import { useEffect, useRef, useState } from "react";
 import { type core, z } from "zod";
-import { getCurrentLocale } from "../i18n/sd.generated";
+import { getCurrentLocale } from "@/i18n/sd.generated";
 
 // ISO 8601 및 타임존 포맷의 날짜 문자열을 Date 객체로 변환하는 reviver
 export function dateReviver(_key: string, value: any): any {

package/src/storage/buffered-file.ts

@@ -35,8 +35,8 @@ export class BufferedFile extends BaseFile {
 
   /**
    * 파일을 디스크에 저장
+   * @param diskName 디스크 이름 ("fs" 또는 "s3")
    * @param key 저장 경로 (예: 'uploads/avatar.png')
-   * @param diskName 디스크 이름 (기본: default disk)
    * @returns 저장된 파일의 URL
    */
   async saveToDisk(diskName: DriverKey, key: string): Promise<string> {

package/src/syncer/syncer.ts

@@ -5,7 +5,6 @@ import path from "path";
 
 import { hot } from "@sonamu-kit/hmr-hook";
 import chalk from "chalk";
-import inflection from "inflection";
 import { minimatch } from "minimatch";
 import { group, unique } from "radashi";
 import { type z } from "zod";
@@ -452,22 +451,13 @@ export class Syncer {
     const params: {
       namesRecord: EntityNamesRecord;
     }[] = mergedGroup.map((modelPath) => {
-      if (modelPath.endsWith(".model.ts")) {
+      if (modelPath.endsWith(".model.ts") || modelPath.endsWith(".frame.ts")) {
         const entityId = EntityManager.getEntityIdFromPath(modelPath);
         assert(entityId);
         return {
           namesRecord: EntityManager.getNamesFromId(entityId),
         };
       }
-      if (modelPath.endsWith(".frame.ts")) {
-        const [, frameName] = modelPath.match(/.+\/(.+)\.frame\.ts$/) ?? [];
-        assert(frameName);
-        // frameName을 PascalCase로 변환 (dashboard -> Dashboard)
-        const frameId = inflection.camelize(frameName);
-        return {
-          namesRecord: EntityManager.getNamesFromId(frameId),
-        };
-      }
       throw new Error("not reachable");
     });
 

package/src/template/implementations/entry-server.template.ts

@@ -75,7 +75,7 @@ export async function render(url: string, preloadedData: PreloadedData[] = []) {
       ...this.getTargetAndPath(),
       body,
       importKeys: [],
-      customHeaders: ["/**", " * @generated", " * 직접 수정하지 마세요.", " */"],
+      customHeaders: ["/**", " * @generated", " * 직접 수정하지 마세요.", " */", ""],
     };
   }
 }

package/src/template/implementations/generated.template.ts

@@ -130,6 +130,7 @@ export class Template__generated extends Template {
         " * @generated",
         " * 직접 수정하지 마세요.",
         " */",
+        "",
         "/* oxlint-disable */",
         "",
         `import { z } from 'zod';`,

package/src/template/implementations/generated_sso.template.ts

@@ -152,6 +152,7 @@ export class Template__generated_sso extends Template {
       " * @generated",
       " * 직접 수정하지 마세요.",
       " */",
+      "",
       `import { ${sonamuImports} } from "sonamu";`,
     ];
     if (this.hasAuthConfig()) {

package/src/template/implementations/queries.template.ts

@@ -106,6 +106,7 @@ ${functions.join("\n\n")}
             " * @generated",
             " * 직접 수정하지 마세요.",
             " */",
+            "",
             "/* oxlint-disable */",
             "",
             `import type { SSRQuery } from 'sonamu/ssr';`,
@@ -116,7 +117,15 @@ ${functions.join("\n\n")}
             `}`,
             "",
           ]
-        : ["/**", " * @generated", " * 직접 수정하지 마세요.", " */", "/* oxlint-disable */", ""],
+        : [
+            "/**",
+            " * @generated",
+            " * 직접 수정하지 마세요.",
+            " */",
+            "",
+            "/* oxlint-disable */",
+            "",
+          ],
     };
   }
 }

package/src/template/implementations/sd.template.ts

@@ -250,7 +250,7 @@ SD.enumLabels = (enumName: string): Record<string, LocalizedString> => {
       ...this.getTargetAndPath(undefined, target),
       body,
       importKeys: [],
-      customHeaders: ["/**", " * @generated", " * 직접 수정하지 마세요.", " */"],
+      customHeaders: ["/**", " * @generated", " * 직접 수정하지 마세요.", " */", ""],
     };
   }
 

package/src/template/implementations/services.template.ts

@@ -209,18 +209,64 @@ export const ${methodName}QueryOptions = ${typeParamsDef}(${paramsDef}) => query
           `.trim(),
           );
 
-          // useQuery hook
+          // useQuery hook (useRefreshable로 래핑해 refresh/isRefreshing을 기본 제공)
           functions.push(
             `
 export const use${inflection.camelize(hookName)} = ${typeParamsDef}(${paramsDef}${
               paramsDef ? ", " : ""
             }options?: { enabled?: boolean }) =>
-  useQuery({
+  useRefreshable(useQuery({
     ...${methodName}QueryOptions(${paramNames}),
     ...options
-  });
+  }));
           `.trim(),
           );
+
+          // infiniteQueryOptions + useInfiniteQuery (AsyncIdConfig.useListInfinite 대상 조건)
+          // 조건: resourceName이 복수형이고 methodName === "findMany"
+          const resourceName = api.options.resourceName;
+          const isInfiniteTarget =
+            !!resourceName &&
+            inflection.pluralize(resourceName) === resourceName &&
+            api.methodName === "findMany";
+
+          if (isInfiniteTarget) {
+            const infiniteMethodName = `${methodName}Infinite`;
+            const infiniteHookName = `use${inflection.camelize(hookName)}Infinite`;
+
+            functions.push(
+              `
+export const ${infiniteMethodName}QueryOptions = ${typeParamsDef}(${paramsDef}) => infiniteQueryOptions({
+  queryKey: ['${modelName}', '${methodName}', 'infinite'${paramNames ? `, ${paramNames}` : ""}],
+  queryFn: ({ pageParam }) => ${methodName}(${
+    paramNames ? paramNames.replace(/\brawParams\b/, "{ ...rawParams, page: pageParam }") : ""
+  }),
+  initialPageParam: 1 as number,
+  getNextPageParam: (lastPage, allPages) => {
+    const total = (lastPage as { total?: number })?.total ?? 0;
+    const loaded = allPages.reduce(
+      (sum, p) => sum + ((p as { rows?: unknown[] })?.rows?.length ?? 0),
+      0,
+    );
+    return loaded < total ? allPages.length + 1 : undefined;
+  },
+  select: dedupeAndFlatten,
+});
+          `.trim(),
+            );
+
+            functions.push(
+              `
+export const ${infiniteHookName} = ${typeParamsDef}(${paramsDef}${
+                paramsDef ? ", " : ""
+              }options?: { enabled?: boolean }) =>
+  useRefreshable(useInfiniteQuery({
+    ...${infiniteMethodName}QueryOptions(${paramNames}),
+    ...options
+  }));
+          `.trim(),
+            );
+          }
         }
 
         // 3. useMutation (tanstack-mutation)
@@ -315,6 +361,7 @@ ${functions.join("\n\n")}
         // resourceName에서 hook 이름 생성 (기존 로직과 동일)
         const hookName = inflection.camelize(assertDefined(listApi.options.resourceName), true);
         const useHookName = `use${inflection.camelize(hookName)}`;
+        const useHookInfiniteName = `${useHookName}Infinite`;
 
         // ListParams 타입명 구성
         const listParamsType = `${names.capital}ListParams`;
@@ -325,6 +372,7 @@ ${functions.join("\n\n")}
 export const ${names.capital}AsyncIdConfig: AsyncIdConfig<${names.capital}SubsetKey, ${names.capital}SubsetMapping, ${listParamsType}> = {
   placeholderKey: "entity.${names.capital}",
   useList: ${names.capital}Service.${useHookName},
+  useListInfinite: ${names.capital}Service.${useHookInfiniteName},
 };
           `.trim(),
         );
@@ -337,6 +385,11 @@ export const ${names.capital}AsyncIdConfig: AsyncIdConfig<${names.capital}Subset
       .map((typeKey) => `type ${typeKey}`);
 
     // sonamu.shared에서 import할 항목들을 동적으로 구성
+    // body 문자열을 기준으로 infinite 훅 생성 여부 판단 (findMany 복수형 분기에서만 참조됨)
+    const bodyForImportCheck = namespaces.join("\n\n");
+    const needsDedupeAndFlatten = bodyForImportCheck.includes("dedupeAndFlatten");
+    const needsUseRefreshable = bodyForImportCheck.includes("useRefreshable");
+
     const sonamuSharedImports = [
       "type ListResult",
       "type FilterQuery",
@@ -346,6 +399,8 @@ export const ${names.capital}AsyncIdConfig: AsyncIdConfig<${names.capital}Subset
       "type SSEStreamOptions",
       "useSSEStream",
       "toFormData",
+      ...(needsDedupeAndFlatten ? ["dedupeAndFlatten"] : []),
+      ...(needsUseRefreshable ? ["useRefreshable"] : []),
     ].join(", ");
 
     // body 구성: namespaces + asyncIdConfigs
@@ -364,13 +419,14 @@ export const ${names.capital}AsyncIdConfig: AsyncIdConfig<${names.capital}Subset
         " * @generated",
         " * 직접 수정하지 마세요.",
         " */",
+        "",
         "/* oxlint-disable */",
         "",
-        `import { queryOptions, useQuery, useMutation, type UseMutationOptions } from '@tanstack/react-query';`,
-        `import type { AxiosProgressEvent } from 'axios';`,
+        `import { queryOptions, useQuery, useInfiniteQuery, infiniteQueryOptions, useMutation, type UseMutationOptions } from '@tanstack/react-query';`,
+        `import { type AxiosProgressEvent } from 'axios';`,
         `import qs from 'qs';`,
         `import { ${sonamuSharedImports} } from './sonamu.shared';`,
-        `import type { AsyncIdConfig } from '@sonamu-kit/react-components/components';`,
+        `import { type AsyncIdConfig } from '@sonamu-kit/react-components/components';`,
       ],
     };
   }

package/src/template/zod-converter.ts

@@ -442,13 +442,14 @@ export function zodTypeToTsTypeDef(zt: z.ZodType): string {
     case "number":
     case "boolean":
     case "bigint":
-    case "date":
     case "null":
     case "undefined":
     case "any":
     case "unknown":
     case "never":
       return zt.def.type;
+    case "date":
+      return "Date";
     case "nullable":
       return `${zodTypeToTsTypeDef((zt as AnyZodNullable).def.innerType)} | null`;
     case "default":

package/src/utils/fs-utils.ts

@@ -71,13 +71,15 @@ export async function copyFileWithReplaceCoreToShared(
   })();
 
   // syncHeader가 제공된 경우 @generated 블록을 교체하거나 최상단에 추가합니다.
+  // `*/` 직후에는 항상 빈 줄 한 개를 보장하여 oxfmt가 주석을 import의 leading comment로 오인해 정렬 시 끌려가는 문제를 방지합니다.
   if (syncHeader) {
-    // 여러 줄 형식만 매칭합니다. 한 줄짜리(/** @generated */)는 매칭하지 않으므로 수동으로 축약하지 마세요.
-    const generatedBlockRegex = /\/\*\*\r?\n \* @generated\r?\n[\s\S]*?\*\/\r?\n/;
+    // 기존 @generated 블록 + 뒤이어 오는 빈 줄들(있으면 포함)을 한꺼번에 매칭하여 교체 시 빈 줄이 누적되지 않게 합니다.
+    // 한 줄짜리(/** @generated */)는 매칭하지 않으므로 수동으로 축약하지 마세요.
+    const generatedBlockRegex = /\/\*\*\r?\n \* @generated\r?\n[\s\S]*?\*\/\r?\n(\r?\n)*/;
     if (generatedBlockRegex.test(newFileContent)) {
-      newFileContent = newFileContent.replace(generatedBlockRegex, `${syncHeader}\n`);
+      newFileContent = newFileContent.replace(generatedBlockRegex, `${syncHeader}\n\n`);
     } else {
-      newFileContent = `${syncHeader}\n${newFileContent}`;
+      newFileContent = `${syncHeader}\n\n${newFileContent}`;
     }
   }