annotaterb 4.4.1 → 4.6.0

data/lib/annotate_rb/model_annotator/file_parser/parsed_file.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module AnnotateRb
+  module ModelAnnotator
+    module FileParser
+      class ParsedFile
+        SKIP_ANNOTATION_STRING = "# -*- SkipSchemaAnnotations"
+
+        def initialize(file_content, new_annotations, options)
+          @file_content = file_content
+          @file_lines = @file_content.lines
+          @new_annotations = new_annotations
+          @options = options
+        end
+
+        def parse
+          @finder = AnnotationFinder.new(@file_content, @options[:wrapper_open], @options[:wrapper_close])
+          has_annotations = false
+
+          begin
+            @finder.run
+            has_annotations = @finder.annotated?
+          rescue AnnotationFinder::NoAnnotationFound => _e
+          end
+
+          annotations = if has_annotations
+            @file_lines[(@finder.annotation_start)..(@finder.annotation_end)].join
+          else
+            ""
+          end
+
+          @diff = AnnotationDiffGenerator.new(annotations, @new_annotations).generate
+          @file_parser = @finder.parser
+
+          has_skip_string = @file_parser.comments.any? { |comment, _lineno| comment.include?(SKIP_ANNOTATION_STRING) }
+          annotations_changed = @diff.changed?
+
+          has_leading_whitespace = false
+          has_trailing_whitespace = false
+
+          annotations_with_whitespace = if has_annotations
+            begin
+              annotation_start = @finder.annotation_start
+              annotation_end = @finder.annotation_end
+
+              if @file_lines[annotation_start - 1]&.strip&.empty?
+                annotation_start -= 1
+                has_leading_whitespace = true
+              end
+
+              if @file_lines[annotation_end + 1]&.strip&.empty?
+                annotation_end += 1
+                has_trailing_whitespace = true
+              end
+
+              @file_lines[annotation_start..annotation_end].join
+            end
+          else
+            ""
+          end
+
+          # :before or :after when it's set
+          annotation_position = nil
+
+          if has_annotations
+            const_declaration = @file_parser.starts.first
+
+            # If the file does not have any class or module declaration then const_declaration can be nil
+            _const, line_number = const_declaration
+
+            if line_number
+              annotation_position = if @finder.annotation_start < line_number
+                :before
+              else
+                :after
+              end
+            end
+          end
+
+          _result = ParsedFileResult.new(
+            has_annotations: has_annotations,
+            has_skip_string: has_skip_string,
+            annotations_changed: annotations_changed,
+            annotations: annotations,
+            annotations_with_whitespace: annotations_with_whitespace,
+            has_leading_whitespace: has_leading_whitespace,
+            has_trailing_whitespace: has_trailing_whitespace,
+            annotation_position: annotation_position
+          )
+        end
+      end
+    end
+  end
+end

data/lib/annotate_rb/model_annotator/file_parser/parsed_file_result.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module AnnotateRb
+  module ModelAnnotator
+    module FileParser
+      class ParsedFileResult
+        def initialize(
+          has_annotations:,
+          has_skip_string:,
+          annotations_changed:,
+          annotations:,
+          annotations_with_whitespace:,
+          has_leading_whitespace:,
+          has_trailing_whitespace:,
+          annotation_position:
+        )
+          @has_annotations = has_annotations
+          @has_skip_string = has_skip_string
+          @annotations_changed = annotations_changed
+          @annotations = annotations
+          @annotations_with_whitespace = annotations_with_whitespace
+          @has_leading_whitespace = has_leading_whitespace
+          @has_trailing_whitespace = has_trailing_whitespace
+          @annotation_position = annotation_position
+        end
+
+        attr_reader :annotations, :annotation_position
+
+        # Returns annotations with new line before and after if they exist
+        attr_reader :annotations_with_whitespace
+
+        def annotations_changed?
+          @annotations_changed
+        end
+
+        def has_annotations?
+          @has_annotations
+        end
+
+        def has_skip_string?
+          @has_skip_string
+        end
+
+        def has_leading_whitespace?
+          @has_leading_whitespace
+        end
+
+        def has_trailing_whitespace?
+          @has_trailing_whitespace
+        end
+      end
+    end
+  end
+end

data/lib/annotate_rb/model_annotator/file_parser.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module AnnotateRb
+  module ModelAnnotator
+    module FileParser
+      autoload :AnnotationFinder, "annotate_rb/model_annotator/file_parser/annotation_finder"
+      autoload :CustomParser, "annotate_rb/model_annotator/file_parser/custom_parser"
+      autoload :ParsedFile, "annotate_rb/model_annotator/file_parser/parsed_file"
+      autoload :ParsedFileResult, "annotate_rb/model_annotator/file_parser/parsed_file_result"
+    end
+  end
+end

data/lib/annotate_rb/model_annotator/model_class_getter.rb

@@ -8,6 +8,13 @@ module AnnotateRb
         # Check for namespaced models in subdirectories as well as models
         # in subdirectories without namespacing.
         def call(file, options)
+          use_zeitwerk = defined?(::Rails) && ::Rails.try(:autoloaders).try(:zeitwerk_enabled?)
+
+          if use_zeitwerk
+            klass = ZeitwerkClassGetter.call(file, options)
+            return klass if klass
+          end
+
           model_path = file.gsub(/\.rb$/, "")
           options[:model_dir].each { |dir| model_path = model_path.gsub(/^#{dir}/, "").gsub(/^\//, "") }
 

data/lib/annotate_rb/model_annotator/model_files_getter.rb

@@ -9,13 +9,9 @@ module AnnotateRb
         # of model files from root dir. Otherwise we take all the model files
         # in the model_dir directory.
         def call(options)
-          model_files = []
+          model_files = list_model_files_from_argument(options)
 
-          # Note: This is currently broken as we don't set `is_rake` anywhere.
-          # It's an artifact from the old Annotate gem and how it did control flow.
-          model_files = list_model_files_from_argument(options) if !options[:is_rake]
-
-          return model_files if !model_files.empty?
+          return model_files if model_files.any?
 
           options[:model_dir].each do |dir|
             Dir.chdir(dir) do
@@ -41,9 +37,9 @@ module AnnotateRb
         private
 
         def list_model_files_from_argument(options)
-          return [] if ARGV.empty?
+          return [] if options.get_state(:working_args).empty?
 
-          specified_files = ARGV.map { |file| File.expand_path(file) }
+          specified_files = options.get_state(:working_args).map { |file| File.expand_path(file) }
 
           model_files = options[:model_dir].flat_map do |dir|
             absolute_dir_path = File.expand_path(dir)

data/lib/annotate_rb/model_annotator/model_wrapper.rb

@@ -6,7 +6,7 @@ module AnnotateRb
       # Should be the wrapper for an ActiveRecord model that serves as the source of truth of the model
       # of the model that we're annotating
 
-      def initialize(klass, options = {})
+      def initialize(klass, options)
         @klass = klass
         @options = options
       end
@@ -115,7 +115,16 @@ module AnnotateRb
 
         # Try to search the table without prefix
         table_name_without_prefix = table_name.to_s.sub(@klass.table_name_prefix, "")
-        @klass.connection.indexes(table_name_without_prefix)
+        begin
+          @klass.connection.indexes(table_name_without_prefix)
+        rescue ActiveRecord::StatementInvalid => _e
+          # Mysql2 adapter behaves differently than Sqlite3 and Postgres adapter.
+          # If `table_name_without_prefix` does not exist, Mysql2 will raise,
+          # the other adapters will return an empty array.
+          #
+          # See: https://github.com/rails/rails/issues/51205
+          []
+        end
       end
 
       def with_comments?

data/lib/annotate_rb/model_annotator/pattern_getter.rb

@@ -142,6 +142,8 @@ module AnnotateRb
           File.join(root_directory, FilePatterns::FACTORY_BOT_SPEC_DIR, "%TABLE_NAME%.rb"), # (new style)
           File.join(root_directory, FilePatterns::FACTORY_BOT_TEST_DIR, "%PLURALIZED_MODEL_NAME%.rb"), # (new style)
           File.join(root_directory, FilePatterns::FACTORY_BOT_SPEC_DIR, "%PLURALIZED_MODEL_NAME%.rb"), # (new style)
+          File.join(root_directory, FilePatterns::FACTORY_BOT_TEST_DIR, "%PLURALIZED_MODEL_NAME%_factory.rb"), # (new style)
+          File.join(root_directory, FilePatterns::FACTORY_BOT_SPEC_DIR, "%PLURALIZED_MODEL_NAME%_factory.rb"), # (new style)
           File.join(root_directory, FilePatterns::FABRICATORS_TEST_DIR, "%MODEL_NAME%_fabricator.rb"),
           File.join(root_directory, FilePatterns::FABRICATORS_SPEC_DIR, "%MODEL_NAME%_fabricator.rb")
         ]

data/lib/annotate_rb/model_annotator/related_files_list_builder.rb

@@ -24,10 +24,10 @@ module AnnotateRb
         add_related_scaffold_files if !@options[:exclude_scaffolds]
         add_related_controller_files if !@options[:exclude_controllers]
         add_related_helper_files if !@options[:exclude_helpers]
-        add_related_admin_files if !@options[:active_admin]
-        add_additional_file_patterns if !@options[:additional_file_patterns].present?
+        add_related_admin_files if @options[:active_admin]
+        add_additional_file_patterns if @options[:additional_file_patterns].present?
 
-        @list
+        @list.uniq
       end
 
       private

data/lib/annotate_rb/model_annotator/single_file_annotation_remover.rb

@@ -12,20 +12,18 @@ module AnnotateRb
           return false unless File.exist?(file_name)
           old_content = File.read(file_name)
 
-          file_components = FileComponents.new(old_content, "", options)
-
-          return false if file_components.has_skip_string?
-          # TODO: Uncomment below after tests are fixed
-          # return false if !file_components.has_annotations?
-
-          wrapper_open = if options[:wrapper_open]
-            "# #{options[:wrapper_open]}\n"
-          else
-            ""
+          begin
+            parsed_file = FileParser::ParsedFile.new(old_content, "", options).parse
+          rescue FileParser::AnnotationFinder::MalformedAnnotation => e
+            warn "Unable to process #{file_name}: #{e.message}"
+            warn "\t" + e.backtrace.join("\n\t") if @options[:trace]
+            return false
           end
 
-          generated_pattern = AnnotationPatternGenerator.call(options)
-          updated_file_content = old_content.sub!(/(#{wrapper_open})?#{generated_pattern}/, "")
+          return false if !parsed_file.has_annotations?
+          return false if parsed_file.has_skip_string?
+
+          updated_file_content = old_content.sub(parsed_file.annotations_with_whitespace, "")
 
           File.open(file_name, "wb") { |f| f.puts updated_file_content }
 

data/lib/annotate_rb/model_annotator/single_file_annotator.rb

@@ -21,22 +21,29 @@ module AnnotateRb
         #  :position_in_*<Symbol>:: where to place the annotated section in fixture or model file,
         #                           :before, :top, :after or :bottom. Default is :before.
         #
-        def call(file_name, annotation, annotation_position, options = {})
+        def call(file_name, annotation, annotation_position, options)
           return false unless File.exist?(file_name)
           old_content = File.read(file_name)
 
-          file_components = FileComponents.new(old_content, annotation, options)
-          builder = FileBuilder.new(file_components, annotation_position, options)
+          begin
+            parsed_file = FileParser::ParsedFile.new(old_content, annotation, options).parse
+          rescue FileParser::AnnotationFinder::MalformedAnnotation => e
+            warn "Unable to process #{file_name}: #{e.message}"
+            warn "\t" + e.backtrace.join("\n\t") if @options[:trace]
+            return false
+          end
 
-          return false if file_components.has_skip_string?
-          return false if !file_components.annotations_changed? && !options[:force]
+          return false if parsed_file.has_skip_string?
+          return false if !parsed_file.annotations_changed? && !options[:force]
 
           abort "AnnotateRb error. #{file_name} needs to be updated, but annotaterb was run with `--frozen`." if options[:frozen]
 
-          updated_file_content = if !file_components.has_annotations? || options[:force]
-            builder.generate_content_with_new_annotations
+          updated_file_content = if !parsed_file.has_annotations?
+            AnnotatedFile::Generator.new(old_content, annotation, annotation_position, options).generate
+          elsif options[:force]
+            AnnotatedFile::Generator.new(old_content, annotation, annotation_position, options).generate
           else
-            builder.update_existing_annotations
+            AnnotatedFile::Updater.new(old_content, annotation, annotation_position, options).update
           end
 
           File.open(file_name, "wb") { |f| f.puts updated_file_content }

data/lib/annotate_rb/model_annotator/single_file_annotator_instruction.rb

@@ -4,7 +4,7 @@ module AnnotateRb
   module ModelAnnotator
     # A plain old Ruby object (PORO) that contains all necessary information for SingleFileAnnotator
     class SingleFileAnnotatorInstruction
-      def initialize(file, annotation, position, options = {})
+      def initialize(file, annotation, position, options)
         @file = file # Path to file
         @annotation = annotation # Annotation string
         @position = position # Position in the file where to write the annotation to

data/lib/annotate_rb/model_annotator/single_file_remove_annotation_instruction.rb

@@ -4,7 +4,7 @@ module AnnotateRb
   module ModelAnnotator
     # A plain old Ruby object (PORO) that contains all necessary information for SingleFileAnnotationRemover
     class SingleFileRemoveAnnotationInstruction
-      def initialize(file, options = {})
+      def initialize(file, options)
         @file = file # Path to file
         @options = options
       end

data/lib/annotate_rb/model_annotator/zeitwerk_class_getter.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+module AnnotateRb
+  module ModelAnnotator
+    class ZeitwerkClassGetter
+      class << self
+        def call(file, options)
+          new(file, options).call
+        end
+      end
+
+      def initialize(file, options)
+        @file = file
+        @options = options
+      end
+
+      # @return [Constant, nil] Attempts to return the model class constant (e.g. User) defined in the model file
+      #   can return `nil` if the file does not define the constant.
+      def call
+        return unless defined?(::Zeitwerk)
+
+        @absolute_file_path = File.expand_path(@file)
+        loader = ::Rails.autoloaders.main
+
+        if supports_cpath?
+          constant_using_cpath(loader)
+        else
+          constant(loader)
+        end
+      end
+
+      private
+
+      def constant(loader)
+        root_dirs = loader.dirs(namespaces: true) # or `root_dirs = loader.root_dirs` with zeitwerk < 2.6.1
+        expanded_file = @absolute_file_path
+
+        # root_dir: "/home/dummyapp/app/models"
+        root_dir, namespace = root_dirs.find do |dir, _namespace|
+          expanded_file.start_with?(dir)
+        end
+
+        # expanded_file: "/home/dummyapp/app/models/collapsed/example/test_model.rb"
+        # filepath_relative_to_root_dir: "/collapsed/example/test_model.rb"
+        _, filepath_relative_to_root_dir = expanded_file.split(root_dir)
+
+        # Remove leading / and the .rb extension
+        filepath_relative_to_root_dir = filepath_relative_to_root_dir[1..].sub(/\.rb$/, "")
+
+        # once we have the filepath_relative_to_root_dir, we need to see if it
+        # falls within one of our Zeitwerk "collapsed" paths.
+        if loader.collapse.any? { |path| path.include?(root_dir) && file.include?(path.split(root_dir)[1]) }
+          # if the file is within a collapsed path, we then need to, for each
+          # collapsed path, remove the root dir
+          collapsed = loader.collapse.map { |path| path.split(root_dir)[1].sub(/^\//, "") }.to_set
+
+          collapsed.each do |collapse|
+            # next, we split the collapsed directory, e.g. `domain_name/models`, by
+            # slash, and discard the domain_name
+            _, *collapsed_namespace = collapse.split("/")
+
+            # if there are any collapsed namespaces, e.g. `models`, we then remove
+            # that from `filepath_relative_to_root_dir`.
+            #
+            # This would result in:
+            #
+            # previous filepath_relative_to_root_dir: domain_name/models/model_name
+            # new filepath_relative_to_root_dir: domain_name/model_name
+            if collapsed_namespace.any?
+              filepath_relative_to_root_dir.sub!("/#{collapsed_namespace.last}", "")
+            end
+          end
+        end
+
+        camelize = loader.inflector.camelize(filepath_relative_to_root_dir, nil)
+        namespace.const_get(camelize)
+      rescue NameError => e
+        warn e
+        nil
+      end
+
+      def constant_using_cpath(loader)
+        begin
+          constant = loader.cpath_expected_at(@absolute_file_path)
+        rescue ::Zeitwerk::Error => e
+          # Raises when file does not exist
+          warn "Zeitwerk unable to find file #{@file}, error:\n#{e.message}"
+          return
+        end
+
+        begin
+          # This uses ActiveSupport::Inflector.constantize
+          klass = constant.constantize
+        rescue NameError => e
+          warn e
+          return
+        end
+
+        klass
+      end
+
+      def supports_cpath?
+        @supports_cpath ||=
+          begin
+            current_version = ::Gem::Version.new(::Zeitwerk::VERSION)
+            required_version = ::Gem::Version.new("2.6.9")
+
+            current_version >= required_version
+          end
+      end
+    end
+  end
+end

data/lib/annotate_rb/model_annotator.rb

@@ -7,7 +7,6 @@ module AnnotateRb
     autoload :BadModelFileError, "annotate_rb/model_annotator/bad_model_file_error"
     autoload :FileNameResolver, "annotate_rb/model_annotator/file_name_resolver"
     autoload :SingleFileAnnotationRemover, "annotate_rb/model_annotator/single_file_annotation_remover"
-    autoload :AnnotationPatternGenerator, "annotate_rb/model_annotator/annotation_pattern_generator"
     autoload :ModelClassGetter, "annotate_rb/model_annotator/model_class_getter"
     autoload :ModelFilesGetter, "annotate_rb/model_annotator/model_files_getter"
     autoload :SingleFileAnnotator, "annotate_rb/model_annotator/single_file_annotator"
@@ -22,10 +21,10 @@ module AnnotateRb
     autoload :SingleFileRemoveAnnotationInstruction, "annotate_rb/model_annotator/single_file_remove_annotation_instruction"
     autoload :AnnotationDiffGenerator, "annotate_rb/model_annotator/annotation_diff_generator"
     autoload :AnnotationDiff, "annotate_rb/model_annotator/annotation_diff"
-    autoload :FileBuilder, "annotate_rb/model_annotator/file_builder"
-    autoload :MagicCommentParser, "annotate_rb/model_annotator/magic_comment_parser"
-    autoload :FileComponents, "annotate_rb/model_annotator/file_components"
     autoload :ProjectAnnotator, "annotate_rb/model_annotator/project_annotator"
     autoload :ProjectAnnotationRemover, "annotate_rb/model_annotator/project_annotation_remover"
+    autoload :AnnotatedFile, "annotate_rb/model_annotator/annotated_file"
+    autoload :FileParser, "annotate_rb/model_annotator/file_parser"
+    autoload :ZeitwerkClassGetter, "annotate_rb/model_annotator/zeitwerk_class_getter"
   end
 end

data/lib/annotate_rb/options.rb

@@ -210,5 +210,9 @@ module AnnotateRb
     def get_state(key)
       @state[key]
     end
+
+    def print
+      # TODO: prints options and state
+    end
   end
 end

data/lib/annotate_rb/parser.rb

@@ -3,7 +3,7 @@ require "optparse"
 module AnnotateRb
   # Class for handling command line arguments
   class Parser # rubocop:disable Metrics/ClassLength
-    def self.parse(args, existing_options = {})
+    def self.parse(args, existing_options)
       new(args, existing_options).parse
     end
 
@@ -35,11 +35,11 @@ module AnnotateRb
     }.freeze
 
     def initialize(args, existing_options)
-      @args = args
+      @args = args.clone
       base_options = DEFAULT_OPTIONS.dup
       @options = base_options.merge(existing_options)
       @commands = []
-      @options[:original_args] = args.dup
+      @options[:original_args] = args.clone
     end
 
     def parse
@@ -52,6 +52,12 @@ module AnnotateRb
       @options
     end
 
+    def remaining_args
+      # `@args` gets modified throughout the lifecycle of this class.
+      # It starts as a shallow clone of ARGV, then arguments matching commands and options are removed in #parse
+      @args
+    end
+
     private
 
     def parse_command(args)

data/lib/annotate_rb/runner.rb

@@ -9,14 +9,15 @@ module AnnotateRb
     end
 
     def run(args)
-      _original_args = args.dup
-
       config_file_options = ConfigLoader.load_config
-      parsed_options = Parser.parse(args)
+      parser = Parser.new(args, {})
+
+      parsed_options = parser.parse
+      remaining_args = parser.remaining_args
 
       options = config_file_options.merge(parsed_options)
 
-      @options = Options.from(options, {})
+      @options = Options.from(options, {working_args: remaining_args})
       AnnotateRb::RakeBootstrapper.call(@options)
 
       if @options[:command]

data/lib/annotate_rb/tasks/annotate_models_migrate.rake

@@ -6,6 +6,11 @@
 
 # Migration tasks are tasks that we'll "hook" into
 migration_tasks = %w[db:migrate db:migrate:up db:migrate:down db:migrate:reset db:migrate:redo db:rollback]
+
+# Support for data_migrate gem (https://github.com/ilyakatz/data-migrate)
+migration_tasks_with_data = migration_tasks.map { |task| "#{task}:with_data" }
+migration_tasks += migration_tasks_with_data
+
 if defined?(Rails::Application) && Rails.version.split(".").first.to_i >= 6
   require "active_record"
 

data/lib/annotate_rb.rb

@@ -22,6 +22,7 @@ require_relative "annotate_rb/eager_loader"
 require_relative "annotate_rb/rake_bootstrapper"
 require_relative "annotate_rb/config_finder"
 require_relative "annotate_rb/config_loader"
+require_relative "annotate_rb/config_generator"
 
 module AnnotateRb
 end

data/lib/generators/annotate_rb/config/USAGE

@@ -0,0 +1,6 @@
+Description:
+    Generates a default configuration file, `.annotaterb.yml` in your
+    Rails app project root.
+
+Example:
+    `rails generate annotate_rb:config`

data/lib/generators/annotate_rb/config/config_generator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "annotate_rb"
+
+module AnnotateRb
+  module Generators
+    class ConfigGenerator < ::Rails::Generators::Base
+      def generate_config
+        create_file ::AnnotateRb::ConfigFinder::DOTFILE do
+          ::AnnotateRb::ConfigGenerator.default_config_yml
+        end
+      end
+    end
+  end
+end

data/lib/generators/annotate_rb/hook/USAGE

@@ -0,0 +1,7 @@
+Description:
+    Adds a rake task into your Rails app's lib/tasks directory, that
+    automatically annotates models when you do a db:migrate in
+    development mode.
+
+Example:
+    `rails generate annotate_rb:hook`

data/lib/generators/annotate_rb/hook/hook_generator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "annotate_rb"
+
+module AnnotateRb
+  module Generators
+    class HookGenerator < ::Rails::Generators::Base
+      source_root File.expand_path("templates", __dir__)
+
+      def copy_hook_file
+        copy_file "annotate_rb.rake", "lib/tasks/annotate_rb.rake"
+      end
+    end
+  end
+end

data/lib/generators/annotate_rb/install/install_generator.rb

@@ -5,10 +5,9 @@ require "annotate_rb"
 module AnnotateRb
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-      source_root File.expand_path("templates", __dir__)
-
-      def copy_task
-        copy_file "annotate_rb.rake", "lib/tasks/annotate_rb.rake"
+      def install_hook_and_generate_defaults
+        generate "annotate_rb:hook"
+        generate "annotate_rb:config"
       end
     end
   end

data/lib/generators/annotate_rb/update_config/USAGE

@@ -0,0 +1,6 @@
+Description:
+    Appends to .annotaterb.yml any missing default configuration
+    key-value pairs.
+
+Example:
+    `rails generate annotate_rb:update_config`

data/lib/generators/annotate_rb/update_config/update_config_generator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "annotate_rb"
+
+module AnnotateRb
+  module Generators
+    class UpdateConfigGenerator < ::Rails::Generators::Base
+      def generate_config
+        insert_into_file ::AnnotateRb::ConfigFinder::DOTFILE do
+          ::AnnotateRb::ConfigGenerator.unset_config_defaults
+        end
+      end
+    end
+  end
+end