From bd079369f390c83b319d966fcfda158296d9cc1a Mon Sep 17 00:00:00 2001 From: John Papa Date: Fri, 1 Apr 2016 17:23:34 -0700 Subject: [PATCH 1/5] docs(style-guide): add A2 styleguide - v1 --- .../style-guide/ts/001/app/app.component.ts | 29 + .../style-guide/ts/001/app/hero.model.ts | 9 + .../style-guide/ts/001/app/hero.service.ts | 14 + .../_examples/style-guide/ts/001/app/main.ts | 9 + .../style-guide/ts/001/app/placeholder.ts | 93 +++ .../ts/example-config.json | 0 .../{router => style-guide}/ts/index.html | 2 +- .../docs/_examples/style-guide/ts/plnkr.json | 8 + public/docs/dart/latest/guide/_data.json | 8 +- .../docs/dart/latest/guide/style-guide.jade | 1 + public/docs/js/latest/guide/_data.json | 8 +- public/docs/js/latest/guide/style-guide.jade | 1 + public/docs/ts/latest/guide/_data.json | 6 + public/docs/ts/latest/guide/style-guide.jade | 665 ++++++++++++++++++ 14 files changed, 850 insertions(+), 3 deletions(-) create mode 100644 public/docs/_examples/style-guide/ts/001/app/app.component.ts create mode 100644 public/docs/_examples/style-guide/ts/001/app/hero.model.ts create mode 100644 public/docs/_examples/style-guide/ts/001/app/hero.service.ts create mode 100644 public/docs/_examples/style-guide/ts/001/app/main.ts create mode 100644 public/docs/_examples/style-guide/ts/001/app/placeholder.ts rename public/docs/_examples/{router => style-guide}/ts/example-config.json (100%) rename public/docs/_examples/{router => style-guide}/ts/index.html (97%) create mode 100644 public/docs/_examples/style-guide/ts/plnkr.json create mode 100644 public/docs/dart/latest/guide/style-guide.jade create mode 100644 public/docs/js/latest/guide/style-guide.jade create mode 100644 public/docs/ts/latest/guide/style-guide.jade diff --git a/public/docs/_examples/style-guide/ts/001/app/app.component.ts b/public/docs/_examples/style-guide/ts/001/app/app.component.ts new file mode 100644 index 0000000000..885ef3a0e6 --- /dev/null +++ b/public/docs/_examples/style-guide/ts/001/app/app.component.ts @@ -0,0 +1,29 @@ +// #docplaster + +// #docregion +/* recommended */ + +// app.component.ts +import { Component, OnInit } from 'angular2/core'; + +import { Hero } from './hero'; +import { HeroService } from './hero.service'; + +@Component({ + selector: 'my-app', + template: ` + 
{{heroes | json}}
+ `, + styleUrls: ['app/app.component.css'], + providers: [HeroService] +}) +export class AppComponent implements OnInit{ + heroes: Hero[] = []; + + constructor(private _heroService: HeroService) {} + + ngOnInit() { + this._heroService.getHeroes() + .then(heroes => this.heroes = heroes); + } +} diff --git a/public/docs/_examples/style-guide/ts/001/app/hero.model.ts b/public/docs/_examples/style-guide/ts/001/app/hero.model.ts new file mode 100644 index 0000000000..5246ac4f1c --- /dev/null +++ b/public/docs/_examples/style-guide/ts/001/app/hero.model.ts @@ -0,0 +1,9 @@ +// #docplaster + +// #docregion +/* recommended */ + +export class Hero { + id: number; + name: string; +} diff --git a/public/docs/_examples/style-guide/ts/001/app/hero.service.ts b/public/docs/_examples/style-guide/ts/001/app/hero.service.ts new file mode 100644 index 0000000000..937b543e7e --- /dev/null +++ b/public/docs/_examples/style-guide/ts/001/app/hero.service.ts @@ -0,0 +1,14 @@ +// #docplaster + +// #docregion +/* recommended */ + +import { Injectable } from 'angular2/core'; +import { HEROES } from './mock-heroes'; + +@Injectable() +export class HeroService { + getHeroes() { + return Promise.resolve(HEROES); + } +} diff --git a/public/docs/_examples/style-guide/ts/001/app/main.ts b/public/docs/_examples/style-guide/ts/001/app/main.ts new file mode 100644 index 0000000000..90f0596ef0 --- /dev/null +++ b/public/docs/_examples/style-guide/ts/001/app/main.ts @@ -0,0 +1,9 @@ +// #docplaster + +// #docregion +/* recommended */ + +import { bootstrap } from 'angular2/platform/browser'; +import { AppComponent } from './app.component'; + +bootstrap(AppComponent, []); diff --git a/public/docs/_examples/style-guide/ts/001/app/placeholder.ts b/public/docs/_examples/style-guide/ts/001/app/placeholder.ts new file mode 100644 index 0000000000..9c78c378ce --- /dev/null +++ b/public/docs/_examples/style-guide/ts/001/app/placeholder.ts @@ -0,0 +1,93 @@ +// #docplaster + +// #docregion 001-1 + /* avoid */ + import { bootstrap } from 'angular2/platform/browser'; + import { Component, OnInit } from 'angular2/core'; + + @Component({ + selector: 'my-app', + template: ` +

{{title}}

+ 
{{heroes | json}}
+ `, + styleUrls: ['app/app.component.css'] + }) + export class AppComponent implements OnInit{ + title = 'Tour of Heroes'; + + heroes: Hero[] = []; + + ngOnInit() { + getHeroes().then(heroes => this.heroes = heroes); + } + } + + bootstrap(AppComponent, []); + + function getHeroes() { + return // some promise of data; + } +// #enddocregion 001-1 + + +// #docregion 001-2 + /* recommended */ + + // main.ts + import { bootstrap } from 'angular2/platform/browser'; + import { AppComponent } from './app.component'; + + bootstrap(AppComponent, []); + /* recommended */ + + // app.component.ts + import { Component, OnInit } from 'angular2/core'; + + import { Hero } from './hero'; + import { HeroService } from './hero.service'; + + @Component({ + selector: 'my-app', + template: ` + 
{{heroes | json}}
+ `, + styleUrls: ['app/app.component.css'], + providers: [HeroService] + }) + export class AppComponent implements OnInit{ + heroes: Hero[] = []; + + constructor(private _heroService: HeroService) {} + + ngOnInit() { + this._heroService.getHeroes() + .then(heroes => this.heroes = heroes); + } + } +// #enddocregion 001-2 + +// #docregion 001-3 + /* recommended */ + + // hero.service.ts + import { Injectable } from 'angular2/core'; + import { HEROES } from './mock-heroes'; + + @Injectable() + export class HeroService { + getHeroes() { + return Promise.resolve(HEROES); + } + } +// #enddocregion 001-3 + +// #docregion 001-4 + /* recommended */ + + // hero.ts + export class Hero { + id: number; + name: string; + } +// #enddocregion 001-4 diff --git a/public/docs/_examples/router/ts/example-config.json b/public/docs/_examples/style-guide/ts/example-config.json similarity index 100% rename from public/docs/_examples/router/ts/example-config.json rename to public/docs/_examples/style-guide/ts/example-config.json diff --git a/public/docs/_examples/router/ts/index.html b/public/docs/_examples/style-guide/ts/index.html similarity index 97% rename from public/docs/_examples/router/ts/index.html rename to public/docs/_examples/style-guide/ts/index.html index dae130f8aa..80a3e1af46 100644 --- a/public/docs/_examples/router/ts/index.html +++ b/public/docs/_examples/style-guide/ts/index.html @@ -7,7 +7,7 @@ - Router Sample + Style Guide Sample diff --git a/public/docs/_examples/style-guide/ts/plnkr.json b/public/docs/_examples/style-guide/ts/plnkr.json new file mode 100644 index 0000000000..334ad918b8 --- /dev/null +++ b/public/docs/_examples/style-guide/ts/plnkr.json @@ -0,0 +1,8 @@ +{ + "description": "Style Guide", + "files":[ + "!**/*.d.ts", + "!**/*.js" + ], + "tags": ["style guide, styleguide"] +} \ No newline at end of file diff --git a/public/docs/dart/latest/guide/_data.json b/public/docs/dart/latest/guide/_data.json index fca35dcc06..e481574fa2 100644 --- a/public/docs/dart/latest/guide/_data.json +++ b/public/docs/dart/latest/guide/_data.json @@ -103,7 +103,13 @@ "title": "Structural Directives", "intro": "Angular has a powerful template engine that lets us easily manipulate the DOM structure of our elements." }, - + + "style-guide": { + "title": "Style Guide", + "intro": "Write Angular 2 with style.", + "hide": true + }, + "testing": { "title": "Testing", "intro": "Techniques and practices for testing an Angular 2 app", diff --git a/public/docs/dart/latest/guide/style-guide.jade b/public/docs/dart/latest/guide/style-guide.jade new file mode 100644 index 0000000000..f8df2a84a6 --- /dev/null +++ b/public/docs/dart/latest/guide/style-guide.jade @@ -0,0 +1 @@ +!= partial("../../../_includes/_ts-temp") \ No newline at end of file diff --git a/public/docs/js/latest/guide/_data.json b/public/docs/js/latest/guide/_data.json index f92809bc9e..1396c0c55e 100644 --- a/public/docs/js/latest/guide/_data.json +++ b/public/docs/js/latest/guide/_data.json @@ -102,7 +102,13 @@ "title": "Structural Directives", "intro": "Angular has a powerful template engine that lets us easily manipulate the DOM structure of our elements." }, - + + "style-guide": { + "title": "Style Guide", + "intro": "Write Angular 2 with style.", + "hide": true + }, + "testing": { "title": "Testing", "intro": "Techniques and practices for testing an Angular 2 app", diff --git a/public/docs/js/latest/guide/style-guide.jade b/public/docs/js/latest/guide/style-guide.jade new file mode 100644 index 0000000000..f8df2a84a6 --- /dev/null +++ b/public/docs/js/latest/guide/style-guide.jade @@ -0,0 +1 @@ +!= partial("../../../_includes/_ts-temp") \ No newline at end of file diff --git a/public/docs/ts/latest/guide/_data.json b/public/docs/ts/latest/guide/_data.json index 5366524e6b..2ced3f717b 100644 --- a/public/docs/ts/latest/guide/_data.json +++ b/public/docs/ts/latest/guide/_data.json @@ -103,6 +103,12 @@ "intro": "Angular has a powerful template engine that lets us easily manipulate the DOM structure of our elements." }, + "style-guide": { + "title": "Style Guide", + "intro": "Write Angular 2 with style.", + "hide": true + }, + "testing": { "title": "Testing", "intro": "Techniques and practices for testing an Angular 2 app" diff --git a/public/docs/ts/latest/guide/style-guide.jade b/public/docs/ts/latest/guide/style-guide.jade new file mode 100644 index 0000000000..e1423af810 --- /dev/null +++ b/public/docs/ts/latest/guide/style-guide.jade @@ -0,0 +1,665 @@ +include ../_util-fns + +:marked + Welcome to the Angular 2 Guide of Style + + ## Purpose + + If you are looking for an opinionated style guide for syntax, conventions, and structuring Angular applications, then step right in. + + The purpose of this style guide is to provide guidance on building Angular applications by showing the conventions we use and, more importantly, why we choose them. +.l-main-section +a(id='toc') +:marked + ## Table of Contents + + 1. [Single Responsibility](#single-responsibility) + 1. [Components](#components) + 1. [Services](#services) + 1. [Data Services](#data-services) + 1. [Naming](#naming) + 1. [Application Structure LIFT Principle](#application-structure-lift-principle) + 1. [Application Structure](#application-structure) + 1. [Appendix](#appendix) +:marked + ## Single Responsibility + + ### Rule of 1 + + #### Style 001 + + Define 1 component per file, recommended to be less than 400 lines of code. + + **Why?** One component per file promotes easier unit testing and mocking. + + **Why?** One component per file makes it far easier to read, maintain, and avoid collisions with teams in source control. + + **Why?** One component per file avoids hidden bugs that often arise when combining components in a file where they may share variables, create unwanted closures, or unwanted coupling with dependencies. + + The following example defines the `AppComponent`, handles the bootstrapping, and shared functions all in the same file. + + The key is to make the code more reusable, easier to read, and less mistake prone. + ++makeExample('style-guide/ts/001/app/placeholder.ts', '001-1', 'app.component.ts (component)') +:marked + The same components are now separated into their own files. + ++makeTabs( + 'style-guide/ts/001/app/main.ts,style-guide/ts/001/app/app.component.ts,style-guide/ts/001/app/hero.service.ts,style-guide/ts/001/app/hero.model.ts', + '', + 'app/main.ts, app/app.component.ts, app/hero.service.ts, app/hero.model.ts') +:marked + As the app grows, this rule becomes even more important. + +Back to top + +:marked + ### Small Functions + + #### Style 002 + + - Define small functions, no more than 75 LOC (less is better). + + **Why?** Small functions are easier to test, especially when they do one thing and serve one purpose. + + **Why?** Small functions promote reuse. + + **Why?** Small functions are easier to read. + + **Why?** Small functions are easier to maintain. + + **Why?** Small functions help avoid hidden bugs that come with large functions that share variables with external scope, create unwanted closures, or unwanted coupling with dependencies. + +Back to top +:marked + ## Components + + ### Member Sequence + + #### Style 033 + + - Place properties up top followed by methods. Private members should follow public members, alphabetized. + + **Why?** Placing members in a consistent sequence makes it easy to read and helps you instantly identify which members of the component serve which purpose. + + ```typescript + /* recommended */ + export class ToastComponent implements OnInit { + // public properties + message: string; + title: string; + + // private fields + private _defaults = { + title: '', + message: 'May the Force be with You' + }; + private _toastElement: any; + + // ctor + constructor(private _toastService: ToastService) { } + + // public methods + activate(message = this._defaults.message, title = this._defaults.title) { + this.title = title; + this.message = message; + this._show(); + } + + ngOnInit() { + this._toastElement = document.getElementById('toast'); + } + + // private methods + private _show() { + console.log(this.message); + this._toastElement.style.opacity = 1; + this._toastElement.style.zIndex = 9999; + + window.setTimeout(() => this._hide(), 2500); + } + + private _hide() { + this._toastElement.style.opacity = 0; + window.setTimeout(() => this._toastElement.style.zIndex = 0, 400); + } + } + ``` + +Back to top +:marked + ### Defer Logic to Services + + #### Style 035 + + - Defer logic in a component by delegating to services. + + - Move reusable logic to services and keep components simple and focused on their intended purpose. + + **Why?** Logic may be reused by multiple components when placed within a service and exposed via a function. + + **Why?** Logic in a service can more easily be isolated in a unit test, while the calling logic in the component can be easily mocked. + + **Why?** Removes dependencies and hides implementation details from the component. + + **Why?** Keeps the component slim, trim, and focused. + + ```typescript + // avoid + export class SessionListComponent implements OnInit { + sessions: Session[]; + + constructor(private _http: Http) { } + + getSessions() { + this.sessions = []; + this._http.get(sessionsUrl) + .map((response: Response) => response.json().data) + .catch(this._exceptionService.catchBadResponse) + .finally(() => this._spinnerService.hide()) + .subscribe(sessions => this.sessions = sessions); + } + + + ngOnInit() { + this.getSessions(); + } + } + ``` + + ```typescript + // recommended + export class SessionListComponent implements OnInit { + sessions: Session[]; + + constructor(private _sessionService: SessionService) { } + + getSessions() { + this.sessions = []; + this._sessionService.getSessions() + .subscribe(sessions => this.sessions = sessions); + } + + ngOnInit() { + this.getSessions(); + } + } + ``` + +Back to top + +:marked + ## Services + + ### Singletons + + #### Style 040 + + - Services are singletons withint he same injector. They should be used for sharing data and functionality. + + ```typescript + // service + import { Injectable } from 'angular2/core'; + import { Session } from './session'; + + @Injectable() + export class HeroService { + getHeroes() { + return this._http.get('api/sessions') + .map((response: Response) => response.json().data) + } + } + ``` + +Back to top + +:marked + ### Providing a Service + + #### Style 041 + + - Services should be provided to the Angular 2 injector at the top-most component where they will be shared. + + **Why?** The Angular 2 injector is hierarchical. + + **Why?** When providing the service to a top level component, that instance is shared and available to all child components of that top level component. + + **Why?** This is ideal when a service is sharing methods and has no state, or state that must be shared. + + **Why?** This is not ideal when two different components need different instances of a service. In this scenario it would be better to provide the service at the component level that needs the new and separate instance. + + ```typescript + /* recommended */ + + // app.component.ts + import { Component } from 'angular2/core'; + + import { SpeakerListComponent } from './speakers/speaker-list.component'; + import { SpeakerService } from './common/speaker.service'; + + @Component({ + selector: 'my-app', + template: ` + + `, + directives: [SpeakerListComponent], + providers: [SpeakerService] + }) + export class AppComponent { } + ``` + + ```typescript + /* recommended */ + + // speaker-list.component.ts + import { Component, OnInit } from 'angular2/core'; + + import { SpeakerService } from './common/speaker.service'; + import { Speaker } from './common/speaker'; + + @Component({ + selector: 'my-speakers', + template: ` + 
{{speakers | json}}
+ ` + }) + export class SpeakerListComponent implements OnInit{ + speakers: Speaker[] = []; + + constructor(private _speakerService: SpeakerService) {} + + ngOnInit() { + this._speakerService.getSpeakers().then(speakers => this.speakers = speakers); + } + } + ``` + +Back to top +:marked + ### Single Responsibility + + #### Style 042 + + - Services should have a [single responsibility](https://en.wikipedia.org/wiki/Single_responsibility_principle), that is encapsulated by its context. Once a service begins to exceed that singular purpose, a new one should be created. + +Back to top +:marked + ## Data Services + + ### Separate Data Calls + + #### Style 050 + + - Refactor logic for making data operations and interacting with data to a service. Make data services responsible for XHR calls, local storage, stashing in memory, or any other data operations. + + **Why?** The component's responsibility is for the presentation and gathering of information for the view. It should not care how it gets the data, just that it knows who to ask for it. Separating the data services moves the logic on how to get it to the data service, and lets the component be simpler and more focused on the view. + + **Why?** This makes it easier to test (mock or real) the data calls when testing a component that uses a data service. + + **Why?** Data service implementation may have very specific code to handle the data repository. This may include headers, how to talk to the data, or other services such as `Http`. Separating the logic into a data service encapsulates this logic in a single place hiding the implementation from the outside consumers (perhaps a component), also making it easier to change the implementation. + + ```typescript + // recommended + export class SessionListComponent implements OnInit { + sessions: Session[]; + filteredSessions = this.sessions; + + constructor(private _sessionService: SessionService) { } + + getSessions() { + this.sessions = []; + this._sessionService.getSessions() + .subscribe(sessions => { + this.sessions = this.filteredSessions = sessions; + }, + error => { + console.log('error occurred here'); + console.log(error); + }, + () => { + console.log('completed'); + }); + } + + ngOnInit() { + this.getSessions(); + } + } + ``` + +Back to top +:marked + ## Naming + + ### Naming Guidelines + + #### Style 100 + + - Use consistent names for all components following a pattern that describes the component's feature then (optionally) its type. My recommended pattern is `feature.type.js`. There are 2 names for most assets: + * the file name (`avengers.component.ts`) + * the registered component name with Angular (`Component`) + + **Why?** Naming conventions help provide a consistent way to find content at a glance. Consistency within the project is vital. Consistency with a team is important. Consistency across a company provides tremendous efficiency. + + **Why?** The naming conventions should simply help you find your code faster and make it easier to understand. + + **Why?** Names of folders and files should clearly convey their intent. For example, `app/speakers/speaker-list.component.ts` may contain a component that manages a list of speakers. + +Back to top +:marked + ### File Names + + #### Style 101 + + - Use consistent names for all components following a pattern that describes the component's feature then (optionally) its type. A recommended pattern is `feature.type.ts`. + + - Use conventional suffixes including `*.service.ts`, `*.component.ts`, `*.pipe.ts`. Invent other suffixes where desired for your team, but take care in having too many. + + - use dashes to separate words and dots to separate the descriptive name from the type. + + **Why?** Provides a consistent way to quickly identify components. + + **Why?** Provides a consistent way to quickly find components using an editor or IDE's fuzzy search techniques. + + **Why?** Provides pattern matching for any automated tasks. + + ``` + // recommended + + // Bootstrapping file and main entry point + main.ts + + // Components + speakers.component.ts + speaker-list.component.ts + speaker-detail.component.ts + + // Services + logger.service.ts + speaker.service.ts + exception.service.ts + filter-text.service.ts + + // Models + session.ts + speaker.ts + + // Pipes + ellipsis.pipe.ts + init-caps.pipe.ts + ``` + +Back to top +:marked + ### Test File Names + + #### Style 102 + + - Name test specifications similar to the component they test with a suffix of `spec`. + + **Why?** Provides a consistent way to quickly identify components. + + **Why?** Provides pattern matching for [karma](http://karma-runner.github.io/) or other test runners. + + ``` + // recommended + + // Components + speakers.component.spec.ts + speaker-list.component.spec.ts + speaker-detail.component.spec.ts + + // Services + logger.service.spec.ts + speaker.service.spec.ts + exception.service.spec.ts + filter-text.service.spec.ts + + // Pipes + ellipsis.pipe.spec.ts + init-caps.pipe.spec.ts + ``` + +Back to top +:marked + ### Component Names + + #### Style 103 + + - Use consistent names for all components named after their feature. Use UpperCamelCase for components' symbols. Match the name of the component to the naming of the file + + **Why?** Provides a consistent way to quickly identify and reference components. + + **Why?** UpperCamelCase is conventional for identifying object that can be instantiated using a constructor. + + ```typescript + AppComponent //app.component.ts + SpeakersComponent //speakers.component.ts + SpeakerListComponent //speaker-list.component.ts + SpeakerDetailComponent //speaker-detail.component.ts + ``` + +Back to top +:marked + ### Suffixes + + #### Style 104 + + - Append the component name with the suffix `Component`. + + **Why?** The `Component` suffix is more commonly used and is more explicitly descriptive. + + ```typescript + // recommended + + // speaker-list.component.ts + export class SpeakerListComponent { } + ``` + +Back to top +:marked + ### Service Names + + #### Style 110 + + - Use consistent names for all services named after their feature. Use UpperCamelCase for services. Suffix services with `Service` when it is not clear what they are (e.g. when they are nouns). + + **Why?** Provides a consistent way to quickly identify and reference services. + + **Why?** Clear service names such as `logger` do not require a suffix. + + **Why?** Service names such as `Credit` are nouns and require a suffix and should be named with a suffix when it is not obvious if it is a service or something else. + + ```typescript + SpeakerService // speaker.service.ts + CreditService // credit.service.ts + Logger // logger.service.ts + ``` + +Back to top +:marked + ## Routing + Client-side routing is important for creating a navigation flow between a component tree hierarchy, and composing components that are made of many other child components. + +Back to top +:marked + ### Component Router + + #### Style 130 + + - Separate route configuration into a routing component file, also known as a component router. + + - Use a `` in the component router, where the routes will have their component targets display their templates. + + - Focus the logic in the component router to the routing aspects and its target components. Extract other logic to services and other components. + + **Why?** A component that handles routing is known as the component router, thus this follows the Angular 2 routing pattern. + + **Why?** A component that handles routing is known as the componenter router. + + **Why?** The `` indicates where the tempalte should be displayed for the target route. + + ```typescript + import { Component } from 'angular2/core'; + import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS } from 'angular2/router'; + + import { SpeakersComponent, SpeakerService } from './+speakers'; + import { DashboardComponent } from './+dashboard'; + import { NavComponent } from './layout/nav.component'; + + @Component({ + selector: 'my-app', + templateUrl: 'app/app.component.html', + styleUrls: ['app/app.component.css'], + directives: [ROUTER_DIRECTIVES, NavComponent], + providers: [ + ROUTER_PROVIDERS, + SpeakerService + ] + }) + @RouteConfig([ + { path: '/dashboard', name: 'Dashboard', component: DashboardComponent, useAsDefault: true }, + { path: '/speakers/...', name: 'Speakers', component: SpeakersComponent }, + ]) + export class AppComponent { } + ``` + +Back to top +:marked + ### Route Naming + + #### Style 131 + + - Use the naming convention for the routes with the component name without the Component suffix. + + **Why?** This maps the route name to the component and makes it easy to identify. + + ```typescript + { path: '/dashboard', name: 'Dashboard', component: DashboardComponent } + ``` + +Back to top +:marked + ## Application Structure LIFT Principle + ### LIFT + + #### Style 140 + + - Structure your app such that you can `L`ocate your code quickly, `I`dentify the code at a glance, keep the `F`lattest structure you can, and `T`ry to stay DRY. The structure should follow these 4 basic guidelines, listed in order of importance. + + *Why LIFT?*: Provides a consistent structure that scales well, is modular, and makes it easier to increase developer efficiency by finding code quickly. Another way to check your app structure is to ask yourself: How quickly can you open and work in all of the related files for a feature? + +Back to top +:marked + ### Locate + + #### Style 141 + + - Make locating your code intuitive, simple and fast. + + **Why?** I find this to be super important for a project. If the team cannot find the files they need to work on quickly, they will not be able to work as efficiently as possible, and the structure needs to change. You may not know the file name or where its related files are, so putting them in the most intuitive locations and near each other saves a ton of time. A descriptive folder structure can help with this. + + ``` + /node_modules + /client + /app + /avengers + /blocks + /exception + /logger + /core + /dashboard + /data + /layout + /widgets + /content + index.html + package.json + ``` + +Back to top +:marked + ### Identify + + #### Style 142 + + - When you look at a file you should instantly know what it contains and represents. + + **Why?** You spend less time hunting and pecking for code, and become more efficient. If this means you want longer file names, then so be it. Be descriptive with file names and keeping the contents of the file to exactly 1 component. Avoid files with multiple controllers, multiple services, or a mixture. There are deviations of the 1 per file rule when I have a set of very small features that are all related to each other, they are still easily identifiable. + +Back to top +:marked + ### Flat + + #### Style 143 + + - Keep a flat folder structure as long as possible. When you get to 7+ files, begin considering separation. + + **Why?** Nobody wants to search 7 levels of folders to find a file. Think about menus on web sites … anything deeper than 2 should take serious consideration. In a folder structure there is no hard and fast number rule, but when a folder has 7-10 files, that may be time to create subfolders. Base it on your comfort level. Use a flatter structure until there is an obvious value (to help the rest of LIFT) in creating a new folder. + +Back to top +:marked + ### T-DRY (Try to Stick to DRY) + + #### Style 144 + + - Be DRY, but don't go nuts and sacrifice readability. + + **Why?** Being DRY is important, but not crucial if it sacrifices the others in LIFT, which is why I call it T-DRY. I don’t want to type session-view.html for a view because, well, it’s obviously a view. If it is not obvious or by convention, then I name it. + +Back to top +:marked + ## Application Structure + + ### Overall Guidelines + + #### Style 150 + + - Have a near term view of implementation and a long term vision. In other words, start small but keep in mind on where the app is heading down the road. All of the app's code goes in a root folder named `app`. All content is 1 feature per file. Each component, service, pipe is in its own file. All 3rd party vendor scripts are stored in another root folder and not in the `app` folder. I didn't write them and I don't want them cluttering my app. + + **example coming soon** + +Back to top +:marked + ### Layout + + #### Style 151 + + - Place components that define the overall layout of the application in a folder named `layout`. These may include a shell view and component may act as the container for the app, navigation, menus, content areas, and other regions. + + **Why?** Organizes all layout in a single place re-used throughout the application. + +Back to top +:marked + ### Folders-by-Feature Structure + + #### Style 152 + + - Create folders named for the feature they represent. When a folder grows to contain more than 7 files, start to consider creating a folder for them. Your threshold may be different, so adjust as needed. + + **Why?** A developer can locate the code, identify what each file represents at a glance, the structure is flat as can be, and there is no repetitive nor redundant names. + + **Why?** The LIFT guidelines are all covered. + + **Why?** Helps reduce the app from becoming cluttered through organizing the content and keeping them aligned with the LIFT guidelines. + + **Why?** When there are a lot of files (10+) locating them is easier with a consistent folder structures and more difficult in flat structures. + + **example coming soon** + +Back to top +:marked + ## Appendix + + ### File Templates and Snippets + Use file templates or snippets to help follow consistent styles and patterns. Here are templates and/or snippets for some of the web development editors and IDEs. + + ### Visual Studio Code + + - [Visual Studio Code](https://code.visualstudio.com/) snippets that follow these styles and guidelines. + + - [Snippets for VS Code](https://marketplace.visualstudio.com/items?itemName=johnpapa.Angular2) + + [![Use Extension](https://github.com/johnpapa/vscode-angular2-snippets/raw/master/images/use-extension.gif)](https://marketplace.visualstudio.com/items?itemName=johnpapa.Angular2) + +Back to top From dd7b5176a82c4825dbc5d1aeb8e4287d8d64dbf3 Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Sun, 10 Apr 2016 15:04:04 -0700 Subject: [PATCH 2/5] docs(testing): add tests that involve Angular 2 --- public/docs/_examples/.gitignore | 1 + public/docs/_examples/karma-test-shim.js | 121 +++-- public/docs/_examples/karma.conf.js | 97 ++-- public/docs/_examples/karma.js.conf.js | 68 --- public/docs/_examples/karma.ts.conf.js | 70 --- public/docs/_examples/package.json | 5 +- public/docs/_examples/protractor-conf.old.js | 24 - .../ts/app/toh/hero.service.1.ts | 10 +- .../ts/app/toh/hero.service.ts | 33 +- public/docs/_examples/testing/ts/app/hero.ts | 2 +- .../testing/ts/app/http-hero.service.spec.ts | 148 ++++++ .../testing/ts/app/http-hero.service.ts | 44 ++ .../ts/app/public-external-template.html | 1 + .../_examples/testing/ts/app/public.spec.ts | 458 ++++++++++++++++++ .../docs/_examples/testing/ts/app/public.ts | 133 +++++ public/docs/_examples/testing/ts/test-shim.js | 48 ++ .../testing/ts/unit-tests-public.html | 32 ++ 17 files changed, 1035 insertions(+), 260 deletions(-) delete mode 100644 public/docs/_examples/karma.js.conf.js delete mode 100644 public/docs/_examples/karma.ts.conf.js delete mode 100644 public/docs/_examples/protractor-conf.old.js create mode 100644 public/docs/_examples/testing/ts/app/http-hero.service.spec.ts create mode 100644 public/docs/_examples/testing/ts/app/http-hero.service.ts create mode 100644 public/docs/_examples/testing/ts/app/public-external-template.html create mode 100644 public/docs/_examples/testing/ts/app/public.spec.ts create mode 100644 public/docs/_examples/testing/ts/app/public.ts create mode 100644 public/docs/_examples/testing/ts/test-shim.js create mode 100644 public/docs/_examples/testing/ts/unit-tests-public.html diff --git a/public/docs/_examples/.gitignore b/public/docs/_examples/.gitignore index d821c82bea..a574567c52 100644 --- a/public/docs/_examples/.gitignore +++ b/public/docs/_examples/.gitignore @@ -10,3 +10,4 @@ tsconfig.json tslint.json npm-debug*. **/protractor.config.js +_test-output diff --git a/public/docs/_examples/karma-test-shim.js b/public/docs/_examples/karma-test-shim.js index 8ccb27a727..932744bc69 100644 --- a/public/docs/_examples/karma-test-shim.js +++ b/public/docs/_examples/karma-test-shim.js @@ -1,68 +1,91 @@ -// Tun on full stack traces in errors to help debugging -Error.stackTraceLimit=Infinity; +/*global jasmine, __karma__, window*/ +(function () { +// Error.stackTraceLimit = Infinity; jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; -// // Cancel Karma's synchronous start, -// // we will call `__karma__.start()` later, once all the specs are loaded. -__karma__.loaded = function() {}; +// Cancel Karma's synchronous start, +// we call `__karma__.start()` later, once all the specs are loaded. +__karma__.loaded = function () { }; +// SET THE RUNTIME APPLICATION ROOT HERE +var appRoot ='app'; // no trailing slash! -System.config({ - packages: { - 'base/app': { - defaultExtension: false, - // removed because of issues with raw .js files not being found. - // format: 'register', - map: Object.keys(window.__karma__.files). - filter(onlyAppFiles). - reduce(function createPathRecords(pathsMapping, appPath) { - // creates local module name mapping to global path with karma's fingerprint in path, e.g.: - // './hero.service': '/base/src/app/hero.service.js?f4523daf879cfb7310ef6242682ccf10b2041b3e' - var moduleName = appPath.replace(/^\/base\/app\//, './').replace(/\.js$/, ''); - pathsMapping[moduleName] = appPath + '?' + window.__karma__.files[appPath] - return pathsMapping; - }, {}) +// RegExp for client application base path within karma (which always starts 'base\') +var karmaBase = '^\/base\/'; // RegEx string for base of karma folders +var appPackage = 'base/' + appRoot; //e.g., base/app +var appRootRe = new RegExp(karmaBase + appRoot + '\/'); +var onlyAppFilesRe = new RegExp(karmaBase + appRoot + '\/(?!.*\.spec\.js$)([a-z0-9-_\.\/]+)\.js$'); - } - } -}); +var moduleNames = []; -// old code from angular 44 -// System.import('angular2/src/core/dom/browser_adapter').then(function(browser_adapter) { -// new path for angular 51 -System.import('angular2/src/platform/browser/browser_adapter').then(function(browser_adapter) { - browser_adapter.BrowserDomAdapter.makeCurrent(); -}).then(function() { +// Configure systemjs packages to use the .js extension for imports from the app folder +var packages = {}; +packages[appPackage] = { + defaultExtension: false, + format: 'register', + map: Object.keys(window.__karma__.files) + .filter(onlyAppFiles) + // Create local module name mapping to karma file path for app files + // with karma's fingerprint in query string, e.g.: + // './hero.service': '/base/app/hero.service.js?f4523daf879cfb7310ef6242682ccf10b2041b3e' + .reduce(function (pathsMapping, appPath) { + var moduleName = appPath.replace(appRootRe, './').replace(/\.js$/, ''); + pathsMapping[moduleName] = appPath + '?' + window.__karma__.files[appPath]; + return pathsMapping; + }, {}) + } + +System.config({ packages: packages }); + +// Configure Angular for the browser and +// with test versions of the platform providers +System.import('angular2/testing') + .then(function (testing) { + return System.import('angular2/platform/testing/browser') + .then(function (providers) { + testing.setBaseTestProviders( + providers.TEST_BROWSER_PLATFORM_PROVIDERS, + providers.TEST_BROWSER_APPLICATION_PROVIDERS + ); + }); + }) + +// Load all spec files +// (e.g. 'base/app/hero.service.spec.js') +.then(function () { return Promise.all( - Object.keys(window.__karma__.files) // All files served by Karma. - .filter(onlySpecFiles) - // .map(filePath2moduleName) // Normalize paths to module names. - .map(function(moduleName) { - // loads all spec files via their global module names (e.g. 'base/src/app/hero.service.spec') - return System.import(moduleName); - })); + Object.keys(window.__karma__.files) + .filter(onlySpecFiles) + .map(function (moduleName) { + moduleNames.push(moduleName); + return System.import(moduleName); + })); }) -.then(function() { - __karma__.start(); -}, function(error) { - __karma__.error(error.stack || error); -}); +.then(success, fail); -function filePath2moduleName(filePath) { - return filePath. - replace(/^\//, ''). // remove / prefix - replace(/\.\w+$/, ''); // remove suffix -} - +////// Helpers ////// function onlyAppFiles(filePath) { - return /^\/base\/app\/.*\.js$/.test(filePath) && !onlySpecFiles(filePath); + return onlyAppFilesRe.test(filePath); } - function onlySpecFiles(filePath) { return /\.spec\.js$/.test(filePath); } + +function success () { + console.log( + 'Spec files loaded:\n ' + + moduleNames.join('\n ') + + '\nStarting Jasmine testrunner'); + __karma__.start(); +} + +function fail(error) { + __karma__.error(error.stack || error); +} + +})(); diff --git a/public/docs/_examples/karma.conf.js b/public/docs/_examples/karma.conf.js index 5b07bee380..e128ca2fb3 100644 --- a/public/docs/_examples/karma.conf.js +++ b/public/docs/_examples/karma.conf.js @@ -1,43 +1,82 @@ module.exports = function(config) { + + var appBase = 'app/'; // transpiled app JS files + var appAssets ='base/app/'; // component assets fetched by Angular's compiler + config.set({ - basePath: '', - frameworks: ['jasmine'], - - files: [ - // paths loaded by Karma - {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true}, - {pattern: 'node_modules/angular2/bundles/angular2.js', included: true, watched: true}, - {pattern: 'node_modules/angular2/bundles/testing.js', included: true, watched: true}, - {pattern: 'karma-test-shim.js', included: true, watched: true}, - {pattern: 'app/test/*.js', included: true, watched: true}, - - // paths loaded via module imports - {pattern: 'app/**/*.js', included: false, watched: true}, - - // paths loaded via Angular's component compiler - // (these paths need to be rewritten, see proxies section) - {pattern: 'app/**/*.html', included: false, watched: true}, - {pattern: 'app/**/*.css', included: false, watched: true}, - - // paths to support debugging with source maps in dev tools - {pattern: 'app/**/*.ts', included: false, watched: false}, - {pattern: 'app/**/*.js.map', included: false, watched: false} + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-htmlfile-reporter') ], - // proxied base paths - proxies: { - // required for component assests fetched by Angular's compiler - "/app/": "/base/app/" + customLaunchers: { + // From the CLI. Not used here but interesting + // chrome setup for travis CI using chromium + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } }, - reporters: ['progress'], - port: 9877, + files: [ + // Angular and shim libraries loaded by Karma + { pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: true, watched: true }, + { pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true }, + { pattern: 'node_modules/es6-shim/es6-shim.js', included: true, watched: true }, + { pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: true }, + { pattern: 'node_modules/rxjs/bundles/Rx.js', included: true, watched: true }, + { pattern: 'node_modules/angular2/bundles/angular2.js', included: true, watched: true }, + { pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, watched: true }, + + // External libraries loaded by Karma + { pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, watched: true }, + { pattern: 'node_modules/angular2/bundles/router.dev.js', included: true, watched: true }, + { pattern: 'node_modules/a2-in-memory-web-api/web-api.js', included: true, watched: true }, + + // Configures module loader w/ app and specs, then launch karma + { pattern: 'karma-test-shim.js', included: true, watched: true }, + + // transpiled application & spec code paths loaded via module imports + {pattern: appBase + '**/*.js', included: false, watched: true}, + + // asset (HTML & CSS) paths loaded via Angular's component compiler + // (these paths need to be rewritten, see proxies section) + {pattern: appBase + '**/*.html', included: false, watched: true}, + {pattern: appBase + '**/*.css', included: false, watched: true}, + + // paths for debugging with source maps in dev tools + {pattern: appBase + '**/*.ts', included: false, watched: false}, + {pattern: appBase + '**/*.js.map', included: false, watched: false} + ], + + // proxied base paths for loading assets + proxies: { + // required for component assets fetched by Angular's compiler + "/app/": appAssets + }, + + exclude: [], + preprocessors: {}, + reporters: ['progress', 'html'], + + // HtmlReporter configuration + htmlReporter: { + // Open this file to see results in browser + outputFile: '_test-output/tests.html', + + // Optional + pageTitle: 'Unit Tests', + subPageTitle: __dirname + }, + + port: 9876, colors: true, logLevel: config.LOG_INFO, autoWatch: true, browsers: ['Chrome'], - singleRun: true + singleRun: false }) } diff --git a/public/docs/_examples/karma.js.conf.js b/public/docs/_examples/karma.js.conf.js deleted file mode 100644 index e55127f0f0..0000000000 --- a/public/docs/_examples/karma.js.conf.js +++ /dev/null @@ -1,68 +0,0 @@ -// Karma configuration -// Generated on Mon Aug 10 2015 11:36:40 GMT-0700 (Pacific Daylight Time) - -module.exports = function(config) { - config.set({ - - // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '', - - - // frameworks to use - // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['jasmine'], - - - // list of files / patterns to load in the browser - files: [ - { pattern: 'https://code.angularjs.org/2.0.0-alpha.34/angular2.sfx.dev.js', watched: false }, - - '**/js/*.js', - ], - - - // list of files to exclude - exclude: [ - '**/*.e2e-spec.js' - ], - - - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: { - }, - - - // test results reporter to use - // possible values: 'dots', 'progress' - // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['progress'], - - - // web server port - port: 9876, - - - // enable / disable colors in the output (reporters and logs) - colors: true, - - - // level of logging - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: true, - - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Chrome'], - - - // Continuous Integration mode - // if true, Karma captures browsers, runs the tests and exits - singleRun: false - }) -} diff --git a/public/docs/_examples/karma.ts.conf.js b/public/docs/_examples/karma.ts.conf.js deleted file mode 100644 index 5b2d176b56..0000000000 --- a/public/docs/_examples/karma.ts.conf.js +++ /dev/null @@ -1,70 +0,0 @@ -// Karma configuration -// Generated on Mon Aug 10 2015 11:36:40 GMT-0700 (Pacific Daylight Time) - -module.exports = function(config) { - config.set({ - - // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '', - - - // frameworks to use - // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['jasmine'], - - - // list of files / patterns to load in the browser - files: [ - { pattern: 'https://github.jspm.io/jmcriffey/bower-traceur-runtime@0.0.87/traceur-runtime.js', watched: false }, - { pattern: 'https://jspm.io/system@0.16.js', watched: false }, - { pattern: 'https://code.angularjs.org/2.0.0-alpha.34/angular2.dev.js', watched: false }, - - '**/ts/**/*.spec.js' - ], - - - // list of files to exclude - exclude: [ - '**/*.e2e-spec.js' - ], - - - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: { - }, - - - // test results reporter to use - // possible values: 'dots', 'progress' - // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['progress'], - - - // web server port - port: 9876, - - - // enable / disable colors in the output (reporters and logs) - colors: true, - - - // level of logging - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: true, - - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Chrome'], - - - // Continuous Integration mode - // if true, Karma captures browsers, runs the tests and exits - singleRun: false - }) -} diff --git a/public/docs/_examples/package.json b/public/docs/_examples/package.json index 92908d0c30..a5e20d4c6f 100644 --- a/public/docs/_examples/package.json +++ b/public/docs/_examples/package.json @@ -4,12 +4,12 @@ "description": "Master package.json, the superset of all dependencies for all of the _example package.json files.", "main": "index.js", "scripts": { - "start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ", + "start": "tsc && concurrently \"tsc -w\" \"lite-server\" ", "tsc": "tsc", "tsc:w": "tsc -w", "lite": "lite-server", "live": "live-server", - "test": "karma start karma.conf.js", + "test": "tsc && concurrently \"tsc -w\" \"karma start karma.conf.js\"", "build-and-test": "npm run tsc && npm run test", "http-server": "tsc && http-server", "http-server:e2e": "http-server", @@ -42,6 +42,7 @@ "karma": "^0.13.22", "karma-chrome-launcher": "^0.2.3", "karma-cli": "^0.1.2", + "karma-htmlfile-reporter": "^0.2.2", "karma-jasmine": "^0.3.8", "live-server": "^0.9.2", "protractor": "^3.2.2", diff --git a/public/docs/_examples/protractor-conf.old.js b/public/docs/_examples/protractor-conf.old.js deleted file mode 100644 index 12dd89ab9f..0000000000 --- a/public/docs/_examples/protractor-conf.old.js +++ /dev/null @@ -1,24 +0,0 @@ -exports.config = { - onPrepare: function() { - patchProtractorWait(browser); - }, - seleniumAddress: 'http://localhost:4444/wd/hub', - baseUrl: 'http://localhost:8080/', - specs: [ - '**/*e2e-spec.js' - ] -}; - -// Disable waiting for Angular as we don't have an integration layer yet... -// TODO(tbosch): Implement a proper debugging API for Ng2.0, remove this here -// and the sleeps in all tests. -function patchProtractorWait(browser) { - browser.ignoreSynchronization = true; - var _get = browser.get; - var sleepInterval = process.env.TRAVIS || process.env.JENKINS_URL ? 14000 : 8000; - browser.get = function() { - var result = _get.apply(this, arguments); - browser.sleep(sleepInterval); - return result; - } -} diff --git a/public/docs/_examples/server-communication/ts/app/toh/hero.service.1.ts b/public/docs/_examples/server-communication/ts/app/toh/hero.service.1.ts index d5734fffc5..05b97fa75d 100644 --- a/public/docs/_examples/server-communication/ts/app/toh/hero.service.1.ts +++ b/public/docs/_examples/server-communication/ts/app/toh/hero.service.1.ts @@ -3,7 +3,7 @@ // #docregion import {Injectable} from 'angular2/core'; -import {Http, Response} from 'angular2/http'; +import {Http} from 'angular2/http'; import {Headers, RequestOptions} from 'angular2/http'; import {Hero} from './hero'; @@ -32,13 +32,13 @@ export class HeroService { .then(res => res.json().data) .catch(this.handleError); } - private handleError (error: any) { // in a real world app, we may send the error to some remote logging infrastructure - // instead of just logging it to the console - console.error(error); - return Promise.reject(error.message || error.json().error || 'Server error'); + console.error(error); // log to console instead + let errMsg = error.message || 'Server error'; + return Promise.reject(errMsg); } + // #enddocregion methods } // #enddocregion diff --git a/public/docs/_examples/server-communication/ts/app/toh/hero.service.ts b/public/docs/_examples/server-communication/ts/app/toh/hero.service.ts index 7ff9805ac0..4e9a0d9070 100644 --- a/public/docs/_examples/server-communication/ts/app/toh/hero.service.ts +++ b/public/docs/_examples/server-communication/ts/app/toh/hero.service.ts @@ -3,7 +3,7 @@ // #docregion // #docregion v1 import {Injectable} from 'angular2/core'; -import {Http, Response} from 'angular2/http'; +import {Http} from 'angular2/http'; // #enddocregion v1 // #docregion import-request-options import {Headers, RequestOptions} from 'angular2/http'; @@ -32,10 +32,10 @@ export class HeroService { // #docregion methods // #docregion error-handling - getHeroes () { + getHeroes (): Observable { // #docregion http-get, http-get-v1 return this.http.get(this._heroesUrl) - .map(res => res.json().data) + .map(this.extractData) // #enddocregion v1, http-get-v1, error-handling .do(data => console.log(data)) // eyeball results in the console // #docregion v1, http-get-v1, error-handling @@ -46,27 +46,36 @@ export class HeroService { // #enddocregion v1 // #docregion addhero - addHero (name: string) : Observable { + addHero (name: string): Observable { let body = JSON.stringify({ name }); - //#docregion headers + // #docregion headers let headers = new Headers({ 'Content-Type': 'application/json' }); let options = new RequestOptions({ headers: headers }); return this.http.post(this._heroesUrl, body, options) - //#enddocregion headers - .map(res => res.json().data) - .catch(this.handleError) + // #enddocregion headers + .map(this.extractData) + .catch(this.handleError); } // #enddocregion addhero // #docregion v1 + + private extractData(res: Response) { + if (res.status < 200 || res.status >= 300) { + throw new Error('Bad response status: ' + res.status); + } + let body = res.json(); + return body.data || { }; + } + // #docregion error-handling - private handleError (error: Response) { + private handleError (error: any) { // in a real world app, we may send the error to some remote logging infrastructure - // instead of just logging it to the console - console.error(error); - return Observable.throw(error.json().error || 'Server error'); + console.error(error); // log to console instead + let errMsg = error.message || 'Server error'; + return Observable.throw(errMsg); } // #enddocregion error-handling // #enddocregion methods diff --git a/public/docs/_examples/testing/ts/app/hero.ts b/public/docs/_examples/testing/ts/app/hero.ts index 2b89781da5..8f7cc205c8 100644 --- a/public/docs/_examples/testing/ts/app/hero.ts +++ b/public/docs/_examples/testing/ts/app/hero.ts @@ -1,5 +1,5 @@ // #docregion -export interface Hero { +export class Hero { id: number; name: string; } diff --git a/public/docs/_examples/testing/ts/app/http-hero.service.spec.ts b/public/docs/_examples/testing/ts/app/http-hero.service.spec.ts new file mode 100644 index 0000000000..f5d61b4955 --- /dev/null +++ b/public/docs/_examples/testing/ts/app/http-hero.service.spec.ts @@ -0,0 +1,148 @@ +/* tslint:disable:no-unused-variable */ +import { + it, + iit, + xit, + describe, + ddescribe, + xdescribe, + expect, + fakeAsync, + tick, + beforeEach, + inject, + injectAsync, + withProviders, + beforeEachProviders +} from 'angular2/testing'; + +import { provide } from 'angular2/core'; + +import { + MockBackend, + MockConnection } from 'angular2/src/http/backends/mock_backend'; + +import { + BaseRequestOptions, + ConnectionBackend, + Request, + RequestMethod, + RequestOptions, + Response, + ResponseOptions, + URLSearchParams, + HTTP_PROVIDERS, + XHRBackend, + Http} from 'angular2/http'; + +// Add all operators to Observable +import 'rxjs/Rx'; +import { Observable } from 'rxjs/Observable'; + +import { Hero } from './hero'; +import { HeroService } from './http-hero.service'; + +type HeroData = {id: string, name: string} + +const makeHeroData = () => [ + { "id": "1", "name": "Windstorm" }, + { "id": "2", "name": "Bombasto" }, + { "id": "3", "name": "Magneta" }, + { "id": "4", "name": "Tornado" } +]; + +// HeroService expects response data like {data: {the-data}} +const makeResponseData = (data: {}) => {return { data }; }; + +//////// SPECS ///////////// +describe('Http-HeroService (mockBackend)', () => { + + beforeEachProviders(() => [ + HTTP_PROVIDERS, + provide(XHRBackend, {useClass: MockBackend}) + ]); + + it('can instantiate service when inject service', + withProviders(() => [HeroService]) + .inject([HeroService], (service: HeroService) => { + expect(service instanceof HeroService).toBe(true); + })); + + + it('can instantiate service with "new"', inject([Http], (http: Http) => { + expect(http).not.toBeNull('http should be provided'); + let service = new HeroService(http); + expect(service instanceof HeroService).toBe(true, 'new service should be ok'); + })); + + + it('can provide the mockBackend as XHRBackend', + inject([XHRBackend], (backend: MockBackend) => { + expect(backend).not.toBeNull('backend should be provided'); + })); + + describe('when getHeroes', () => { + let backend: MockBackend; + let service: HeroService; + let fakeHeroes: HeroData[]; + let response: Response; + + + beforeEach(inject([Http, XHRBackend], (http: Http, be: MockBackend) => { + backend = be; + service = new HeroService(http); + fakeHeroes = makeHeroData(); + let options = new ResponseOptions({status: 200, body: {data: fakeHeroes}}); + response = new Response(options); + })); + + it('should have expected fake heroes (then)', injectAsync([], () => { + backend.connections.subscribe((c: MockConnection) => c.mockRespond(response)); + + return service.getHeroes().toPromise() + // .then(() => Promise.reject('deliberate')) + .then(heroes => { + expect(heroes.length).toEqual(fakeHeroes.length, + 'should have expected no. of heroes'); + }); + })); + + it('should have expected fake heroes (Observable.do)', injectAsync([], () => { + backend.connections.subscribe((c: MockConnection) => c.mockRespond(response)); + + return service.getHeroes() + .do(heroes => { + expect(heroes.length).toEqual(fakeHeroes.length, + 'should have expected no. of heroes'); + }) + .toPromise(); + })); + + + it('should be OK returning no heroes', injectAsync([], () => { + let resp = new Response(new ResponseOptions({status: 200, body: {data: []}})); + backend.connections.subscribe((c: MockConnection) => c.mockRespond(resp)); + + return service.getHeroes() + .do(heroes => { + expect(heroes.length).toEqual(0, 'should have no heroes'); + }) + .toPromise(); + })); + + it('should treat 404 as an Observable error', injectAsync([], () => { + let resp = new Response(new ResponseOptions({status: 404})); + backend.connections.subscribe((c: MockConnection) => c.mockRespond(resp)); + + return service.getHeroes() + .do(heroes => { + fail('should not respond with heroes'); + }) + .catch(err => { + expect(err).toMatch(/Bad response status/, 'should catch bad response status code'); + return Observable.of(null); // failure is the expected test result + }) + .toPromise(); + })); + }); +}); diff --git a/public/docs/_examples/testing/ts/app/http-hero.service.ts b/public/docs/_examples/testing/ts/app/http-hero.service.ts new file mode 100644 index 0000000000..40c2f37866 --- /dev/null +++ b/public/docs/_examples/testing/ts/app/http-hero.service.ts @@ -0,0 +1,44 @@ +// #docplaster +// #docregion +import {Injectable} from 'angular2/core'; +import {Http, Response} from 'angular2/http'; +import {Headers, RequestOptions} from 'angular2/http'; +import {Hero} from './hero'; +import {Observable} from 'rxjs/Observable'; + +@Injectable() +export class HeroService { + constructor (private http: Http) {} + private _heroesUrl = 'app/heroes'; // URL to web api + getHeroes (): Observable { + return this.http.get(this._heroesUrl) + .map(this.extractData) + // .do(data => console.log(data)) // eyeball results in the console + .catch(this.handleError); + } + + addHero (name: string): Observable { + let body = JSON.stringify({ name }); + let headers = new Headers({ 'Content-Type': 'application/json' }); + let options = new RequestOptions({ headers: headers }); + + return this.http.post(this._heroesUrl, body, options) + .map(this.extractData) + .catch(this.handleError); + } + + private extractData(res: Response) { + if (res.status < 200 || res.status >= 300) { + throw new Error('Bad response status: ' + res.status); + } + let body = res.json(); + return body.data || { }; + } + + private handleError (error: any) { + // in a real world app, we may send the error to some remote logging infrastructure + let errMsg = error.message || 'Server error'; + console.error(errMsg); // log to console instead + return Observable.throw(errMsg); + } +} diff --git a/public/docs/_examples/testing/ts/app/public-external-template.html b/public/docs/_examples/testing/ts/app/public-external-template.html new file mode 100644 index 0000000000..4c2b23755f --- /dev/null +++ b/public/docs/_examples/testing/ts/app/public-external-template.html @@ -0,0 +1 @@ +from external template diff --git a/public/docs/_examples/testing/ts/app/public.spec.ts b/public/docs/_examples/testing/ts/app/public.spec.ts new file mode 100644 index 0000000000..1ccd8c89f4 --- /dev/null +++ b/public/docs/_examples/testing/ts/app/public.spec.ts @@ -0,0 +1,458 @@ +// Based on https://github.com/angular/angular/blob/master/modules/angular2/test/testing/testing_public_spec.ts +/* tslint:disable:no-unused-variable */ +import { + BadTemplateUrl, ButtonComp, + ChildChildComp, ChildComp, ChildWithChildComp, + ExternalTemplateComp, + FancyService, MockFancyService, + MyIfComp, + MockChildComp, MockChildChildComp, + ParentComp, + TestProvidersComp, TestViewProvidersComp +} from './public'; + +import { + it, + iit, + xit, + describe, + ddescribe, + xdescribe, + expect, + fakeAsync, + tick, + beforeEach, + inject, + injectAsync, + withProviders, + beforeEachProviders, + TestComponentBuilder +} from 'angular2/testing'; + +import { provide } from 'angular2/core'; +import { ViewMetadata } from 'angular2/core'; +import { PromiseWrapper } from 'angular2/src/facade/promise'; +import { XHR } from 'angular2/src/compiler/xhr'; +import { XHRImpl } from 'angular2/src/platform/browser/xhr_impl'; + +/////////// Module Preparation /////////////////////// +interface Done { + (): void; + fail: (err: any) => void; +} + +//////// SPECS ///////////// + +/// Verify can use Angular testing's DOM abstraction to access DOM + +describe('angular2 jasmine matchers', () => { + describe('toHaveCssClass', () => { + it('should assert that the CSS class is present', () => { + let el = document.createElement('div'); + el.classList.add('matias'); + expect(el).toHaveCssClass('matias'); + }); + + it('should assert that the CSS class is not present', () => { + let el = document.createElement('div'); + el.classList.add('matias'); + expect(el).not.toHaveCssClass('fatias'); + }); + }); + + describe('toHaveCssStyle', () => { + it('should assert that the CSS style is present', () => { + let el = document.createElement('div'); + expect(el).not.toHaveCssStyle('width'); + + el.style.setProperty('width', '100px'); + expect(el).toHaveCssStyle('width'); + }); + + it('should assert that the styles are matched against the element', () => { + let el = document.createElement('div'); + expect(el).not.toHaveCssStyle({width: '100px', height: '555px'}); + + el.style.setProperty('width', '100px'); + expect(el).toHaveCssStyle({width: '100px'}); + expect(el).not.toHaveCssStyle({width: '100px', height: '555px'}); + + el.style.setProperty('height', '555px'); + expect(el).toHaveCssStyle({height: '555px'}); + expect(el).toHaveCssStyle({width: '100px', height: '555px'}); + }); + }); +}); + +describe('using the test injector with the inject helper', () => { + it('should run normal tests', () => { expect(true).toEqual(true); }); + + it('should run normal async tests', (done: Done) => { + setTimeout(() => { + expect(true).toEqual(true); + done(); + }, 0); + }); + + it('provides a real XHR instance', + inject([XHR], (xhr: any) => { expect(xhr).toBeAnInstanceOf(XHRImpl); })); + + describe('setting up Providers with FancyService', () => { + beforeEachProviders(() => [ + provide(FancyService, {useValue: new FancyService()}) + ]); + + it('should use FancyService', + inject([FancyService], (service: FancyService) => { + expect(service.value).toEqual('real value'); + })); + + it('test should wait for FancyService.getAsyncValue', + injectAsync([FancyService], (service: FancyService) => { + return service.getAsyncValue().then( + (value) => { expect(value).toEqual('async value'); }); + })); + + // Experimental: write async tests synchonously by faking async processing + it('should allow the use of fakeAsync (Experimental)', + inject([FancyService], fakeAsync((service: FancyService) => { + let value: any; + service.getAsyncValue().then((val: any) => value = val); + tick(); // Trigger JS engine cycle until all promises resolve. + expect(value).toEqual('async value'); + }))); + + describe('using inner beforeEach to inject-and-modify FancyService', () => { + beforeEach(inject([FancyService], (service: FancyService) => { + service.value = 'value modified in beforeEach'; + })); + + it('should use modified providers', + inject([FancyService], (service: FancyService) => { + expect(service.value).toEqual('value modified in beforeEach'); + })); + }); + + describe('using async within beforeEach', () => { + beforeEach(injectAsync([FancyService], (service: FancyService) => { + return service.getAsyncValue().then(value => { service.value = value; }); + })); + + it('should use asynchronously modified value ... in synchronous test', + inject([FancyService], (service: FancyService) => { + expect(service.value).toEqual('async value'); })); + }); + }); + + describe('using `withProviders` for per-test provision', () => { + it('should inject test-local FancyService for this test', + // `withProviders`: set up providers at individual test level + withProviders(() => [provide(FancyService, {useValue: {value: 'fake value'}})]) + + // now inject and test + .inject([FancyService], (service: FancyService) => { + expect(service.value).toEqual('fake value'); + })); + }); +}); + +describe('test component builder', function() { + it('should instantiate a component with valid DOM', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.createAsync(ChildComp).then(fixture => { + fixture.detectChanges(); + expect(fixture.nativeElement).toHaveText('Original Child'); + }); + })); + + it('should allow changing members of the component', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.createAsync(MyIfComp).then(fixture => { + fixture.detectChanges(); + expect(fixture.nativeElement).toHaveText('MyIf()'); + + fixture.debugElement.componentInstance.showMore = true; + fixture.detectChanges(); + expect(fixture.nativeElement).toHaveText('MyIf(More)'); + }); + })); + + it('should support clicking a button', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.createAsync(ButtonComp).then(fixture => { + + let comp = fixture.componentInstance; + expect(comp.wasClicked).toEqual(false, 'wasClicked should be false at start'); + + let btn = fixture.debugElement.query(el => el.name === 'button'); + btn.triggerEventHandler('click', null); + // btn.nativeElement.click(); // this works too; which is "better"? + expect(comp.wasClicked).toEqual(true, 'wasClicked should be true after click'); + }); + })); + + it('should override a template', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.overrideTemplate(MockChildComp, 'Mock') + .createAsync(MockChildComp) + .then(fixture => { + fixture.detectChanges(); + expect(fixture.nativeElement).toHaveText('Mock'); + }); + })); + + it('should override a view', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.overrideView( + ChildComp, + new ViewMetadata({template: 'Modified {{childBinding}}'}) + ) + .createAsync(ChildComp) + .then(fixture => { + fixture.detectChanges(); + expect(fixture.nativeElement).toHaveText('Modified Child'); + + }); + })); + + it('should override component dependencies', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.overrideDirective(ParentComp, ChildComp, MockChildComp) + .createAsync(ParentComp) + .then(fixture => { + fixture.detectChanges(); + expect(fixture.nativeElement).toHaveText('Parent(Mock)'); + + }); + })); + + + it('should override child component\'s dependencies', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.overrideDirective(ParentComp, ChildComp, ChildWithChildComp) + .overrideDirective(ChildWithChildComp, ChildChildComp, MockChildChildComp) + .createAsync(ParentComp) + .then(fixture => { + fixture.detectChanges(); + expect(fixture.nativeElement) + .toHaveText('Parent(Original Child(ChildChild Mock))'); + + }); + })); + + it('should override a provider', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.overrideProviders( + TestProvidersComp, + [provide(FancyService, {useClass: MockFancyService})] + ) + .createAsync(TestProvidersComp) + .then(fixture => { + fixture.detectChanges(); + expect(fixture.nativeElement) + .toHaveText('injected value: mocked out value'); + }); + })); + + + it('should override a viewProvider', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.overrideViewProviders( + TestViewProvidersComp, + [provide(FancyService, {useClass: MockFancyService})] + ) + .createAsync(TestViewProvidersComp) + .then(fixture => { + fixture.detectChanges(); + expect(fixture.nativeElement) + .toHaveText('injected value: mocked out value'); + }); + })); + + it('should allow an external templateUrl', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + + return tcb.createAsync(ExternalTemplateComp) + .then(fixture => { + fixture.detectChanges(); + expect(fixture.nativeElement) + .toHaveText('from external template\n'); + }); + }), 10000); // Long timeout because this test makes an actual XHR. +}); + +describe('errors', () => { + let originalJasmineIt: any; + let originalJasmineBeforeEach: any; + + let patchJasmineIt = () => { + let deferred = PromiseWrapper.completer(); + originalJasmineIt = jasmine.getEnv().it; + jasmine.getEnv().it = (description: string, fn: Function) => { + let done = () => { deferred.resolve(); }; + (done).fail = (err: any) => { deferred.reject(err); }; + fn(done); + return null; + }; + return deferred.promise; + }; + + let restoreJasmineIt = () => { jasmine.getEnv().it = originalJasmineIt; }; + + let patchJasmineBeforeEach = () => { + let deferred = PromiseWrapper.completer(); + originalJasmineBeforeEach = jasmine.getEnv().beforeEach; + jasmine.getEnv().beforeEach = (fn: any) => { + let done = () => { deferred.resolve(); }; + (done).fail = (err: any) => { deferred.reject(err); }; + fn(done); + return null; + }; + return deferred.promise; + }; + + let restoreJasmineBeforeEach = + () => { jasmine.getEnv().beforeEach = originalJasmineBeforeEach; }; + + const shouldNotSucceed = + (done: Done) => () => done.fail( 'Expected function to throw, but it did not'); + + const shouldFail = + (done: Done, emsg: string) => (err: any) => { expect(err).toEqual(emsg); done(); }; + + it('injectAsync should fail when return was forgotten in it', (done: Done) => { + let itPromise = patchJasmineIt(); + it('forgets to return a proimse', injectAsync([], () => { return true; })); + + itPromise.then( + shouldNotSucceed(done), + shouldFail(done, + 'Error: injectAsync was expected to return a promise, but the returned value was: true') + ); + restoreJasmineIt(); + }); + + it('inject should fail if a value was returned', (done: Done) => { + let itPromise = patchJasmineIt(); + it('returns a value', inject([], () => { return true; })); + + itPromise.then( + shouldNotSucceed(done), + shouldFail(done, + 'Error: inject returned a value. Did you mean to use injectAsync? Returned value was: true') + ); + restoreJasmineIt(); + }); + + it('injectAsync should fail when return was forgotten in beforeEach', (done: Done) => { + let beforeEachPromise = patchJasmineBeforeEach(); + beforeEach(injectAsync([], () => { return true; })); + + beforeEachPromise.then( + shouldNotSucceed(done), + shouldFail(done, + 'Error: injectAsync was expected to return a promise, but the returned value was: true') + ); + restoreJasmineBeforeEach(); + }); + + it('inject should fail if a value was returned in beforeEach', (done: Done) => { + let beforeEachPromise = patchJasmineBeforeEach(); + beforeEach(inject([], () => { return true; })); + + beforeEachPromise.then( + shouldNotSucceed(done), + shouldFail(done, + 'Error: inject returned a value. Did you mean to use injectAsync? Returned value was: true') + ); + restoreJasmineBeforeEach(); + }); + + it('should fail when an error occurs inside inject', (done: Done) => { + let itPromise = patchJasmineIt(); + + it('throws an error', inject([], () => { throw new Error('foo'); })); + + itPromise.then( + shouldNotSucceed(done), + err => { expect(err.message).toEqual('foo'); done(); } + ); + restoreJasmineIt(); + }); + + // TODO(juliemr): reenable this test when we are using a test zone and can capture this error. + xit('should fail when an asynchronous error is thrown', (done: Done) => { + let itPromise = patchJasmineIt(); + + it('throws an async error', + injectAsync([], () => { setTimeout(() => { throw new Error('bar'); }, 0); })); + + itPromise.then( + shouldNotSucceed(done), + err => { expect(err.message).toEqual('bar'); done(); } + ); + restoreJasmineIt(); + }); + + it('should fail when a returned promise is rejected', (done: Done) => { + let itPromise = patchJasmineIt(); + + it('should fail with an error from a promise', injectAsync([], () => { + let deferred = PromiseWrapper.completer(); + let p = deferred.promise.then(() => { expect(1).toEqual(2); }); + + deferred.reject('baz'); + return p; + })); + + itPromise.then( + shouldNotSucceed(done), + shouldFail(done, 'baz') + ); + restoreJasmineIt(); + }); + + it('should fail when an XHR fails', (done: Done) => { + let itPromise = patchJasmineIt(); + + it('should fail with an error from a promise', + injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { + return tcb.createAsync(BadTemplateUrl); + })); + + itPromise.then( + shouldNotSucceed(done), + shouldFail(done, 'Failed to load non-existant.html') + ); + restoreJasmineIt(); + }, 10000); + + describe('using beforeEachProviders', () => { + beforeEachProviders(() => [provide(FancyService, {useValue: new FancyService()})]); + + beforeEach( + inject([FancyService], (service: FancyService) => { expect(service.value).toEqual('real value'); })); + + describe('nested beforeEachProviders', () => { + + it('should fail when the injector has already been used', () => { + patchJasmineBeforeEach(); + expect(() => { + beforeEachProviders(() => [provide(FancyService, {useValue: new FancyService()})]); + }) + .toThrowError('beforeEachProviders was called after the injector had been used ' + + 'in a beforeEach or it block. This invalidates the test injector'); + restoreJasmineBeforeEach(); + }); + }); + }); +}); diff --git a/public/docs/_examples/testing/ts/app/public.ts b/public/docs/_examples/testing/ts/app/public.ts new file mode 100644 index 0000000000..382c2c700e --- /dev/null +++ b/public/docs/_examples/testing/ts/app/public.ts @@ -0,0 +1,133 @@ +// Based on https://github.com/angular/angular/blob/master/modules/angular2/test/testing/testing_public_spec.ts +import { Component, Injectable } from 'angular2/core'; +import { NgIf } from 'angular2/common'; + +// Let TypeScript know about the special SystemJS __moduleName variable +declare var __moduleName: string; + +// moduleName is not set in some module loaders; set it explicitly +if (!__moduleName) { + __moduleName = `http://${location.host}/${location.pathname}/app/`; +} +// console.log(`The __moduleName is ${__moduleName} `); + + + +////////// The App: Services and Components for the tests. ////////////// + +////////// Services /////////////// + +@Injectable() +export class FancyService { + value: string = 'real value'; + getAsyncValue() { return Promise.resolve('async value'); } +} + +@Injectable() +export class MockFancyService extends FancyService { + value: string = 'mocked out value'; +} + +//////////// Components ///////////// + +@Component({ + selector: 'button-comp', + template: `` +}) +export class ButtonComp { + wasClicked = false; + clicked() { this.wasClicked = true; } +} + + +@Component({ + selector: 'child-comp', + template: `Original {{childBinding}}` +}) +export class ChildComp { + childBinding = 'Child'; +} + + +@Component({ + selector: 'child-comp', + template: `Mock` +}) +export class MockChildComp { } + + +@Component({ + selector: 'parent-comp', + template: `Parent()`, + directives: [ChildComp] +}) +export class ParentComp { } + + +@Component({ + selector: 'my-if-comp', + template: `MyIf(More)`, + directives: [NgIf] +}) +export class MyIfComp { + showMore: boolean = false; +} + + +@Component({ + selector: 'child-child-comp', + template: 'ChildChild' +}) +export class ChildChildComp { } + + +@Component({ + selector: 'child-comp', + template: `Original {{childBinding}}()`, + directives: [ChildChildComp] +}) +export class ChildWithChildComp { + childBinding = 'Child'; +} + + +@Component({ + selector: 'child-child-comp', + template: `ChildChild Mock` +}) +export class MockChildChildComp { } + + +@Component({ + selector: 'my-service-comp', + template: `injected value: {{fancyService.value}}`, + providers: [FancyService] +}) +export class TestProvidersComp { + constructor(private fancyService: FancyService) {} +} + + +@Component({ + selector: 'my-service-comp', + template: `injected value: {{fancyService.value}}`, + viewProviders: [FancyService] +}) +export class TestViewProvidersComp { + constructor(private fancyService: FancyService) {} +} + + +@Component({ + moduleId: __moduleName, + selector: 'external-template-comp', + templateUrl: 'public-external-template.html' +}) +export class ExternalTemplateComp { } + + +@Component({ + selector: 'bad-template-comp', + templateUrl: 'non-existant.html' +}) +export class BadTemplateUrl { } diff --git a/public/docs/_examples/testing/ts/test-shim.js b/public/docs/_examples/testing/ts/test-shim.js new file mode 100644 index 0000000000..31e1998e69 --- /dev/null +++ b/public/docs/_examples/testing/ts/test-shim.js @@ -0,0 +1,48 @@ +/*global jasmine, __karma__, window*/ + +// Browser testing shim +(function () { + +// Error.stackTraceLimit = Infinity; + +jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; + +// Configure systemjs to use the .js extension for imports from the app folder +System.config({ + packages: { + app: { + format: 'register', + defaultExtension: 'js' + } + } +}); + +// Configure Angular for the browser and with test versions of the platform providers +System.import('angular2/testing') + .then(function (testing) { + return System.import('angular2/platform/testing/browser') + .then(function (providers) { + testing.setBaseTestProviders( + providers.TEST_BROWSER_PLATFORM_PROVIDERS, + providers.TEST_BROWSER_APPLICATION_PROVIDERS + ); + }); + }) + + // Load the spec files (__spec_files__) explicitly + .then(function () { + console.log('loading spec files: '+__spec_files__.join(', ')); + return Promise.all(__spec_files__.map(function(spec) { return System.import(spec);} )); + }) + + // After all imports load, re-execute `window.onload` which + // triggers the Jasmine test-runner start or explain what went wrong + .then(success, console.error.bind(console)); + +function success () { + console.log('Spec files loaded; starting Jasmine testrunner'); + window.onload(); +} + + +})(); diff --git a/public/docs/_examples/testing/ts/unit-tests-public.html b/public/docs/_examples/testing/ts/unit-tests-public.html new file mode 100644 index 0000000000..cbb3f7f859 --- /dev/null +++ b/public/docs/_examples/testing/ts/unit-tests-public.html @@ -0,0 +1,32 @@ + + + + + + Angular Public Unit Tests + + + + + + + + + + + + + + + + + + + + + + + + From 353abff0841671eff35d3275987ba6b93d7bb35b Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Wed, 13 Apr 2016 08:21:32 -0700 Subject: [PATCH 3/5] docs(server-communication): fix http after testing chapter discoveries --- .../server-communication/ts/app/main.ts | 18 ++- .../ts/app/toh/hero-list.component.1.ts | 20 +--- .../ts/app/toh/hero-list.component.html | 13 +++ .../ts/app/toh/hero-list.component.ts | 15 +-- .../ts/app/toh/hero.service.1.ts | 27 +++-- .../ts/app/toh/hero.service.ts | 17 ++- .../ts/app/toh/toh.component.1.ts | 32 ++++++ .../ts/app/toh/toh.component.2.ts | 44 ++++++++ .../ts/app/toh/toh.component.ts | 37 +++--- .../testing/ts/app/http-hero.service.ts | 2 +- .../ts/latest/guide/server-communication.jade | 105 +++++++++++------- .../server-communication/hero-list.png | Bin 24050 -> 12153 bytes 12 files changed, 213 insertions(+), 117 deletions(-) create mode 100644 public/docs/_examples/server-communication/ts/app/toh/hero-list.component.html create mode 100644 public/docs/_examples/server-communication/ts/app/toh/toh.component.1.ts create mode 100644 public/docs/_examples/server-communication/ts/app/toh/toh.component.2.ts diff --git a/public/docs/_examples/server-communication/ts/app/main.ts b/public/docs/_examples/server-communication/ts/app/main.ts index c992809065..a7c4bab464 100644 --- a/public/docs/_examples/server-communication/ts/app/main.ts +++ b/public/docs/_examples/server-communication/ts/app/main.ts @@ -1,15 +1,21 @@ -//#docregion -import {bootstrap} from 'angular2/platform/browser'; +// #docplaster +// #docregion +import { bootstrap } from 'angular2/platform/browser'; +// #docregion http-providers +import { HTTP_PROVIDERS } from 'angular2/http'; +// #enddocregion http-providers // #docregion import-rxjs // Add all operators to Observable import 'rxjs/Rx'; // #enddocregion import-rxjs -import {WikiComponent} from './wiki/wiki.component'; -import {WikiSmartComponent} from './wiki/wiki-smart.component'; -import {TohComponent} from './toh/toh.component'; +import { WikiComponent } from './wiki/wiki.component'; +import { WikiSmartComponent } from './wiki/wiki-smart.component'; +import { TohComponent } from './toh/toh.component'; bootstrap(WikiComponent); bootstrap(WikiSmartComponent); -bootstrap(TohComponent); \ No newline at end of file +// #docregion http-providers +bootstrap(TohComponent, [HTTP_PROVIDERS]); +// #enddocregion http-providers diff --git a/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.1.ts b/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.1.ts index 2a96ce2df3..4506bab39f 100644 --- a/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.1.ts +++ b/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.1.ts @@ -1,3 +1,4 @@ +// ToH Promise Version // #docregion import {Component, OnInit} from 'angular2/core'; import {Hero} from './hero'; @@ -5,22 +6,7 @@ import {HeroService} from './hero.service.1'; @Component({ selector: 'hero-list', -// #docregion template - template: ` -

Heroes:

-
    -
  • - {{ hero.name }} -
    • -
- New Hero: - - -
{{errorMessage}}
- `, - // #enddocregion template + templateUrl: 'app/toh/hero-list.component.html', styles: ['.error {color:red;}'] }) // #docregion component @@ -29,7 +15,7 @@ export class HeroListComponent implements OnInit { constructor (private _heroService: HeroService) {} errorMessage: string; - heroes:Hero[]; + heroes: Hero[]; ngOnInit() { this.getHeroes(); } diff --git a/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.html b/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.html new file mode 100644 index 0000000000..22105a6b15 --- /dev/null +++ b/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.html @@ -0,0 +1,13 @@ + +

Heroes:

+
    +
  • + {{ hero.name }} +
    • +
+New Hero: + + +
{{errorMessage}}
diff --git a/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.ts b/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.ts index a55cf35a72..088ffc56a6 100644 --- a/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.ts +++ b/public/docs/_examples/server-communication/ts/app/toh/hero-list.component.ts @@ -5,20 +5,7 @@ import {HeroService} from './hero.service'; @Component({ selector: 'hero-list', - template: ` -

Heroes:

-
    -
  • - {{ hero.name }} -
    • -
- New Hero: - - -
{{errorMessage}}
- `, + templateUrl: 'app/toh/hero-list.component.html', styles: ['.error {color:red;}'] }) // #docregion component diff --git a/public/docs/_examples/server-communication/ts/app/toh/hero.service.1.ts b/public/docs/_examples/server-communication/ts/app/toh/hero.service.1.ts index 05b97fa75d..8ac1d92a2c 100644 --- a/public/docs/_examples/server-communication/ts/app/toh/hero.service.1.ts +++ b/public/docs/_examples/server-communication/ts/app/toh/hero.service.1.ts @@ -1,9 +1,9 @@ -/* Promise version */ +// ToH Promise Version // #docplaster // #docregion import {Injectable} from 'angular2/core'; -import {Http} from 'angular2/http'; +import {Http, Response} from 'angular2/http'; import {Headers, RequestOptions} from 'angular2/http'; import {Hero} from './hero'; @@ -15,27 +15,36 @@ export class HeroService { private _heroesUrl = 'app/heroes.json'; // #docregion methods - getHeroes () { + getHeroes (): Promise { return this.http.get(this._heroesUrl) .toPromise() - .then(res => res.json().data, this.handleError) - .then(data => { console.log(data); return data; }); // eyeball results in the console + .then(this.extractData) + .catch(this.handleError); } - addHero (name: string) : Promise { + addHero (name: string): Promise { let body = JSON.stringify({ name }); let headers = new Headers({ 'Content-Type': 'application/json' }); let options = new RequestOptions({ headers: headers }); return this.http.post(this._heroesUrl, body, options) .toPromise() - .then(res => res.json().data) + .then(this.extractData) .catch(this.handleError); } + + private extractData(res: Response) { + if (res.status < 200 || res.status >= 300) { + throw new Error('Bad response status: ' + res.status); + } + let body = res.json(); + return body.data || { }; + } + private handleError (error: any) { - // in a real world app, we may send the error to some remote logging infrastructure - console.error(error); // log to console instead + // In a real world app, we might send the error to remote logging infrastructure let errMsg = error.message || 'Server error'; + console.error(errMsg); // log to console instead return Promise.reject(errMsg); } diff --git a/public/docs/_examples/server-communication/ts/app/toh/hero.service.ts b/public/docs/_examples/server-communication/ts/app/toh/hero.service.ts index 4e9a0d9070..0ada9137fc 100644 --- a/public/docs/_examples/server-communication/ts/app/toh/hero.service.ts +++ b/public/docs/_examples/server-communication/ts/app/toh/hero.service.ts @@ -3,7 +3,7 @@ // #docregion // #docregion v1 import {Injectable} from 'angular2/core'; -import {Http} from 'angular2/http'; +import {Http, Response} from 'angular2/http'; // #enddocregion v1 // #docregion import-request-options import {Headers, RequestOptions} from 'angular2/http'; @@ -31,18 +31,13 @@ export class HeroService { // #enddocregion endpoint // #docregion methods - // #docregion error-handling + // #docregion error-handling, http-get getHeroes (): Observable { - // #docregion http-get, http-get-v1 return this.http.get(this._heroesUrl) .map(this.extractData) - // #enddocregion v1, http-get-v1, error-handling - .do(data => console.log(data)) // eyeball results in the console - // #docregion v1, http-get-v1, error-handling .catch(this.handleError); - // #enddocregion http-get, http-get-v1 } - // #enddocregion error-handling + // #enddocregion error-handling, http-get // #enddocregion v1 // #docregion addhero @@ -62,6 +57,7 @@ export class HeroService { // #docregion v1 + // #docregion extract-data private extractData(res: Response) { if (res.status < 200 || res.status >= 300) { throw new Error('Bad response status: ' + res.status); @@ -69,12 +65,13 @@ export class HeroService { let body = res.json(); return body.data || { }; } + // #enddocregion extract-data // #docregion error-handling private handleError (error: any) { - // in a real world app, we may send the error to some remote logging infrastructure - console.error(error); // log to console instead + // In a real world app, we might send the error to remote logging infrastructure let errMsg = error.message || 'Server error'; + console.error(errMsg); // log to console instead return Observable.throw(errMsg); } // #enddocregion error-handling diff --git a/public/docs/_examples/server-communication/ts/app/toh/toh.component.1.ts b/public/docs/_examples/server-communication/ts/app/toh/toh.component.1.ts new file mode 100644 index 0000000000..d689f73fd3 --- /dev/null +++ b/public/docs/_examples/server-communication/ts/app/toh/toh.component.1.ts @@ -0,0 +1,32 @@ +// ToH Promise Version +console.log ('Promise version'); + +import { Component } from 'angular2/core'; +import { HTTP_PROVIDERS } from 'angular2/http'; + +import { HeroListComponent } from './hero-list.component.1'; +import { HeroService } from './hero.service.1'; + +import { provide } from 'angular2/core'; +import { XHRBackend } from 'angular2/http'; + +import { InMemoryBackendService, + SEED_DATA } from 'a2-in-memory-web-api/core'; +import { HeroData } from '../hero-data'; + +@Component({ + selector: 'my-toh', + template: ` +

Tour of Heroes

+ + `, + directives:[HeroListComponent], + providers: [ + HTTP_PROVIDERS, + HeroService, + // in-memory web api providers + provide(XHRBackend, { useClass: InMemoryBackendService }), // in-mem server + provide(SEED_DATA, { useClass: HeroData }) // in-mem server data + ] +}) +export class TohComponent { } diff --git a/public/docs/_examples/server-communication/ts/app/toh/toh.component.2.ts b/public/docs/_examples/server-communication/ts/app/toh/toh.component.2.ts new file mode 100644 index 0000000000..f6efb282a5 --- /dev/null +++ b/public/docs/_examples/server-communication/ts/app/toh/toh.component.2.ts @@ -0,0 +1,44 @@ +// #docplaster + +// #docregion +import { Component } from 'angular2/core'; +import { HTTP_PROVIDERS } from 'angular2/http'; + +import { HeroListComponent } from './hero-list.component'; +import { HeroService } from './hero.service'; +// #enddocregion + +// #docregion in-mem-web-api-imports +import { provide } from 'angular2/core'; +import { XHRBackend } from 'angular2/http'; + +// in-memory web api imports +import { InMemoryBackendService, + SEED_DATA } from 'a2-in-memory-web-api/core'; +import { HeroData } from '../hero-data'; +// #enddocregion in-mem-web-api-imports +// #docregion + +@Component({ + selector: 'my-toh', +// #docregion template + template: ` +

Tour of Heroes

+ + `, + // #enddocregion template + directives: [HeroListComponent], + providers: [ + HTTP_PROVIDERS, + HeroService, +// #enddocregion +// #docregion in-mem-web-api-providers + // in-memory web api providers + provide(XHRBackend, { useClass: InMemoryBackendService }), // in-mem server + provide(SEED_DATA, { useClass: HeroData }) // in-mem server data +// #enddocregion in-mem-web-api-providers +// #docregion + ] +}) +export class TohComponent { } +// #enddocregion diff --git a/public/docs/_examples/server-communication/ts/app/toh/toh.component.ts b/public/docs/_examples/server-communication/ts/app/toh/toh.component.ts index bc93e5c9c9..f6efb282a5 100644 --- a/public/docs/_examples/server-communication/ts/app/toh/toh.component.ts +++ b/public/docs/_examples/server-communication/ts/app/toh/toh.component.ts @@ -1,24 +1,23 @@ // #docplaster // #docregion -import {Component} from 'angular2/core'; -import {HTTP_PROVIDERS} from 'angular2/http'; +import { Component } from 'angular2/core'; +import { HTTP_PROVIDERS } from 'angular2/http'; -import {Hero} from './hero'; -import {HeroListComponent} from './hero-list.component'; -import {HeroService} from './hero.service'; -//#enddocregion +import { HeroListComponent } from './hero-list.component'; +import { HeroService } from './hero.service'; +// #enddocregion -//#docregion in-mem-web-api-imports -import {provide} from 'angular2/core'; -import {XHRBackend} from 'angular2/http'; +// #docregion in-mem-web-api-imports +import { provide } from 'angular2/core'; +import { XHRBackend } from 'angular2/http'; // in-memory web api imports -import {InMemoryBackendService, - SEED_DATA} from 'a2-in-memory-web-api/core'; -import {HeroData} from '../hero-data'; +import { InMemoryBackendService, + SEED_DATA } from 'a2-in-memory-web-api/core'; +import { HeroData } from '../hero-data'; // #enddocregion in-mem-web-api-imports -//#docregion +// #docregion @Component({ selector: 'my-toh', @@ -28,17 +27,17 @@ import {HeroData} from '../hero-data'; `, // #enddocregion template - directives:[HeroListComponent], - providers: [ + directives: [HeroListComponent], + providers: [ HTTP_PROVIDERS, HeroService, -//#enddocregion -//#docregion in-mem-web-api-providers +// #enddocregion +// #docregion in-mem-web-api-providers // in-memory web api providers provide(XHRBackend, { useClass: InMemoryBackendService }), // in-mem server provide(SEED_DATA, { useClass: HeroData }) // in-mem server data -//#enddocregion in-mem-web-api-providers -//#docregion +// #enddocregion in-mem-web-api-providers +// #docregion ] }) export class TohComponent { } diff --git a/public/docs/_examples/testing/ts/app/http-hero.service.ts b/public/docs/_examples/testing/ts/app/http-hero.service.ts index 40c2f37866..86f3dcf8d2 100644 --- a/public/docs/_examples/testing/ts/app/http-hero.service.ts +++ b/public/docs/_examples/testing/ts/app/http-hero.service.ts @@ -36,7 +36,7 @@ export class HeroService { } private handleError (error: any) { - // in a real world app, we may send the error to some remote logging infrastructure + // In a real world app, we might send the error to remote logging infrastructure let errMsg = error.message || 'Server error'; console.error(errMsg); // log to console instead return Observable.throw(errMsg); diff --git a/public/docs/ts/latest/guide/server-communication.jade b/public/docs/ts/latest/guide/server-communication.jade index eefc531262..248aa33c14 100644 --- a/public/docs/ts/latest/guide/server-communication.jade +++ b/public/docs/ts/latest/guide/server-communication.jade @@ -21,7 +21,6 @@ include ../_util-fns [Enabling RxJS Operators](#enable-rxjs-operators)
[Extract JSON data with RxJS map](#map)
[Error handling](#error-handling)
- [Log results to console](#do)
[Send data to the server](#update)
[Add headers](#headers)
[Promises instead of observables](#promises)
@@ -67,14 +66,20 @@ figure.image-display making them available to the child components of this "Tour of Heroes" application. .l-sub-section + :marked + Alternatively, we may choose to add the `HTTP_PROVIDERS` while bootstrapping the app: + +makeExample('server-communication/ts/app/main.ts','http-providers','app/main.ts')(format='.') :marked Learn about providers in the [Dependency Injection](dependency-injection.html) chapter. + :marked - This sample only has one child, the `HeroListComponent` shown here in full: -+makeExample('server-communication/ts/app/toh/hero-list.component.ts', null, 'app/toh/hero-list.component.ts') + This sample only has one child, the `HeroListComponent`. Here's its template: ++makeExample('server-communication/ts/app/toh/hero-list.component.html', null, 'app/toh/hero-list.component.html (Template)') :marked The component template displays a list of heroes with the `NgFor` repeater directive. - +figure.image-display + img(src='/resources/images/devguide/server-communication/hero-list.png' alt="Hero List") +:marked Beneath the heroes is an input box and an *Add Hero* button where we can enter the names of new heroes and add them to the database. We use a [local template variable](template-syntax.html#local-vars), `newHero`, to access the @@ -82,22 +87,26 @@ figure.image-display When the user clicks the button, we pass that value to the component's `addHero` method and then clear it to make ready for a new hero name. - Below the button is an optional error message. + Below the button is a (hidden) area for an error message. a(id="oninit") a(id="HeroListComponent") :marked ### The *HeroListComponent* class + Here's the component class: ++makeExample('server-communication/ts/app/toh/hero-list.component.ts','component', 'app/toh/hero-list.component.ts (class)') +:marked We [inject](dependency-injection.html) the `HeroService` into the constructor. That's the instance of the `HeroService` that we provided in the parent shell `TohComponent`. Notice that the component **does not talk to the server directly!** The component doesn't know or care how we get the data. Those details it delegates to the `heroService` class (which we'll get to in a moment). - This is a golden rule: *always delegate data access to a supporting service class*. + + This is a golden rule: **always delegate data access to a supporting service class**. - Although the component should request heroes immediately, - we do **not** call the service `get` method in the component's constructor. + Although _at runtime_ the component requests heroes immediately after creation, + we do **not** call the service's `get` method in the component's constructor. We call it inside the `ngOnInit` [lifecycle hook](lifecycle-hooks.html) instead and count on Angular to call `ngOnInit` when it instantiates this component. .l-sub-section @@ -106,8 +115,9 @@ a(id="HeroListComponent") Components are easier to test and debug when their constructors are simple and all real work (especially calling a remote server) is handled in a separate method. :marked - The service `get` and `addHero` methods return an `Observable` of HTTP Responses to which we `subscribe`, - specifying the actions to take if a method succeeds or fails. + The service `get` and `addHero` methods return an `Observable` of HTTP hero data. + We subscribe to this `Observable`, + specifying the actions to take when the request succeeds or fails. We'll get to observables and subscription shortly. With our basic intuitions about the component squared away, we can turn to development of the backend data source @@ -122,7 +132,7 @@ a(id="HeroListComponent") In this chapter, we get the heroes from the server using Angular's own HTTP Client service. Here's the new `HeroService`: -+makeExample('server-communication/ts/app/toh/hero.service.ts', 'v1', 'app/toh/hero.service.ts')(format=".") ++makeExample('server-communication/ts/app/toh/hero.service.ts', 'v1', 'app/toh/hero.service.ts') :marked We begin by importing Angular's `Http` client service and [inject it](dependency-injection.html) into the `HeroService` constructor. @@ -133,7 +143,7 @@ a(id="HeroListComponent") +makeExample('server-communication/ts/index.html', 'http', 'index.html')(format=".") :marked Look closely at how we call `http.get` -+makeExample('server-communication/ts/app/toh/hero.service.ts', 'http-get-v1', 'app/toh/hero.service.ts (http.get)')(format=".") ++makeExample('server-communication/ts/app/toh/hero.service.ts', 'http-get', 'app/toh/hero.service.ts (getHeroes)')(format=".") :marked We pass the resource URL to `get` and it calls the server which should return heroes. .l-sub-section @@ -153,13 +163,6 @@ a(id="HeroListComponent") In fact, the `http.get` method returns an **Observable** of HTTP Responses (`Observable`) from the RxJS library and `map` is one of the RxJS *operators*. -.callout.is-important - header HTTP GET Delayed - :marked - The `http.get` does **not send the request just yet!** This observable is - [*cold*](https://github.com/Reactive-Extensions/RxJS/blob/master/doc/gettingstarted/creating.md#cold-vs-hot-observables) - which means the request won't go out until something *subscribes* to the observable. - That *something* is the [HeroListComponent](#subscribe). .l-main-section :marked @@ -193,15 +196,37 @@ a(id="HeroListComponent") It's best to add that statement early when we're bootstrapping the application. : +makeExample('server-communication/ts/app/main.ts', 'import-rxjs', 'app/main.ts (import rxjs)')(format=".") + +a(id="map") +a(id="extract-data") :marked - - ### Map the response object - Let's come back to the `HeroService` and look at the `http.get` call again to see why we needed `map()` -+makeExample('server-communication/ts/app/toh/hero.service.ts', 'http-get-v1', 'app/toh/hero.service.ts (http.get)')(format=".") + ### Process the response object + Remember that our `getHeroes` method mapped the `http.get` response object to heroes with an `extractData` helper method: ++makeExample('server-communication/ts/app/toh/hero.service.ts', 'extract-data', 'app/toh/hero.service.ts (extractData)')(format=".") :marked The `response` object does not hold our data in a form we can use directly. - It takes an additional step — calling `response.json()` — to transform the bytes from the server into a JSON object. + To make it useful in our application we must + * check for a bad response + * parse the response data into a JSON object +.alert.is-important + :marked + *Beta alert*: error status interception and parsing may be absorbed within `http` when Angular is released. +:marked + #### Bad status codes + A status code outside the 200-300 range is an error from the _application point of view_ + but it is not an error from the _`http` point of view_. + For example, a `404 - Not Found` is a response like any other. + The request went out; a response came back; here it is, thank you very much. + We'd have an observable error only if `http` failed to operate (e.g., it errored internally). + + Because a status code outside the 200-300 range _is an error_ from the application point of view, + we intercept it and throw, moving the observable chain to the error path. + + The `catch` operator that is next in the `getHeroes` observable chain will handle our thrown error. + #### Parse to JSON + The response data are in JSON string form. + We must parse that string into JavaScript objects which we do by calling `response.json()`. .l-sub-section :marked This is not Angular's own design. @@ -228,8 +253,18 @@ a(id="HeroListComponent") It has no interest in what we do to get them. It doesn't care where they come from. And it certainly doesn't want to deal with a response object. + + +.callout.is-important + header HTTP GET is delayed + :marked + The `http.get` does **not send the request just yet!** This observable is + [*cold*](https://github.com/Reactive-Extensions/RxJS/blob/master/doc/gettingstarted/creating.md#cold-vs-hot-observables) + which means the request won't go out until something *subscribes* to the observable. + That *something* is the [HeroListComponent](#subscribe). - +a(id="error-handling") +:marked ### Always handle errors The eagle-eyed reader may have spotted our use of the `catch` operator in conjunction with a `handleError` method. @@ -243,8 +278,8 @@ a(id="HeroListComponent") In this simple app we provide rudimentary error handling in both the service and the component. We use the Observable `catch` operator on the service level. - It takes an error handling function with the failed `Response` object as the argument. - Our service handler, `errorHandler`, logs the response to the console, + It takes an error handling function with an error object as the argument. + Our service handler, `handleError`, logs the response to the console, transforms the error into a user-friendly message, and returns the message in a new, failed observable via `Observable.throw`. +makeExample('server-communication/ts/app/toh/hero.service.ts', 'error-handling', 'app/toh/hero.service.ts')(format=".") @@ -263,19 +298,7 @@ a(id="HeroListComponent") .l-sub-section :marked Want to see it fail? Reset the api endpoint in the `HeroService` to a bad value. Remember to restore it! - - -:marked - ### Peek at results in the console - During development we're often curious about the data returned by the server. - Logging to console without disrupting the flow would be nice. - - The Observable `do` operator is perfect for the job. - It passes the input through to the output while we do something with a useful side-effect such as writing to console. - Slip it into the pipeline between `map` and `catch` like this. -+makeExample('server-communication/ts/app/toh/hero.service.ts', 'http-get', 'app/toh/hero.service.ts')(format=".") -:marked - Remember to comment it out before going to production! + @@ -327,7 +350,7 @@ code-example(format="." language="javascript"). :marked ### JSON results - As with `get`, we extract the data from the response with `json()` and unwrap the hero via the `data` property. + As with `getHeroes`, we [extract the data](#extract-data) from the response with `json()` and unwrap the hero via the `data` property. .alert.is-important :marked Know the shape of the data returned by the server. diff --git a/public/resources/images/devguide/server-communication/hero-list.png b/public/resources/images/devguide/server-communication/hero-list.png index db53046c71095286be875493ff2ac791a22e9fb2..6d2169eaab7936e0c6830daa33b1420d8c51cfc0 100644 GIT binary patch literal 12153 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≺ehOM)|`t7LfmAKAr?+L-5e7lqCga-0rcJajrbIvQh7VcJ42KBK9% z6}l+s>eA#X93cSx$TVLSTj9@2$*5YV*`Mb!GBTWs42BiEK;A$g%@8R*}$&=mJu3u*i zsbncVyC9B{bXY*($kC(A83_jh7q&%ccnU>TvjeNe zNC1$38ISuk=uA&f4?=8)NnkA%+BTM6P_SD~=hwuhCVu@A1Qc3s z@eZksEDQkBLXAjiRyq{wUca7j>w@j!D6r{>xHzs?myaGle%vx|sG&h?czBqTmv;o3 z>y<$fTUP6NysDxi*<9j&z2!k}<`I#9I8+pTaigM``mwiuzxT}x|Ni|lq}#oE%SzKc zAc?h|ojD*M@QP_616mX#YItBzcq&pfJN2|e4;lqof2JcQD zhuam%Azvll z`>GpDx*I0DOOA+$r03^Hxycbz=W9t_dj!`SyP+(Lile-O~|ugRv~#fDoDj}gjivB3L$kBMtH z*5+%0IYwSXyS{w+!nt?vU|NJyYIb%wK_CEIu4^k^Cmeey;P;f8pz+>{z(dGy^%66?SkN|Zu+RN*}*M283Pyx9ishijw7;HR1z8+-fX0a}^OzltB` zj9GHM!^dB`bm?QU`xxcI(5Fvl2*k-TEIFgAyHi|Qcl~FScD&>d@WHf_k_3Sy&yC5A zAsCdqGTr2MP&j(@^DTFvqTc&zHsW_t8|o5qRi=4RWU6Ln2OSC%^n}z7N1f7Pzx49) zRbDrY&$Tsw%r@LNxXE3RqE_2#%lx?Nhrq{8n>OKu@?pB5@-nqxZhpSU^^ljojLGAA%OV^cbQEgvgkAed;oWI3UVIkr*+4zT#Y7LP zar~ys@F#6oJ<{<_WApaY%PODAWE?kT6;RHwSv|8E7@(2@*W(WH5MRDL^19FmyKci^Po9X3=RBPnv3QK?P06y=V_Nh>ILf-!Q* z$O!IM>H6C8@K{)A=t2*zyr#XKlb~McdnkB^p3+)c#ro=&k^F1fVM;~^X*WuiMW_OS zf?fFNo1c9)f@i4j!(GhwJa{oiJ`=|a>^eR| zyyWTIeUM%CS05x~faa%`Qo7FszWE@jl zj-eSq34nknkB2%4MoY+{xv@60{El~?GY23IfSk+aADhLQatw;@^iBy7l<5VE^AkAL zocHMDWJXq27}zlSHrapa2qp>Ij4Dx)o*r~^|NGEgM`IHbB$LY?`*hbOYL zwv2V)!}VFkMp#FX6olr0 z34O8106IblPH30pMyvAg;!K#}@8M45mdfNuC$9mYY7L);$NFo*?QD*ux< zHb>Cc+%iu4bMHi&a1v%T-10oT4v9-I*$GRS=;NbTa#Wk89`2J5t{F6$>L~+(h2Rch z-ZudGSGx2&Ya9)yFB}XX7F?lf)a_eO&szG#Q8BUgYvloaRd;6~7G0x%ioru)Sdf9J ze3qVGU7EXW6r{ojhYt?#ssC$lQSghN1s4qS~o|BW4Zus=u%*-0!#A?%& zl$6^L;?s4;YmY$8B;quTQhw?SpE;3G@ADuiRS>W%A{amJBr{te%gvns#9C_4A=Kr! zZ;xnu-~*dWV9IWZ?wiW+0}-A`x$=mG{_Ym-d+-!4=NQzcoDPB8k&2Q1j1EZUb);#Pq%QC(dPJt*c0@42$yiEyHfjd{_I z=u3nij^76<;bum~ZnXvnTAG_Hp?W7@DuVs%UB3LSsmVmi)*LDe1HdG|gJL^HCd0*z zefqR&!Xv=qe?KlI0qHUS)g|{Q2w$u@E($b{2H7a0wAWRG~(WjZgnqy3rzHT$9Ip>mY&fpI) z7G<3WHcyo=i{_Ti|F}}1ofLYc>f5|J`{{=8xZx)Uk(Z%y@tyi#{-?~*b@awU(Gt9? zV{UTJa*1#-^0%#kG!WLm?c3BbIWS5)6+gW z(b{7udZmXK_q~85zp%V#yvxAF zntOV*&u(0H%Joo)QT3Ln z$~X-L#+j|w=R%O08KAT<{o^}{xt4xXJYc)Et1I=DSm z?>BKX%p{X-n;KyR!rVL%Roe%V|MF#IAIHF7Z+})&9pD(ct}Hl%*TZx~o5SZRxiyvX z<_#jGkH{%!7JV(VDO0{9@&-jNL7oZ@Phv2aG1d$0J3m39>5zy8YimK{V3kXqS?1%hsjAnuz>cQ%0k=x6Rxmi2wC#*WQ6N<944a z2dtF~)rw_6(n8H;XeMC7!L5dVBxVp^ft)lxx4yOBt)zSSPyoh|w$dU$P64JYY(Q{+ z@Ez!c-o2kbIcpm#$uATv;1U0^`(7IDw27 z{uz|w1N;cKxuX)D7Q@UhPePk4EzK6p{rSUgaBeM(sS-&uOhbmv8@-m1=lz$g3W|uR zkx0Huy?4&5d6XzRj<=xENqra2pC@$GNMo{e@~y{OnQ$g7PZ3k$)#aN;Z#{vyaAm!{ z_ry;5$tO0H)=|6KZE~K~ng%@%V!hCIkaW)f7?~Vz_MotC*RFDXeiLbIC&&=H0ILSH zVsk+x-XFH|io+!|GfP{1R)l91AF=wbdC`%@hD74J9y(4#LB8_qXdXl zJ~Z{2;5K-6gda?6twUK3z06D+81KmMD)oY2rG*|sPAoOjka&q;BZZbg41n!mKR}_PR+1E}Vy)ot&I3wGTE? zcj`%VlM8Pieav`}uYAJIa6KboTD>;hjZ6$EH+OfDB@Pt7)8MBa12YS!ZyHQKZL)T2 zTE!2M^?epIWS9xp$?p&*QrP*ziXp)4cFP~ZAt8&?l`IHTysX3b@bC}@6!Hm?_L!TF zXU~QZI}>}&j0#3nY`ndf66_*a2mXQyy4ZJ@1(xdKmt)PK-^@G;>O#@i{uPTp?~HH- zZ^@xpv$nd-G2ZN+2uTO^M+^6OMqwljM98r0>}(X-)`a@`bVqJpUMpMMZGV6Jb_oy! zm*T!E=e~Uw9j`4A%240J;u1D4@9H{n?AR%OHWOHm`od3^*Y<fsrmJi6+fPt7& z{A?+2-u!u(+bT8j@U#;hW}TZ{*^LqtPK2XdmJ#ZBcyh&04D2C0EzCWYQ zZXO=50rl)^SEuO>+ho0F`O%@rHi6o{wrM_m!l6rDc=zD@+nWe)3%b_LkQf&DrP<$E zxvyP@&I1Y3(%=o{-{?@~!wnPJ6|^Fx7?Mbc4nh*#5Lf4C>mQ6z&Uo?S9{dWX%Dx~D zqi4^b2ZHEI0htqwZB*&(m!mK|XUjWirJBeoU)^;9pK1!Y=~J;;6RdlN!XzygUx+Pv}h7Dr;3aflfa_Nl^r zyBQt9cd*uS(a1GO_6S*tW03`G9fY@W#Z<62*KmkHgVXcEF%YCNx5(F_g1)|Qf z8^+j30y+O1Lxa##n7`rDJ?}@T#}pOo33t$cMFxs3)Jp;JDV!v~r&3^&g~Jpl6e-j+6n$4$m)~0}Z|`_G$8Lr-6CQ|P>#^NYi{Iyh`&@N@C$gwU zF|kV|^Z}u0r#M4Z4`4GV9)L}qOeu+sF+fR=B>6nN)#FuD>RVxWB7v}f(I4>bh#>UG zk88v}5pp@?ksvd8`q=G4CUi&R@M*AD#NNXeE^>)*goYpP&}9$0D5!e%>Q%xq0Q(>> zQc>^ta>POwqDl}Z%zcz)Lz3bJ;oXwPCBBO;RIzUmm&i};e!RKA>*!@VFqd|a|B9v7 zT(}My&!2C`co63-9TU^Lr|h=6x{79n|BE^q_?CX*!Gj0?npSTEj-wG$GBSceBuqF7 z+Y+`6Q{^*!9h7iVz?xTRXy~uszf;rF1|N=mF&s^jb^X-!q{Pk`{zGw2f;8E#yLcCd z*8BH#_+_lF-SBUJ2E~QPgw}^@PQ~6B4#E^^<@or|t|Hf49!?s*(P5qlNd*P0wu}&-b6HuUxkN2K^!CZV z3wz0e+o0Ob>*J4mbpk%`-n}~!+b zdH0(SBUF>ZPT2aN#2@%fe%U?~A{#=Wa{gI)`Pxx|^vPf{xqZUJ$akh%ZEJR!QLe1M zpHB=jW8pmyit4s!wF-SWQpNEgB0}=mu@8U#NWqdIdgUOVz3aR@hsNKs&Nn&f<1`LC z8jDJnC*jh*&nufK!EdyY;pi%GAA8%>wxxtXz} z_`zqYET)kAz3tme1_l&hJ~lQAJ9kh5j^N|4GsaZ;9xEA_FQ2(`g#!z6Qc_ZV)WzvV zUqWsG>1DXfr<^XaSFc=%JfBYC3W!ZUlpG)bB|)|#v2mo*_AQ)V3bbpz*e!Ud9UUEa z=>G{?IBm&EkDdTFPPgc4$0cUsX5m&6eh~^p%Ez;)KSxi{3@8w8ld8UZ*bqQPoY6HG|V>Hp#NH8=)1H;#^CM!B~>=v$_sB0%?v zu>xO5LRR)1j)B*AdPAmma`~W~I0O$yNds0&ik$j4!WRU4X!`NvJc4goW;s~7=qbz_ z;|o4Po_gt*ju4h0T$GfH_pon+_lBX=($ey^yE`1t&Z}1s#@ceDG!A3^F(oT&yJjXX$E2jp8{BTWyLY!$hyX6&KoSWQhCQsysi~2>EK2%+KJmoVshvB=2=@sQAB1PU z?Bm(lSsyvtzU4YH84aPTtsNoziD4QJ%M7+!To5Q>DXCuW7Li`TU8Wn>M?u1=aHZq{ zYG5*96UV3VNPqwwOd{5e63}+}^Gk}v0Y+I7(d^mt#m7%Hi@3g(*B5Rv94L4! zhyW@wU5^HvaOUa5xPX;!G<^qQ65^$?x#94g6u7t$9w&ay*K)>A4QOj?qg^S3P;mTg z*h}k~aoICma|jSed^HzXnlLh{O0P0(&~^VAe*<&g^~Tun!Q>b7F749SluI<4R*L2I zg*~!eNqMFGe7GKoE#gk~+IoC~TUo;Ea!@SHch}b=9z}!b_bvzN4!iH;Z{BrJmeRO_ zPaTLn*(`-k$qu{SA(eUiRb6YKKex}Qd^0G9N$3I`jXxN4M}K>W~-hFwL*lOlDG7BJL-M z4bo)3sw>6K&;PA9jr{SBw*S_qa1Bnz8IhO-t{A}u+t5^GCnKBmux^J{Q}y&q*71k= ziW#sbS`z0{7ydUTX;&TNd^hkko^DJiY2Z+PWXR3}>@O)Rq0om10N%~82==YIi; CAwOaO literal 24050 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 From f2f5d9f9aecd5ee789657d7317581ff01d43d35d Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Wed, 13 Apr 2016 19:07:20 -0700 Subject: [PATCH 4/5] docs(ts): update to beta.15 also restore accidentally deleted router sample files --- .../homepage-hello-world/ts/index.1.html | 8 +-- .../_examples/homepage-tabs/ts/index.1.html | 8 +-- .../_examples/homepage-todo/ts/index.1.html | 8 +-- public/docs/_examples/package.json | 10 ++-- .../_examples/quickstart/js/package.1.json | 4 +- .../_examples/quickstart/ts/package.1.json | 8 +-- .../_examples/quickstart/ts/typings.1.json | 2 +- .../_examples/router/ts/example-config.json | 0 public/docs/_examples/router/ts/index.html | 50 +++++++++++++++++++ public/docs/_examples/typings.json | 2 +- public/docs/dart/latest/_data.json | 2 +- public/docs/js/latest/_data.json | 2 +- public/docs/ts/latest/_data.json | 2 +- tools/plunker-builder/indexHtmlTranslator.js | 25 +++++----- 14 files changed, 91 insertions(+), 40 deletions(-) create mode 100644 public/docs/_examples/router/ts/example-config.json create mode 100644 public/docs/_examples/router/ts/index.html diff --git a/public/docs/_examples/homepage-hello-world/ts/index.1.html b/public/docs/_examples/homepage-hello-world/ts/index.1.html index 3b747789d7..c311e81341 100644 --- a/public/docs/_examples/homepage-hello-world/ts/index.1.html +++ b/public/docs/_examples/homepage-hello-world/ts/index.1.html @@ -9,14 +9,14 @@ - + - - - + + + - + - - - + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + loading... + + + + diff --git a/public/docs/_examples/typings.json b/public/docs/_examples/typings.json index c06bb4d720..d6a258cfb6 100644 --- a/public/docs/_examples/typings.json +++ b/public/docs/_examples/typings.json @@ -1,6 +1,6 @@ { "ambientDependencies": { "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd", - "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd" + "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#5c182b9af717f73146399c2485f70f1e2ac0ff2b" } } diff --git a/public/docs/dart/latest/_data.json b/public/docs/dart/latest/_data.json index 20395954fe..5ff6c36d74 100644 --- a/public/docs/dart/latest/_data.json +++ b/public/docs/dart/latest/_data.json @@ -3,7 +3,7 @@ "icon": "home", "title": "Angular Docs", "menuTitle": "Docs Home", - "banner": "Welcome to angular.io/dart! The current Angular 2 release is beta.14. Consult the Change Log about recent enhancements, fixes, and breaking changes." + "banner": "Welcome to angular.io/dart! The current Angular 2 release is beta.15. Consult the Change Log about recent enhancements, fixes, and breaking changes." }, "quickstart": { diff --git a/public/docs/js/latest/_data.json b/public/docs/js/latest/_data.json index 90342c89f3..3e0602f0b7 100644 --- a/public/docs/js/latest/_data.json +++ b/public/docs/js/latest/_data.json @@ -3,7 +3,7 @@ "icon": "home", "title": "Angular Docs", "menuTitle": "Docs Home", - "banner": "Welcome to Angular in JavaScript! The current Angular 2 release is beta.14. Please consult the Change Log about recent enhancements, fixes, and breaking changes." + "banner": "Welcome to Angular in JavaScript! The current Angular 2 release is beta.15. Please consult the Change Log about recent enhancements, fixes, and breaking changes." }, "quickstart": { diff --git a/public/docs/ts/latest/_data.json b/public/docs/ts/latest/_data.json index d0533f5b6e..b0cdb6993b 100644 --- a/public/docs/ts/latest/_data.json +++ b/public/docs/ts/latest/_data.json @@ -3,7 +3,7 @@ "icon": "home", "title": "Angular Docs", "menuTitle": "Docs Home", - "banner": "Welcome to Angular in TypeScript! The current Angular 2 release is beta.14. Please consult the Change Log about recent enhancements, fixes, and breaking changes." + "banner": "Welcome to Angular in TypeScript! The current Angular 2 release is beta.15. Please consult the Change Log about recent enhancements, fixes, and breaking changes." }, "quickstart": { diff --git a/tools/plunker-builder/indexHtmlTranslator.js b/tools/plunker-builder/indexHtmlTranslator.js index 3591c8e47c..c40182adde 100644 --- a/tools/plunker-builder/indexHtmlTranslator.js +++ b/tools/plunker-builder/indexHtmlTranslator.js @@ -35,57 +35,58 @@ var _rxData = [ pattern: 'script', from: 'node_modules/systemjs/dist/system.src.js', //to: ['https://code.angularjs.org/tools/system.js', 'https://code.angularjs.org/tools/typescript.js'] - to: ['https://code.angularjs.org/tools/system.js', 'https://npmcdn.com/typescript@1.8.9/lib/typescript.js'] + //to: ['https://code.angularjs.org/tools/system.js', 'https://npmcdn.com/typescript@1.8.10/lib/typescript.js'] + to: ['https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.26/system.js', 'https://npmcdn.com/typescript@1.8.10/lib/typescript.js'] }, { pattern: 'script', from: 'node_modules/angular2/bundles/angular2.dev.js', - to: 'https://code.angularjs.org/2.0.0-beta.14/angular2.dev.js' + to: 'https://code.angularjs.org/2.0.0-beta.15/angular2.dev.js' }, { pattern: 'script', from: 'node_modules/angular2/bundles/angular2-all.umd.dev.js', - to: 'https://code.angularjs.org/2.0.0-beta.14/angular2-all.umd.dev.js' + to: 'https://code.angularjs.org/2.0.0-beta.15/angular2-all.umd.dev.js' }, { pattern: 'script', from: 'node_modules/angular2/bundles/angular2-all.umd.js', - to: 'https://code.angularjs.org/2.0.0-beta.14/angular2-all.umd.dev.js' + to: 'https://code.angularjs.org/2.0.0-beta.15/angular2-all.umd.dev.js' }, { pattern: 'script', from: 'node_modules/angular2/bundles/angular2-polyfills.js', - to: 'https://code.angularjs.org/2.0.0-beta.14/angular2-polyfills.js' + to: 'https://code.angularjs.org/2.0.0-beta.15/angular2-polyfills.js' }, { pattern: 'script', from: 'node_modules/rxjs/bundles/Rx.js', - to: 'https://code.angularjs.org/2.0.0-beta.14/Rx.js' + to: 'https://code.angularjs.org/2.0.0-beta.15/Rx.js' }, { pattern: 'script', from: 'node_modules/rxjs/bundles/Rx.umd.js', - to: 'https://code.angularjs.org/2.0.0-beta.14/Rx.umd.js' + to: 'https://code.angularjs.org/2.0.0-beta.15/Rx.umd.js' }, { pattern: 'script', from: 'node_modules/angular2/bundles/router.dev.js', - to: 'https://code.angularjs.org/2.0.0-beta.14/router.dev.js' + to: 'https://code.angularjs.org/2.0.0-beta.15/router.dev.js' }, { pattern: 'script', from: 'node_modules/angular2/bundles/http.dev.js', - to: 'https://code.angularjs.org/2.0.0-beta.14/http.dev.js' + to: 'https://code.angularjs.org/2.0.0-beta.15/http.dev.js' }, { pattern: 'script', from: 'node_modules/angular2/bundles/testing.dev.js', - to: 'https://code.angularjs.org/2.0.0-beta.14/testing.dev.js' + to: 'https://code.angularjs.org/2.0.0-beta.15/testing.dev.js' }, { pattern: 'script', from: 'node_modules/angular2/es6/dev/src/testing/shims_for_IE.js', - to: 'https://npmcdn.com/angular2@2.0.0-beta.14/es6/dev/src/testing/shims_for_IE.js' + to: 'https://npmcdn.com/angular2@2.0.0-beta.15/es6/dev/src/testing/shims_for_IE.js' }, { pattern: 'script', @@ -95,7 +96,7 @@ var _rxData = [ { pattern: 'script', from: 'node_modules/systemjs/dist/system-polyfills.js', - to: 'https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js' + to: 'https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.26/system-polyfills.js' }, { pattern: 'script', From 205cc28f25b9b4aaf9e35a46f889fdc090a6fd3d Mon Sep 17 00:00:00 2001 From: Ken Dale Date: Wed, 13 Apr 2016 18:42:43 -0400 Subject: [PATCH 5/5] docs(lifecycle-hooks): change ngOnit references to ngOnInit closes #1084 --- public/docs/ts/latest/guide/lifecycle-hooks.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/docs/ts/latest/guide/lifecycle-hooks.jade b/public/docs/ts/latest/guide/lifecycle-hooks.jade index 1f425fbee9..192e7a9aa2 100644 --- a/public/docs/ts/latest/guide/lifecycle-hooks.jade +++ b/public/docs/ts/latest/guide/lifecycle-hooks.jade @@ -348,7 +348,7 @@ figure.image-display img(src='/resources/images/devguide/lifecycle-hooks/spy-directive.gif' alt="Spy Directive") :marked - Adding a hero results in a new hero `
`. The spy's `ngOnit` logs that event. + Adding a hero results in a new hero `
`. The spy's `ngOnInit` logs that event. We see a new entry for each hero. The *Reset* button clears the `heroes` list. @@ -374,7 +374,7 @@ figure.image-display Constructors should do no more than set the initial local variables to simple values. When a component must start working _soon_ after creation, - we can count on Angular to call the `ngOnit` method to jumpstart it. + we can count on Angular to call the `ngOnInit` method to jumpstart it. That's where the heavy initialization logic belongs. Remember also that a directive's data-bound input properties are not set until _after construction_.