ejx 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dc481f36010e82885f2b6ea60a4f13bb4e6c9c4b823ee6899fd02ce12650942
-  data.tar.gz: 7262002c9a7cb0b3ce87def1d77911e45d6a3e85dde2ae4bfe3fa41aff0f7741
+  metadata.gz: c5e3997ce1ac9e0edc1de2f0046b0b6a088bdaae849e05278c86223a4e4d620f
+  data.tar.gz: db78cf1549960d7264a1eb001fd1999c94a911f9f8e00aaa721e1d9471bbfd72
 SHA512:
-  metadata.gz: 58f1139b43dcf0205a43619b0f167460d27bd5a75b1708cb4b9497887b8696c7aa5489df61ac89da4e17b3df22a460d3b9fa4ca2f8ce2e5ed6b5fa6c30ca41a4
-  data.tar.gz: 8cd338246eb063e0156504252c83216fc003f507af94655b3f383984e98831ff5e01ddcc669d6c80e85fa84b8a47888170c97e1ccf11e28b0a80be6f23606142
+  metadata.gz: 3770f88b9741b78be7d90ce40d865821b6e0f71f4a6ee3cb48c018c93b81436f31df47b83fd0b9143935439f8ddfb594eebdfda1724487c44f4b015af024d74a
+  data.tar.gz: 873581ec37a56a0ffa9a4b9c0e44f9f9aa632b41419f2ad8e67a8033a22bc9e6915d74cb0827e7ebe15028d4a9a7ac2ddcc669a28caa15b61eb4bfd4ba3cebea

data/lib/ejx/assets/ejx.js

@@ -1,17 +1,26 @@
+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 Text) {
+      // TextNode#toString() => "[object Text]" so we need to get it ourselves,
+      // Not sure why but the test in Node do not reflect this.
+      el.insertAdjacentText('beforebegin', i.textContent);
+    } 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) {
@@ -23,12 +32,12 @@ export function append(items, to, escape, promises, promiseResults) {
       let holder = document.createElement( "div");
       to[method](holder);
       promises.push( items.then((resolvedItems) => {
-          if(holder.parentElement) {
-            repalceejx(holder, resolvedItems || promiseResults.flat())
+          if (holder.parentElement) {
+            repalceejx(holder, resolvedItems || promiseResults.flat());
           } else if (Array.isArray(resolvedItems)) {
-            to.splice(to.indexOf(holder), 1, ...resolvedItems)
+            to.splice(to.indexOf(holder), 1, ...resolvedItems);
           } else {
-            to.splice(to.indexOf(holder), 1, resolvedItems)
+            to.splice(to.indexOf(holder), 1, resolvedItems);
           }
       }));
     } else if (typeof items === 'string') {

data/lib/ejx/template.rb

@@ -70,7 +70,7 @@ class EJX::Template
           @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)
+          @tree << EJX::Template::Subtemplate.new(pm.strip, [open_modifier, close_modifier].compact, append: !pm.match?(/\A\s*(var|const|let)?\s*[^(]+\s*=/))
           @stack.pop
         else
           if open_modifier != :comment && !pre_js.empty? && @tree.last.children.last.is_a?(EJX::Template::JS)

data/lib/ejx/template/subtemplate.rb

@@ -1,19 +1,26 @@
 class EJX::Template::Subtemplate
 
-  attr_reader :children
+  attr_reader :children, :append
   
-  def initialize(opening, modifiers)
+  def initialize(opening, modifiers, append: true)
     @children = [opening]
     @modifiers = modifiers
+    @append = append
   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 #{global_output_var} = [];\n"
-    output << "#{' '*indentation}__ejx_append("
-    output << @children.first << "\n"
+    output = ''
+    if @append
+      output << "#{' '*indentation}var #{global_output_var} = [];\n"
+      output << "#{' '*indentation}__ejx_append("
+      output << @children.first << "\n"
+    else
+      output << "#{' '*indentation}#{@children.first}\n"
+    end
+
     output << "#{' '*(indentation+4)}var #{output_var} = [];\n"
     
     @children[1..-2].each do |child|
@@ -25,10 +32,14 @@ class EJX::Template::Subtemplate
       end
     end
     
-    output << ' '*(indentation+4) << "#{global_output_var}.push(#{output_var});\n";
+    output << ' '*(indentation+4) << "#{global_output_var}.push(#{output_var});\n" if @append
     output << ' '*(indentation+4) << "return #{output_var};\n";
     output << ' '*indentation << @children.last.strip.delete_suffix(';')
-    output << ", #{append}, true, __promises, #{global_output_var});\n"
+    output << if @append
+      ", #{append}, true, __promises, #{global_output_var});\n"
+    else
+      ";\n"
+    end
 
     output
   end

data/lib/ejx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ejx
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Jonathan Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,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