Merge pull request #230 from marp-team/resolve-real-dir

Fix path resolution of the directory whose name included glob special chars

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Add a trailing slash to the directory links on server index page to avoid broken path resolution ([#221](https://github.com/marp-team/marp-cli/pull/221) by [@n-ari](https://github.com/n-ari))
 - Restart CSS animations when switching page in bespoke template ([#222](https://github.com/marp-team/marp-cli/pull/222))
+- Fix path resolution of the directory whose name included glob special chars ([#227](https://github.com/marp-team/marp-cli/issues/227), [#230](https://github.com/marp-team/marp-cli/pull/230))
 
 ### Changed
 

src/file.ts

@@ -167,6 +167,7 @@ export class File {
   ): Promise<string[]> {
     const filepaths = new Set<string>()
     const globs: string[] = []
+    const dirs: string[] = []
 
     // Collect passed files that refers to a real path at first
     for (const p of paths) {
@@ -176,6 +177,9 @@ export class File {
         if (s.isFile()) {
           filepaths.add(path.resolve(p))
           continue
+        } else if (s.isDirectory()) {
+          dirs.push(path.resolve(p))
+          continue
         }
       } catch (e) {}
 
@@ -184,13 +188,12 @@ export class File {
     }
 
     // Find remaining path through globby
-    ;(
-      await globby(globs, {
-        absolute: true,
-        ignore: ['**/node_modules'],
-        ...opts,
-      })
-    ).forEach((p) => filepaths.add(p))
+    const gOpts = { absolute: true, ignore: ['**/node_modules'], ...opts }
+    ;(await globby(globs, gOpts)).forEach((p) => filepaths.add(p))
+
+    for (const cwd of dirs) {
+      ;(await globby('.', { cwd, ...gOpts })).forEach((p) => filepaths.add(p))
+    }
 
     return [...filepaths.values()].map((p) => path.normalize(p))
   }

test/marp-cli.ts

@@ -209,7 +209,7 @@ describe('Marp CLI', () => {
       jest.spyOn(cli, 'info').mockImplementation()
 
       expect(await marpCli(['--input-dir', files])).toBe(0)
-      expect(writeFile).toHaveBeenCalledTimes(5)
+      expect(writeFile).toHaveBeenCalledTimes(6)
       writeFile.mock.calls.forEach(([fn]) => expect(fn).toMatch(/\.html$/))
     })
 
@@ -246,14 +246,23 @@ describe('Marp CLI', () => {
       )
     })
 
+    context('when the directory path has included glob pattern', () => {
+      it('converts files in specified dir', async () => {
+        jest.spyOn(cli, 'info').mockImplementation()
+
+        expect(await marpCli(['--input-dir', assetFn('_files/(sp)')])).toBe(0)
+        expect(writeFile).toHaveBeenCalledTimes(1)
+      })
+    })
+
     context('when the output folder is specified by -o option', () => {
       it('converts markdowns with keeping folder structure', async () => {
         const args = ['--input-dir', files, '-o', assetFn('dist')]
 
         jest.spyOn(cli, 'info').mockImplementation()
 
         expect(await marpCli(args)).toBe(0)
-        expect(writeFile).toHaveBeenCalledTimes(5)
+        expect(writeFile).toHaveBeenCalledTimes(6)
 
         const outputFiles = writeFile.mock.calls.map(([fn]) => fn)
         expect(outputFiles).toContain(assetFn('dist/1.html'))
@@ -763,7 +772,7 @@ describe('Marp CLI', () => {
 
       expect(await marpCli([assetFn('_files')])).toBe(0)
       expect(cliInfo.mock.calls.map(([m]) => m)).toContainEqual(
-        expect.stringContaining('5 markdowns')
+        expect.stringContaining('6 markdowns')
       )
     })
 
@@ -789,6 +798,20 @@ describe('Marp CLI', () => {
       })
     })
 
+    context(
+      'when glob special chars are included in real directory path',
+      () => {
+        it('finds out markdown files in specified directory correctly', async () => {
+          jest.spyOn(cli, 'info').mockImplementation()
+          jest
+            .spyOn<any, any>(Converter.prototype, 'convertFiles')
+            .mockImplementation(() => [])
+
+          expect(await marpCli([assetFn('_files/(sp)')])).toBe(0)
+        })
+      }
+    )
+
     context('with --server option', () => {
       it('treats passed directory as an input directory of the server', async () => {
         jest.spyOn(cli, 'info').mockImplementation()

test/server.ts

@@ -175,8 +175,8 @@ describe('Server', () => {
 
         const $ = cheerio.load(response.text)
         expect($('h1').text()).toBe('/')
-        expect($('ul#index li')).toHaveLength(8) // Actual file count
-        expect($('ul#index li.directory')).toHaveLength(4) // Directories
+        expect($('ul#index li')).toHaveLength(9) // Actual file count
+        expect($('ul#index li.directory')).toHaveLength(5) // Directories
         expect($('ul#index li.directory.nodeModules')).toHaveLength(1)
         expect($('ul#index li.convertible')).toHaveLength(3) // Markdown files