esa-cli 0.0.2-beta.16 → 0.0.2-beta.19

package/dist/commands/commit/index.js

@@ -8,12 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { exit } from 'process';
-import t from '../../i18n/index.js';
-import { validateAndInitializeProject, generateCodeVersion } from '../common/utils.js';
 import { intro, outro } from '@clack/prompts';
-import promptParameter from '../../utils/prompt.js';
-import logger from '../../libs/logger.js';
 import chalk from 'chalk';
+import t from '../../i18n/index.js';
+import logger from '../../libs/logger.js';
+import promptParameter from '../../utils/prompt.js';
+import { validateAndInitializeProject, generateCodeVersion } from '../common/utils.js';
 const commit = {
     command: 'commit [entry]',
     describe: `📥 ${t('commit_describe').d('Commit your code, save as a new version')}`,

package/dist/commands/common/utils.js

@@ -11,10 +11,10 @@ import chalk from 'chalk';
 import t from '../../i18n/index.js';
 import { ApiService } from '../../libs/apiService.js';
 import logger from '../../libs/logger.js';
+import { ensureRoutineExists } from '../../utils/checkIsRoutineCreated.js';
 import compress from '../../utils/compress.js';
 import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import sleep from '../../utils/sleep.js';
-import { ensureRoutineExists } from '../../utils/checkIsRoutineCreated.js';
 import { checkIsLoginSuccess } from '../utils.js';
 function normalizeNotFoundStrategy(value) {
     if (!value)
@@ -83,12 +83,15 @@ export function commitRoutineWithAssets(requestParams, zipBuffer) {
 export function validateAndInitializeProject(name, projectPath) {
     return __awaiter(this, void 0, void 0, function* () {
         const projectConfig = getProjectConfig(projectPath);
-        if (!projectConfig) {
+        // allow missing config, derive name from cwd when not provided
+        const projectName = name ||
+            (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) ||
+            process.cwd().split(/[\\/]/).pop();
+        if (!projectName) {
             logger.notInProject();
             return null;
         }
-        const projectName = name || projectConfig.name;
-        logger.startSubStep('Checking login status abc');
+        logger.startSubStep('Checking login status');
         const isSuccess = yield checkIsLoginSuccess();
         if (!isSuccess) {
             logger.endSubStep('You are not logged in');
@@ -96,7 +99,7 @@ export function validateAndInitializeProject(name, projectPath) {
         }
         logger.endSubStep('Logged in');
         yield ensureRoutineExists(projectName);
-        return { projectConfig, projectName };
+        return { projectConfig: projectConfig || null, projectName };
     });
 }
 /**
@@ -116,9 +119,104 @@ export function getRoutineDetails(projectName) {
 export function generateCodeVersion(projectName_1, description_1, entry_1, assets_1) {
     return __awaiter(this, arguments, void 0, function* (projectName, description, entry, assets, minify = false, projectPath) {
         var _a;
-        const zip = yield compress(entry, assets, minify, projectPath);
+        const { zip, sourceList, dynamicSources } = yield compress(entry, assets, minify, projectPath);
+        try {
+            // Pretty print upload directory tree
+            const buildTree = (paths, decorateTopLevel) => {
+                const root = { children: new Map(), isFile: false };
+                const sorted = [...paths].sort((a, b) => a.localeCompare(b));
+                for (const p of sorted) {
+                    const parts = p.split('/').filter(Boolean);
+                    let node = root;
+                    for (let i = 0; i < parts.length; i++) {
+                        const part = parts[i];
+                        if (!node.children.has(part)) {
+                            node.children.set(part, { children: new Map(), isFile: false });
+                        }
+                        const child = node.children.get(part);
+                        if (i === parts.length - 1)
+                            child.isFile = true;
+                        node = child;
+                    }
+                }
+                const lines = [];
+                const render = (node, prefix, depth) => {
+                    const entries = [...node.children.entries()];
+                    entries.forEach(([_name, _child], idx) => {
+                        const isLast = idx === entries.length - 1;
+                        const connector = isLast ? '└ ' : '├ ';
+                        const nextPrefix = prefix + (isLast ? '   ' : '│  ');
+                        const displayName = depth === 0 ? decorateTopLevel(_name) : _name;
+                        lines.push(prefix + connector + displayName);
+                        render(_child, nextPrefix, depth + 1);
+                    });
+                };
+                render(root, '', 0);
+                return lines.length ? lines : ['-'];
+            };
+            const header = chalk.hex('#22c55e')('UPLOAD') + ' Files to be uploaded (source paths)';
+            logger.block();
+            logger.log(header);
+            const dynamicSet = new Set(dynamicSources);
+            const LIMIT = 300;
+            const staticPaths = sourceList
+                .filter((p) => !dynamicSet.has(p))
+                .sort((a, b) => a.localeCompare(b));
+            const dynamicPaths = sourceList
+                .filter((p) => dynamicSet.has(p))
+                .sort((a, b) => a.localeCompare(b));
+            let omitted = 0;
+            let shownStatic = staticPaths;
+            if (staticPaths.length > LIMIT) {
+                shownStatic = staticPaths.slice(0, LIMIT);
+                omitted = staticPaths.length - LIMIT;
+            }
+            // Compute top-level markers based on whether a top-level bucket contains dynamic/static files
+            const topLevelStats = new Map();
+            const addStat = (p, isDynamic) => {
+                const top = p.split('/')[0] || p;
+                const stat = topLevelStats.get(top) || {
+                    hasDynamic: false,
+                    hasStatic: false
+                };
+                if (isDynamic)
+                    stat.hasDynamic = true;
+                else
+                    stat.hasStatic = true;
+                topLevelStats.set(top, stat);
+            };
+            dynamicPaths.forEach((p) => addStat(p, true));
+            shownStatic.forEach((p) => addStat(p, false));
+            const dynamicMarker = chalk.bold.yellowBright(' (dynamic)');
+            const staticMarker = chalk.bold.greenBright(' (static)');
+            const decorateTopLevel = (name) => {
+                const stat = topLevelStats.get(name);
+                if (!stat)
+                    return name;
+                if (stat.hasDynamic && stat.hasStatic) {
+                    return `${name}${dynamicMarker}${staticMarker}`;
+                }
+                if (stat.hasDynamic)
+                    return `${name}${dynamicMarker}`;
+                if (stat.hasStatic)
+                    return `${name}${staticMarker}`;
+                return name;
+            };
+            const combined = [...dynamicPaths, ...shownStatic];
+            const treeLines = buildTree(combined, decorateTopLevel);
+            for (const line of treeLines) {
+                logger.log(line);
+            }
+            if (omitted > 0) {
+                const note = chalk.gray(`仅展示前 ${LIMIT} 个静态文件，已省略 ${omitted} 个`);
+                logger.log(note);
+            }
+            logger.block();
+        }
+        catch (_b) { }
         const projectConfig = getProjectConfig(projectPath);
         const notFoundStrategy = normalizeNotFoundStrategy((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.notFoundStrategy);
+        logger.startSubStep('Generating code version');
         const requestParams = {
             Name: projectName,
             CodeDescription: description,
@@ -165,19 +263,18 @@ export function commitAndDeployVersion(projectName_1, scriptEntry_1, assets_1) {
     return __awaiter(this, arguments, void 0, function* (projectName, scriptEntry, assets, description = '', projectPath, env = 'production', minify = false, version) {
         var _a, _b, _c;
         const projectInfo = yield validateAndInitializeProject(projectName, projectPath);
-        if (!projectInfo || !projectInfo.projectConfig) {
+        if (!projectInfo) {
             return false;
         }
         const { projectConfig } = projectInfo;
         // 2) Use existing version or generate a new one
         if (version) {
             logger.startSubStep(`Using existing version ${version}`);
-            const deployed = yield deployToEnvironments(projectConfig.name, version, env);
+            const deployed = yield deployToEnvironments(projectInfo.projectName, version, env);
             logger.endSubStep(deployed ? 'Deploy finished' : 'Deploy failed');
             return deployed;
         }
-        logger.startSubStep('Generating code version');
-        const res = yield generateCodeVersion(projectConfig.name, description, scriptEntry || projectConfig.entry, assets || ((_a = projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory), minify || projectConfig.minify, projectPath);
+        const res = yield generateCodeVersion(projectInfo.projectName, description, scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry), assets || ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory), minify || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.minify), projectPath);
         const isCommitSuccess = res === null || res === void 0 ? void 0 : res.isSuccess;
         if (!isCommitSuccess) {
             logger.endSubStep('Generate version failed');
@@ -190,7 +287,7 @@ export function commitAndDeployVersion(projectName_1, scriptEntry_1, assets_1) {
         }
         logger.endSubStep(`Version generated: ${codeVersion}`);
         // 3) Deploy to specified environment(s)
-        const deployed = yield deployToEnvironments(projectConfig.name, codeVersion, env);
+        const deployed = yield deployToEnvironments(projectInfo.projectName, codeVersion, env);
         return deployed;
     });
 }

package/dist/commands/deploy/helper.js

@@ -10,21 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import chalk from 'chalk';
 import moment from 'moment';
 import SelectItems from '../../components/selectInput.js';
-import { yesNoPrompt } from '../../components/yesNoPrompt.js';
 import t from '../../i18n/index.js';
 import { PublishType } from '../../libs/interface.js';
 import logger from '../../libs/logger.js';
+import promptParameter from '../../utils/prompt.js';
 export function yesNoPromptAndExecute(message, execute) {
-    return new Promise((resolve) => {
-        yesNoPrompt((item) => __awaiter(this, void 0, void 0, function* () {
-            if (item.value === 'yes') {
-                const result = yield execute();
-                resolve(result);
-            }
-            else {
-                resolve(false);
-            }
-        }), message);
+    return __awaiter(this, void 0, void 0, function* () {
+        const confirmed = (yield promptParameter({
+            type: 'confirm',
+            question: message,
+            label: 'Confirm',
+            defaultValue: true
+        }));
+        if (!confirmed)
+            return false;
+        return yield execute();
     });
 }
 export function promptSelectVersion(versionList) {

package/dist/commands/deploy/index.js

@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { exit } from 'process';
+import { intro, outro } from '@clack/prompts';
 import t from '../../i18n/index.js';
 import { getRoot } from '../../utils/fileUtils/base.js';
-import { commitAndDeployVersion, displayDeploySuccess } from '../common/utils.js';
-import { intro, outro } from '@clack/prompts';
 import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { commitAndDeployVersion, displayDeploySuccess } from '../common/utils.js';
 const deploy = {
     command: 'deploy [entry]',
     builder: (yargs) => {
@@ -41,7 +41,7 @@ const deploy = {
             .option('assets', {
             alias: 'a',
             describe: t('deploy_option_assets').d('Deploy assets'),
-            type: 'boolean'
+            type: 'string'
         })
             .option('description', {
             alias: 'd',
@@ -52,11 +52,6 @@ const deploy = {
             alias: 'm',
             describe: t('deploy_option_minify').d('Minify the code'),
             type: 'boolean'
-        })
-            .option('minify', {
-            alias: 'm',
-            describe: t('deploy_option_minify').d('Minify the code'),
-            type: 'boolean'
         });
     },
     describe: `🚀 ${t('deploy_describe').d('Deploy your project')}`,
@@ -67,14 +62,18 @@ const deploy = {
 };
 export function handleDeploy(argv) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const entry = argv.entry;
-        const assets = argv.assets;
+        const assets = (_a = argv.assets) !== null && _a !== void 0 ? _a : undefined;
         intro(`Deploy an application with ESA`);
         const success = yield commitAndDeployVersion(argv.name || undefined, entry, assets, argv.description || '', getRoot(), argv.environment || 'all', argv.minify, argv.version);
         outro(success ? 'Deploy finished' : 'Deploy failed');
         if (success) {
             const projectConfig = getProjectConfig(getRoot());
-            yield displayDeploySuccess(argv.name || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) || '', true, true);
+            yield displayDeploySuccess(argv.name ||
+                (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) ||
+                getRoot().split(/[\\/]/).pop() ||
+                '', true, true);
         }
     });
 }

package/dist/commands/init/helper.js

@@ -9,19 +9,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { execSync } from 'child_process';
 import path from 'path';
+import { exit } from 'process';
 import { confirm as clackConfirm, isCancel, log, outro } from '@clack/prompts';
 import chalk from 'chalk';
 import fs from 'fs-extra';
+import Haikunator from 'haikunator';
 import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import Template from '../../libs/templates/index.js';
+import { execCommand } from '../../utils/command.js';
 import { getDirName } from '../../utils/fileUtils/base.js';
 import { generateConfigFile, getCliConfig, getProjectConfig, getTemplatesConfig, templateHubPath, updateProjectConfigFile } from '../../utils/fileUtils/index.js';
-import { execCommand } from '../../utils/command.js';
 import promptParameter from '../../utils/prompt.js';
-import Haikunator from 'haikunator';
 import { commitAndDeployVersion } from '../common/utils.js';
-import { exit } from 'process';
 export const getTemplateInstances = (templateHubPath) => {
     return fs
         .readdirSync(templateHubPath)
@@ -212,12 +212,14 @@ export function getInitParamsFromArgv(argv) {
         params.template = a.template;
         params.framework = undefined;
         params.language = undefined;
+        params.category = 'template';
     }
     else {
         const fw = a.framework;
         const lang = a.language;
         if (fw) {
             params.framework = fw;
+            params.category = 'framework';
         }
         if (lang) {
             params.language = lang;
@@ -550,6 +552,7 @@ export const updateConfigFile = (initParams) => __awaiter(void 0, void 0, void 0
     }
 });
 export const initGit = (initParams) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const frameworkConfig = getFrameworkConfig(initParams.framework || '');
     if ((frameworkConfig === null || frameworkConfig === void 0 ? void 0 : frameworkConfig.useGit) === false) {
         log.step('Git skipped');
@@ -581,13 +584,15 @@ export const initGit = (initParams) => __awaiter(void 0, void 0, void 0, functio
             outro(`Git initialization failed`);
             exit(1);
         }
+        // Ensure .gitignore exists and has sensible defaults
+        yield ensureGitignore(targetPath, (_a = frameworkConfig === null || frameworkConfig === void 0 ? void 0 : frameworkConfig.assets) === null || _a === void 0 ? void 0 : _a.directory);
     }
     return true;
 });
 export function getGitVersion() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const stdout = yield execCommand(['git', '--version'], {
+            let stdout = yield execCommand(['git', '--version'], {
                 useSpinner: false,
                 silent: true,
                 captureOutput: true
@@ -603,7 +608,87 @@ export function getGitVersion() {
 }
 export function isGitInstalled() {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield getGitVersion()) !== null;
+        return (yield getGitVersion()) !== '';
+    });
+}
+/**
+ * Create or update .gitignore in project root with sensible defaults.
+ * - Preserves existing entries and comments
+ * - Avoids duplicates
+ * - Adds framework assets directory if provided
+ */
+function ensureGitignore(projectRoot, assetsDirectory) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const gitignorePath = path.join(projectRoot, '.gitignore');
+            const defaults = [
+                '# Logs',
+                'logs',
+                '*.log',
+                'npm-debug.log*',
+                'yarn-debug.log*',
+                'yarn-error.log*',
+                'pnpm-debug.log*',
+                '',
+                '# Node modules',
+                'node_modules/',
+                '',
+                '# Build output',
+                'dist/',
+                'build/',
+                'out/',
+                '.next/',
+                '.nuxt/',
+                'coverage/',
+                '.vite/',
+                '',
+                '# Env files',
+                '.env',
+                '.env.local',
+                '.env.development.local',
+                '.env.test.local',
+                '.env.production.local',
+                '',
+                '# IDE/editor',
+                '.DS_Store',
+                '.idea/',
+                '.vscode/',
+                '',
+                '# Misc caches',
+                '.eslintcache',
+                '.parcel-cache/',
+                '.turbo/',
+                '.cache/'
+            ];
+            // Include assets directory if provided and not a common default
+            if (assetsDirectory &&
+                !['dist', 'build', 'out'].includes(assetsDirectory.replace(/\/$/, ''))) {
+                defaults.push('', '# Project assets output', `${assetsDirectory}/`);
+            }
+            let existingContent = '';
+            if (fs.existsSync(gitignorePath)) {
+                existingContent = fs.readFileSync(gitignorePath, 'utf-8');
+            }
+            const existingLines = new Set(existingContent.split(/\r?\n/).map((l) => l.trimEnd()));
+            const toAppend = [];
+            for (const line of defaults) {
+                if (!existingLines.has(line)) {
+                    toAppend.push(line);
+                    existingLines.add(line);
+                }
+            }
+            // If nothing to add, keep as is
+            if (!toAppend.length)
+                return;
+            const newContent = existingContent
+                ? `${existingContent.replace(/\n$/, '')}\n${toAppend.join('\n')}\n`
+                : `${toAppend.join('\n')}\n`;
+            fs.writeFileSync(gitignorePath, newContent, 'utf-8');
+            logger.log('Updated .gitignore');
+        }
+        catch (_a) {
+            // Do not fail init due to .gitignore issues
+        }
     });
 }
 export const buildProject = (initParams) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/commands/init/index.js

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { exit } from 'process';
 import { intro, outro } from '@clack/prompts';
+import chalk from 'chalk';
 import t from '../../i18n/index.js';
 import { promptParameter } from '../../utils/prompt.js';
-import { applyFileEdits, buildProject, checkAndUpdatePackage, configCategory, configLanguage, configProjectName, configTemplate, createProject, deployProject, getInitParamsFromArgv, initGit, installDependencies, installESACli, updateConfigFile } from './helper.js';
 import { displayDeploySuccess } from '../common/utils.js';
-import chalk from 'chalk';
+import { applyFileEdits, buildProject, checkAndUpdatePackage, configCategory, configLanguage, configProjectName, configTemplate, createProject, deployProject, getInitParamsFromArgv, initGit, installDependencies, installESACli, updateConfigFile } from './helper.js';
 const init = {
     command: 'init [name]',
     describe: `📥 ${t('init_describe').d('Initialize a routine with a template')}`,

package/dist/commands/init/template.jsonc

@@ -55,7 +55,7 @@
   "astro": {
     "label": "Astro",
     "useGit": false,
-    "command": "npm create-astro@4.13.1",
+    "command": "npm create astro@4.13.1",
     "params": "--no-install",
     "assets": {
       "directory": "./dist"

package/dist/commands/route/add.js

@@ -14,6 +14,7 @@ import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
 import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
+import { routeBuilder } from '../../components/routeBuilder.js';
 import { transferRouteToRuleString } from './helper.js';
 const addRoute = {
     command: 'add',
@@ -99,35 +100,18 @@ export function handlerAddRoute(argv) {
         let siteName = argv.site;
         let siteId;
         if (!siteName) {
-            if (argv._.length > 2) {
-                siteName = argv._[2];
-            }
-            // 如果仍未提供站点名称，则提示选择
-            if (!siteName) {
-                const response = yield inquirer.prompt([
-                    {
-                        type: 'list',
-                        name: 'routeSite',
-                        message: t('create_route_site').d('Select a site that is active in your account:'),
-                        choices: siteList
-                    }
-                ]);
-                siteId = response.routeSite;
-            }
-            else {
-                // 根据站点名称查找对应的站点ID
-                const matchedSite = siteList.find((site) => site.name === siteName);
-                if (matchedSite) {
-                    siteId = matchedSite.value;
-                }
-                else {
-                    logger.error(t('site_not_found').d(`Site "${siteName}" not found in your account`));
-                    return;
+            const response = yield inquirer.prompt([
+                {
+                    type: 'list',
+                    name: 'routeSite',
+                    message: t('create_route_site').d('Select a site that is active in your account:'),
+                    choices: siteList
                 }
-            }
+            ]);
+            siteId = response.routeSite;
         }
         else {
-            // 根据站点名称查找对应的站点ID
+            // Find corresponding site ID by site name
             const matchedSite = siteList.find((site) => site.name === siteName);
             if (matchedSite) {
                 siteId = matchedSite.value;
@@ -137,40 +121,24 @@ export function handlerAddRoute(argv) {
                 return;
             }
         }
-        // 获取路由值，支持直接通过参数传入
         let inputRoute = argv.route;
         if (!inputRoute) {
-            // 如果参数中提供了路由值，使用它
-            if (argv._.length > 1) {
-                inputRoute = argv._[1];
-            }
-            // 如果仍未提供路由值，则提示输入
-            if (!inputRoute) {
-                const response = yield inquirer.prompt([
-                    {
-                        type: 'input',
-                        name: 'inputRoute',
-                        message: t('create_route_route').d('Enter a Route (e.g., example.com/*):'),
-                        validate: (input) => {
-                            if (!input) {
-                                return t('route_input_required').d('Route is required');
-                            }
-                            if (!input.includes('*') && !input.includes('/')) {
-                                return t('route_format_invalid').d('Route format is invalid. Please include wildcard (*) or path (/)');
-                            }
-                            return true;
-                        }
-                    }
-                ]);
-                inputRoute = response.inputRoute;
+            // Get selected site name for route building
+            const selectedSite = siteList.find((site) => site.value === siteId);
+            const displaySiteName = selectedSite ? selectedSite.name : siteName;
+            // Use route builder
+            const builtRoute = yield routeBuilder(displaySiteName);
+            if (!builtRoute) {
+                logger.info(t('route_build_cancelled').d('Route building cancelled'));
+                return;
             }
+            inputRoute = builtRoute;
         }
         const rule = transferRouteToRuleString(inputRoute);
         if (!rule) {
             logger.error(t('route_format_invalid').d('Invalid route format'));
             return;
         }
-        // 获取站点名称用于显示
         const selectedSite = siteList.find((site) => site.value === siteId);
         const displaySiteName = selectedSite ? selectedSite.name : siteName;
         const req = {

package/dist/commands/routine/list.js

@@ -18,37 +18,55 @@ const list = {
     command: 'list',
     describe: `📋 ${t('list_describe').d('List all your routines')}`,
     builder: (yargs) => {
-        return yargs.usage(`${t('common_usage').d('Usage')}: \$0 list []`);
+        return yargs
+            .option('keyword', {
+            alias: 'k',
+            describe: t('deploy_option_keyword').d('Keyword to search for routines'),
+            type: 'string'
+        })
+            .usage(`${t('common_usage').d('Usage')}: \$0 list [--keyword <keyword>]`);
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
         handleList(argv);
     })
 };
 export default list;
+export function getAllRoutines(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const server = yield ApiService.getInstance();
+        const allRoutines = [];
+        let pageNumber = 1;
+        const pageSize = (options === null || options === void 0 ? void 0 : options.PageSize) || 50;
+        while (true) {
+            const res = yield server.listUserRoutines({
+                RegionId: options === null || options === void 0 ? void 0 : options.RegionId,
+                PageNumber: pageNumber,
+                PageSize: pageSize,
+                SearchKeyWord: options === null || options === void 0 ? void 0 : options.SearchKeyWord
+            });
+            if (!((_a = res === null || res === void 0 ? void 0 : res.body) === null || _a === void 0 ? void 0 : _a.Routines)) {
+                break;
+            }
+            allRoutines.push(...res.body.Routines);
+            const totalCount = res.body.TotalCount;
+            const currentCount = allRoutines.length;
+            if (currentCount >= totalCount) {
+                break;
+            }
+            pageNumber++;
+        }
+        return allRoutines;
+    });
+}
 export function handleList(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const { site } = argv;
         const isSuccess = yield checkIsLoginSuccess();
         if (!isSuccess)
             return;
-        const server = yield ApiService.getInstance();
-        if (site) {
-            const req = {
-                SiteSearchType: 'fuzzy',
-                Status: 'active',
-                PageNumber: 1,
-                PageSize: 50
-            };
-            const res = yield server.listSites(req);
-            const siteList = (_a = res === null || res === void 0 ? void 0 : res.data.Sites) !== null && _a !== void 0 ? _a : [];
-            const siteNameList = siteList === null || siteList === void 0 ? void 0 : siteList.map((item) => item.SiteName);
-            logger.log(chalk.bold.bgGray(`📃 ${t('list_site_name_title').d('List all of site names')}:`));
-            logger.tree(siteNameList);
-            return;
-        }
-        const res = yield server.listUserRoutines();
-        const routineList = (_b = res === null || res === void 0 ? void 0 : res.body) === null || _b === void 0 ? void 0 : _b.Routines;
+        const routineList = yield getAllRoutines({
+            SearchKeyWord: argv.keyword
+        });
         if (routineList) {
             logger.log(chalk.bold.bgGray(`📃 ${t('list_routine_name_title').d('List all of routine')}:`));
             displayRoutineList(routineList);