vue 2.5.9 → 2.5.13

package/src/core/vdom/patch.js

@@ -263,11 +263,14 @@ export function createPatchFunction (backend) {
 
   function createChildren (vnode, children, insertedVnodeQueue) {
     if (Array.isArray(children)) {
+      if (process.env.NODE_ENV !== 'production') {
+        checkDuplicateKeys(children)
+      }
       for (let i = 0; i < children.length; ++i) {
         createElm(children[i], insertedVnodeQueue, vnode.elm, null, true)
       }
     } else if (isPrimitive(vnode.text)) {
-      nodeOps.appendChild(vnode.elm, nodeOps.createTextNode(vnode.text))
+      nodeOps.appendChild(vnode.elm, nodeOps.createTextNode(String(vnode.text)))
     }
   }
 
@@ -394,6 +397,10 @@ export function createPatchFunction (backend) {
     // during leaving transitions
     const canMove = !removeOnly
 
+    if (process.env.NODE_ENV !== 'production') {
+      checkDuplicateKeys(newCh)
+    }
+
     while (oldStartIdx <= oldEndIdx && newStartIdx <= newEndIdx) {
       if (isUndef(oldStartVnode)) {
         oldStartVnode = oldCh[++oldStartIdx] // Vnode has been moved left
@@ -426,13 +433,6 @@ export function createPatchFunction (backend) {
           createElm(newStartVnode, insertedVnodeQueue, parentElm, oldStartVnode.elm)
         } else {
           vnodeToMove = oldCh[idxInOld]
-          /* istanbul ignore if */
-          if (process.env.NODE_ENV !== 'production' && !vnodeToMove) {
-            warn(
-              'It seems there are duplicate keys that is causing an update error. ' +
-              'Make sure each v-for item has a unique key.'
-            )
-          }
           if (sameVnode(vnodeToMove, newStartVnode)) {
             patchVnode(vnodeToMove, newStartVnode, insertedVnodeQueue)
             oldCh[idxInOld] = undefined
@@ -453,6 +453,24 @@ export function createPatchFunction (backend) {
     }
   }
 
+  function checkDuplicateKeys (children) {
+    const seenKeys = {}
+    for (let i = 0; i < children.length; i++) {
+      const vnode = children[i]
+      const key = vnode.key
+      if (isDef(key)) {
+        if (seenKeys[key]) {
+          warn(
+            `Duplicate keys detected: '${key}'. This may cause an update error.`,
+            vnode.context
+          )
+        } else {
+          seenKeys[key] = true
+        }
+      }
+    }
+  }
+
   function findIdxInOld (node, oldCh, start, end) {
     for (let i = start; i < end; i++) {
       const c = oldCh[i]

package/src/platforms/web/compiler/directives/model.js

@@ -73,11 +73,11 @@ function genCheckboxModel (
   const falseValueBinding = getBindingAttr(el, 'false-value') || 'false'
   addProp(el, 'checked',
     `Array.isArray(${value})` +
-      `?_i(${value},${valueBinding})>-1` + (
-        trueValueBinding === 'true'
-          ? `:(${value})`
-          : `:_q(${value},${trueValueBinding})`
-      )
+    `?_i(${value},${valueBinding})>-1` + (
+      trueValueBinding === 'true'
+        ? `:(${value})`
+        : `:_q(${value},${trueValueBinding})`
+    )
   )
   addHandler(el, 'change',
     `var $$a=${value},` +
@@ -94,9 +94,9 @@ function genCheckboxModel (
 }
 
 function genRadioModel (
-    el: ASTElement,
-    value: string,
-    modifiers: ?ASTModifiers
+  el: ASTElement,
+  value: string,
+  modifiers: ?ASTModifiers
 ) {
   const number = modifiers && modifiers.number
   let valueBinding = getBindingAttr(el, 'value') || 'null'
@@ -106,9 +106,9 @@ function genRadioModel (
 }
 
 function genSelect (
-    el: ASTElement,
-    value: string,
-    modifiers: ?ASTModifiers
+  el: ASTElement,
+  value: string,
+  modifiers: ?ASTModifiers
 ) {
   const number = modifiers && modifiers.number
   const selectedVal = `Array.prototype.filter` +

package/src/platforms/web/compiler/modules/class.js

@@ -11,8 +11,8 @@ function transformNode (el: ASTElement, options: CompilerOptions) {
   const warn = options.warn || baseWarn
   const staticClass = getAndRemoveAttr(el, 'class')
   if (process.env.NODE_ENV !== 'production' && staticClass) {
-    const expression = parseText(staticClass, options.delimiters)
-    if (expression) {
+    const res = parseText(staticClass, options.delimiters)
+    if (res) {
       warn(
         `class="${staticClass}": ` +
         'Interpolation inside attributes has been removed. ' +

package/src/platforms/web/compiler/modules/model.js

@@ -11,6 +11,7 @@
  */
 
 import {
+  addRawAttr,
   getBindingAttr,
   getAndRemoveAttr
 } from 'compiler/helpers'
@@ -77,11 +78,6 @@ function cloneASTElement (el) {
   return createASTElement(el.tag, el.attrsList.slice(), el.parent)
 }
 
-function addRawAttr (el, name, value) {
-  el.attrsMap[name] = value
-  el.attrsList.push({ name, value })
-}
-
 export default {
   preTransformNode
 }

package/src/platforms/web/compiler/modules/style.js

@@ -14,8 +14,8 @@ function transformNode (el: ASTElement, options: CompilerOptions) {
   if (staticStyle) {
     /* istanbul ignore if */
     if (process.env.NODE_ENV !== 'production') {
-      const expression = parseText(staticStyle, options.delimiters)
-      if (expression) {
+      const res = parseText(staticStyle, options.delimiters)
+      if (res) {
         warn(
           `style="${staticStyle}": ` +
           'Interpolation inside attributes has been removed. ' +

package/src/platforms/web/runtime/modules/dom-props.js

@@ -56,12 +56,12 @@ type acceptValueElm = HTMLInputElement | HTMLSelectElement | HTMLOptionElement;
 function shouldUpdateValue (elm: acceptValueElm, checkVal: string): boolean {
   return (!elm.composing && (
     elm.tagName === 'OPTION' ||
-    isDirty(elm, checkVal) ||
-    isInputChanged(elm, checkVal)
+    isNotInFocusAndDirty(elm, checkVal) ||
+    isDirtyWithModifiers(elm, checkVal)
   ))
 }
 
-function isDirty (elm: acceptValueElm, checkVal: string): boolean {
+function isNotInFocusAndDirty (elm: acceptValueElm, checkVal: string): boolean {
   // return true when textbox (.number and .trim) loses focus and its value is
   // not equal to the updated value
   let notInFocus = true
@@ -71,14 +71,20 @@ function isDirty (elm: acceptValueElm, checkVal: string): boolean {
   return notInFocus && elm.value !== checkVal
 }
 
-function isInputChanged (elm: any, newVal: string): boolean {
+function isDirtyWithModifiers (elm: any, newVal: string): boolean {
   const value = elm.value
   const modifiers = elm._vModifiers // injected by v-model runtime
-  if (isDef(modifiers) && modifiers.number) {
-    return toNumber(value) !== toNumber(newVal)
-  }
-  if (isDef(modifiers) && modifiers.trim) {
-    return value.trim() !== newVal.trim()
+  if (isDef(modifiers)) {
+    if (modifiers.lazy) {
+      // inputs with lazy should only be updated when not in focus
+      return false
+    }
+    if (modifiers.number) {
+      return toNumber(value) !== toNumber(newVal)
+    }
+    if (modifiers.trim) {
+      return value.trim() !== newVal.trim()
+    }
   }
   return value !== newVal
 }

package/src/platforms/web/util/class.js

@@ -2,18 +2,18 @@
 
 import { isDef, isObject } from 'shared/util'
 
-export function genClassForVnode (vnode: VNode): string {
+export function genClassForVnode (vnode: VNodeWithData): string {
   let data = vnode.data
   let parentNode = vnode
   let childNode = vnode
   while (isDef(childNode.componentInstance)) {
     childNode = childNode.componentInstance._vnode
-    if (childNode.data) {
+    if (childNode && childNode.data) {
       data = mergeClassData(childNode.data, data)
     }
   }
   while (isDef(parentNode = parentNode.parent)) {
-    if (parentNode.data) {
+    if (parentNode && parentNode.data) {
       data = mergeClassData(data, parentNode.data)
     }
   }

package/src/platforms/web/util/style.js

@@ -40,7 +40,7 @@ export function normalizeStyleBinding (bindingStyle: any): ?Object {
  * parent component style should be after child's
  * so that parent component's style could override it
  */
-export function getStyle (vnode: VNode, checkChild: boolean): Object {
+export function getStyle (vnode: VNodeWithData, checkChild: boolean): Object {
   const res = {}
   let styleData
 
@@ -48,7 +48,10 @@ export function getStyle (vnode: VNode, checkChild: boolean): Object {
     let childNode = vnode
     while (childNode.componentInstance) {
       childNode = childNode.componentInstance._vnode
-      if (childNode.data && (styleData = normalizeStyleData(childNode.data))) {
+      if (
+        childNode && childNode.data &&
+        (styleData = normalizeStyleData(childNode.data))
+      ) {
         extend(res, styleData)
       }
     }

package/src/platforms/weex/compiler/index.js

@@ -12,9 +12,9 @@ import {
   isReservedTag,
   canBeLeftOpenTag,
   getTagNamespace
-} from '../util/index'
+} from '../util/element'
 
-export const baseOptions: CompilerOptions = {
+export const baseOptions: WeexCompilerOptions = {
   modules,
   directives,
   isUnaryTag,
@@ -23,8 +23,30 @@ export const baseOptions: CompilerOptions = {
   isReservedTag,
   getTagNamespace,
   preserveWhitespace: false,
+  recyclable: false,
   staticKeys: genStaticKeys(modules)
 }
 
-const { compile, compileToFunctions } = createCompiler(baseOptions)
-export { compile, compileToFunctions }
+const compiler = createCompiler(baseOptions)
+
+export function compile (
+  template: string,
+  options?: WeexCompilerOptions
+): WeexCompiledResult {
+  let generateAltRender = false
+  if (options && options.recyclable === true) {
+    generateAltRender = true
+    options.recyclable = false
+  }
+  const result = compiler.compile(template, options)
+
+  // generate @render function for <recycle-list>
+  if (options && generateAltRender) {
+    options.recyclable = true
+    // disable static optimizations
+    options.optimize = false
+    const { render } = compiler.compile(template, options)
+    result['@render'] = render
+  }
+  return result
+}

package/src/platforms/weex/compiler/modules/append.js

@@ -1,7 +1,13 @@
 /* @flow */
 
+import { makeMap } from 'shared/util'
+
+// The "unitary tag" means that the tag node and its children
+// must be sent to the native together.
+const isUnitaryTag = makeMap('cell,header,cell-slot,recycle-list', true)
+
 function preTransformNode (el: ASTElement, options: CompilerOptions) {
-  if (el.tag === 'cell' && !el.attrsList.some(item => item.name === 'append')) {
+  if (isUnitaryTag(el.tag) && !el.attrsList.some(item => item.name === 'append')) {
     el.attrsMap.append = 'tree'
     el.attrsList.push({ name: 'append', value: 'tree' })
   }

package/src/platforms/weex/compiler/modules/class.js

@@ -55,7 +55,7 @@ function parseStaticClass (staticClass: ?string, options: CompilerOptions): Stat
       const result = parseText(name, options.delimiters)
       if (result) {
         dynamic = true
-        return result
+        return result.expression
       }
       return JSON.stringify(name)
     })

package/src/platforms/weex/compiler/modules/index.js

@@ -2,8 +2,10 @@ import klass from './class'
 import style from './style'
 import props from './props'
 import append from './append'
+import recycleList from './recycle-list/index'
 
 export default [
+  recycleList,
   klass,
   style,
   props,

package/src/platforms/weex/compiler/modules/recycle-list/component-root.js

@@ -0,0 +1,15 @@
+/* @flow */
+
+import { addAttr } from 'compiler/helpers'
+
+// mark component root nodes as
+export function postTransformComponentRoot (
+  el: ASTElement,
+  options: WeexCompilerOptions
+) {
+  if (!el.parent) {
+    // component root
+    addAttr(el, '@isComponentRoot', 'true')
+    addAttr(el, '@componentProps', '$props || {}')
+  }
+}

package/src/platforms/weex/compiler/modules/recycle-list/component.js

@@ -0,0 +1,16 @@
+/* @flow */
+
+import { addAttr } from 'compiler/helpers'
+import { RECYCLE_LIST_MARKER } from 'weex/util/index'
+
+// mark components as inside recycle-list so that we know we need to invoke
+// their special @render function instead of render in create-component.js
+export function postTransformComponent (
+  el: ASTElement,
+  options: WeexCompilerOptions
+) {
+  // $flow-disable-line (we know isReservedTag is there)
+  if (!options.isReservedTag(el.tag) && el.tag !== 'cell-slot') {
+    addAttr(el, RECYCLE_LIST_MARKER, 'true')
+  }
+}

package/src/platforms/weex/compiler/modules/recycle-list/index.js

@@ -0,0 +1,56 @@
+/* @flow */
+
+import { postTransformComponent } from './component'
+import { postTransformComponentRoot } from './component-root'
+import { postTransformText } from './text'
+import { preTransformVBind } from './v-bind'
+import { preTransformVIf } from './v-if'
+import { preTransformVFor } from './v-for'
+import { postTransformVOn } from './v-on'
+
+let currentRecycleList = null
+
+function shouldCompile (el: ASTElement, options: WeexCompilerOptions) {
+  return options.recyclable ||
+    (currentRecycleList && el !== currentRecycleList)
+}
+
+function preTransformNode (el: ASTElement, options: WeexCompilerOptions) {
+  if (el.tag === 'recycle-list') {
+    currentRecycleList = el
+  }
+  if (shouldCompile(el, options)) {
+    preTransformVBind(el, options)
+    preTransformVIf(el, options) // also v-else-if and v-else
+    preTransformVFor(el, options)
+  }
+}
+
+function transformNode (el: ASTElement, options: WeexCompilerOptions) {
+  if (shouldCompile(el, options)) {
+    // do nothing yet
+  }
+}
+
+function postTransformNode (el: ASTElement, options: WeexCompilerOptions) {
+  if (shouldCompile(el, options)) {
+    // mark child component in parent template
+    postTransformComponent(el, options)
+    // mark root in child component template
+    postTransformComponentRoot(el, options)
+    // <text>: transform children text into value attr
+    if (el.tag === 'text') {
+      postTransformText(el, options)
+    }
+    postTransformVOn(el, options)
+  }
+  if (el === currentRecycleList) {
+    currentRecycleList = null
+  }
+}
+
+export default {
+  preTransformNode,
+  transformNode,
+  postTransformNode
+}

package/src/platforms/weex/compiler/modules/recycle-list/text.js

@@ -0,0 +1,23 @@
+/* @flow */
+
+import { addAttr } from 'compiler/helpers'
+
+function genText (node: ASTNode) {
+  const value = node.type === 3
+    ? node.text
+    : node.type === 2
+      ? node.tokens.length === 1
+        ? node.tokens[0]
+        : node.tokens
+      : ''
+  return JSON.stringify(value)
+}
+
+export function postTransformText (el: ASTElement, options: WeexCompilerOptions) {
+  // weex <text> can only contain text, so the parser
+  // always generates a single child.
+  if (el.children.length) {
+    addAttr(el, 'value', genText(el.children[0]))
+    el.children = []
+  }
+}

package/src/platforms/weex/compiler/modules/recycle-list/v-bind.js

@@ -0,0 +1,22 @@
+/* @flow */
+
+import { camelize } from 'shared/util'
+import { bindRE } from 'compiler/parser/index'
+import { getAndRemoveAttr, addRawAttr } from 'compiler/helpers'
+
+function parseAttrName (name: string): string {
+  return camelize(name.replace(bindRE, ''))
+}
+
+export function preTransformVBind (el: ASTElement, options: WeexCompilerOptions) {
+  for (const attr in el.attrsMap) {
+    if (bindRE.test(attr)) {
+      const name: string = parseAttrName(attr)
+      const value = {
+        '@binding': getAndRemoveAttr(el, attr)
+      }
+      delete el.attrsMap[attr]
+      addRawAttr(el, name, value)
+    }
+  }
+}

package/src/platforms/weex/compiler/modules/recycle-list/v-for.js

@@ -0,0 +1,33 @@
+/* @flow */
+
+import { parseFor } from 'compiler/parser/index'
+import { getAndRemoveAttr, addRawAttr } from 'compiler/helpers'
+
+export function preTransformVFor (el: ASTElement, options: WeexCompilerOptions) {
+  const exp = getAndRemoveAttr(el, 'v-for')
+  if (!exp) {
+    return
+  }
+
+  const res = parseFor(exp)
+  if (!res) {
+    if (process.env.NODE_ENV !== 'production' && options.warn) {
+      options.warn(`Invalid v-for expression: ${exp}`)
+    }
+    return
+  }
+
+  const desc: Object = {
+    '@expression': res.for,
+    '@alias': res.alias
+  }
+  if (res.iterator2) {
+    desc['@key'] = res.iterator1
+    desc['@index'] = res.iterator2
+  } else {
+    desc['@index'] = res.iterator1
+  }
+
+  delete el.attrsMap['v-for']
+  addRawAttr(el, '[[repeat]]', desc)
+}

package/src/platforms/weex/compiler/modules/recycle-list/v-if.js

@@ -0,0 +1,47 @@
+/* @flow */
+
+import { getAndRemoveAttr, addRawAttr } from 'compiler/helpers'
+
+function hasConditionDirective (el: ASTElement): boolean {
+  for (const attr in el.attrsMap) {
+    if (/^v\-if|v\-else|v\-else\-if$/.test(attr)) {
+      return true
+    }
+  }
+  return false
+}
+
+function getPrevMatch (el: ASTElement): any {
+  if (el.parent && el.parent.children) {
+    const prev: Object = el.parent.children[el.parent.children.length - 1]
+    return prev.attrsMap['[[match]]']
+  }
+}
+
+export function preTransformVIf (el: ASTElement, options: WeexCompilerOptions) {
+  if (hasConditionDirective(el)) {
+    let exp
+    const ifExp = getAndRemoveAttr(el, 'v-if', true /* remove from attrsMap */)
+    const elseifExp = getAndRemoveAttr(el, 'v-else-if', true)
+    // don't need the value, but remove it to avoid being generated as a
+    // custom directive
+    getAndRemoveAttr(el, 'v-else', true)
+    if (ifExp) {
+      exp = ifExp
+    } else {
+      const prevMatch = getPrevMatch(el)
+      if (prevMatch) {
+        exp = elseifExp
+          ? `!(${prevMatch}) && (${elseifExp})` // v-else-if
+          : `!(${prevMatch})` // v-else
+      } else if (process.env.NODE_ENV !== 'production' && options.warn) {
+        options.warn(
+          `v-${elseifExp ? ('else-if="' + elseifExp + '"') : 'else'} ` +
+          `used on element <${el.tag}> without corresponding v-if.`
+        )
+        return
+      }
+    }
+    addRawAttr(el, '[[match]]', exp)
+  }
+}

package/src/platforms/weex/compiler/modules/recycle-list/v-on.js

@@ -0,0 +1,25 @@
+/* @flow */
+
+const inlineStatementRE = /^\s*([A-Za-z_$0-9\['\."\]]+)*\s*\(\s*(([A-Za-z_$0-9\['\."\]]+)?(\s*,\s*([A-Za-z_$0-9\['\."\]]+))*)\s*\)$/
+
+function parseHandlerParams (handler: ASTElementHandler) {
+  const res = inlineStatementRE.exec(handler.value)
+  if (res && res[2]) {
+    handler.params = res[2].split(/\s*,\s*/)
+  }
+}
+
+export function postTransformVOn (el: ASTElement, options: WeexCompilerOptions) {
+  const events: ASTElementHandlers | void = el.events
+  if (!events) {
+    return
+  }
+  for (const name in events) {
+    const handler: ASTElementHandler | Array<ASTElementHandler> = events[name]
+    if (Array.isArray(handler)) {
+      handler.map(fn => parseHandlerParams(fn))
+    } else {
+      parseHandlerParams(handler)
+    }
+  }
+}

package/src/platforms/weex/compiler/modules/style.js

@@ -64,7 +64,7 @@ function parseStaticStyle (staticStyle: ?string, options: CompilerOptions): Stat
       const dynamicValue = parseText(value, options.delimiters)
       if (dynamicValue) {
         dynamic = true
-        return key + ':' + dynamicValue
+        return key + ':' + dynamicValue.expression
       }
       return key + ':' + JSON.stringify(value)
     }).filter(result => result)

package/src/platforms/weex/entry-framework.js

@@ -61,12 +61,8 @@ export function createInstance (
   }, timerAPIs, env.services)
 
   appCode = `(function(global){ \n${appCode}\n })(Object.create(this))`
-
   callFunction(instanceVars, appCode)
 
-  // Send `createFinish` signal to native.
-  document.taskCenter.send('dom', { action: 'createFinish' }, [])
-
   return instance
 }
 
@@ -117,53 +113,6 @@ export function getRoot (instanceId) {
   return instance.app.$el.toJSON()
 }
 
-const jsHandlers = {
-  fireEvent: (id, ...args) => {
-    return fireEvent(instances[id], ...args)
-  },
-  callback: (id, ...args) => {
-    return callback(instances[id], ...args)
-  }
-}
-
-function fireEvent (instance, nodeId, type, e, domChanges) {
-  const el = instance.document.getRef(nodeId)
-  if (el) {
-    return instance.document.fireEvent(el, type, e, domChanges)
-  }
-  return new Error(`invalid element reference "${nodeId}"`)
-}
-
-function callback (instance, callbackId, data, ifKeepAlive) {
-  const result = instance.document.taskCenter.callback(callbackId, data, ifKeepAlive)
-  instance.document.taskCenter.send('dom', { action: 'updateFinish' }, [])
-  return result
-}
-
-/**
- * Accept calls from native (event or callback).
- *
- * @param  {string} id
- * @param  {array} tasks list with `method` and `args`
- */
-export function receiveTasks (id, tasks) {
-  const instance = instances[id]
-  if (instance && Array.isArray(tasks)) {
-    const results = []
-    tasks.forEach((task) => {
-      const handler = jsHandlers[task.method]
-      const args = [...task.args]
-      /* istanbul ignore else */
-      if (typeof handler === 'function') {
-        args.unshift(id)
-        results.push(handler(...args))
-      }
-    })
-    return results
-  }
-  return new Error(`invalid instance id "${id}" or tasks`)
-}
-
 /**
  * Create a fresh instance of Vue for each Weex instance.
  */
@@ -208,6 +157,16 @@ function createVueModuleInstance (instanceId, weex) {
         // record instance by id
         instance.app = this
       }
+    },
+    mounted () {
+      const options = this.$options
+      // root component (vm)
+      if (options.el && weex.document) {
+        try {
+          // Send "createFinish" signal to native.
+          weex.document.taskCenter.send('dom', { action: 'createFinish' }, [])
+        } catch (e) {}
+      }
     }
   })
 

package/src/platforms/weex/runtime/index.js

@@ -12,7 +12,7 @@ import {
   isReservedTag,
   isRuntimeComponent,
   isUnknownElement
-} from 'weex/util/index'
+} from 'weex/util/element'
 
 // install platform specific utils
 Vue.config.mustUseProp = mustUseProp