diff --git a/.github/workflows/upload.yaml b/.github/workflows/upload.yaml index 0e2ae8f..f3b7214 100644 --- a/.github/workflows/upload.yaml +++ b/.github/workflows/upload.yaml @@ -19,15 +19,15 @@ jobs: - uses: supplypike/setup-bin@v3 with: - uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a2/cr' + uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a3/cr' name: 'cr' - version: '0.8.0-a2' + version: '0.8.0-a3' - uses: supplypike/setup-bin@v3 with: - uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a2/caps' + uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a3/caps' name: 'caps' - version: '0.8.0-a2' + version: '0.8.0-a3' - name: "compiles to js" run: > diff --git a/calcit.cirru b/calcit.cirru index d06bc74..44aab0c 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -6,8 +6,7 @@ :server $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) :modules $ [] |calcit-http/ :files $ {} - |app.analyze $ {} - :configs $ {} + |app.analyze $ %{} :FileEntry :defs $ {} |analyze-deps $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1650821318744) (:by |rJG4IHzWf) @@ -1256,8 +1255,7 @@ :data $ {} |T $ %{} :Leaf (:at 1650811822612) (:by |rJG4IHzWf) (:text |ns) |b $ %{} :Leaf (:at 1650811822612) (:by |rJG4IHzWf) (:text |app.analyze) - |app.comp.call-tree $ {} - :configs $ {} + |app.comp.call-tree $ %{} :FileEntry :defs $ {} |build-call-tree $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1653375064643) (:by |rJG4IHzWf) @@ -2259,8 +2257,7 @@ |h $ %{} :Expr (:at 1653385525186) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1653385525463) (:by |rJG4IHzWf) (:text |comp-spin-slider) - |app.comp.command $ {} - :configs $ {} + |app.comp.command $ %{} :FileEntry :defs $ {} |commands $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1691612379444) (:by |rJG4IHzWf) @@ -4045,8 +4042,7 @@ |h $ %{} :Expr (:at 1651569867038) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1651569868134) (:by |rJG4IHzWf) (:text |defstyle) - |app.comp.deps-of $ {} - :configs $ {} + |app.comp.deps-of $ %{} :FileEntry :defs $ {} |comp-curves $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1651118436684) (:by |rJG4IHzWf) @@ -5060,8 +5056,7 @@ |h $ %{} :Expr (:at 1651082633582) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1651082633582) (:by |rJG4IHzWf) (:text |memof1-call) - |app.comp.deps-tree $ {} - :configs $ {} + |app.comp.deps-tree $ %{} :FileEntry :defs $ {} |*defs-layout-stack $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1650860462146) (:by |rJG4IHzWf) @@ -6358,8 +6353,7 @@ |h $ %{} :Expr (:at 1650875711154) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1650875710689) (:by |rJG4IHzWf) (:text |measure-text-width!) - |app.comp.editor $ {} - :configs $ {} + |app.comp.editor $ %{} :FileEntry :defs $ {} |all-block? $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1650213204319) (:by |rJG4IHzWf) @@ -11120,8 +11114,7 @@ |h $ %{} :Expr (:at 1651079811347) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1651079811347) (:by |rJG4IHzWf) (:text |measure-text-width!) - |app.comp.key-event $ {} - :configs $ {} + |app.comp.key-event $ %{} :FileEntry :defs $ {} |comp-key-event $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1650303770666) (:by |rJG4IHzWf) @@ -11340,8 +11333,7 @@ :data $ {} |T $ %{} :Leaf (:at 1650303815679) (:by |rJG4IHzWf) (:text |dev?) |b $ %{} :Leaf (:at 1650303815679) (:by |rJG4IHzWf) (:text |api-host) - |app.comp.nav $ {} - :configs $ {} + |app.comp.nav $ %{} :FileEntry :defs $ {} |comp-files-entry $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1650192393596) (:by |rJG4IHzWf) @@ -13501,8 +13493,7 @@ |T $ %{} :Leaf (:at 1691431806020) (:by |rJG4IHzWf) (:text |respo-ui.css) |b $ %{} :Leaf (:at 1691431806865) (:by |rJG4IHzWf) (:text |:as) |h $ %{} :Leaf (:at 1691431807488) (:by |rJG4IHzWf) (:text |css) - |app.comp.stack $ {} - :configs $ {} + |app.comp.stack $ %{} :FileEntry :defs $ {} |comp-stack $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1651056730352) (:by |rJG4IHzWf) @@ -13933,7 +13924,7 @@ |h $ %{} :Expr (:at 1651566860163) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1651566861677) (:by |rJG4IHzWf) (:text |css-hover-entry) - |app.config $ {} + |app.config $ %{} :FileEntry :defs $ {} |api-host $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1649852295006) (:by |rJG4IHzWf) @@ -14082,7 +14073,7 @@ |T $ %{} :Leaf (:at 1649073519181) (:by |rJG4IHzWf) (:text "|\"mobile-detect") |b $ %{} :Leaf (:at 1649073519181) (:by |rJG4IHzWf) (:text |:default) |h $ %{} :Leaf (:at 1649073519181) (:by |rJG4IHzWf) (:text |mobile-detect) - |app.container $ {} + |app.container $ %{} :FileEntry :defs $ {} |comp-container $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1573356299931) (:by |rJG4IHzWf) @@ -14819,8 +14810,7 @@ |h $ %{} :Expr (:at 1653374450162) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1653374450162) (:by |rJG4IHzWf) (:text |comp-call-tree) - |app.fetch $ {} - :configs $ {} + |app.fetch $ %{} :FileEntry :defs $ {} |load-files! $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1649786377448) (:by |rJG4IHzWf) @@ -14894,6 +14884,10 @@ :data $ {} |T $ %{} :Leaf (:at 1692867107514) (:by |rJG4IHzWf) (:text |:CodeEntry) |b $ %{} :Leaf (:at 1692867113521) (:by |rJG4IHzWf) (:text |schema/CodeEntry) + |h $ %{} :Expr (:at 1693285012345) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1693285016028) (:by |rJG4IHzWf) (:text |:FileEntry) + |b $ %{} :Leaf (:at 1693285020463) (:by |rJG4IHzWf) (:text |schema/FileEntry) |T $ %{} :Expr (:at 1649786852221) (:by |rJG4IHzWf) :data $ {} |D $ %{} :Leaf (:at 1649786853290) (:by |rJG4IHzWf) (:text |if) @@ -15084,7 +15078,7 @@ |T $ %{} :Leaf (:at 1692867118270) (:by |rJG4IHzWf) (:text |app.schema) |b $ %{} :Leaf (:at 1692867120409) (:by |rJG4IHzWf) (:text |:as) |h $ %{} :Leaf (:at 1692867121875) (:by |rJG4IHzWf) (:text |schema) - |app.main $ {} + |app.main $ %{} :FileEntry :defs $ {} |*store $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1573662553239) (:by |rJG4IHzWf) @@ -15597,7 +15591,7 @@ |h $ %{} :Expr (:at 1651081703520) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1651081703255) (:by |rJG4IHzWf) (:text |lookup-target-def) - |app.math $ {} + |app.math $ %{} :FileEntry :defs $ {} |add-path $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1584291209905) (:by |rJG4IHzWf) @@ -15925,7 +15919,7 @@ :data $ {} |T $ %{} :Leaf (:at 1584291209905) (:by |rJG4IHzWf) (:text |ns) |j $ %{} :Leaf (:at 1584291209905) (:by |rJG4IHzWf) (:text |app.math) - |app.schema $ {} + |app.schema $ %{} :FileEntry :defs $ {} |CodeEntry $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1692867090687) (:by |rJG4IHzWf) @@ -15938,6 +15932,17 @@ |b $ %{} :Leaf (:at 1692867100354) (:by |rJG4IHzWf) (:text |:CodeEntry) |h $ %{} :Leaf (:at 1692867100940) (:by |rJG4IHzWf) (:text |:doc) |l $ %{} :Leaf (:at 1692867102103) (:by |rJG4IHzWf) (:text |:code) + |FileEntry $ %{} :CodeEntry (:doc |) + :code $ %{} :Expr (:at 1693284989826) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1693284989826) (:by |rJG4IHzWf) (:text |def) + |b $ %{} :Leaf (:at 1693284989826) (:by |rJG4IHzWf) (:text |FileEntry) + |h $ %{} :Expr (:at 1693284989826) (:by |rJG4IHzWf) + :data $ {} + |T $ %{} :Leaf (:at 1693284992469) (:by |rJG4IHzWf) (:text |new-record) + |b $ %{} :Leaf (:at 1693284995579) (:by |rJG4IHzWf) (:text |:FileEntry) + |h $ %{} :Leaf (:at 1693284997293) (:by |rJG4IHzWf) (:text |:ns) + |l $ %{} :Leaf (:at 1693284998305) (:by |rJG4IHzWf) (:text |:defs) |inline $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1629647867474) (:by |rJG4IHzWf) :data $ {} @@ -16062,8 +16067,7 @@ :data $ {} |T $ %{} :Leaf (:at nil) (:by nil) (:text |ns) |j $ %{} :Leaf (:at nil) (:by nil) (:text |app.schema) - |app.server $ {} - :configs $ {} + |app.server $ %{} :FileEntry :defs $ {} |*app-server $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1649772506313) (:by |rJG4IHzWf) @@ -16629,8 +16633,7 @@ |h $ %{} :Expr (:at 1649852641832) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1649852643742) (:by |rJG4IHzWf) (:text |cors-headers) - |app.style $ {} - :configs $ {} + |app.style $ %{} :FileEntry :defs $ {} |button $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1650135673103) (:by |rJG4IHzWf) @@ -16725,7 +16728,7 @@ |T $ %{} :Leaf (:at 1651568972004) (:by |rJG4IHzWf) (:text |respo-ui.core) |b $ %{} :Leaf (:at 1651568973117) (:by |rJG4IHzWf) (:text |:as) |h $ %{} :Leaf (:at 1651568973473) (:by |rJG4IHzWf) (:text |ui) - |app.updater $ {} + |app.updater $ %{} :FileEntry :defs $ {} |splice-after $ %{} :CodeEntry (:doc |) :code $ %{} :Expr (:at 1649255256536) (:by |rJG4IHzWf) @@ -17540,7 +17543,8 @@ |h $ %{} :Leaf (:at 1649964292830) (:by |rJG4IHzWf) (:text |ns) |l $ %{} :Expr (:at 1649964216558) (:by |rJG4IHzWf) :data $ {} - |T $ %{} :Leaf (:at 1649964217626) (:by |rJG4IHzWf) (:text |{}) + |T $ %{} :Leaf (:at 1693284983613) (:by |rJG4IHzWf) (:text |%{}) + |X $ %{} :Leaf (:at 1693284989582) (:by |rJG4IHzWf) (:text |schema/FileEntry) |b $ %{} :Expr (:at 1649964217947) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1649964218436) (:by |rJG4IHzWf) (:text |:ns) diff --git a/compact.cirru b/compact.cirru index b60e91c..f69f5ca 100644 --- a/compact.cirru +++ b/compact.cirru @@ -6,7 +6,7 @@ :server $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) :modules $ [] |calcit-http/ :files $ {} - |app.analyze $ {} + |app.analyze $ %{} :FileEntry :defs $ {} |analyze-deps $ %{} :CodeEntry (:doc |) :code $ quote @@ -193,7 +193,7 @@ , token :ns $ %{} :CodeEntry (:doc |) :code $ quote (ns app.analyze) - |app.comp.call-tree $ {} + |app.comp.call-tree $ %{} :FileEntry :defs $ {} |build-call-tree $ %{} :CodeEntry (:doc |) :code $ quote @@ -329,7 +329,7 @@ app.comp.editor :refer $ comp-editor memof.once :refer $ memof1-call phlox.comp.slider :refer $ comp-spin-slider - |app.comp.command $ {} + |app.comp.command $ %{} :FileEntry :defs $ {} |commands $ %{} :CodeEntry (:doc |) :code $ quote @@ -554,7 +554,7 @@ app.analyze :refer $ analyze-deps respo-ui.css :as css respo.css :refer $ defstyle - |app.comp.deps-of $ {} + |app.comp.deps-of $ %{} :FileEntry :defs $ {} |comp-curves $ %{} :CodeEntry (:doc |) :code $ quote @@ -680,7 +680,7 @@ phlox.util :refer $ measure-text-width! app.comp.editor :refer $ comp-editor memof.once :refer $ memof1-call - |app.comp.deps-tree $ {} + |app.comp.deps-tree $ %{} :FileEntry :defs $ {} |*defs-layout-stack $ %{} :CodeEntry (:doc |) :code $ quote @@ -870,7 +870,7 @@ phlox.complex :as complex pointed-prompt.core :refer $ prompt-at! phlox.util :refer $ measure-text-width! - |app.comp.editor $ {} + |app.comp.editor $ %{} :FileEntry :defs $ {} |all-block? $ %{} :CodeEntry (:doc |) :code $ quote @@ -1553,7 +1553,7 @@ app.comp.deps-tree :refer $ comp-deps-tree app.analyze :refer $ lookup-target-def strip-at phlox.util :refer $ measure-text-width! - |app.comp.key-event $ {} + |app.comp.key-event $ %{} :FileEntry :defs $ {} |comp-key-event $ %{} :CodeEntry (:doc |) :code $ quote @@ -1588,7 +1588,7 @@ respo.core :refer $ defcomp defeffect <> >> div button textarea span input a list-> respo.comp.space :refer $ =< app.config :refer $ dev? api-host - |app.comp.nav $ {} + |app.comp.nav $ %{} :FileEntry :defs $ {} |comp-files-entry $ %{} :CodeEntry (:doc |) :code $ quote @@ -1855,7 +1855,7 @@ memof.once :refer $ memof1-call respo.css :refer $ defstyle respo-ui.css :as css - |app.comp.stack $ {} + |app.comp.stack $ %{} :FileEntry :defs $ {} |comp-stack $ %{} :CodeEntry (:doc |) :code $ quote @@ -1908,7 +1908,7 @@ app.comp.key-event :refer $ comp-key-event app.analyze :refer $ analyze-deps app.style :refer $ css-hover-entry - |app.config $ {} + |app.config $ %{} :FileEntry :defs $ {} |api-host $ %{} :CodeEntry (:doc |) :code $ quote @@ -1941,7 +1941,7 @@ :ns $ %{} :CodeEntry (:doc |) :code $ quote ns app.config $ :require ("\"mobile-detect" :default mobile-detect) - |app.container $ {} + |app.container $ %{} :FileEntry :defs $ {} |comp-container $ %{} :CodeEntry (:doc |) :code $ quote @@ -2034,7 +2034,7 @@ memof.once :refer $ memof1-call app.comp.deps-of :refer $ comp-deps-of app.comp.call-tree :refer $ comp-call-tree - |app.fetch $ {} + |app.fetch $ %{} :FileEntry :defs $ {} |load-files! $ %{} :CodeEntry (:doc |) :code $ quote @@ -2046,7 +2046,7 @@ .!then $ fn (text) let compact-files $ parse-cirru-edn text - {} $ :CodeEntry schema/CodeEntry + {} (:CodeEntry schema/CodeEntry) (:FileEntry schema/FileEntry) if (some? compact-files) do d! $ :: :load-files (transform-cirru-quoted compact-files) @@ -2074,7 +2074,7 @@ ns app.fetch $ :require app.config :refer $ api-host api-host-6011 mocked? app.schema :as schema - |app.main $ {} + |app.main $ %{} :FileEntry :defs $ {} |*store $ %{} :CodeEntry (:doc |) :code $ quote (defatom *store schema/store) @@ -2157,7 +2157,7 @@ respo.comp.space :refer $ =< app.fetch :refer $ load-files! app.analyze :refer $ lookup-target-def - |app.math $ {} + |app.math $ %{} :FileEntry :defs $ {} |add-path $ %{} :CodeEntry (:doc |) :code $ quote @@ -2224,11 +2224,14 @@ [] (- a x) (- b y) :ns $ %{} :CodeEntry (:doc |) :code $ quote (ns app.math) - |app.schema $ {} + |app.schema $ %{} :FileEntry :defs $ {} |CodeEntry $ %{} :CodeEntry (:doc |) :code $ quote def CodeEntry $ new-record :CodeEntry :doc :code + |FileEntry $ %{} :CodeEntry (:doc |) + :code $ quote + def FileEntry $ new-record :FileEntry :ns :defs |inline $ %{} :CodeEntry (:doc |) :code $ quote defmacro inline (path) @@ -2255,7 +2258,7 @@ :deps-tree nil :ns $ %{} :CodeEntry (:doc |) :code $ quote (ns app.schema) - |app.server $ {} + |app.server $ %{} :FileEntry :defs $ {} |*app-server $ %{} :CodeEntry (:doc |) :code $ quote (defatom *app-server nil) @@ -2340,7 +2343,7 @@ ns app.server $ :require http.core :refer $ serve-http! app.config :refer $ cors-headers - |app.style $ {} + |app.style $ %{} :FileEntry :defs $ {} |button $ %{} :CodeEntry (:doc |) :code $ quote @@ -2358,7 +2361,7 @@ respo.css :refer $ defstyle respo-ui.core :refer $ hsl respo-ui.core :as ui - |app.updater $ {} + |app.updater $ %{} :FileEntry :defs $ {} |splice-after $ %{} :CodeEntry (:doc |) :code $ quote @@ -2475,7 +2478,7 @@ let ns $ or op-data "\"TODO_NS" assoc-in store ([] :files ns) - {} + %{} schema/FileEntry :ns $ %{} schema/CodeEntry (:doc "\"") :code $ :: 'quote ([] "\"ns" ns) :defs $ {} diff --git a/package.cirru b/package.cirru index dd4319c..3ce9d8b 100644 --- a/package.cirru +++ b/package.cirru @@ -1,13 +1,13 @@ {} :dependencies $ {} - |calcit-lang/lilac |main - |calcit-lang/memof |main - |Respo/respo.calcit |main - |Respo/respo-ui.calcit |main - |Phlox-GL/phlox |0.6.0 - |Quatrefoil-GL/touch-control |0.0.14 - |mvc-works/pointed-prompt |0.0.6 - |Respo/alerts.calcit |main - |Cirru/respo-cirru-editor |0.5.0 - |calcit-lang/calcit-http |0.2.0 + |calcit-lang/lilac |0.4.0-a2 + |calcit-lang/memof |0.0.14 + |Respo/respo.calcit |0.16.0-a3 + |Respo/respo-ui.calcit |0.5.0-a3 + |Phlox-GL/phlox |0.7.0 + |Quatrefoil-GL/touch-control |0.0.15 + |mvc-works/pointed-prompt |0.0.7 + |Respo/alerts.calcit |0.9.0-a2 + |Cirru/respo-cirru-editor |0.6.0 + |calcit-lang/calcit-http |0.3.0 diff --git a/package.json b/package.json index 9d3cee5..0ea3aa0 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "vite": "^4.4.9" }, "dependencies": { - "@calcit/procs": "^0.8.0-a2", + "@calcit/procs": "^0.8.0-a3", "@quamolit/phlox-utils": "^0.0.2", "@quamolit/touch-control": "^0.0.13", "bottom-tip": "^0.1.5", diff --git a/yarn.lock b/yarn.lock index cfe5676..a29b713 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@calcit/procs@^0.8.0-a2": - version "0.8.0-a2" - resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.8.0-a2.tgz#2df06f18030dcac8bc3ea3e308baad5fa942acfa" - integrity sha512-v18GEiq54+WrvNouBDtk30Ta212W8DSPY1uo7JghVNNDMWh5Hab7Y6pVCw5HpF0REyBs/7+sibKjneJtrcr5kg== +"@calcit/procs@^0.8.0-a3": + version "0.8.0-a3" + resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.8.0-a3.tgz#1a34506697bf7494f6c3f9b417795199652f08ee" + integrity sha512-Lei/bEcyxtenToL6Yp6Ur4/+45t5+QluI2yfF9kyNzYCDJQT5MSL2PrXkoiwolUJccKP/U9oSGx9v2lW6WeBoA== dependencies: "@calcit/ternary-tree" "0.0.23" "@cirru/parser.ts" "^0.0.6"