Sync recent updates to gallery generator and examples (#93)

Author: nshahan

angular_gallery/lib/builder/gallery_app_builder.dart

@@ -24,7 +24,7 @@ class GalleryWebBuilder extends Builder {
 
   Future _generateIndexHtml(BuildStep buildStep) async {
     final mustacheContext = {'galleryTitle': _galleryTitle};
-    final newAssetId = new AssetId(buildStep.inputId.package, 'web/index.html');
+    final newAssetId = AssetId(buildStep.inputId.package, 'web/index.html');
     await writeAsset(buildStep, 'lib/builder/template/index.html.mustache',
         mustacheContext, newAssetId);
   }
@@ -34,13 +34,13 @@ class GalleryWebBuilder extends Builder {
       'galleryImportUri':
           'package:${buildStep.inputId.package}/gallery/gallery.template.dart'
     };
-    final newAssetId = new AssetId(buildStep.inputId.package, 'web/main.dart');
+    final newAssetId = AssetId(buildStep.inputId.package, 'web/main.dart');
     await writeAsset(buildStep, 'lib/builder/template/main.dart.mustache',
         mustacheContext, newAssetId);
   }
 
   Future _generateStyleScss(BuildStep buildStep) async {
-    final newAssetId = new AssetId(buildStep.inputId.package, 'web/style.scss');
+    final newAssetId = AssetId(buildStep.inputId.package, 'web/style.scss');
     await writeAsset(
         buildStep, 'lib/builder/template/style.scss.mustache', {}, newAssetId);
   }

angular_gallery/lib/builder/gallery_lib_builder.dart

@@ -42,7 +42,7 @@ class GalleryLibBuilder extends Builder {
   Future _generateGalleryHtml(BuildStep buildStep) async {
     final mustacheContext = {'galleryTitle': _galleryTitle};
     final newAssetId =
-        new AssetId(buildStep.inputId.package, 'lib/gallery/gallery.html');
+        AssetId(buildStep.inputId.package, 'lib/gallery/gallery.html');
     await writeAsset(buildStep, 'lib/builder/template/gallery.html.mustache',
         mustacheContext, newAssetId);
   }
@@ -55,14 +55,14 @@ class GalleryLibBuilder extends Builder {
     };
 
     final newAssetId =
-        new AssetId(buildStep.inputId.package, 'lib/gallery/gallery.dart');
+        AssetId(buildStep.inputId.package, 'lib/gallery/gallery.dart');
     await writeAsset(buildStep, 'lib/builder/template/gallery.dart.mustache',
         mustacheContext, newAssetId);
   }
 
   Future _generateGalleryScss(BuildStep buildStep) async {
     final newAssetId =
-        new AssetId(buildStep.inputId.package, 'lib/gallery/gallery.scss');
+        AssetId(buildStep.inputId.package, 'lib/gallery/gallery.scss');
     await writeAsset(buildStep, 'lib/builder/template/gallery.scss.mustache',
         {}, newAssetId);
   }
@@ -73,7 +73,7 @@ class GalleryLibBuilder extends Builder {
       'examples': examples,
     };
 
-    final newAssetId = new AssetId(
+    final newAssetId = AssetId(
         buildStep.inputId.package, 'lib/gallery/gallery_route_library.dart');
     await writeAsset(
         buildStep,
@@ -84,18 +84,18 @@ class GalleryLibBuilder extends Builder {
 
   /// Reads gallery_section_summary.json files from all `_examplePackages`.
   Future<List<Example>> loadSummaries(BuildStep buildStep) async {
-    final examples = new List<Example>();
+    final examples = List<Example>();
 
     for (var package in _examplePackages) {
       final gallerySectionSummaryId =
-          new AssetId(package, 'lib/gallery_section_summary.json');
+          AssetId(package, 'lib/gallery_section_summary.json');
       if (!await buildStep.canRead(gallerySectionSummaryId)) continue;
 
       final summaryContents =
           await buildStep.readAsString(gallerySectionSummaryId);
       final summaries = (jsonDecode(summaryContents) as Iterable)
           .map((m) => (m as Map).cast<String, dynamic>());
-      examples.addAll(summaries.map((summary) => new Example(
+      examples.addAll(summaries.map((summary) => Example(
           summary['displayName'],
           summary['dartImport'],
           summary['componentClass'],
@@ -118,7 +118,7 @@ class Example {
       this.relatedComponents);
 
   String get name => strings
-      .underscore(displayName.replaceAll(new RegExp(r'[^a-zA-Z0-9 _-]'), ''));
+      .underscore(displayName.replaceAll(RegExp(r'[^a-zA-Z0-9 _-]'), ''));
 
   String get linkName => strings.capitalizeFirstLetter(name);
 

angular_gallery/lib/builders.dart

@@ -7,14 +7,13 @@ import 'package:angular_gallery/builder/gallery_app_builder.dart';
 import 'package:angular_gallery/builder/gallery_lib_builder.dart';
 
 /// Builders used to generate files in the gallery app target.
-Builder galleryAppBuilder(BuilderOptions options) => new MultiplexingBuilder([
-      new GalleryWebBuilder(
-          options.config['galleryTitle'] ?? 'Example Gallery'),
-      new HomeDartBuilder(),
+Builder galleryAppBuilder(BuilderOptions options) => MultiplexingBuilder([
+      GalleryWebBuilder(options.config['galleryTitle'] ?? 'Example Gallery'),
+      HomeDartBuilder(),
     ]);
 
 /// Builder used to generate files in the gallery library target.
-Builder galleryLibBuilder(BuilderOptions options) => new GalleryLibBuilder(
+Builder galleryLibBuilder(BuilderOptions options) => GalleryLibBuilder(
       options.config['galleryTitle'] ?? 'Example Gallery',
       options.config['styleUrls'].cast<String>(),
       (options.config['examples'] as String).split(','),

angular_gallery/lib/src/template_util.dart

@@ -14,9 +14,8 @@ import 'package:mustache/mustache.dart';
 /// in package:ads.acx2.demo.
 Future writeAsset(BuildStep buildStep, String templatePath,
     Map<String, dynamic> mustacheContext, AssetId newAssetId) async {
-  final templateId = new AssetId('angular_gallery', templatePath);
-  final mustacheTemplate =
-      new Template(await buildStep.readAsString(templateId));
+  final templateId = AssetId('angular_gallery', templatePath);
+  final mustacheTemplate = Template(await buildStep.readAsString(templateId));
   buildStep.writeAsString(
       newAssetId, mustacheTemplate.renderString(mustacheContext));
 }

angular_gallery/pubspec.yaml

@@ -3,10 +3,10 @@ author: Dart Team <[email protected]>
 environment:
   sdk: '>=2.0.0-dev.64.2 <3.0.0'
 dependencies:
-  angular: ^5.0.0-beta+1
-  angular_components: 0.9.0-beta+1
-  angular_forms: ^2.0.0-beta+1
-  angular_router: 2.0.0-alpha+16
+  angular: ^5.0.0-beta+2
+  angular_components: 0.9.0-beta+2
+  angular_forms: ^2.0.0-beta+2
+  angular_router: 2.0.0-alpha+17
   build: '>=0.11.1 <0.13.0'
   build_config: '>=0.2.6 <0.4.0'
   mustache: ^1.0.0

angular_gallery_section/lib/builder.dart

@@ -12,18 +12,16 @@ import 'package:angular_gallery_section/builder/gallery_section_summary_builder.
 /// @GallerySectionConfig to be read by the other builders that might not
 /// have access to a resolver.
 Builder galleryInfoBuilder(BuilderOptions options) =>
-    new GalleryInfoBuilder(options.config['staticImageServer']);
+    GalleryInfoBuilder(options.config['staticImageServer']);
 
 /// Builder used to generate the API page for the gallery from a
 /// @GallerySectionConfig-annotated class.
-Builder componentApiBuilder(BuilderOptions options) =>
-    new ComponentApiBuilder();
+Builder componentApiBuilder(BuilderOptions options) => ComponentApiBuilder();
 
 /// Builder used to generate the page for a stand alone example app and a
 /// summary used in building the gallery from a @GallerySectionConfig-annotated
 /// class.
-Builder gallerySectionBuilder(BuilderOptions options) =>
-    new MultiplexingBuilder([
-      new GallerySectionBuilder(),
-      new GallerySectionSummaryBuilder(),
+Builder gallerySectionBuilder(BuilderOptions options) => MultiplexingBuilder([
+      GallerySectionBuilder(),
+      GallerySectionSummaryBuilder(),
     ]);

angular_gallery_section/lib/builder/component_api_builder.dart

@@ -29,30 +29,29 @@ class ComponentApiBuilder extends Builder {
   Future build(BuildStep buildStep) async {
     final inputId = buildStep.inputId;
     final infoList = (jsonDecode(await buildStep.readAsString(inputId)) as List)
-        .map((info) => new ResolvedConfig.fromJson(info));
+        .map((info) => ResolvedConfig.fromJson(info));
 
     final mustacheContext = await _mustacheContext(infoList);
-    final templateId = new AssetId('angular_gallery_section',
+    final templateId = AssetId('angular_gallery_section',
         'lib/builder/template/component.api.dart.mustache');
-    final mustacheTemplate = new Template(
-        await buildStep.readAsString(templateId),
+    final mustacheTemplate = Template(await buildStep.readAsString(templateId),
         htmlEscapeValues: false);
 
-    final newAssetId = new AssetId(inputId.package,
+    final newAssetId = AssetId(inputId.package,
         inputId.path.replaceFirst('.gallery_info.json', '.api.dart'));
     buildStep.writeAsString(
         newAssetId, mustacheTemplate.renderString(mustacheContext));
   }
 
   @override
   Map<String, List<String>> get buildExtensions => const {
-        '.gallery_info.json': const ['.api.dart']
+        '.gallery_info.json': ['.api.dart']
       };
 
   /// Returns a context with the useful values from the [configs].
   Future<Map<String, dynamic>> _mustacheContext(
       Iterable<ResolvedConfig> configs) async {
-    final dedupedImports = new Set<String>();
+    final dedupedImports = Set<String>();
     final context = <String, dynamic>{'apiComponents': []};
     for (final config in configs) {
       // If multiple components are defined in a demo file, we would end up with

angular_gallery_section/lib/builder/gallery_info_builder.dart

@@ -46,7 +46,7 @@ class GalleryInfoBuilder extends Builder {
 
   @override
   Map<String, List<String>> get buildExtensions => const {
-        '.dart': const ['.gallery_info.json'],
+        '.dart': ['.gallery_info.json'],
       };
 
   /// Resolve the docs and demos within all [configs].
@@ -56,7 +56,7 @@ class GalleryInfoBuilder extends Builder {
   Future<Iterable<ResolvedConfig>> _resolveConfigs(Iterable<ConfigInfo> configs,
           LibraryElement rootLibrary, AssetReader assetReader) async =>
       Future.wait(configs.map((config) async {
-        final resolved = new ResolvedConfig()
+        final resolved = ResolvedConfig()
           ..displayName = config.displayName
           ..benchmarks = config.benchmarks
           ..benchmarkPrefix = config.benchmarkPrefix
@@ -68,8 +68,7 @@ class GalleryInfoBuilder extends Builder {
           Future.wait(_resolveDocs(config.docs, rootLibrary, assetReader)).then(
               (docs) =>
                   resolved.docs = docs.where((doc) => doc != null).toList()),
-          Future
-              .wait(_resolveDemos(
+          Future.wait(_resolveDemos(
                   config.demoClassNames, rootLibrary, assetReader))
               .then((demos) => resolved.demos =
                   demos.where((demo) => demo != null).toList()),
@@ -108,7 +107,7 @@ class GalleryInfoBuilder extends Builder {
   /// Read the [markdownAsset] with [assetReader] and render as HTML.
   Future<DocInfo> _readMarkdownAsset(
       String markdownAsset, AssetReader assetReader) async {
-    final assetId = new AssetId.resolve(markdownAsset);
+    final assetId = AssetId.resolve(markdownAsset);
     if (extension(assetId.path) != '.md') {
       log.warning('Generator only supports .md files as supplementary docs. '
           'Can not insert $assetId into gallery.');
@@ -124,7 +123,7 @@ class GalleryInfoBuilder extends Builder {
     // Convert markdown to html and insert static server for images.
     final htmlContent = _replaceImgTags(g3docMarkdownToHtml(content));
 
-    return new DocInfo()
+    return DocInfo()
       ..name = basenameWithoutExtension(assetId.path)
       ..path = path_utils.assetToPath(assetId.toString())
       ..comment = htmlContent;
@@ -137,7 +136,7 @@ class GalleryInfoBuilder extends Builder {
   /// [assetReader].
   Future<DocInfo> _resolveDocFromClass(String identifier,
       LibraryElement library, AssetReader assetReader) async {
-    final libraryId = new AssetId.resolve(library.source.uri.toString());
+    final libraryId = AssetId.resolve(library.source.uri.toString());
     final docClass = library.getType(identifier);
     DocInfo docs;
 
@@ -160,15 +159,15 @@ class GalleryInfoBuilder extends Builder {
       // classElement.documentationComment, classElement.metadata, etc are not
       // populated in the resolved element model available here.
       var libraryId =
-          new AssetId.resolve(classElement.library.source.uri.toString());
+          AssetId.resolve(classElement.library.source.uri.toString());
       docs =
           await extractDocumentation(classElement.name, libraryId, assetReader);
 
       if (docs == null) {
         // The super class must be defined in the library as a part file.
         for (var part in classElement.library.parts) {
           if (part.getType(classElement.name) != null) {
-            libraryId = new AssetId.resolve(part.source.uri.toString());
+            libraryId = AssetId.resolve(part.source.uri.toString());
             docs = await extractDocumentation(
                 classElement.name, libraryId, assetReader);
           }
@@ -235,7 +234,7 @@ class GalleryInfoBuilder extends Builder {
 
   /// Replace web server in `<img>` tags with the [_staticImageServer].
   String _replaceImgTags(String content) => content.replaceAllMapped(
-      new RegExp(r'<img alt="(.*)" src="(\S*g3doc\S+)" \/>'),
+      RegExp(r'<img alt="(.*)" src="(\S*g3doc\S+)" \/>'),
       (Match m) => '<img alt="${m[1]}" src="$_staticImageServer${m[2]}" />');
 
   /// Resolve all [demoClassNames] into [_DemoInfo]s.
@@ -263,15 +262,15 @@ class GalleryInfoBuilder extends Builder {
   /// [assetReader].
   Future<DemoInfo> _resolveDemo(String demoClassName, LibraryElement library,
       AssetReader assetReader) async {
-    final libraryId = new AssetId.resolve(library.source.uri.toString());
+    final libraryId = AssetId.resolve(library.source.uri.toString());
     final extractedDemo =
         await extractDocumentation(demoClassName, libraryId, assetReader);
 
     if (extractedDemo == null) {
       log.warning('Failed to extract demo information from: $demoClassName.');
       return null;
     }
-    return new DemoInfo()
+    return DemoInfo()
       ..type = extractedDemo.name
       ..name = extractedDemo.name
       ..selector = extractedDemo.selector
@@ -284,8 +283,8 @@ class GalleryInfoBuilder extends Builder {
   /// Searches imports with a breadth-first search, as that should find
   /// [identifier] faster than a depth-first search.
   LibraryElement _searchFor(String identifier, LibraryElement rootLibrary) {
-    final visited = new Set<LibraryElement>();
-    final toVisit = new Queue<LibraryElement>();
+    final visited = Set<LibraryElement>();
+    final toVisit = Queue<LibraryElement>();
 
     toVisit.add(rootLibrary);
 

angular_gallery_section/lib/builder/gallery_section_builder.dart

@@ -21,17 +21,17 @@ class GallerySectionBuilder extends Builder {
   Future build(BuildStep buildStep) async {
     final inputId = buildStep.inputId;
     final infoAssets =
-        await buildStep.findAssets(new Glob('**/*.gallery_info.json')).toList();
+        await buildStep.findAssets(Glob('**/*.gallery_info.json')).toList();
     if (infoAssets.isEmpty) return;
 
-    final mergedImports = new Set<String>();
+    final mergedImports = Set<String>();
     final mergedDemos = <String, String>{};
     final apis = [];
 
     for (final assetId in infoAssets) {
       final infoList =
           (jsonDecode(await buildStep.readAsString(assetId)) as List)
-              .map((info) => new ResolvedConfig.fromJson(info));
+              .map((info) => ResolvedConfig.fromJson(info));
 
       // There is an API page generated for every .gallery_info.json file.
       final api = <String, dynamic>{
@@ -63,13 +63,12 @@ class GallerySectionBuilder extends Builder {
       'apis': apis,
     };
 
-    final templateId = new AssetId('angular_gallery_section',
+    final templateId = AssetId('angular_gallery_section',
         'lib/builder/template/gallery_section.dart.mustache');
-    final mustacheTemplate = new Template(
-        await buildStep.readAsString(templateId),
+    final mustacheTemplate = Template(await buildStep.readAsString(templateId),
         htmlEscapeValues: false);
 
-    final newAssetId = new AssetId(inputId.package, 'lib/gallery_section.dart');
+    final newAssetId = AssetId(inputId.package, 'lib/gallery_section.dart');
     buildStep.writeAsString(
         newAssetId, mustacheTemplate.renderString(mustacheContext));
   }

angular_gallery_section/lib/builder/gallery_section_summary_builder.dart

@@ -19,14 +19,14 @@ class GallerySectionSummaryBuilder extends Builder {
   @override
   Future build(BuildStep buildStep) async {
     final inputId = buildStep.inputId;
-    final summaries = new List<Map<String, dynamic>>();
+    final summaries = List<Map<String, dynamic>>();
 
     // Extract details from @GallerySectionConfig annotations.
     await for (var assetId
-        in buildStep.findAssets(new Glob('**/*.gallery_info.json'))) {
+        in buildStep.findAssets(Glob('**/*.gallery_info.json'))) {
       final infoList =
           (jsonDecode(await buildStep.readAsString(assetId)) as List)
-              .map((info) => new ResolvedConfig.fromJson(info));
+              .map((info) => ResolvedConfig.fromJson(info));
 
       if (infoList.isEmpty) continue;
 
@@ -39,7 +39,7 @@ class GallerySectionSummaryBuilder extends Builder {
     }
 
     final newAssetId =
-        new AssetId(inputId.package, 'lib/gallery_section_summary.json');
+        AssetId(inputId.package, 'lib/gallery_section_summary.json');
     buildStep.writeAsString(newAssetId, jsonEncode(summaries));
   }
 

angular_gallery_section/lib/components/content/delayed_content.dart

@@ -22,8 +22,8 @@ import 'package:angular_components/material_progress/material_progress.dart';
 @Component(
   selector: 'delayed-content',
   templateUrl: 'delayed_content.html',
-  styleUrls: const ['delayed_content.scss.css'],
-  directives: const [MaterialProgressComponent, NgIf],
+  styleUrls: ['delayed_content.scss.css'],
+  directives: [MaterialProgressComponent, NgIf],
   // TODO(google): Change preserveWhitespace to false to improve codesize.
   preserveWhitespace: true,
 )
@@ -37,7 +37,7 @@ class DelayedContentComponent implements OnInit {
   void ngOnInit() {
     if (delay != null) {
       resolved = false;
-      new Timer(new Duration(seconds: delay), _resolve);
+      Timer(Duration(seconds: delay), _resolve);
     } else {
       resolved = true;
     }