rpc4next 0.1.6 → 0.1.8

package/README.md

@@ -8,15 +8,12 @@ Inspired by Hono RPC and Pathpida, **rpc4next** automatically generates a type-s
 
 ## ✨ Features
 
-- ✅ 既存の `app/**/route.ts` および `app/**/page.tsx` を活用するため、新たなハンドラファイルの作成は不要
 - ✅ ルート、パラメータ、クエリパラメータ、 リクエストボディ、レスポンスの型安全なクライアント生成
+- ✅ 既存の `app/**/route.ts` および `app/**/page.tsx` を活用するため、新たなハンドラファイルの作成は不要
 - ✅ 最小限のセットアップで、カスタムサーバー不要
 - ✅ 動的ルート（`[id]`、`[...slug]` など）に対応
 - ✅ CLI による自動クライアント用型定義生成
 
-> **注意**  
-> RPCとしてresponseの戻り値の推論が機能するのは、対象となる `route.ts` の HTTPメソッドハンドラ内で`NextResponse.json()` をしている物のみになります。
-
 ---
 
 ## 🚀 Getting Started
@@ -54,7 +51,7 @@ export async function GET(
 
 🚩 Query or OptionalQuery 型を export することで、searchParams の型も自動的にクライアントに反映されます。
 
-- **RPCとしてresponseの戻り値の推論が機能するのは、対象となる `route.ts` の HTTPメソッドハンドラ内で`NextResponse.json()` をしている物のみになります**
+- **RPCとしてresponseの戻り値の推論が機能するのは、対象となる `route.ts` の HTTPメソッドハンドラ内で`NextResponse.json()` をしている関数のみになります**
 
 ---
 
@@ -85,8 +82,6 @@ npx rpc4next <baseDir> <outputPath>
   npx rpc4next <baseDir> <outputPath> --generate-params-types <paramsFileName>
   ```
 
-  ※ このオプションを指定する際は、必ずファイル名をセットしてください。ファイル名が指定されない場合、エラーが発生します。
-
 ---
 
 ### 4. Create Your RPC Client
@@ -152,10 +147,7 @@ const createRouteHandler = routeHandlerFactory((err, rc) =>
   rc.text("error", { status: 400 })
 );
 
-const { POST } = createRouteHandler().post(
-  async (rc) => rc.json("json response"),
-  async (rc) => rc.text("plain text")
-);
+const { POST } = createRouteHandler().post(async (rc) => rc.text("plain text"));
 ```
 
 これだけで、POST リクエストの返り値が、responseの内容(json,textなど)、status,contenttypeが型付けされるようになります。

package/dist/cli/cli-handler.d.ts

@@ -1,2 +1,2 @@
-import { CliOptions, Logger } from "./types";
-export declare const handleCli: (baseDir: string, outputPath: string, options: CliOptions, logger: Logger) => number;
+import type { CliOptions, ExitCode, Logger } from "./types";
+export declare const handleCli: (baseDir: string, outputPath: string, options: CliOptions, logger: Logger) => ExitCode;

package/dist/cli/cli-handler.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleCli = void 0;
 const path_1 = __importDefault(require("path"));
+const constants_1 = require("./constants");
 const generator_1 = require("./generator");
 const watcher_1 = require("./watcher");
 const handleCli = (baseDir, outputPath, options, logger) => {
@@ -13,14 +14,14 @@ const handleCli = (baseDir, outputPath, options, logger) => {
     const paramsFileName = typeof options.paramsFile === "string" ? options.paramsFile : null;
     if (options.paramsFile !== undefined && !paramsFileName) {
         logger.error("Error: --params-file requires a filename.");
-        return 1;
+        return constants_1.EXIT_FAILURE;
     }
     if (options.watch) {
         (0, watcher_1.setupWatcher)(resolvedBaseDir, () => {
             (0, generator_1.generate)({
                 baseDir: resolvedBaseDir,
                 outputPath: resolvedOutputPath,
-                paramsFileName: options.paramsFile || null,
+                paramsFileName,
                 logger,
             });
         }, logger);
@@ -29,10 +30,10 @@ const handleCli = (baseDir, outputPath, options, logger) => {
         (0, generator_1.generate)({
             baseDir: resolvedBaseDir,
             outputPath: resolvedOutputPath,
-            paramsFileName: options.paramsFile || null,
+            paramsFileName,
             logger,
         });
     }
-    return 0;
+    return constants_1.EXIT_SUCCESS;
 };
 exports.handleCli = handleCli;

package/dist/cli/constants.d.ts

@@ -0,0 +1,7 @@
+import { ErrorExitCode, SuccessExitCode } from "./types";
+export declare const END_POINT_FILE_NAMES: readonly ["page.tsx", "route.ts"];
+export declare const EXIT_SUCCESS: SuccessExitCode;
+export declare const EXIT_FAILURE: ErrorExitCode;
+export declare const SUCCESS_INDENT_LEVEL = 1;
+export declare const SUCCESS_PAD_LENGTH = 20;
+export declare const SUCCESS_SEPARATOR = "\u2192";

package/dist/cli/constants.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SUCCESS_SEPARATOR = exports.SUCCESS_PAD_LENGTH = exports.SUCCESS_INDENT_LEVEL = exports.EXIT_FAILURE = exports.EXIT_SUCCESS = exports.END_POINT_FILE_NAMES = void 0;
+exports.END_POINT_FILE_NAMES = ["page.tsx", "route.ts"];
+exports.EXIT_SUCCESS = 0;
+exports.EXIT_FAILURE = 1;
+exports.SUCCESS_INDENT_LEVEL = 1;
+exports.SUCCESS_PAD_LENGTH = 20;
+exports.SUCCESS_SEPARATOR = "→";

package/dist/cli/core/cache.d.ts

@@ -7,7 +7,7 @@ export declare const scanAppDirCache: Map<string, {
     }[];
     paramsTypes: {
         paramsType: string;
-        path: string;
+        dirPath: string;
     }[];
 }>;
 export declare const clearVisitedDirsCacheAbove: (targetPath: string) => void;

package/dist/cli/core/constants.d.ts

@@ -1,4 +1,3 @@
-export declare const END_POINT_FILE_NAMES: readonly ["page.tsx", "route.ts"];
 export declare const QUERY_TYPES: readonly ["Query", "OptionalQuery"];
 export declare const INDENT = "  ";
 export declare const NEWLINE = "\n";

package/dist/cli/core/constants.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RPC4NEXT_CLIENT_IMPORT_PATH = exports.TYPE_KEYS = exports.TYPE_KEY_PARAMS = exports.TYPE_KEY_OPTIONAL_QUERY = exports.TYPE_KEY_QUERY = exports.TYPE_END_POINT = exports.TYPE_SEPARATOR = exports.STATEMENT_TERMINATOR = exports.NEWLINE = exports.INDENT = exports.QUERY_TYPES = exports.END_POINT_FILE_NAMES = void 0;
-exports.END_POINT_FILE_NAMES = ["page.tsx", "route.ts"];
+exports.RPC4NEXT_CLIENT_IMPORT_PATH = exports.TYPE_KEYS = exports.TYPE_KEY_PARAMS = exports.TYPE_KEY_OPTIONAL_QUERY = exports.TYPE_KEY_QUERY = exports.TYPE_END_POINT = exports.TYPE_SEPARATOR = exports.STATEMENT_TERMINATOR = exports.NEWLINE = exports.INDENT = exports.QUERY_TYPES = void 0;
 exports.QUERY_TYPES = ["Query", "OptionalQuery"];
 exports.INDENT = "  ";
 exports.NEWLINE = "\n";

package/dist/cli/core/generate-path-structure.js

@@ -1,11 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePages = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const constants_1 = require("./constants");
 const route_scanner_1 = require("./route-scanner");
 const type_utils_1 = require("./type-utils");
@@ -20,9 +15,7 @@ const generatePages = (outputPath, baseDir) => {
         : "";
     const keyTypes = constants_1.TYPE_KEYS.filter((type) => pathStructure.includes(type));
     const keyTypesImportStr = (0, type_utils_1.createImport)(keyTypes.join(" ,"), constants_1.RPC4NEXT_CLIENT_IMPORT_PATH);
-    const dirParamsTypes = paramsTypes.map(({ paramsType, path: filePath }) => {
-        const stats = fs_1.default.statSync(filePath);
-        const dirPath = stats.isFile() ? path_1.default.dirname(filePath) : filePath;
+    const dirParamsTypes = paramsTypes.map(({ paramsType, dirPath }) => {
         const params = `export type Params = ${paramsType}${constants_1.STATEMENT_TERMINATOR}`;
         return {
             paramsType: params,

package/dist/cli/core/route-scanner.d.ts

@@ -2,6 +2,14 @@
  * Inspired by pathpida (https://github.com/aspida/pathpida),
  * especially the design and UX of its CLI.
  */
+type ImportObj = {
+    statement: string;
+    path: string;
+};
+type ParamsType = {
+    paramsType: string;
+    dirPath: string;
+};
 export declare const hasTargetFiles: (dirPath: string) => boolean;
 export declare const scanAppDir: (output: string, input: string, indent?: string, parentParams?: {
     paramName: string;
@@ -14,12 +22,7 @@ export declare const scanAppDir: (output: string, input: string, indent?: string
     };
 }[]) => {
     pathStructure: string;
-    imports: {
-        statement: string;
-        path: string;
-    }[];
-    paramsTypes: {
-        paramsType: string;
-        path: string;
-    }[];
+    imports: ImportObj[];
+    paramsTypes: ParamsType[];
 };
+export {};

package/dist/cli/core/route-scanner.js

@@ -15,9 +15,9 @@ const constants_1 = require("./constants");
 const scan_utils_1 = require("./scan-utils");
 const type_utils_1 = require("./type-utils");
 const constants_2 = require("../../lib/constants");
-const endPointFileNames = new Set(constants_1.END_POINT_FILE_NAMES);
+const constants_3 = require("../constants");
+const endPointFileNames = new Set(constants_3.END_POINT_FILE_NAMES);
 const hasTargetFiles = (dirPath) => {
-    // Return cached result if available
     if (cache_1.visitedDirsCache.has(dirPath))
         return cache_1.visitedDirsCache.get(dirPath);
     const entries = fs_1.default.readdirSync(dirPath, { withFileTypes: true });
@@ -25,7 +25,7 @@ const hasTargetFiles = (dirPath) => {
         const { name } = entry;
         const entryPath = path_1.default.join(dirPath, name);
         if (name === "node_modules" ||
-            // privete
+            // private
             name.startsWith("_") ||
             // intercepts
             name.startsWith("(.)") ||
@@ -38,137 +38,154 @@ const hasTargetFiles = (dirPath) => {
             cache_1.visitedDirsCache.set(dirPath, true);
             return true;
         }
-        if (entry.isDirectory()) {
-            if ((0, exports.hasTargetFiles)(entryPath)) {
-                cache_1.visitedDirsCache.set(dirPath, true);
-                return true;
-            }
+        if (entry.isDirectory() && (0, exports.hasTargetFiles)(entryPath)) {
+            cache_1.visitedDirsCache.set(dirPath, true);
+            return true;
         }
     }
     cache_1.visitedDirsCache.set(dirPath, false);
     return false;
 };
 exports.hasTargetFiles = hasTargetFiles;
+const extractParamInfo = (entryName, { isDynamic, isCatchAll, isOptionalCatchAll, }) => {
+    let param = entryName;
+    // Remove brackets if it's a dynamic segment
+    if (isDynamic) {
+        param = param.replace(/^\[+|\]+$/g, "");
+    }
+    // Remove leading "..." if it's a catch-all segment
+    if (isCatchAll || isOptionalCatchAll) {
+        param = param.replace(/^\.{3}/, "");
+    }
+    const prefix = isOptionalCatchAll
+        ? constants_2.OPTIONAL_CATCH_ALL_PREFIX
+        : isCatchAll
+            ? constants_2.CATCH_ALL_PREFIX
+            : isDynamic
+                ? constants_2.DYNAMIC_PREFIX
+                : "";
+    return { paramName: param, keyName: `${prefix}${param}` };
+};
 const scanAppDir = (output, input, indent = "", parentParams = []) => {
-    if (cache_1.scanAppDirCache.has(input)) {
+    if (cache_1.scanAppDirCache.has(input))
         return cache_1.scanAppDirCache.get(input);
-    }
-    indent += constants_1.INDENT;
+    const previousIndent = indent;
+    const currentIndent = indent + constants_1.INDENT;
     const pathStructures = [];
     const imports = [];
-    const types = [];
-    const params = [...parentParams];
+    const typeFragments = [];
     const paramsTypes = [];
+    const params = [...parentParams];
+    // Get entries under the directory (only target files or directories) and sort them
     const entries = fs_1.default
         .readdirSync(input, { withFileTypes: true })
         .filter((entry) => {
-        const { name } = entry;
         if (entry.isDirectory()) {
-            const dirPath = path_1.default.join(input, name);
+            const dirPath = path_1.default.join(input, entry.name);
             return (0, exports.hasTargetFiles)(dirPath);
         }
         return endPointFileNames.has(entry.name);
     })
         .sort();
-    entries.forEach((entry) => {
-        const fullPath = path_1.default.join(input, entry.name);
-        const nameWithoutExt = entry.isFile()
-            ? entry.name.replace(/\.[^/.]+$/, "")
-            : entry.name;
+    for (const entry of entries) {
+        const fullPath = path_1.default.join(input, entry.name).replace(/\\/g, "/");
         if (entry.isDirectory()) {
-            const isGroup = nameWithoutExt.startsWith("(") && nameWithoutExt.endsWith(")");
-            const isParallel = nameWithoutExt.startsWith("@");
-            const isOptionalCatchAll = nameWithoutExt.startsWith("[[...") && nameWithoutExt.endsWith("]]");
-            const isCatchAll = nameWithoutExt.startsWith("[...") && nameWithoutExt.endsWith("]");
-            const isDynamic = nameWithoutExt.startsWith("[") && nameWithoutExt.endsWith("]");
-            const { paramName, keyName } = (() => {
-                let param = nameWithoutExt;
-                // Remove []
-                if (isDynamic) {
-                    param = param.replace(/^\[+|\]+$/g, "");
-                }
-                // Remove ...
-                if (isCatchAll || isOptionalCatchAll) {
-                    param = param.replace(/^\.{3}/, "");
-                }
-                const prefix = isOptionalCatchAll
-                    ? constants_2.OPTIONAL_CATCH_ALL_PREFIX
-                    : isCatchAll
-                        ? constants_2.CATCH_ALL_PREFIX
-                        : isDynamic
-                            ? constants_2.DYNAMIC_PREFIX
-                            : "";
-                return { paramName: param, keyName: `${prefix}${param}` };
-            })();
-            let nextParams = params;
-            if (isDynamic || isCatchAll || isOptionalCatchAll) {
-                const routeType = {
-                    isGroup,
-                    isParallel,
-                    isOptionalCatchAll,
-                    isCatchAll,
-                    isDynamic,
-                };
-                nextParams = [...params, { paramName, routeType }];
-            }
+            const entryName = entry.name;
+            const isGroup = entryName.startsWith("(") && entryName.endsWith(")");
+            const isParallel = entryName.startsWith("@");
+            const isOptionalCatchAll = entryName.startsWith("[[...") && entryName.endsWith("]]");
+            const isCatchAll = entryName.startsWith("[...") && entryName.endsWith("]");
+            const isDynamic = entryName.startsWith("[") && entryName.endsWith("]");
+            const { paramName, keyName } = extractParamInfo(entryName, {
+                isDynamic,
+                isCatchAll,
+                isOptionalCatchAll,
+            });
+            // If it's a dynamic segment, inherit the parameters
+            const nextParams = isDynamic || isCatchAll || isOptionalCatchAll
+                ? [
+                    ...params,
+                    {
+                        paramName,
+                        routeType: {
+                            isDynamic,
+                            isCatchAll,
+                            isOptionalCatchAll,
+                            isGroup,
+                            isParallel,
+                        },
+                    },
+                ]
+                : params;
             const isSkipDir = isGroup || isParallel;
-            const { pathStructure: childPathStructure, imports: childImports, paramsTypes: childParamsTypes, } = (0, exports.scanAppDir)(output, fullPath, isSkipDir ? indent.replace(constants_1.INDENT, "") : indent, nextParams);
+            const { pathStructure: childPathStructure, imports: childImports, paramsTypes: childParamsTypes, } = (0, exports.scanAppDir)(output, fullPath, isSkipDir ? previousIndent : currentIndent, nextParams);
             imports.push(...childImports);
             paramsTypes.push(...childParamsTypes);
             if (isSkipDir) {
-                // Extract the contents inside {}
+                // Extract only the inner part inside `{}` from the child output
                 const match = childPathStructure.match(/^\s*\{([\s\S]*)\}\s*$/);
-                const childStr = match ? match[1].trim() : null;
-                if (childStr) {
-                    pathStructures.push(`${indent}${childStr}`);
+                const childContent = match ? match[1].trim() : "";
+                if (childContent) {
+                    pathStructures.push(`${currentIndent}${childContent}`);
                 }
             }
             else {
-                pathStructures.push(`${indent}"${keyName}": ${childPathStructure}`);
+                pathStructures.push(`${currentIndent}"${keyName}": ${childPathStructure}`);
             }
         }
         else {
+            // Process endpoint file
             const queryDef = (0, scan_utils_1.scanQuery)(output, fullPath);
             if (queryDef) {
-                const { importStatement: statement, importPath: path, type } = queryDef;
-                imports.push({ statement, path });
-                types.push(type);
+                const { importStatement, importPath, type } = queryDef;
+                imports.push({ statement: importStatement, path: importPath });
+                typeFragments.push(type);
             }
+            // Process routes for each HTTP method (excluding OPTIONS)
             constants_2.HTTP_METHODS_EXCLUDE_OPTIONS.forEach((method) => {
                 const routeDef = (0, scan_utils_1.scanRoute)(output, fullPath, method);
                 if (routeDef) {
-                    const { importStatement: statement, importPath: path, type, } = routeDef;
-                    imports.push({ statement, path });
-                    types.push(type);
+                    const { importStatement, importPath, type } = routeDef;
+                    imports.push({ statement: importStatement, path: importPath });
+                    typeFragments.push(type);
                 }
             });
-            types.push(constants_1.TYPE_END_POINT);
+            // Add endpoint type
+            typeFragments.push(constants_1.TYPE_END_POINT);
+            // If parameters exist, generate their type definition
             if (params.length > 0) {
-                const fields = params.map((param) => {
-                    const { paramName, routeType } = param;
-                    const { isCatchAll, isOptionalCatchAll } = routeType;
-                    const paramType = isCatchAll
+                const fields = params.map(({ paramName, routeType }) => {
+                    const paramType = routeType.isCatchAll
                         ? "string[]"
-                        : isOptionalCatchAll
+                        : routeType.isOptionalCatchAll
                             ? "string[] | undefined"
                             : "string";
                     return { name: paramName, type: paramType };
                 });
-                const paramsType = (0, type_utils_1.createObjectType)(fields);
-                paramsTypes.push({ paramsType, path: fullPath.replace(/\\/g, "/") });
-                types.push((0, type_utils_1.createRecodeType)(constants_1.TYPE_KEY_PARAMS, paramsType));
+                const paramsTypeStr = (0, type_utils_1.createObjectType)(fields);
+                paramsTypes.push({
+                    paramsType: paramsTypeStr,
+                    dirPath: path_1.default.dirname(fullPath),
+                });
+                typeFragments.push((0, type_utils_1.createRecodeType)(constants_1.TYPE_KEY_PARAMS, paramsTypeStr));
             }
         }
-    });
-    const typeString = types.join(" & ");
-    const pathStructure = pathStructures.length > 0
-        ? `${typeString}${typeString ? " & " : ""}{${constants_1.NEWLINE}${pathStructures.join(`,${constants_1.NEWLINE}`)}${constants_1.NEWLINE}${indent.replace(constants_1.INDENT, "")}}`
-        : typeString;
+    }
+    // Combine all type definitions
+    const typeString = typeFragments.join(" & ");
+    // Construct the nested path structure
+    const pathStructureBody = pathStructures.length > 0
+        ? `{${constants_1.NEWLINE}${pathStructures.join(`,${constants_1.NEWLINE}`)}${constants_1.NEWLINE}${previousIndent}}`
+        : "";
+    const pathStructure = typeString && pathStructureBody
+        ? `${typeString} & ${pathStructureBody}`
+        : typeString || pathStructureBody;
     const result = {
         pathStructure,
         imports,
         paramsTypes,
     };
+    // Cache the result for reuse
     cache_1.scanAppDirCache.set(input, result);
     return result;
 };

package/dist/cli/core/scan-utils.js

@@ -24,7 +24,7 @@ const scanFile = (outputFile, inputFile, findCallBack, typeCallBack) => {
     };
 };
 exports.scanFile = scanFile;
-// query定義作成
+// Create query definitions
 const scanQuery = (outputFile, inputFile) => {
     return (0, exports.scanFile)(outputFile, inputFile, (fileContents) => {
         return constants_1.QUERY_TYPES.find((type) => new RegExp(`export (interface ${type} ?{|type ${type} ?=)`).test(fileContents));
@@ -33,7 +33,7 @@ const scanQuery = (outputFile, inputFile) => {
         : (0, type_utils_1.createRecodeType)(constants_1.TYPE_KEY_OPTIONAL_QUERY, importAlias));
 };
 exports.scanQuery = scanQuery;
-// route定義作成
+// Create route definitions
 const scanRoute = (outputFile, inputFile, httpMethod) => {
     return (0, exports.scanFile)(outputFile, inputFile, (fileContents) => {
         return [httpMethod].find((method) => new RegExp(`export (async )?(function ${method} ?\\(|const ${method} ?=|\\{[^}]*\\b${method}\\b[^}]*\\} ?=|const \\{[^}]*\\b${method}\\b[^}]*\\} ?=|\\{[^}]*\\b${method}\\b[^}]*\\} from)`).test(fileContents));

package/dist/cli/generator.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from "./types";
+import type { Logger } from "./types";
 export declare const generate: ({ baseDir, outputPath, paramsFileName, logger, }: {
     baseDir: string;
     outputPath: string;

package/dist/cli/generator.js

@@ -5,18 +5,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const constants_1 = require("./constants");
 const generate_path_structure_1 = require("./core/generate-path-structure");
+const logger_1 = require("./logger");
 const generate = ({ baseDir, outputPath, paramsFileName, logger, }) => {
-    logger.info("Generating...");
+    logger.info("Types regenerated due to file change", { event: "generate" });
     const { pathStructure, paramsTypes } = (0, generate_path_structure_1.generatePages)(outputPath, baseDir);
     fs_1.default.writeFileSync(outputPath, pathStructure);
-    logger.success(`Generated types at ${outputPath}`);
+    logger.success((0, logger_1.padMessage)("Path structure type", path_1.default.relative(process.cwd(), outputPath), constants_1.SUCCESS_SEPARATOR, constants_1.SUCCESS_PAD_LENGTH), { indentLevel: constants_1.SUCCESS_INDENT_LEVEL });
     if (paramsFileName) {
         paramsTypes.forEach(({ paramsType, dirPath }) => {
-            const filePath = `${dirPath}/${paramsFileName}`;
+            const filePath = path_1.default.join(dirPath, paramsFileName);
             fs_1.default.writeFileSync(filePath, paramsType);
         });
-        logger.success(`Generated params type at ${paramsFileName}`);
+        logger.success((0, logger_1.padMessage)("Params types", paramsFileName, constants_1.SUCCESS_SEPARATOR, constants_1.SUCCESS_PAD_LENGTH), {
+            indentLevel: constants_1.SUCCESS_INDENT_LEVEL,
+        });
     }
 };
 exports.generate = generate;

package/dist/cli/logger.d.ts

@@ -1,2 +1,3 @@
-import { Logger } from "./types";
+import type { Logger } from "./types";
+export declare const padMessage: (label: string, value: string, separator?: string, targetLength?: number) => string;
 export declare const createLogger: () => Logger;

package/dist/cli/logger.js

@@ -1,11 +1,31 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogger = void 0;
+exports.createLogger = exports.padMessage = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const constants_1 = require("./core/constants");
+const padMessage = (label, value, separator = "→", targetLength = 24) => {
+    return label.padEnd(targetLength) + ` ${separator} ${value}`;
+};
+exports.padMessage = padMessage;
+const createIndent = (level = 0) => constants_1.INDENT.repeat(level);
 const createLogger = () => {
     return {
-        info: (msg) => console.log(msg),
-        success: (msg) => console.log(msg),
-        error: (msg) => console.error(msg),
+        info: (msg, options = {}) => {
+            const { indentLevel = 0, event } = options;
+            const prefix = event ? `${chalk_1.default.cyan(`[${event}]`)} ` : "";
+            console.log(`${createIndent(indentLevel)}${prefix}${msg}`);
+        },
+        success: (msg, options = {}) => {
+            const { indentLevel = 0 } = options;
+            console.log(`${createIndent(indentLevel)}${chalk_1.default.green("✓")} ${msg}`);
+        },
+        error: (msg, options = {}) => {
+            const { indentLevel = 0 } = options;
+            console.error(`${createIndent(indentLevel)}${chalk_1.default.red("✗")} ${chalk_1.default.red(msg)}`);
+        },
     };
 };
 exports.createLogger = createLogger;

package/dist/cli/types.d.ts

@@ -1,9 +1,21 @@
-export interface Logger {
-    info: (msg: string) => void;
-    success: (msg: string) => void;
-    error: (msg: string) => void;
-}
+import type { END_POINT_FILE_NAMES } from "./constants";
+export type EndPointFileNames = (typeof END_POINT_FILE_NAMES)[number];
 export interface CliOptions {
     watch?: boolean;
     paramsFile?: string;
 }
+type LogOptions = {
+    indentLevel?: number;
+    event?: string;
+};
+export interface Logger {
+    info: (msg: string, options?: LogOptions) => void;
+    success: (msg: string, options?: Pick<LogOptions, "indentLevel">) => void;
+    error: (msg: string, options?: Pick<LogOptions, "indentLevel">) => void;
+}
+type BuildRange<N extends number, Result extends number[] = []> = Result["length"] extends N ? Result : BuildRange<N, [...Result, Result["length"]]>;
+type NumericRange<F extends number, T extends number> = Exclude<BuildRange<T>, BuildRange<F>> | F;
+export type SuccessExitCode = 0;
+export type ErrorExitCode = NumericRange<1, 256>;
+export type ExitCode = SuccessExitCode | ErrorExitCode;
+export {};

package/dist/cli/watcher.d.ts

@@ -1,2 +1,2 @@
-import { Logger } from "./types";
+import type { Logger } from "./types";
 export declare const setupWatcher: (baseDir: string, onGenerate: () => void, logger: Logger) => void;

package/dist/cli/watcher.js

@@ -4,12 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupWatcher = void 0;
+const path_1 = __importDefault(require("path"));
 const chokidar_1 = __importDefault(require("chokidar"));
+const constants_1 = require("./constants");
 const cache_1 = require("./core/cache");
 const debounce_1 = require("./debounce");
 const setupWatcher = (baseDir, onGenerate, logger) => {
-    logger.info(`Watching ${baseDir}...`);
-    const isTargetFiles = (path) => path.endsWith("route.ts") || path.endsWith("page.tsx");
+    logger.info(`${path_1.default.relative(process.cwd(), baseDir)}`, {
+        event: "watch",
+    });
+    const isTargetFiles = (path) => constants_1.END_POINT_FILE_NAMES.some((fileName) => path.endsWith(fileName));
     const changedPaths = new Set();
     // Once the debounced function starts executing, no new watcher events will be processed until it completes.
     // This is due to JavaScript's single-threaded event loop: the current debounced function runs to completion,
@@ -30,10 +34,11 @@ const setupWatcher = (baseDir, onGenerate, logger) => {
     watcher.on("ready", () => {
         // First execution
         debouncedGenerate();
-        watcher.on("all", (event, path) => {
-            if (isTargetFiles(path)) {
-                logger.info(`[${event}] ${path}`);
-                changedPaths.add(path);
+        watcher.on("all", (event, filePath) => {
+            if (isTargetFiles(filePath)) {
+                const relativePath = path_1.default.relative(process.cwd(), filePath);
+                logger.info(relativePath, { event });
+                changedPaths.add(filePath);
                 debouncedGenerate();
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rpc4next",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Inspired by Hono RPC and Pathpida, rpc4next brings a lightweight and intuitive RPC solution to Next.js, making server-client communication seamless",
   "author": "watanabe-1",
   "license": "MIT",

package/dist/cli/core/types.d.ts

@@ -1,2 +0,0 @@
-import type { END_POINT_FILE_NAMES } from "./constants";
-export type EndPointFileNames = (typeof END_POINT_FILE_NAMES)[number];

package/dist/cli/core/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });