wip: codegen for scoped slots

yyx990803 · yyx990803 · commit 3575ff4a8853 · 2016-11-20T12:03:43.000-05:00
diff --git a/flow/compiler.js b/flow/compiler.js
@@ -87,6 +87,7 @@ declare type ASTElement = {
   transitionMode?: string | null;
   slotName?: ?string;
   slotTarget?: ?string;
+  scopedSlots?: { [name: string]: ASTElement };
 
   ref?: string;
   refInFor?: boolean;
diff --git a/src/compiler/codegen/index.js b/src/compiler/codegen/index.js
@@ -182,20 +182,11 @@ function genData (el: ASTElement): string {
   }
   // inline-template
   if (el.inlineTemplate) {
-    const ast = el.children[0]
-    if (process.env.NODE_ENV !== 'production' && (
-      el.children.length > 1 || ast.type !== 1
-    )) {
-      warn('Inline-template components must have exactly one child element.')
-    }
-    if (ast.type === 1) {
-      const inlineRenderFns = generate(ast, currentOptions)
-      data += `inlineTemplate:{render:function(){${
-        inlineRenderFns.render
-      }},staticRenderFns:[${
-        inlineRenderFns.staticRenderFns.map(code => `function(){${code}}`).join(',')
-      }]}`
-    }
+    data += `${genInlineTemplate(el)},`
+  }
+  // scoped slots
+  if (el.scopedSlots) {
+    data += `${genScopedSlots(el.scopedSlots)},`
   }
   data = data.replace(/,$/, '') + '}'
   // v-bind data wrap
@@ -236,6 +227,39 @@ function genDirectives (el: ASTElement): string | void {
   }
 }
 
+function genInlineTemplate (el) {
+  const ast = el.children[0]
+  if (process.env.NODE_ENV !== 'production' && (
+    el.children.length > 1 || ast.type !== 1
+  )) {
+    warn('Inline-template components must have exactly one child element.')
+  }
+  if (ast.type === 1) {
+    const inlineRenderFns = generate(ast, currentOptions)
+    return `inlineTemplate:{render:function(){${
+      inlineRenderFns.render
+    }},staticRenderFns:[${
+      inlineRenderFns.staticRenderFns.map(code => `function(){${code}}`).join(',')
+    }]}`
+  } else {
+    return ''
+  }
+}
+
+function genScopedSlots (slots) {
+  return `scopedSlots:{${
+    Object.keys(slots).map(key => genScopedSlot(key, slots[key])).join(',')
+  }}`
+}
+
+function genScopedSlot (key: string, el: ASTElement) {
+  return `${key}:function(${String(el.attrsMap.scope)}){` +
+    `return ${el.tag === 'template'
+      ? genChildren(el) || 'void 0'
+      : genElement(el)
+  }}`
+}
+
 function genChildren (el: ASTElement): string | void {
   if (el.children.length) {
     return '[' + el.children.map(genNode).join(',') + ']'
diff --git a/src/compiler/parser/index.js b/src/compiler/parser/index.js
@@ -167,8 +167,10 @@ export function parse (
         }
       }
       if (currentParent && !element.forbidden) {
-        if (element.else) {
+        if (element.else) { // else block
           processElse(element, currentParent)
+        } else if (element.slotTarget && element.attrsMap.scope) { // scoped slot
+          (currentParent.scopedSlots || (currentParent.scopedSlots = {}))[element.slotTarget] = element
         } else {
           currentParent.children.push(element)
           element.parent = currentParent

Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,10 @@ export function parse (`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`if (currentParent && !element.forbidden) {`
`170`		`- if (element.else) {`
	`170`	`+ if (element.else) { // else block`
`171`	`171`	`processElse(element, currentParent)`
	`172`	`+ } else if (element.slotTarget && element.attrsMap.scope) { // scoped slot`
	`173`	`+ (currentParent.scopedSlots \|\| (currentParent.scopedSlots = {}))[element.slotTarget] = element`
`172`	`174`	`} else {`
`173`	`175`	`currentParent.children.push(element)`
`174`	`176`	`element.parent = currentParent`