From 6dc7b45c07dabeb3dc9c24959a5304af09efcb92 Mon Sep 17 00:00:00 2001 From: Werner Kok Date: Fri, 16 Feb 2024 16:37:48 +0000 Subject: [PATCH] Commit sample metadata --- samples/drift/.metadata | 30 ++++++++++++------------ samples/rxdb/.metadata | 30 ++++++++++++------------ src/hti/re_dash/alpha.cljd | 3 ++- src/hti/re_dash/core.cljd | 3 ++- src/hti/re_dash/database/impl/rx_db.cljd | 3 ++- 5 files changed, 36 insertions(+), 33 deletions(-) diff --git a/samples/drift/.metadata b/samples/drift/.metadata index 78a65c5..a778330 100644 --- a/samples/drift/.metadata +++ b/samples/drift/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "9e1c857886f07d342cf106f2cd588bcd5e031bb2" + revision: "d211f42860350d914a5ad8102f9ec32764dc6d06" channel: "stable" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: android - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: ios - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: linux - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: macos - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: web - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: windows - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 # User provided section diff --git a/samples/rxdb/.metadata b/samples/rxdb/.metadata index 78a65c5..a778330 100644 --- a/samples/rxdb/.metadata +++ b/samples/rxdb/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "9e1c857886f07d342cf106f2cd588bcd5e031bb2" + revision: "d211f42860350d914a5ad8102f9ec32764dc6d06" channel: "stable" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: android - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: ios - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: linux - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: macos - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: web - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: windows - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 # User provided section diff --git a/src/hti/re_dash/alpha.cljd b/src/hti/re_dash/alpha.cljd index 4adecbe..7543b4a 100644 --- a/src/hti/re_dash/alpha.cljd +++ b/src/hti/re_dash/alpha.cljd @@ -50,7 +50,8 @@ [signal-builder [subscription-id query :as query-vec]] (or (get-in @signal-cache [subscription-id query]) (let [signals' ((signal-builder subscribe) query-vec)] - (when-not (dart/is? signals' c/Atom) + (when-not (or (dart/is? signals' c/Atom) + (dart/is? signals' Stream)) (swap! signal-cache #(assoc-in % [subscription-id query] signals'))) signals'))) diff --git a/src/hti/re_dash/core.cljd b/src/hti/re_dash/core.cljd index 9ccca46..a635261 100644 --- a/src/hti/re_dash/core.cljd +++ b/src/hti/re_dash/core.cljd @@ -44,7 +44,8 @@ [signal-builder [subscription-id query :as query-vec]] (or (get-in @signal-cache [subscription-id query]) (let [signals' ((signal-builder subscribe) query-vec)] - (when-not (dart/is? signals' c/Atom) + (when-not (or (dart/is? signals' c/Atom) + (dart/is? signals' Stream)) (swap! signal-cache #(assoc-in % [subscription-id query] signals'))) signals'))) diff --git a/src/hti/re_dash/database/impl/rx_db.cljd b/src/hti/re_dash/database/impl/rx_db.cljd index 7de61f7..500c57f 100644 --- a/src/hti/re_dash/database/impl/rx_db.cljd +++ b/src/hti/re_dash/database/impl/rx_db.cljd @@ -37,7 +37,8 @@ (.asyncMap ^Stream s #(computation-fn % query-vec)) :else - (.$ ^rxdb/RxQuery (computation-fn s query-vec))))) + (when-let [computation (computation-fn s query-vec)] + (.$ ^rxdb/RxQuery computation))))) (ref [_]