esa-cli 1.0.10 → 1.0.11

package/dist/utils/fileUtils/base.js

@@ -1,31 +1,27 @@
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-const cliConfigFile = 'cliconfig.toml';
+const projectConfigFiles = ['esa.jsonc', 'esa.toml'];
 export const getDirName = (metaUrl) => {
     const __filename = fileURLToPath(metaUrl);
     const __dirname = path.dirname(__filename);
     return __dirname;
 };
 export const getRoot = (root) => {
-    if (typeof root === 'undefined') {
-        root = process.cwd();
-    }
-    if (path.parse(root).root === root) {
-        return process.cwd();
-    }
-    const file = path.join(root, cliConfigFile);
-    const prev = path.resolve(root, '../');
-    try {
-        const hasToml = fs.existsSync(file);
-        if (hasToml) {
-            return root;
+    const start = path.resolve(root !== null && root !== void 0 ? root : process.cwd());
+    let current = start;
+    while (true) {
+        try {
+            const hasProjectConfig = projectConfigFiles.some((fileName) => fs.existsSync(path.join(current, fileName)));
+            if (hasProjectConfig) {
+                return current;
+            }
         }
-        else {
-            return getRoot(prev);
+        catch (_a) { }
+        const parent = path.dirname(current);
+        if (parent === current) {
+            return process.cwd();
         }
-    }
-    catch (err) {
-        return getRoot(prev);
+        current = parent;
     }
 };

package/dist/utils/fileUtils/index.js

@@ -269,6 +269,26 @@ export function getDevOpenBrowserUrl() {
 }
 export const getApiConfig = () => {
     var _a, _b, _c;
+    const envAccessKeyId = process.env.ALIBABA_CLOUD_ACCESS_KEY_ID ||
+        process.env.ESA_ACCESS_KEY_ID;
+    const envAccessKeySecret = process.env.ALIBABA_CLOUD_ACCESS_KEY_SECRET ||
+        process.env.ESA_ACCESS_KEY_SECRET;
+    const envSecurityToken = process.env.ALIBABA_CLOUD_SECURITY_TOKEN ||
+        process.env.ESA_SECURITY_TOKEN;
+    if (envAccessKeyId && envAccessKeySecret) {
+        const [cliConfig, projectConfig] = getConfigurations();
+        const endpoint = (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.endpoint) ||
+            (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.endpoint) ||
+            'esa.cn-hangzhou.aliyuncs.com';
+        return {
+            auth: {
+                accessKeyId: envAccessKeyId,
+                accessKeySecret: envAccessKeySecret,
+                securityToken: envSecurityToken
+            },
+            endpoint
+        };
+    }
     const [cliConfig, projectConfig] = getConfigurations();
     let defaultConfig = {
         auth: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "A CLI for operating Alibaba Cloud ESA Functions and Pages.",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -36,11 +36,13 @@
   ],
   "author": "Kinice, Shengyuan Ma",
   "license": "MIT",
+  "engines": {
+    "node": ">=18"
+  },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.24.7",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.5.0",
-    "@testing-library/react": "^16.0.1",
     "@types/adm-zip": "^0.5.7",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.6",
@@ -48,53 +50,52 @@
     "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.12",
+    "@types/inquirer": "^9.0.7",
     "@types/lodash": "^4.14.202",
     "@types/node": "^20.8.10",
     "@types/node-fetch": "^2.6.9",
     "@types/portscanner": "^2.1.4",
-    "@types/react": "^18.2.47",
     "@types/yargs": "^17.0.32",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.9.1",
+    "@typescript-eslint/eslint-plugin": "8.46.1",
+    "@typescript-eslint/parser": "8.46.1",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-react": "latest",
-    "eslint-plugin-react-hooks": "^5.2.0",
+    "rimraf": "5.0.10",
     "husky": "^8.0.3",
     "jsdom": "^25.0.1",
     "lint-staged": "^15.0.2",
     "prettier": "^3.0.3",
     "tsc-files": "^1.1.4",
     "typescript": "^5.2.2",
-    "vitest": "^2.0.4"
+    "@vitest/coverage-istanbul": "^3.2.6",
+    "vite": "6.4.3",
+    "vitest": "^3.2.6"
   },
   "dependencies": {
-    "@alicloud/esa20240910": "2.25.0",
+    "@alicloud/esa20240910": "2.29.0",
     "@alicloud/openapi-client": "^0.4.7",
+    "@alicloud/tea-util": "^1.4.9",
     "@babel/generator": "^7.26.3",
     "@babel/parser": "^7.24.4",
     "@babel/traverse": "^7.24.1",
     "@clack/prompts": "1.0.0-alpha.4",
     "@iarna/toml": "^2.2.5",
-    "@types/inquirer": "^9.0.7",
-    "@vitest/coverage-istanbul": "^2.0.4",
-    "adm-zip": "^0.5.16",
+    "adm-zip": "^0.6.0",
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
+    "debug": "^4.4.3",
     "esa-template": "^0.0.10",
-    "esbuild": "^0.21.1",
+    "esbuild": "^0.25.12",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",
     "fs-extra": "^11.2.0",
     "haikunator": "^2.1.2",
     "http-proxy-agent": "^7.0.2",
-    "ink": "^5.0.1",
-    "ink-select-input": "^6.0.0",
-    "ink-text-input": "^6.0.0",
     "inquirer": "^9.2.15",
     "js-base64": "^3.7.7",
+    "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "node-fetch": "^3.3.2",
     "open": "^9.1.0",
@@ -103,10 +104,7 @@
     "portscanner": "^2.2.0",
     "winston": "^3.11.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "yargs": "^17.7.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "rimraf": "^6.0.1"
+    "yargs": "^17.7.2"
   },
   "lint-staged": {
     "src/**/*.{ts,tsx,js,jsx}": [

package/zh_CN.md

@@ -51,7 +51,7 @@ npm i -D esa-cli@latest
 
 ## 相关文档
 
-- [esa-cli 命令](./docs/Commands_zh_CN.md)
-- [ESA 配置文件说明](./docs/Config_zh_CN.md)
+- [esa-cli 命令](https://github.com/aliyun/alibabacloud-esa-cli/blob/master/docs/Commands_zh_CN.md)
+- [ESA 配置文件说明](https://github.com/aliyun/alibabacloud-esa-cli/blob/master/docs/Config_zh_CN.md)
 - [阿里云 ESA 文档](https://help.aliyun.com/document_detail/2710021.html)
 - [Functions 和 Pages API 参考](https://help.aliyun.com/document_detail/2710024.html)

package/dist/components/descriptionInput.js

@@ -1,38 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { Box, render, Text } from 'ink';
-import TextInput from 'ink-text-input';
-import React, { useState } from 'react';
-export const DescriptionInput = ({ prompt, onSubmit, required }) => {
-    const [input, setInput] = useState('');
-    const [error, setError] = useState('');
-    const handleSubmit = () => {
-        if (required && !input.trim()) {
-            setError('This field is required');
-        }
-        else {
-            onSubmit(input);
-        }
-    };
-    return (React.createElement(Box, { flexDirection: "column" },
-        React.createElement(Box, null,
-            React.createElement(Text, null, prompt)),
-        React.createElement(TextInput, { value: input, onChange: setInput, onSubmit: handleSubmit }),
-        error && (React.createElement(Box, null,
-            React.createElement(Text, { color: "red" }, error)))));
-};
-export const descriptionInput = (prompt_1, ...args_1) => __awaiter(void 0, [prompt_1, ...args_1], void 0, function* (prompt, required = false) {
-    return new Promise((resolve) => {
-        const { unmount } = render(React.createElement(DescriptionInput, { prompt: prompt, required: required, onSubmit: (input) => {
-                unmount();
-                resolve(input);
-            } }));
-    });
-});

package/dist/components/filterSelector.js

@@ -1,132 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { Box, render, Text, useInput } from 'ink';
-import TextInput from 'ink-text-input';
-import React, { useState, useEffect } from 'react';
-import t from '../i18n/index.js';
-export const FilterSelector = ({ data, onSubmit, hideCount = 20 }) => {
-    const [inputValue, setInputValue] = useState('');
-    const [filteredData, setFilteredData] = useState(data);
-    const [isShowFilteredData, setIsShowFilteredData] = useState(false);
-    const [isSelectionMode, setIsSelectionMode] = useState(false);
-    const [selectedIndex, setSelectedIndex] = useState(-1);
-    const [tabPressCount, setTabPressCount] = useState(0);
-    const [showAll, setShowAll] = useState(false);
-    useEffect(() => {
-        if (showAll && !isSelectionMode) {
-            setFilteredData(data.filter((site) => site.label.includes(inputValue)));
-        }
-    }, [inputValue, data]);
-    const handleSubmit = () => {
-        onSubmit(inputValue);
-    };
-    useInput((input, key) => {
-        if (key.return && isSelectionMode && filteredData[selectedIndex]) {
-            setInputValue(filteredData[selectedIndex].label);
-            setIsSelectionMode(false);
-            setIsShowFilteredData(false);
-            setSelectedIndex(-1);
-            setTabPressCount(0);
-        }
-        else if (key.tab) {
-            if (tabPressCount === 0) {
-                const filteredDataInner = data.filter((site) => site.label.includes(inputValue));
-                setFilteredData(filteredDataInner);
-                if (filteredData.length === 1) {
-                    setIsShowFilteredData(false);
-                    setInputValue(filteredDataInner[0].label);
-                    setSelectedIndex(0);
-                }
-                else {
-                    setIsShowFilteredData(true);
-                }
-            }
-            else if (tabPressCount === 1) {
-                const filteredDataInner = data.filter((site) => site.label.includes(inputValue));
-                setFilteredData(filteredDataInner);
-                // Enter selection mode when match results >= 1
-                if ((filteredDataInner.length >= 1 &&
-                    showAll &&
-                    filteredDataInner.length > hideCount) ||
-                    (filteredDataInner.length >= 1 &&
-                        filteredDataInner.length <= hideCount)) {
-                    setIsSelectionMode(true);
-                    setSelectedIndex(0);
-                    setInputValue(filteredDataInner[0].label);
-                }
-            }
-            else if (tabPressCount >= 2 &&
-                isSelectionMode &&
-                (showAll || filteredData.length <= hideCount) &&
-                filteredData.length > 1) {
-                setSelectedIndex((prevIndex) => (prevIndex + 1) % filteredData.length);
-                setInputValue(filteredData[(selectedIndex + 1) % filteredData.length].label);
-            }
-            setTabPressCount((prevCount) => prevCount + 1);
-        }
-        else if (key.downArrow && isSelectionMode) {
-            setSelectedIndex((prevIndex) => (prevIndex + 1) % filteredData.length);
-            setInputValue(filteredData[(selectedIndex + 1) % filteredData.length].label);
-        }
-        else if (key.upArrow && isSelectionMode) {
-            setSelectedIndex((prevIndex) => (prevIndex - 1 + filteredData.length) % filteredData.length);
-            setInputValue(filteredData[(selectedIndex - 1 + filteredData.length) % filteredData.length].label);
-        }
-        else if (key.leftArrow || key.rightArrow) {
-        }
-        else if (key.return) {
-            handleSubmit();
-            setTabPressCount(0);
-        }
-        else if (input === 'y' &&
-            !showAll &&
-            isShowFilteredData &&
-            (filteredData === null || filteredData === void 0 ? void 0 : filteredData.length) > hideCount) {
-            setShowAll(true);
-            setIsSelectionMode(true);
-        }
-        else {
-            setIsSelectionMode(false);
-            setIsShowFilteredData(false);
-            setSelectedIndex(-1);
-            setTabPressCount(0);
-            setShowAll(false);
-        }
-    });
-    const renderFilterData = () => {
-        return ((showAll || filteredData.length <= hideCount) &&
-            filteredData.length > 1 && (React.createElement(React.Fragment, null,
-            React.createElement(Text, null, `👉 ${t('route_add_tab_tip').d('Press Tab to select')}`),
-            filteredData.map((item, index) => (React.createElement(Text, { key: index, inverse: index === selectedIndex }, item.label))))));
-    };
-    return (React.createElement(Box, { flexDirection: "column" },
-        React.createElement(TextInput, { value: inputValue, highlightPastedText: true, onChange: (value) => {
-                if (!showAll &&
-                    value[value.length - 1] === 'y' &&
-                    tabPressCount === 1) {
-                    return;
-                }
-                setInputValue(value);
-            } }),
-        isShowFilteredData && (React.createElement(React.Fragment, null,
-            filteredData.length > hideCount && !showAll && (React.createElement(Text, null, t('route_add_see_more').d(`Do you wish to see all ${filteredData.length} possibilities? (y/n)`))),
-            renderFilterData()))));
-};
-export const promptFilterSelector = (siteList) => __awaiter(void 0, void 0, void 0, function* () {
-    return new Promise((resolve) => {
-        const { unmount } = render(React.createElement(FilterSelector, { onSubmit: (input) => {
-                unmount();
-                resolve(siteList.find((site) => site.label === input) || {
-                    label: '',
-                    value: ''
-                });
-            }, data: siteList }));
-    });
-});

package/dist/components/selectItem.js

@@ -1,6 +0,0 @@
-import { Text } from 'ink';
-import * as React from 'react';
-function Item({ isSelected = false, label }) {
-    return React.createElement(Text, { color: isSelected ? 'green' : undefined }, label);
-}
-export default Item;

package/dist/components/yesNoPrompt.js

@@ -1,9 +0,0 @@
-import SelectItems from './selectInput.js';
-const yesNoItems = [
-    { label: 'Yes', value: 'yes' },
-    { label: 'No', value: 'no' }
-];
-export const yesNoPrompt = (handleSelect, title) => {
-    console.log(title);
-    SelectItems({ items: yesNoItems, handleSelect });
-};