rblade 0.2.5 → 0.4.0

data/TODO.md

@@ -0,0 +1,2 @@
+Add @shouldRender? Or say you can use return (return _out) to exit early? @return? @exitComponent?
+

data/lib/rblade/compiler/compiles_components.rb

@@ -9,13 +9,13 @@ module RBlade
 
     def compile!(tokens)
       tokens.each do |token|
-        if [:component, :component_start, :component_end].none? token.type
+        if [:component, :component_start, :component_end, :component_unsafe_end].none? token.type
           next
         end
 
         token.value = if token.type == :component_start
           compile_token_start token
-        elsif token.type == :component_end
+        elsif token.type == :component_end || token.type == :component_unsafe_end
           compile_token_end token
         else
           compile_token_start(token) + compile_token_end(token)
@@ -30,11 +30,15 @@ module RBlade
 
       @component_stack << {
         name: token.value[:name],
-        attributes: token.value[:attributes],
         index: @component_count
       }
 
-      "_comp_#{@component_count}_swap=_out;_out='';"
+      attributes = compile_attributes token.value[:attributes]
+
+      code = "_c#{@component_count}_swap=_out;_out='';"
+      code << "_c#{@component_count}_attr={#{attributes.join(",")}};"
+
+      code
     end
 
     def compile_token_end token
@@ -42,72 +46,42 @@ module RBlade
       if component.nil?
         raise StandardError.new "Unexpected closing tag (#{token.value[:name]})"
       end
-      if token.value[:name] != component[:name]
+      if token.type == :component_end && token.value[:name] != component[:name]
         raise StandardError.new "Unexpected closing tag (#{token.value[:name]}) expecting #{component[:name]}"
       end
 
-      attributes = compile_attributes component[:attributes]
-
-      code = "def _component(slot,attributes);#{attributes[:assignments].join}_out='';"
-      code << "_stacks=[];"
-      code << "attributes=RBlade::AttributesManager.new(attributes);"
-      code << ComponentStore.fetchComponent(token.value[:name])
-      code << "RBlade::StackManager.get(_stacks) + _out;end;"
-      code << "_slot=_out;_out=_comp_#{component[:index]}_swap;"
-      code << "_out<<_component(_slot,{#{attributes[:arguments].join(",")}});"
+      code = "_slot=_out;_out=_c#{component[:index]}_swap;"
+      code << "_out<<#{ComponentStore.component(component[:name])}(_slot,_c#{component[:index]}_attr);"
+      code << "_slot=nil;_c#{component[:index]}_swap=nil;"
 
       code
     end
 
-    def compile_attributes attributes
-      attribute_arguments = []
-      attribute_assignments = []
-
-      attributes.each do |attribute|
-        if attribute[:type] == "class"
-          attribute_arguments.push "'class': RBlade::ClassManager.new(#{attribute[:value]})"
-          attribute_assignments.push "_class = attributes[:class];"
-
-          next
-        end
-        if attribute[:type] == "style"
-          attribute_arguments.push "'style': RBlade::StyleManager.new(#{attribute[:value]})"
-          attribute_assignments.push "_style = attributes[:style];"
-
-          next
-        end
-        if attribute[:type] == "attributes"
-          attribute_arguments.push "**(#{attribute[:value]}).to_h"
-
-          next
-        end
-
-        if attribute[:type] == "string"
-          attribute_arguments.push "'#{attribute[:name]}': '#{RBlade.escape_quotes(attribute[:value])}'"
-        end
-
-        if attribute[:type] == "ruby"
-          attribute_arguments.push "'#{attribute[:name]}': (#{attribute[:value]})"
-        end
-
-        if attribute[:type] == "pass_through"
-          attribute_arguments.push "#{attribute[:name]}:"
-        end
-
-        if attribute[:type] == "empty"
-          attribute_arguments.push "'#{attribute[:name]}': true"
-        end
-
-        variable_name = attribute[:name]&.tr("-", "_")
-        if !variable_name.nil? && variable_name.match(/^[A-Za-z_][A-Za-z0-9_]*$/)
-          keywords = %w[__FILE__ __LINE__ alias and begin BEGIN break case class def defined? do else elsif end END ensure false for if in module next nil not or redo rescue retry return self super then true undef unless until when while yield attributes _out slot]
-          next if keywords.include? variable_name
+    def get_method_name name
+      name.gsub(/[^a-zA-Z0-9_]/, "_")
+    end
 
-          attribute_assignments.push "#{variable_name} = attributes[:'#{attribute[:name]}'];"
+    def compile_attributes attributes
+      attributes.map do |attribute|
+        case attribute[:type]
+        when "class"
+          "'class': RBlade::ClassManager.new(#{attribute[:value]})"
+        when "style"
+          "'style': RBlade::StyleManager.new(#{attribute[:value]})"
+        when "attributes"
+          "**(#{attribute[:value]})"
+        when "string"
+          "'#{attribute[:name]}': '#{RBlade.escape_quotes(attribute[:value])}'"
+        when "ruby"
+          "'#{attribute[:name]}': (#{attribute[:value]})"
+        when "pass_through"
+          "#{attribute[:name]}:"
+        when "empty"
+          "'#{attribute[:name]}': true"
+        else
+          raise StandardError.new "Component compiler: unexpected attribute type (#{attribute[:type]})"
         end
       end
-
-      {arguments: attribute_arguments, assignments: attribute_assignments}
     end
   end
 end

data/lib/rblade/compiler/compiles_ruby.rb

@@ -11,7 +11,7 @@ module RBlade
           # <%% and %%> are escape ERB style tags
           (<%%)(.+?)(%%>)
           |
-          (?:^|[\b\s])(@ruby)\s+(.+?)[\s;]*(@endruby)(?:$|[\b\s])
+          \s?(?<!\w)(@ruby)\s+(.+?)[\s;]*(@endruby)(?!\w)\s?
           |
           (<%)\s+(.+?)[\s;]*(%>)
         /xm)

data/lib/rblade/compiler/compiles_statements.rb

@@ -1,6 +1,8 @@
 require "rblade/compiler/statements/compiles_conditionals"
+require "rblade/compiler/statements/compiles_html_attributes"
 require "rblade/compiler/statements/compiles_inline_ruby"
 require "rblade/compiler/statements/compiles_loops"
+require "rblade/compiler/statements/compiles_once"
 require "rblade/compiler/statements/compiles_props"
 require "rblade/compiler/statements/compiles_stacks"
 
@@ -43,7 +45,7 @@ module RBlade
     private
 
     def getHandler(name)
-      handler_class, handler_method = @@statement_handlers[name]
+      handler_class, handler_method = @@statement_handlers[name.tr("_", "").downcase]
 
       if !handler_class&.method_defined?(handler_method)
         raise StandardError.new "Unhandled statement: @#{name}"
@@ -65,6 +67,7 @@ module RBlade
       "breakif" => [CompilesLoops, :compileBreakIf],
       "case" => [CompilesConditionals, :compileCase],
       "checked" => [CompilesConditionals, :compileChecked],
+      "class" => [CompilesHtmlAttributes, :compileClass],
       "disabled" => [CompilesConditionals, :compileDisabled],
       "else" => [CompilesConditionals, :compileElse],
       "elsif" => [CompilesConditionals, :compileElsif],
@@ -75,27 +78,38 @@ module RBlade
       "endcase" => [CompilesStatements, :compileEnd],
       "endeach" => [CompilesStatements, :compileEnd],
       "endeachelse" => [CompilesStatements, :compileEnd],
+      "endenv" => [CompilesStatements, :compileEnd],
       "endfor" => [CompilesStatements, :compileEnd],
       "endforelse" => [CompilesStatements, :compileEnd],
       "endif" => [CompilesStatements, :compileEnd],
+      "endonce" => [CompilesStatements, :compileEnd],
       "endprepend" => [CompilesStacks, :compileEndPrepend],
+      "endprependonce" => [CompilesOnce, :compileEndPrependOnce],
+      "endproduction" => [CompilesStatements, :compileEnd],
       "endpush" => [CompilesStacks, :compileEndPush],
+      "endpushonce" => [CompilesOnce, :compileEndPushOnce],
       "endunless" => [CompilesStatements, :compileEnd],
       "enduntil" => [CompilesStatements, :compileEnd],
       "endwhile" => [CompilesStatements, :compileEnd],
+      "env" => [CompilesConditionals, :compileEnv],
       "for" => [CompilesLoops, :compileFor],
       "forelse" => [CompilesLoops, :compileForElse],
       "if" => [CompilesConditionals, :compileIf],
       "next" => [CompilesLoops, :compileNext],
       "nextif" => [CompilesLoops, :compileNextIf],
+      "once" => [CompilesOnce, :compileOnce],
       "prepend" => [CompilesStacks, :compilePrepend],
+      "prependonce" => [CompilesOnce, :compilePrependOnce],
+      "production" => [CompilesConditionals, :compileProduction],
       "props" => [CompilesProps, :compileProps],
       "push" => [CompilesStacks, :compilePush],
+      "pushonce" => [CompilesOnce, :compilePushOnce],
       "readonly" => [CompilesConditionals, :compileReadonly],
       "required" => [CompilesConditionals, :compileRequired],
       "ruby" => [CompilesInlineRuby, :compile],
       "selected" => [CompilesConditionals, :compileSelected],
       "stack" => [CompilesStacks, :compileStack],
+      "style" => [CompilesHtmlAttributes, :compileStyle],
       "unless" => [CompilesConditionals, :compileUnless],
       "until" => [CompilesLoops, :compileUntil],
       "when" => [CompilesConditionals, :compileWhen],

data/lib/rblade/compiler/compiles_verbatim.rb

@@ -0,0 +1,29 @@
+module RBlade
+  class CompilesVerbatim
+    def compile!(tokens)
+      tokens.map! do |token|
+        next(token) if token.type != :unprocessed
+
+        segments = token.value.split(/\s?(?<!\w)(@verbatim)(?!\w)\s?(.+?)\s?(?<!\w)@end_?verbatim(?!\w)\s?/mi)
+
+        i = 0
+        while i < segments.count
+          if segments[i] == "@verbatim"
+            segments.delete_at i
+            segments[i] = Token.new(type: :raw_text, value: segments[i])
+
+            i += 1
+          elsif !segments[i].nil? && segments[i] != ""
+            segments[i] = Token.new(type: :unprocessed, value: segments[i])
+
+            i += 1
+          else
+            segments.delete_at i
+          end
+        end
+
+        segments
+      end.flatten!
+    end
+  end
+end

data/lib/rblade/compiler/statements/compiles_conditionals.rb

@@ -88,6 +88,32 @@ module RBlade
 
         "if #{args[0]};_out<<'selected';end;"
       end
+
+      def compileEnv args
+        if args&.count != 1
+          raise StandardError.new "Env statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        end
+
+        environments = args[0].strip
+
+        "if Array.wrap(#{environments}).include?(Rails.env);"
+      end
+
+      def compileProduction args
+        unless args.nil?
+          raise StandardError.new "Production statement: wrong number of arguments (given #{args.count}, expecting 1)"
+        end
+
+        "if Rails.env.production?;"
+      end
+
+      def compileOnce args
+        if args&.count&.> 1
+          raise StandardError.new "Production statement: wrong number of arguments (given #{args.count}, expecting 0 or 1)"
+        end
+
+        args[0].nil? ? "" : args[0]
+      end
     end
   end
 end

data/lib/rblade/compiler/statements/compiles_html_attributes.rb

@@ -0,0 +1,21 @@
+module RBlade
+  class CompilesStatements
+    class CompilesHtmlAttributes
+      def compileClass args
+        if args&.count != 1
+          raise StandardError.new "Class statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        end
+
+        "_out<<'class=\"'<<RBlade::ClassManager.new(#{args[0]})<<'\"';"
+      end
+
+      def compileStyle args
+        if args&.count != 1
+          raise StandardError.new "Style statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        end
+
+        "_out<<'style=\"'<<RBlade::StyleManager.new(#{args[0]})<<'\"';"
+      end
+    end
+  end
+end

data/lib/rblade/compiler/statements/compiles_loops.rb

@@ -6,40 +6,40 @@ module RBlade
       end
 
       def compileBreak args
-        if !args.nil?
-          raise StandardError.new "Break statement: wrong number of arguments (given #{args&.count}, expecting 0)"
+        if args&.count&.> 1
+          raise StandardError.new "Break statement: wrong number of arguments (given #{args&.count}, expecting 0 or 1)"
         end
 
-        "break;"
-      end
-
-      def compileBreakIf args
-        if args&.count != 1
-          raise StandardError.new "Break statement: wrong number of arguments (given #{args&.count}, expecting 1)"
+        if args.nil?
+          "break;"
+        else
+          "if #{args[0]};break;end;"
         end
-
-        "if #{args[0]};break;end;"
       end
 
       def compileEach args
-        if args&.count != 1
+        if args.nil? || args.count > 2
           raise StandardError.new "Each statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
+        # Allow variables to be a key, value pair
+        args = args.join ","
 
-        variables, collection = args[0].split(" in ")
+        variables, collection = args.split(" in ")
 
         "#{collection}.each do |#{variables}|;"
       end
 
       def compileEachElse args
-        if args&.count != 1
-          raise StandardError.new "Each else statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        if args.nil? || args.count > 2
+          raise StandardError.new "Each statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
+        # Allow variables to be a key, value pair
+        args = args.join ","
         @loop_else_counter += 1
 
-        variables, collection = args[0].split(" in ")
+        variables, collection = args.split(" in ")
 
-        "_looped_#{@loop_else_counter}=true;#{collection}.each do |#{variables}|;_looped_#{@loop_else_counter}=false;"
+        "_looped_#{@loop_else_counter}=false;#{collection}.each do |#{variables}|;_looped_#{@loop_else_counter}=true;"
       end
 
       def compileFor args
@@ -56,13 +56,13 @@ module RBlade
         end
         @loop_else_counter += 1
 
-        "_looped_#{@loop_else_counter}=true;for #{args[0]};_looped_#{@loop_else_counter}=false;"
+        "_looped_#{@loop_else_counter}=false;for #{args[0]};_looped_#{@loop_else_counter}=true;"
       end
 
       def compileEmpty
         @loop_else_counter -= 1
 
-        "end;if _looped_#{@loop_else_counter + 1};"
+        "end;if !_looped_#{@loop_else_counter + 1};"
       end
 
       def compileNext args
@@ -73,19 +73,7 @@ module RBlade
         if args.nil?
           "next;"
         else
-          "next #{args[0]};"
-        end
-      end
-
-      def compileNextIf args
-        if args.nil? || args.count > 2
-          raise StandardError.new "For statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
-        end
-
-        if args.count == 1
           "if #{args[0]};next;end;"
-        else
-          "if #{args[0]};next #{args[1]};end;"
         end
       end
 

data/lib/rblade/compiler/statements/compiles_once.rb

@@ -0,0 +1,57 @@
+module RBlade
+  class CompilesStatements
+    class CompilesOnce
+      def initialize
+        @once_counter = 0
+      end
+
+      def compileOnce args
+        if args&.count&.> 1
+          raise StandardError.new "Once statement: wrong number of arguments (given #{args.count}, expecting 0 or 1)"
+        end
+
+        once_id = args.nil? ? ":_#{@once_counter += 1}" : args[0]
+
+        "unless $_once_tokens.include? #{once_id};$_once_tokens<<#{once_id};"
+      end
+
+      def compilePushOnce args
+        if args&.count != 1 && args&.count != 2
+          raise StandardError.new "Push once statement: wrong number of arguments (given #{args.count}, expecting 1 or 2)"
+        end
+        @once_counter += 1
+        once_id = args[1].nil? ? ":_#{@once_counter}" : args[1]
+
+        "unless $_once_tokens.include? #{once_id};$_once_tokens<<#{once_id};" \
+          << "_p1_#{@once_counter}=#{args[0]};_p1_#{@once_counter}_b=_out;_out='';"
+      end
+
+      def compileEndPushOnce args
+        if !args.nil?
+          raise StandardError.new "End push once statement: wrong number of arguments (given #{args&.count}, expecting 0)"
+        end
+
+        "RBlade::StackManager.push(_p1_#{@once_counter}, _out);_out=_p1_#{@once_counter}_b;end;"
+      end
+
+      def compilePrependOnce args
+        if args&.count != 1 && args&.count != 2
+          raise StandardError.new "Prepend once statement: wrong number of arguments (given #{args.count}, expecting 1 or 2)"
+        end
+        @once_counter += 1
+        once_id = args[1].nil? ? ":_#{@once_counter}" : args[1]
+
+        "unless $_once_tokens.include? #{once_id};$_once_tokens<<#{once_id};" \
+          << "_p1_#{@once_counter}=#{args[0]};_p1_#{@once_counter}_b=_out;_out='';"
+      end
+
+      def compileEndPrependOnce args
+        if !args.nil?
+          raise StandardError.new "End prepend once statement: wrong number of arguments (given #{args&.count}, expecting 0)"
+        end
+
+        "RBlade::StackManager.prepend(_p1_#{@once_counter}, _out);_out=_p1_#{@once_counter}_b;end;"
+      end
+    end
+  end
+end

data/lib/rblade/compiler/statements/compiles_props.rb

@@ -11,9 +11,9 @@ module RBlade
         props = extractProps args[0]
         props.map do |key, value|
           if value == "_required"
-            "if !defined?(#{key})&&!attributes.has?(:'#{RBlade::escape_quotes(key)}');raise \"Props statement: #{key} is not defined\";end;#{key.sub /[^a-zA-Z0-9_]/, '_'}=attributes.default(:'#{RBlade::escape_quotes(key)}');"
+            "if !defined?(#{key})&&!attributes.has?(:'#{RBlade.escape_quotes(key)}');raise \"Props statement: #{key} is not defined\";end;#{key.sub(/[^a-zA-Z0-9_]/, "_")}=attributes.default(:'#{RBlade.escape_quotes(key)}');"
           else
-            "#{key.sub /[^a-zA-Z0-9_]/, '_'}=attributes.default(:'#{RBlade::escape_quotes(key)}',#{value});"
+            "#{key.sub(/[^a-zA-Z0-9_]/, "_")}=attributes.default(:'#{RBlade.escape_quotes(key)}',#{value});"
           end
         end.join
       end

data/lib/rblade/compiler/statements/compiles_stacks.rb

@@ -23,7 +23,7 @@ module RBlade
         else
           @push_counter += 1
 
-          "_push_#{@push_counter}_name=#{args[0]};_push_#{@push_counter}_buffer=_out;_out='';"
+          "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out='';"
         end
       end
 
@@ -34,7 +34,7 @@ module RBlade
 
         @push_counter -= 1
 
-        "RBlade::StackManager.prepend(_push_#{@push_counter + 1}_name, _out);_out=_push_#{@push_counter + 1}_buffer;"
+        "RBlade::StackManager.prepend(_p_#{@push_counter + 1}, _out);_out=_p_#{@push_counter + 1}_b;"
       end
 
       def compilePush args
@@ -47,7 +47,7 @@ module RBlade
         else
           @push_counter += 1
 
-          "_push_#{@push_counter}_name=#{args[0]};_push_#{@push_counter}_buffer=_out;_out='';"
+          "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out='';"
         end
       end
 
@@ -58,7 +58,7 @@ module RBlade
 
         @push_counter -= 1
 
-        "RBlade::StackManager.push(_push_#{@push_counter + 1}_name, _out);_out=_push_#{@push_counter + 1}_buffer;"
+        "RBlade::StackManager.push(_p_#{@push_counter + 1}, _out);_out=_p_#{@push_counter + 1}_b;"
       end
     end
   end

data/lib/rblade/compiler/tokenizes_components.rb

@@ -6,7 +6,7 @@ module RBlade
       tokens.map! do |token|
         next(token) if token.type != :unprocessed
 
-        segments = tokenizeComponentOpeningTags token.value
+        segments = tokenizeComponentTags token.value
 
         i = 0
         while i < segments.count
@@ -15,6 +15,9 @@ module RBlade
 
             segments.delete_at i + 1
             i += 1
+          elsif segments[i] == "<//>"
+            segments[i] = Token.new(type: :component_unsafe_end)
+            i += 1
           elsif segments[i] == "<" && segments[i + 1]&.match(/x[-:]/)
             name = segments[i + 1][2..]
             raw_attributes = (segments[i + 2] != ">") ? tokenizeAttributes(segments[i + 2]) : nil
@@ -97,7 +100,7 @@ module RBlade
       attributes
     end
 
-    def tokenizeComponentOpeningTags value
+    def tokenizeComponentTags value
       value.split(%r/
         # Opening and self-closing tags
         (?:
@@ -147,6 +150,8 @@ module RBlade
             \s*
           >
         )
+        |
+        (<\/\/>)
       /xm)
     end
 

data/lib/rblade/compiler/tokenizes_statements.rb

@@ -8,12 +8,23 @@ module RBlade
         next(token) if token.type != :unprocessed
 
         segments = token.value.split(/
-          (?:^|[\b\s])
-          (@@?)
-          (\w+(?:::\w+)?)
-          (?:[ \t]*
-            (\(.*?\))
-          )?/mx)
+          \s?(?<!\w)
+          (?:
+            (?:
+              (@@)
+              (\w+(?!\w))
+            )
+            |
+            (?:
+              (@)
+              (\w+(?!\w))
+              (?:[ \t]*
+                (\(.*?\))
+              )?
+            )
+          )
+          \s?
+        /mx)
 
         parseSegments! segments
       end.flatten!
@@ -35,11 +46,6 @@ module RBlade
         elsif segment == "@"
           tokenizeStatement! segments, i
 
-          # Remove trailing whitespace if it exists, but don't double dip when another statement follows
-          if !segments[i + 1].nil? && segments[i + 1].match(/^\s/) && (segments[i + 1].length > 1 || segments[i + 2].nil?)
-            segments[i + 1].slice! 0, 1
-          end
-
           i += 1
         elsif !segments[i].nil? && segments[i] != ""
           segments[i] = Token.new(type: :unprocessed, value: segments[i])

data/lib/rblade/compiler.rb

@@ -2,6 +2,7 @@ require "rblade/compiler/compiles_comments"
 require "rblade/compiler/compiles_components"
 require "rblade/compiler/compiles_echos"
 require "rblade/compiler/compiles_ruby"
+require "rblade/compiler/compiles_verbatim"
 require "rblade/compiler/compiles_statements"
 require "rblade/compiler/tokenizes_components"
 require "rblade/compiler/tokenizes_statements"
@@ -22,6 +23,7 @@ module RBlade
     def self.compileString(string_template)
       tokens = [Token.new(:unprocessed, string_template)]
 
+      CompilesVerbatim.new.compile! tokens
       CompilesComments.new.compile! tokens
       CompilesRuby.new.compile! tokens
       TokenizesComponents.new.tokenize! tokens
@@ -36,8 +38,8 @@ module RBlade
     def self.compileAttributeString(string_template)
       tokens = [Token.new(:unprocessed, string_template)]
 
-      CompilesRuby.compile! tokens
       CompilesComments.compile!(tokens)
+      CompilesRuby.compile! tokens
       CompilesEchos.compile!(tokens)
 
       compileTokens tokens