refactor: use path.join from stdlib instead of custom join (#1861)

Author: scolladon

__tests__/test-utils-join.js

@@ -4,7 +4,8 @@ const path = require('path').posix || require('path')
 const { join } = require('isomorphic-git/internal-apis')
 
 describe('utils/join', () => {
-  it('should join "good" paths the same as path.join', async () => {
+  describe('when "internal join" generates paths the same as "path.join"', () => {
+    // Tests adapted from path-browserify
     const fixtures = [
       ['/foo/bar', 'baz'],
       ['foo/bar', 'baz'],
@@ -18,60 +19,39 @@ describe('utils/join', () => {
       ['/', '.'],
       ['/', '.git'],
       ['.', '.git'],
+      [],
+      ['foo/x', './bar'],
+      ['foo/x/', './bar'],
+      ['foo/x/', '.', 'bar'],
+      ['.', '.', '.'],
+      ['.', './', '.'],
+      ['.', '/./', '.'],
+      ['.', '/////./', '.'],
+      ['.'],
+      ['', '.'],
+      ['foo', '/bar'],
+      ['foo', ''],
+      ['foo', '', '/bar'],
+      ['/'],
+      ['/', '.'],
+      [''],
+      ['', ''],
+      ['', 'foo'],
+      ['', '', 'foo'],
+      [' /foo'],
+      [' ', 'foo'],
+      [' ', '.'],
+      [' ', ''],
+      ['/', '/foo'],
+      ['/', '//foo'],
+      ['/', '', '/foo'],
     ]
-    for (const fixture of fixtures) {
-      expect(join(...fixture)).toEqual(path.join(...fixture))
-    }
-  })
-  it('should join degenerate paths the same as path.join in these cases', async () => {
-    // Tests adapted from path-browserify
-    const fixtures = [
-      [[], '.'],
-      [['foo/x', './bar'], 'foo/x/bar'],
-      [['foo/x/', './bar'], 'foo/x/bar'],
-      [['foo/x/', '.', 'bar'], 'foo/x/bar'],
-      [['.', '.', '.'], '.'],
-      [['.', './', '.'], '.'],
-      [['.', '/./', '.'], '.'],
-      [['.', '/////./', '.'], '.'],
-      [['.'], '.'],
-      [['', '.'], '.'],
-      [['foo', '/bar'], 'foo/bar'],
-      [['foo', ''], 'foo'],
-      [['foo', '', '/bar'], 'foo/bar'],
-      [['/'], '/'],
-      [['/', '.'], '/'],
-      [[''], '.'],
-      [['', ''], '.'],
-      [['', 'foo'], 'foo'],
-      [['', '', 'foo'], 'foo'],
-      [[' /foo'], ' /foo'],
-      [[' ', 'foo'], ' /foo'],
-      [[' ', '.'], ' '],
-      [[' ', ''], ' '],
-      [['/', '/foo'], '/foo'],
-      [['/', '//foo'], '/foo'],
-      [['/', '', '/foo'], '/foo'],
-    ]
-    for (const [args, result] of fixtures) {
-      expect(join(...args)).toEqual(result)
-      expect(join(...args)).toEqual(path.join(...args))
-    }
-  })
-  it('should join degenerate paths differently from path.join in these cases', async () => {
-    // Tests adapted from path-browserify
-    const disagreeFixtures = [
-      [['./'], '.'],
-      [['.', './'], '.'],
-      [['', '/foo'], 'foo'],
-      [['', '', '/foo'], 'foo'],
-      [['foo/', ''], 'foo'],
-      [['', '/', 'foo'], 'foo'],
-      [['', '/', '/foo'], 'foo'],
-    ]
-    for (const [args, result] of disagreeFixtures) {
-      expect(join(...args)).toEqual(result)
-      expect(join(...args)).not.toEqual(path.join(...args))
-    }
+    fixtures.forEach(fixture => {
+      it(`"${JSON.stringify(fixture)}" should join to "${path.join(
+        ...fixture
+      )}"`, () => {
+        expect(join(...fixture)).toEqual(path.join(...fixture))
+      })
+    })
   })
 })

src/internal-apis.js

@@ -41,7 +41,6 @@ export * from './utils/mergeFile'
 export * from './utils/mergeTree'
 export * from './utils/modified'
 export * from './utils/padHex'
-export * from './utils/path'
 export * from './utils/pkg'
 export * from './utils/resolveTree'
 export * from './utils/shasum'

src/utils/join.js

@@ -1,7 +1 @@
-// For some reason path.posix.join is undefined in webpack
-// Also, this is just much smaller
-import { normalizePath } from './normalizePath.js'
-
-export function join(...parts) {
-  return normalizePath(parts.map(normalizePath).join('/'))
-}
+export { join } from 'path'