fix(ivy): Update Todo app to take advantage of optional injector

mhevery · mhevery · commit 7cf605d02973 · 2018-04-13T13:36:09.000-07:00
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -1,4 +1,7 @@
 [
+  {
+    "name": "BLOOM_SIZE"
+  },
   {
     "name": "CIRCULAR$2"
   },
@@ -29,6 +32,12 @@
   {
     "name": "IterableChangeRecord_"
   },
+  {
+    "name": "IterableDiffers"
+  },
+  {
+    "name": "NG_ELEMENT_ID"
+  },
   {
     "name": "NG_HOST_SYMBOL"
   },
@@ -176,6 +185,9 @@
   {
     "name": "_c9"
   },
+  {
+    "name": "_currentInjector"
+  },
   {
     "name": "_devMode"
   },
@@ -218,6 +230,12 @@
   {
     "name": "bindingUpdated"
   },
+  {
+    "name": "bloomFindPossibleInjector"
+  },
+  {
+    "name": "bloomHashBit"
+  },
   {
     "name": "cacheMatchingDirectivesForNode"
   },
@@ -275,9 +293,6 @@
   {
     "name": "currentView"
   },
-  {
-    "name": "defaultIterableDiffers"
-  },
   {
     "name": "defineComponent"
   },
@@ -302,6 +317,9 @@
   {
     "name": "directiveCreate"
   },
+  {
+    "name": "directiveInject"
+  },
   {
     "name": "domRendererFactory3"
   },
@@ -380,6 +398,9 @@
   {
     "name": "getOrCreateElementRef"
   },
+  {
+    "name": "getOrCreateInjectable"
+  },
   {
     "name": "getOrCreateNodeInjector"
   },
@@ -428,6 +449,9 @@
   {
     "name": "initChangeDetectorIfExisting"
   },
+  {
+    "name": "inject"
+  },
   {
     "name": "injectTemplateRef"
   },
@@ -572,6 +596,12 @@
   {
     "name": "scheduleTick"
   },
+  {
+    "name": "searchMatchesQueuedForCreation"
+  },
+  {
+    "name": "setCurrentInjector"
+  },
   {
     "name": "setHostBindings"
   },
diff --git a/packages/core/test/bundling/todo/index.ts b/packages/core/test/bundling/todo/index.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule, NgForOf, NgIf} from '@angular/common';
-import {ChangeDetectionStrategy, Component, EventEmitter, InjectFlags, Injectable, Input, IterableDiffers, NgModule, Output, createInjector, defineInjector, inject, ɵComponentDef as ComponentDef, ɵComponentType as ComponentType, ɵDirectiveDef as DirectiveDef, ɵDirectiveType as DirectiveType, ɵNgOnChangesFeature as NgOnChangesFeature, ɵdefaultIterableDiffers as defaultIterableDiffers, ɵdefineDirective as defineDirective, ɵinjectTemplateRef as injectTemplateRef, ɵinjectViewContainerRef as injectViewContainerRef, ɵmarkDirty as markDirty, ɵrenderComponent as renderComponent} from '@angular/core';
+import {ChangeDetectionStrategy, Component, EventEmitter, InjectFlags, Injectable, Input, IterableDiffers, NgModule, Output, createInjector, defineInjector, inject, ɵComponentDef as ComponentDef, ɵComponentType as ComponentType, ɵDirectiveDef as DirectiveDef, ɵDirectiveType as DirectiveType, ɵNgOnChangesFeature as NgOnChangesFeature, ɵdefaultIterableDiffers as defaultIterableDiffers, ɵdefineDirective as defineDirective, ɵdirectiveInject as directiveInject, ɵinjectTemplateRef as injectTemplateRef, ɵinjectViewContainerRef as injectViewContainerRef, ɵmarkDirty as markDirty, ɵrenderComponent as renderComponent} from '@angular/core';
 
 
 export class Todo {
@@ -23,7 +23,7 @@ export class Todo {
   }
 }
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class TodoStore {
   todos: Array<Todo> = [
     new Todo('Demonstrate Components'),
@@ -108,12 +108,9 @@ export class TodoStore {
   // changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ToDoAppComponent {
-  todoStore: TodoStore;
   newTodoText = '';
 
-  // TODO(misko) Fix injection
-  // constructor(todoStore: TodoStore) { this.todoStore = todoStore; }
-  constructor() { this.todoStore = new TodoStore(); }
+  constructor(public todoStore: TodoStore) {}
 
   stopEditing(todo: Todo, editedTitle: string) {
     todo.title = editedTitle;
@@ -157,10 +154,7 @@ export class ToDoAppComponent {
   type: NgForOf,
   selectors: [['', 'ngFor', '', 'ngForOf', '']],
   factory: () => new NgForOf(
-               injectViewContainerRef(), injectTemplateRef(),
-               // TODO(misko): inject does not work since it needs to be directiveInject
-               // inject(IterableDiffers, defaultIterableDiffers)
-               defaultIterableDiffers),
+               injectViewContainerRef(), injectTemplateRef(), directiveInject(IterableDiffers)),
   features: [NgOnChangesFeature({
     ngForOf: 'ngForOf',
     ngForTrackBy: 'ngForTrackBy',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`[`
	`2`	`+ {`
	`3`	`+ "name": "BLOOM_SIZE"`
	`4`	`+ },`
`2`	`5`	`{`
`3`	`6`	`"name": "CIRCULAR$2"`
`4`	`7`	`},`
`@@ -29,6 +32,12 @@`
`29`	`32`	`{`
`30`	`33`	`"name": "IterableChangeRecord_"`
`31`	`34`	`},`
	`35`	`+ {`
	`36`	`+ "name": "IterableDiffers"`
	`37`	`+ },`
	`38`	`+ {`
	`39`	`+ "name": "NG_ELEMENT_ID"`
	`40`	`+ },`
`32`	`41`	`{`
`33`	`42`	`"name": "NG_HOST_SYMBOL"`
`34`	`43`	`},`
`@@ -176,6 +185,9 @@`
`176`	`185`	`{`
`177`	`186`	`"name": "_c9"`
`178`	`187`	`},`
	`188`	`+ {`
	`189`	`+ "name": "_currentInjector"`
	`190`	`+ },`
`179`	`191`	`{`
`180`	`192`	`"name": "_devMode"`
`181`	`193`	`},`
`@@ -218,6 +230,12 @@`
`218`	`230`	`{`
`219`	`231`	`"name": "bindingUpdated"`
`220`	`232`	`},`
	`233`	`+ {`
	`234`	`+ "name": "bloomFindPossibleInjector"`
	`235`	`+ },`
	`236`	`+ {`
	`237`	`+ "name": "bloomHashBit"`
	`238`	`+ },`
`221`	`239`	`{`
`222`	`240`	`"name": "cacheMatchingDirectivesForNode"`
`223`	`241`	`},`
`@@ -275,9 +293,6 @@`
`275`	`293`	`{`
`276`	`294`	`"name": "currentView"`
`277`	`295`	`},`
`278`		`- {`
`279`		`- "name": "defaultIterableDiffers"`
`280`		`- },`
`281`	`296`	`{`
`282`	`297`	`"name": "defineComponent"`
`283`	`298`	`},`
`@@ -302,6 +317,9 @@`
`302`	`317`	`{`
`303`	`318`	`"name": "directiveCreate"`
`304`	`319`	`},`
	`320`	`+ {`
	`321`	`+ "name": "directiveInject"`
	`322`	`+ },`
`305`	`323`	`{`
`306`	`324`	`"name": "domRendererFactory3"`
`307`	`325`	`},`
`@@ -380,6 +398,9 @@`
`380`	`398`	`{`
`381`	`399`	`"name": "getOrCreateElementRef"`
`382`	`400`	`},`
	`401`	`+ {`
	`402`	`+ "name": "getOrCreateInjectable"`
	`403`	`+ },`
`383`	`404`	`{`
`384`	`405`	`"name": "getOrCreateNodeInjector"`
`385`	`406`	`},`
`@@ -428,6 +449,9 @@`
`428`	`449`	`{`
`429`	`450`	`"name": "initChangeDetectorIfExisting"`
`430`	`451`	`},`
	`452`	`+ {`
	`453`	`+ "name": "inject"`
	`454`	`+ },`
`431`	`455`	`{`
`432`	`456`	`"name": "injectTemplateRef"`
`433`	`457`	`},`
`@@ -572,6 +596,12 @@`
`572`	`596`	`{`
`573`	`597`	`"name": "scheduleTick"`
`574`	`598`	`},`
	`599`	`+ {`
	`600`	`+ "name": "searchMatchesQueuedForCreation"`
	`601`	`+ },`
	`602`	`+ {`
	`603`	`+ "name": "setCurrentInjector"`
	`604`	`+ },`
`575`	`605`	`{`
`576`	`606`	`"name": "setHostBindings"`
`577`	`607`	`},`