ejx 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d977622dbdaa5af0afbc8c9c024439f104337c3b4133dbf2c7866656256f373
-  data.tar.gz: e02233b080ee6d8dce9e94135993771464e33497a9102419d75ad8cf058f8984
+  metadata.gz: 9f52677d4f3ebc419528b87b62deb8c54c4c87b65193a58efd675ebf4cdec670
+  data.tar.gz: 1d3529c96bb7756822e0b1f0708f5f39ab6fabccb20376196ee1729cddf75e8c
 SHA512:
-  metadata.gz: e5dd9308fe7904ad51c24475de414887f92cdc62c76111f2c98ff03342d4d2874e17d44cbea939ae9dc3285670ebce7b027afb278630931b96898a40657babd1
-  data.tar.gz: f53c0b6ca412d595ae449f8db65f6038a152ba411f12debc9f57226d9679134c2a471f5e69a14572f8728c97bd0b797e9243322cf47e3af12532ce8719e4b6f4
+  metadata.gz: 7ca36c97ddf80cef591f4f2c0c0787c6c8ea09f52484ca30932aae9c8a1c4195cbdab3a5a8f12579a671e47fa0fcbdaeeefd0ba849218cfbb1c698ad70ec34df
+  data.tar.gz: dd5c1d1c21812e910e24fd156d0dca8458aacf6f04958a073c172fe4bf7cf6f8e3e11d6c0b52904dae3597cb13996267228ba5896f703198646f3c41a53330f8

data/lib/condenser/transformers/ejx.rb

@@ -1,5 +1,7 @@
 class Condenser::EjxTransformer < Condenser::NodeProcessor
 
+  attr_accessor :options
+  
   def initialize(options = {})
     @options = options
   end
@@ -20,4 +22,4 @@ class Condenser::EjxTransformer < Condenser::NodeProcessor
     input[:source] = EJX::Template.new(input[:source], @options).to_module
   end
 
-end
+end

data/lib/ejx/assets/ejx.js

@@ -14,18 +14,31 @@ function repalceejx(el, withItems) {
   }
 }
 
-export function append(items, to, escape, promises, promise_results) {
+export function append(items, to, escape, promises, promiseResults) {
   if ( Array.isArray(items) ) {
     items.forEach((i) => append(i, to, escape, promises));
   } else {
     let method = Array.isArray(to) ? 'push' : 'append';
-    
     if (items instanceof Promise) {
       let holder = document.createElement( "div");
       to[method](holder);
       promises.push( items.then((resolvedItems) => {
-        repalceejx(holder, promise_results || 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);
+      }
     } else {
       to[method](items);
     }

data/lib/ejx/template.rb

@@ -51,6 +51,7 @@ class EJX::Template
           end
         end
       when :js
+        pre_js = pre_match
         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
@@ -63,15 +64,18 @@ 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*\}\s*\)/m) && !pm.match(/\A\s*\}.*\{\s*\Z/m)
+        elsif @tree.last.is_a?(EJX::Template::Subtemplate) && pm.match(/\A\s*\}.*\)/m) && !pm.match(/\A\s*\}.*\{\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)
+        elsif open_modifier && (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)
           @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(' ')
+          end
           value = EJX::Template::JS.new(pm.strip, [open_modifier, close_modifier].compact)
 
           @stack.pop
@@ -89,6 +93,10 @@ class EJX::Template
           end
         end
       when :html_tag
+        if @tree.last.children.last.is_a?(EJX::Template::JS)
+          @tree.last.children << 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)
           @tree << EJX::Template::HTMLTag.new
@@ -182,18 +190,42 @@ class EJX::Template
           @tree.last.attrs << { key => matched }
         end
       when :html_tag_attr_value_double_quoted
-        scan_until(/[^\"]*/)
+        quoted_value = []
+        scan_until(/("|\[\[=)/)
+        while matched == '[[='
+          quoted_value << pre_match if !pre_match.strip.empty?
+          scan_until(/\]\]/)
+          quoted_value << EJX::Template::JS.new(pre_match.strip)
+          scan_until(/("|\[\[=)/)
+        end
+        quoted_value << pre_match if !pre_match.strip.empty?
+        rewind(1)
+
+        quoted_value = EJX::Template::HTMLTag::AttributeValue.new(quoted_value)
+
         key = @tree.last.attrs.pop
-        @tree.last.namespace = matched if key == 'xmlns'
-        @tree.last.attrs << { key => matched }
+        @tree.last.namespace = quoted_value if key == 'xmlns'
+        @tree.last.attrs << { key => quoted_value }
         scan_until(/\"/)
         @stack.pop
       when :html_tag_attr_value_single_quoted
-        scan_until(/[^']*/)
+        quoted_value = []
+        scan_until(/('|\[\[=)/)
+        while matched == '[[='
+          quoted_value << pre_match if !pre_match.strip.empty?
+          scan_until(/\]\]/)
+          quoted_value << EJX::Template::JS.new(pre_match.strip)
+          scan_until(/('|\[\[=)/)
+        end
+        quoted_value << pre_match if !pre_match.strip.empty?
+        rewind(1)
+
+        quoted_value = EJX::Template::HTMLTag::AttributeValue.new(quoted_value)
+
         key = @tree.last.attrs.pop
-        @tree.last.namespace = matched if key == 'xmlns'
-        @tree.last.attrs << { key => matched }
-        scan_until(/'/)
+        @tree.last.namespace = quoted_value if key == 'xmlns'
+        @tree.last.attrs << { key => quoted_value }
+        scan_until(/\'/)
         @stack.pop
       end
     end

data/lib/ejx/template/html_tag.rb

@@ -1,4 +1,6 @@
 class EJX::Template::HTMLTag
+
+  autoload :AttributeValue, File.expand_path('../html_tag/attribute_value', __FILE__)
   
   attr_accessor :tag_name, :attrs, :children, :namespace
 
@@ -21,7 +23,7 @@ class EJX::Template::HTMLTag
     output_var = var_generator.next
     js = "#{' '*indentation}var #{output_var} = document.createElement"
     js << if namespace
-      "NS(#{JSON.generate(namespace)}, #{JSON.generate(tag_name)});\n"
+      "NS(#{namespace.to_js}, #{JSON.generate(tag_name)});\n"
     else
       "(#{JSON.generate(tag_name)});\n"
     end
@@ -29,7 +31,7 @@ class EJX::Template::HTMLTag
     @attrs.each do |attr|
       if attr.is_a?(Hash)
         attr.each do |k, v|
-          js << "#{' '*indentation}#{output_var}.setAttribute(#{JSON.generate(k)}, #{JSON.generate(v)});\n"
+          js << "#{' '*indentation}#{output_var}.setAttribute(#{JSON.generate(k)}, #{v.to_js});\n"
         end
       else
         js << "#{' '*indentation}#{output_var}.setAttribute(#{JSON.generate(attr)}, \"\");\n"

data/lib/ejx/template/html_tag/attribute_value.rb

@@ -0,0 +1,15 @@
+class EJX::Template::HTMLTag::AttributeValue
+
+  def initialize(values)
+    @values = values
+  end
+
+  def to_js
+    if @values.empty?
+      JSON.generate('')
+    else
+      @values.map{ |v| v.is_a?(::String) ? JSON.generate(v) : v.value }.join(' + ')
+    end
+  end
+  
+end

data/lib/ejx/template/js.rb

@@ -1,6 +1,8 @@
 class EJX::Template::JS
   
-  def initialize(value, modifiers)
+  attr_reader :value
+  
+  def initialize(value, modifiers = [])
     @modifiers = modifiers
     @value = value
   end

data/lib/ejx/template/parse_helpers.rb

@@ -19,8 +19,8 @@ module EJX::Template::ParseHelpers
     @source[@old_index...(@index-@matched.size)]
   end
 
-  def rewind(by)
-    @index -= 1
+  def rewind(by=1)
+    @index -= by
   end
 
   def seek(pos)

data/lib/ejx/template/subtemplate.rb

@@ -8,13 +8,14 @@ class EJX::Template::Subtemplate
   end
 
   def to_js(indentation: 4, var_generator: nil, append: "__output")
+    global_output_var = var_generator.next
     output_var = var_generator.next
-    output =  "#{' '*indentation}var #{output_var} = [];\n"
+    
+    output =  "#{' '*indentation}var #{global_output_var} = [];\n"
     output << "#{' '*indentation}__ejx_append("
-    output << @children.first
-    output << "\n"
-
-    # var_generator ||= EJX::Template::VarGenerator.new
+    output << @children.first << "\n"
+    output << "#{' '*(indentation+4)}var #{output_var} = [];\n"
+    
     @children[1..-2].each do |child|
       output << case child
       when EJX::Template::String
@@ -23,9 +24,11 @@ class EJX::Template::Subtemplate
         child.to_js(indentation: indentation + 4, var_generator: var_generator, append: output_var)
       end
     end
-    output << ' '*indentation
-    output << @children.last
-    output << ", #{append}, true, __promises, #{output_var});\n"
+    
+    output << ' '*(indentation+4) << "#{global_output_var}.push(#{output_var});\n";
+    output << ' '*(indentation+4) << "return #{output_var};\n";
+    output << ' '*indentation << @children.last
+    output << ", #{append}, true, __promises, #{global_output_var});\n"
 
     output
   end

data/lib/ejx/version.rb

@@ -1,3 +1,3 @@
 module EJX
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ejx
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Jonathan Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,7 +68,7 @@ dependencies:
         version: '0'
 description: |
   Compile EJX (Embedded JavaScript) templates to Javascript
-  functions with Ruby.
+  with Ruby.
 email:
 - jonbracy@gmail.com
 executables: []
@@ -83,6 +83,7 @@ files:
 - lib/ejx/template.rb
 - lib/ejx/template/base.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/string.rb
@@ -93,7 +94,7 @@ homepage: https://github.com/malomalo/ejx
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: EJX Template Compiler
 test_files: []