RubyGems - yamlint - Versions diffs - 0.1.0 → 1.0.0 - Mend

yamlint 0.1.0 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (136) hide show

checksums.yaml +4 -4
data/.rubocop.yml +31 -9
data/.serena/.gitignore +1 -0
data/.serena/memories/project_overview.md +25 -0
data/.serena/memories/style_and_conventions.md +7 -0
data/.serena/memories/suggested_commands.md +17 -0
data/.serena/memories/task_completion.md +5 -0
data/.serena/project.yml +89 -0
data/CHANGELOG.md +6 -2
data/Gemfile +9 -7
data/LICENSE.txt +1 -1
data/README.md +155 -17
data/Rakefile +10 -3
data/docs/Yamlint/Cli.html +403 -0
data/docs/Yamlint/Config.html +1034 -0
data/docs/Yamlint/Formatter.html +433 -0
data/docs/Yamlint/Linter.html +423 -0
data/docs/Yamlint/Models/LintContext.html +993 -0
data/docs/Yamlint/Models/Problem.html +951 -0
data/docs/Yamlint/Models/Token.html +713 -0
data/docs/Yamlint/Models.html +117 -0
data/docs/Yamlint/Output/Base.html +290 -0
data/docs/Yamlint/Output/Colored.html +293 -0
data/docs/Yamlint/Output/Github.html +260 -0
data/docs/Yamlint/Output/Parsable.html +258 -0
data/docs/Yamlint/Output/Standard.html +270 -0
data/docs/Yamlint/Output.html +208 -0
data/docs/Yamlint/Parser/Comment.html +795 -0
data/docs/Yamlint/Parser/CommentExtractor.html +287 -0
data/docs/Yamlint/Parser/LineParser.html +423 -0
data/docs/Yamlint/Parser/TokenParser/Handler.html +910 -0
data/docs/Yamlint/Parser/TokenParser.html +291 -0
data/docs/Yamlint/Parser.html +117 -0
data/docs/Yamlint/Presets.html +266 -0
data/docs/Yamlint/Rules/Anchors/AnchorHandler.html +678 -0
data/docs/Yamlint/Rules/Anchors.html +314 -0
data/docs/Yamlint/Rules/Base.html +968 -0
data/docs/Yamlint/Rules/Braces.html +335 -0
data/docs/Yamlint/Rules/Brackets.html +335 -0
data/docs/Yamlint/Rules/Colons.html +313 -0
data/docs/Yamlint/Rules/Commas.html +313 -0
data/docs/Yamlint/Rules/CommentRule.html +298 -0
data/docs/Yamlint/Rules/Comments.html +317 -0
data/docs/Yamlint/Rules/CommentsIndentation.html +328 -0
data/docs/Yamlint/Rules/DocumentEnd.html +332 -0
data/docs/Yamlint/Rules/DocumentStart.html +332 -0
data/docs/Yamlint/Rules/EmptyLines.html +300 -0
data/docs/Yamlint/Rules/EmptyValues.html +273 -0
data/docs/Yamlint/Rules/FloatValues.html +383 -0
data/docs/Yamlint/Rules/Hyphens.html +337 -0
data/docs/Yamlint/Rules/Indentation.html +329 -0
data/docs/Yamlint/Rules/KeyDuplicates/DuplicateKeyHandler.html +716 -0
data/docs/Yamlint/Rules/KeyDuplicates.html +258 -0
data/docs/Yamlint/Rules/KeyOrdering/KeyOrderHandler.html +694 -0
data/docs/Yamlint/Rules/KeyOrdering.html +258 -0
data/docs/Yamlint/Rules/LineLength.html +251 -0
data/docs/Yamlint/Rules/LineRule.html +304 -0
data/docs/Yamlint/Rules/NewLineAtEndOfFile.html +308 -0
data/docs/Yamlint/Rules/NewLines.html +310 -0
data/docs/Yamlint/Rules/OctalValues.html +270 -0
data/docs/Yamlint/Rules/QuotedStrings.html +381 -0
data/docs/Yamlint/Rules/Registry.html +492 -0
data/docs/Yamlint/Rules/TokenRule.html +298 -0
data/docs/Yamlint/Rules/TrailingSpaces.html +321 -0
data/docs/Yamlint/Rules/Truthy.html +288 -0
data/docs/Yamlint/Rules.html +190 -0
data/docs/Yamlint/Runner.html +551 -0
data/docs/Yamlint.html +135 -0
data/docs/_index.html +643 -0
data/docs/class_list.html +54 -0
data/docs/css/common.css +1 -0
data/docs/css/full_list.css +58 -0
data/docs/css/style.css +490 -0
data/docs/file.README.html +276 -0
data/docs/file_list.html +59 -0
data/docs/frames.html +22 -0
data/docs/index.html +276 -0
data/docs/js/app.js +395 -0
data/docs/js/full_list.js +244 -0
data/docs/js/jquery.js +4 -0
data/docs/method_list.html +1582 -0
data/docs/top-level-namespace.html +110 -0
data/exe/yamlint +7 -0
data/lib/yamlint/cli.rb +162 -0
data/lib/yamlint/config.rb +113 -0
data/lib/yamlint/formatter.rb +140 -0
data/lib/yamlint/linter.rb +130 -0
data/lib/yamlint/models/lint_context.rb +43 -0
data/lib/yamlint/models/problem.rb +44 -0
data/lib/yamlint/models/token.rb +22 -0
data/lib/yamlint/models.rb +9 -0
data/lib/yamlint/output/base.rb +15 -0
data/lib/yamlint/output/colored.rb +54 -0
data/lib/yamlint/output/github.rb +20 -0
data/lib/yamlint/output/parsable.rb +19 -0
data/lib/yamlint/output/standard.rb +25 -0
data/lib/yamlint/output.rb +26 -0
data/lib/yamlint/parser/comment_extractor.rb +78 -0
data/lib/yamlint/parser/line_parser.rb +30 -0
data/lib/yamlint/parser/token_parser.rb +92 -0
data/lib/yamlint/parser.rb +10 -0
data/lib/yamlint/presets/default.rb +35 -0
data/lib/yamlint/presets/relaxed.rb +34 -0
data/lib/yamlint/presets.rb +19 -0
data/lib/yamlint/rules/anchors.rb +133 -0
data/lib/yamlint/rules/base.rb +102 -0
data/lib/yamlint/rules/braces.rb +105 -0
data/lib/yamlint/rules/brackets.rb +105 -0
data/lib/yamlint/rules/colons.rb +73 -0
data/lib/yamlint/rules/commas.rb +85 -0
data/lib/yamlint/rules/comments.rb +77 -0
data/lib/yamlint/rules/comments_indentation.rb +66 -0
data/lib/yamlint/rules/document_end.rb +45 -0
data/lib/yamlint/rules/document_start.rb +45 -0
data/lib/yamlint/rules/empty_lines.rb +107 -0
data/lib/yamlint/rules/empty_values.rb +43 -0
data/lib/yamlint/rules/float_values.rb +67 -0
data/lib/yamlint/rules/hyphens.rb +42 -0
data/lib/yamlint/rules/indentation.rb +39 -0
data/lib/yamlint/rules/key_duplicates.rb +127 -0
data/lib/yamlint/rules/key_ordering.rb +126 -0
data/lib/yamlint/rules/line_length.rb +57 -0
data/lib/yamlint/rules/new_line_at_end_of_file.rb +31 -0
data/lib/yamlint/rules/new_lines.rb +59 -0
data/lib/yamlint/rules/octal_values.rb +62 -0
data/lib/yamlint/rules/quoted_strings.rb +73 -0
data/lib/yamlint/rules/registry.rb +48 -0
data/lib/yamlint/rules/trailing_spaces.rb +31 -0
data/lib/yamlint/rules/truthy.rb +48 -0
data/lib/yamlint/rules.rb +41 -0
data/lib/yamlint/runner.rb +80 -0
data/lib/yamlint/version.rb +1 -1
data/lib/yamlint.rb +11 -3
metadata +131 -11
data/CODE_OF_CONDUCT.md +0 -84
data/sig/yamlint.rbs +0 -4

data/docs/top-level-namespace.html ADDED Viewed

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Top Level Namespace
+    &mdash; Documentation by YARD 0.9.38
+</title>
+  <link rel="stylesheet" href="css/style.css" type="text/css" />
+  <link rel="stylesheet" href="css/common.css" type="text/css" />
+<script type="text/javascript">
+  pathId = "";
+  relpath = '';
+</script>
+  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+    <a href="_index.html">Index</a> &raquo;
+    <span class="title">Top Level Namespace</span>
+</div>
+        <div id="search">
+    <a class="full_list_link" id="class_list_link"
+        href="class_list.html">
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+</div>
+        <div class="clear"></div>
+      </div>
+      <div id="content"><h1>Top Level Namespace
+</h1>
+<div class="box_info">
+</div>
+<h2>Defined Under Namespace</h2>
+<p class="children">
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Yamlint.html" title="Yamlint (module)">Yamlint</a></span>
+</p>
+</div>
+      <div id="footer">
+  Generated on Sun Jan 25 08:00:08 2026 by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.38 (ruby-4.0.0).
+</div>
+    </div>
+  </body>
+</html>

data/exe/yamlint ADDED Viewed

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+require 'yamlint'
+exit Yamlint::Cli.new(ARGV).run

data/lib/yamlint/cli.rb ADDED Viewed

@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+require 'optparse'
+module Yamlint
+  class Cli
+    attr_reader :options
+    def initialize(argv = ARGV)
+      @argv = argv
+      @options = {
+        config: nil,
+        format: 'colored',
+        fix: false,
+        dry_run: false,
+        strict: false
+      }
+    end
+    def run
+      parse_options
+      command = @argv.shift || 'lint'
+      case command
+      when 'lint', 'l'
+        run_lint
+      when 'format', 'fmt', 'fix'
+        run_format
+      when 'version', '-v', '--version'
+        puts "yamlint #{VERSION}"
+        0
+      when 'help', '-h', '--help'
+        puts help_text
+        0
+      else
+        if File.exist?(command) || File.directory?(command)
+          @argv.unshift(command)
+          run_lint
+        else
+          warn "Unknown command: #{command}"
+          warn help_text
+          1
+        end
+      end
+    end
+    private
+    def parse_options
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: yamlint [command] [options] [files...]'
+        opts.on('-c', '--config FILE', 'Configuration file') do |file|
+          @options[:config] = file
+        end
+        opts.on('-f', '--format FORMAT', 'Output format (standard, parsable, colored, github)') do |format|
+          @options[:format] = format
+        end
+        opts.on('--fix', 'Auto-fix problems') do
+          @options[:fix] = true
+        end
+        opts.on('--dry-run', 'Show what would be fixed without making changes') do
+          @options[:dry_run] = true
+        end
+        opts.on('-s', '--strict', 'Treat warnings as errors') do
+          @options[:strict] = true
+        end
+        opts.on('-v', '--version', 'Show version') do
+          puts "yamlint #{VERSION}"
+          exit 0
+        end
+        opts.on('-h', '--help', 'Show help') do
+          puts opts
+          exit 0
+        end
+      end
+      parser.order!(@argv)
+    end
+    def run_lint
+      paths = @argv.empty? ? ['.'] : @argv
+      config = load_config
+      runner = Runner.new(config:, output_format: @options[:format])
+      result = runner.lint(paths)
+      puts result[:output] unless result[:output].empty?
+      puts result[:summary] unless result[:summary].empty?
+      result[:exit_code]
+    end
+    def run_format
+      paths = @argv.empty? ? ['.'] : @argv
+      config = load_config
+      runner = Runner.new(config:, output_format: @options[:format])
+      result = runner.format(paths, dry_run: @options[:dry_run])
+      if @options[:dry_run]
+        if result[:changed].positive?
+          puts "Would fix #{result[:changed]} file(s):"
+          result[:changed_files].each { |f| puts "  #{f}" }
+        else
+          puts 'No files would be changed'
+        end
+      elsif result[:changed].positive?
+        puts "Fixed #{result[:changed]} file(s)"
+      else
+        puts 'No files changed'
+      end
+      result[:exit_code]
+    end
+    def load_config
+      if @options[:config]
+        Config.load(@options[:config])
+      else
+        Config.load_default
+      end
+    end
+    def help_text
+      <<~HELP
+        yamlint - A YAML file linter and formatter
+        Usage:
+          yamlint [command] [options] [files...]
+        Commands:
+          lint, l       Lint YAML files (default)
+          format, fmt   Format YAML files
+          version       Show version
+          help          Show help
+        Options:
+          -c, --config FILE     Configuration file
+          -f, --format FORMAT   Output format (standard, parsable, colored, github)
+          --fix                 Auto-fix problems
+          --dry-run             Show what would be fixed without making changes
+          -s, --strict          Treat warnings as errors
+          -v, --version         Show version
+          -h, --help            Show help
+        Examples:
+          yamlint .
+          yamlint file.yaml
+          yamlint -c .yamllint.yml .
+          yamlint format --dry-run .
+          yamlint -f github .
+      HELP
+    end
+  end
+end

data/lib/yamlint/config.rb ADDED Viewed

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+require 'yaml'
+module Yamlint
+  class Config
+    DEFAULT_CONFIG_FILES = %w[
+      .yamllint
+      .yamllint.yaml
+      .yamllint.yml
+    ].freeze
+    YAML_FILE_PATTERNS = %w[
+      *.yaml
+      *.yml
+    ].freeze
+    attr_reader :rules, :yaml_files, :ignore, :extends
+    def initialize(options = {})
+      @extends = options[:extends]
+      @yaml_files = options[:'yaml-files'] || options['yaml-files'] || YAML_FILE_PATTERNS
+      @ignore = options[:ignore] || options['ignore'] || []
+      @rules = normalize_rules(options[:rules] || options['rules'] || {})
+    end
+    def self.load(path = nil)
+      if path
+        load_from_file(path)
+      else
+        load_default
+      end
+    end
+    def self.load_from_file(path)
+      content = File.read(path)
+      data = YAML.safe_load(content, permitted_classes: [Symbol]) || {}
+      build_from_hash(data)
+    end
+    def self.load_default
+      config_file = find_config_file
+      if config_file
+        load_from_file(config_file)
+      else
+        new_with_preset('default')
+      end
+    end
+    def self.find_config_file
+      DEFAULT_CONFIG_FILES.find { |f| File.exist?(f) }
+    end
+    def self.new_with_preset(preset_name)
+      preset = Presets.get(preset_name)
+      new(preset)
+    end
+    def self.build_from_hash(data)
+      base_config = if data['extends']
+                      Presets.get(data['extends'])
+                    else
+                      {}
+                    end
+      merged = deep_merge(base_config, symbolize_keys(data))
+      new(merged)
+    end
+    def rule_config(rule_id)
+      @rules[rule_id.to_s] || @rules[rule_id.to_sym] || {}
+    end
+    def rule_enabled?(rule_id)
+      config = rule_config(rule_id)
+      config != 'disable' && config != false
+    end
+    private
+    def normalize_rules(rules)
+      normalized = {}
+      rules.each do |key, value|
+        normalized[key.to_s] = value
+      end
+      normalized
+    end
+    class << self
+      private
+      def deep_merge(base, override)
+        result = base.dup
+        override.each do |key, value|
+          result[key] = if value.is_a?(Hash) && result[key].is_a?(Hash)
+                          deep_merge(result[key], value)
+                        else
+                          value
+                        end
+        end
+        result
+      end
+      def symbolize_keys(hash)
+        return hash unless hash.is_a?(Hash)
+        hash.transform_keys(&:to_sym).transform_values do |v|
+          v.is_a?(Hash) ? symbolize_keys(v) : v
+        end
+      end
+    end
+  end
+end

data/lib/yamlint/formatter.rb ADDED Viewed

@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+require 'date'
+require 'yaml'
+module Yamlint
+  class Formatter
+    attr_reader :config
+    def initialize(config = nil)
+      @config = config || Config.load_default
+    end
+    def format(content, dry_run: false)
+      original = content.dup
+      result = content
+      result = fix_trailing_spaces(result)
+      result = fix_new_line_at_end(result)
+      result = fix_new_lines(result)
+      result = fix_empty_lines(result)
+      return original if dry_run
+      if safe_fix?(original, result)
+        result
+      else
+        original
+      end
+    end
+    def format_file(filepath, dry_run: false)
+      content = File.read(filepath)
+      formatted = format(content, dry_run:)
+      File.write(filepath, formatted) unless dry_run || content == formatted
+      formatted
+    end
+    private
+    def fix_trailing_spaces(content)
+      content.gsub(/[ \t]+$/, '')
+    end
+    def fix_new_line_at_end(content)
+      return content if content.empty?
+      return content if content.end_with?("\n")
+      "#{content}\n"
+    end
+    def fix_new_lines(content)
+      new_line_type = @config.rules['new-lines']
+      return content unless new_line_type.is_a?(Hash)
+      type = new_line_type['type'] || new_line_type[:type] || 'unix'
+      case type
+      when 'unix'
+        content.gsub("\r\n", "\n")
+      when 'dos'
+        content.gsub(/(?<!\r)\n/, "\r\n")
+      else
+        content
+      end
+    end
+    def fix_empty_lines(content)
+      lines = content.lines
+      return content if lines.empty?
+      empty_lines_config = @config.rules['empty-lines'] || {}
+      return content unless empty_lines_config.is_a?(Hash)
+      max_start = empty_lines_config['max-start'] || empty_lines_config[:'max-start'] || 0
+      max_end = empty_lines_config['max-end'] || empty_lines_config[:'max-end'] || 0
+      max = empty_lines_config['max'] || empty_lines_config[:max] || 2
+      lines = remove_start_empty_lines(lines, max_start)
+      lines = remove_end_empty_lines(lines, max_end)
+      lines = limit_consecutive_empty_lines(lines, max)
+      lines.join
+    end
+    def remove_start_empty_lines(lines, max)
+      count = 0
+      lines.each do |line|
+        break unless line.strip.empty?
+        count += 1
+      end
+      lines.drop([count - max, 0].max)
+    end
+    def remove_end_empty_lines(lines, max)
+      count = 0
+      lines.reverse_each do |line|
+        break unless line.strip.empty?
+        count += 1
+      end
+      to_remove = [count - max, 0].max
+      to_remove.positive? ? lines[0...-to_remove] : lines
+    end
+    def limit_consecutive_empty_lines(lines, max)
+      result = []
+      consecutive_empty = 0
+      lines.each do |line|
+        if line.strip.empty?
+          consecutive_empty += 1
+          result << line if consecutive_empty <= max
+        else
+          consecutive_empty = 0
+          result << line
+        end
+      end
+      result
+    end
+    def safe_fix?(original, fixed)
+      return true if original == fixed
+      return false if original.empty? || fixed.empty?
+      begin
+        original_data = YAML.safe_load(original, permitted_classes: [Symbol, Date, Time])
+        fixed_data = YAML.safe_load(fixed, permitted_classes: [Symbol, Date, Time])
+        original_data == fixed_data
+      rescue Psych::SyntaxError
+        false
+      end
+    end
+  end
+end

data/lib/yamlint/linter.rb ADDED Viewed

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+require 'set'
+require 'yaml'
+module Yamlint
+  class Linter
+    attr_reader :config
+    def initialize(config = nil)
+      @config = config || Config.load_default
+    end
+    def lint(content, filepath: nil)
+      context = build_context(content, filepath)
+      syntax_problems = check_syntax(content, filepath)
+      return syntax_problems unless syntax_problems.empty?
+      parse_content(context)
+      rules = build_rules
+      rules.each do |rule|
+        problems = rule.check(context)
+        context.problems.concat(Array(problems))
+      end
+      filter_disabled_problems(context)
+    end
+    def lint_file(filepath)
+      content = File.read(filepath)
+      lint(content, filepath:)
+    end
+    private
+    def build_context(content, filepath)
+      Models::LintContext.new(
+        filepath: filepath || '<string>',
+        content:
+      )
+    end
+    def parse_content(context)
+      token_parser = Parser::TokenParser.new(context.content)
+      context.tokens.concat(token_parser.parse)
+      comment_extractor = Parser::CommentExtractor.new(context.content)
+      context.comments.concat(comment_extractor.extract)
+    end
+    def check_syntax(content, _filepath)
+      Psych.parse(content)
+      []
+    rescue Psych::SyntaxError => e
+      [Models::Problem.new(
+        line: e.line,
+        column: e.column,
+        rule: 'syntax',
+        level: :error,
+        message: e.message.sub(/^\([^)]+\): /, ''),
+        fixable: false
+      )]
+    end
+    def build_rules
+      Rules.load_all
+      enabled_rules = []
+      Rules::Registry.all.each do |rule_class|
+        rule_id = rule_class.id
+        next unless @config.rule_enabled?(rule_id)
+        rule_config = @config.rule_config(rule_id)
+        rule_options = rule_config.is_a?(Hash) ? normalize_options(rule_config) : {}
+        enabled_rules << rule_class.new(rule_options)
+      end
+      enabled_rules
+    end
+    def normalize_options(options)
+      normalized = {}
+      options.each do |key, value|
+        normalized[key.to_s.tr('_', '-').to_sym] = value
+      end
+      normalized
+    end
+    def filter_disabled_problems(context)
+      disabled_rules = Set.new
+      line_disabled = {}
+      context.comments.each do |comment|
+        if comment.disable_directive?
+          rules = comment.disabled_rules
+          if comment.text.include?('disable-line')
+            line_disabled[comment.line_number] ||= Set.new
+            if rules.empty?
+              line_disabled[comment.line_number] = :all
+            else
+              line_disabled[comment.line_number].merge(rules) unless line_disabled[comment.line_number] == :all
+            end
+          else
+            rules.empty? ? disabled_rules = :all : disabled_rules.merge(rules)
+          end
+        elsif comment.enable_directive?
+          rules = comment.disabled_rules
+          if rules.empty?
+            disabled_rules = Set.new
+          elsif disabled_rules.is_a?(Set)
+            disabled_rules.subtract(rules)
+          end
+        end
+      end
+      context.problems.reject do |problem|
+        next true if disabled_rules == :all
+        next true if disabled_rules.include?(problem.rule)
+        line_disable = line_disabled[problem.line]
+        next true if line_disable == :all
+        next true if line_disable&.include?(problem.rule)
+        false
+      end
+    end
+  end
+end

data/lib/yamlint/models/lint_context.rb ADDED Viewed

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+module Yamlint
+  module Models
+    class LintContext
+      attr_reader :filepath, :content, :lines, :tokens, :comments
+      attr_accessor :problems
+      def initialize(filepath:, content:)
+        @filepath = filepath
+        @content = content
+        @lines = content.lines
+        @tokens = []
+        @comments = []
+        @problems = []
+      end
+      def add_problem(problem)
+        @problems << problem
+      end
+      def add_token(token)
+        @tokens << token
+      end
+      def add_comment(comment)
+        @comments << comment
+      end
+      def line_count
+        @lines.length
+      end
+      def line_at(line_number)
+        @lines[line_number - 1]
+      end
+      def empty?
+        @content.empty?
+      end
+    end
+  end
+end