Skip to content

refactor(compiler-core,runtime-core,shared): use plain-object instead… #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/compiler-core/src/transforms/transformExpression.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import {
parseJS,
walkJS
} from '../utils'
import { globalsWhitelist } from '@vue/shared'
import { isGloballyWhitelisted, makeMap } from '@vue/shared'

const literalsWhitelist = new Set([`true`, `false`, `null`, `this`])
const isLiteralWhitelisted = makeMap('true,false,null,this')

export const transformExpression: NodeTransform = (node, context) => {
if (node.type === NodeTypes.INTERPOLATION) {
Expand Down Expand Up @@ -86,8 +86,8 @@ export function processExpression(
if (
!asParams &&
!context.identifiers[rawExp] &&
!globalsWhitelist.has(rawExp) &&
!literalsWhitelist.has(rawExp)
!isGloballyWhitelisted(rawExp) &&
!isLiteralWhitelisted(rawExp)
) {
node.content = `_ctx.${rawExp}`
}
Expand Down Expand Up @@ -246,7 +246,7 @@ function shouldPrefix(identifier: Identifier, parent: Node) {
// not in an Array destructure pattern
!(parent.type === 'ArrayPattern') &&
// skip whitelisted globals
!globalsWhitelist.has(identifier.name) &&
!isGloballyWhitelisted(identifier.name) &&
// special case for webpack compilation
identifier.name !== `require` &&
// is a special keyword but parsed as identifier
Expand Down
4 changes: 2 additions & 2 deletions packages/runtime-core/src/componentProxy.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ComponentInternalInstance, Data } from './component'
import { nextTick } from './scheduler'
import { instanceWatch } from './apiWatch'
import { EMPTY_OBJ, hasOwn, globalsWhitelist } from '@vue/shared'
import { EMPTY_OBJ, hasOwn, isGloballyWhitelisted } from '@vue/shared'
import { ExtractComputedReturns } from './apiOptions'
import { UnwrapRef, ReactiveEffect } from '@vue/reactivity'
import { warn } from './warning'
Expand Down Expand Up @@ -106,6 +106,6 @@ if (__RUNTIME_COMPILE__) {
// this trap is only called in browser-compiled render functions that use
// `with (this) {}`
PublicInstanceProxyHandlers.has = (_: any, key: string): boolean => {
return key[0] !== '_' && !globalsWhitelist.has(key)
return key[0] !== '_' && !isGloballyWhitelisted(key)
}
}
190 changes: 21 additions & 169 deletions packages/shared/src/element.ts
Original file line number Diff line number Diff line change
@@ -1,176 +1,28 @@
const HTMLTagSet = new Set([
'html',
'body',
'base',
'head',
'link',
'meta',
'style',
'title',
'address',
'article',
'aside',
'footer',
'header',
'h1',
'h2',
'h3',
'h4',
'h5',
'h6',
'hgroup',
'nav',
'section',
'div',
'dd',
'dl',
'dt',
'figcaption',
'figure',
'picture',
'hr',
'img',
'li',
'main',
'ol',
'p',
'pre',
'ul',
'a',
'b',
'abbr',
'bdi',
'bdo',
'br',
'cite',
'code',
'data',
'dfn',
'em',
'i',
'kbd',
'mark',
'q',
'rp',
'rt',
'rtc',
'ruby',
's',
'samp',
'small',
'span',
'strong',
'sub',
'sup',
'time',
'u',
'var',
'wbr',
'area',
'audio',
'map',
'track',
'video',
'embed',
'object',
'param',
'source',
'canvas',
'script',
'noscript',
'del',
'ins',
'caption',
'col',
'colgroup',
'table',
'thead',
'tbody',
'td',
'th',
'tr',
'button',
'datalist',
'fieldset',
'form',
'input',
'label',
'legend',
'meter',
'optgroup',
'option',
'output',
'progress',
'select',
'textarea',
'details',
'dialog',
'menu',
'menuitem',
'summary',
'content',
'element',
'shadow',
'template',
'blockquote',
'iframe',
'tfoot'
])
import { makeMap } from './makeMap'

const HTML_TAGS =
'html,body,base,head,link,meta,style,title,address,article,aside,footer,' +
'header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,div,dd,dl,dt,figcaption,' +
'figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,' +
'data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,s,samp,small,span,strong,sub,sup,' +
'time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,' +
'canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,' +
'th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,' +
'option,output,progress,select,textarea,details,dialog,menu,menuitem,' +
'summary,content,element,shadow,template,blockquote,iframe,tfoot'

/**
* this list is intentionally selective, only covering SVG elements that may
* contain child elements.
*/
const SVGTagSet = new Set([
'svg',
'animate',
'circle',
'clippath',
'cursor',
'defs',
'desc',
'ellipse',
'filter',
'font-face',
'foreignObject',
'g',
'glyph',
'image',
'line',
'marker',
'mask',
'missing-glyph',
'path',
'pattern',
'polygon',
'polyline',
'rect',
'switch',
'symbol',
'text',
'textpath',
'tspan',
'use',
'view'
])
const SVG_TAGS =
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font-face,' +
'foreignObject,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view'

const VoidTagSet = new Set([
'area',
'base',
'br',
'col',
'embed',
'hr',
'img',
'input',
'link',
'meta',
'param',
'source',
'track',
'wbr'
])
const VOID_TAGS =
'area,base,br,col,embed,hr,img,input,link,meta,param,source,track,wbr'

export const isVoidTag = (tag: string) => VoidTagSet.has(tag)
export const isHTMLTag = (tag: string) => HTMLTagSet.has(tag)
export const isSVGTag = (tag: string) => SVGTagSet.has(tag)
export const isHTMLTag = makeMap(HTML_TAGS)
export const isSVGTag = makeMap(SVG_TAGS)
export const isVoidTag = makeMap(VOID_TAGS)
33 changes: 8 additions & 25 deletions packages/shared/src/globalsWhitelist.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,8 @@
export const globalsWhitelist = new Set([
'Infinity',
'undefined',
'NaN',
'isFinite',
'isNaN',
'parseFloat',
'parseInt',
'decodeURI',
'decodeURIComponent',
'encodeURI',
'encodeURIComponent',
'Math',
'Number',
'Date',
'Array',
'Object',
'Boolean',
'String',
'RegExp',
'Map',
'Set',
'JSON',
'Intl'
])
import { makeMap } from './makeMap'

const GLOBALS_WHITE_LISTED =
'Infinity,undefined,NaN,isFinite,isNaN,parseFloat,parseInt,decodeURI,' +
'decodeURIComponent,encodeURI,encodeURIComponent,Math,Number,Date,Array,' +
'Object,Boolean,String,RegExp,Map,Set,JSON,Intl'

export const isGloballyWhitelisted = makeMap(GLOBALS_WHITE_LISTED)
3 changes: 2 additions & 1 deletion packages/shared/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export * from './patchFlags'
export * from './element'
export { globalsWhitelist } from './globalsWhitelist'
export { isGloballyWhitelisted } from './globalsWhitelist'
export { makeMap } from './makeMap'

export const EMPTY_OBJ: { readonly [key: string]: any } = __DEV__
? Object.freeze({})
Expand Down
15 changes: 15 additions & 0 deletions packages/shared/src/makeMap.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Make a map and return a function for checking if a key
* is in that map.
*/
export function makeMap(
str: string,
expectsLowerCase?: boolean
): (key: string) => boolean {
const map: Record<string, boolean> = Object.create(null)
const list: Array<string> = str.split(',')
for (let i = 0; i < list.length; i++) {
map[list[i]] = true
}
return expectsLowerCase ? val => !!map[val.toLowerCase()] : val => !!map[val]
}