Skip to content

Commit 31361b7

Browse files
tiyetiye
committed
allow more optional values; alpha release
1 parent 8447237 commit 31361b7

File tree

6 files changed

+70
-39
lines changed

6 files changed

+70
-39
lines changed

‎calcit.cirru

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -695,10 +695,14 @@
695695
|j $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592758829662)
696696
:data $ {}
697697
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592758832669) (:text |:type) (:id |Vbqf4jvTfV)
698-
|j $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592758840399)
698+
|j $ {} (:type :expr) (:by |UI0sFmATo) (:at 1593882819077)
699699
:data $ {}
700-
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592758844401) (:text |keyword+) (:id |pvJqZp08L)
701-
:id |odW9LcMgXE
700+
|T $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592758840399)
701+
:data $ {}
702+
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592758844401) (:text |keyword+) (:id |pvJqZp08L)
703+
:id |odW9LcMgXE
704+
|D $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1593882819738) (:text |optional+) (:id |zGEGPa2Ky7)
705+
:id |gfjo0Kp-Z
702706
:id |6Oa29UHFle
703707
|r $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592758834516)
704708
:data $ {}
@@ -721,7 +725,7 @@
721725
:data $ {}
722726
|T $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592794890323)
723727
:data $ {}
724-
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592794890323) (:text |:exact-keys?) (:id |rEdajZlIrn)
728+
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1593882834352) (:text |:check-keys?) (:id |rEdajZlIrn)
725729
|j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592794890323) (:text |true) (:id |g0DQkwYFf3)
726730
:id |tDflazWTeR
727731
|D $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592794967209) (:text |{}) (:id |MBjG50JQdA)
@@ -731,6 +735,15 @@
731735
|D $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592758817053) (:text |or+) (:id |YsAZ4WykNx)
732736
:id |9-RVrTFqy
733737
|D $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592758722279) (:text |vector+) (:id |KjyYWm6Ty3)
738+
|j $ {} (:type :expr) (:by |UI0sFmATo) (:at 1593882714088)
739+
:data $ {}
740+
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1593882714445) (:text |{}) (:id |DlKk3DZtQleaf)
741+
|j $ {} (:type :expr) (:by |UI0sFmATo) (:at 1593882715215)
742+
:data $ {}
743+
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1593882719034) (:text |:allow-seq?) (:id |K2yMKoGa5y)
744+
|j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1593882811473) (:text |true) (:id |_XADr9MrM)
745+
:id |RVBGcETxU
746+
:id |DlKk3DZtQ
734747
:id |ikWImu6XXM
735748
:id |7gTZAuJ2Mg
736749
|j $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592758666091)
@@ -887,7 +900,7 @@
887900
|T $ {} (:type :leaf) (:id |SkS-giGakhob) (:text |:scripts) (:by |root) (:at 1506700563333)
888901
|j $ {} (:type :expr) (:id |B18ZloMpy3jW) (:by nil) (:at 1506700563333)
889902
:data $ {}
890-
|T $ {} (:type :leaf) (:id |rkDZljfakhjZ) (:text |[]) (:by |root) (:at 1506700563333)
903+
|T $ {} (:type :leaf) (:id |rkDZljfakhjZ) (:text |list) (:by |UI0sFmATo) (:at 1593882759026)
891904
|j $ {} (:type :leaf) (:id |BydWlofp1hsZ) (:text ||/main.js) (:by |root) (:at 1506700563333)
892905
|r $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592740105598)
893906
:data $ {}
@@ -908,6 +921,20 @@
908921
|j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592794787775) (:text |false) (:id |g7W96Z1HN)
909922
:id |70rAbeuAXw
910923
:id |IAm-LZvgZg
924+
|v $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592740105598)
925+
:data $ {}
926+
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592740105957) (:text |{}) (:id |MdgrEfeXvQ)
927+
|r $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592740111358)
928+
:data $ {}
929+
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592740112279) (:text |:src) (:id |JUgNAE2XMeleaf)
930+
|j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1593882769328) (:text "|\"client.js") (:id |KCDGrUcwJj)
931+
:id |JUgNAE2XMe
932+
|v $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592794734803)
933+
:data $ {}
934+
|T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592794737943) (:text |:defer?) (:id |70rAbeuAXwleaf)
935+
|j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1593882766736) (:text |true) (:id |g7W96Z1HN)
936+
:id |70rAbeuAXw
937+
:id |SPBRfsEBh
911938
|xT $ {} (:type :expr) (:id |HyeOnfvJ1M) (:by |root) (:at 1510073008262)
912939
:data $ {}
913940
|T $ {} (:type :leaf) (:text |:inline-styles) (:id |HyeOnfvJ1Mleaf) (:by |root) (:at 1510073011770)

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"http-server": "^0.12.3",
18-
"shadow-cljs": "^2.10.13"
18+
"shadow-cljs": "^2.10.14"
1919
},
2020
"dependencies": {}
2121
}

‎release.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{:version "0.1.14",
1+
{:version "0.1.15-a1",
22
:group-id "mvc-works",
33
:artifact-id "shell-page",
44
:skip-tag true,

‎src/shell_page/core.cljs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
(or+
2424
[(string+)
2525
(record+
26-
{:type (keyword+), :src (string+), :defer? (boolean+)}
27-
{:exact-keys? true})])),
26+
{:type (optional+ (keyword+)), :src (string+), :defer? (boolean+)}
27+
{:check-keys? true})])
28+
{:allow-seq? true}),
2829
:inline-html (string+),
2930
:append-html (string+),
3031
:manifest (string+)}

‎src/shell_page/main.cljs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
:ssr "respo-ssr",
1212
:styles ["/main.css"],
1313
:inline-styles [".app{color:#aaa;}"],
14-
:scripts ["/main.js" {:type :module, :src "main.js", :defer? false}],
14+
:scripts (list
15+
"/main.js"
16+
{:type :module, :src "main.js", :defer? false}
17+
{:src "client.js", :defer? true}),
1518
:inline-html "<script>console.log('nothing')</script>",
1619
:append-html "<script>console.log('appended');</script>",
1720
:manifest "manifest.json"})))

0 commit comments

Comments
 (0)