weapp-ide-cli 0.0.2 → 1.0.0

package/README.md

@@ -22,12 +22,12 @@ weapp-ide-cli open
 weapp open -p
 # 等价
 weapp open --project
-# 官方 cli 项目选项中 `--project` 等价于 `-h`
+
 
 # 在相对的路径，打开微信开发者工具
 # 比如 uni-app 就可以在项目目录执行
 weapp open -p dist/dev/mp-weixin
-# 工具会把它转化为绝对路径，然后打开
+# 工具会把相对路径转化为绝对路径，然后打开(绝对路径不转化)
 ```
 
 ## 常用命令

package/dist/cli.js

@@ -1,25 +1,17 @@
 'use strict';
 
-var utils = require('./utils-b22f3285.js');
-var execa = require('execa');
-var fs = require('fs/promises');
+var utils = require('./utils-a2548256.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 }; }
 
-var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
+var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 
-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);
@@ -41,7 +33,7 @@ function getConfig() {
                 encoding: 'utf8'
             });
             const config = JSON.parse(content);
-            console.log('自定义cli路径：', config.cliPath);
+            console.log('> 自定义cli路径：', config.cliPath);
             return config;
         }
         else {
@@ -50,7 +42,24 @@ function getConfig() {
             };
         }
     });
-}
+}
+
+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 rlSetConfig() {
     console.log('请设置微信web开发者工具 cli 的路径');
     console.log('> 提示：命令行工具默认所在位置：');
@@ -66,8 +75,8 @@ function rlSetConfig() {
         }));
     });
 }
+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() {
-    var _a;
     return utils.__awaiter(this, void 0, void 0, function* () {
         if (isSupported) {
             const { cliPath } = yield getConfig();
@@ -77,28 +86,8 @@ function main() {
                     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;
+                const formattedArgv = parseArgv(argv);
+                yield utils.execute(cliPath, formattedArgv);
             }
             else {
                 console.log('在当前自定义路径中,未找到微信web开发者命令行工具，请重新指定路径');

package/dist/index.js

@@ -2,15 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var utils = require('./utils-b22f3285.js');
+var utils = require('./utils-a2548256.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/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/types.d.ts

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

package/dist/types/utils.d.ts

@@ -1 +1,6 @@
+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-a2548256.js}

@@ -2,12 +2,14 @@
 
 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 execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 
 const homedir = os__default["default"].homedir();
@@ -59,11 +61,75 @@ function exist(filepath, mode) {
             return false;
         }
     });
+}
+function execute(cliPath, argv) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        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;
+    });
+}
+function resolvePath(filePath) {
+    if (path__default["default"].isAbsolute(filePath)) {
+        return filePath;
+    }
+    else {
+        return path__default["default"].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,6 +1,6 @@
 {
   "name": "weapp-ide-cli",
-  "version": "0.0.2",
+  "version": "1.0.0",
   "description": "让微信开发者工具，用起来更加方便吧！",
   "main": "dist/index.js",
   "module": "dist/index.js",