diff --git a/lib/src/generator/templates.aot_renderers_for_html.dart b/lib/src/generator/templates.aot_renderers_for_html.dart index 447b245ab2..9d79ada883 100644 --- a/lib/src/generator/templates.aot_renderers_for_html.dart +++ b/lib/src/generator/templates.aot_renderers_for_html.dart @@ -91,7 +91,7 @@ String renderCategory(CategoryTemplateData context0) { var context6 = context1.publicMixinsSorted; for (var context7 in context6) { buffer.write('\n '); - buffer.write(_renderCategory_partial_container_3(context7)); + buffer.write(_renderCategory_partial_container_4(context7)); } buffer.writeln(); buffer.write(''' @@ -106,7 +106,7 @@ String renderCategory(CategoryTemplateData context0) { var context8 = context1.publicExtensionsSorted; for (var context9 in context8) { buffer.write('\n '); - buffer.write(_renderCategory_partial_extension_4(context9)); + buffer.write(_renderCategory_partial_extension_5(context9)); } buffer.writeln(); buffer.write(''' @@ -121,7 +121,7 @@ String renderCategory(CategoryTemplateData context0) { var context10 = context1.publicConstantsSorted; for (var context11 in context10) { buffer.write('\n '); - buffer.write(_renderCategory_partial_constant_5(context11)); + buffer.write(_renderCategory_partial_constant_6(context11)); } buffer.writeln(); buffer.write(''' @@ -136,7 +136,7 @@ String renderCategory(CategoryTemplateData context0) { var context12 = context1.publicPropertiesSorted; for (var context13 in context12) { buffer.write('\n '); - buffer.write(_renderCategory_partial_property_6(context13)); + buffer.write(_renderCategory_partial_property_7(context13)); } buffer.writeln(); buffer.write(''' @@ -151,7 +151,7 @@ String renderCategory(CategoryTemplateData context0) { var context14 = context1.publicFunctionsSorted; for (var context15 in context14) { buffer.write('\n '); - buffer.write(_renderCategory_partial_callable_7(context15)); + buffer.write(_renderCategory_partial_callable_8(context15)); } buffer.writeln(); buffer.write(''' @@ -166,7 +166,7 @@ String renderCategory(CategoryTemplateData context0) { var context16 = context1.publicEnumsSorted; for (var context17 in context16) { buffer.write('\n '); - buffer.write(_renderCategory_partial_container_3(context17)); + buffer.write(_renderCategory_partial_container_9(context17)); } buffer.writeln(); buffer.write(''' @@ -181,7 +181,7 @@ String renderCategory(CategoryTemplateData context0) { var context18 = context1.publicTypedefsSorted; for (var context19 in context18) { buffer.write('\n '); - buffer.write(_renderCategory_partial_typedef_8(context19)); + buffer.write(_renderCategory_partial_typedef_10(context19)); } buffer.writeln(); buffer.write(''' @@ -196,7 +196,7 @@ String renderCategory(CategoryTemplateData context0) { var context20 = context1.publicExceptionsSorted; for (var context21 in context20) { buffer.write('\n '); - buffer.write(_renderCategory_partial_container_3(context21)); + buffer.write(_renderCategory_partial_container_11(context21)); } buffer.writeln(); buffer.write(''' @@ -206,7 +206,7 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(''' '''); - buffer.write(_renderCategory_partial_footer_12(context0)); + buffer.write(_renderCategory_partial_footer_15(context0)); buffer.writeln(); return buffer.toString(); @@ -965,7 +965,7 @@ String renderLibrary(LibraryTemplateData context0) { var context9 = context8.publicEnumsSorted; for (var context10 in context9) { buffer.write('\n '); - buffer.write(_renderLibrary_partial_container_5(context10)); + buffer.write(_renderLibrary_partial_container_6(context10)); } buffer.writeln(); buffer.write(''' @@ -982,7 +982,7 @@ String renderLibrary(LibraryTemplateData context0) { var context13 = context12.publicMixinsSorted; for (var context14 in context13) { buffer.write('\n '); - buffer.write(_renderLibrary_partial_container_5(context14)); + buffer.write(_renderLibrary_partial_container_7(context14)); } buffer.writeln(); buffer.write(''' @@ -1000,7 +1000,7 @@ String renderLibrary(LibraryTemplateData context0) { var context17 = context16.publicExtensionTypesSorted; for (var context18 in context17) { buffer.write('\n '); - buffer.write(_renderLibrary_partial_extension_type_6(context18)); + buffer.write(_renderLibrary_partial_extension_type_8(context18)); } buffer.writeln(); buffer.write(''' @@ -1017,7 +1017,7 @@ String renderLibrary(LibraryTemplateData context0) { var context21 = context20.publicExtensionsSorted; for (var context22 in context21) { buffer.write('\n '); - buffer.write(_renderLibrary_partial_extension_7(context22)); + buffer.write(_renderLibrary_partial_extension_9(context22)); } buffer.writeln(); buffer.write(''' @@ -1034,7 +1034,7 @@ String renderLibrary(LibraryTemplateData context0) { var context25 = context24.publicConstantsSorted; for (var context26 in context25) { buffer.write('\n '); - buffer.write(_renderLibrary_partial_constant_8(context26)); + buffer.write(_renderLibrary_partial_constant_10(context26)); } buffer.writeln(); buffer.write(''' @@ -1051,7 +1051,7 @@ String renderLibrary(LibraryTemplateData context0) { var context29 = context28.publicPropertiesSorted; for (var context30 in context29) { buffer.write('\n '); - buffer.write(_renderLibrary_partial_property_9(context30)); + buffer.write(_renderLibrary_partial_property_11(context30)); } buffer.writeln(); buffer.write(''' @@ -1068,7 +1068,7 @@ String renderLibrary(LibraryTemplateData context0) { var context33 = context32.publicFunctionsSorted; for (var context34 in context33) { buffer.write('\n '); - buffer.write(_renderLibrary_partial_callable_10(context34)); + buffer.write(_renderLibrary_partial_callable_12(context34)); } buffer.writeln(); buffer.write(''' @@ -1085,7 +1085,7 @@ String renderLibrary(LibraryTemplateData context0) { var context37 = context36.publicTypedefsSorted; for (var context38 in context37) { buffer.write('\n '); - buffer.write(_renderLibrary_partial_typedef_11(context38)); + buffer.write(_renderLibrary_partial_typedef_13(context38)); } buffer.writeln(); buffer.write(''' @@ -1102,7 +1102,7 @@ String renderLibrary(LibraryTemplateData context0) { var context41 = context40.publicExceptionsSorted; for (var context42 in context41) { buffer.write('\n '); - buffer.write(_renderLibrary_partial_container_5(context42)); + buffer.write(_renderLibrary_partial_container_14(context42)); } buffer.writeln(); buffer.write(''' @@ -1112,7 +1112,7 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(''' '''); - buffer.write(_renderLibrary_partial_footer_14(context0)); + buffer.write(_renderLibrary_partial_footer_17(context0)); buffer.writeln(); return buffer.toString(); @@ -1499,26 +1499,10 @@ String renderSidebarForContainer( '''); var context6 = context1.availableInstanceFieldsSorted; for (var context7 in context6) { - buffer.writeln(); - buffer.write(''' - '''); - buffer.write(context7.linkedName); - buffer.write('\n '); - if (context7.isProvidedByExtension) { - var context8 = context7.enclosingExtension; - buffer.writeln(); - buffer.write(''' (ext)'''); - } - buffer.writeln(); - buffer.write(''' '''); + buffer.write('\n '); + buffer.write( + _renderSidebarForContainer_partial_container_sidebar_item_0( + context7)); } } buffer.writeln(); @@ -1531,27 +1515,12 @@ String renderSidebarForContainer( buffer.write('''">Methods'''); - var context9 = context1.availableInstanceMethodsSorted; - for (var context10 in context9) { - buffer.writeln(); - buffer.write(''' - '''); - buffer.write(context10.linkedName); - if (context10.isProvidedByExtension) { - var context11 = context10.enclosingExtension; - buffer.writeln(); - buffer.write(''' (ext)'''); - } - buffer.writeln(); - buffer.write(''' '''); + var context8 = context1.availableInstanceMethodsSorted; + for (var context9 in context8) { + buffer.write('\n '); + buffer.write( + _renderSidebarForContainer_partial_container_sidebar_item_1( + context9)); } } buffer.writeln(); @@ -1564,27 +1533,12 @@ String renderSidebarForContainer( buffer.write('''">Operators'''); - var context12 = context1.availableInstanceOperatorsSorted; - for (var context13 in context12) { - buffer.writeln(); - buffer.write(''' - '''); - buffer.write(context13.linkedName); - if (context13.isProvidedByExtension) { - var context14 = context13.enclosingExtension; - buffer.writeln(); - buffer.write(''' (ext)'''); - } - buffer.writeln(); - buffer.write(''' '''); + var context10 = context1.availableInstanceOperatorsSorted; + for (var context11 in context10) { + buffer.write('\n '); + buffer.write( + _renderSidebarForContainer_partial_container_sidebar_item_2( + context11)); } } } @@ -1595,11 +1549,11 @@ String renderSidebarForContainer( buffer.write('''
  • Properties
    • '''); - var context15 = context1.availableInstanceFieldsSorted; - for (var context16 in context15) { + var context12 = context1.availableInstanceFieldsSorted; + for (var context13 in context12) { buffer.writeln(); buffer.write('''
  • '''); - buffer.write(context16.linkedName); + buffer.write(context13.linkedName); buffer.write('''
    • '''); } } @@ -1609,11 +1563,11 @@ String renderSidebarForContainer( buffer.write('''
  • Methods
    • '''); - var context17 = context1.availableInstanceMethodsSorted; - for (var context18 in context17) { + var context14 = context1.availableInstanceMethodsSorted; + for (var context15 in context14) { buffer.writeln(); buffer.write('''
  • '''); - buffer.write(context18.linkedName); + buffer.write(context15.linkedName); buffer.write('''
    • '''); } } @@ -1623,11 +1577,11 @@ String renderSidebarForContainer( buffer.write('''
  • Operators
    • '''); - var context19 = context1.availableInstanceOperatorsSorted; - for (var context20 in context19) { + var context16 = context1.availableInstanceOperatorsSorted; + for (var context17 in context16) { buffer.writeln(); buffer.write('''
  • '''); - buffer.write(context20.linkedName); + buffer.write(context17.linkedName); buffer.write('''
    • '''); } } @@ -1638,11 +1592,11 @@ String renderSidebarForContainer( buffer.write('''
  • Static properties
    • '''); - var context21 = context1.publicVariableStaticFieldsSorted; - for (var context22 in context21) { + var context18 = context1.publicVariableStaticFieldsSorted; + for (var context19 in context18) { buffer.writeln(); buffer.write('''
  • '''); - buffer.write(context22.linkedName); + buffer.write(context19.linkedName); buffer.write('''
    • '''); } } @@ -1652,11 +1606,11 @@ String renderSidebarForContainer( buffer.write('''
  • Static methods
    • '''); - var context23 = context1.publicStaticMethodsSorted; - for (var context24 in context23) { + var context20 = context1.publicStaticMethodsSorted; + for (var context21 in context20) { buffer.writeln(); buffer.write('''
  • '''); - buffer.write(context24.linkedName); + buffer.write(context21.linkedName); buffer.write('''
    • '''); } } @@ -1666,11 +1620,11 @@ String renderSidebarForContainer( buffer.write('''
  • Constants
    • '''); - var context25 = context1.publicConstantFieldsSorted; - for (var context26 in context25) { + var context22 = context1.publicConstantFieldsSorted; + for (var context23 in context22) { buffer.writeln(); buffer.write('''
  • '''); - buffer.write(context26.linkedName); + buffer.write(context23.linkedName); buffer.write('''
    • '''); } } @@ -1982,13 +1936,16 @@ String _renderCategory_partial_library_2(Library context2) => String _renderCategory_partial_container_3(Container context2) => _deduplicated_lib_templates__container_html(context2); -String _renderCategory_partial_extension_4(Extension context2) => +String _renderCategory_partial_container_4(Mixin context2) => + _deduplicated_lib_templates__container_html(context2); + +String _renderCategory_partial_extension_5(Extension context2) => _deduplicated_lib_templates__extension_html(context2); -String _renderCategory_partial_constant_5(TopLevelVariable context2) => +String _renderCategory_partial_constant_6(TopLevelVariable context2) => _deduplicated_lib_templates__constant_html(context2); -String _renderCategory_partial_property_6(TopLevelVariable context2) { +String _renderCategory_partial_property_7(TopLevelVariable context2) { final buffer = StringBuffer(); buffer.write('''
    '''); buffer.write( - __renderCategory_partial_callable_7_partial_categorization_0(context2)); + __renderCategory_partial_callable_8_partial_categorization_0(context2)); buffer.writeln(); buffer.write('''
    '''); @@ -2105,25 +2062,31 @@ String _renderCategory_partial_callable_7(ModelFunctionTyped context2) { return buffer.toString(); } -String __renderCategory_partial_callable_7_partial_categorization_0( +String __renderCategory_partial_callable_8_partial_categorization_0( ModelFunctionTyped context2) => _deduplicated_lib_templates__categorization_html(context2); -String __renderCategory_partial_callable_7_partial_attributes_1( +String __renderCategory_partial_callable_8_partial_attributes_1( ModelFunctionTyped context2) => _deduplicated_lib_templates__attributes_html(context2); -String _renderCategory_partial_typedef_8(Typedef context2) => +String _renderCategory_partial_container_9(Enum context2) => + _deduplicated_lib_templates__container_html(context2); + +String _renderCategory_partial_typedef_10(Typedef context2) => _deduplicated_lib_templates__typedef_html(context2); -String _renderCategory_partial_search_sidebar_9( +String _renderCategory_partial_container_11(Class context2) => + _deduplicated_lib_templates__container_html(context2); + +String _renderCategory_partial_search_sidebar_12( CategoryTemplateData context0) => _deduplicated_lib_templates__search_sidebar_html(context0); -String _renderCategory_partial_packages_10(CategoryTemplateData context0) => +String _renderCategory_partial_packages_13(CategoryTemplateData context0) => _deduplicated_lib_templates__packages_html(context0); -String _renderCategory_partial_sidebar_for_category_11( +String _renderCategory_partial_sidebar_for_category_14( CategoryTemplateData context0) { final buffer = StringBuffer(); buffer.write('''
      '''); @@ -2309,7 +2272,7 @@ String _renderCategory_partial_sidebar_for_category_11( return buffer.toString(); } -String _renderCategory_partial_footer_12(CategoryTemplateData context0) => +String _renderCategory_partial_footer_15(CategoryTemplateData context0) => _deduplicated_lib_templates__footer_html(context0); String _renderClass_partial_head_0(ClassTemplateData context0) => @@ -2706,7 +2669,13 @@ String _renderLibrary_partial_documentation_4(Library context1) => String _renderLibrary_partial_container_5(Container context3) => _deduplicated_lib_templates__container_html(context3); -String _renderLibrary_partial_extension_type_6(ExtensionType context3) { +String _renderLibrary_partial_container_6(Enum context3) => + _deduplicated_lib_templates__container_html(context3); + +String _renderLibrary_partial_container_7(Mixin context3) => + _deduplicated_lib_templates__container_html(context3); + +String _renderLibrary_partial_extension_type_8(ExtensionType context3) { final buffer = StringBuffer(); buffer.write('''
      '''); buffer.write( - __renderLibrary_partial_property_9_partial_categorization_0(context3)); + __renderLibrary_partial_property_11_partial_categorization_0(context3)); buffer.writeln(); buffer.write('''
      '''); @@ -2794,15 +2763,15 @@ String _renderLibrary_partial_property_9(TopLevelVariable context3) { return buffer.toString(); } -String __renderLibrary_partial_property_9_partial_categorization_0( +String __renderLibrary_partial_property_11_partial_categorization_0( TopLevelVariable context3) => _deduplicated_lib_templates__categorization_html(context3); -String __renderLibrary_partial_property_9_partial_attributes_1( +String __renderLibrary_partial_property_11_partial_attributes_1( TopLevelVariable context3) => _deduplicated_lib_templates__attributes_html(context3); -String _renderLibrary_partial_callable_10(ModelFunctionTyped context3) { +String _renderLibrary_partial_callable_12(ModelFunctionTyped context3) { final buffer = StringBuffer(); buffer.write('''
      + '''); + buffer.write(context2.linkedName); + if (context2.isProvidedByExtension) { + var context3 = context2.enclosingExtension; + buffer.writeln(); + buffer.write(''' (ext)'''); + } + buffer.writeln(); + buffer.write(''''''); + + return buffer.toString(); +} + +String _renderSidebarForContainer_partial_container_sidebar_item_1( + Method context2) { + final buffer = StringBuffer(); + buffer.writeln(); + buffer.write(''' + + '''); + buffer.write(context2.linkedName); + if (context2.isProvidedByExtension) { + var context3 = context2.enclosingExtension; + buffer.writeln(); + buffer.write(''' (ext)'''); + } + buffer.writeln(); + buffer.write(''''''); + + return buffer.toString(); +} + +String _renderSidebarForContainer_partial_container_sidebar_item_2( + Operator context2) { + final buffer = StringBuffer(); + buffer.writeln(); + buffer.write(''' + + '''); + buffer.write(context2.linkedName); + if (context2.isProvidedByExtension) { + var context3 = context2.enclosingExtension; + buffer.writeln(); + buffer.write(''' (ext)'''); + } + buffer.writeln(); + buffer.write(''''''); + + return buffer.toString(); +} + String _renderTopLevelProperty_partial_head_0( TopLevelPropertyTemplateData context0) => _deduplicated_lib_templates__head_html(context0); diff --git a/lib/templates/_container_sidebar_item.html b/lib/templates/_container_sidebar_item.html new file mode 100644 index 0000000000..a815d20c93 --- /dev/null +++ b/lib/templates/_container_sidebar_item.html @@ -0,0 +1,11 @@ + + + {{{ linkedName }}} + {{ #isProvidedByExtension }} + {{ #enclosingExtension }} + (ext) + {{ /enclosingExtension }} + {{ /isProvidedByExtension }} + \ No newline at end of file diff --git a/lib/templates/_sidebar_for_container.html b/lib/templates/_sidebar_for_container.html index f446966b66..95052e6bf1 100644 --- a/lib/templates/_sidebar_for_container.html +++ b/lib/templates/_sidebar_for_container.html @@ -24,51 +24,21 @@ Properties {{ #availableInstanceFieldsSorted }} - - {{{ linkedName }}} - {{!-- TODO(srawlins): Look into moving this block into a partial; - currently Mustachio cannot handle multiple partial calls to the - same partial with different types. --}} - {{ #isProvidedByExtension }} - {{ #enclosingExtension }} - (ext) - {{ /enclosingExtension }} - {{ /isProvidedByExtension }} - + {{ >container_sidebar_item }} {{ /availableInstanceFieldsSorted }} {{ /hasAvailableInstanceFields }} {{ #hasAvailableInstanceMethods }}
    1. Methods
      2. {{ #availableInstanceMethodsSorted }} - - {{{ linkedName }}} - {{ #isProvidedByExtension }} - {{ #enclosingExtension }} - (ext) - {{ /enclosingExtension }} - {{ /isProvidedByExtension }} - + {{ >container_sidebar_item }} {{ /availableInstanceMethodsSorted }} {{ /hasAvailableInstanceMethods }} {{ #hasAvailableInstanceOperators }}
    2. Operators
      3. {{ #availableInstanceOperatorsSorted }} - - {{{ linkedName }}} - {{ #isProvidedByExtension }} - {{ #enclosingExtension }} - (ext) - {{ /enclosingExtension }} - {{ /isProvidedByExtension }} - + {{ >container_sidebar_item }} {{ /availableInstanceOperatorsSorted }} {{ /hasAvailableInstanceOperators }} {{ /isInterface }} diff --git a/test/mustachio/aot_compiler_builder_test.dart b/test/mustachio/aot_compiler_builder_test.dart index 0d246e4c36..bdd6217a20 100644 --- a/test/mustachio/aot_compiler_builder_test.dart +++ b/test/mustachio/aot_compiler_builder_test.dart @@ -6,6 +6,7 @@ library; import 'dart:io'; + import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; @@ -160,6 +161,59 @@ import 'annotations.dart'; ); }); + test('deduplicates partials used multiple times in the same template', + () async { + await testMustachioBuilder( + ''' +abstract class Foo { + List get l1; + List get l2; +} + +class Base { + String s1 = 's1'; +} +class A extends Base {} +class B extends Base {} +''', + libraryFrontMatter: ''' +@Renderer(#renderFoo, Context(), 'foo') +library foo; +import 'annotations.dart'; +''', + additionalAssets: () => [ + d.dir('lib', [ + d.dir('templates', [ + d.file('foo.html', ''' +{{ #l1 }} + {{ >base }} +{{ /l1 }} +{{ #l2 }} + {{ >base }} +{{ /l2 }} +'''), + d.file('_base.html', 's1 is {{ s1 }}'), + ]), + ]), + ], + ); + var generatedContent = await File(aotRenderersForHtmlPath).readAsString(); + expect( + generatedContent, + contains('String _renderFoo_partial_base_0(A context1) =>\n' + ' _deduplicated_lib_templates__base_html(context1);\n'), + ); + expect( + generatedContent, + contains('String _renderFoo_partial_base_1(B context1) =>\n' + ' _deduplicated_lib_templates__base_html(context1);\n'), + ); + expect( + generatedContent, + contains('String _deduplicated_lib_templates__base_html(Base context0)'), + ); + }); + test('does not deduplicate partials when attempting to do so throws', () async { await testMustachioBuilder( diff --git a/tool/mustachio/codegen_aot_compiler.dart b/tool/mustachio/codegen_aot_compiler.dart index 2cdf2e6b9b..42e6acb060 100644 --- a/tool/mustachio/codegen_aot_compiler.dart +++ b/tool/mustachio/codegen_aot_compiler.dart @@ -296,7 +296,7 @@ class _AotCompiler { _contextNameCounter = contextStack.length; /// Returns a copy of [original], replacing each variable's name with - /// `context0` through `contextN` for `N` variables. + /// `context0` through `contextN` for `N - 1` variables. /// /// This ensures that each renderer accepts a simple list of context objects /// with predictable names. @@ -449,8 +449,8 @@ class _BlockCompiler { filePath.add('_$fileName.$extension'); var partialPath = path.join( path.dirname(_templateCompiler._templatePath), filePath.join('/')); - var partialCompiler = _templateCompiler._partialCompilers - .firstWhereOrNull((p) => p._templatePath == partialPath); + var partialCompiler = _templateCompiler._partialCompilers.firstWhereOrNull( + (p) => p._templatePath == partialPath && p._contextType == contextType); if (partialCompiler == null) { var sanitizedKey = node.key.replaceAll('.', '_').replaceAll('/', '_'); var name = '${partialBaseName}_' @@ -459,7 +459,8 @@ class _BlockCompiler { partialCompiler = await _AotCompiler._readAndParse( contextType, name, partialPath, _templateCompiler._buildData, contextStack: _contextStack); - // Add this partial renderer; to be written later. + // Add this partial renderer; it is compiled here, but not written until + // later. _templateCompiler._partialCompilers.add(partialCompiler); _templateCompiler._partialCounter++; _templateCompiler._compiledPartials[partialCompiler] =