test(ivy): add bundling test todo_i18n (#27420)

PR Close #27420
This commit is contained in:
Olivier Combe
2018-12-04 19:59:12 -08:00
committed by Igor Minar
parent bd864fb274
commit 7f17c70fd0
13 changed files with 996 additions and 6 deletions
+2 -1
View File
@@ -7,7 +7,7 @@
*/
import {LifecycleHooksFeature, renderComponent, whenRendered} from './component';
import {defineBase, defineComponent, defineDirective, defineNgModule, definePipe} from './definition';
import {getHostElement, getRenderedText} from './discovery_utils';
import {getComponent, getHostElement, getRenderedText} from './discovery_utils';
import {InheritDefinitionFeature} from './features/inherit_definition_feature';
import {NgOnChangesFeature} from './features/ng_onchanges_feature';
import {ProvidersFeature} from './features/providers_feature';
@@ -169,6 +169,7 @@ export {
defineBase,
definePipe,
getHostElement,
getComponent,
getRenderedText,
renderComponent,
whenRendered,
+1 -2
View File
@@ -179,5 +179,4 @@ class ToDoAppComponent {
class ToDoAppModule {
}
// TODO(misko): create cleaner way to publish component into global location for tests.
(window as any).toDoAppComponent = renderComponent(ToDoAppComponent);
renderComponent(ToDoAppComponent);
@@ -8,6 +8,7 @@
import '@angular/compiler';
import {ɵwhenRendered as whenRendered} from '@angular/core';
import {getComponent} from '@angular/core/src/render3';
import {withBody} from '@angular/private/testing';
import * as path from 'path';
@@ -22,8 +23,7 @@ describe('functional test for todo', () => {
describe(bundle, () => {
it('should render todo', withBody('<todo-app></todo-app>', async() => {
require(path.join(PACKAGE, bundle));
// TODO(misko): have cleaner way to do this for tests.
const toDoAppComponent = (window as any).toDoAppComponent;
const toDoAppComponent = getComponent(document.querySelector('todo-app') !);
expect(document.body.textContent).toContain('todos');
expect(document.body.textContent).toContain('Demonstrate Components');
expect(document.body.textContent).toContain('4 items left');
@@ -0,0 +1,115 @@
package(default_visibility = ["//visibility:public"])
load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
load("//tools/http-server:http_server.bzl", "http_server")
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
ng_module(
name = "todo_i18n",
srcs = [
"index.ts",
"translations.ts",
],
tags = [
"ivy-only",
],
deps = [
"//packages/common",
"//packages/core",
"//packages/core/test/bundling/util:reflect_metadata",
],
)
ng_rollup_bundle(
name = "bundle",
# TODO(alexeagle): This is inconsistent.
# We try to teach users to always have their workspace at the start of a
# path, to disambiguate from other workspaces.
# Here, the rule implementation is looking in an execroot where the layout
# has an "external" directory for external dependencies.
# This should probably start with "angular/" and let the rule deal with it.
entry_point = "packages/core/test/bundling/todo_i18n/index.js",
tags = [
"ivy-only",
],
deps = [
":todo_i18n",
"//packages/common",
"//packages/core",
"//packages/core/test/bundling/util:reflect_metadata",
],
)
ts_library(
name = "test_lib",
testonly = True,
srcs = glob(["*_spec.ts"]),
tags = [
"ivy-only",
],
deps = [
"//packages:types",
"//packages/compiler",
"//packages/core",
"//packages/core/testing",
"//packages/private/testing",
],
)
jasmine_node_test(
name = "test",
data = [
":bundle",
":bundle.js",
":bundle.min.js",
":bundle.min_debug.js",
],
tags = [
"ivy-only",
],
deps = [":test_lib"],
)
genrule(
name = "tslib",
srcs = [
"@ngdeps//node_modules/tslib:tslib.js",
],
outs = [
"tslib.js",
],
cmd = "cp $< $@",
tags = [
"ivy-only",
],
)
ts_devserver(
name = "devserver",
entry_module = "angular/packages/core/test/bundling/todo_i18n/index",
serving_path = "/bundle.min.js",
static_files = [
"index.html",
":tslib",
"todo.css",
"base.css",
],
tags = [
"ivy-only",
],
deps = [":todo_i18n"],
)
http_server(
name = "prodserver",
data = [
"base.css",
"index.html",
"todo.css",
":bundle.min.js.br",
":bundle.min_debug.js",
],
tags = [
"ivy-only",
],
)
@@ -0,0 +1,36 @@
# Outstanding on the `Todo` app
## `Todo` app
- [X] Clicking archive removes todo item.
- [X] Update `Todo` app to match http://todomvc.com/.
- [ ] Make it work with `[(ngModel)]`.
- [ ] Make it work with `(keyup.Enter)`.
## Compiler
- [ ] Remove ` tslib_1.__decorate([core_1.Input(), tslib_1.__metadata("design:type", Object)], TodoComponent.prototype, "todo", void 0);` from generated output.
- [ ] Allow compilation of `@angular/common` through ivy.
## Ivy Runtime
- [X] Work on `ViewContainerRef` needs to cause change detection so that `todo` app renders correctly on first render.
- [X] The todo input value box is not correctly rendering to checked for completed tasks.
- [ ] `ViewContainerRef` must separate creation mode from update mode otherwise {{todo.done}} fails for `NgFor` because `todo` is not set during creation mode.
- [ ] Injector should be optional
## Testing
- [ ] Create a debug mode which would publish components into DOM for easier writing of tests.
## Bazel
- [ ] Have action verb on the `ng_rollup_bundle` to display source maps.
# NOTES
## Killing hung `iblaze` server
At times the `iblaze run packages/core/test/bundling/todo:devserver` keeps running and holding onto
ports even after `ctrl-c`. This command kills the outstanding processes.
```
kill -9 $(ps aux | grep ibazel\\\|devserver | cut -c 17-23)
```
@@ -0,0 +1,141 @@
hr {
margin: 20px 0;
border: 0;
border-top: 1px dashed #c5c5c5;
border-bottom: 1px dashed #f7f7f7;
}
.learn a {
font-weight: normal;
text-decoration: none;
color: #b83f45;
}
.learn a:hover {
text-decoration: underline;
color: #787e7e;
}
.learn h3,
.learn h4,
.learn h5 {
margin: 10px 0;
font-weight: 500;
line-height: 1.2;
color: #000;
}
.learn h3 {
font-size: 24px;
}
.learn h4 {
font-size: 18px;
}
.learn h5 {
margin-bottom: 0;
font-size: 14px;
}
.learn ul {
padding: 0;
margin: 0 0 30px 25px;
}
.learn li {
line-height: 20px;
}
.learn p {
font-size: 15px;
font-weight: 300;
line-height: 1.3;
margin-top: 0;
margin-bottom: 0;
}
#issue-count {
display: none;
}
.quote {
border: none;
margin: 20px 0 60px 0;
}
.quote p {
font-style: italic;
}
.quote p:before {
content: '“';
font-size: 50px;
opacity: .15;
position: absolute;
top: -20px;
left: 3px;
}
.quote p:after {
content: '”';
font-size: 50px;
opacity: .15;
position: absolute;
bottom: -42px;
right: 3px;
}
.quote footer {
position: absolute;
bottom: -40px;
right: 0;
}
.quote footer img {
border-radius: 3px;
}
.quote footer a {
margin-left: 5px;
vertical-align: middle;
}
.speech-bubble {
position: relative;
padding: 10px;
background: rgba(0, 0, 0, .04);
border-radius: 5px;
}
.speech-bubble:after {
content: '';
position: absolute;
top: 100%;
right: 30px;
border: 13px solid transparent;
border-top-color: rgba(0, 0, 0, .04);
}
.learn-bar > .learn {
position: absolute;
width: 272px;
top: 8px;
left: -300px;
padding: 10px;
border-radius: 5px;
background-color: rgba(255, 255, 255, .6);
transition-property: left;
transition-duration: 500ms;
}
@media (min-width: 899px) {
.learn-bar {
width: auto;
padding-left: 300px;
}
.learn-bar > .learn {
left: 8px;
}
}
@@ -0,0 +1,57 @@
<!doctype html>
<html>
<head>
<title>Angular Todo Example</title>
<link rel="stylesheet" href="base.css">
<link rel="stylesheet" href="todo.css">
<style>
.done {
text-decoration: line-through;
}
</style>
</head>
<body>
<!-- The Angular application will be bootstrapped into this element. -->
<todo-app></todo-app>
<!--
Script tag which bootstraps the application. Use `?debug` in URL to select
the debug version of the script.
There are two scripts sources: `bundle.min.js` and `bundle.min_debug.js` You can
switch between which bundle the browser loads to experiment with the application.
- `bundle.min.js`: Is what the site would serve to their users. It has gone
through rollup, build-optimizer, and uglify with tree shaking.
- In `devserver` mode `bundle.min.js` is a bit misnamed since it is concatenated
individual files which are not minified.
- `bundle.min_debug.js`: Is what the developer would like to see when debugging
the application. It has also gone through full pipeline of rollup, build-optimizer,
and uglify, however special flags were passed to uglify to prevent inlining and
property renaming.
-->
<script>
document.write('<script src="' +
(document.location.search.endsWith('debug') ? '/bundle.min_debug.js' : '/bundle.min.js.br') +
'"></' + 'script>');
</script>
<script>
if (typeof define === "function" && define.amd) {
// If `define` is defined that we are in devserver mode. Dev server concatenates all of the
// source files and than loads them using `require`. There is an issue with the way
// `@angular/core` imports are generated which results in both `@angular/core` as well as `@angular/core/index`
// This hack makes both of the exports available to the application.
define("@angular/core", ["require", "exports", "tslib", "@angular/core/index"], function (require, exports) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var tslib = require("tslib");
tslib.__exportStar(require("@angular/core/index"), exports);
});
}
</script>
</body>
</html>
@@ -0,0 +1,181 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import '@angular/core/test/bundling/util/src/reflect_metadata';
import {CommonModule} from '@angular/common';
import {Component, Injectable, NgModule, ViewEncapsulation, ɵmarkDirty as markDirty, ɵrenderComponent as renderComponent} from '@angular/core';
// TODO(ocombe): replace this with the real runtime i18n service
import {localize} from './translations';
class Todo {
editing: boolean;
// TODO(issue/24571): remove '!'.
private _title !: string;
get title() { return this._title; }
set title(value: string) { this._title = value.trim(); }
constructor(title: string, public completed: boolean = false) {
this.editing = false;
this.title = title;
}
}
@Injectable({providedIn: 'root'})
class TodoStore {
todos: Array<Todo> = [
new Todo(localize('Demonstrate Components')),
new Todo(localize('Demonstrate Structural Directives'), true),
// Using a placeholder
new Todo(localize('Demonstrate {$value}', {value: 'NgModules'})),
new Todo(localize('Demonstrate zoneless change detection')),
new Todo(localize('Demonstrate internationalization')),
];
private getWithCompleted(completed: boolean) {
return this.todos.filter((todo: Todo) => todo.completed === completed);
}
allCompleted() { return this.todos.length === this.getCompleted().length; }
setAllTo(completed: boolean) { this.todos.forEach((t: Todo) => t.completed = completed); }
removeCompleted() { this.todos = this.getWithCompleted(false); }
getRemaining() { return this.getWithCompleted(false); }
getCompleted() { return this.getWithCompleted(true); }
toggleCompletion(todo: Todo) { todo.completed = !todo.completed; }
remove(todo: Todo) { this.todos.splice(this.todos.indexOf(todo), 1); }
add(title: string) { this.todos.push(new Todo(title)); }
}
@Component({
selector: 'todo-app',
// TODO(misko): make this work with `[(ngModel)]`
encapsulation: ViewEncapsulation.None,
template: `
<section class="todoapp">
<header class="header" i18n>
<h1>todos</h1>
<input class="new-todo" i18n-placeholder placeholder="What needs to be done?" autofocus=""
[value]="newTodoText"
(keyup)="$event.code == 'Enter' ? addTodo() : updateNewTodoValue($event.target.value)">
</header>
<section *ngIf="todoStore.todos.length > 0" class="main">
<input *ngIf="todoStore.todos.length"
#toggleall class="toggle-all" type="checkbox"
[checked]="todoStore.allCompleted()"
(click)="toggleAllTodos(toggleall.checked)">
<ul class="todo-list">
<li *ngFor="let todo of todoStore.todos"
[class.completed]="todo.completed"
[class.editing]="todo.editing">
<div class="view">
<input class="toggle" type="checkbox"
(click)="toggleCompletion(todo)"
[checked]="todo.completed">
<label (dblclick)="editTodo(todo)">{{todo.title}}</label>
<button class="destroy" (click)="remove(todo)"></button>
</div>
<input *ngIf="todo.editing"
class="edit" #editedtodo
[value]="todo.title"
(blur)="updateEditingTodo(todo, editedtodo.value)"
(keyup)="updateEditedTodoValue($event.target.value)"
(keyup)="$event.code == 'Enter' && updateEditingTodo(todo, editedtodo.value)"
(keyup)="$event.code == 'Escape' && cancelEditingTodo(todo)">
</li>
</ul>
</section>
<footer *ngIf="todoStore.todos.length > 0" class="footer">
<span class="todo-count" i18n>
<strong>{{todoStore.getRemaining().length}}</strong> {todoStore.getRemaining().length, plural, =1 {item left} other {items left}}
</span>
<button *ngIf="todoStore.getCompleted().length > 0" class="clear-completed" (click)="removeCompleted()" i18n>
Clear completed
</button>
</footer>
</section>
`,
// TODO(misko): switch over to OnPush
// changeDetection: ChangeDetectionStrategy.OnPush
})
class ToDoAppComponent {
newTodoText = '';
constructor(public todoStore: TodoStore) {}
cancelEditingTodo(todo: Todo) {
todo.editing = false;
markDirty(this);
}
finishUpdatingTodo(todo: Todo, editedTitle: string) {
editedTitle = editedTitle.trim();
if (editedTitle.length === 0) {
this.remove(todo);
}
todo.title = editedTitle;
this.cancelEditingTodo(todo);
}
editTodo(todo: Todo) {
todo.editing = true;
markDirty(this);
}
removeCompleted() {
this.todoStore.removeCompleted();
markDirty(this);
}
toggleCompletion(todo: Todo) {
this.todoStore.toggleCompletion(todo);
markDirty(this);
}
remove(todo: Todo) {
this.todoStore.remove(todo);
markDirty(this);
}
addTodo() {
if (this.newTodoText.trim().length) {
this.todoStore.add(this.newTodoText);
this.newTodoText = '';
}
markDirty(this);
}
toggleAllTodos(checked: boolean) {
this.todoStore.setAllTo(checked);
markDirty(this);
}
updateEditedTodoValue(todo: Todo, value: string) {
todo.title = value;
markDirty(this);
}
updateNewTodoValue(value: string) {
this.newTodoText = value;
markDirty(this);
}
}
@NgModule({declarations: [ToDoAppComponent], imports: [CommonModule]})
class ToDoAppModule {
}
renderComponent(ToDoAppComponent);
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,36 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import '@angular/compiler';
import {ɵwhenRendered as whenRendered} from '@angular/core';
import {getComponent} from '@angular/core/src/render3';
import {withBody} from '@angular/private/testing';
import * as path from 'path';
const PACKAGE = 'angular/packages/core/test/bundling/todo_i18n';
const BUNDLES = ['bundle.js', 'bundle.min_debug.js', 'bundle.min.js'];
describe('functional test for todo i18n', () => {
BUNDLES.forEach(bundle => {
describe(bundle, () => {
it('should render todo i18n', withBody('<todo-app></todo-app>', async() => {
require(path.join(PACKAGE, bundle));
const toDoAppComponent = getComponent(document.querySelector('todo-app') !);
expect(document.body.textContent).toContain('liste de tâches');
expect(document.body.textContent).toContain('Démontrer les components');
expect(document.body.textContent).toContain('Démontrer NgModules');
expect(document.body.textContent).toContain('4 tâches restantes');
expect(document.querySelector('.new-todo') !.getAttribute('placeholder'))
.toEqual(`Qu'y a-t-il à faire ?`);
document.querySelector('button') !.click();
await whenRendered(toDoAppComponent);
expect(document.body.textContent).toContain('3 tâches restantes');
}));
});
});
});
@@ -0,0 +1,42 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
declare var global: any;
declare var window: any;
export const translations: {[key: string]: string} = {
'What needs to be done?': `Qu'y a-t-il à faire ?`,
'{$startHeadingLevel1}todos{$closeHeadingLevel1}{$tagInput}':
'{$startHeadingLevel1}liste de tâches{$closeHeadingLevel1}{$tagInput}',
'{VAR_PLURAL, plural, =1 {item left} other {items left}}':
'{VAR_PLURAL, plural, =1 {tâche restante} other {tâches restantes}}',
'{$startTagStrong}{$interpolation}{$closeTagStrong}{$icu}':
'{$startTagStrong}{$interpolation}{$closeTagStrong} {$icu}',
' Clear completed ': ' Effacer terminés ',
'Demonstrate Components': 'Démontrer les components',
'Demonstrate Structural Directives': 'Démontrer les directives structurelles',
'Demonstrate {$value}': 'Démontrer {$value}',
'Demonstrate zoneless change detection': 'Démontrer la détection des changements sans zonejs',
'Demonstrate internationalization': `Démontrer l'internationalisation`
};
// Runtime i18n uses Closure goog.getMsg for now
// It will be replaced by the runtime service for external people
const glob = typeof global !== 'undefined' ? global : window;
glob.goog = glob.goog || {};
glob.goog.getMsg =
glob.goog.getMsg || function(input: string, placeholders: {[key: string]: string} = {}) {
if (typeof translations[input] !== 'undefined') { // to account for empty string
input = translations[input];
}
return Object.keys(placeholders).length ?
input.replace(/\{\$(.*?)\}/g, (match, key) => placeholders[key] || '') :
input;
};
export const localize = goog.getMsg;
+1
View File
@@ -16,6 +16,7 @@ declare namespace goog {
* as it is sometimes true.
*/
export const DEBUG: boolean;
export const getMsg: (input: string, placeholders?: {[key: string]: string}) => string;
}
/**
+4 -1
View File
@@ -13,11 +13,14 @@
* running outside of Closure Compiler. This method will not be needed once runtime translation
* service support is introduced.
*/
export function polyfillGoogGetMsg(): void {
export function polyfillGoogGetMsg(translations: {[key: string]: string} = {}): void {
const glob = (global as any);
glob.goog = glob.goog || {};
glob.goog.getMsg =
glob.goog.getMsg || function(input: string, placeholders: {[key: string]: string} = {}) {
if (typeof translations[input] !== 'undefined') { // to account for empty string
input = translations[input];
}
return Object.keys(placeholders).length ?
input.replace(/\{\$(.*?)\}/g, (match, key) => placeholders[key] || '') :
input;