esa-cli 1.0.1 → 1.0.2-beta.0

package/README.md

@@ -3,10 +3,10 @@
 ESA CLI is a command-line tool for building with Alibaba Cloud ESA Functions and Pages.
 
 <p>
-  <a href="https://discord.gg/xygV6MYx">
+  <a href="https://discord.gg/BxcRVEeh">
     <img alt="Discord CN" src="https://img.shields.io/badge/Discord-中文-5865F2?logo=discord&logoColor=white" />
   </a>
-  <a href="https://discord.gg/YeFg4yUA" style="margin-left:8px;">
+  <a href="https://discord.gg/SHYe5926" style="margin-left:8px;">
     <img alt="Discord EN" src="https://img.shields.io/badge/Discord-English-5865F2?logo=discord&logoColor=white" />
   </a>
  </p>

package/dist/commands/commit/index.js

@@ -39,6 +39,11 @@ const commit = {
             alias: 'n',
             describe: t('commit_option_name').d('Functions& Pages name'),
             type: 'string'
+        })
+            .option('bundle', {
+            describe: 'Bundle with esbuild (use --no-bundle to skip)',
+            type: 'boolean',
+            default: true
         });
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
@@ -68,7 +73,7 @@ export function handleCommit(argv) {
             }));
         }
         logger.startSubStep('Generating code version');
-        const res = yield generateCodeVersion(projectName, description, argv === null || argv === void 0 ? void 0 : argv.entry, argv === null || argv === void 0 ? void 0 : argv.assets, argv === null || argv === void 0 ? void 0 : argv.minify);
+        const res = yield generateCodeVersion(projectName, description, argv === null || argv === void 0 ? void 0 : argv.entry, argv === null || argv === void 0 ? void 0 : argv.assets, argv === null || argv === void 0 ? void 0 : argv.minify, undefined, (argv.bundle === false));
         const { isSuccess } = res || {};
         if (!isSuccess) {
             logger.endSubStep('Generate version failed');

package/dist/commands/common/utils.js

@@ -120,9 +120,9 @@ export function getRoutineDetails(projectName) {
  * 支持assets和普通代码两种模式
  */
 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) {
+    return __awaiter(this, arguments, void 0, function* (projectName, description, entry, assets, minify = false, projectPath, noBundle = false) {
         var _a;
-        const { zip, sourceList, dynamicSources } = yield compress(entry, assets, minify, projectPath);
+        const { zip, sourceList, dynamicSources } = yield compress(entry, assets, minify, projectPath, noBundle);
         // Pretty print upload directory tree
         const buildTree = (paths, decorateTopLevel) => {
             const root = { children: new Map(), isFile: false };
@@ -260,7 +260,7 @@ 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) {
+    return __awaiter(this, arguments, void 0, function* (projectName, scriptEntry, assets, description = '', projectPath, env = 'production', minify = false, version, noBundle = false) {
         var _a, _b, _c;
         const projectInfo = yield validateAndInitializeProject(projectName, projectPath);
         if (!projectInfo) {
@@ -274,7 +274,7 @@ export function commitAndDeployVersion(projectName_1, scriptEntry_1, assets_1) {
             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);
+        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 isCommitSuccess = res === null || res === void 0 ? void 0 : res.isSuccess;
         if (!isCommitSuccess) {
             logger.endSubStep('Generate version failed');
@@ -317,6 +317,32 @@ export function deployCodeVersion(name, codeVersion, environment) {
         }
     });
 }
+/**
+ * 部署指定的多个版本及其百分比
+ */
+export function deployCodeVersions(name, versions, env) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const server = yield ApiService.getInstance();
+        const doDeploy = (targetEnv) => __awaiter(this, void 0, void 0, function* () {
+            const res = yield server.createRoutineCodeDeployment({
+                Name: name,
+                CodeVersions: versions.map((v) => ({
+                    Percentage: v.percentage,
+                    CodeVersion: v.codeVersion
+                })),
+                Strategy: 'percentage',
+                Env: targetEnv
+            });
+            return !!res;
+        });
+        if (env === 'all') {
+            const s = yield doDeploy('staging');
+            const p = yield doDeploy('production');
+            return s && p;
+        }
+        return yield doDeploy(env);
+    });
+}
 /**
  * Poll routine code version status until it becomes ready
  */
@@ -417,3 +443,57 @@ export function displayDeploySuccess(projectName_1) {
         logger.block();
     });
 }
+/**
+ * 解析 --versions 参数并执行按百分比分发部署；成功后打印展示和百分比分配
+ */
+export function deployWithVersionPercentages(nameArg, versionsArg, env, projectPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const raw = (versionsArg || [])
+            .flatMap((v) => String(v).split(','))
+            .map((s) => s.trim())
+            .filter(Boolean);
+        const pairs = raw.map((s) => {
+            const [codeVersion, percentStr] = s.split(':');
+            return {
+                codeVersion: codeVersion === null || codeVersion === void 0 ? void 0 : codeVersion.trim(),
+                percentage: Number((percentStr || '').trim())
+            };
+        });
+        if (pairs.length > 2) {
+            logger.error('Deploy failed: at most two versions are supported');
+            return false;
+        }
+        if (pairs.some((p) => !p.codeVersion || Number.isNaN(p.percentage) || p.percentage < 0)) {
+            logger.error('Deploy failed: invalid --versions format. Use v1:80,v2:20');
+            return false;
+        }
+        if (pairs.length === 1) {
+            if (pairs[0].percentage !== 100) {
+                logger.error('Deploy failed: single version must be 100%');
+                return false;
+            }
+        }
+        else if (pairs.length === 2) {
+            const sum = pairs[0].percentage + pairs[1].percentage;
+            if (sum !== 100) {
+                logger.error('Deploy failed: percentages must sum to 100');
+                return false;
+            }
+        }
+        const projectInfo = yield validateAndInitializeProject(nameArg, projectPath);
+        if (!projectInfo) {
+            return false;
+        }
+        const ok = yield deployCodeVersions(projectInfo.projectName, pairs, env);
+        if (!ok)
+            return false;
+        yield displayDeploySuccess(projectInfo.projectName, true, true);
+        logger.block();
+        logger.log('📦 Versions rollout:');
+        pairs.forEach((p) => {
+            logger.log(`- ${p.codeVersion}: ${p.percentage}%`);
+        });
+        logger.block();
+        return true;
+    });
+}

package/dist/commands/deploy/index.js

@@ -12,7 +12,7 @@ import { intro, outro } from '@clack/prompts';
 import t from '../../i18n/index.js';
 import { getRoot } from '../../utils/fileUtils/base.js';
 import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { commitAndDeployVersion, displayDeploySuccess } from '../common/utils.js';
+import { commitAndDeployVersion, displayDeploySuccess, deployWithVersionPercentages } from '../common/utils.js';
 const deploy = {
     command: 'deploy [entry]',
     builder: (yargs) => {
@@ -52,6 +52,15 @@ const deploy = {
             alias: 'm',
             describe: t('deploy_option_minify').d('Minify the code'),
             type: 'boolean'
+        })
+            .option('bundle', {
+            describe: 'Bundle with esbuild (use --no-bundle to skip)',
+            type: 'boolean',
+            default: true
+        })
+            .option('versions', {
+            describe: 'Deploy two versions with percentages, format: v1:80,v2:20 or repeat --versions v1:80 --versions v2:20',
+            type: 'array'
         });
     },
     describe: `🚀 ${t('deploy_describe').d('Deploy your project')}`,
@@ -65,8 +74,15 @@ export function handleDeploy(argv) {
         var _a;
         const entry = argv.entry;
         const assets = (_a = argv.assets) !== null && _a !== void 0 ? _a : undefined;
+        const versionsArg = argv.versions || [];
         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);
+        if (versionsArg.length > 0) {
+            const env = argv.environment || 'all';
+            const ok = yield deployWithVersionPercentages(argv.name || undefined, versionsArg, env, getRoot());
+            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));
         outro(success ? 'Deploy finished' : 'Deploy failed');
         if (success) {
             const projectConfig = getProjectConfig(getRoot());

package/dist/commands/login/index.js

@@ -17,7 +17,7 @@ const login = {
     command: 'login',
     describe: `🔑 ${t('login_describe').d('Login to the server')}`,
     builder: (yargs) => {
-        var _a, _b;
+        var _a, _b, _c;
         return yargs
             .option('access-key-id', {
             alias: 'ak',
@@ -28,6 +28,11 @@ const login = {
             alias: 'sk',
             describe: (_b = t('login_option_access_key_secret')) === null || _b === void 0 ? void 0 : _b.d('AccessKey Secret'),
             type: 'string'
+        })
+            .option('endpoint', {
+            alias: 'e',
+            describe: (_c = t('login_option_endpoint')) === null || _c === void 0 ? void 0 : _c.d('Endpoint'),
+            type: 'string'
         });
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
@@ -40,13 +45,14 @@ export function handleLogin(argv) {
         generateDefaultConfig();
         const accessKeyId = argv === null || argv === void 0 ? void 0 : argv['access-key-id'];
         const accessKeySecret = argv === null || argv === void 0 ? void 0 : argv['access-key-secret'];
+        const endpoint = (argv === null || argv === void 0 ? void 0 : argv['endpoint']) || process.env.ESA_ENDPOINT;
         if (accessKeyId && accessKeySecret) {
-            yield handleLoginWithAKSK(accessKeyId, accessKeySecret);
+            yield handleLoginWithAKSK(accessKeyId, accessKeySecret, endpoint);
             return;
         }
         if (process.env.ESA_ACCESS_KEY_ID && process.env.ESA_ACCESS_KEY_SECRET) {
             logger.log(`🔑 ${t('login_get_from_env').d(`Get AccessKey ID and AccessKey Secret from environment variables.`)}`);
-            yield handleLoginWithAKSK(process.env.ESA_ACCESS_KEY_ID, process.env.ESA_ACCESS_KEY_SECRET);
+            yield handleLoginWithAKSK(process.env.ESA_ACCESS_KEY_ID, process.env.ESA_ACCESS_KEY_SECRET, endpoint);
             return;
         }
         const cliConfig = getCliConfig();
@@ -73,31 +79,32 @@ export function handleLogin(argv) {
                 if (isCancel(selected) || selected === 'exit') {
                     return;
                 }
-                yield getUserInputAuthInfo();
+                yield getUserInputAuthInfo(endpoint);
             }
             else {
                 logger.error(t('pre_login_failed').d('The previously entered Access Key ID (AK) and Secret Access Key (SK) are incorrect. Please enter them again.'));
                 logger.log(`${t('login_logging').d('Logging in')}...`);
-                yield getUserInputAuthInfo();
+                yield getUserInputAuthInfo(endpoint);
             }
         }
         else {
             logger.log(`${t('login_logging').d('Logging in')}...`);
-            yield getUserInputAuthInfo();
+            yield getUserInputAuthInfo(endpoint);
         }
     });
 }
-function handleLoginWithAKSK(accessKeyId, accessKeySecret) {
+function handleLoginWithAKSK(accessKeyId, accessKeySecret, endpoint) {
     return __awaiter(this, void 0, void 0, function* () {
         let apiConfig = getApiConfig();
         apiConfig.auth = {
             accessKeyId,
             accessKeySecret
         };
+        if (endpoint) {
+            apiConfig.endpoint = endpoint;
+        }
         try {
-            yield updateCliConfigFile({
-                auth: apiConfig.auth
-            });
+            yield updateCliConfigFile(Object.assign({ auth: apiConfig.auth }, (endpoint ? { endpoint } : {})));
             const service = yield ApiService.getInstance();
             service.updateConfig(apiConfig);
             const loginStatus = yield service.checkLogin();
@@ -113,7 +120,7 @@ function handleLoginWithAKSK(accessKeyId, accessKeySecret) {
         }
     });
 }
-export function getUserInputAuthInfo() {
+export function getUserInputAuthInfo(endpoint) {
     return __awaiter(this, void 0, void 0, function* () {
         const styledUrl = chalk.underline.blue('https://ram.console.aliyun.com/manage/ak');
         logger.log(`🔑 ${chalk.underline(t('login_get_ak_sk').d(`Please go to the following link to get your account's AccessKey ID and AccessKey Secret`))}`);
@@ -127,10 +134,11 @@ export function getUserInputAuthInfo() {
             accessKeyId,
             accessKeySecret
         };
+        if (endpoint) {
+            apiConfig.endpoint = endpoint;
+        }
         try {
-            yield updateCliConfigFile({
-                auth: apiConfig.auth
-            });
+            yield updateCliConfigFile(Object.assign({ auth: apiConfig.auth }, (endpoint ? { endpoint } : {})));
             const service = yield ApiService.getInstance();
             service.updateConfig(apiConfig);
             const loginStatus = yield service.checkLogin();