isomorfeus-data 2.2.2 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d36a0a2969584b5e5aea166cb0908ab8bec00468a92db227f23c4fc119f3758
-  data.tar.gz: 6ffb3e2ce6d9b346d4cdab06cf11bce8ecfcabe26018862da4bfb00c524ffadd
+  metadata.gz: 5ab4a823aea4e8ce1ac387d38165ec3edc965860b9610489659965de6507e040
+  data.tar.gz: 85d563dcbf7c0fb35a4adb58160070aa99e81302a6b580f7e6a8b44298d711cf
 SHA512:
-  metadata.gz: ec637e80c1b1ab442fb7e083612e8fd2b69048bc632caabb0a9eeda38f8b655fb5c96336621d2c3d670796beda867b2f27bfa4bb2a984f1d125e3cd6bd85d56c
-  data.tar.gz: b934e52cb638f92aef1ecf1851d57ca48c86ab6ecb88a637a22265e9835db2769e5aade0ea36d7c9e16daad5c40c9dd18e5f302aab93c3011f2b114e9fc03b9a
+  metadata.gz: b71a2919ce601d39c2507d3746330e7dfae6693f1176b2a41feb807ce345ffd6110ea126b2e816774035f45f4c2a423861855dbb48f9b2d53d8fadc0b809cadf
+  data.tar.gz: 9124d75496b322d9dd7d3d7f455d9badc97823c202d56029f5fff91a3c72d714c8be9d7e70347b87f42013bc6bc681347f4723a91b197326bdcce0fc0ef6312f

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.2.2'
+    VERSION = '2.2.5'
   end
 end

data/lib/isomorfeus_data/lucid_query/mixin.rb

@@ -6,28 +6,62 @@ module LucidQuery
 
       if RUBY_ENGINE == 'opal'
         base.instance_exec do
+          def _generate_auto_key(props_s)
+            component = nil
+            component_name = '_'
+            %x{
+              let c = Opal.Preact.active_component();
+              if (typeof c?.__ruby_instance !== 'undefined') { component = c.__ruby_instance; }
+            }
+            component_name = component.class.name if component
+            "#{component_name}:_:#{self.name}:#{props_s}"
+          end
+
+          def _should_return?(lqri, gak)
+            if on_ssr?
+              lqri.loaded? && gak
+            else on_browser?
+              if Isomorfeus::TopLevel.hydrated
+                if Isomorfeus::TopLevel.first_pass
+                  lqri.loaded?
+                else
+                  lqri.loaded? && !gak
+                end
+              else
+                lqri.loaded? && !gak
+              end
+            end
+          end
+
           def execute(key: nil, **props)
-            props[:query_result_instance] = LucidQueryResult.new(key: key)
-            promise_execute(props) unless props[:query_result_instance].loaded?
-            props[:query_result_instance]
+            gak = key ? false : true
+            key = _generate_auto_key(`JSON.stringify(props)`) unless key
+
+            lqri = LucidQueryResult.new(key: key)
+            return lqri if _should_return?(lqri, gak)
+            props[:query_result_instance] = lqri
+            promise_execute(key: gak ? nil : key, **props)
+            lqri
           end
 
           def promise_execute(key: nil, **props)
-            query_result_instance = props.delete(:query_result_instance)
-            query_result_instance = LucidQueryResult.new(key: key) unless query_result_instance
+            gak = key ? false : true
+            key = _generate_auto_key(`JSON.stringify(props)`) unless key
 
-            return Promise.new.resolve(query_result_instance) if query_result_instance.loaded?
+            lqri = props.delete(:query_result_instance)
+            lqri = LucidQueryResult.new(key: key) unless lqri
+            return Promise.new.resolve(lqri) if _should_return?(lqri, gak)
 
             props.each_key do |prop_name|
               Isomorfeus.raise_error(message: "#{self.to_s} No such query prop declared: '#{prop_name}'!") unless declared_props.key?(prop_name)
             end
             props = validated_props(props)
-            props[:key] = query_result_instance.key
+            props[:key] = lqri.key
             Isomorfeus::Transport.promise_send_path( 'Isomorfeus::Data::Handler::Generic', self.name, :execute, props).then do |agent|
               agent.process do
-                query_result_instance._load_from_store!
+                lqri._load_from_store!
                 Isomorfeus.store.dispatch(type: 'DATA_LOAD', data: agent.full_response[:data])
-                query_result_instance
+                lqri
               end
             end
           end

data/lib/isomorfeus_data/lucid_query_result.rb

@@ -46,7 +46,7 @@ class LucidQueryResult
                        stored_results = Redux.fetch_by_path(:data_state, @class_name, @key)
                        stored_results.JS[accessor_name] if stored_results
                      end
-      Isomorfeus.raise_error(message: "#{@class_name}: no such thing '#{accessor_name}' in the results!") unless sid_or_array
+      return nil unless sid_or_array
       if stored_results.JS['_is_array_']
         sid_or_array.map { |sid| Isomorfeus.instance_from_sid(sid) }
       else
@@ -82,7 +82,7 @@ class LucidQueryResult
           sids_hash[key.to_s] = value_or_array.map(&:sid)
           sids_hash[:_is_array_] = true
         else
-          sids_hash[key.to_s] = value_or_array.sid
+          sids_hash[key.to_s] = value_or_array.nil? ? nil : value_or_array.sid
         end
       end
       { @class_name => { @key => sids_hash }}
@@ -99,9 +99,11 @@ class LucidQueryResult
             end
           end
         else
-          data_hash.deep_merge!(value.to_transport)
-          if value.respond_to?(:included_items_to_transport)
-            data_hash.deep_merge!(value.included_items_to_transport)
+          unless value.nil?
+            data_hash.deep_merge!(value.to_transport)
+            if value.respond_to?(:included_items_to_transport)
+              data_hash.deep_merge!(value.included_items_to_transport)
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,42 +114,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.45
+        version: 10.6.50
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.45
+        version: 10.6.50
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement