Merge 5062c1f683 into release/next-js

This commit is contained in:
janeway-bot 2021-04-13 10:18:34 +04:00 committed by GitHub
commit 98c586cc1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 47 additions and 90 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:accbadc701471f6b071ed286164a0bf4d3f8a2e64cfaea9019e123bd9edca569
size 10292454
oid sha256:1d56b7351a347a65c06999955114f196523a86c853390d5d1822a90a606619d6
size 10357558

View File

@ -243,7 +243,7 @@
=/ headers
:~ content-type+mime-type
max-1-da:gen
'Service-Worker-Allowed'^'/'
'service-worker-allowed'^'/'
==
[[200 headers] `q.u.data]
==

View File

@ -5,7 +5,7 @@
/- glob
/+ default-agent, verb, dbug
|%
++ hash 0v4.7tk5q.9ha4l.tbmji.fvkno.s9pfq
++ hash 0v6.qafur.17301.j8obh.vbepn.7tq3l
+$ state-0 [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
+$ all-states
$% state-0

View File

@ -37,73 +37,7 @@
++ on-init on-init:def
++ on-save !>(~)
++ on-load on-load:def
++ on-poke
|= [=mark =vase]
^- (quip card _this)
|^
?. =(mark %sane)
(on-poke:def mark vase)
[(sane !<(?(%check %fix) vase)) this]
::
++ scry-sharing
.^ (set resource)
%gx
(scot %p our.bowl)
%group-push-hook
(scot %da now.bowl)
/sharing/noun
==
::
++ sane
|= input=?(%check %fix)
^- (list card)
=; cards=(list card)
?: =(%check input)
~&(cards ~)
cards
%+ murn
~(tap in scry-sharing)
|= rid=resource
^- (unit card)
=/ u-g=(unit group)
(scry-group:grp rid)
?~ u-g
`(poke-us %remove rid)
=* group u.u-g
=/ subs=(set ship)
(get-subscribers-for-group rid)
=/ to-remove=(set ship)
(~(dif in members.group) (~(gas in subs) our.bowl ~))
?~ to-remove ~
`(poke-store %remove-members rid to-remove)
::
++ poke-us
|= =action:push-hook
^- card
=- [%pass / %agent [our.bowl %group-push-hook] %poke -]
push-hook-action+!>(action)
::
++ poke-store
|= =update:store
^- card
=+ group-update-0+!>(update)
[%pass /sane %agent [our.bowl %group-store] %poke -]
::
++ get-subscribers-for-group
|= rid=resource
^- (set ship)
=/ target=path
(en-path:resource rid)
%- ~(gas in *(set ship))
%+ murn
~(val by sup.bowl)
|= [her=ship =path]
^- (unit ship)
?. =(path resource+target)
~
`her
--
++ on-poke on-poke:def
++ on-agent on-agent:def
++ on-watch on-watch:def
++ on-leave on-leave:def

View File

@ -415,10 +415,7 @@
(~(has by tags) tag)
==
%= +<
::
tags
%+ ~(jab by tags) tag
|=((set ship) (~(dif in +<) ships))
tags (dif-ju tags tag ships)
==
:_ state
(send-diff %remove-tag rid tag ships)
@ -543,7 +540,15 @@
(send-diff %remove-group rid ~)
::
--
:: TODO: move to +zuse
++ dif-ju
|= [=tags =tag remove=(set ship)]
=/ ships ~(tap in remove)
|-
?~ ships
tags
$(tags (~(del ju tags) tag i.ships), ships t.ships)
::
++ merge-tags
|= [=tags ships=(set ship) new-tags=(set tag)]
^+ tags

View File

@ -24,6 +24,6 @@
<div id="portal-root"></div>
<script src="/~landscape/js/channel.js"></script>
<script src="/~landscape/js/session.js"></script>
<script src="/~landscape/js/bundle/index.857da0dbc92427b1460b.js"></script>
<script src="/~landscape/js/bundle/index.fd3d400454968e081ca9.js"></script>
</body>
</html>

View File

@ -104,6 +104,7 @@
+$ state-6 [%6 base-state-1]
+$ state-7 [%7 base-state-2]
+$ state-8 [%8 base-state-3]
+$ state-9 [%9 base-state-3]
+$ versioned-state
$% state-0
state-1
@ -114,10 +115,11 @@
state-6
state-7
state-8
state-9
==
::
+$ inflated-state
$: state-8
$: state-9
cached-indices
==
--
@ -230,7 +232,7 @@
=| cards=(list card)
|^
=* loop $
?: ?=(%8 -.old)
?: ?=(%9 -.old)
:- cards
%_ state
associations associations.old
@ -238,6 +240,24 @@
group-indices (rebuild-group-indices associations.old)
app-indices (rebuild-app-indices associations.old)
==
?: ?=(%8 -.old)
=/ groups (~(got by app-indices) %groups)
=/ pokes=(list card)
%+ murn ~(tap in ~(key by groups))
|= group=resource
^- (unit card)
=/ =association:store (~(got by associations) [%groups group])
=* met metadatum.association
?. ?=([%group [~ [~ [@ [@ @]]]]] config.met)
~
=* res resource.u.u.feed.config.met
=- `[%pass /fix-feed %agent [our.bowl %graph-pull-hook] %poke -]
:- %pull-hook-action
!> [%add entity.res name.res]
%_ $
cards (weld cards pokes)
-.old %9
==
?: ?=(%7 -.old)
$(old [%8 (associations-2-to-3 associations.old) ~])
?: ?=(%6 -.old)
@ -369,7 +389,7 @@
^- (quip card _state)
|^
=^ cards state
(on-load !>([%8 (remake-metadata ;;(tree-metadata +.arc))]))
(on-load !>([%9 (remake-metadata ;;(tree-metadata +.arc))]))
:_ state
%+ weld cards
%+ turn ~(tap in ~(key by group-indices))

View File

@ -7,9 +7,7 @@
::
++ supported-apps
^- (list term)
:~ %group-push-hook
%group-store
==
~[%group-store]
::
++ poke-all-sane
|= =input