phlexing 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36dca58e17556b8b085edeb24dbe3fc5f8c8cb976056a6f739a655c5d94d7a36
-  data.tar.gz: 21f2b6dbec24a29a4dbfe52bb25d77887e52c72d29098e41c5a80a2173e8cc66
+  metadata.gz: 0a1f00bbf43b734cd75f369ace78ec7a8e782192fc65b9729c345b16dfb25dd6
+  data.tar.gz: 10985bfa447d6e052b2bfe932ff796bc2465458ca5a7b8f0e77bb089f0372371
 SHA512:
-  metadata.gz: e52e0c6836f3e701c24f6ccf2338f823b5507497863e3af93d089712a2503213d2e86d5f3516f1f9d3e60bffd907de7ffbfc3661610141dd0f917f43a7cc2008
-  data.tar.gz: 00730543e38df6d87c1f5a1263ea964bfc27024de00dea885df86a5d60626afd665485899aad1d8cf350fba3df7e914879fda76040953125a4e9842e387c4b7b
+  metadata.gz: b9ad394751b8749495198b624ee0b0df792225d62664ef760b98f29ec18f1bc09aeb02b9cd3727e386bcf75fd11409658679e2a69b12709644cfeefc7aea3b3c
+  data.tar.gz: '009f8d61b78789d5f78641c85ef37307661bdcdc5bcf3591032766d3de63a9bb8c6fb4b63c74500b94b8084ebccd6e977f1d7abb883a0e5417e2a915edcad9d3'

data/Gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "maxitest", "~> 4.4"
 gem "minitest", "~> 5.0"
 gem "rake", "~> 13.0"
 gem "rubocop", require: false, github: "joeldrapper/rubocop", branch: "rubocop-user-agent"

data/Gemfile.lock

@@ -17,63 +17,215 @@ GIT
 PATH
   remote: .
   specs:
-    phlexing (0.2.0)
-      erb_parser (~> 0.0.2)
+    phlexing (0.4.0)
+      deface (~> 1.9)
       html_press (~> 0.8.2)
       nokogiri (~> 1.0)
-      rufo (~> 0.13.0)
+      phlex (~> 1.6)
+      phlex-rails (~> 0.9)
+      syntax_tree (~> 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actioncable (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.4.3)
+      actionview (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      rack (~> 2.0, >= 2.2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.4.3)
+      activesupport (= 7.0.4.3)
+      globalid (>= 0.3.6)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activestorage (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     ast (2.4.2)
+    builder (3.2.4)
+    cgi (0.3.6)
+    concurrent-ruby (1.2.2)
+    crass (1.0.6)
     css_press (0.3.2)
       csspool-st (= 3.1.2)
       json
     csspool-st (3.1.2)
-    erb_parser (0.0.2)
-      treetop
+    date (3.3.3)
+    deface (1.9.0)
+      actionview (>= 5.2)
+      nokogiri (>= 1.6)
+      polyglot
+      railties (>= 5.2)
+      rainbow (>= 2.1.0)
+    erb (4.0.2)
+      cgi (>= 0.3.3)
+    erubi (1.12.0)
     execjs (2.8.1)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
     html_press (0.8.2)
       htmlentities
       multi_css (>= 0.1.0)
       multi_js (>= 0.1.0)
     htmlentities (4.3.4)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
     json (2.6.2)
-    minitest (5.16.3)
+    loofah (2.19.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    maxitest (4.4.0)
+      minitest (>= 5.0.0, < 5.18.0)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.17.0)
     multi_css (0.1.0)
       css_press
     multi_js (0.1.0)
       uglifier (~> 2)
-    nokogiri (1.13.10-x86_64-darwin)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.8)
+    nokogiri (1.14.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
+    phlex (1.6.1)
+      concurrent-ruby (~> 1.2)
+      erb (>= 4)
+      zeitwerk (~> 2.6)
+    phlex-rails (0.9.0)
+      phlex (~> 1.6)
+      rails (>= 6.1, < 8)
+      zeitwerk (~> 2.6)
     polyglot (0.3.5)
+    prettier_print (1.2.1)
     racc (1.6.2)
+    rack (2.2.6.4)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (7.0.4.3)
+      actioncable (= 7.0.4.3)
+      actionmailbox (= 7.0.4.3)
+      actionmailer (= 7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actiontext (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      bundler (>= 1.15.0)
+      railties (= 7.0.4.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
-    rubocop-ast (1.23.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    rufo (0.13.0)
-    treetop (1.6.12)
-      polyglot (~> 0.3)
+    syntax_tree (6.1.1)
+      prettier_print (>= 1.2.0)
+    thor (1.2.1)
+    timeout (0.3.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   x86_64-darwin-19
   x86_64-linux
 
 DEPENDENCIES
+  maxitest (~> 4.4)
   minitest (~> 5.0)
   phlexing!
   rake (~> 13.0)

data/Rakefile

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
@@ -9,8 +8,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
-task default: %i[test rubocop]
+task default: %i[test]

data/lib/phlexing/component_generator.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module Phlexing
+  class ComponentGenerator
+    include Helpers
+
+    attr_accessor :converter, :analyzer
+
+    def self.call(converter)
+      new(converter).call
+    end
+
+    def initialize(converter)
+      @converter = converter
+      @analyzer = RubyAnalyzer.new
+      @analyzer.analyze(converter.source)
+    end
+
+    def call
+      out = StringIO.new
+
+      out << "class "
+      out << options.component_name
+      out << " < "
+      out << options.parent_component
+      out << newline
+
+      analyzer.includes.sort.each do |inklude|
+        out << "include "
+        out << inklude
+        out << newline
+      end
+
+      out << newline if analyzer.includes.any?
+
+      if analyzer.locals.any?
+        out << "attr_accessor "
+        out << build_accessors
+        out << newline
+        out << newline
+      end
+
+      converter.custom_elements.sort.each do |element|
+        out << "register_element :"
+        out << element
+        out << newline
+      end
+
+      out << newline if converter.custom_elements.any?
+
+      if kwargs.any?
+        out << "def initialize("
+        out << build_kwargs
+        out << ")"
+        out << newline
+
+        kwargs.each do |dep|
+          out << "@#{dep} = #{dep}\n"
+        end
+
+        out << "end"
+        out << newline
+        out << newline
+      end
+
+      out << "def template"
+      out << newline
+      out << converter.template_code
+      out << newline
+      out << "end"
+
+      if analyzer.instance_methods.any?
+        out << newline
+        out << newline
+        out << "private"
+        out << newline
+        out << newline
+
+        analyzer.instance_methods.sort.each do |instance_method|
+          out << "def "
+          out << instance_method
+          out << "(*args, **kwargs)"
+          out << newline
+          out << "# TODO: Implement me"
+          out << newline
+          out << "end"
+          out << newline
+          out << newline
+        end
+
+        out << newline
+      end
+
+      out << newline
+      out << "end"
+      out << newline
+
+      Formatter.call(out.string.strip)
+    rescue StandardError
+      out.string.strip
+    end
+
+    private
+
+    def kwargs
+      Set.new(analyzer.ivars + analyzer.locals).sort
+    end
+
+    def build_kwargs
+      kwargs.map { |kwarg| arg(kwarg) }.join(", ")
+    end
+
+    def build_accessors
+      analyzer.locals.sort.map { |local| symbol(local) }.join(", ")
+    end
+
+    def options
+      converter.options
+    end
+  end
+end

data/lib/phlexing/converter.rb

@@ -1,253 +1,42 @@
 # frozen_string_literal: true
 
-require "nokogiri"
-require "ostruct"
-require "rufo"
-require "html_press"
-require "erb_parser"
-
 module Phlexing
   class Converter
-    include Helpers
-
-    using ::Phlexing::Refinements::StringRefinements
-
-    attr_accessor :html, :custom_elements, :ivars, :locals, :idents
+    attr_accessor :source, :custom_elements, :options
 
-    def self.convert(html, **options)
-      new(html, **options).output
+    def self.call(source, **options)
+      new(**options).call(source)
     end
 
-    def initialize(html, **options)
-      @html = html
-      @buffer = StringIO.new
-      @custom_elements = Set.new
-      @ivars = Set.new
-      @locals = Set.new
-      @includes = Set.new
-      @idents = Set.new
-      @options = options
-      analyze_ruby
-      handle_node
+    def self.convert(source, **options)
+      new(**options).call(source)
     end
 
-    def handle_text(node, level, newline: true)
-      text = node.text
-
-      if text.squish.empty? && text.length.positive?
-        @buffer << indent(level)
-        @buffer << whitespace(@options)
-
-        text.strip!
-      end
+    def call(source)
+      @source = source
 
-      if text.length.positive?
-        @buffer << indent(level)
-
-        if siblings?(node)
-          @buffer << "text "
-        end
-
-        @buffer << quote(text)
-        @buffer << "\n" if newline
-      end
+      code
     end
 
-    def handle_erb_element(node, level, newline: true)
-      if erb_safe_output?(node)
-        @buffer << "unsafe_raw "
-        @buffer << node.text.from(1)
-        @buffer << "\n" if newline
-
-        return
-      end
-
-      if erb_interpolation?(node) && node.parent.children.count > 1
-        if node.text.length >= 24
-          @buffer << "text("
-          @buffer << node.text
-          @buffer << ")"
-        else
-          @buffer << "text "
-          @buffer << node.text
-        end
-      elsif erb_comment?(node)
-        @buffer << "#"
-        @buffer << node.text
-      else
-        @buffer << node.text
-      end
-
-      @buffer << "\n" if newline
-    end
-
-    def handle_element(node, level)
-      @buffer << (indent(level) + node_name(node) + handle_attributes(node))
-
-      if node.children.any?
-        if node.children.one? && text_node?(node.children.first) && node.text.length <= 32
-          single_line_block {
-            handle_text(node.children.first, 0, newline: false)
-          }
-        elsif node.children.one? && erb_interpolation?(node.children.first) && node.text.length <= 32
-          single_line_block {
-            handle_erb_element(node.children.first, 0, newline: false)
-          }
-        else
-          multi_line_block(level) {
-            handle_children(node, level)
-          }
-        end
-      else
-        @buffer << "\n"
-      end
-    end
-
-    def handle_comment_node(node, level)
-      @buffer << indent(level)
-      @buffer << "comment "
-      @buffer << quote(node.text.strip)
-      @buffer << "\n"
-    end
-
-    def handle_children(node, level)
-      node.children.each do |child|
-        handle_node(child, level + 1)
-      end
-    end
-
-    def handle_attributes(node)
-      return "" if node.attributes.keys.none?
-
-      b = StringIO.new
-
-      node.attributes.each_value do |attribute|
-        b << attribute.name.gsub("-", "_")
-        b << ": "
-        b << double_quote(attribute.value)
-        b << ", " if node.attributes.values.last != attribute
-      end
-
-      if node.children.any?
-        "(#{b.string.strip}) "
-      else
-        " #{b.string.strip}"
-      end
-    end
-
-    def handle_node(node = parsed, level = 0)
-      case node
-      when Nokogiri::XML::Text
-        handle_text(node, level)
-      when Nokogiri::XML::Element
-        if erb_node?(node)
-          handle_erb_element(node, level)
-        else
-          handle_element(node, level)
-        end
-
-        @buffer << "\n" if level == 1
-      when Nokogiri::HTML4::DocumentFragment
-        handle_children(node, level)
-      when Nokogiri::XML::Comment
-        handle_comment_node(node, level)
-      else
-        @buffer << ("UNKNOWN#{node.class}")
-      end
-
-      @buffer.string
-    end
-
-    def parsed
-      @parsed ||= Nokogiri::HTML.fragment(minified_erb)
-    end
+    def initialize(source = nil, **options)
+      @custom_elements = Set.new
+      @options = Options.new(**options)
 
-    def buffer
-      Rufo::Formatter.format(@buffer.string.strip)
-    rescue Rufo::SyntaxError
-      @buffer.string.strip
+      call(source)
     end
 
-    def output
-      out = StringIO.new
-
-      if @options.fetch(:phlex_class, false)
-        component_name = @options.fetch(:component_name, "Component")
-        component_name = "A#{component_name}" if component_name[0] == "0" || component_name[0].to_i != 0
-
-        parent_component = @options.fetch(:parent_component, "Phlex::HTML")
-        parent_component = "A#{parent_component}" if parent_component[0] == "0" || parent_component[0].to_i != 0
-
-        out << "class #{component_name}"
-        out << "< #{parent_component}\n"
-
-        if locals.any?
-          out << indent(1)
-          out << "attr_accessor "
-          out << locals.sort.map { |local| ":#{local}" }.join(", ")
-          out << "\n\n"
-        end
-
-        @custom_elements.sort.each do |element|
-          out << indent(1)
-          out << "register_element :#{element}\n"
-        end
-
-        kwargs = Set.new(ivars + locals).sort
-
-        if kwargs.any?
-          out << indent(1)
-          out << "def initialize("
-          out << kwargs.map { |kwarg| "#{kwarg}: " }.join(", ")
-          out << ")\n"
-
-          kwargs.each do |dep|
-            out << indent(2)
-            out << "@#{dep} = #{dep}\n"
-          end
-
-          out << indent(1)
-          out << "end\n"
-        end
-
-        out << indent(1)
-        out << "def template\n"
-
-        out << indent(2)
-        out << @buffer.string
-
-        out << indent(1)
-        out << "end\n"
-        out << "end\n"
-      else
-        out << @buffer.string
-      end
-
-      Rufo::Formatter.format(out.string.strip)
-    rescue Rufo::SyntaxError
-      out.string.strip
+    def code
+      options.component? ? component_code : template_code
     end
 
-    def analyze_ruby
-      ruby_code = ErbParser.parse(html).tokens.map { |tag| tag.is_a?(ErbParser::ErbTag) && !tag.to_s.start_with?("<%#") ? tag.ruby_code.delete_prefix("=") : nil }.join("\n")
-      visitor = Phlexing::Visitor.new(self)
-      program = SyntaxTree.parse(ruby_code)
-      # puts program.construct_keys
-      visitor.visit(program)
-    rescue StandardError => e
-      puts e.inspect
-    end
+    # private
 
-    def converted_erb
-      ErbParser.transform_xml(html).gsub("\n", "").gsub("\r", "")
-    rescue StandardError
-      html
+    def template_code
+      TemplateGenerator.call(self, source)
     end
 
-    def minified_erb
-      HtmlPress.press(converted_erb)
-    rescue StandardError
-      converted_erb
+    def component_code
+      ComponentGenerator.call(self)
     end
   end
 end

data/lib/phlexing/erb_transformer.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "deface"
+
+module Phlexing
+  # Takes ERB and transforms it to Nokogiri-compatible HTML.
+  class ERBTransformer
+    def self.call(...)
+      new(...).call
+    end
+
+    def initialize(source)
+      @source = source.to_s.dup
+    end
+
+    def call
+      remove_newlines
+      strip_whitespace
+      transform_erb_tags
+      transform_template_tags
+
+      @source
+    end
+
+    private
+
+    def remove_newlines
+      @source.tr!("\n\r", "")
+    end
+
+    def strip_whitespace
+      @source.strip!
+    end
+
+    # Replace ERB tags with Nokogiri-compatible HTML.
+    def transform_erb_tags
+      @source = Deface::Parser.erb_markup!(@source)
+    end
+
+    # Phlex uses `template_tag` in place of `template` for `<template>` tags.
+    def transform_template_tags
+      @source.gsub!(/<template/i, "<template-tag")
+      @source.gsub!(%r{</template}i, "</template-tag")
+    end
+  end
+end