fix: use unfriendly name for preinstall hook (#66)

oclif · Oct 2, 2018 · b5d38e2 · b5d38e2
1 parent 7cc37ca
commit b5d38e2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/src/commands/plugins/install.ts b/src/commands/plugins/install.ts
@@ -35,7 +35,7 @@ e.g. If you have a core plugin that has a 'hello' command, installing a user-ins
     for (let name of argv) {
       if (aliases[name] === null) this.error(`${name} is blacklisted`)
       name = aliases[name] || name
-      let p = parsePlugin(name)
+      let p = await this.parsePlugin(name)
       let plugin
       if (p.type === 'npm') {
         cli.action.start(`Installing plugin ${chalk.cyan(this.plugins.friendlyName(p.name))}`)
@@ -50,18 +50,19 @@ e.g. If you have a core plugin that has a 'hello' command, installing a user-ins
       cli.action.stop(`installed v${plugin.version}`)
     }
   }
-}
 
-function parsePlugin(input: string): {name: string, tag: string, type: 'npm'} | {url: string, type: 'repo'} {
-  if (input.includes('@') && input.includes('/')) {
-    input = input.slice(1)
-    let [name, tag = 'latest'] = input.split('@')
-    return {name: '@' + name, tag, type: 'npm'}
-  } else if (input.includes('/')) {
-    if (input.includes(':')) return {url: input, type: 'repo'}
-    else return {url: `https://github.com/${input}`, type: 'repo'}
-  } else {
-    let [name, tag = 'latest'] = input.split('@')
-    return {name, tag, type: 'npm'}
+  async parsePlugin(input: string): Promise<{name: string, tag: string, type: 'npm'} | {url: string, type: 'repo'}> {
+    if (input.includes('@') && input.includes('/')) {
+      input = input.slice(1)
+      let [name, tag = 'latest'] = input.split('@')
+      return {name: '@' + name, tag, type: 'npm'}
+    } else if (input.includes('/')) {
+      if (input.includes(':')) return {url: input, type: 'repo'}
+      else return {url: `https://github.com/${input}`, type: 'repo'}
+    } else {
+      let [name, tag = 'latest'] = input.split('@')
+      name = await this.plugins.maybeUnfriendlyName(name)
+      return {name, tag, type: 'npm'}
+    }
   }
 }
diff --git a/src/plugins.ts b/src/plugins.ts
@@ -185,6 +185,14 @@ export default class Plugins {
     return `@${scope}/plugin-${name}`
   }
 
+  async maybeUnfriendlyName(name: string): Promise<string> {
+    const unfriendly = this.unfriendlyName(name)
+    if (unfriendly && await this.npmHasPackage(unfriendly)) {
+      return unfriendly
+    }
+    return name
+  }
+
   friendlyName(name: string): string {
     const scope = this.config.pjson.oclif.scope
     if (!scope) return name