fix(plugins/plugin-bash-like): ls ~ fails

Fixes #7008

Author: myan9

plugins/plugin-bash-like/fs/src/vfs/index.ts

@@ -17,7 +17,17 @@
 import Debug from 'debug'
 import slash from 'slash'
 import { isAbsolute, join } from 'path'
-import { cwd, Arguments, ParsedOptions, REPL, Table, eventBus, getCurrentTab, inBrowser } from '@kui-shell/core'
+import {
+  cwd,
+  expandHomeDir,
+  Arguments,
+  ParsedOptions,
+  REPL,
+  Table,
+  eventBus,
+  getCurrentTab,
+  inBrowser
+} from '@kui-shell/core'
 
 import { FStat } from '../lib/fstat'
 import { KuiGlobOptions, GlobStats } from '../lib/glob'
@@ -183,7 +193,7 @@ export async function mount(vfs: VFS | VFSProducingFunction) {
 
 /** @return the absolute path to `filepath` */
 export function absolute(filepath: string): string {
-  return isAbsolute(filepath) ? filepath : join(cwd(), filepath)
+  return isAbsolute(expandHomeDir(filepath)) ? filepath : join(cwd(), filepath)
 }
 
 /** Lookup compiatible matching mount */

plugins/plugin-bash-like/src/test/bash-like/ls.ts

@@ -28,6 +28,21 @@ describe(`directory listing ${process.env.MOCHA_RUN_TARGET || ''}`, function(thi
       .catch(Common.oops(this, true))
   )
 
+  it('should touch a test file in ~', () =>
+    CLI.command(`touch ~/testls`, this.app)
+      .then(ReplExpect.ok)
+      .catch(Common.oops(this, true)))
+
+  it('should ls -l ~ and see ~/testls', () =>
+    CLI.command('ls -l ~', this.app)
+      .then(ReplExpect.okWith('testls'))
+      .catch(Common.oops(this, true)))
+
+  it('should remove a test file in ~', () =>
+    CLI.command(`rm -f ~/testls`, this.app)
+      .then(ReplExpect.ok)
+      .catch(Common.oops(this, true)))
+
   it('should fail with 404 to ls a non-existing file', () =>
     CLI.command('ls fjdsioafjdsaioffsdaiofjdsaiofjdsaiofjdsaiofjdsaifjdsaiofsa', this.app)
       .then(ReplExpect.error(404))

plugins/plugin-client-test/src/test/api2/vfs.ts

@@ -147,4 +147,28 @@ describe('ls versus vfs', function(this: Common.ISuite) {
     CLI.command('ls -l F2', this.app)
       .then(ReplExpect.ok)
       .catch(Common.oops(this, true)))
+
+  // now try cd into ~
+  it('should cd ~', () =>
+    CLI.command('cd ~', this.app)
+      .then(ReplExpect.ok)
+      .catch(Common.oops(this, true)))
+  it('should touch a testvfs file in ~', () =>
+    CLI.command(`touch testvfs`, this.app)
+      .then(ReplExpect.ok)
+      .catch(Common.oops(this, true)))
+  it('should ls -l ~ and see ~/testvfs', () =>
+    CLI.command('ls -l ~', this.app)
+      .then(ReplExpect.okWith('testvfs'))
+      .catch(Common.oops(this)))
+  it('should remove a testvfs file in ~', () =>
+    CLI.command(`rm -f testvfs`, this.app)
+      .then(ReplExpect.ok)
+      .catch(Common.oops(this, true)))
+
+  // now try cd back to /kuifake/fake2
+  it('should cd /kuifake/fake2', () =>
+    CLI.command('cd /kuifake/fake2', this.app)
+      .then(ReplExpect.okWithString('/kuifake/fake2'))
+      .catch(Common.oops(this, true)))
 })