esa-cli 0.0.2-beta.2 → 0.0.2-beta.21

package/dist/utils/installEw2.js

@@ -7,17 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { execSync } from 'child_process';
+import https from 'https';
 import os from 'os';
-import fs from 'fs-extra';
 import path from 'path';
 import util from 'util';
-import https from 'https';
-import { execSync } from 'child_process';
-import logger from '../libs/logger.js';
-import { getDirName } from './fileUtils/base.js';
+import fs from 'fs-extra';
 import t from '../i18n/index.js';
-import { calculateFileMD5 } from './fileMd5.js';
+import logger from '../libs/logger.js';
 import { checkOS } from './checkOS.js';
+import { calculateFileMD5 } from './fileMd5.js';
+import { getDirName } from './fileUtils/base.js';
 export const EW2DirName = '.ew2';
 export const EW2BinName = 'edgeworker2';
 export const EW2Path = path.join(os.homedir(), EW2DirName);
@@ -79,7 +79,7 @@ export function fetchRemoteManifest() {
                 }
             });
         })
-            .on('error', (err) => reject);
+            .on('error', () => reject);
     });
 }
 export function checkManifest() {

package/dist/utils/openInBrowser.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import open from 'open';
-import logger from '../libs/logger.js';
 import t from '../i18n/index.js';
+import logger from '../libs/logger.js';
 /**
  * Open url in browser
  * @param {string} url

package/dist/utils/prompt.js

@@ -0,0 +1,97 @@
+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 { confirm as clackConfirm, isCancel, multiselect as clackMultiselect, select as clackSelect, text as clackText, cancel as clackCancel } from '@clack/prompts';
+import multiLevelSelect from '../components/mutiLevelSelect.js';
+function normalizeChoices(choices) {
+    if (!choices)
+        return undefined;
+    return choices.map((c) => {
+        if (typeof c === 'string')
+            return { label: c, value: c };
+        return { label: c.name, value: String(c.value), hint: c.hint };
+    });
+}
+export function promptParameter(param) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const { type, question, defaultValue, validate } = param;
+        let value = '';
+        const msg = question;
+        if (type === 'text') {
+            const v = yield clackText({
+                message: msg,
+                placeholder: typeof defaultValue === 'string' ? defaultValue : undefined,
+                initialValue: typeof defaultValue === 'string' ? defaultValue : undefined,
+                validate: validate
+                    ? (val) => {
+                        if (val === undefined)
+                            return 'Value is required';
+                        const res = validate(val);
+                        return res === true ? undefined : res;
+                    }
+                    : undefined
+            });
+            if (isCancel(v)) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        else if (type === 'confirm') {
+            const v = yield clackConfirm({
+                message: msg,
+                initialValue: (_a = defaultValue) !== null && _a !== void 0 ? _a : false
+            });
+            if (isCancel(v)) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        else if (type === 'select') {
+            const options = normalizeChoices(param.choices) || [];
+            const v = yield clackSelect({
+                message: msg,
+                options,
+                initialValue: defaultValue || undefined
+            });
+            if (isCancel(v)) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        else if (type === 'multiselect') {
+            const options = normalizeChoices(param.choices) || [];
+            const initialValues = (defaultValue || []).map((v) => String(v));
+            const v = yield clackMultiselect({
+                message: msg,
+                options,
+                initialValues
+            });
+            if (isCancel(v)) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        else if (type === 'multiLevelSelect') {
+            const items = (param.treeItems || []);
+            const v = yield multiLevelSelect(items, msg);
+            if (v === null) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        return value;
+    });
+}
+export default promptParameter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.2",
+  "version": "0.0.2-beta.21",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -15,12 +15,14 @@
   ],
   "scripts": {
     "build": "rm -rf ./dist && rm -rf ./build && node ./genLocale.cjs && tsc && node ./copy.cjs",
-    "watch": "tsc --watch",
+    "dev": "tsc --watch",
     "eslint": "eslint src/ --ext .js,.jsx,.ts,.tsx",
+    "prepare": "husky install",
     "lint-staged": "lint-staged",
-    "prepare": "npm run build",
-    "test": "FORCE_COLOR=0 npx vitest ",
-    "coverage": "vitest --coverage"
+    "test": "vitest --coverage",
+    "coverage": "vitest --coverage",
+    "lint": "eslint src/",
+    "lint:fix": "eslint src/ --fix"
   },
   "keywords": [
     "cli",
@@ -37,6 +39,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",
     "@types/cli-table": "^0.3.4",
@@ -49,11 +52,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",
-    "eslint": "^8.52.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react": "latest",
     "husky": "^8.0.3",
     "jsdom": "^25.0.1",
     "lint-staged": "^15.0.2",
@@ -66,24 +67,26 @@
     "vitest": "^2.0.4"
   },
   "dependencies": {
-    "@alicloud/esa20240910": "2.8.1",
+    "@alicloud/esa20240910": "2.25.0",
     "@alicloud/openapi-client": "^0.4.7",
     "@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",
-    "axios": "^1.7.7",
+    "adm-zip": "^0.5.16",
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
-    "esa-template": "^0.0.3",
+    "esa-template": "0.0.9",
     "esbuild": "^0.21.1",
     "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",
@@ -100,6 +103,11 @@
     "winston-daily-rotate-file": "^5.0.0",
     "yargs": "^17.7.2"
   },
+  "lint-staged": {
+    "src/**/*.{ts,tsx,js,jsx}": [
+      "eslint --fix"
+    ]
+  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/aliyun/alibabacloud-esa-cli.git"