fix: allow tagged packages to be uninstalled (#202)

oclif · Nov 19, 2020 · 716569c · 716569c
1 parent 1bc2c19
commit 716569c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/src/commands/plugins/uninstall.ts b/src/commands/plugins/uninstall.ts
@@ -36,9 +36,9 @@ export default class PluginsUninstall extends Command {
     if (flags.verbose) this.plugins.verbose = true
     if (argv.length === 0) argv.push('.')
     for (const plugin of argv) {
-      const friendly = this.plugins.friendlyName(plugin)
+      const friendly = this.removeTags(this.plugins.friendlyName(plugin))
       cli.action.start(`Uninstalling ${friendly}`)
-      const unfriendly = await this.plugins.hasPlugin(plugin)
+      const unfriendly = await this.plugins.hasPlugin(this.removeTags(plugin))
       if (!unfriendly) {
         const p = this.config.plugins.find(p => p.name === plugin) as Plugin | undefined
         if (p) {
@@ -51,4 +51,19 @@ export default class PluginsUninstall extends Command {
     }
   }
   /* eslint-enable no-await-in-loop */
+
+  private removeTags(plugin: string) {
+    if (plugin.includes('@')) {
+      const chunked = plugin.split('@')
+      const last = chunked[chunked.length - 1]
+
+      if (!last.includes('/') && chunked.length > 1) {
+        chunked.pop()
+      }
+
+      return chunked.join('@')
+    }
+
+    return plugin
+  }
 }
diff --git a/src/plugins.ts b/src/plugins.ts
@@ -181,13 +181,10 @@ export default class Plugins {
 
   async hasPlugin(name: string) {
     const list = await this.list()
-    return list.find(p => {
-      if (this.friendlyName(p.name) === this.friendlyName(name)) return true
-      if (p.type === 'link') {
-        if (path.resolve(p.root) === path.resolve(name)) return true
-      }
-      return false
-    })
+    const friendly = list.find(p => this.friendlyName(p.name) === this.friendlyName(name))
+    const unfriendly = list.find(p => this.unfriendlyName(p.name) === this.unfriendlyName(name))
+    const link = list.find(p => p.type === 'link' && path.resolve(p.root) === path.resolve(name))
+    return friendly ?? unfriendly ?? link ?? false
   }
 
   async yarnNodeVersion(): Promise<string | undefined> {

diff --git a/test/commands/plugins/index.test.ts b/test/commands/plugins/index.test.ts
@@ -15,6 +15,17 @@ describe('command', () => {
   .do(output => expect(output.stdout).to.equal('no plugins installed\n'))
   .it('installs and uninstalls @oclif/example-plugin-ts')
 
+  test
+  .command(['plugins:install', '@oclif/example-plugin-ts@latest'], {reset: true})
+  .stdout()
+  .command(['plugins'], {reset: true})
+  .do(output => expect(output.stdout).to.contain('@oclif/example-plugin-ts'))
+  .command(['plugins:uninstall', '@oclif/example-plugin-ts@latest'], {reset: true})
+  .stdout()
+  .command(['plugins'], {reset: true})
+  .do(output => expect(output.stdout).to.equal('no plugins installed\n'))
+  .it('installs and uninstalls @oclif/example-plugin-ts with tags')
+
   test
   .command(['plugins:install', 'aliasme'], {reset: true})
   .stdout()