refactor

defcc · defcc · commit d3ddf2136384 · 2017-01-06T01:02:46.000+08:00
diff --git a/flow/compiler.js b/flow/compiler.js
@@ -75,14 +75,14 @@ declare type ASTElement = {
   staticInFor?: boolean;
   staticProcessed?: boolean;
   hasBindings?: boolean;
-  hasNormalProp?: true;
 
   text?: string;
   attrs?: Array<{ name: string; value: string }>;
   props?: Array<{ name: string; value: string }>;
   plain?: boolean;
   pre?: true;
   ns?: string;
+  staticProps?: Array<string>;
 
   component?: string;
   inlineTemplate?: true;
diff --git a/src/compiler/helpers.js b/src/compiler/helpers.js
@@ -15,7 +15,10 @@ export function pluckModuleFunction<F: Function> (
     : []
 }
 
-export function addProp (el: ASTElement, name: string, value: string) {
+export function addProp (el: ASTElement, name: string, value: string, fromStaticAttr?: boolean) {
+  if (fromStaticAttr) {
+    (el.staticProps || (el.staticProps = [])).push(name)
+  }
   (el.props || (el.props = [])).push({ name, value })
 }
 
diff --git a/src/compiler/optimizer.js b/src/compiler/optimizer.js
@@ -30,7 +30,7 @@ export function optimize (root: ?ASTElement, options: CompilerOptions) {
 
 function genStaticKeys (keys: string): Function {
   return makeMap(
-    'type,tag,attrsList,attrsMap,plain,parent,children,attrs' +
+    'type,tag,attrsList,attrsMap,plain,parent,children,attrs,staticProps' +
     (keys ? ',' + keys : '')
   )
 }
@@ -100,7 +100,7 @@ function isStatic (node: ASTNode): boolean {
     return true
   }
   const nodeAttrs = Object.keys(node)
-  if (!node.hasNormalProp && node.props && node.props.length) {
+  if (node.staticProps && node.props && node.staticProps.length === node.props.length) {
     remove(nodeAttrs, 'props')
   }
   return !!(node.pre || (
diff --git a/src/compiler/parser/index.js b/src/compiler/parser/index.js
@@ -444,7 +444,6 @@ function processAttrs (el) {
           }
         }
         if (isProp || platformMustUseProp(el.tag, name)) {
-          el.hasNormalProp = true
           addProp(el, name, value)
         } else {
           addAttr(el, name, value)
@@ -482,9 +481,9 @@ function processAttrs (el) {
       // so that patches between dynamic/static are consistent
       if (platformMustUseProp(el.tag, name)) {
         if (name === 'value') {
-          addProp(el, name, JSON.stringify(value))
+          addProp(el, name, JSON.stringify(value), true)
         } else {
-          addProp(el, name, 'true')
+          addProp(el, name, 'true', true)
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,10 @@ export function pluckModuleFunction<F: Function> (`
`15`	`15`	`: []`
`16`	`16`	`}`
`17`	`17`
`18`		`-export function addProp (el: ASTElement, name: string, value: string) {`
	`18`	`+export function addProp (el: ASTElement, name: string, value: string, fromStaticAttr?: boolean) {`
	`19`	`+ if (fromStaticAttr) {`
	`20`	`+ (el.staticProps \|\| (el.staticProps = [])).push(name)`
	`21`	`+ }`
`19`	`22`	`(el.props \|\| (el.props = [])).push({ name, value })`
`20`	`23`	`}`
`21`	`24`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export function optimize (root: ?ASTElement, options: CompilerOptions) {`
`30`	`30`
`31`	`31`	`function genStaticKeys (keys: string): Function {`
`32`	`32`	`return makeMap(`
`33`		`- 'type,tag,attrsList,attrsMap,plain,parent,children,attrs' +`
	`33`	`+ 'type,tag,attrsList,attrsMap,plain,parent,children,attrs,staticProps' +`
`34`	`34`	`(keys ? ',' + keys : '')`
`35`	`35`	`)`
`36`	`36`	`}`
`@@ -100,7 +100,7 @@ function isStatic (node: ASTNode): boolean {`
`100`	`100`	`return true`
`101`	`101`	`}`
`102`	`102`	`const nodeAttrs = Object.keys(node)`
`103`		`- if (!node.hasNormalProp && node.props && node.props.length) {`
	`103`	`+ if (node.staticProps && node.props && node.staticProps.length === node.props.length) {`
`104`	`104`	`remove(nodeAttrs, 'props')`
`105`	`105`	`}`
`106`	`106`	`return !!(node.pre \|\| (`
Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,6 @@ function processAttrs (el) {`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`	`if (isProp \|\| platformMustUseProp(el.tag, name)) {`
`447`		`- el.hasNormalProp = true`
`448`	`447`	`addProp(el, name, value)`
`449`	`448`	`} else {`
`450`	`449`	`addAttr(el, name, value)`
`@@ -482,9 +481,9 @@ function processAttrs (el) {`
`482`	`481`	`// so that patches between dynamic/static are consistent`
`483`	`482`	`if (platformMustUseProp(el.tag, name)) {`
`484`	`483`	`if (name === 'value') {`
`485`		`- addProp(el, name, JSON.stringify(value))`
	`484`	`+ addProp(el, name, JSON.stringify(value), true)`
`486`	`485`	`} else {`
`487`		`- addProp(el, name, 'true')`
	`486`	`+ addProp(el, name, 'true', true)`
`488`	`487`	`}`
`489`	`488`	`}`
`490`	`489`	`}`