isomorfeus-data 2.2.1 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36f2a4b42f218414eb7b5d64477e37d31af469bfc9e75dd2dfdc9dfa72784eb4
-  data.tar.gz: 882e1a566d0f5aa47f62766bb735c1c77de497274a6b77a6a4a464d92e39bc72
+  metadata.gz: f38e6bfe020ed2d119bfa65c03081a66cbaa25a6c7de2e1cfc3bf81d6a664509
+  data.tar.gz: 2ee22f40a1eee27e38f6b24fea9bfff03b78415a0ff1a19385b82b38cd057159
 SHA512:
-  metadata.gz: 384ad08196c3672aed40ec02d02b14a37f54f9512792b15c93ff9be6d050896b383569b0f97a232c04789039f739b8de7303268a2e5028508f9124600a883e25
-  data.tar.gz: 3920980f38fd39a1c0110938cbdc5f306210788be3c97fb88cb7808587789bf4d2fd546c2c6bdfcce43eae43c2ccfa7e456af736004931eac718e3c83a3a73da
+  metadata.gz: 573f1fe92e77a05e4c53fb02b39ae32e1ae9d4765190b7652a0f59da9d90c4d39b3d7ee5976ba1d029819aa7f8a9db0bc683319e883650fb824b9148d64f403a
+  data.tar.gz: 42a357b982e34c4feef9d5493b11d403f9a94fd4f76ecc136421ea50eef114dff2cdd342228a55e74753e742aa12ac64eac8dd5f038479fd0662ef6d09a6ae3c

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.2.1'
+    VERSION = '2.2.4'
   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.1
+  version: 2.2.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-20 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.1
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.40
+        version: 10.6.49
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.40
+        version: 10.6.49
 - !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.1
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Reactive objects, documents, files and queries for isomorfeus.