isomorfeus-data 2.2.3 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be6d699092fcfe828d576a95f320a465dd5580e6b87397b7463c7aae95cdc10
-  data.tar.gz: e703dc37e202262e72e65dceba8758ef2fa7a4a34272134564cc844d32a8c297
+  metadata.gz: 75a9c8b414039562455c5b7a869da4751653c82d0031b710d0a8417af7370a39
+  data.tar.gz: 2293d29e72b6c62b4de861ba38d6db77a98c1c5f8defd69d4004ee234316a3b1
 SHA512:
-  metadata.gz: 15dd953c787af8e00838e5d03bbbbce74a3ef38e06904464f5f83e11c60456a3a68091e79cc8d36f90bd0f20de5bf147bc8efe4f50c296b690ca9709a94d9a34
-  data.tar.gz: 4331648418677ea736fabe1319e60ffcedbc70fb0b22612b6c17aa24461bf69601f74a3b7b56e55c7a4c0a73571fa5c5a380e2b5f270882178a28acad1e53f36
+  metadata.gz: 775a51d6cd7886279e560a44c2eb0cdd6b2cf0f542ad1ee44f35874e5e47bffc26dc62cf5a44910a6cb34f224efab6fb050d38d818d4a36f6e5c2c66284f58bd
+  data.tar.gz: 741d236c0f5add80ec028845b6aa459a9305c208dfe54fec089e26d7ef0a624dff1303c86daa6e5be55fbf85d9cd5934ddd87ec6cb979ec17ccf035040663778

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.2.3'
+    VERSION = '2.2.6'
   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?
+            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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.6
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-02-25 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.3
+        version: 2.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.6
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.6
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.47
+        version: 10.6.50
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.47
+        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.3
+        version: 2.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.6
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement