fix: get component filename relative (fix #706)

doczjs · Mar 29, 2019 · 84b23ea · 84b23ea
1 parent d81c568
commit 84b23ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/core/docz-core/src/states/props.ts b/core/docz-core/src/states/props.ts
@@ -19,7 +19,9 @@ const getPattern = (config: Config) => {
 
 export const mapToArray = (map: any = []) =>
   Object.entries(map)
-    .map(entry => entry && { key: entry[0], value: entry[1] })
+    .map(entry => {
+      return entry && { key: relative(paths.root, entry[0]), value: entry[1] }
+    })
     .filter(Boolean)
 
 const initial = (config: Config) => async (p: Params) => {
@@ -39,9 +41,8 @@ const add = (p: Params, config: Config) => async (filepath: string) => {
 }
 
 const remove = (p: Params) => async (filepath: string) => {
-  const root = paths.root
   const prev = get('props', p.getState())
-  const next = prev.filter((item: any) => relative(root, item.key) !== filepath)
+  const next = prev.filter((item: any) => item.key !== filepath)
   p.setState('props', next)
 }
 

diff --git a/other-packages/babel-plugin-export-metadata/src/index.js b/other-packages/babel-plugin-export-metadata/src/index.js
@@ -1,3 +1,4 @@
+const path = require('path')
 const { default: template } = require('@babel/template')
 const { get } = require('lodash')
 
@@ -14,7 +15,10 @@ const buildFileMeta = template(`
   }
 `)
 
-const getFilename = state => get(state, 'file.opts.filename')
+const getFilename = state => {
+  const filename = get(state, 'file.opts.filename')
+  return filename && path.relative(process.cwd(), filename)
+}
 
 const getPathName = path =>
   get(path, 'node.id.name') || get(path, 'parent.id.name')

diff --git a/other-packages/babel-plugin-export-metadata/tests/__snapshots__/index.test.js.snap b/other-packages/babel-plugin-export-metadata/tests/__snapshots__/index.test.js.snap
@@ -11,7 +11,7 @@ if (typeof bar !== 'undefined' && bar && bar === Object(bar)) {
     configurable: true,
     value: {
       name: \\"bar\\",
-      filename: \\"/Volumes/Projects/dev/docz/docz/other-packages/babel-plugin-export-metadata/tests/fixtures/example.js\\"
+      filename: \\"tests/fixtures/example.js\\"
     }
   });
 }
@@ -22,7 +22,7 @@ if (typeof bar !== 'undefined' && bar && bar === Object(bar)) {
     configurable: true,
     value: {
       name: \\"bar\\",
-      filename: \\"/Volumes/Projects/dev/docz/docz/other-packages/babel-plugin-export-metadata/tests/fixtures/example.js\\"
+      filename: \\"tests/fixtures/example.js\\"
     }
   });
 }
@@ -49,7 +49,7 @@ if (typeof getOther !== 'undefined' && getOther && getOther === Object(getOther)
     configurable: true,
     value: {
       name: \\"getOther\\",
-      filename: \\"/Volumes/Projects/dev/docz/docz/other-packages/babel-plugin-export-metadata/tests/fixtures/example.js\\"
+      filename: \\"tests/fixtures/example.js\\"
     }
   });
 }
@@ -82,7 +82,7 @@ if (typeof component !== 'undefined' && component && component === Object(compon
     configurable: true,
     value: {
       name: \\"component\\",
-      filename: \\"/Volumes/Projects/dev/docz/docz/other-packages/babel-plugin-export-metadata/tests/fixtures/example.js\\"
+      filename: \\"tests/fixtures/example.js\\"
     }
   });
 }
@@ -103,7 +103,7 @@ if (typeof Abcd !== 'undefined' && Abcd && Abcd === Object(Abcd)) {
     configurable: true,
     value: {
       name: \\"Abcd\\",
-      filename: \\"/Volumes/Projects/dev/docz/docz/other-packages/babel-plugin-export-metadata/tests/fixtures/example.js\\"
+      filename: \\"tests/fixtures/example.js\\"
     }
   });
 }