🪲 (markdown-render) The slot in the template has a higher priority

Closes #83
vuese · Jun 18, 2019 · a3fb19b · a3fb19b
1 parent 61f1394
commit a3fb19b
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 12 deletions.
diff --git a/packages/markdown-render/__test__/index.test.ts b/packages/markdown-render/__test__/index.test.ts
@@ -33,7 +33,16 @@ test('Proper rendering of the table header', () => {
         describe: 'Table header',
         backerDesc: '`<th>{{title}}</th>`',
         bindings: {},
-        scoped: false
+        scoped: false,
+        target: 'template'
+      },
+      {
+        name: 'header',
+        describe: 'Table header',
+        backerDesc: '`<th>{{title}}</th>`',
+        bindings: {},
+        scoped: false,
+        target: 'script'
       }
     ],
     methods: [

diff --git a/packages/markdown-render/lib/index.ts b/packages/markdown-render/lib/index.ts
@@ -143,6 +143,26 @@ export class Render {
   slotRender(slotsRes: SlotResult[]) {
     const slotConfig = (this.options as RenderOptions).slots
     let code = this.renderTabelHeader(slotConfig)
+
+    // If the template and script contain slots with the same name,
+    // only the slots in the template are rendered
+    const slotInTemplate: SlotResult[] = []
+    const slotInScript: SlotResult[] = []
+    slotsRes.forEach((slot: SlotResult) => {
+      slot.target === 'template'
+        ? slotInTemplate.push(slot)
+        : slotInScript.push(slot)
+    })
+
+    slotsRes = slotInTemplate.concat(
+      slotInScript.filter(ss => {
+        for (let i = 0; i < slotInTemplate.length; i++) {
+          if (ss.name === slotInTemplate[i].name) return false
+        }
+        return true
+      })
+    )
+
     slotsRes.forEach((slot: SlotResult) => {
       const row: string[] = []
       for (let i = 0; i < slotConfig.length; i++) {

diff --git a/packages/parser/__test__/__fixtures__/namedSlot.vue b/packages/parser/__test__/__fixtures__/namedSlot.vue
@@ -10,7 +10,11 @@
 
 <script>
 export default {
-
+  computed: {
+    hasBack() {
+      return this.$slots.header != null
+    }
+  }
 }
 </script>
 

diff --git a/packages/parser/__test__/parseTemplate.test.ts b/packages/parser/__test__/parseTemplate.test.ts
@@ -41,15 +41,18 @@ test('Default slot with slot description in a v-if', () => {
 
 test('Named slot with slot description', () => {
   const sfc: AstResult = getAST('namedSlot.vue')
+  const mockOnSlot = jest.fn(() => {})
   const options: ParserOptions = {
-    onSlot(slotRes) {
-      expect((slotRes as SlotResult).name).toBe('header')
-      expect((slotRes as SlotResult).describe).toBe('head slot')
-      expect((slotRes as SlotResult).backerDesc).toBe('Default Slot Content')
-      expect((slotRes as SlotResult).bindings).toEqual({})
-    }
+    onSlot: mockOnSlot
   }
   parseTemplate(sfc.templateAst, options)
+
+  expect(mockOnSlot.mock.calls.length).toBe(1)
+  const arg = mockOnSlot.mock.calls[0][0]
+  expect((arg as SlotResult).name).toBe('header')
+  expect((arg as SlotResult).describe).toBe('head slot')
+  expect((arg as SlotResult).backerDesc).toBe('Default Slot Content')
+  expect((arg as SlotResult).bindings).toEqual({})
 })
 
 test('Named slot with slot description and bingdings', () => {

diff --git a/packages/parser/lib/index.ts b/packages/parser/lib/index.ts
@@ -91,6 +91,7 @@ export interface SlotResult {
   backerDesc: string
   bindings: AttrsMap
   scoped: boolean
+  target: 'template' | 'script'
 }
 
 export interface ParserOptions {

diff --git a/packages/parser/lib/parseJavascript.ts b/packages/parser/lib/parseJavascript.ts
@@ -211,7 +211,8 @@ export function parseJavascript(ast: bt.File, options: ParserOptions = {}) {
                 ? slotsComments.content.join('')
                 : '',
               bindings: {},
-              scoped: true
+              scoped: true,
+              target: 'script'
             }
 
             options.onSlot(scopedSlots)
@@ -330,7 +331,8 @@ export function parseJavascript(ast: bt.File, options: ParserOptions = {}) {
                 ? slotsComments.content.join('')
                 : '',
               bindings: {},
-              scoped: false
+              scoped: false,
+              target: 'script'
             }
 
             options.onSlot(slotRes)

diff --git a/packages/parser/lib/parseTemplate.ts b/packages/parser/lib/parseTemplate.ts
@@ -9,7 +9,8 @@ export function parseTemplate(templateAst: any, options: ParserOptions) {
         describe: '',
         backerDesc: '',
         bindings: {},
-        scoped: false
+        scoped: false,
+        target: 'template'
       }
       slot.bindings = extractAndFilterAttr(templateAst.attrsMap)
       if (slot.bindings.name) {

diff --git a/packages/parser/lib/processRenderFunction.ts b/packages/parser/lib/processRenderFunction.ts
@@ -43,7 +43,8 @@ export function determineChildren(
         describe: '',
         backerDesc: '',
         scoped: false,
-        bindings: {}
+        bindings: {},
+        target: 'script'
       }
 
       const commentsRes: CommentResult = bt.isExpressionStatement(