Process glob-like path that refers to a real file correctly

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 
 - Fix that cannot find Markdown from directory that includes non-ASCII code ([#108](https://github.com/marp-team/marp-cli/issues/108), [#109](https://github.com/marp-team/marp-cli/pull/109))
+- Process glob-like path that refers to a real file correctly ([#95](https://github.com/marp-team/marp-cli/issues/95), [#117](https://github.com/marp-team/marp-cli/pull/117))
 
 ## v0.11.1 - 2019-06-28
 

src/config.ts

@@ -121,7 +121,7 @@ export class MarpCLIConfig {
     const theme = await this.loadTheme()
     const initialThemes = theme instanceof Theme ? [theme] : []
 
-    const themeSetPathes =
+    const themeSetPaths =
       this.args.themeSet ||
       (this.conf.themeSet
         ? (Array.isArray(this.conf.themeSet)
@@ -131,13 +131,13 @@ export class MarpCLIConfig {
         : [])
 
     const themeSet = await ThemeSet.initialize(
-      (inputDir ? [inputDir] : []).concat(themeSetPathes),
+      (inputDir ? [inputDir] : []).concat(themeSetPaths),
       initialThemes
     )
 
     if (
       themeSet.themes.size <= initialThemes.length &&
-      themeSetPathes.length > 0
+      themeSetPaths.length > 0
     )
       warn('Not found additional theme CSS files.')
 

src/file.ts

@@ -7,6 +7,7 @@ import * as url from 'url'
 import { tmpName } from 'tmp'
 import { promisify } from 'util'
 
+const stat = promisify(fs.stat)
 const mkdirpPromise = promisify<string, any>(mkdirp)
 const readFile = promisify(fs.readFile)
 const tmpNamePromise = promisify(tmpName)
@@ -118,15 +119,35 @@ export class File {
 
   private static stdinBuffer?: Buffer
 
-  static async find(...pathes: string[]): Promise<File[]> {
-    return (await globby(pathes, {
+  static async find(...paths: string[]): Promise<File[]> {
+    const filepaths = new Set<string>()
+    const globs: string[] = []
+
+    // Collect passed files that refers to a real path at first
+    for (const p of paths) {
+      try {
+        const s: fs.Stats = await stat(p)
+
+        if (s.isFile()) {
+          filepaths.add(path.resolve(p))
+          continue
+        }
+      } catch (e) {}
+
+      globs.push(p)
+    }
+
+    // Find remaining path through globby
+    ;(await globby(globs, {
       absolute: true,
       expandDirectories: {
         extensions: [],
         files: markdownExtensions.map(ext => `*.${ext}`),
       },
       ignore: ['**/node_modules'],
-    })).map(p => new File(p))
+    })).forEach(p => filepaths.add(p))
+
+    return [...filepaths.values()].map(p => new File(p))
   }
 
   static async findDir(directory: string): Promise<File[]> {

test/marp-cli.ts

@@ -730,6 +730,17 @@ describe('Marp CLI', () => {
       )
     })
 
+    context('when glob special chars are included in real file path', () => {
+      it('finds out a file correctly', async () => {
+        jest.spyOn(cli, 'info').mockImplementation()
+        jest
+          .spyOn<any, any>(Converter.prototype, 'convertFiles')
+          .mockImplementation(() => [])
+
+        expect(await marpCli([assetFn('_files/字/(non-ascii).md')])).toBe(0)
+      })
+    })
+
     context('when non-ASCII code is included in directory name', () => {
       it('finds out markdown files correctly', async () => {
         jest.spyOn(cli, 'info').mockImplementation()

test/theme.ts

@@ -24,7 +24,7 @@ describe('ThemeSet', () => {
   })
 
   describe('#findPath', () => {
-    it('returns the result of findings from original pathes', async () => {
+    it('returns the result of findings from original paths', async () => {
       const themeSet = await ThemeSet.initialize([themeDir])
       const found = await themeSet.findPath()