hyperstack-config 1.0.alpha1.4 → 1.0.alpha1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c21092fde747464cfb3942b3871d93d186577009ae7eb0435621ddf3cbd357
-  data.tar.gz: 4946f4a97f818dae12f89ed66c90bee89e36be1329afc9059a5ad8eae1b6d8bc
+  metadata.gz: d14021b6ecdd6098649de52f6da0252c1293adf0c78e5d3def26df3a15a3564c
+  data.tar.gz: c9da07047b3a4b765986c70ea1461e41458d6bf638b3c00530bd2e252a97d3f4
 SHA512:
-  metadata.gz: aaaa02d68b6390e11ab5cd8de537235c7ebf43c083bdb2185ade0785186350df5eb5056be9778e34367d4bd0c040c83e8f425bd0c45bbc416ac12f56e14e34c4
-  data.tar.gz: c6a73f7a61b5fc4641d91e55746fc4b1b07d8f5f1b78ee59132ccc30fafb7463f82bcb0dd3be9f70e53a93afa3a72dbd742017802eb7438c25c26e07980a7236
+  metadata.gz: 4d4375dc40618772fbde219f71217038b06baa335a1e4b772e2ce598e7a988f7e582c35c947584907d635eaaed8703f1ec9df7a5d1a8fa1c553febc081797fad
+  data.tar.gz: c00034e43ae80a7bfd39534a8f3e497c84f20968f5182b1e7450035035772fe500a896467c52155e5dac16ce1f71482ad2eed8d7568800c3bea2c75bbeea2675

data/lib/hyperstack-config.rb

@@ -38,6 +38,7 @@ else
   require 'hyperstack/on_error'
   Hyperstack.define_setting :hotloader_port, 25222
   Hyperstack.define_setting :hotloader_ping, nil
+  Hyperstack.define_setting :hotloader_ignore_callback_mapping, false
   Hyperstack.import 'opal', gem: true
   Hyperstack.import 'browser', client_only: true
   Hyperstack.import 'hyperstack-config', gem: true

data/lib/hyperstack-hotloader-config.js.erb

@@ -1,7 +1,7 @@
-console.log('hotloader config doing its thing')
 if ((typeof(window) !== 'undefined') && (window.Hyperstack==undefined || window.Hyperstack.hotloader==undefined)) {
   window.Hyperstack = { hotloader: function(port, ping) { }}
 }
 //if (typeof(Hyperstack) === 'undefined') { Hyperstack = {} }
 Hyperstack.hotloader.port = <%= Hyperstack.hotloader_port %>
-Hyperstack.hotloader.ping = <%= !!Hyperstack.hotloader_ping %>
+Hyperstack.hotloader.ping = <%= Hyperstack.hotloader_ping ? Hyperstack.hotloader_ping : false %>
+Hyperstack.hotloader.ignore_callback_mapping = <%= !(!Hyperstack.hotloader_ignore_callback_mapping && Rails.configuration.assets.debug) %>

data/lib/hyperstack/config/version.rb

@@ -1,5 +1,5 @@
 module Hyperstack
   module Config
-    VERSION = '1.0.alpha1.4'
+    VERSION = '1.0.alpha1.5'
   end
 end

data/lib/hyperstack/context.rb

@@ -25,7 +25,8 @@ module Hyperstack
       # @context.
       if @context
         @context.each do |ctx, vars|
-          vars.each { |var, init| ctx.instance_variable_set(var, init.dup) }
+          # be careful:  You can't dup nil, hence `init && init.dup`
+          vars.each { |var, init| ctx.instance_variable_set(var, init && init.dup) }
         end
         Hyperstack::Application::Boot.run if reboot
       else

data/lib/hyperstack/hotloader.rb

@@ -19,19 +19,29 @@ module Hyperstack
       @@callbacks ||= Hash.new { |h, k| h[k] = Array.new }
     end
 
-    STACKDIRS = ['hyperstack/', 'corelib/']
+    STACKDIRS = ['hyperstack', 'corelib']
 
     def self.file_name(frame)
+      return unless frame
       file_name = `#{frame}.fileName`
-      match = %r{^(.+\/assets\/)(.+\/)(.+\/)}.match(file_name)
-      return unless match && match[2] == match[3] && !STACKDIRS.include?(match[2])
-      file_name.gsub(match[1] + match[2], '')
+      match = %r{^(.+\/assets)\/}.match(file_name)
+      return unless match
+      file_name = file_name.gsub(match[0], '').split('/')
+      n = (file_name.length - 1) / 2
+      return unless file_name[0..n - 1] == file_name[n..2 * n - 1]
+      return if STACKDIRS.include?(file_name[0])
+      "#{match[0]}#{file_name[0..n - 1].join('/')}/#{file_name[-1]}"
     end
 
     def self.when_file_updates(&block)
+      return if `Hyperstack.hotloader.ignore_callback_mapping`
       return callbacks[$_hyperstack_reloader_file_name] << block if $_hyperstack_reloader_file_name
       callback = lambda do |frames|
-        frames.collect(&method(:file_name)).each { |name| callbacks[name] << block if name }
+        # StackTrace.get maps the stack frames back to the source maps
+        # we then associate any files in the call stack that match our application file pattern
+        # with the block, which will remove any callbacks defined when those files were executing.
+        # Note that StackTrace.getSync gives us the raw .js file names so it will not work
+        frames.collect(&method(:file_name)).compact.uniq.each { |name| callbacks[name] << block if name }
       end
       error = lambda do |e|
         `console.error(#{"hyperstack hot loader could not find source file for callback: #{e}"})`

data/lib/hyperstack/hotloader/short_cut.js

@@ -4,6 +4,6 @@ if (typeof window !== 'undefined') {
       Opal.Hyperstack.$const_get('Hotloader').$listen(port || 25222, ping || Opal.nil)
     }
   }
-} else {
+} /* else {
   throw 'Attempt to run hotloader during prerendering - make sure you import with the `client_only: true` option'
-}
+} */

data/lib/hyperstack/imports.rb

@@ -6,13 +6,17 @@ module Hyperstack
     end
 
     def import(value, gem: nil, cancelled: nil, client_only: nil, server_only: nil, tree: nil, js_import: nil, at_head: nil)
-      return if import_list.detect { |current_value, *_rest| value == current_value }
+      return if imported? value
       new_element = [
         value, cancelled, !client_only, !server_only, (tree ? :tree : :gem), js_import
       ]
       import_list.send(at_head ? :unshift : :push, new_element)
     end
 
+    def imported?(value)
+      import_list.detect { |current_value, *| value == current_value }
+    end
+
     alias imports import
 
     def import_tree(value, cancelled: nil, client_only: nil, server_only: nil)
@@ -90,8 +94,8 @@ module Hyperstack
       Dir.glob(Rails.root.join('app', path, '**', '*')).sort.collect do |fname|
         fname = fname.gsub(/^#{base_name}/, '')
         fname = fname.gsub(/\.erb$/, '')
-        if fname =~ /(\.js$)|(\.rb$)/
-          fname = fname.gsub(/(\.js$)|(\.rb$)/, '')
+        if fname =~ /(\.js$)|(\.rb$)|(\.jsx$)/
+          fname = fname.gsub(/(\.js$)|(\.rb$)|(\.jsx$)/, '')
           r = "require '#{fname}' #{client_guard(render_on_server, render_on_client)}"
           puts "    #{r}"
           "puts \"#{r}\"; #{r}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperstack-config
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.4
+  version: 1.0.alpha1.5
 platform: ruby
 authors:
 - Mitch VanDuyn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Provides a single point configuration module for hyperstack gems