ejx 1.0 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dc481f36010e82885f2b6ea60a4f13bb4e6c9c4b823ee6899fd02ce12650942
-  data.tar.gz: 7262002c9a7cb0b3ce87def1d77911e45d6a3e85dde2ae4bfe3fa41aff0f7741
+  metadata.gz: 2cb0b12e342368966d44f7738cff85dd83ce6af48f691885cd231d77090127df
+  data.tar.gz: 271e81bf0e111b4f0846dff9dfea6cf03422e223b712b1f14459f2f0539081e9
 SHA512:
-  metadata.gz: 58f1139b43dcf0205a43619b0f167460d27bd5a75b1708cb4b9497887b8696c7aa5489df61ac89da4e17b3df22a460d3b9fa4ca2f8ce2e5ed6b5fa6c30ca41a4
-  data.tar.gz: 8cd338246eb063e0156504252c83216fc003f507af94655b3f383984e98831ff5e01ddcc669d6c80e85fa84b8a47888170c97e1ccf11e28b0a80be6f23606142
+  metadata.gz: 8361e0271745451e9daa3c9638e019ba75c46eebd9be260be58286233d1340eb32fab7e6a73f79591d067a13d85545fe86ec6298246f315174ffab6e8b811fdb
+  data.tar.gz: b2fe93fd63d2d2096f5c2c9b4d482f03fef1bd89b525c5b68d3f127b6762f9beb4735d0d26ad10b51e489a27a5133a3f022c8bd802ca09c763518d4deb343dd5

data/lib/ejx/assets/ejx.js

@@ -1,47 +1,77 @@
+function insertBefore(el, items) {
+    items.forEach((i) => {
+        if ( Array.isArray(i) ) {
+            insertBefore(el, i);
+        } else if (i instanceof Element) {
+            el.insertAdjacentElement('beforebegin', i);
+        } else if (i instanceof Node) {
+            el.parentNode.insertBefore(i, el)
+        } else {
+            el.insertAdjacentText('beforebegin', i);
+        }
+    });
+}
+
 function repalceejx(el, withItems) {
-  if ( Array.isArray(withItems) ) {
-    withItems.forEach((i) => {
-      if (i instanceof Node) {
-        el.insertAdjacentElement('beforebegin', i)
-      } else {
-        // el.insertAdjacentHTML()
-        el.insertAdjacentText('beforebegin', i)
-      }
-    })
-    el.remove();
-  } else {
-    el.replaceWith(withItems);
-  }
+    if ( Array.isArray(withItems) ) {
+        insertBefore(el, withItems);
+        el.remove();
+    } else {
+        el.replaceWith(withItems);
+    }
 }
 
-export function append(items, to, escape, promises, promiseResults) {
-  if ( Array.isArray(items) ) {
-    items.forEach((i) => append(i, to, escape, promises));
-  } else {
+function placehold(promise, to, promises) {
+    const placeholder = document.createElement( "div");
+    to[Array.isArray(to) ? 'push' : 'append'](placeholder);
+    
+    var newPromise = promise.then((resolvedItems) => {
+        if (resolvedItems !== undefined) {
+            if (placeholder.parentElement) {
+                repalceejx(placeholder, resolvedItems || "");
+            } else if (Array.isArray(resolvedItems)) {
+                to.splice(to.indexOf(placeholder), 1, ...resolvedItems);
+            } else {
+                to.splice(to.indexOf(placeholder), 1, resolvedItems);
+            }
+        } else {
+            if (placeholder.parentElement) {
+                placeholder.remove();
+            } else {
+                to.splice(to.indexOf(placeholder), 1);
+            }
+        }
+        return resolvedItems;
+    });
+    promises.push(newPromise);
+    return newPromise;
+}
+
+export function append(items, to, appendMode, promises, awaiter, marker) {
+    if (awaiter instanceof Promise) {
+        return placehold(awaiter, to, promises);
+    }
+
+
+    if ( Array.isArray(items) ) {
+        return items.map((i) => append(i, to, appendMode, promises));
+    }
+    
     let method = Array.isArray(to) ? 'push' : 'append';
-    if (items instanceof Promise) {
-      let holder = document.createElement( "div");
-      to[method](holder);
-      promises.push( items.then((resolvedItems) => {
-          if(holder.parentElement) {
-            repalceejx(holder, resolvedItems || promiseResults.flat())
-          } else if (Array.isArray(resolvedItems)) {
-            to.splice(to.indexOf(holder), 1, ...resolvedItems)
-          } else {
-            to.splice(to.indexOf(holder), 1, resolvedItems)
-          }
-      }));
-    } else if (typeof items === 'string') {
-      if (escape) {
-        to[method](items);
-      } else {
-        var container = document.createElement(Array.isArray(to) ? 'div' : to.tagName);
-        container.innerHTML = items;
-        to[method](...container.childNodes);
-      }
+    
+    if (items instanceof Promise || (items && items.then)) {
+        return placehold(items, to, promises);
+    }
+    
+    if (typeof items === 'string') {
+        if (appendMode === 'escape') {
+            to[method](items);
+        } else {
+            var container = document.createElement(Array.isArray(to) ? 'div' : to.tagName);
+            container.innerHTML = items;
+            to[method](...container.childNodes);
+        }
     } else {
-      to[method](items);
+        to[method](items);
     }
-
-  }
 }

data/lib/ejx/template/balance_scanner.rb

@@ -0,0 +1,32 @@
+class EJX::Template::BalanceScanner
+  include StreamParser
+
+  BALANCE = {
+    "}" => "{",
+    ")" => "(",
+    "{" => "}",
+    "(" => ")",
+  }
+    
+  def parse(stack = [])
+    while !eos?
+      if match = scan_until(/[\(\)\{\}\"\'\`]/)
+        case match[0]
+        when "}", ")"
+          if stack.last == BALANCE[match[0]]
+            stack.pop
+          else
+            stack << match[0]
+          end
+        when "\"", "'", "`"
+          quoted_value(match[0])
+        else
+          stack << match[0]
+        end
+      end
+    end
+    
+    stack
+  end
+
+end

data/lib/ejx/template/base.rb

@@ -1,13 +1,12 @@
-class EJX::Template::Base
+class EJX::Template::Base < EJX::Template::Node
   
-  attr_accessor :children, :imports
-
-  def initialize(escape: nil)
-    @children = []
-    @escape = escape
+  attr_accessor :imports
+  
+  def initialize(**options)
+    super
     @imports = []
   end
-
+  
   def to_module
     var_generator = EJX::Template::VarGenerator.new
     
@@ -32,9 +31,12 @@ class EJX::Template::Base
         child.to_js(var_generator: var_generator)
       end
     end
-    output << "\n    await Promise.all(__promises);\n"
-    output << "    return __output;\n"
-    output << "}"
+    
+    output << "\n    await Promise.all(__promises);"
+
+    output << "\n    return __output;"
+    output << "\n}"
+
     output
   end
 

data/lib/ejx/template/html_comment.rb

@@ -0,0 +1,19 @@
+class EJX::Template::HTMLComment
+
+  def initialize(comment)
+    @comment = comment
+  end
+
+  def to_s
+    @comment
+  end
+
+  def inspect
+    "#<EJX::HTMLComment:#{self.object_id} @comment=#{@comment}>"
+  end
+
+  def to_js(append: "__output", var_generator:, indentation: 4, namespace: nil)
+    "#{' '*indentation}#{append}.push(document.createComment(#{JSON.generate(@comment)}));\n"
+  end
+  
+end

data/lib/ejx/template/html_tag.rb

@@ -1,12 +1,12 @@
-class EJX::Template::HTMLTag
+class EJX::Template::HTMLTag < EJX::Template::Node
 
   autoload :AttributeValue, File.expand_path('../html_tag/attribute_value', __FILE__)
   
-  attr_accessor :tag_name, :attrs, :children, :namespace
+  attr_accessor :tag_name, :attrs, :namespace
 
   def initialize
+    super
     @attrs = []
-    @children = []
   end
 
   def to_s
@@ -16,8 +16,8 @@ class EJX::Template::HTMLTag
   def inspect
     "#<EJX::HTMLTag:#{self.object_id} @tag_name=#{tag_name}>"
   end
-
-  def to_js(append: "__output", var_generator:, indentation: 4, namespace: nil)
+  
+  def to_js(append: "__output", var_generator:, indentation: 4, namespace: nil, promises: '__promises')
     namespace ||= self.namespace
     
     output_var = var_generator.next
@@ -40,15 +40,15 @@ class EJX::Template::HTMLTag
 
     @children.each do |child|
       js << if child.is_a?(EJX::Template::String)
-        "#{' '*indentation}__ejx_append(#{child.to_js}, #{output_var}, false, __promises);\n"
+        "#{' '*indentation}__ejx_append(#{child.to_js}, #{output_var}, 'unescape', #{promises});\n"
       elsif child.is_a?(EJX::Template::HTMLTag)
-        child.to_js(var_generator: var_generator, indentation: indentation, append: output_var, namespace: namespace)
+        child.to_js(var_generator: var_generator, indentation: indentation, append: output_var, namespace: namespace, promises: promises)
       else
-        child.to_js(var_generator: var_generator, indentation: indentation, append: output_var)
+        child.to_js(var_generator: var_generator, indentation: indentation, append: output_var, promises: promises)
       end
     end
 
-    js << "#{' '*indentation}__ejx_append(#{output_var}, #{append}, false, __promises);\n"
+    js << "#{' '*indentation}__ejx_append(#{output_var}, #{append}, 'unescape', #{promises});\n"
     js
   end
   

data/lib/ejx/template/js.rb

@@ -7,14 +7,20 @@ class EJX::Template::JS
     @value = value
   end
 
-  def to_js(indentation: 4, var_generator: nil, append: "__output")
+  def to_js(indentation: 4, var_generator: nil, append: "__output", promises: '__promises')
     output = @value
     
     if @modifiers.include? :escape
-      "#{' '*indentation}__ejx_append(#{output}, #{append}, true, __promises);\n"
+      if output =~ /\A\s*(var|const|let)\s+(\S+)/
+        "#{' '*indentation}#{output}#{output.strip.end_with?(';') ? '' : ';'}\n#{' '*indentation}__ejx_append(#{$2}, #{append}, 'escape', #{promises});\n"
+      else
+        "#{' '*indentation}__ejx_append(#{output.gsub(/;\s*\Z/, '')}, #{append}, 'escape', #{promises});\n"
+      end
     elsif @modifiers.include? :unescape
-      "#{' '*indentation}__ejx_append(#{output}, #{append}, false, __promises);\n"
-    elsif !@modifiers.include? :comment
+      "#{' '*indentation}__ejx_append(#{output.gsub(/;\s*\Z/, '')}, #{append}, 'unescape', #{promises});\n"
+    elsif @modifiers.include? :comment
+      "#{' '*indentation}#{output.index("\n").nil? ? "// #{output}" : "/* #{output.gsub(/\n\s+/, "\n"+(' '*indentation)+"   ")} */"}\n"
+    else
       "#{' '*indentation}#{output}\n"
     end
   end

data/lib/ejx/template/multitemplate.rb

@@ -0,0 +1,37 @@
+class EJX::Template::Multitemplate < EJX::Template::Subtemplate
+
+  def to_js(indentation: 4, var_generator: nil, append: "__output", promises: '__promises')
+    already_assigned = @children.first =~ /\A\s*(var|const|let)\s+(\S+)/
+    output_var = $2
+    output = ""
+    if already_assigned# || !@append
+      output << "#{' '*indentation}#{@children.first}\n"
+    else
+      output << "#{' '*indentation}__ejx_append("
+      output << @children.first << "\n"
+    end
+    
+    @children[1..-2].each do |child|
+      output << case child
+      when EJX::Template::String
+        "#{' '*(indentation+4)}__ejx_append(#{child.to_js}, #{append}, 'unescape', __promises);\n"
+      when String
+        "#{' '*(indentation)}#{child}\n"
+      when EJX::Template::Subtemplate
+        child.to_sub_js(indentation: indentation + 4, var_generator: var_generator, promises: promises)
+      else
+        child.to_js(indentation: indentation + 4, var_generator: var_generator, append: append)
+      end
+    end
+    
+    output << ' '*indentation << @children.last.strip.delete_suffix(';')
+    if already_assigned
+      output << ";\n#{' '*indentation}__ejx_append(#{output_var}, #{append}, 'escape', __promises);\n"
+    else
+      output << ", #{append}, 'escape', __promises);\n"
+    end
+
+    output
+  end
+
+end

data/lib/ejx/template/node.rb

@@ -0,0 +1,17 @@
+class EJX::Template::Node
+
+  attr_accessor :children
+
+  def initialize(escape: nil)
+    @children = []
+    @escape = escape
+  end
+
+  def push(*values)
+    @children.push(*values)
+    self
+  end
+
+  alias_method :<<, :push
+
+end

data/lib/ejx/template/subtemplate.rb

@@ -1,34 +1,175 @@
-class EJX::Template::Subtemplate
+class EJX::Template::Subtemplate < EJX::Template::Node
 
-  attr_reader :children
+  attr_reader :modifiers
   
-  def initialize(opening, modifiers)
+  [:assigned_to_variable, :async, :append].each do |fn_name|
+    attr_reader fn_name
+    define_method(:"#{fn_name}?", instance_method(fn_name))
+  end
+  
+  def function?
+    !!@function_type
+  end
+  
+  def arrow_function?
+    @function_type == :arrow
+  end
+  
+  def initialize(opening, modifiers, append: true)
     @children = [opening]
     @modifiers = modifiers
+    @append = append
+    @balance_stack = opening ? EJX::Template::BalanceScanner.parse(opening) : []
+    
+    @assigned_to_variable = @children.first&.match(/\A\s*(var|const|let)\s+(\S+)/)&.send(:[], 2)
+    @async = false
+    
+    if match = @children.first&.match(/(?:async\s+)?function(:?\s+\w+)?\s*\([^\)]*\)\s*\{\s*\Z/m)
+      @function_type = :regular
+      @async = match[0].start_with?('async')
+      @assigned_to_variable = true if !match[1].nil?
+    elsif match = @children.first&.match(/(?:async)?(?:\s*\([^\)\(]*\)|(?:(?<=\()|\s+)[^\(\s]+)?\s*=>\s*\{\s*\Z/m)
+      @function_type = :arrow
+      @async = match[0].start_with?('async')
+    end
   end
+  
+  def push(*values)
+    values.each do |value|
+      case value
+      when EJX::Template::JS
+        EJX::Template::BalanceScanner.parse(value.value, @balance_stack)
+      when String
+        EJX::Template::BalanceScanner.parse(value, @balance_stack)
+      end
+    end
+    
+    super
+  end
+
+  def balanced?
+    @balance_stack.empty?
+  end
+  
+  def balance
+    @balance_stack
+  end
+  
+  def ending_balance
+    @balance_stack.reverse.map { |i| EJX::Template::BalanceScanner::BALANCE[i] }
+  end
+
+  def to_js(indentation: 4, var_generator: nil, append: "__output", promises: '__promises')
+    output = ''
 
-  def to_js(indentation: 4, var_generator: nil, append: "__output")
-    global_output_var = var_generator.next
+    global_output_var = var_generator.next if !assigned_to_variable?
+    sub_global_output_var = var_generator.next
     output_var = var_generator.next
-    
-    output =  "#{' '*indentation}var #{global_output_var} = [];\n"
-    output << "#{' '*indentation}__ejx_append("
-    output << @children.first << "\n"
+
+    if assigned_to_variable?
+      output << "#{' '*indentation}#{@children.first}\n"
+      output << "#{' '*(indentation+4)}var #{sub_global_output_var}_promises = [];\n"
+    elsif !(@modifiers & [:escape, :unescape]).empty?
+      output << "#{' '*indentation}var #{global_output_var}_result = #{@children.first}\n"
+      output << "#{' '*(indentation+4)}var #{sub_global_output_var}_promises = [];\n"
+    else
+      output << <<~JS.gsub(/\n+\Z/, '')
+        #{' '*(indentation)}var #{global_output_var}_results = [];
+        #{' '*(indentation)}var #{global_output_var}_promises = [];
+        #{' '*(indentation)}var #{global_output_var}_result = 
+      JS
+      
+      indentation += 4
+      output << if arrow_function?
+        @children.first.sub(/((?:async)?(?:\s*\([^\)\(]*\)|(?:(?<=\()|\s+)[^\(\s]+)?\s*=>\s*\{\s*)\Z/m, <<~JS)
+          (...__args) => {
+          #{' '*(indentation)}var #{sub_global_output_var}_results = [];
+          #{' '*(indentation)}var #{sub_global_output_var}_promises = [];
+          #{' '*(indentation)}var #{sub_global_output_var}_result = (\\1
+        JS
+      else
+        @children.first.sub(/((?:async\s+)?\s*function\s*\([^\)\(]*\)\s*\{\s*)\Z/m, <<~JS)
+          (...__args) => {
+          #{' '*(indentation)}var #{sub_global_output_var}_results = [];
+          #{' '*(indentation)}var #{sub_global_output_var}_promises = [];
+          #{' '*(indentation)}var #{sub_global_output_var}_result = (\\1
+        JS
+      end
+    end
+
     output << "#{' '*(indentation+4)}var #{output_var} = [];\n"
     
     @children[1..-2].each do |child|
+      promise_var = "#{sub_global_output_var}_promises"
       output << case child
       when EJX::Template::String
-        "#{' '*(indentation+4)}__ejx_append(#{child.to_js}, #{output_var}, false, __promises);\n"
+        "#{' '*(indentation+4)}__ejx_append(#{child.to_js}, #{output_var}, 'unescape', #{promise_var});\n"
       else
-        child.to_js(indentation: indentation + 4, var_generator: var_generator, append: output_var)
+        child.to_js(indentation: indentation + 4, var_generator: var_generator, append: output_var, promises: promise_var)
       end
     end
+
+    if !assigned_to_variable? && (@modifiers & [:escape, :unescape]).empty?
+      output << ' '*(indentation+4) << "#{sub_global_output_var}_results.push(#{output_var});\n"
+    end
+
+    if async?
+      output << ' '*(indentation+4) << "await Promise.all(#{sub_global_output_var}_promises);\n"
+      output << ' '*(indentation+4) << "return #{output_var};\n";
+    elsif assigned_to_variable?
+      output << ' '*(indentation+4)
+      output << "return #{sub_global_output_var}_promises.length === 0 ? #{output_var} : Promise.all(#{sub_global_output_var}_promises).then(() => #{output_var});\n"
+    else
+      output << ' '*(indentation+4) << "return Promise.all(#{sub_global_output_var}_promises).then(() => #{output_var});\n"
+    end
+
+    output << ' '*((@modifiers & [:escape, :unescape]).empty? ? indentation : indentation-4)
+
+    split = @children.last.strip.delete_suffix(';').split(/\}/, 2)
+    output << split[0]
+      
+    if !assigned_to_variable? && (@modifiers & [:escape, :unescape]).empty?
+      output << "})(...__args);\n"
+      output << "#{' '*indentation}__ejx_append(#{sub_global_output_var}_results, #{global_output_var}_results, 'escape', #{global_output_var}_promises, #{sub_global_output_var}_result);\n"
+      output << ' '*(indentation) << "return #{sub_global_output_var}_result;\n"
+      output << ' '*(indentation-4) << "}" << split[1]
+    else
+      output << ' '*(indentation-4) << "}" << split[1]
+    end
+    indentation = indentation - 4
     
-    output << ' '*(indentation+4) << "#{global_output_var}.push(#{output_var});\n";
-    output << ' '*(indentation+4) << "return #{output_var};\n";
-    output << ' '*indentation << @children.last.strip.delete_suffix(';')
-    output << ", #{append}, true, __promises, #{global_output_var});\n"
+    if assigned_to_variable?
+      output << ";\n"
+      if !(@modifiers & [:escape, :unescape]).empty?
+        output << "#{' '*indentation}__ejx_append(#{@assigned_to_variable}, #{append}, 'escape', #{promises});\n"
+      end
+    else
+      output << ";\n"
+      if !(@modifiers & [:escape, :unescape]).empty?
+        output << "#{' '*(indentation+4)}__ejx_append(#{global_output_var}_result, #{append}, 'escape', #{promises});\n"
+      else
+        output << "#{' '*indentation}__ejx_append(#{global_output_var}_results.flat(1), #{append}, 'escape', #{promises}, "
+        output << "(#{global_output_var}_result instanceof Promise) ? #{global_output_var}_result.then(() => Promise.all(#{global_output_var}_promises).then(r => r.flat(1))) : Promise.all(#{global_output_var}_promises).then(r => r.flat(1)));\n"
+      end
+    end
+
+    output
+  end
+  
+  def to_sub_js(indentation: 4, var_generator: nil, promises: '__promises')
+    output_var = var_generator.next
+    
+    output = "#{' '*(indentation)}var #{output_var} = [];\n"
+
+    @children[1..-1].each do |child|
+      output << case child
+      when EJX::Template::String
+        "#{' '*(indentation)}__ejx_append(#{child.to_js}, #{output_var}, 'unescape', #{promises});\n"
+      else
+        child.to_js(indentation: indentation, var_generator: var_generator, append: output_var)
+      end
+    end
+    output << ' '*(indentation) << "return #{output_var};\n";
 
     output
   end

data/lib/ejx/template.rb

@@ -1,19 +1,22 @@
+require 'stream_parser'
+
 class EJX::Template
 
   autoload :JS, File.expand_path('../template/js', __FILE__)
   autoload :Base, File.expand_path('../template/base', __FILE__)
   autoload :String, File.expand_path('../template/string', __FILE__)
   autoload :HTMLTag, File.expand_path('../template/html_tag', __FILE__)
-  autoload :ParseHelpers, File.expand_path('../template/parse_helpers', __FILE__)
+  autoload :HTMLComment, File.expand_path('../template/html_comment', __FILE__)
   autoload :Subtemplate, File.expand_path('../template/subtemplate', __FILE__)
+  autoload :Multitemplate, File.expand_path('../template/multitemplate', __FILE__)
   autoload :VarGenerator, File.expand_path('../template/var_generator', __FILE__)
+  autoload :Node, File.expand_path('../template/node', __FILE__)
+  autoload :BalanceScanner, File.expand_path('../template/balance_scanner', __FILE__)
   
-  include EJX::Template::ParseHelpers
-  
-  attr_accessor :source
+  include StreamParser
   
   def initialize(source, options={})
-    @source = source.strip
+    super(source.strip)
 
     @js_start_tags = [options[:open_tag] || EJX.settings[:open_tag]]
     @html_start_tags = ['<']
@@ -27,11 +30,10 @@ class EJX::Template
     @close_tag_modifiers = EJX.settings[:close_tag_modifiers].merge(options[:close_tag_modifiers] || {})
     
     @escape = options[:escape]
-    process
+    parse
   end
 
-  def process
-    seek(0)
+  def parse
     @tree =   [EJX::Template::Base.new(escape: @escape)]
     @stack =  [:str]
     
@@ -40,13 +42,17 @@ class EJX::Template
       when :str
         scan_until(Regexp.new("(#{@start_tags.map{|s| Regexp.escape(s) }.join('|')}|\\z)"))
         if !pre_match.strip.empty?
-          @tree.last.children << EJX::Template::String.new(pre_match)
+          @tree.last << EJX::Template::String.new(pre_match)
         end
         
-        if !matched.nil?
-          if @js_start_tags.include?(matched)
+        if !match.nil?
+          if peek(3) == '!--'
+            scan_until('!--')
+            @stack << :html_comment
+          elsif @js_start_tags.include?(match)
+            # @stack.pop
             @stack << :js
-          elsif @html_start_tags.include?(matched)
+          elsif @html_start_tags.include?(match)
             @stack << :html_tag
           end
         end
@@ -55,7 +61,7 @@ class EJX::Template
         scan_until(Regexp.new("(#{@js_close_tags.map{|s| Regexp.escape(s) }.join('|')})"))
         pm = pre_match
         open_modifier = @open_tag_modifiers.find { |k,v| pm.start_with?(v) }&.first
-        close_modifier = @close_tag_modifiers.find { |k,v| matched.end_with?(v) }&.first
+        close_modifier = @close_tag_modifiers.find { |k,v| match.end_with?(v) }&.first
         pm.slice!(0, open_modifier[1].size) if open_modifier
         pm.slice!(pm.size - close_modifier[1].size, close_modifier[1].size) if close_modifier
         
@@ -64,17 +70,39 @@ class EJX::Template
           import += ';' if !import.end_with?(';')
           @tree.first.imports << import
           @stack.pop
-        elsif @tree.last.is_a?(EJX::Template::Subtemplate) && pm.match(/\A\s*\}.*\)/m) && !pm.match(/\A\s*\}.*\{\s*\Z/m)
+        elsif @tree.last.is_a?(EJX::Template::Subtemplate) && EJX::Template::BalanceScanner.parse(pm) == @tree.last.ending_balance
+          #&& pm.match(/\A\s*\}/m) && !pm.match(/\{\s*\Z/m)
+
           subtemplate = @tree.pop
-          subtemplate.children << pm.strip
-          @tree.last.children << subtemplate
-          @stack.pop
-        elsif pm.match(/function\s*\([^\)]*\)\s*\{\s*\Z/m) || pm.match(/=>\s*\{\s*\Z/m)
-          @tree << EJX::Template::Subtemplate.new(pm.strip, [open_modifier, close_modifier].compact)
+          if @tree.last.is_a?(EJX::Template::Multitemplate)
+            multitemplate = @tree.pop
+            multitemplate << subtemplate << pm.strip
+            @tree.last << multitemplate
+          else
+            subtemplate << pm.strip
+            @tree.last << subtemplate
+          end
+          @stack.pop# if subtemplate.balanced?
+        elsif pm.match(/function\s*(:?\w+)?\s*\([^\)]*\)\s*\{\s*\Z/m) || pm.match(/=>\s*\{\s*\Z/m)
+          if @tree.last.is_a?(EJX::Template::Subtemplate) && pm.match(/\A\s*\}/m)
+            template = @tree.pop
+            multitemplate = EJX::Template::Multitemplate.new(template.children.shift, template.modifiers, append: template.append)
+            @tree << multitemplate
+            subtemplate = EJX::Template::Subtemplate.new(nil, [open_modifier, close_modifier].compact, append: false)
+            subtemplate.push(*template.children)
+            @tree.last << subtemplate << pm.strip
+            @tree << EJX::Template::Subtemplate.new(nil, [open_modifier, close_modifier].compact, append: false)
+            @tree.last.instance_variable_set(:@balance_stack, multitemplate.balance)
+          elsif @tree.last.is_a?(EJX::Template::Multitemplate) && pm.match(/\A\s*\}/m)
+            @tree.last << pm.strip
+            @tree.last << EJX::Template::Subtemplate.new(nil, [open_modifier, close_modifier].compact, append: false)
+          else
+            @tree << EJX::Template::Subtemplate.new(pm.strip, [open_modifier, close_modifier].compact, append: [:escape, :unescape].include?(open_modifier) || !pm.match?(/\A\s*(var|const|let)?\s*[^(]+\s*=/))
+          end
           @stack.pop
         else
           if open_modifier != :comment && !pre_js.empty? && @tree.last.children.last.is_a?(EJX::Template::JS)
-            @tree.last.children << EJX::Template::String.new(' ')
+            @tree.last << EJX::Template::String.new(' ')
           end
           value = EJX::Template::JS.new(pm.strip, [open_modifier, close_modifier].compact)
 
@@ -89,60 +117,61 @@ class EJX::Template
             @tree.last.attrs << {@stack_info.last => value}
             @stack.pop
           else
-            @tree.last.children << value
+            @tree.last << value
           end
         end
       when :html_tag
         if @tree.last.children.last.is_a?(EJX::Template::JS)
-          @tree.last.children << EJX::Template::String.new(' ')
+          @tree.last << EJX::Template::String.new(' ')
         end
 
         scan_until(Regexp.new("(#{@js_start_tags.map{|s| Regexp.escape(s) }.join('|')}|\\/|[^\\s>]+)"))
-        if @js_start_tags.include?(matched)
+        if @js_start_tags.include?(match)
           @tree << EJX::Template::HTMLTag.new
           @stack << :js
-        elsif matched == '/'
+        elsif match == '/'
           @stack.pop
           @stack << :html_close_tag
         else
           @tree << EJX::Template::HTMLTag.new
-          @tree.last.tag_name = matched
+          @tree.last.tag_name = match
           @stack << :html_tag_attr_key
         end
       when :html_close_tag
         scan_until(Regexp.new("(#{@js_start_tags.map{|s| Regexp.escape(s) }.join('|')}|[^\\s>]+)"))
 
-        if @js_start_tags.include?(matched)
+        if @js_start_tags.include?(match)
           @stack << :js
         else
           el = @tree.pop
-          if el.tag_name != matched
-            raise EJX::TemplateError.new("Expected to close #{el.tag_name} tag, instead closed #{matched}\n#{cursor}")
+          if el.tag_name != match
+            raise EJX::TemplateError.new("Expected to close #{el.tag_name} tag, instead closed #{match}\n#{cursor}")
           end
-          @tree.last.children << el
+          @tree.last << el
           scan_until(Regexp.new("(#{@html_close_tags.map{|s| Regexp.escape(s) }.join('|')})"))
           @stack.pop
         end
       when :html_tag_attr_key
         scan_until(Regexp.new("(#{(@js_start_tags+@html_close_tags).map{|s| Regexp.escape(s) }.join('|')}|[^\\s=>]+)"))
-        if @js_start_tags.include?(matched)
+        if @js_start_tags.include?(match)
           @stack << :js
-        elsif @html_close_tags.include?(matched)
-          if matched == '/>' || EJX::VOID_ELEMENTS.include?(@tree.last.tag_name)
+        elsif @html_close_tags.include?(match)
+          if match == '/>' || EJX::VOID_ELEMENTS.include?(@tree.last.tag_name)
             el = @tree.pop
-            @tree.last.children << el
+            @tree.last << el
             @stack.pop
             @stack.pop
           else
+            @stack.pop
             @stack << :str
           end
         else
-          key = if matched.start_with?('"') && matched.end_with?('"')
-            matched[1..-2]
-          elsif matched.start_with?('"') && matched.end_with?('"')
-            matched[1..-2]
+          key = if match.start_with?('"') && match.end_with?('"')
+            match[1..-2]
+          elsif match.start_with?('"') && match.end_with?('"')
+            match[1..-2]
           else
-            matched
+            match
           end
           @tree.last.attrs << key
           @stack << :html_tag_attr_value_tx
@@ -150,19 +179,19 @@ class EJX::Template
       when :html_tag_attr_value_tx
         scan_until(Regexp.new("(#{(@js_start_tags+@html_close_tags).map{|s| Regexp.escape(s) }.join('|')}|=|\\S)"))
         tag_key = @tree.last.attrs.pop
-        if @js_start_tags.include?(matched)
+        if @js_start_tags.include?(match)
           @stack << :js
-        elsif @html_close_tags.include?(matched)
+        elsif @html_close_tags.include?(match)
           el = @tree.last
           el.attrs << tag_key
           if EJX::VOID_ELEMENTS.include?(el.tag_name)
             @tree.pop
-            @tree.last.children << el
+            @tree.last << el
           end
           @stack.pop
           @stack.pop
           @stack.pop
-        elsif matched == '='
+        elsif match == '='
           @stack.pop
           @tree.last.attrs << tag_key
           @stack << :html_tag_attr_value
@@ -175,24 +204,24 @@ class EJX::Template
       when :html_tag_attr_value
         scan_until(Regexp.new("(#{(@js_start_tags+@html_close_tags).map{|s| Regexp.escape(s) }.join('|')}|'|\"|\\S+)"))
 
-        if @js_start_tags.include?(matched)
+        if @js_start_tags.include?(match)
           push(:js)
-        elsif matched == '"'
+        elsif match == '"'
           @stack.pop
           @stack << :html_tag_attr_value_double_quoted
-        elsif matched == "'"
+        elsif match == "'"
           @stack.pop
           @stack << :html_tag_attr_value_single_quoted
         else
           @stack.pop
           key = @tree.last.attrs.pop
-          @tree.last.namespace = matched if key == 'xmlns'
-          @tree.last.attrs << { key => matched }
+          @tree.last.namespace = match if key == 'xmlns'
+          @tree.last.attrs << { key => match }
         end
       when :html_tag_attr_value_double_quoted
         quoted_value = []
         scan_until(/("|\[\[=)/)
-        while matched == '[[='
+        while match == '[[='
           quoted_value << pre_match if !pre_match.strip.empty?
           scan_until(/\]\]/)
           quoted_value << EJX::Template::JS.new(pre_match.strip)
@@ -211,7 +240,7 @@ class EJX::Template
       when :html_tag_attr_value_single_quoted
         quoted_value = []
         scan_until(/('|\[\[=)/)
-        while matched == '[[='
+        while match == '[[='
           quoted_value << pre_match if !pre_match.strip.empty?
           scan_until(/\]\]/)
           quoted_value << EJX::Template::JS.new(pre_match.strip)
@@ -227,6 +256,10 @@ class EJX::Template
         @tree.last.attrs << { key => quoted_value }
         scan_until(/\'/)
         @stack.pop
+      when :html_comment
+        scan_until('-->')
+        @tree.last << EJX::Template::HTMLComment.new(pre_match)
+        @stack.pop
       end
     end
   end

data/lib/ejx/version.rb

@@ -1,3 +1,3 @@
 module EJX
-  VERSION = '1.0'
+  VERSION = '1.2'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ejx
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.2'
 platform: ruby
 authors:
 - Jonathan Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: stream_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,11 +109,14 @@ files:
 - lib/ejx.rb
 - lib/ejx/assets/ejx.js
 - lib/ejx/template.rb
+- lib/ejx/template/balance_scanner.rb
 - lib/ejx/template/base.rb
+- lib/ejx/template/html_comment.rb
 - lib/ejx/template/html_tag.rb
 - lib/ejx/template/html_tag/attribute_value.rb
 - lib/ejx/template/js.rb
-- lib/ejx/template/parse_helpers.rb
+- lib/ejx/template/multitemplate.rb
+- lib/ejx/template/node.rb
 - lib/ejx/template/string.rb
 - lib/ejx/template/subtemplate.rb
 - lib/ejx/template/var_generator.rb
@@ -109,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: EJX Template Compiler

data/lib/ejx/template/parse_helpers.rb

@@ -1,44 +0,0 @@
-module EJX::Template::ParseHelpers
-
-  attr_accessor :matched
-
-  def eos?
-    @index >= @source.size
-  end
-
-  def scan_until(r)
-    index = @source.index(r, @index)
-    match = @source.match(r, @index)
-    @matched = match.to_s
-    @old_index = @index
-    @index = index + @matched.size
-    match
-  end
-
-  def pre_match
-    @source[@old_index...(@index-@matched.size)]
-  end
-
-  def rewind(by=1)
-    @index -= by
-  end
-
-  def seek(pos)
-    @old_index = nil
-    @matched = nil
-    @index = pos
-  end
-
-  def current_line
-    start = (@source.rindex("\n", @old_index) || 0) + 1
-    uptop = @source.index("\n", @index) || (@old_index + @matched.length)
-    @source[start..uptop]
-  end
-  
-  def cursor
-    start = (@source.rindex("\n", @old_index) || 0) + 1
-    uptop = @source.index("\n", @index) || (@old_index + @matched.length)
-    lineno = @source[0..start].count("\n") + 1
-    "#{lineno.to_s.rjust(4)}: " + @source[start..uptop] + "\n      #{'-'* (@old_index-start)}#{'^'*(@matched.length)}"
-  end
-end