feat: Add improved <list-view> syntax: for="item in items"

rigor789 · rigor789 · commit 81af13422863 · 2017-12-21T15:09:31.000Z
diff --git a/platform/nativescript/compiler/modules/index.js b/platform/nativescript/compiler/modules/index.js
@@ -1,6 +1,7 @@
 import class_ from './class'
 import style from './style'
-import scopedSlots from './scopedSlots'
+import listView from './list-view'
+import vTemplate from './v-template'
 import view from './view'
 
-export default [class_, style, scopedSlots, view]
+export default [class_, style, vTemplate, listView, view]
diff --git a/platform/nativescript/compiler/modules/list-view.js b/platform/nativescript/compiler/modules/list-view.js
@@ -0,0 +1,21 @@
+import { normalizeElementName } from '../../element-registry'
+import { parseFor } from 'compiler/parser/index'
+import { getAndRemoveAttr, addRawAttr } from 'compiler/helpers'
+
+function preTransformNode(el) {
+  if (normalizeElementName(el.tag) !== 'listview') {
+    return
+  }
+  const exp = getAndRemoveAttr(el, 'for')
+  if (!exp) return
+
+  const res = parseFor(exp)
+  if (!res) return
+
+  addRawAttr(el, ':items', res.for)
+  addRawAttr(el, '+alias', res.alias)
+}
+
+export default {
+  preTransformNode
+}
diff --git a/platform/nativescript/runtime/components/list-view.js b/platform/nativescript/runtime/components/list-view.js
@@ -91,4 +91,8 @@ class ItemContext {
     this.even = index % 2 === 0
     this.odd = !this.even
   }
+
+  toString() {
+    return this.value && this.value.toString()
+  }
 }
diff --git a/platform/nativescript/runtime/components/v-template.js b/platform/nativescript/runtime/components/v-template.js
@@ -13,6 +13,11 @@ export default {
 
     if: {
       type: String
+    },
+
+    '+alias': {
+      type: String,
+      default: 'item'
     }
   },
 
@@ -26,6 +31,7 @@ export default {
     this.$templates.registerTemplate(
       this.$props.name || (this.$props.if ? `v-template-${tid++}` : 'default'),
       this.$props.if,
+      this.$props['+alias'],
       this.$scopedSlots.default
     )
   },
@@ -38,10 +44,11 @@ export class TemplateBag {
     this._templateMap = new Map()
   }
 
-  registerTemplate(name, condition, scopedFn) {
+  registerTemplate(name, condition, alias, scopedFn) {
     this._templateMap.set(name, {
       condition,
-      conditionFn: this.getConditionFn(condition),
+      alias,
+      conditionFn: this.getConditionFn(condition, alias),
       scopedFn,
       keyedTemplate: new VueKeyedTemplate(name, scopedFn)
     })
@@ -62,8 +69,8 @@ export class TemplateBag {
     }
   }
 
-  getConditionFn(condition) {
-    return new Function('item', `return !!(${condition})`)
+  getConditionFn(condition, alias) {
+    return new Function(alias, `return !!(${condition})`)
   }
 
   getKeyedTemplate(name) {
diff --git a/platform/nativescript/runtime/index.js b/platform/nativescript/runtime/index.js
@@ -86,6 +86,7 @@ Vue.prototype.$mount = function(el, hydrating) {
   return mount.call(this, el, hydrating)
 }
 
+Vue.compile = compileToFunctions
 Vue.prototype.$renderTemplate = function(template, context, oldVnode) {
   let slot = template
   if (typeof template !== 'function') {

Original file line number	Diff line number	Diff line change
`@@ -91,4 +91,8 @@ class ItemContext {`
`91`	`91`	`this.even = index % 2 === 0`
`92`	`92`	`this.odd = !this.even`
`93`	`93`	`}`
	`94`	`+`
	`95`	`+ toString() {`
	`96`	`+ return this.value && this.value.toString()`
	`97`	`+ }`
`94`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ Vue.prototype.$mount = function(el, hydrating) {`
`86`	`86`	`return mount.call(this, el, hydrating)`
`87`	`87`	`}`
`88`	`88`
	`89`	`+Vue.compile = compileToFunctions`
`89`	`90`	`Vue.prototype.$renderTemplate = function(template, context, oldVnode) {`
`90`	`91`	`let slot = template`
`91`	`92`	`if (typeof template !== 'function') {`