fix: set allowUnknownOption=true for factory's commands

fbi-js · Sep 21, 2020 · b22e423 · b22e423
1 parent 9b342a2
commit b22e423
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -51,13 +51,13 @@
   "devDependencies": {
     "@types/ejs": "^3.0.4",
     "@types/fs-extra": "^9.0.1",
-    "@types/node": "^14.10.1",
-    "@types/semver": "^7.3.3",
-    "@typescript-eslint/eslint-plugin": "^4.1.0",
-    "@typescript-eslint/parser": "^4.1.0",
+    "@types/node": "^14.11.1",
+    "@types/semver": "^7.3.4",
+    "@typescript-eslint/eslint-plugin": "^4.1.1",
+    "@typescript-eslint/parser": "^4.1.1",
     "eslint": "^7.9.0",
     "eslint-config-prettier": "^6.11.0",
     "ts-node": "^9.0.0",
-    "typescript": "^4.0.2"
+    "typescript": "^4.0.3"
   }
 }
diff --git a/src/cli.ts b/src/cli.ts
@@ -111,6 +111,7 @@ export class Cli extends BaseClass {
         }
       }
       cmd.option('-d, --debug', 'output extra debugging')
+      cmd.allowUnknownOption(true)
     }
   }
 

diff --git a/src/commands/add.ts b/src/commands/add.ts
@@ -15,6 +15,10 @@ export default class CommandAdd extends Command {
   }
 
   public async run(repositories: any, flags: any) {
+    this.debug(`Running command "${this.id}" from factory "${this.factory.id}" with options:`, {
+      repositories,
+      flags
+    })
     const config = this.context.get('config')
     const rootDir = join(config.rootDirectory, config.directoryName)
 

diff --git a/src/commands/clean.ts b/src/commands/clean.ts
@@ -14,6 +14,9 @@ export default class CommandClean extends Command {
   }
 
   public async run(flags: any) {
+    this.debug(`Running command "${this.id}" from factory "${this.factory.id}" with options:`, {
+      flags
+    })
     await this.removeUnavailableFactories()
     await this.removeUnavailableProjects()
   }

diff --git a/src/commands/create.ts b/src/commands/create.ts
@@ -18,6 +18,11 @@ export default class CommandCreate extends Command {
   }
 
   async run(inputTemplate: any, project: any, flags: any) {
+    this.debug(`Running command "${this.id}" from factory "${this.factory.id}" with options:`, {
+      inputTemplate,
+      project,
+      flags
+    })
     const factories = this.factory.createAllFactories()
 
     // if is fbi project
@@ -57,19 +62,18 @@ export default class CommandCreate extends Command {
       templateInstances = templates.filter((t: Template) => t.id === inputTemplate)
       if (!isValidArray(templateInstances)) {
         // 若已有添加模板中不存在则添加远程模板
-        const addCommand = this.factory.commands.find(it => it.id === 'add')
+        const addCommand = this.factory.commands.find((it) => it.id === 'add')
         await addCommand?.run([inputTemplate], flags)
         const nowFactories = this.factory.createAllFactories() || []
-        const addFactory = nowFactories.find(it => it.id === inputTemplate)
-        templates = flatten(nowFactories.map((f:Factory) => f.templates))
+        const addFactory = nowFactories.find((it) => it.id === inputTemplate)
+        templates = flatten(nowFactories.map((f: Factory) => f.templates))
         templateInstances = addFactory?.templates
         if (!isValidArray(templateInstances)) {
           return this.error(`template "${inputTemplate}" not found`).exit()
         }
       }
     }
 
-
     templateInstances = groupBy(
       (isValidArray(templateInstances) && templateInstances) || templates,
       'factory.id'

diff --git a/src/commands/info.ts b/src/commands/info.ts
@@ -15,6 +15,9 @@ export default class CommandInfo extends Command {
 
   async run(flags: any) {
     this.clear()
+    this.debug(`Running command "${this.id}" from factory "${this.factory.id}" with options:`, {
+      flags
+    })
 
     const config = this.loadConfig()
     let globalConfig = {}

diff --git a/src/commands/link.ts b/src/commands/link.ts
@@ -15,6 +15,10 @@ export default class CommandLink extends Command {
   }
 
   async run(factories: any, flags: any) {
+    this.debug(`Running command "${this.id}" from factory "${this.factory.id}" with options:`, {
+      factories,
+      flags
+    })
     const ids = (Array.isArray(factories) && factories.length > 0 && factories) || ['.']
 
     const config = this.context.get('config')

diff --git a/src/commands/list.ts b/src/commands/list.ts
@@ -26,7 +26,10 @@ export default class CommandList extends Command {
   }
 
   async run(targetFactories: any, flags: any) {
-    this.debug(`Factory: (${this.factory.id})`, 'from command', this.id, { targetFactories, flags })
+    this.debug(`Running command "${this.id}" from factory "${this.factory.id}" with options:`, {
+      targetFactories,
+      flags
+    })
     this.showProjects = flags.projects
     this.showVersions = flags.versions
 

diff --git a/src/commands/remove.ts b/src/commands/remove.ts
@@ -14,6 +14,10 @@ export default class CommandRemove extends Command {
   }
 
   async run(factories: any, flags: any) {
+    this.debug(`Running command "${this.id}" from factory "${this.factory.id}" with options:`, {
+      factories,
+      flags
+    })
     const ids = (Array.isArray(factories) && factories.length > 0 && factories) || [
       process
         .cwd()

diff --git a/src/commands/unlink.ts b/src/commands/unlink.ts
@@ -14,11 +14,12 @@ export default class CommandUnLink extends Command {
   }
 
   async run(factories: any, flags: any) {
+    this.debug(`Running command "${this.id}" from factory "${this.factory.id}" with options:`, {
+      factories,
+      flags
+    })
     const ids = (Array.isArray(factories) && factories.length > 0 && factories) || [
-      process
-        .cwd()
-        .split(sep)
-        .pop()
+      process.cwd().split(sep).pop()
     ]
     for (const id of ids) {
       const factory = this.store.get(id)

diff --git a/src/fbi.ts b/src/fbi.ts
@@ -134,6 +134,7 @@ export class Fbi extends Factory {
       const info: any = value
       if (info.global) {
         globalFactories.push(this.createFactory(info.path))
+        this.debug('Fbi<resolveGlobalFactories>:', info.id)
       }
     }
 
@@ -145,7 +146,7 @@ export class Fbi extends Factory {
     if (!factory) {
       return null
     }
-    this.debug('Fbi:', `Factory "${targetId}" found in memory`)
+    this.debug(`Factory "${targetId}" found in memory`)
     return factory
   }
 
@@ -155,7 +156,7 @@ export class Fbi extends Factory {
     if (!factoryInfo) {
       return null
     }
-    this.debug('Fbi:', `Factory "${targetId}" found in store`)
+    this.debug(`Factory "${targetId}" found in store`)
     // local link not support version control
     if (targetVersion && factoryInfo.type !== 'local') {
       const matchVersion = factoryInfo.version?.versions
@@ -183,7 +184,7 @@ export class Fbi extends Factory {
     const arr = realpath.split(sep)
     const idx = arr.lastIndexOf('node_modules')
     const dir = arr.slice(0, idx + 2).join(sep)
-    this.debug('Fbi:', `Factory "${targetId}" found in node_modules`)
+    this.debug(`Factory "${targetId}" found in node_modules`)
     return this.createFactory(dir)
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,6 +111,7 @@ export class Cli extends BaseClass { @@
             }
           }
           cmd.option('-d, --debug', 'output extra debugging')
+          cmd.allowUnknownOption(true)
         }
       }
@@ Expand Down @@