Skip to content

Commit 3e398cd

Browse files
committed
Rename map-opts-out? -> keep-wrapped? for clarity
1 parent 21781b5 commit 3e398cd

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/nextjournal/clerk/viewer.cljc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,23 +448,23 @@
448448
(if viewer
449449
(let [fn-viewer? (or (var? viewer) (fn? viewer))
450450
is-var? (var-from-def? value)
451-
map-opts-out? (and (map? viewer) (:var-from-def? viewer))
451+
keep-wrapped? (and (map? viewer) (:var-from-def? viewer))
452452
apply-vw (fn [v]
453453
(if fn-viewer?
454454
(viewer v)
455455
{:nextjournal/value v
456456
:nextjournal/viewer (normalize-viewer viewer)}))
457457
first-try (apply-vw (cond-> value
458-
(and is-var? fn-viewer? (not map-opts-out?))
458+
(and is-var? fn-viewer? (not keep-wrapped?))
459459
unwrap-var-value))
460-
return-opts-out? (boolean (-> first-try ->viewer :var-from-def?))
460+
return-keep-wrapped? (boolean (-> first-try ->viewer :var-from-def?))
461461
value+viewer (cond
462462
;; map viewer w/ var-from-def, no opt-out → unwrap
463-
(and is-var? (not fn-viewer?) (not map-opts-out?))
463+
(and is-var? (not fn-viewer?) (not keep-wrapped?))
464464
(update first-try :nextjournal/value unwrap-var-value)
465465

466466
;; fn viewer whose return opts out → re-run with raw wrapper
467-
(and is-var? fn-viewer? return-opts-out?)
467+
(and is-var? fn-viewer? return-keep-wrapped?)
468468
(apply-vw value)
469469

470470
:else first-try)]

0 commit comments

Comments
 (0)