Merge cb7c9c6535 into release/next-js

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f504eec4f36c7f6074b9988cfd4bfac2bb88617a84d7172c5061e6711b3bbda
-size 8682363
+oid sha256:6722f30060fe93296a6b29bddc7c441fce58aaa6960a78d1e98e62a930fcba0b
+size 8746487

pkg/arvo/app/graph-push-hook.hoon

@@ -92,27 +92,6 @@
       %run-updates        (is-allowed resource.q.update bowl %.y)
   ==
 ::
-++  resource-for-update
-  |=  =vase
-  ^-  (unit resource:res)
-  =/  =update:store  !<(update:store vase)
-  ?-  -.q.update
-      %add-graph          `resource.q.update
-      %remove-graph       `resource.q.update
-      %add-nodes          `resource.q.update
-      %remove-nodes       `resource.q.update
-      %add-signatures     `resource.uid.q.update
-      %remove-signatures  `resource.uid.q.update
-      %archive-graph      `resource.q.update
-      %unarchive-graph    ~
-      %add-tag            ~
-      %remove-tag         ~
-      %keys               ~
-      %tags               ~
-      %tag-queries        ~
-      %run-updates        `resource.q.update
-  ==
-::
 ++  initial-watch
   |=  [=path =resource:res]
   ^-  vase

pkg/arvo/app/group-push-hook.hoon

@@ -81,15 +81,6 @@
     ==
   --
 ::
-++  resource-for-update
-  |=  =vase
-  ^-  (unit resource)
-  =/  =update:store
-    !<(update:store vase)
-  ?:  ?=(%initial -.update)
-    ~
-  `resource.update
-::
 ++  take-update
   |=   =vase
   ^-  [(list card) agent]

pkg/arvo/lib/pull-hook.hoon

@@ -285,7 +285,7 @@
             (on-agent:og wire sign)
           [cards this]
         :_  this
-        ~[(update-store:hc q.cage.sign)]
+        ~[(update-store:hc rid q.cage.sign)]
       ==
       ++  on-leave
         |=  =path
@@ -424,15 +424,24 @@
       /helper/pull-hook
     wire
   ::
+  ++  get-conversion
+    .^  tube:clay
+      %cc  (scot %p our.bowl)  %home  (scot %da now.bowl)
+      /[update-mark.config]/resource
+    ==
+  ::
   ++  give-update
     ^-  card
     [%give %fact ~[/tracking] %pull-hook-update !>(tracking)]
   ::
   ++  update-store
-    |=  =vase
+    |=  [wire-rid=resource =vase]
     ^-  card
     =/  =wire
       (make-wire /store)
+    =+  !<(rid=resource (get-conversion vase))
+    ?>  =(src.bowl (~(got by tracking) rid))
+    ?>  =(wire-rid rid)
     [%pass wire %agent [our.bowl store-name.config] %poke update-mark.config vase]
   --
 --

pkg/arvo/lib/push-hook.hoon

@@ -67,16 +67,6 @@
   |*  =config
   $_  ^|
   |_  bowl:gall
-  ::
-  ::  +resource-for-update: get affected resource from an update
-  ::  
-  ::    Given a vase of the update, the mark of which is
-  ::    update-mark.config, produce the affected resource, if any.
-  ::
-  ++  resource-for-update
-    |~  vase
-    *(unit resource)
-  ::
   ::  +take-update: handle update from store
   ::
   ::    Given an update from the store, do other things after proxying
@@ -175,9 +165,11 @@
       |^ 
       ?-  -.old
           %1  
+        =.  cards
+          :_(cards (build-mark:hc %sing))
         =^  og-cards   push-hook
           (on-load:og inner-state.old)
-        [(weld cards og-cards) this(state old)]
+        [(weld (flop cards) og-cards) this(state old)]
         ::
           %0
         %_    $
@@ -274,11 +266,18 @@
         =^  cards  push-hook
           (on-leave:og path)
         [cards this]
+      ::
       ++  on-arvo
         |=  [=wire =sign-arvo]
-        =^  cards  push-hook
-          (on-arvo:og wire sign-arvo)
-        [cards this]
+        ?.  ?=([%helper %push-hook @ *] wire)
+          =^  cards  push-hook
+            (on-arvo:og wire sign-arvo)
+          [cards this]
+        ?.  ?=(%resource-conversion i.t.t.wire)
+          (on-arvo:def wire sign-arvo)
+        :_  this
+        ~[(build-mark:hc %next)]
+      ::
       ++  on-fail
         |=  [=term =tang]
         =^  cards  push-hook
@@ -368,7 +367,7 @@
     |=  =vase
     ^-  (list card:agent:gall)
     =/  rid=(unit resource)
-      (resource-for-update:og vase)
+      (resource-for-update vase)
     ?~  rid  ~
     =/  prefix=path
       resource+(en-path:resource u.rid)
@@ -385,7 +384,7 @@
     |=  =vase
     ^-  (list card:agent:gall)
     =/  rid=(unit resource)
-      (resource-for-update:og vase)
+      (resource-for-update vase)
     ?~  rid  ~
     =/  =path
       resource+(en-path:resource u.rid)
@@ -394,5 +393,30 @@
     =/  dap=term
       ?:(=(our.bowl entity.u.rid) store-name.config dap.bowl)
     [%pass wire %agent [entity.u.rid dap] %poke update-mark.config vase]~
+  ::
+  ++  get-conversion
+    .^  tube:clay
+      %cc  (scot %p our.bowl)  %home  (scot %da now.bowl)
+      /[update-mark.config]/resource
+    ==
+  ::
+  ++  resource-for-update
+    |=  update=vase
+    =/  =tube:clay
+      get-conversion
+    %+  bind
+      (mole |.((tube update)))
+    |=(=vase !<(resource vase))
+  ::
+  ++  build-mark
+    |=  rav=?(%sing %next)
+    ^-  card
+    =/  =wire
+      (make-wire /resource-conversion)
+    =/  =mood:clay
+     [%c da+now.bowl /[update-mark.config]/resource]
+    =/  =rave:clay
+      ?:(?=(%next rav) [rav mood] [rav mood])
+    [%pass wire %arvo %c %warp our.bowl [%home `rave]]
   --
 --

pkg/arvo/mar/graph/update.hoon

@@ -7,6 +7,13 @@
   |%
   ++  noun  upd
   ++  json  (update:enjs upd)
+  ++  resource
+    ?+  -.q.upd  !!
+      ?(%run-updates %add-nodes %remove-nodes %add-graph)  resource.q.upd
+      ?(%remove-graph %archive-graph %unarchive-graph)     resource.q.upd
+      ?(%add-tag %remove-tag)                              resource.q.upd
+      ?(%add-signatures %remove-signatures)                resource.uid.q.upd
+    ==
   ++  mime  [/application/x-urb-graph-update (as-octs (jam upd))]
   --
 ::

pkg/arvo/mar/group/update.hoon

@@ -4,9 +4,13 @@
 ++  grow
   |%
   ++  noun  upd
+  ++  resource
+    ?<  ?=(%initial -.upd)
+    resource.upd
+  ::
   ++  json
-  %+  frond:enjs:format  'groupUpdate'
-  (update:enjs upd)
+    %+  frond:enjs:format  'groupUpdate'
+    (update:enjs upd)
   --
 ++  grab
   |%

pkg/arvo/mar/resource.hoon

@@ -0,0 +1,14 @@
+/+  resource
+|_  rid=resource
+++  grad  %noun
+++  grow
+  |%
+  ++  noun  rid
+  ++  json  (enjs:resource rid)
+  --
+++  grab
+  |%
+  ++  noun  resource
+  ++  json  dejs:resource
+  --
+--