Commit6893499

committed

feat: rename inject alias from "name" to "from"

1 parent6dac3db commit6893499Copy full SHA for 6893499

File tree

+24

-7

lines changed

+24

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export function resolveInject (inject: any, vm: Component): ?Object {`
`49`	`49`
`50`	`50`	`for(leti=0;i<keys.length;i++){`
`51`	`51`	`constkey=keys[i]`
`52`		`-constprovideKey=inject[key].name`
	`52`	`+constprovideKey=inject[key].from`
`53`	`53`	`letsource=vm`
`54`	`54`	`while(source){`
`55`	`55`	`if(source._provided&&provideKeyinsource._provided){`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -273,14 +273,14 @@ function normalizeInject (options: Object) {`
`273`	`273`	`constnormalized=options.inject={}`
`274`	`274`	`if(Array.isArray(inject)){`
`275`	`275`	`for(leti=0;i<inject.length;i++){`
`276`		`-normalized[inject[i]]={name:inject[i]}`
	`276`	`+normalized[inject[i]]={from:inject[i]}`
`277`	`277`	`}`
`278`	`278`	`}elseif(isPlainObject(inject)){`
`279`	`279`	`for(constkeyininject){`
`280`	`280`	`constval=inject[key]`
`281`	`281`	`normalized[key]=isPlainObject(val)`
`282`		`- ?extend({name:key},val)`
`283`		`- :{name:val}`
	`282`	`+ ?extend({from:key},val)`
	`283`	`+ :{from:val}`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`	`}`

Lines changed: 20 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -384,12 +384,29 @@ describe('Options provide/inject', () => {`
`384`	`384`	`injected=[this.foo,this.bar,this.baz]`
`385`	`385`	`}`
`386`	`386`	`})`
`387`		-expect(`Injection "foo" not found`).not.toHaveBeenWarned()
`388`		-expect(`Injection "bar" not found`).not.toHaveBeenWarned()
`389`		-expect(`Injection "baz" not found`).not.toHaveBeenWarned()
`390`	`387`	`expect(injected).toEqual([1,false,undefined])`
`391`	`388`	`})`
`392`	`389`
	`390`	`+it('should support name alias and default together',()=>{`
	`391`	`+constvm=newVue({`
	`392`	`+provide:{`
	`393`	`+FOO:2`
	`394`	`+}`
	`395`	`+})`
	`396`	`+newVue({`
	`397`	`+parent:vm,`
	`398`	`+inject:{`
	`399`	`+foo:{from:'FOO',default:1},`
	`400`	`+bar:{default:false},`
	`401`	`+baz:{default:undefined}`
	`402`	`+},`
	`403`	`+created(){`
	`404`	`+injected=[this.foo,this.bar,this.baz]`
	`405`	`+}`
	`406`	`+})`
	`407`	`+expect(injected).toEqual([2,false,undefined])`
	`408`	`+})`
	`409`	`+`
`393`	`410`	`it('should use provided value even if inject has default',()=>{`
`394`	`411`	`constvm=newVue({`
`395`	`412`	`provide:{`

Comments

(0)