fwi 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eae98e13b6ec9a8846176fa727bbb962397b1c5f
-  data.tar.gz: 7352bb31bed27f0a41cc332f59276bc57bf35b70
+  metadata.gz: f3b629c26f6de53dcada43907b1f5bd35ad3fdb8
+  data.tar.gz: b01d3b6214332bd3256b166fe0b8b898c2dcc643
 SHA512:
-  metadata.gz: 675e87dea63eb8189a13de38e72b00b85c14bbfe84d83463c56f13272671bce276aa4bf558152294d596a96f4f9f8590e9cdc9c9666956de41612f59db1022ea
-  data.tar.gz: a2a3deb6e44f6d372b9ec90bcd2f45aff0fc5dd33f9a9e93f8fb11910432aa56f631020b1f1ff8f608547a3efd1a72f4bf65f847f05b44e4557c5be03dc79645
+  metadata.gz: f03f6db426aecbfc0c6aa0514e46983c7aad1ee259126d29de9eaa23a08185a97dc471351ec7671d8f39b3f02e5d4d024a9512e7ee8efee9a30ee8aa3103ca9a
+  data.tar.gz: 682943fd84c6e43c68d7a0adc6f3309afa45dcff59eec280c37de6f5e896f21bebe12171dc9e8527dce8562a506a18b9f7f7f09b7779d88d513e27b5dc78db27

data/fwi.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fwi"
-  spec.version       = "1.1.0"
+  spec.version       = "1.2.0"
   spec.authors       = ["Jaci Brunning"]
   spec.email         = ["jaci.brunning@gmail.com"]
 

data/lib/fwi/compilers/js/gen.rb

@@ -100,15 +100,16 @@ module Generator
         def gen_for_ns parent, name, ns, str, indent
             is_root = name == "<root>"
             has_parent = parent != "<root>"
-            unless has_parent
-                append str, indent, "var #{name} = {};" unless is_root
-            else
-                append str, indent, "#{parent}.#{name} = {};" unless is_root
-            end
 
             fqn_ns = name
             fqn_ns = parent + "." + fqn_ns if has_parent
 
+            unless has_parent
+                append str, indent, "var #{name} = FWI.util.exports().#{fqn_ns} || {};" unless is_root
+            else
+                append str, indent, "#{fqn_ns} = FWI.util.exports().#{fqn_ns} || {};" unless is_root
+            end
+            
             unless is_root
                 append(str, indent, "FWI.util.exports().#{fqn_ns} = #{fqn_ns};")
             end
@@ -137,7 +138,7 @@ module Generator
                     append str, indent, "};"
                 end
                 
-                if is_root
+                if is_root && element[:type] != :namespace
                     append(str, indent, "FWI.util.exports().#{fqn} = #{fqn};")
                 end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fwi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jaci Brunning