@yuw-cli-dev/exec 1.0.37 → 1.0.39

package/lib/index.js

@@ -1,33 +1,37 @@
-"use strict";
+'use strict';
 
-const path = require("path");
-const Package = require("@yuw-cli-dev/package");
-const log = require("@yuw-cli-dev/log");
+const path = require('path');
+const slash = require('slash');
+const cp = require('child_process');
+const Package = require('@yuw-cli-dev/package');
+const log = require('@yuw-cli-dev/log');
+const { normalizePath, exec: spawn } = require('@yuw-cli-dev/utils');
 
 const SETTINGS = {
-  init: "@yuw-cli-dev/init",
+  init: '@yuw-cli-dev/init',
 };
-const CACHE_DIR = "dependencies";
+const CACHE_DIR = 'dependencies';
+
 async function exec() {
   let targetPath = process.env.CLI_TARGET_PATH;
-  let storeDir = "";
+  let storeDir = '';
   let pkg;
   const homePath = process.env.CLI_HOME_PATH;
 
-  log.verbose("targetPath", targetPath);
-  log.verbose("homePath", homePath);
+  log.verbose('targetPath', targetPath);
+  log.verbose('homePath', homePath);
 
   const cmdObj = arguments[arguments.length - 1];
   const cmdName = cmdObj.name();
   const packageName = SETTINGS[cmdName];
-  const packageVersion = "latest";
+  const packageVersion = 'latest';
 
   if (!targetPath) {
     targetPath = path.resolve(homePath, CACHE_DIR);
-    storeDir = path.resolve(targetPath, "node_modules");
+    storeDir = path.resolve(targetPath, 'node_modules');
 
-    log.verbose("storeDir", storeDir);
-    log.verbose("targetPath", targetPath);
+    log.verbose('storeDir', storeDir);
+    log.verbose('targetPath', targetPath);
 
     pkg = new Package({
       targetPath,
@@ -36,9 +40,9 @@ async function exec() {
       packageVersion,
     });
 
-    if (pkg.exists()) {
+    if (await pkg.exists()) {
       // 更新package
-      pkg.update();
+      await pkg.update();
     } else {
       // 安装package
       await pkg.install();
@@ -52,7 +56,37 @@ async function exec() {
   }
   const rootFile = pkg.getRootFilePath();
   if (rootFile) {
-    require(rootFile).call(null, ...arguments);
+    try {
+      const args = Array.from(arguments);
+      const o = Object.create(null);
+      const cmdObj = args[args.length - 1];
+      Object.keys(cmdObj).forEach(key => {
+        if (
+          cmdObj.hasOwnProperty(key) &&
+          !key.startsWith('_') &&
+          key !== 'parent'
+        ) {
+          o[key] = cmdObj[key];
+        }
+      });
+      args[args.length - 1] = o;
+      const code = `require('${normalizePath(rootFile)}').call(null, ${JSON.stringify(args)})`;
+      const child = spawn('node', ['-e', code], {
+        cwd: process.cwd(),
+        stdio: 'inherit',
+      });
+      child.on('error', e => {
+        log.error(e.message);
+        process.exit(1);
+      });
+      child.on('exit', e => {
+        log.verbose('命令执行成功:' + e);
+        process.exit(e);
+      });
+    } catch (error) {
+      log.error(error.message);
+    }
   }
 }
+
 module.exports = exec;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuw-cli-dev/exec",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "yuw-cli-dev execute package",
   "author": "yuwei <yuwei@huya.com>",
   "homepage": "https://github.com/yousanjin/yuw-cli#readme",
@@ -27,8 +27,9 @@
     "url": "https://github.com/yousanjin/yuw-cli/issues"
   },
   "dependencies": {
-    "@yuw-cli-dev/log": "^1.0.36",
-    "@yuw-cli-dev/package": "file:../../models/package"
+    "@yuw-cli-dev/log": "^1.0.39",
+    "@yuw-cli-dev/package": "file:../../models/package",
+    "@yuw-cli-dev/utils": "^1.0.39"
   },
-  "gitHead": "ab03556d97ed9d4caf7af33d1720f4e45e34749a"
+  "gitHead": "7bcace542ccccc47f518b0537cbb0cce93229adf"
 }