angular · tbosch · Nov 6, 2015 · Nov 2, 2015
diff --git a/modules/angular2/pubspec.yaml b/modules/angular2/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   source_span: '^1.0.0'
   stack_trace: '^1.1.1'
 dev_dependencies:
-  guinness: '^0.1.17'
+  guinness: '^0.1.18'
 transformers:
 - angular2
 - $dart2js:

diff --git a/modules/angular2/src/compiler/change_detector_compiler.ts b/modules/angular2/src/compiler/change_detector_compiler.ts
@@ -63,7 +63,7 @@ export class ChangeDetectionCompiler {
     var index = 0;
     var sourceParts = changeDetectorDefinitions.map(definition => {
       var codegen: any;
-      var sourcePart;
+      var sourcePart: string;
       // TODO(tbosch): move the 2 code generators to the same place, one with .dart and one with .ts
       // suffix
       // and have the same API for calling them!
@@ -74,7 +74,7 @@ export class ChangeDetectionCompiler {
                           'dynamic' :
                           `${moduleRef(componentType.moduleUrl)}${componentType.name}`;
         codegen.generate(typeRef, className, definition);
-        factories.push(`(dispatcher) => new ${className}(dispatcher)`);
+        factories.push(`${className}.newChangeDetector`);
         sourcePart = codegen.toString();
       } else {
         codegen = new ChangeDetectorJITGenerator(

diff --git a/modules/angular2/src/compiler/command_compiler.ts b/modules/angular2/src/compiler/command_compiler.ts
diff --git a/modules/angular2/src/compiler/style_compiler.ts b/modules/angular2/src/compiler/style_compiler.ts
@@ -9,21 +9,12 @@ import {UrlResolver} from 'angular2/src/compiler/url_resolver';
 import {extractStyleUrls} from './style_url_resolver';
 import {
   escapeSingleQuoteString,
-  codeGenConcatArray,
-  codeGenMapArray,
-  codeGenReplaceAll,
   codeGenExportVariable,
   codeGenToString,
   MODULE_SUFFIX
 } from './util';
 import {Injectable} from 'angular2/src/core/di';
-
-const COMPONENT_VARIABLE = '%COMP%';
-var COMPONENT_REGEX = /%COMP%/g;
-const HOST_ATTR = `_nghost-${COMPONENT_VARIABLE}`;
-const HOST_ATTR_EXPR = `'_nghost-'+${COMPONENT_VARIABLE}`;
-const CONTENT_ATTR = `_ngcontent-${COMPONENT_VARIABLE}`;
-const CONTENT_ATTR_EXPR = `'_ngcontent-'+${COMPONENT_VARIABLE}`;
+import {COMPONENT_VARIABLE, HOST_ATTR, CONTENT_ATTR} from 'angular2/src/core/render/view_factory';
 
 @Injectable()
 export class StyleCompiler {
@@ -32,46 +23,33 @@ export class StyleCompiler {
 
   constructor(private _xhr: XHR, private _urlResolver: UrlResolver) {}
 
-  compileComponentRuntime(appId: string, templateId: number,
-                          template: CompileTemplateMetadata): Promise<string[]> {
+  compileComponentRuntime(template: CompileTemplateMetadata): Promise<Array<string | any[]>> {
     var styles = template.styles;
     var styleAbsUrls = template.styleUrls;
     return this._loadStyles(styles, styleAbsUrls,
-                            template.encapsulation === ViewEncapsulation.Emulated)
-        .then(styles => styles.map(style => StringWrapper.replaceAll(
-                                       style, COMPONENT_REGEX, componentId(appId, templateId))));
+                            template.encapsulation === ViewEncapsulation.Emulated);
   }
 
-  compileComponentCodeGen(appIdExpression: string, templateIdExpression: string,
-                          template: CompileTemplateMetadata): SourceExpression {
+  compileComponentCodeGen(template: CompileTemplateMetadata): SourceExpression {
     var shim = template.encapsulation === ViewEncapsulation.Emulated;
-    var suffix;
-    if (shim) {
-      suffix = codeGenMapArray(
-          ['style'],
-          `style${codeGenReplaceAll(COMPONENT_VARIABLE, componentIdExpression(appIdExpression, templateIdExpression))}`);
-    } else {
-      suffix = '';
-    }
-    return this._styleCodeGen(template.styles, template.styleUrls, shim, suffix);
+    return this._styleCodeGen(template.styles, template.styleUrls, shim);
   }
 
   compileStylesheetCodeGen(stylesheetUrl: string, cssText: string): SourceModule[] {
     var styleWithImports = extractStyleUrls(this._urlResolver, stylesheetUrl, cssText);
     return [
       this._styleModule(
           stylesheetUrl, false,
-          this._styleCodeGen([styleWithImports.style], styleWithImports.styleUrls, false, '')),
-      this._styleModule(
-          stylesheetUrl, true,
-          this._styleCodeGen([styleWithImports.style], styleWithImports.styleUrls, true, ''))
+          this._styleCodeGen([styleWithImports.style], styleWithImports.styleUrls, false)),
+      this._styleModule(stylesheetUrl, true, this._styleCodeGen([styleWithImports.style],
+                                                                styleWithImports.styleUrls, true))
     ];
   }
 
   clearCache() { this._styleCache.clear(); }
 
   private _loadStyles(plainStyles: string[], absUrls: string[],
-                      encapsulate: boolean): Promise<string[]> {
+                      encapsulate: boolean): Promise<Array<string | any[]>> {
     var promises = absUrls.map((absUrl) => {
       var cacheKey = `${absUrl}${encapsulate ? '.shim' : ''}`;
       var result = this._styleCache.get(cacheKey);
@@ -86,22 +64,23 @@ export class StyleCompiler {
       return result;
     });
     return PromiseWrapper.all(promises).then((nestedStyles: string[][]) => {
-      var result = plainStyles.map(plainStyle => this._shimIfNeeded(plainStyle, encapsulate));
-      nestedStyles.forEach(styles => styles.forEach(style => result.push(style)));
+      var result: Array<string | any[]> =
+          plainStyles.map(plainStyle => this._shimIfNeeded(plainStyle, encapsulate));
+      nestedStyles.forEach(styles => result.push(styles));
       return result;
     });
   }
 
-  private _styleCodeGen(plainStyles: string[], absUrls: string[], shim: boolean,
-                        suffix: string): SourceExpression {
-    var expressionSource = `(`;
-    expressionSource +=
-        `[${plainStyles.map( plainStyle => escapeSingleQuoteString(this._shimIfNeeded(plainStyle, shim)) ).join(',')}]`;
+  private _styleCodeGen(plainStyles: string[], absUrls: string[], shim: boolean): SourceExpression {
+    var arrayPrefix = IS_DART ? `const` : '';
+    var styleExpressions = plainStyles.map(
+        plainStyle => escapeSingleQuoteString(this._shimIfNeeded(plainStyle, shim)));
+
     for (var i = 0; i < absUrls.length; i++) {
       var moduleUrl = this._createModuleUrl(absUrls[i], shim);
-      expressionSource += codeGenConcatArray(`${moduleRef(moduleUrl)}STYLES`);
+      styleExpressions.push(`${moduleRef(moduleUrl)}STYLES`);
     }
-    expressionSource += `)${suffix}`;
+    var expressionSource = `${arrayPrefix} [${styleExpressions.join(',')}]`;
     return new SourceExpression([], expressionSource);
   }
 
@@ -122,29 +101,3 @@ export class StyleCompiler {
     return shim ? `${stylesheetUrl}.shim${MODULE_SUFFIX}` : `${stylesheetUrl}${MODULE_SUFFIX}`;
   }
 }
-
-export function shimContentAttribute(appId: string, templateId: number): string {
-  return StringWrapper.replaceAll(CONTENT_ATTR, COMPONENT_REGEX, componentId(appId, templateId));
-}
-
-export function shimContentAttributeExpr(appIdExpr: string, templateIdExpr: string): string {
-  return StringWrapper.replaceAll(CONTENT_ATTR_EXPR, COMPONENT_REGEX,
-                                  componentIdExpression(appIdExpr, templateIdExpr));
-}
-
-export function shimHostAttribute(appId: string, templateId: number): string {
-  return StringWrapper.replaceAll(HOST_ATTR, COMPONENT_REGEX, componentId(appId, templateId));
-}
-
-export function shimHostAttributeExpr(appIdExpr: string, templateIdExpr: string): string {
-  return StringWrapper.replaceAll(HOST_ATTR_EXPR, COMPONENT_REGEX,
-                                  componentIdExpression(appIdExpr, templateIdExpr));
-}
-
-function componentId(appId: string, templateId: number): string {
-  return `${appId}-${templateId}`;
-}
-
-function componentIdExpression(appIdExpression: string, templateIdExpression: string): string {
-  return `${appIdExpression}+'-'+${codeGenToString(templateIdExpression)}`;
-}