theme-check 0.8.0 → 0.9.1

data/lib/theme_check/checks/missing_enable_comment.rb

@@ -17,13 +17,13 @@ module ThemeCheck
     end
 
     def after_document(node)
-      return if @disabled_checks.full_document_disabled?
-      return unless @disabled_checks.any?
+      checks_missing_end_index = @disabled_checks.checks_missing_end_index
+      return if checks_missing_end_index.empty?
 
-      message = if @disabled_checks.all_disabled?
+      message = if checks_missing_end_index.any? { |name| name == :all }
         "All checks were"
       else
-        @disabled_checks.all.join(', ') + " " + (@disabled_checks.all.size == 1 ? "was" : "were")
+        checks_missing_end_index.join(', ') + " " + (checks_missing_end_index.size == 1 ? "was" : "were")
       end
 
       add_offense("#{message} disabled but not re-enabled with theme-check-enable", node: node)

data/lib/theme_check/checks/missing_template.rb

@@ -5,6 +5,7 @@ module ThemeCheck
     severity :suggestion
     category :liquid
     doc docs_url(__FILE__)
+    single_file false
 
     def on_include(node)
       template = node.value.template_name_expr

data/lib/theme_check/checks/nested_snippet.rb

@@ -20,7 +20,7 @@ module ThemeCheck
       end
     end
 
-    def initialize(max_nesting_level: 2)
+    def initialize(max_nesting_level: 3)
       @max_nesting_level = max_nesting_level
       @templates = {}
     end

data/lib/theme_check/checks/parser_blocking_javascript.rb

@@ -1,48 +1,16 @@
 # frozen_string_literal: true
 module ThemeCheck
   # Reports errors when trying to use parser-blocking script tags
-  class ParserBlockingJavaScript < LiquidCheck
-    include RegexHelpers
+  class ParserBlockingJavaScript < HtmlCheck
     severity :error
-    categories :liquid, :performance
+    categories :html, :performance
     doc docs_url(__FILE__)
 
-    PARSER_BLOCKING_SCRIPT_TAG = %r{
-      <script                                    # Find the start of a script tag
-      (?=[^>]+?src=)                             # Make sure src= is in the script with a lookahead
-      (?:(?!defer|async|type=["']module['"]).)*? # Find tags that don't have defer|async|type="module"
-      /?>
-    }xim
-    SCRIPT_TAG_FILTER = /\{\{[^}]+script_tag\s+\}\}/
+    def on_script(node)
+      return unless node.attributes["src"]
+      return if node.attributes["defer"] || node.attributes["async"] || node.attributes["type"]&.value == "module"
 
-    def on_document(node)
-      @source = node.template.source
-      @node = node
-      record_offenses
-    end
-
-    private
-
-    def record_offenses
-      record_offenses_from_regex(
-        message: "Missing async or defer attribute on script tag",
-        regex: PARSER_BLOCKING_SCRIPT_TAG,
-      )
-      record_offenses_from_regex(
-        message: "The script_tag filter is parser-blocking. Use a script tag with the async or defer attribute for better performance",
-        regex: SCRIPT_TAG_FILTER,
-      )
-    end
-
-    def record_offenses_from_regex(regex: nil, message: nil)
-      matches(@source, regex).each do |match|
-        add_offense(
-          message,
-          node: @node,
-          markup: match[0],
-          line_number: @source[0...match.begin(0)].count("\n") + 1
-        )
-      end
+      add_offense("Missing async or defer attribute on script tag", node: node)
     end
   end
 end

data/lib/theme_check/checks/parser_blocking_script_tag.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module ThemeCheck
+  # Reports errors when trying to use parser-blocking script tags
+  class ParserBlockingScriptTag < LiquidCheck
+    severity :error
+    categories :liquid, :performance
+    doc docs_url(__FILE__)
+
+    def on_variable(node)
+      used_filters = node.value.filters.map { |name, *_rest| name }
+      if used_filters.include?("script_tag")
+        add_offense(
+          "The script_tag filter is parser-blocking. Use a script tag with the async or defer " \
+          "attribute for better performance",
+          node: node
+        )
+      end
+    end
+  end
+end

data/lib/theme_check/checks/remote_asset.rb

@@ -1,99 +1,41 @@
 # frozen_string_literal: true
 module ThemeCheck
-  class RemoteAsset < LiquidCheck
-    include RegexHelpers
+  class RemoteAsset < HtmlCheck
     severity :suggestion
-    categories :liquid, :performance
+    categories :html, :performance
     doc docs_url(__FILE__)
 
-    OFFENSE_MESSAGE = "Asset should be served by the Shopify CDN for better performance."
-
-    HTML_FILTERS = [
-      'stylesheet_tag',
-      'script_tag',
-      'img_tag',
-    ]
-    ASSET_URL_FILTERS = [
-      'asset_url',
-      'asset_img_url',
-      'file_img_url',
-      'file_url',
-      'global_asset_url',
-      'img_url',
-      'payment_type_img_url',
-      'shopify_asset_url',
-    ]
-
-    RESOURCE_TAG = %r{<(?<tag_name>img|script|link|source)#{HTML_ATTRIBUTES}/?>}oim
-    RESOURCE_URL = /\s(?:src|href)=(?<resource_url>#{QUOTED_LIQUID_ATTRIBUTE})/oim
-    ASSET_URL_FILTER = /[\|\s]*(#{ASSET_URL_FILTERS.join('|')})/omi
+    TAGS = %w[img script link source]
     PROTOCOL = %r{(https?:)?//}
     ABSOLUTE_PATH = %r{\A/[^/]}im
     RELATIVE_PATH = %r{\A(?!#{PROTOCOL})[^/\{]}oim
-    REL = /\srel=(?<rel>#{QUOTED_LIQUID_ATTRIBUTE})/oim
-
-    def on_variable(node)
-      record_variable_offense(node)
-    end
 
-    def on_document(node)
-      source = node.template.source
-      record_html_offenses(node, source)
-    end
+    def on_element(node)
+      return unless TAGS.include?(node.name)
 
-    private
+      resource_url = node.attributes["src"]&.value || node.attributes["href"]&.value
+      return if resource_url.nil? || resource_url.empty?
 
-    def record_variable_offense(variable_node)
-      # We flag HTML tags with URLs not hosted by Shopify
-      return if !html_resource_drop?(variable_node) || variable_hosted_by_shopify?(variable_node)
-      add_offense(OFFENSE_MESSAGE, node: variable_node)
-    end
+      # Ignore if URL is Liquid, taken care of by AssetUrlFilters check
+      return if resource_url =~ ABSOLUTE_PATH
+      return if resource_url =~ RELATIVE_PATH
+      return if url_hosted_by_shopify?(resource_url)
 
-    def html_resource_drop?(variable_node)
-      variable_node.value.filters
-        .any? { |(filter_name, *_filter_args)| HTML_FILTERS.include?(filter_name) }
-    end
+      # Ignore non-stylesheet rel tags
+      rel = node.attributes["rel"]
+      return if rel && rel.value != "stylesheet"
 
-    def variable_hosted_by_shopify?(variable_node)
-      variable_node.value.filters
-        .any? { |(filter_name, *_filter_args)| ASSET_URL_FILTERS.include?(filter_name) }
+      add_offense(
+        "Asset should be served by the Shopify CDN for better performance.",
+        node: node,
+      )
     end
 
-    # This part is slightly more complicated because we don't have an
-    # HTML AST. We have to resort to looking at the HTML with regexes
-    # to figure out if we have a resource (stylesheet, script, or media)
-    # that points to a remote domain.
-    def record_html_offenses(node, source)
-      matches(source, RESOURCE_TAG).each do |match|
-        tag = match[0]
-
-        # We don't flag stuff without URLs
-        next unless tag =~ RESOURCE_URL
-        resource_match = Regexp.last_match
-        resource_url = resource_match[:resource_url].gsub(START_OR_END_QUOTE, '')
-
-        next if non_stylesheet_link?(tag)
-        next if url_hosted_by_shopify?(resource_url)
-        next if resource_url =~ ABSOLUTE_PATH
-        next if resource_url =~ RELATIVE_PATH
-        next if resource_url.empty?
-
-        start = match.begin(0) + resource_match.begin(:resource_url)
-        add_offense(
-          OFFENSE_MESSAGE,
-          node: node,
-          markup: resource_url,
-          line_number: source[0...start].count("\n") + 1,
-        )
-      end
-    end
-
-    def non_stylesheet_link?(tag)
-      tag =~ REL && !(Regexp.last_match[:rel] =~ /\A['"]stylesheet['"]\Z/)
-    end
+    private
 
     def url_hosted_by_shopify?(url)
-      url =~ /\A#{VARIABLE}\Z/oim && url =~ ASSET_URL_FILTER
+      url.start_with?(Liquid::VariableStart) &&
+        AssetUrlFilters::ASSET_URL_FILTERS.any? { |filter| url.include?(filter) }
     end
   end
 end

data/lib/theme_check/checks/space_inside_braces.rb

@@ -15,12 +15,18 @@ module ThemeCheck
       return if :assign == node.type_name
 
       outside_of_strings(node.markup) do |chunk|
-        chunk.scan(/([,:])  +/) do |_match|
+        chunk.scan(/([,:|]|==|<>|<=|>=|<|>|!=)  +/) do |_match|
           add_offense("Too many spaces after '#{Regexp.last_match(1)}'", node: node, markup: Regexp.last_match(0))
         end
-        chunk.scan(/([,:])\S/) do |_match|
+        chunk.scan(/([,:|]|==|<>|<=|>=|<\b|>\b|!=)(\S|\z)/) do |_match|
           add_offense("Space missing after '#{Regexp.last_match(1)}'", node: node, markup: Regexp.last_match(0))
         end
+        chunk.scan(/  (\||==|<>|<=|>=|<|>|!=)+/) do |_match|
+          add_offense("Too many spaces before '#{Regexp.last_match(1)}'", node: node, markup: Regexp.last_match(0))
+        end
+        chunk.scan(/(\A|\S)(?<match>\||==|<>|<=|>=|<|\b>|!=)/) do |_match|
+          add_offense("Space missing before '#{Regexp.last_match(1)}'", node: node, markup: Regexp.last_match(0))
+        end
       end
     end
 

data/lib/theme_check/checks/template_length.rb

@@ -8,6 +8,9 @@ module ThemeCheck
     def initialize(max_length: 200, exclude_schema: true)
       @max_length = max_length
       @exclude_schema = exclude_schema
+    end
+
+    def on_document(_node)
       @excluded_lines = 0
     end
 

data/lib/theme_check/checks/valid_html_translation.rb

@@ -5,6 +5,7 @@ require 'nokogumbo'
 module ThemeCheck
   class ValidHTMLTranslation < JsonCheck
     severity :suggestion
+    category :translation
     doc docs_url(__FILE__)
 
     def on_file(file)

data/lib/theme_check/config.rb

@@ -91,11 +91,13 @@ module ThemeCheck
 
         options_for_check = options.transform_keys(&:to_sym)
         options_for_check.delete(:enabled)
+        ignored_patterns = options_for_check.delete(:ignore) || []
         check = if options_for_check.empty?
           check_class.new
         else
           check_class.new(**options_for_check)
         end
+        check.ignored_patterns = ignored_patterns
         check.options = options_for_check
         check
       end.compact

data/lib/theme_check/disabled_check.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# This class keeps track of checks being turned on and off in ranges.
+# We'll use the node position to figure out if the test is disabled or not.
+module ThemeCheck
+  class DisabledCheck
+    attr_reader :name, :template, :ranges
+    attr_accessor :first_line
+
+    def initialize(template, name)
+      @template = template
+      @name = name
+      @ranges = []
+      @first_line = false
+    end
+
+    def start_index=(index)
+      return unless ranges.empty? || !last.end.nil?
+      @ranges << (index..)
+    end
+
+    def end_index=(index)
+      return if ranges.empty? || !last.end.nil?
+      @ranges << (@ranges.pop.begin..index)
+    end
+
+    def disabled?(index)
+      index == 0 && first_line ||
+        ranges.any? { |range| range.cover?(index) }
+    end
+
+    def last
+      ranges.last
+    end
+
+    def missing_end_index?
+      return false if first_line && ranges.size == 1
+      last&.end.nil?
+    end
+  end
+end

data/lib/theme_check/disabled_checks.rb

@@ -8,50 +8,52 @@ module ThemeCheck
 
     ACTION_DISABLE_CHECKS = :disable
     ACTION_ENABLE_CHECKS = :enable
-    ACTION_UNRELATED_COMMENT = :unrelated
 
     def initialize
-      @disabled = []
-      @all_disabled = false
-      @full_document_disabled = false
+      @disabled_checks = Hash.new do |hash, key|
+        template, check_name = key
+        hash[key] = DisabledCheck.new(template, check_name)
+      end
     end
 
     def update(node)
       text = comment_text(node)
-
       if start_disabling?(text)
-        @disabled = checks_from_text(text)
-        @all_disabled = @disabled.empty?
-
-        if node&.line_number == 1
-          @full_document_disabled = true
+        checks_from_text(text).each do |check_name|
+          disabled = @disabled_checks[[node.template, check_name]]
+          disabled.start_index = node.start_index
+          disabled.first_line = true if node.line_number == 1
         end
       elsif stop_disabling?(text)
-        checks = checks_from_text(text)
-        @disabled = checks.empty? ? [] : @disabled - checks
-
-        @all_disabled = false
+        checks_from_text(text).each do |check_name|
+          disabled = @disabled_checks[[node.template, check_name]]
+          next unless disabled
+          disabled.end_index = node.end_index
+        end
       end
     end
 
-    # Whether any checks are currently disabled
-    def any?
-      !@disabled.empty? || @all_disabled
-    end
+    def disabled?(check, template, check_name, index)
+      return true if check.ignored_patterns&.any? do |pattern|
+        template.relative_path.fnmatch?(pattern)
+      end
 
-    # Whether all checks should be disabled
-    def all_disabled?
-      @all_disabled
+      @disabled_checks[[template, :all]]&.disabled?(index) ||
+        @disabled_checks[[template, check_name]]&.disabled?(index)
     end
 
-    # Get a list of all the individual disabled checks
-    def all
-      @disabled
+    def checks_missing_end_index
+      @disabled_checks.values
+        .select(&:missing_end_index?)
+        .map(&:name)
     end
 
-    # If the first line of the document is a theme-check-disable comment
-    def full_document_disabled?
-      @full_document_disabled
+    def remove_disabled_offenses(checks)
+      checks.disableable.each do |check|
+        check.offenses.reject! do |offense|
+          disabled?(check, offense.template, offense.code_name, offense.start_index)
+        end
+      end
     end
 
     private
@@ -69,9 +71,11 @@ module ThemeCheck
     end
 
     # Return a list of checks from a theme-check-disable comment
-    # Returns [] if all checks are meant to be disabled
+    # Returns [:all] if all checks are meant to be disabled
     def checks_from_text(text)
-      text.gsub(DISABLE_PREFIX_PATTERN, '').strip.split(',').map(&:strip)
+      checks = text.gsub(DISABLE_PREFIX_PATTERN, '').strip.split(',').map(&:strip)
+      return [:all] if checks.empty?
+      checks
     end
   end
 end

data/lib/theme_check/exceptions.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+require "net/http"
+
+TIMEOUT_EXCEPTIONS = [
+  Net::ReadTimeout,
+  Net::OpenTimeout,
+  Net::WriteTimeout,
+  Errno::ETIMEDOUT,
+  Timeout::Error,
+]
+
+CONNECTION_EXCEPTIONS = [
+  IOError,
+  EOFError,
+  SocketError,
+  Errno::EINVAL,
+  Errno::ECONNRESET,
+  Errno::ECONNABORTED,
+  Errno::EPIPE,
+  Errno::ECONNREFUSED,
+  Errno::EAGAIN,
+  Errno::EHOSTUNREACH,
+  Errno::ENETUNREACH,
+]
+
+NET_HTTP_EXCEPTIONS = [
+  Net::HTTPBadResponse,
+  Net::HTTPHeaderSyntaxError,
+  Net::ProtocolError,
+  *TIMEOUT_EXCEPTIONS,
+  *CONNECTION_EXCEPTIONS,
+]