hot loader fixes

Author: catmando

ruby/hyper-model/lib/reactive_record/active_record/reactive_record/collection.rb

@@ -77,11 +77,6 @@ def [](index)
         (@collection.length..index).each do |i|
           new_dummy_record = ReactiveRecord::Base.new_from_vector(@target_klass, nil, *@vector, "*#{i}")
           new_dummy_record.attributes[@association.inverse_of] = @owner if @association && !@association.through_association?
-<<<<<<< Updated upstream
-=======
-          # HMT-TODO: the above needs to be looked into... if we are a hmt then don't we need to create a dummy on the joins collection as well?
-          # or maybe this just does not work for HMT?
->>>>>>> Stashed changes
           @collection << new_dummy_record
         end
       end
@@ -217,11 +212,7 @@ def related_records_for(record)
       return [] unless attrs[@association.inverse_of] == @owner
       if !@association.through_association
         [record]
-<<<<<<< Updated upstream
       elsif (source = attrs[@association.source])
-=======
-      elsif (source = attrs[@association.source]) && source.is_a?(@target_klass)
->>>>>>> Stashed changes
         [source]
       else
         []
@@ -242,12 +233,7 @@ def live_scopes
     end
 
     def in_this_collection(related_records)
-<<<<<<< Updated upstream
       return related_records unless @association
-=======
-      # HMT-TODO: I don't think we can get a set of related records here with a through association unless they are part of the collection
-      return related_records if !@association || @association.through_association?
->>>>>>> Stashed changes
       related_records.select do |r|
         r.backing_record.attributes[@association.inverse_of] == @owner
       end
@@ -420,15 +406,7 @@ def push_and_update_belongs_to(id)
     def set_belongs_to(child)
       if @owner
         # TODO this is major broken...current
-<<<<<<< Updated upstream
         child.send("#{@association.inverse_of}=", @owner) if @association && !@association.through_association
-=======
-        if (through_association = @association.through_association)
-          # HMT-TODO: create a new record with owner and child
-        else
-          child.send("#{@association.inverse_of}=", @owner) if @association && !@association.through_association
-        end
->>>>>>> Stashed changes
       elsif @parent
         @parent.set_belongs_to(child)
       end
@@ -443,7 +421,6 @@ def set_belongs_to(child)
 
     def update_child(item)
       backing_record = item.backing_record
-<<<<<<< Updated upstream
       if backing_record && @owner && @association && !@association.through_association? && item.attributes[@association.inverse_of] != @owner
         inverse_of = @association.inverse_of
         current_association = item.attributes[inverse_of]
@@ -452,44 +429,11 @@ def update_child(item)
         if current_association && current_association.attributes[@association.attribute]
           current_association.attributes[@association.attribute].delete(item)
         end
-=======
-      # HMT TODO:  The following && !association.through_association was commented out, causing wrong class items to be added to
-      # associations
-      # Why was it commented out.
-      if backing_record && @owner && @association && item.attributes[@association.inverse_of] != @owner && !@association.through_association?
-        inverse_of = @association.inverse_of
-        current_association_value = item.attributes[inverse_of]
-        backing_record.virgin = false unless backing_record.data_loading?
-        #backing_record.update_belongs_to(inverse_of, @owner)
-        backing_record.set_belongs_to_via_has_many(@association, @owner)
-        # following is handled by update_belongs_to and is redundant
-        # unless current_association_value.nil?  # might be a dummy value which responds to nil
-        #   current_association = @association.inverse.inverse(current_association_value)
-        #   current_association_attribute = current_association.attribute
-        #   if current_association.collection? && current_association_value.attributes[current_association_attribute]
-        #     current_association.attributes[current_association_attribute].delete(item)
-        #   end
-        # end
->>>>>>> Stashed changes
         @owner.backing_record.sync_has_many(@association.attribute)
       end
     end
 
     def push(item)
-<<<<<<< Updated upstream
-=======
-      if (through_association = @association&.through_association)
-        through_association.klass.create(@association.inverse_of => @owner, @association.source => item)
-        self
-      else
-        _internal_push(item)
-      end
-    end
-
-    alias << push
-
-    def _internal_push(item)
->>>>>>> Stashed changes
       item.itself # force get of at least the id
       if collection
         self.force_push item
@@ -505,11 +449,8 @@ def _internal_push(item)
       self
     end
 
-<<<<<<< Updated upstream
     alias << push
 
-=======
->>>>>>> Stashed changes
     def sort!(*args, &block)
       replace(sort(*args, &block))
     end
@@ -582,33 +523,20 @@ def internal_replace(new_array)
       if new_array.is_a? Collection
         @dummy_collection = new_array.dummy_collection
         @dummy_record = new_array.dummy_record
-<<<<<<< Updated upstream
         new_array.collection.each { |item| self << item } if new_array.collection
       else
         @dummy_collection = @dummy_record = nil
         new_array.each { |item| self << item }
-=======
-        new_array.collection.each { |item| _internal_push item } if new_array.collection
-      else
-        @dummy_collection = @dummy_record = nil
-        new_array.each { |item| _internal_push item }
->>>>>>> Stashed changes
       end
       notify_of_change new_array
     end
 
     def delete(item)
       unsaved_children.delete(item)
       notify_of_change(
-<<<<<<< Updated upstream
         if @owner && @association && !@association.through_association?
           inverse_of = @association.inverse_of
           if (backing_record = item.backing_record) && item.attributes[inverse_of] == @owner
-=======
-        if @owner && @association
-          inverse_of = @association.inverse_of
-          if (backing_record = item.backing_record) && item.attributes[inverse_of] == @owner && !@association.through_association?
->>>>>>> Stashed changes
             # the if prevents double update if delete is being called from << (see << above)
             backing_record.update_belongs_to(inverse_of, nil)
           end
@@ -634,11 +562,6 @@ def loading?
       @dummy_collection.loading?
     end
 
-<<<<<<< Updated upstream
-    def loaded?
-      false && @collection && (!@dummy_collection || !@dummy_collection.loading?) && (!@owner || @owner.id || @vector.length > 1)
-    end
-=======
     # def loading?
     #   !@collection || (@dummy_collection && @dummy_collection.loading?) || (@owner && [email protected] && @vector && @vector.length <= 1)
     # end
@@ -647,7 +570,6 @@ def loaded?
     #   @collection && (!@dummy_collection || !@dummy_collection.loading?) && (!@owner || @owner.id || !@vector || @vector.length > 1)
     #   #false && @collection && (!@dummy_collection || !@dummy_collection.loading?) && (!@owner || @owner.id || @vector.length > 1)
     # end
->>>>>>> Stashed changes
 
     def empty?
       # should be handled by method missing below, but opal-rspec does not deal well

ruby/hyperstack-config/lib/hyperstack-config.rb

@@ -38,6 +38,7 @@ def self.naming_convention
   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

ruby/hyperstack-config/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.ignore_callback_mapping = <%= !(!Hyperstack.hotloader_ignore_callback_mapping && Rails.configuration.assets.debug) %>

ruby/hyperstack-config/lib/hyperstack/hotloader.rb

@@ -19,19 +19,29 @@ def self.callbacks
       @@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}"})`