theme-check 0.10.2 → 1.3.0

data/lib/theme_check/regex_helpers.rb

@@ -2,6 +2,11 @@
 
 module ThemeCheck
   module RegexHelpers
+    LIQUID_TAG = /#{Liquid::TagStart}.*?#{Liquid::TagEnd}/om
+    LIQUID_VARIABLE = /#{Liquid::VariableStart}.*?#{Liquid::VariableEnd}/om
+    LIQUID_TAG_OR_VARIABLE = /#{LIQUID_TAG}|#{LIQUID_VARIABLE}/om
+    START_OR_END_QUOTE = /(^['"])|(['"]$)/
+
     def matches(s, re)
       start_at = 0
       matches = []
@@ -11,5 +16,20 @@ module ThemeCheck
       end
       matches
     end
+
+    def href_to_file_size(href)
+      # asset_url (+ optional stylesheet_tag) variables
+      if href =~ /^#{LIQUID_VARIABLE}$/o && href =~ /asset_url/ && href =~ Liquid::QuotedString
+        asset_id = Regexp.last_match(0).gsub(START_OR_END_QUOTE, "")
+        asset = @theme.assets.find { |a| a.name.end_with?("/" + asset_id) }
+        return if asset.nil?
+        asset.gzipped_size
+
+      # remote URLs
+      elsif href =~ %r{^(https?:)?//}
+        asset = RemoteAssetFile.from_src(href)
+        asset.gzipped_size
+      end
+    end
   end
 end

data/lib/theme_check/tags.rb

@@ -125,6 +125,42 @@ module ThemeCheck
       end
     end
 
+    class Render < Liquid::Tag
+      SYNTAX = /((?:#{Liquid::QuotedString}|#{Liquid::VariableSegment})+)(\s+(with|#{Liquid::Render::FOR})\s+(#{Liquid::QuotedFragment}+))?(\s+(?:as)\s+(#{Liquid::VariableSegment}+))?/o
+
+      disable_tags "include"
+
+      attr_reader :template_name_expr, :attributes
+
+      def initialize(tag_name, markup, options)
+        super
+
+        raise SyntaxError, options[:locale].t("errors.syntax.render") unless markup =~ SYNTAX
+
+        template_name = Regexp.last_match(1)
+        with_or_for = Regexp.last_match(3)
+        variable_name = Regexp.last_match(4)
+
+        @alias_name = Regexp.last_match(6)
+        @variable_name_expr = variable_name ? parse_expression(variable_name) : nil
+        @template_name_expr = parse_expression(template_name)
+        @for = (with_or_for == Liquid::Render::FOR)
+
+        @attributes = {}
+        markup.scan(Liquid::TagAttributes) do |key, value|
+          @attributes[key] = parse_expression(value)
+        end
+      end
+
+      class ParseTreeVisitor < Liquid::ParseTreeVisitor
+        def children
+          [
+            @node.template_name_expr,
+          ] + @node.attributes.values
+        end
+      end
+    end
+
     class Style < Liquid::Block; end
 
     class Schema < Liquid::Raw; end
@@ -133,13 +169,31 @@ module ThemeCheck
 
     class Stylesheet < Liquid::Raw; end
 
-    Liquid::Template.register_tag('form', Form)
-    Liquid::Template.register_tag('layout', Layout)
-    Liquid::Template.register_tag('paginate', Paginate)
-    Liquid::Template.register_tag('section', Section)
-    Liquid::Template.register_tag('style', Style)
-    Liquid::Template.register_tag('schema', Schema)
-    Liquid::Template.register_tag('javascript', Javascript)
-    Liquid::Template.register_tag('stylesheet', Stylesheet)
+    class << self
+      attr_writer :register_tags
+
+      def register_tags?
+        @register_tags
+      end
+
+      def register_tag(name, klass)
+        Liquid::Template.register_tag(name, klass)
+      end
+
+      def register_tags!
+        return if !register_tags? || (defined?(@registered_tags) && @registered_tags)
+        @registered_tags = true
+        register_tag('form', Form)
+        register_tag('layout', Layout)
+        register_tag('render', Render)
+        register_tag('paginate', Paginate)
+        register_tag('section', Section)
+        register_tag('style', Style)
+        register_tag('schema', Schema)
+        register_tag('javascript', Javascript)
+        register_tag('stylesheet', Stylesheet)
+      end
+    end
+    self.register_tags = true
   end
 end

data/lib/theme_check/template.rb

@@ -1,25 +1,7 @@
 # frozen_string_literal: true
-require "pathname"
 
 module ThemeCheck
-  class Template
-    def initialize(relative_path, storage)
-      @storage = storage
-      @relative_path = relative_path
-    end
-
-    def path
-      @storage.path(@relative_path)
-    end
-
-    def relative_path
-      @relative_pathname ||= Pathname.new(@relative_path)
-    end
-
-    def source
-      @source ||= @storage.read(@relative_path)
-    end
-
+  class Template < ThemeFile
     def write
       content = updated_content
       if source != content
@@ -28,14 +10,6 @@ module ThemeCheck
       end
     end
 
-    def name
-      relative_path.sub_ext('').to_s
-    end
-
-    def json?
-      false
-    end
-
     def liquid?
       true
     end
@@ -88,16 +62,13 @@ module ThemeCheck
       parse.root
     end
 
-    def ==(other)
-      other.is_a?(Template) && relative_path == other.relative_path
-    end
-    alias_method :eql?, :==
-
     def self.parse(source)
+      Tags.register_tags!
       Liquid::Template.parse(
         source,
         line_numbers: true,
         error_mode: :warn,
+        disable_liquid_c_nodes: true,
       )
     end
   end

data/lib/theme_check/theme.rb

@@ -7,6 +7,8 @@ module ThemeCheck
     LIQUID_REGEX = /\.liquid$/i
     JSON_REGEX = /\.json$/i
 
+    attr_accessor :storage
+
     def initialize(storage)
       @storage = storage
     end

data/lib/theme_check/theme_file.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+require "pathname"
+
+module ThemeCheck
+  class ThemeFile
+    def initialize(relative_path, storage)
+      @relative_path = relative_path
+      @storage = storage
+    end
+
+    def path
+      @storage.path(@relative_path)
+    end
+
+    def relative_path
+      @relative_pathname ||= Pathname.new(@relative_path)
+    end
+
+    def name
+      relative_path.sub_ext('').to_s
+    end
+
+    def source
+      @source ||= @storage.read(@relative_path)
+    end
+
+    def json?
+      false
+    end
+
+    def liquid?
+      false
+    end
+
+    def ==(other)
+      other.is_a?(self.class) && relative_path == other.relative_path
+    end
+    alias_method :eql?, :==
+  end
+end

data/lib/theme_check/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ThemeCheck
-  VERSION = "0.10.2"
+  VERSION = "1.3.0"
 end

data/lib/theme_check.rb

@@ -4,6 +4,7 @@ require "liquid"
 require_relative "theme_check/version"
 require_relative "theme_check/bug"
 require_relative "theme_check/exceptions"
+require_relative "theme_check/theme_file"
 require_relative "theme_check/analyzer"
 require_relative "theme_check/check"
 require_relative "theme_check/checks_tracking"
@@ -26,6 +27,7 @@ require_relative "theme_check/config"
 require_relative "theme_check/node"
 require_relative "theme_check/offense"
 require_relative "theme_check/printer"
+require_relative "theme_check/json_printer"
 require_relative "theme_check/shopify_liquid"
 require_relative "theme_check/storage"
 require_relative "theme_check/string_helpers"
@@ -45,3 +47,17 @@ Dir[__dir__ + "/theme_check/checks/*.rb"].each { |file| require file }
 # UTF-8 is the default internal and external encoding, like in Rails & Shopify.
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
+
+module ThemeCheck
+  def self.with_liquid_c_disabled
+    if defined?(Liquid::C)
+      was_enabled = Liquid::C.enabled
+      Liquid::C.enabled = false if was_enabled
+    end
+    yield
+  ensure
+    if defined?(Liquid::C) && was_enabled
+      Liquid::C.enabled = true
+    end
+  end
+end

data/theme-check.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency('liquid', '>= 5.0.1')
-  spec.add_dependency('nokogumbo')
+  spec.add_dependency('nokogiri', '>= 1.12')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-check
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Marc-André Cournoyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.1
 - !ruby/object:Gem::Dependency
-  name: nokogumbo
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
 description: 
 email:
 - marcandre.cournoyer@shopify.com
@@ -60,8 +60,11 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
-- bin/liquid-server
+- bin/theme-check
+- bin/theme-check-language-server
 - config/default.yml
+- config/nothing.yml
+- config/theme_app_extension.yml
 - data/shopify_liquid/deprecated_filters.yml
 - data/shopify_liquid/filters.yml
 - data/shopify_liquid/objects.yml
@@ -74,12 +77,18 @@ files:
 - docs/api/json_check.md
 - docs/api/liquid_check.md
 - docs/checks/TEMPLATE.md.erb
+- docs/checks/app_block_valid_tags.md
+- docs/checks/asset_size_app_block_css.md
+- docs/checks/asset_size_app_block_javascript.md
 - docs/checks/asset_size_css.md
+- docs/checks/asset_size_css_stylesheet_tag.md
 - docs/checks/asset_size_javascript.md
 - docs/checks/asset_url_filters.md
 - docs/checks/content_for_header_modification.md
 - docs/checks/convert_include_to_render.md
 - docs/checks/default_locale.md
+- docs/checks/deprecate_bgsizes.md
+- docs/checks/deprecate_lazysizes.md
 - docs/checks/deprecated_filter.md
 - docs/checks/html_parsing_error.md
 - docs/checks/img_lazy_loading.md
@@ -91,6 +100,7 @@ files:
 - docs/checks/missing_required_template_files.md
 - docs/checks/missing_template.md
 - docs/checks/nested_snippet.md
+- docs/checks/pagination_size.md
 - docs/checks/parser_blocking_javascript.md
 - docs/checks/parser_blocking_script_tag.md
 - docs/checks/remote_asset.md
@@ -117,12 +127,18 @@ files:
 - lib/theme_check/check.rb
 - lib/theme_check/checks.rb
 - lib/theme_check/checks/TEMPLATE.rb.erb
+- lib/theme_check/checks/app_block_valid_tags.rb
+- lib/theme_check/checks/asset_size_app_block_css.rb
+- lib/theme_check/checks/asset_size_app_block_javascript.rb
 - lib/theme_check/checks/asset_size_css.rb
+- lib/theme_check/checks/asset_size_css_stylesheet_tag.rb
 - lib/theme_check/checks/asset_size_javascript.rb
 - lib/theme_check/checks/asset_url_filters.rb
 - lib/theme_check/checks/content_for_header_modification.rb
 - lib/theme_check/checks/convert_include_to_render.rb
 - lib/theme_check/checks/default_locale.rb
+- lib/theme_check/checks/deprecate_bgsizes.rb
+- lib/theme_check/checks/deprecate_lazysizes.rb
 - lib/theme_check/checks/deprecated_filter.rb
 - lib/theme_check/checks/html_parsing_error.rb
 - lib/theme_check/checks/img_lazy_loading.rb
@@ -134,6 +150,7 @@ files:
 - lib/theme_check/checks/missing_required_template_files.rb
 - lib/theme_check/checks/missing_template.rb
 - lib/theme_check/checks/nested_snippet.rb
+- lib/theme_check/checks/pagination_size.rb
 - lib/theme_check/checks/parser_blocking_javascript.rb
 - lib/theme_check/checks/parser_blocking_script_tag.rb
 - lib/theme_check/checks/remote_asset.rb
@@ -165,6 +182,7 @@ files:
 - lib/theme_check/json_check.rb
 - lib/theme_check/json_file.rb
 - lib/theme_check/json_helpers.rb
+- lib/theme_check/json_printer.rb
 - lib/theme_check/language_server.rb
 - lib/theme_check/language_server/completion_engine.rb
 - lib/theme_check/language_server/completion_helper.rb
@@ -203,6 +221,7 @@ files:
 - lib/theme_check/tags.rb
 - lib/theme_check/template.rb
 - lib/theme_check/theme.rb
+- lib/theme_check/theme_file.rb
 - lib/theme_check/version.rb
 - lib/theme_check/visitor.rb
 - packaging/homebrew/theme_check.base.rb
@@ -227,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: A Shopify Theme Linter

data/bin/liquid-server

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-dev="/opt/dev/bin/dev"
-cd "$($dev project-path theme-check)"
-"$dev" language-server