fix(cli): adopt cli for commander 9.x

lib/cli.js

@@ -38,7 +38,8 @@ program
 openupm add <pkg> [otherPkgs...]
 openupm add <pkg>@<version> [otherPkgs...]`
   )
-  .action(async function(pkg, otherPkgs, options) {
+  .action(async function (pkg, otherPkgs, options) {
+    options._global = program.opts()
     const pkgs = [pkg].concat(otherPkgs);
     const retCode = await add(pkgs, options);
     if (retCode) process.exit(retCode);
@@ -49,6 +50,7 @@ program
   .aliases(["rm", "uninstall"])
   .description("remove package from manifest json")
   .action(async function(pkg, otherPkgs, options) {
+    options._global = program.opts()
     const pkgs = [pkg].concat(otherPkgs);
     const retCode = await remove(pkgs, options);
     if (retCode) process.exit(retCode);
@@ -59,6 +61,7 @@ program
   .aliases(["s", "se", "find"])
   .description("Search package by keyword")
   .action(async function(keyword, options) {
+    options._global = program.opts()
     const retCode = await search(keyword, options);
     if (retCode) process.exit(retCode);
   });
@@ -68,6 +71,7 @@ program
   .aliases(["v", "info", "show"])
   .description("view package information")
   .action(async function(pkg, options) {
+    options._global = program.opts()
     const retCode = await view(pkg, options);
     if (retCode) process.exit(retCode);
   });
@@ -82,6 +86,7 @@ openupm deps <pkg>
 openupm deps <pkg>@<version>`
   )
   .action(async function(pkg, options) {
+    options._global = program.opts()
     const retCode = await deps(pkg, options);
     if (retCode) process.exit(retCode);
   });
@@ -100,6 +105,7 @@ program
   )
   .description("authenticate with a scoped registry")
   .action(async function(options) {
+    options._global = program.opts()
     try {
       const retCode = await login(options);
       if (retCode) process.exit(retCode);

lib/cmd-login.js

@@ -22,8 +22,8 @@ const login = async function(options) {
   if (!options.password)
     options.password = await promptly.password("Password: ");
   if (!options.email) options.email = await promptly.prompt("Email: ");
-  if (!options.parent.registry)
-    options.parent.registry = await promptly.prompt("Registry: ", {
+  if (!options._global.registry)
+    options._global.registry = await promptly.prompt("Registry: ", {
       validator: [validateRegistry]
     });
   let token = null;
@@ -38,7 +38,7 @@ const login = async function(options) {
       username: options.username,
       password: options.password,
       email: options.email,
-      registry: options.parent.registry
+      registry: options._global.registry
     });
     if (result.code == 1) return result.code;
     if (!result.token) {
@@ -48,7 +48,7 @@ const login = async function(options) {
     token = result.token;
     // write npm token
     await writeNpmToken({
-      registry: options.parent.registry,
+      registry: options._global.registry,
       token: result.token
     });
   }
@@ -58,7 +58,7 @@ const login = async function(options) {
     alwaysAuth: options.alwaysAuth || false,
     basicAuth: options.basicAuth || false,
     email: options.email,
-    registry: options.parent.registry,
+    registry: options._global.registry,
     token
   });
 };

lib/core.js

@@ -36,26 +36,26 @@ const parseEnv = async function(options, { checkPath }) {
   // the dict of auth param for npm registry API
   env.auth = {};
   // log level
-  log.level = options.parent.verbose ? "verbose" : "notice";
+  log.level = options._global.verbose ? "verbose" : "notice";
   // color
-  if (options.parent.color === false) env.color = false;
+  if (options._global.color === false) env.color = false;
   if (process.env.NODE_ENV == "test") env.color = false;
   if (!env.color) {
     chalk.level = 0;
     log.disableColor();
   }
   // upstream
-  if (options.parent.upstream === false) env.upstream = false;
+  if (options._global.upstream === false) env.upstream = false;
   // region cn
-  if (options.parent.cn === true) {
+  if (options._global.cn === true) {
     env.registry = "https://package.openupm.cn";
     env.upstreamRegistry = "https://packages.unity.cn";
     env.region = "cn";
     log.notice("region", "cn");
   }
   // registry
-  if (options.parent.registry) {
-    let registry = options.parent.registry;
+  if (options._global.registry) {
+    let registry = options._global.registry;
     if (!registry.toLowerCase().startsWith("http"))
       registry = "http://" + registry;
     if (registry.endsWith("/")) registry = registry.slice(0, -1);
@@ -70,8 +70,8 @@ const parseEnv = async function(options, { checkPath }) {
         .join(".");
   }
   // auth
-  if (options.parent.systemUser) env.systemUser = true;
-  if (options.parent.wsl) env.wsl = true;
+  if (options._global.systemUser) env.systemUser = true;
+  if (options._global.wsl) env.wsl = true;
   const upmConfig = await loadUpmConfig();
   if (upmConfig) {
     env.npmAuth = upmConfig.npmAuth;
@@ -108,8 +108,8 @@ const parseEnv = async function(options, { checkPath }) {
   // return if no need to check path
   if (!checkPath) return true;
   // cwd
-  if (options.parent.chdir) {
-    const cwd = path.resolve(options.parent.chdir);
+  if (options._global.chdir) {
+    const cwd = path.resolve(options._global.chdir);
     if (!fs.existsSync(cwd)) {
       log.error("env", `can not resolve path ${cwd}`);
       return false;

test/test-cmd-add.js

@@ -18,29 +18,29 @@ const {
 
 describe("cmd-add.js", function() {
   const options = {
-    parent: {
+    _global: {
       registry: "http://example.com",
       upstream: false,
       chdir: getWorkDir("test-openupm-cli")
     }
   };
   const upstreamOptions = {
-    parent: {
+    _global: {
       registry: "http://example.com",
       upstream: true,
       chdir: getWorkDir("test-openupm-cli")
     }
   };
   const testableOptions = {
-    parent: {
+    _global: {
       registry: "http://example.com",
       upstream: false,
       chdir: getWorkDir("test-openupm-cli")
     },
     test: true
   };
   const forceOptions = {
-    parent: {
+    _global: {
       registry: "http://example.com",
       upstream: false,
       chdir: getWorkDir("test-openupm-cli")

test/test-cmd-deps.js

@@ -18,7 +18,7 @@ const {
 
 describe("cmd-deps.js", function() {
   const options = {
-    parent: {
+    _global: {
       registry: "http://example.com",
       chdir: getWorkDir("test-openupm-cli")
     }

test/test-cmd-remove.js

@@ -48,7 +48,7 @@ describe("cmd-remove.js", function() {
     });
     it("remove pkg", async function() {
       const options = {
-        parent: {
+        _global: {
           registry: "http://example.com",
           chdir: getWorkDir("test-openupm-cli")
         }
@@ -69,7 +69,7 @@ describe("cmd-remove.js", function() {
     });
     it("remove pkg@1.0.0", async function() {
       const options = {
-        parent: {
+        _global: {
           registry: "http://example.com",
           chdir: getWorkDir("test-openupm-cli")
         }
@@ -83,7 +83,7 @@ describe("cmd-remove.js", function() {
     });
     it("remove pkg-not-exist", async function() {
       const options = {
-        parent: {
+        _global: {
           registry: "http://example.com",
           chdir: getWorkDir("test-openupm-cli")
         }
@@ -97,7 +97,7 @@ describe("cmd-remove.js", function() {
     });
     it("remove more than one pkgs", async function() {
       const options = {
-        parent: {
+        _global: {
           registry: "http://example.com",
           chdir: getWorkDir("test-openupm-cli")
         }

test/test-cmd-search.js

@@ -19,14 +19,14 @@ describe("cmd-search.js", function() {
   let stdoutInspect = null;
   let stderrInspect = null;
   const options = {
-    parent: {
+    _global: {
       registry: "http://example.com",
       upstream: false,
       chdir: getWorkDir("test-openupm-cli")
     }
   };
   const upstreamOptions = {
-    parent: {
+    _global: {
       registry: "http://example.com",
       chdir: getWorkDir("test-openupm-cli")
     }

test/test-cmd-view.js

@@ -17,14 +17,14 @@ const {
 
 describe("cmd-view.js", function() {
   const options = {
-    parent: {
+    _global: {
       registry: "http://example.com",
       upstream: false,
       chdir: getWorkDir("test-openupm-cli")
     }
   };
   const upstreamOptions = {
-    parent: {
+    _global: {
       registry: "http://example.com",
       chdir: getWorkDir("test-openupm-cli")
     }