weapp-ide-cli 0.0.2 → 1.0.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 ice breaker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,53 +1,53 @@
-# weapp-ide-cli
-
-微信开发者工具的命令行(v2) 的一个二次封装的包裹实现，来让开发者更加方便的使用微信开发者工具。
-
-> 要使用命令行，注意首先需要在开发者工具的设置 -> 安全设置中开启服务端口。
-## 快速安装
-
-```bash
-npm i -g weapp-ide-cli
-# or
-yarn global add weapp-ide-cli
-```
-
-### 执行命令
-
-```bash
-weapp open
-# 等价
-weapp-ide-cli open
-
-# 在当前命令行所在位置，打开微信开发者工具
-weapp open -p
-# 等价
-weapp open --project
-# 官方 cli 项目选项中 `--project` 等价于 `-h`
-
-# 在相对的路径，打开微信开发者工具
-# 比如 uni-app 就可以在项目目录执行
-weapp open -p dist/dev/mp-weixin
-# 工具会把它转化为绝对路径，然后打开
-```
-
-## 常用命令
-
-1. `weapp login` 在命令行进行微信扫码登录
-2. `weapp open -p` 启动工具进行调试开发
-3. `weapp preview` 开始预览
-4. `weapp upload` 上传代码
-5. `weapp quit` 关闭开发者工具
-
-
-### 自定义配置
-
-`weapp config` 可以对微信开发者工具的 `cli` 目录进行配置，而配置文件就存放在用户的 `${homedir}/.weapp-ide-cli/config.json` 中，您可以随时进行更改。
-
-> 比如 windows 存放位置就在 `C:\Users\${你的用户名}\.weapp-ide-cli/config.json`
-
-
-### 更多命令
-
-这个工具本质是一个 `cli` 二次处理工具，所以绝大部分命令都是透传的。
-
+# weapp-ide-cli
+
+微信开发者工具的命令行(v2) 的一个二次封装的包裹实现，来让开发者更加方便的使用微信开发者工具。
+
+> 要使用命令行，注意首先需要在开发者工具的设置 -> 安全设置中开启服务端口。
+## 快速安装
+
+```bash
+npm i -g weapp-ide-cli
+# or
+yarn global add weapp-ide-cli
+```
+
+### 执行命令
+
+```bash
+weapp open
+# 等价
+weapp-ide-cli open
+
+# 在当前命令行所在位置，打开微信开发者工具
+weapp open -p
+# 等价
+weapp open --project
+
+
+# 在相对的路径，打开微信开发者工具
+# 比如 uni-app 就可以在项目目录执行
+weapp open -p dist/dev/mp-weixin
+# 工具会把相对路径转化为绝对路径，然后打开(绝对路径不转化)
+```
+
+## 常用命令
+
+1. `weapp login` 在命令行进行微信扫码登录
+2. `weapp open -p` 启动工具进行调试开发
+3. `weapp preview` 开始预览
+4. `weapp upload` 上传代码
+5. `weapp quit` 关闭开发者工具
+
+
+### 自定义配置
+
+`weapp config` 可以对微信开发者工具的 `cli` 目录进行配置，而配置文件就存放在用户的 `${homedir}/.weapp-ide-cli/config.json` 中，您可以随时进行更改。
+
+> 比如 windows 存放位置就在 `C:\Users\${你的用户名}\.weapp-ide-cli/config.json`
+
+
+### 更多命令
+
+这个工具本质是一个 `cli` 二次处理工具，所以绝大部分命令都是透传的。
+
 全部的命令请查看 https://developers.weixin.qq.com/miniprogram/dev/devtools/cli.html

package/bin/weapp.js

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
-require('../dist/cli.js')
+#!/usr/bin/env node
+require('../dist/cli.js')

package/dist/cli.js

@@ -1,115 +1,99 @@
 'use strict';
 
-var utils = require('./utils-b22f3285.js');
-var execa = require('execa');
-var fs = require('fs/promises');
+var utils = require('./utils-d05fca05.js');
 var readline = require('readline');
-var path = require('path');
+var fs = require('fs/promises');
+require('path');
 require('os');
+require('execa');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+function createCustomConfig(params) {
+    return utils.__awaiter(this, void 0, void 0, function* () {
+        const isExisted = yield utils.exist(utils.defaultCustomConfigDirPath);
+        if (!isExisted) {
+            yield fs.mkdir(utils.defaultCustomConfigDirPath, { recursive: true });
+        }
+        yield fs.writeFile(utils.defaultCustomConfigFilePath, JSON.stringify({
+            cliPath: params.cliPath
+        }, null, 2), {
+            encoding: 'utf8'
+        });
+    });
+}
+function getConfig() {
+    return utils.__awaiter(this, void 0, void 0, function* () {
+        const isExisted = yield utils.exist(utils.defaultCustomConfigFilePath);
+        if (isExisted) {
+            const content = yield fs.readFile(utils.defaultCustomConfigFilePath, {
+                encoding: 'utf8'
+            });
+            const config = JSON.parse(content);
+            console.log('> 自定义cli路径：', config.cliPath);
+            return config;
+        }
+        else {
+            return {
+                cliPath: utils.defaultPath
+            };
+        }
+    });
+}
 
-var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
+function compose(...funcs) {
+    if (funcs.length === 0) {
+        return (arg) => arg;
+    }
+    if (funcs.length === 1) {
+        return funcs[0];
+    }
+    return funcs.reduce((a, b) => (...args) => a(b(...args)));
+}
 
-const rl = readline__default["default"].createInterface({
-    input: process.stdin,
-    output: process.stdout
-});
-const isSupported = Boolean(utils.defaultPath);
-const argv = process.argv.slice(2);
-function createCustomConfig(params) {
-    return utils.__awaiter(this, void 0, void 0, function* () {
-        const isExisted = yield utils.exist(utils.defaultCustomConfigDirPath);
-        if (!isExisted) {
-            yield fs__default["default"].mkdir(utils.defaultCustomConfigDirPath, { recursive: true });
-        }
-        yield fs__default["default"].writeFile(utils.defaultCustomConfigFilePath, JSON.stringify({
-            cliPath: params.cliPath
-        }, null, 2), {
-            encoding: 'utf8'
-        });
-    });
-}
-function getConfig() {
-    return utils.__awaiter(this, void 0, void 0, function* () {
-        const isExisted = yield utils.exist(utils.defaultCustomConfigFilePath);
-        if (isExisted) {
-            const content = yield fs__default["default"].readFile(utils.defaultCustomConfigFilePath, {
-                encoding: 'utf8'
-            });
-            const config = JSON.parse(content);
-            console.log('自定义cli路径：', config.cliPath);
-            return config;
-        }
-        else {
-            return {
-                cliPath: utils.defaultPath
-            };
-        }
-    });
-}
-function rlSetConfig() {
-    console.log('请设置微信web开发者工具 cli 的路径');
-    console.log('> 提示：命令行工具默认所在位置：');
-    console.log('- MacOS: <安装路径>/Contents/MacOS/cli');
-    console.log('- Windows: <安装路径>/cli.bat');
-    return new Promise((resolve, reject) => {
-        rl.question('请输入微信web开发者工具cli路径：', (cliPath) => utils.__awaiter(this, void 0, void 0, function* () {
-            yield createCustomConfig({
-                cliPath
-            });
-            console.log(`全局配置存储位置：${utils.defaultCustomConfigFilePath}`);
-            resolve(cliPath);
-        }));
-    });
-}
-function main() {
-    var _a;
-    return utils.__awaiter(this, void 0, void 0, function* () {
-        if (isSupported) {
-            const { cliPath } = yield getConfig();
-            const isExisted = yield utils.exist(cliPath);
-            if (isExisted) {
-                if (argv[0] === 'config') {
-                    yield rlSetConfig();
-                    return;
-                }
-                let projectOptionIdx = argv.indexOf('-p');
-                if (projectOptionIdx > -1) {
-                    argv[projectOptionIdx] = '--project';
-                }
-                else {
-                    projectOptionIdx = argv.indexOf('--project');
-                }
-                if (projectOptionIdx > -1) {
-                    const projectPathIdx = projectOptionIdx + 1;
-                    const projectPath = argv[projectPathIdx];
-                    if (projectPath) {
-                        if (!path__default["default"].isAbsolute(projectPath)) {
-                            argv[projectPathIdx] = path__default["default"].resolve(process.cwd(), projectPath);
-                        }
-                    }
-                    else {
-                        argv.splice(projectPathIdx, 0, process.cwd());
-                    }
-                }
-                const task = execa__default["default"](cliPath, argv);
-                (_a = task === null || task === void 0 ? void 0 : task.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
-                yield task;
-            }
-            else {
-                console.log('在当前自定义路径中,未找到微信web开发者命令行工具，请重新指定路径');
-                yield rlSetConfig();
-            }
-        }
-        else {
-            console.log(`微信web开发者工具不支持当前平台：${utils.operatingSystemName} !`);
-        }
-    });
-}
-main().finally(() => {
-    process.exit();
+const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+});
+const isSupported = Boolean(utils.defaultPath);
+const argv = process.argv.slice(2);
+function rlSetConfig() {
+    console.log('请设置微信web开发者工具 cli 的路径');
+    console.log('> 提示：命令行工具默认所在位置：');
+    console.log('- MacOS: <安装路径>/Contents/MacOS/cli');
+    console.log('- Windows: <安装路径>/cli.bat');
+    return new Promise((resolve, reject) => {
+        rl.question('请输入微信web开发者工具cli路径：', (cliPath) => utils.__awaiter(this, void 0, void 0, function* () {
+            yield createCustomConfig({
+                cliPath
+            });
+            console.log(`全局配置存储位置：${utils.defaultCustomConfigFilePath}`);
+            resolve(cliPath);
+        }));
+    });
+}
+const parseArgv = compose(utils.createAlias({ find: '-p', replacement: '--project' }), utils.createPathCompat('--result-output'), utils.createPathCompat('-r'), utils.createPathCompat('--qr-output'), utils.createPathCompat('-o'), utils.createPathCompat('--info-output'), utils.createPathCompat('-i'));
+function main() {
+    return utils.__awaiter(this, void 0, void 0, function* () {
+        if (isSupported) {
+            const { cliPath } = yield getConfig();
+            const isExisted = yield utils.exist(cliPath);
+            if (isExisted) {
+                if (argv[0] === 'config') {
+                    yield rlSetConfig();
+                    return;
+                }
+                const formattedArgv = parseArgv(argv);
+                yield utils.execute(cliPath, formattedArgv);
+            }
+            else {
+                console.log('在当前自定义路径中,未找到微信web开发者命令行工具，请重新指定路径');
+                yield rlSetConfig();
+            }
+        }
+        else {
+            console.log(`微信web开发者工具不支持当前平台：${utils.operatingSystemName} !`);
+        }
+    });
+}
+main().finally(() => {
+    process.exit();
 });

package/dist/index.js

@@ -1,16 +1,19 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var utils = require('./utils-b22f3285.js');
+var utils = require('./utils-d05fca05.js');
 require('path');
 require('os');
+require('execa');
 require('fs/promises');
 
 
 
+exports.createAlias = utils.createAlias;
+exports.createPathCompat = utils.createPathCompat;
 exports.defaultCustomConfigDirPath = utils.defaultCustomConfigDirPath;
 exports.defaultCustomConfigFilePath = utils.defaultCustomConfigFilePath;
 exports.defaultPath = utils.defaultPath;
+exports.execute = utils.execute;
 exports.exist = utils.exist;
 exports.operatingSystemName = utils.operatingSystemName;
+exports.resolvePath = utils.resolvePath;

package/dist/types/cli.d.ts

@@ -1 +1 @@
-export {};
+export {};

package/dist/types/compose.d.ts

@@ -0,0 +1 @@
+export declare function compose<TArgs extends any[]>(...funcs: TArgs): any;

package/dist/types/config.d.ts

@@ -0,0 +1,3 @@
+import type { IBaseConfig } from './types';
+export declare function createCustomConfig(params: IBaseConfig): Promise<void>;
+export declare function getConfig(): Promise<IBaseConfig>;

package/dist/types/defaults.d.ts

@@ -1,4 +1,4 @@
-export declare const operatingSystemName: string;
-export declare const defaultCustomConfigDirPath: string;
-export declare const defaultCustomConfigFilePath: string;
-export declare const defaultPath: string;
+export declare const operatingSystemName: string;
+export declare const defaultCustomConfigDirPath: string;
+export declare const defaultCustomConfigFilePath: string;
+export declare const defaultPath: string;

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
-export type { IBaseConfig } from './types';
-export * from './defaults';
-export * from './utils';
+export type { IBaseConfig } from './types';
+export * from './defaults';
+export * from './utils';

package/dist/types/types.d.ts

@@ -1,3 +1,7 @@
-export interface IBaseConfig {
-    cliPath: string;
-}
+export interface IBaseConfig {
+    cliPath: string;
+}
+export interface IAliasEntry {
+    find: string;
+    replacement: string;
+}

package/dist/types/utils.d.ts

@@ -1 +1,6 @@
-export declare function exist(filepath: string, mode?: number): Promise<boolean>;
+import type { IAliasEntry } from './types';
+export declare function exist(filepath: string, mode?: number): Promise<boolean>;
+export declare function execute(cliPath: string, argv: string[]): Promise<void>;
+export declare function resolvePath(filePath: string): string;
+export declare function createAlias(entry: IAliasEntry): (argv: string[]) => string[];
+export declare function createPathCompat(option: string): (argv: string[]) => string[];

package/dist/{utils-b22f3285.js → utils-d05fca05.js}

@@ -2,29 +2,24 @@
 
 var path = require('path');
 var os = require('os');
+var execa = require('execa');
 var fs = require('fs/promises');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var os__default = /*#__PURE__*/_interopDefaultLegacy(os);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-
-const homedir = os__default["default"].homedir();
-const SupportedPlatformsMap = {
-    Windows_NT: 'Windows_NT',
-    Darwin: 'Darwin'
-};
-const defaultPathMap = {
-    [SupportedPlatformsMap.Windows_NT]: 'C:\\Program Files (x86)\\Tencent\\微信web开发者工具\\cli.bat',
-    [SupportedPlatformsMap.Darwin]: '/Applications/wechatwebdevtools.app/Contents/MacOS/cli'
-};
-const operatingSystemName = os__default["default"].type();
-const defaultCustomConfigDirPath = path__default["default"].join(homedir, '.weapp-ide-cli');
-const defaultCustomConfigFilePath = path__default["default"].join(defaultCustomConfigDirPath, 'config.json');
+const homedir = os.homedir();
+const SupportedPlatformsMap = {
+    Windows_NT: 'Windows_NT',
+    Darwin: 'Darwin'
+};
+const defaultPathMap = {
+    [SupportedPlatformsMap.Windows_NT]: 'C:\\Program Files (x86)\\Tencent\\微信web开发者工具\\cli.bat',
+    [SupportedPlatformsMap.Darwin]: '/Applications/wechatwebdevtools.app/Contents/MacOS/cli'
+};
+const operatingSystemName = os.type();
+const defaultCustomConfigDirPath = path.join(homedir, '.weapp-ide-cli');
+const defaultCustomConfigFilePath = path.join(defaultCustomConfigDirPath, 'config.json');
 const defaultPath = defaultPathMap[operatingSystemName];
 
-/******************************************************************************
+/*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -49,21 +44,85 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-function exist(filepath, mode) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            yield fs__default["default"].access(filepath, mode);
-            return true;
-        }
-        catch (error) {
-            return false;
-        }
-    });
+function exist(filepath, mode) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield fs.access(filepath, mode);
+            return true;
+        }
+        catch (error) {
+            return false;
+        }
+    });
+}
+function execute(cliPath, argv) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const task = execa(cliPath, argv);
+        (_a = task === null || task === void 0 ? void 0 : task.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
+        yield task;
+    });
+}
+function resolvePath(filePath) {
+    if (path.isAbsolute(filePath)) {
+        return filePath;
+    }
+    else {
+        return path.resolve(process.cwd(), filePath);
+    }
+}
+function alias(argv, entry) {
+    let findIdx = argv.indexOf(entry.find);
+    if (findIdx > -1) {
+        argv[findIdx] = entry.replacement;
+    }
+    else {
+        findIdx = argv.indexOf(entry.replacement);
+    }
+    if (findIdx > -1) {
+        const paramIdx = findIdx + 1;
+        const param = argv[paramIdx];
+        if (param && param[0] !== '-') {
+            argv[paramIdx] = resolvePath(param);
+        }
+        else {
+            argv.splice(paramIdx, 0, process.cwd());
+        }
+    }
+    return argv;
+}
+function pathCompat(argv, option) {
+    const findIdx = argv.indexOf(option);
+    if (findIdx > -1) {
+        const paramIdx = findIdx + 1;
+        const param = argv[paramIdx];
+        if (param && param[0] !== '-') {
+            argv[paramIdx] = resolvePath(param);
+        }
+        else {
+            argv.splice(paramIdx, 0, process.cwd());
+        }
+    }
+    return argv;
+}
+function createAlias(entry) {
+    return function (argv) {
+        return alias(argv, entry);
+    };
+}
+function createPathCompat(option) {
+    return function (argv) {
+        return pathCompat(argv, option);
+    };
 }
 
 exports.__awaiter = __awaiter;
+exports.createAlias = createAlias;
+exports.createPathCompat = createPathCompat;
 exports.defaultCustomConfigDirPath = defaultCustomConfigDirPath;
 exports.defaultCustomConfigFilePath = defaultCustomConfigFilePath;
 exports.defaultPath = defaultPath;
+exports.execute = execute;
 exports.exist = exist;
 exports.operatingSystemName = operatingSystemName;
+exports.resolvePath = resolvePath;

package/package.json

@@ -1,56 +1,56 @@
-{
-  "name": "weapp-ide-cli",
-  "version": "0.0.2",
-  "description": "让微信开发者工具，用起来更加方便吧！",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/types/index.d.ts",
-  "files": [
-    "dist",
-    "bin"
-  ],
-  "bin": {
-    "weapp": "bin/weapp.js",
-    "weapp-ide-cli": "bin/weapp.js"
-  },
-  "scripts": {
-    "dev": "cross-env NODE_ENV=development rollup -cw",
-    "build": "cross-env NODE_ENV=production rollup -c",
-    "weapp": "ts-node src/cli.ts",
-    "debug": "ts-node src/cli.ts config",
-    "raw": "node bin/weapp.js"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "keywords": [
-    "weapp",
-    "weapp-cli",
-    "wechat",
-    "cli",
-    "uni-app",
-    "taro",
-    "ide",
-    "weapp-ide",
-    "mini",
-    "miniprogram"
-  ],
-  "author": "SonOfMagic <qq1324318532@gmail.com>",
-  "license": "MIT",
-  "devDependencies": {
-    "@icebreakers/rollup": "*",
-    "@icebreakers/tsconfig": "*"
-  },
-  "dependencies": {
-    "execa": "5.1.1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sonofmagic/utils.git"
-  },
-  "bugs": {
-    "url": "https://github.com/sonofmagic/utils/issues"
-  },
-  "homepage": "https://github.com/sonofmagic/utils/tree/main/packages/weapp-ide-cli#readme"
-}
+{
+  "name": "weapp-ide-cli",
+  "version": "1.0.1",
+  "description": "让微信开发者工具，用起来更加方便吧！",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/types/index.d.ts",
+  "files": [
+    "dist",
+    "bin"
+  ],
+  "bin": {
+    "weapp": "bin/weapp.js",
+    "weapp-ide-cli": "bin/weapp.js"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "keywords": [
+    "weapp",
+    "weapp-cli",
+    "wechat",
+    "cli",
+    "uni-app",
+    "taro",
+    "ide",
+    "weapp-ide",
+    "mini",
+    "miniprogram"
+  ],
+  "author": "SonOfMagic <qq1324318532@gmail.com>",
+  "license": "MIT",
+  "devDependencies": {
+    "@icebreakers/rollup": "*",
+    "@icebreakers/tsconfig": "*"
+  },
+  "dependencies": {
+    "execa": "5.1.1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sonofmagic/utils.git"
+  },
+  "bugs": {
+    "url": "https://github.com/sonofmagic/utils/issues"
+  },
+  "homepage": "https://github.com/sonofmagic/utils/tree/main/packages/weapp-ide-cli#readme",
+  "scripts": {
+    "dev": "cross-env NODE_ENV=development rollup -cw",
+    "build": "cross-env NODE_ENV=production rollup -c",
+    "weapp": "ts-node src/cli.ts",
+    "debug": "ts-node src/cli.ts config",
+    "raw": "node bin/weapp.js"
+  }
+}