esa-cli 1.0.3 → 1.0.4-beta.0

package/dist/commands/commit/index.js

@@ -13,6 +13,7 @@ import chalk from 'chalk';
 import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import promptParameter from '../../utils/prompt.js';
+import { checkAndCleanupVersions } from '../utils.js';
 import { validateAndInitializeProject, generateCodeVersion } from '../common/utils.js';
 const commit = {
     command: 'commit [entry]',
@@ -44,6 +45,10 @@ const commit = {
             describe: 'Bundle with esbuild (use --no-bundle to skip)',
             type: 'boolean',
             default: true
+        })
+            .option('version-limit', {
+            describe: t('commit_option_version_limit').d('Maximum number of versions to keep. Oldest unreleased versions will be deleted if exceeded.'),
+            type: 'number'
         });
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
@@ -59,7 +64,12 @@ export function handleCommit(argv) {
         const projectInfo = yield validateAndInitializeProject(argv === null || argv === void 0 ? void 0 : argv.name);
         if (!projectInfo)
             return;
-        const { projectName } = projectInfo;
+        const { projectName, projectConfig } = projectInfo;
+        // Cleanup old versions if limit is specified
+        const limit = argv['version-limit'] || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.versionLimit);
+        if (limit) {
+            yield checkAndCleanupVersions(projectName, limit, true);
+        }
         let description;
         if (argv.description) {
             description = argv.description;

package/dist/commands/common/utils.js

@@ -15,7 +15,7 @@ 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 { checkIsLoginSuccess } from '../utils.js';
+import { checkAndCleanupVersions, checkIsLoginSuccess } from '../utils.js';
 function normalizeNotFoundStrategy(value) {
     if (!value)
         return undefined;
@@ -260,21 +260,26 @@ export function deployToEnvironments(name, codeVersion, env) {
  * 结合了压缩、提交和部署的完整流程
  */
 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, noBundle = false) {
+    return __awaiter(this, arguments, void 0, function* (projectName, scriptEntry, assets, description = '', projectPath, env = 'production', minify = false, version, noBundle = false, versionLimit) {
         var _a, _b, _c;
         const projectInfo = yield validateAndInitializeProject(projectName, projectPath);
         if (!projectInfo) {
             return false;
         }
-        const { projectConfig } = projectInfo;
+        const { projectConfig, projectName: resolvedProjectName } = projectInfo;
+        // Cleanup old versions if limit is specified
+        const limit = versionLimit || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.versionLimit);
+        if (limit) {
+            yield checkAndCleanupVersions(resolvedProjectName, limit, !version);
+        }
         // 2) Use existing version or generate a new one
         if (version) {
             logger.startSubStep(`Using existing version ${version}`);
-            const deployed = yield deployToEnvironments(projectInfo.projectName, version, env);
+            const deployed = yield deployToEnvironments(resolvedProjectName, version, env);
             logger.endSubStep(deployed ? 'Deploy finished' : 'Deploy failed');
             return deployed;
         }
-        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, noBundle);
+        const res = yield generateCodeVersion(resolvedProjectName, 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, noBundle);
         const isCommitSuccess = res === null || res === void 0 ? void 0 : res.isSuccess;
         if (!isCommitSuccess) {
             logger.endSubStep('Generate version failed');

package/dist/commands/deploy/index.js

@@ -61,6 +61,10 @@ const deploy = {
             .option('versions', {
             describe: 'Deploy two versions with percentages, format: v1:80,v2:20 or repeat --versions v1:80 --versions v2:20',
             type: 'array'
+        })
+            .option('version-limit', {
+            describe: t('deploy_option_version_limit').d('Maximum number of versions to keep. Oldest unreleased versions will be deleted if exceeded.'),
+            type: 'number'
         });
     },
     describe: `🚀 ${t('deploy_describe').d('Deploy your project')}`,
@@ -82,7 +86,7 @@ export function handleDeploy(argv) {
             outro(ok ? 'Deploy finished' : 'Deploy failed');
             exit(ok ? 0 : 1);
         }
-        const success = yield commitAndDeployVersion(argv.name || undefined, entry, assets, argv.description || '', getRoot(), argv.environment || 'all', argv.minify, argv.version, (argv.bundle === false));
+        const success = yield commitAndDeployVersion(argv.name || undefined, entry, assets, argv.description || '', getRoot(), argv.environment || 'all', argv.minify, argv.version, (argv.bundle === false), argv['version-limit']);
         outro(success ? 'Deploy finished' : 'Deploy failed');
         if (success) {
             const projectConfig = getProjectConfig(getRoot());

package/dist/commands/utils.js

@@ -153,3 +153,61 @@ export const getRoutineCodeVersions = (projectName) => __awaiter(void 0, void 0,
     const productionVersions = ((_m = (_l = (_k = (_j = (_h = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _h === void 0 ? void 0 : _h.Envs) === null || _j === void 0 ? void 0 : _j.find((item) => item.Env === 'production')) === null || _k === void 0 ? void 0 : _k.CodeDeploy) === null || _l === void 0 ? void 0 : _l.CodeVersions) === null || _m === void 0 ? void 0 : _m.map((item) => item.CodeVersion)) || [];
     return { allVersions, stagingVersions, productionVersions };
 });
+/**
+ * Check the total number of versions and delete the oldest unreleased ones if they exceed the limit.
+ * @param projectName Name of the project
+ * @param limit The maximum number of versions to keep
+ * @param isCreatingNewVersion Whether a new version will be created after cleanup
+ */
+export function checkAndCleanupVersions(projectName_1, limit_1) {
+    return __awaiter(this, arguments, void 0, function* (projectName, limit, isCreatingNewVersion = true) {
+        if (limit <= 0)
+            return;
+        const { allVersions, stagingVersions, productionVersions } = yield getRoutineCodeVersions(projectName);
+        const currentCount = allVersions.length;
+        const targetCount = isCreatingNewVersion ? limit - 1 : limit;
+        if (currentCount <= targetCount) {
+            return;
+        }
+        const deployedVersions = new Set([...stagingVersions, ...productionVersions]);
+        // Filter versions that are not currently deployed
+        const undeployedVersions = allVersions.filter((v) => v.codeVersion && !deployedVersions.has(v.codeVersion));
+        // Sort by createTime (oldest first)
+        undeployedVersions.sort((a, b) => {
+            const timeA = a.createTime ? new Date(a.createTime).getTime() : 0;
+            const timeB = b.createTime ? new Date(b.createTime).getTime() : 0;
+            return timeA - timeB;
+        });
+        const numToDelete = currentCount - targetCount;
+        const toDelete = undeployedVersions.slice(0, numToDelete);
+        if (toDelete.length > 0) {
+            logger.info(t('cleanup_versions_start', {
+                count: toDelete.length.toString(),
+                limit: limit.toString()
+            }).d(`Cleaning up ${toDelete.length} oldest unreleased versions (limit: ${limit})...`));
+            const server = yield ApiService.getInstance();
+            for (const version of toDelete) {
+                if (!version.codeVersion)
+                    continue;
+                try {
+                    const res = yield server.deleteRoutineCodeVersion({
+                        Name: projectName,
+                        CodeVersion: version.codeVersion
+                    });
+                    if ((res === null || res === void 0 ? void 0 : res.Status) === 'OK') {
+                        logger.success(t('deployments_delete_success').d('Delete success') +
+                            `: ${version.codeVersion}`);
+                    }
+                    else {
+                        logger.warn(t('deployments_delete_failed').d('Delete failed') +
+                            `: ${version.codeVersion}`);
+                    }
+                }
+                catch (error) {
+                    logger.warn(t('deployments_delete_failed').d('Delete failed') +
+                        `: ${version.codeVersion}`);
+                }
+            }
+        }
+    });
+}

package/dist/docs/Commands_en.md

@@ -143,6 +143,9 @@ Description for Functions & Pages/version (skip interactive input)
 **--name, -n** _optional_  
 Functions & Pages name
 
+**--version-limit** _optional_  
+Maximum number of versions to keep. Oldest unreleased versions (not in staging or production) will be deleted if exceeded.
+
 ---
 
 ## deploy
@@ -174,6 +177,9 @@ Description of the version
 **--minify, -m** _optional_  
 Whether to minify the code
 
+**--version-limit** _optional_  
+Maximum number of versions to keep. Oldest unreleased versions (not in staging or production) will be deleted if exceeded.
+
 ---
 
 ## deployments

package/dist/docs/Commands_zh_CN.md

@@ -155,6 +155,9 @@ esa-cli commit [<ENTRY>] [OPTIONS]
 **--name, -n** _可选_
 **函数和Pages名称**
 
+**--version-limit** _可选_
+**保持的最大版本数量。如果超过此限制，将删除最旧的未发布版本（不处于仿真环境或线上环境的版本）。**
+
 ---
 
 ## deploy
@@ -186,6 +189,9 @@ esa-cli deploy [<ENTRY>] [OPTIONS]
 **--minify, -m** _可选_
 **是否压缩代码**
 
+**--version-limit** _可选_
+**保持的最大版本数量。如果超过此限制，将删除最旧的未发布版本（不处于仿真环境或线上环境的版本）。**
+
 ---
 
 ## deployments

package/dist/i18n/locales.json

@@ -1322,5 +1322,17 @@
   "login_get_credentials_from_environment_variables": {
     "en": "Get credentials from environment variables",
     "zh_CN": ""
+  },
+  "commit_option_version_limit": {
+    "en": "Maximum number of versions to keep. Oldest unreleased versions will be deleted if exceeded.",
+    "zh_CN": "保留的最大版本数量。如果超过此限制，最旧的未发布版本将被删除。"
+  },
+  "deploy_option_version_limit": {
+    "en": "Maximum number of versions to keep. Oldest unreleased versions will be deleted if exceeded.",
+    "zh_CN": "保留的最大版本数量。如果超过此限制，最旧的未发布版本将被删除。"
+  },
+  "cleanup_versions_start": {
+    "en": "Cleaning up ${toDelete.length} oldest unreleased versions (limit: ${limit})...",
+    "zh_CN": "正在清理 ${count} 个最旧的未发布版本（限制数量：${limit}）..."
   }
 }

package/dist/libs/api.js

@@ -11,8 +11,8 @@ import ESA, * as $ESA from '@alicloud/esa20240910';
 import * as $OpenApi from '@alicloud/openapi-client';
 import * as $Util from '@alicloud/tea-util';
 import { getApiConfig } from '../utils/fileUtils/index.js';
-import logger from './logger.js';
 import { CLI_USER_AGENT } from './constants.js';
+import logger from './logger.js';
 class Client {
     constructor() {
         this.callApi = (action, request) => __awaiter(this, void 0, void 0, function* () {

package/dist/libs/apiService.js

@@ -12,8 +12,8 @@ import FormData from 'form-data';
 import fetch from 'node-fetch';
 import t from '../i18n/index.js';
 import { getApiConfig } from '../utils/fileUtils/index.js';
-import { Environment } from './interface.js';
 import { CLI_USER_AGENT } from './constants.js';
+import { Environment } from './interface.js';
 export class ApiService {
     constructor(cliConfig) {
         var _a, _b;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "1.0.3",
+  "version": "1.0.4-beta.0",
   "description": "A CLI for operating Alibaba Cloud ESA Functions and Pages.",
   "main": "bin/enter.cjs",
   "type": "module",