@toktokhan-dev/cli-plugin-gen-api-react-query 0.2.0 → 0.2.1

package/dist/index.js

@@ -1,5 +1,5 @@
 import { defineCommand } from '@toktokhan-dev/cli';
-import { createPackageRoot, prettierString, withLoading, cwd } from '@toktokhan-dev/node';
+import { createPackageRoot, withLoading, cwd } from '@toktokhan-dev/node';
 import omit from 'lodash/omit.js';
 import path from 'path';
 import { generateApi } from 'swagger-typescript-api';
@@ -43,6 +43,8 @@ const parseSwagger = (config) => generateApi({
     input: config.swaggerSchemaUrl,
     httpClientType: config.httpClientType, // "axios" or "fetch"
     typeSuffix: 'Type',
+    sortTypes: true,
+    sortRoutes: true,
     prettier: {
         printWidth: 120,
     },
@@ -394,12 +396,12 @@ const writeSwaggerApiFile = async (params) => {
                     processedContent = rewriteDataContractsImport(content, filename, classificationResult);
                 }
                 const { apiContents, hookParts } = splitHookContents(filename, processedContent);
-                await generatePretty(path.resolve(targetFolder, `${filename}.api.ts`), apiContents);
+                generate(path.resolve(targetFolder, `${filename}.api.ts`), apiContents);
                 if (config.includeReactQuery) {
-                    await generatePretty(path.resolve(targetFolder, `${filename}.query.ts`), hookParts[0]);
+                    generate(path.resolve(targetFolder, `${filename}.query.ts`), hookParts[0]);
                 }
                 if (config.includeReactSuspenseQuery) {
-                    await generatePretty(path.resolve(targetFolder, `${filename}.suspenseQuery.ts`), hookParts[1]);
+                    generate(path.resolve(targetFolder, `${filename}.suspenseQuery.ts`), hookParts[1]);
                 }
                 continue;
             }
@@ -498,23 +500,6 @@ function extractImportedTypeNames(content) {
         .map((s) => s.trim())
         .filter(Boolean));
 }
-async function generatePretty(path, contents) {
-    let organized = contents;
-    try {
-        organized = await prettierString(contents, {
-            parser: 'babel-ts',
-            plugins: ['prettier-plugin-organize-imports'],
-        });
-    }
-    catch (err) {
-        console.warn('⚠️  prettier-plugin-organize-imports not found, skipping import organization');
-    }
-    const formatted = await prettierString(organized, {
-        parser: 'typescript',
-        configPath: 'auto',
-    });
-    generate(path, formatted);
-}
 function generate(path, contents) {
     let existingContent = '';
     try {
@@ -654,7 +639,9 @@ const genApi = defineCommand({
             await withLoading('Prettier format', covered.output, async () => {
                 const fs = await import('fs');
                 const pathMod = await import('path');
-                const { prettierString } = await import('@toktokhan-dev/node');
+                const { prettierString, findFileToTop } = await import('@toktokhan-dev/node');
+                // output 디렉토리 기준으로 prettier config를 탐색 (cwd 의존 제거)
+                const configPath = findFileToTop(covered.output, '.prettierrc.js') || 'auto';
                 const listTsFiles = (dir) => {
                     const entries = fs.readdirSync(dir, { withFileTypes: true });
                     const files = [];
@@ -673,9 +660,19 @@ const genApi = defineCommand({
                 for (const file of files) {
                     try {
                         const raw = fs.readFileSync(file, 'utf8');
-                        const formatted = await prettierString(raw, {
+                        let organized = raw;
+                        try {
+                            organized = await prettierString(raw, {
+                                parser: 'babel-ts',
+                                plugins: ['prettier-plugin-organize-imports'],
+                            });
+                        }
+                        catch {
+                            // prettier-plugin-organize-imports not installed, skip
+                        }
+                        const formatted = await prettierString(organized, {
                             parser: 'typescript',
-                            configPath: 'auto',
+                            configPath,
                         });
                         fs.writeFileSync(file, formatted);
                     }
@@ -693,8 +690,9 @@ const genApi = defineCommand({
 // 스마트 타입 병합 함수
 function mergeTypeScriptContent(existing, newContent) {
     // 1) import 구문 보존 및 병합 (양쪽 모두에서 수집)
-    const importRegex = /^\s*import\s+[^;]*;\s*$/gm;
-    const sideEffectImportRegex = /^\s*import\s+['"][^'"]+['"];\s*$/gm;
+    // 멀티라인 import도 매칭: import { \n A, \n B \n } from '...';
+    const importRegex = /^\s*import\s+[\s\S]*?from\s*['"][^'"]*['"];?/gm;
+    const sideEffectImportRegex = /^\s*import\s*['"][^'"]+['"];\s*$/gm;
     const collectImports = (content) => {
         const imports = new Set();
         const matchedA = content.match(importRegex) ?? [];
@@ -710,14 +708,17 @@ function mergeTypeScriptContent(existing, newContent) {
     // import 병합: 새 파일 기준 우선 순서 + 기존에만 있는 import 추가
     const mergedImportSet = new Set(newImports);
     existingImports.forEach((imp) => mergedImportSet.add(imp));
-    const mergedImports = Array.from(mergedImportSet);
+    const mergedImports = Array.from(mergedImportSet).sort();
     // 2) 타입 선언 병합 (중복 제거)
     const existingTypes = parseTypeDefinitions(existingBody);
     const newTypes = parseTypeDefinitions(newBody);
     // 새 타입 기준으로 병합: 새 버전이 source of truth (swagger 스키마)
     // 기존에만 있는 타입은 보존 (사용자가 수동 추가한 것)
     const mergedTypes = { ...existingTypes, ...newTypes };
-    const mergedTypesString = Object.values(mergedTypes).join('\n\n');
+    const mergedTypesString = Object.entries(mergedTypes)
+        .sort(([a], [b]) => a.localeCompare(b))
+        .map(([, v]) => v)
+        .join('\n\n');
     // 3) 기타 코드(타입/임포트 외)는 "새로운 내용"을 기준으로 유지
     const removeHeaderComment = (content) => {
         // 파일 상단의 모든 블록 코멘트와 라인 코멘트를 제거 (재귀적 처리)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toktokhan-dev/cli-plugin-gen-api-react-query",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A CLI plugin for generating API hooks with React Query built by TOKTOKHAN.DEV",
   "author": "TOKTOKHAN.DEV <fe-system@toktokhan.dev>",
   "license": "ISC",
@@ -38,8 +38,8 @@
     "lodash": "^4.17.21",
     "prettier-plugin-organize-imports": "^3.2.4",
     "swagger-typescript-api": "13.0.22",
-    "@toktokhan-dev/node": "0.0.10",
-    "@toktokhan-dev/cli": "0.0.11"
+    "@toktokhan-dev/cli": "0.0.11",
+    "@toktokhan-dev/node": "0.0.10"
   },
   "devDependencies": {
     "@types/lodash": "^4.17.0",

package/templates/custom-axios/data-contracts.eta

@@ -36,7 +36,7 @@
       return `${keyName} : "${enumNames?.[idx]}"`;
     }).join(", ");
 
-    return `type ${contract.name} = keyof typeof ${mapName};  export const ${mapName} = {\r\n${map} \r\n } as const`;
+    return `type ${contract.name} = keyof typeof ${mapName};  export const ${mapName} = {\n${map} \n } as const`;
 
     },
     interface: (contract) => {
@@ -49,7 +49,7 @@
         content = content.replace(field, `${field} | null`)
       })
 
-      return `interface ${contract.name} {\r\n${content}}`;
+      return `interface ${contract.name} {\n${content}}`;
     },
     type: (contract) => {
       return `type ${contract.name} = ${contract.content}`;
@@ -83,8 +83,7 @@
 <% if (description.length) { %>
 /**
 <%~ description.map(part => `* ${part}`).join("\n") %>
-
-*/
+ */
 <% } %>
 export <%~ (dataContractTemplates[contract.typeIdentifier] || dataContractTemplates.type)(contract) %>
 

package/templates/custom-fetch/data-contracts.eta

@@ -36,7 +36,7 @@
       return `${keyName} : "${enumNames?.[idx]}"`;
     }).join(", ");
 
-    return `type ${contract.name} = keyof typeof ${mapName};  export const ${mapName} = {\r\n${map} \r\n } as const`;
+    return `type ${contract.name} = keyof typeof ${mapName};  export const ${mapName} = {\n${map} \n } as const`;
 
     },
     interface: (contract) => {
@@ -49,7 +49,7 @@
         content = content.replace(field, `${field} | null`)
       })
 
-      return `interface ${contract.name} {\r\n${content}}`;
+      return `interface ${contract.name} {\n${content}}`;
     },
     type: (contract) => {
       return `type ${contract.name} = ${contract.content}`;
@@ -85,8 +85,7 @@
 <% if (description.length) { %>
 /**
 <%~ description.map(part => `* ${part}`).join("\n") %>
-
-*/
+ */
 <% } %>
 export <%~ (dataContractTemplates[contract.typeIdentifier] || dataContractTemplates.type)(contract) %>
 

package/templates/custom-fetch/http-client.eta

@@ -60,7 +60,7 @@ export enum ContentType {
 }
 
 export class HttpClient<SecurityDataType = unknown> {
-    public baseUrl: string = "<%~ apiConfig.baseUrl %>";
+    public baseUrl: string = "<%~ apiConfig.baseUrl.replace(/\/$/, '') %>";
     private securityData: SecurityDataType | null = null;
     private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
     private abortControllers = new Map<CancelToken, AbortController>();

package/templates/my/react-query-type.eta

@@ -44,7 +44,7 @@ export type InfiniteQueryHookParams<
 > = {
   options?: Partial<
     Omit<
-      UseInfiniteQueryOptions<OriginData, Error, TData, OriginData, any, TPageParam>,
+      UseInfiniteQueryOptions<OriginData, Error, TData, any, TPageParam>,
       'queryKey' | 'queryFn'
     >
   >;
@@ -85,7 +85,7 @@ export type SuspenseInfiniteQueryHookParams<
 > = {
   options?: Partial<
     Omit<
-      UseSuspenseInfiniteQueryOptions<OriginData, Error, TData, OriginData, any, TPageParam>,
+      UseSuspenseInfiniteQueryOptions<OriginData, Error, TData, any, TPageParam>,
       'queryKey' | 'queryFn'
     >
   >;