primer_view_components 0.0.48 → 0.0.52

data/lib/primer/view_components/linters/argument_mappers/label.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module ERBLint
+  module Linters
+    module ArgumentMappers
+      # Maps classes in a label element to arguments for the Label component.
+      class Label < Base
+        SCHEME_MAPPINGS = Primer::ViewComponents::Constants.get(
+          component: "Primer::LabelComponent",
+          constant: "SCHEME_MAPPINGS",
+          symbolize: true
+        ).freeze
+
+        VARIANT_MAPPINGS = Primer::ViewComponents::Constants.get(
+          component: "Primer::LabelComponent",
+          constant: "VARIANT_MAPPINGS",
+          symbolize: true
+        ).freeze
+
+        DEFAULT_TAG = Primer::ViewComponents::Constants.get(
+          component: "Primer::LabelComponent",
+          constant: "DEFAULT_TAG"
+        ).freeze
+
+        ATTRIBUTES = %w[title].freeze
+
+        def attribute_to_args(attribute)
+          { title: erb_helper.convert(attribute) }
+        end
+
+        def classes_to_args(classes)
+          classes.split.each_with_object({ classes: [] }) do |class_name, acc|
+            next if class_name == "Label"
+
+            if SCHEME_MAPPINGS[class_name] && acc[:scheme].nil?
+              acc[:scheme] = SCHEME_MAPPINGS[class_name]
+            elsif VARIANT_MAPPINGS[class_name] && acc[:variant].nil?
+              acc[:variant] = VARIANT_MAPPINGS[class_name]
+            else
+              acc[:classes] << class_name
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/primer/view_components/linters/argument_mappers/system_arguments.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "conversion_error"
+require_relative "helpers/erb_block"
 
 module ERBLint
   module Linters
@@ -10,9 +11,11 @@ module ERBLint
         STRING_PARAMETERS = %w[aria- data-].freeze
         TEST_SELECTOR_REGEX = /test_selector\((?<selector>.+)\)$/.freeze
 
-        attr_reader :attribute
+        attr_reader :attribute, :erb_helper
+
         def initialize(attribute)
           @attribute = attribute
+          @erb_helper = Helpers::ErbBlock.new
         end
 
         def to_args
@@ -28,11 +31,9 @@ module ERBLint
 
             { test_selector: m[:selector].tr("'", '"') }
           elsif attr_name == "data-test-selector"
-            { test_selector: attribute.value.to_json }
+            { test_selector: erb_helper.convert(attribute) }
           elsif attr_name.start_with?(*STRING_PARAMETERS)
-            raise ConversionError, "Cannot convert attribute \"#{attr_name}\" because its value contains an erb block" if attribute.value_node&.children&.any? { |n| n.try(:type) == :erb }
-
-            { "\"#{attr_name}\"" => attribute.value.to_json }
+            { "\"#{attr_name}\"" => erb_helper.convert(attribute) }
           else
             raise ConversionError, "Cannot convert attribute \"#{attr_name}\""
           end

data/lib/primer/view_components/linters/autocorrectable.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative "argument_mappers/conversion_error"
+
+module ERBLint
+  module Linters
+    # Helper methods for autocorrectable ERB linters.
+    module Autocorrectable
+      def map_arguments(tag)
+        self.class::ARGUMENT_MAPPER.new(tag).to_s
+      rescue ArgumentMappers::ConversionError
+        nil
+      end
+
+      def correction(args)
+        return nil if args.nil?
+
+        correction = "<%= render #{self.class::COMPONENT}.new"
+        correction += "(#{args})" if args.present?
+        "#{correction} do %>"
+      end
+
+      def message(args, processed_source)
+        return self.class::MESSAGE if args.nil?
+
+        "#{self.class::MESSAGE}\nTry using:\n\n#{correction(args)}\n\nYou can also run erblint in autocorrect mode:\n\nbundle exec erblint -a #{processed_source.filename}\n"
+      end
+    end
+  end
+end

data/lib/primer/view_components/linters/button_component_migration_counter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "helpers"
+require_relative "autocorrectable"
 require_relative "argument_mappers/button"
 
 module ERBLint
@@ -8,32 +9,17 @@ module ERBLint
     # Counts the number of times a HTML button is used instead of the component.
     class ButtonComponentMigrationCounter < Linter
       include Helpers
+      include Autocorrectable
+
+      TAGS = Primer::ViewComponents::Constants.get(
+        component: "Primer::BaseButton",
+        constant: "TAG_OPTIONS"
+      ).freeze
 
-      TAGS = %w[button summary a].freeze
       CLASSES = %w[btn btn-link].freeze
       MESSAGE = "We are migrating buttons to use [Primer::ButtonComponent](https://primer.style/view-components/components/button), please try to use that instead of raw HTML."
-
-      private
-
-      def map_arguments(tag)
-        ArgumentMappers::Button.new(tag).to_s
-      rescue ArgumentMappers::ConversionError
-        nil
-      end
-
-      def correction(args)
-        return nil if args.nil?
-
-        correction = "<%= render Primer::ButtonComponent.new"
-        correction += "(#{args})" if args.present?
-        "#{correction} do %>"
-      end
-
-      def message(args)
-        return MESSAGE if args.nil?
-
-        "#{MESSAGE}\n\nTry using:\n\n#{correction(args)}\n\nInstead of:\n"
-      end
+      ARGUMENT_MAPPER = ArgumentMappers::Button
+      COMPONENT = "Primer::ButtonComponent"
     end
   end
 end

data/lib/primer/view_components/linters/clipboard_copy_component_migration_counter.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "helpers"
+require_relative "autocorrectable"
+require_relative "argument_mappers/clipboard_copy"
+
+module ERBLint
+  module Linters
+    # Counts the number of times a HTML clipboard-copy is used instead of the component.
+    class ClipboardCopyComponentMigrationCounter < Linter
+      include Helpers
+      include Autocorrectable
+
+      TAGS = %w[clipboard-copy].freeze
+      REQUIRED_ARGUMENTS = [/for|value/, "aria-label"].freeze
+      MESSAGE = "We are migrating clipboard-copy to use [Primer::ClipboardCopy](https://primer.style/view-components/components/clipboardcopy), please try to use that instead of raw HTML."
+      ARGUMENT_MAPPER = ArgumentMappers::ClipboardCopy
+      COMPONENT = "Primer::ClipboardCopy"
+    end
+  end
+end

data/lib/primer/view_components/linters/close_button_component_migration_counter.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative "helpers"
+
+module ERBLint
+  module Linters
+    # Counts the number of times a HTML clipboard-copy is used instead of the component.
+    class CloseButtonComponentMigrationCounter < Linter
+      include Helpers
+
+      TAGS = %w[button].freeze
+      CLASSES = %w[close-button].freeze
+      MESSAGE = "We are migrating close-button to use [Primer::CloseButton](https://primer.style/view-components/components/closebutton), please try to use that instead of raw HTML."
+    end
+  end
+end

data/lib/primer/view_components/linters/helpers.rb

@@ -2,6 +2,7 @@
 
 require "json"
 require "openssl"
+require "primer/view_components/constants"
 
 module ERBLint
   module Linters
@@ -14,63 +15,67 @@ module ERBLint
       ].freeze
 
       DUMP_FILE = ".erblint-counter-ignore.json"
+      CLASSES = [].freeze
+      REQUIRED_ARGUMENTS = [].freeze
 
       def self.included(base)
         base.include(ERBLint::LinterRegistry)
+      end
 
-        define_method "run" do |processed_source|
-          @total_offenses = 0
-          @offenses_not_corrected = 0
-          tags = tags(processed_source)
-          tag_tree = build_tag_tree(tags)
+      def run(processed_source)
+        @total_offenses = 0
+        @offenses_not_corrected = 0
+        tags = tags(processed_source)
+        tag_tree = build_tag_tree(tags)
 
-          tags.each do |tag|
-            next if tag.closing?
-            next unless self.class::TAGS&.include?(tag.name)
+        tags.each do |tag|
+          next if tag.closing?
+          next unless self.class::TAGS&.include?(tag.name)
 
-            classes = tag.attributes["class"]&.value&.split(" ") || []
+          classes = tag.attributes["class"]&.value&.split(" ") || []
+          tag_tree[tag][:offense] = false
 
-            tag_tree[tag][:offense] = false
+          next unless self.class::CLASSES.blank? || (classes & self.class::CLASSES).any?
 
-            next unless self.class::CLASSES.blank? || (classes & self.class::CLASSES).any?
+          args = map_arguments(tag)
+          correction = correction(args)
 
-            args = map_arguments(tag)
-            correction = correction(args)
+          attributes = tag.attributes.each.map(&:name).join(" ")
+          matches_required_attributes = self.class::REQUIRED_ARGUMENTS.blank? || self.class::REQUIRED_ARGUMENTS.all? { |arg| attributes.match?(arg) }
 
-            tag_tree[tag][:offense] = true
-            tag_tree[tag][:correctable] = !correction.nil?
-            tag_tree[tag][:message] = message(args)
-            tag_tree[tag][:correction] = correction
-          end
+          tag_tree[tag][:offense] = true
+          tag_tree[tag][:correctable] = matches_required_attributes && !correction.nil?
+          tag_tree[tag][:message] = message(args, processed_source)
+          tag_tree[tag][:correction] = correction
+        end
 
-          tag_tree.each do |tag, h|
-            next unless h[:offense]
-
-            @total_offenses += 1
-            # We always fix the offenses using blocks. The closing tag corresponds to `<% end %>`.
-            if h[:correctable]
-              add_offense(tag.loc, h[:message], h[:correction])
-              add_offense(h[:closing].loc, h[:message], "<% end %>")
-            else
-              @offenses_not_corrected += 1
-              generate_offense(self.class, processed_source, tag, h[:message])
-            end
+        tag_tree.each do |tag, h|
+          next unless h[:offense]
+
+          @total_offenses += 1
+          # We always fix the offenses using blocks. The closing tag corresponds to `<% end %>`.
+          if h[:correctable]
+            add_offense(tag.loc, h[:message], h[:correction])
+            add_offense(h[:closing].loc, h[:message], "<% end %>")
+          else
+            @offenses_not_corrected += 1
+            generate_offense(self.class, processed_source, tag, h[:message])
           end
+        end
 
-          counter_correct?(processed_source)
+        counter_correct?(processed_source)
 
-          dump_data(processed_source) if ENV["DUMP_LINT_DATA"] == "1"
-        end
+        dump_data(processed_source) if ENV["DUMP_LINT_DATA"] == "1"
+      end
 
-        define_method "autocorrect" do |processed_source, offense|
-          return unless offense.context
+      def autocorrect(processed_source, offense)
+        return unless offense.context
 
-          lambda do |corrector|
-            if offense.context.include?(counter_disable)
-              correct_counter(corrector, processed_source, offense)
-            else
-              corrector.replace(offense.source_range, offense.context)
-            end
+        lambda do |corrector|
+          if offense.context.include?(counter_disable)
+            correct_counter(corrector, processed_source, offense)
+          else
+            corrector.replace(offense.source_range, offense.context)
           end
         end
       end
@@ -96,7 +101,7 @@ module ERBLint
       # Override this function to customize the linter message.
       #
       # @return [String] message to show on linter error.
-      def message(_tag)
+      def message(_tag, _processed_source)
         self.class::MESSAGE
       end
 

data/lib/primer/view_components/linters/label_component_migration_counter.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative "helpers"
+require_relative "autocorrectable"
+require_relative "argument_mappers/label"
+
+module ERBLint
+  module Linters
+    # Counts the number of times a HTML label is used instead of the component.
+    class LabelComponentMigrationCounter < Linter
+      include Helpers
+      include Autocorrectable
+
+      TAGS = Primer::ViewComponents::Constants.get(
+        component: "Primer::LabelComponent",
+        constant: "TAG_OPTIONS"
+      ).freeze
+
+      CLASSES = %w[Label].freeze
+      MESSAGE = "We are migrating labels to use [Primer::LabelComponent](https://primer.style/view-components/components/label), please try to use that instead of raw HTML."
+      ARGUMENT_MAPPER = ArgumentMappers::Label
+      COMPONENT = "Primer::LabelComponent"
+    end
+  end
+end

data/lib/primer/view_components/version.rb

@@ -5,7 +5,7 @@ module Primer
     module VERSION
       MAJOR = 0
       MINOR = 0
-      PATCH = 48
+      PATCH = 52
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end

data/lib/rubocop/config/default.yml

@@ -10,3 +10,8 @@ Primer/SystemArgumentInsteadOfClass:
 Primer/NoTagMemoize:
   Enabled: false
 
+Primer/PrimerOcticon:
+  Enabled: true
+
+Primer/DeprecatedArguments:
+  Enabled: true

data/lib/rubocop/cop/primer.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-require "rubocop/cop/primer/no_tag_memoize"
-require "rubocop/cop/primer/system_argument_instead_of_class"
+Dir[File.join(__dir__, "primer", "*.rb")].sort.each { |file| require file }

data/lib/rubocop/cop/primer/deprecated_arguments.rb

@@ -0,0 +1,173 @@
+# frozen_string_literal: true
+
+require "rubocop"
+require "primer/view_components/statuses"
+require_relative "../../../../app/lib/primer/view_helper"
+
+# :nocov:
+module RuboCop
+  module Cop
+    module Primer
+      # This cop ensures that components don't use deprecated arguments
+      #
+      # bad
+      # Component.new(foo: :deprecated)
+      #
+      # good
+      # Component.new(foo: :bar)
+      class DeprecatedArguments < RuboCop::Cop::Cop
+        INVALID_MESSAGE = <<~STR
+          Avoid using deprecated arguments: https://primer.style/view-components/deprecated.
+        STR
+
+        # This is a hash of deprecated arguments and their replacements.
+        #
+        #   * The top level key is the argument.
+        #   * The second level key is the value.
+        #   * The seceond level value is a string of the full replacement. e.g. "new_argument: :new_value"
+        #     If the value is nil, then there is no replacement.
+        #
+        # e.g.
+        # DEPRECATED = {
+        #   argument: {
+        #     value: "new_argument: :new_value"
+        #   }
+        # }
+        #
+        DEPRECATED = {
+          color: {
+            blue: "color: :text_link",
+            gray_dark: "color: :text_primary",
+            gray: "color: :text_secondary",
+            gray_light: "color: :text_tertiary",
+            green: "color: :text_success",
+            yellow: "color: :text_warning",
+            red: "color: :text_danger",
+            gray_0: nil,
+            gray_1: nil,
+            gray_2: nil,
+            gray_3: nil,
+            gray_4: nil,
+            gray_5: nil,
+            gray_6: nil,
+            gray_7: nil,
+            gray_8: nil,
+            gray_9: nil,
+            blue_0: nil,
+            blue_1: nil,
+            blue_2: nil,
+            blue_3: nil,
+            blue_4: nil,
+            blue_5: nil,
+            blue_6: nil,
+            blue_7: nil,
+            blue_8: nil,
+            blue_9: nil,
+            green_0: nil,
+            green_1: nil,
+            green_2: nil,
+            green_3: nil,
+            green_4: nil,
+            green_5: nil,
+            green_6: nil,
+            green_7: nil,
+            green_8: nil,
+            green_9: nil,
+            yellow_0: nil,
+            yellow_1: nil,
+            yellow_2: nil,
+            yellow_3: nil,
+            yellow_4: nil,
+            yellow_5: nil,
+            yellow_6: nil,
+            yellow_7: nil,
+            yellow_8: nil,
+            yellow_9: nil,
+            red_0: nil,
+            red_1: nil,
+            red_2: nil,
+            red_3: nil,
+            red_4: nil,
+            red_5: nil,
+            red_6: nil,
+            red_7: nil,
+            red_8: nil,
+            red_9: nil,
+            purple_0: nil,
+            purple_1: nil,
+            purple_2: nil,
+            purple_3: nil,
+            purple_4: nil,
+            purple_5: nil,
+            purple_6: nil,
+            purple_7: nil,
+            purple_8: nil,
+            purple_9: nil,
+            pink_0: nil,
+            pink_1: nil,
+            pink_2: nil,
+            pink_3: nil,
+            pink_4: nil,
+            pink_5: nil,
+            pink_6: nil,
+            pink_7: nil,
+            pink_8: nil,
+            pink_9: nil,
+            orange_0: nil,
+            orange_1: nil,
+            orange_2: nil,
+            orange_3: nil,
+            orange_4: nil,
+            orange_5: nil,
+            orange_6: nil,
+            orange_7: nil,
+            orange_8: nil,
+            orange_9: nil
+          }
+        }.freeze
+
+        def on_send(node)
+          return unless valid_node?(node)
+          return unless node.arguments?
+
+          # we are looking for hash arguments and they are always last
+          kwargs = node.arguments.last
+
+          return unless kwargs.type == :hash
+
+          kwargs.pairs.each do |pair|
+            # Skip if we're not dealing with a symbol
+            next if pair.key.type != :sym
+            next unless pair.value.type == :sym || pair.value.type == :str
+
+            key = pair.key.value
+            value = pair.value.value.to_sym
+
+            next unless DEPRECATED.key?(key) && DEPRECATED[key].key?(value)
+
+            add_offense(pair, message: INVALID_MESSAGE)
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            replacement = DEPRECATED[node.key.value][node.value.value.to_sym]
+            corrector.replace(node, replacement) if replacement.present?
+          end
+        end
+
+        private
+
+        # We only verify SystemArguments if it's a `.new` call on a component or
+        # a ViewHleper call.
+        def valid_node?(node)
+          view_helpers.include?(node.method_name) || (node.method_name == :new && ::Primer::ViewComponents::STATUSES.key?(node.receiver.const_name))
+        end
+
+        def view_helpers
+          ::Primer::ViewHelper::HELPERS.keys.map { |key| "primer_#{key}".to_sym }
+        end
+      end
+    end
+  end
+end