Skip to content

Commit

Permalink
upgrade cr 0.4 ; bump 0.14.28
Browse files Browse the repository at this point in the history
  • Loading branch information
tiye committed Jun 14, 2021
1 parent b7929ae commit 3242f66
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 60 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
- name: "prepare modules"
run: >
mkdir -p ~/.config/calcit/modules/ && cd ~/.config/calcit/modules/
&& git clone https://github.com/calcit-lang/memof.git
&& git clone https://github.com/calcit-lang/lilac.git
&& git clone https://github.com/calcit-lang/calcit-test.git
&& git clone https://github.com/calcit-lang/memof.git --branch=0.0.7
&& git clone https://github.com/calcit-lang/lilac.git --branch=0.1.5
&& git clone https://github.com/calcit-lang/calcit-test.git --branch=0.0.3
- name: "load deps"
run: yarn
Expand Down
44 changes: 19 additions & 25 deletions calcit.cirru

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 15 additions & 17 deletions compact.cirru
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{} (:package |respo)
:configs $ {} (:init-fn |respo.main/main!) (:reload-fn |respo.main/reload!)
:modules $ [] |memof/compact.cirru |lilac/compact.cirru |calcit-test/compact.cirru
:version |0.14.27
:version |0.14.28
:files $ {}
|respo.app.style.widget $ {}
:ns $ quote
Expand Down Expand Up @@ -92,7 +92,7 @@
v $ last entry
str
prop->attr $ turn-string k
, |= $ escape
, |= $ .escape
cond
= k :style
style->string v
Expand Down Expand Up @@ -173,7 +173,7 @@
str |on $ turn-string x
|event->string $ quote
defn event->string (x)
substr (turn-string x) 3
&str:slice (turn-string x) 3
|dashed->camel $ quote
defn dashed->camel (x)
.!replace x dashed-letter-pattern $ fn (cc pos prop)
Expand Down Expand Up @@ -469,7 +469,7 @@
k $ get pair 0
v $ get pair 1
not $ starts-with? (turn-string k) "\"on-"
set->list
.to-list
sort $ fn (x y)
compare-xy (first x) (first y)
|pick-event $ quote
Expand All @@ -488,7 +488,7 @@
k $ get pair 0
v $ get pair 1
[]
turn-keyword $ substr (turn-string k) 3
turn-keyword $ &str:slice (turn-string k) 3
, v
pairs-map
|val-exists? $ quote
Expand Down Expand Up @@ -1191,7 +1191,7 @@
{} (:class-name |task-list) (:style style-list)
-> tasks
either $ []
reverse
.reverse
map $ fn (task)
let
task-id $ :id task
Expand Down Expand Up @@ -1289,13 +1289,13 @@
true false
|component? $ quote
defn component? (x)
if (record? x) (relevant-record? x schema/Component) false
if (record? x) (.matches? schema/Component x) false
|effect? $ quote
defn effect? (x)
and (record? x) (relevant-record? x schema/Effect)
and (record? x) (.matches? schema/Effect x)
|element? $ quote
defn element? (x)
if (record? x) (relevant-record? x schema/Element) false
if (record? x) (.matches? schema/Element x) false
:proc $ quote ()
|respo.app.comp.task $ {}
:ns $ quote
Expand Down Expand Up @@ -1527,8 +1527,7 @@
attrs $ pick-attrs props
styles $ ->
either (:style props) ({})
to-pairs
set->list
.to-list
sort $ fn (x y)
compare-xy (first x) (first y)
event $ pick-event props
Expand Down Expand Up @@ -1594,8 +1593,7 @@
attrs $ pick-attrs props
styles $ -> props (:style)
either $ {}
to-pairs
set->list
.to-list
sort $ fn (x y)
compare-xy (first x) (first y)
event $ pick-event props
Expand Down Expand Up @@ -1645,15 +1643,15 @@
let
args-var $ gensym "\"args"
params-var $ gensym "\"params"
quote-replace $ defn ~effect-name ~args
quasiquote $ defn ~effect-name ~args
%{} schema/Effect
:name $ ~ (turn-keyword effect-name)
:coord $ []
:args $ [] ~@args
:method $ fn (~args-var ~params-var)
let[] ~args ~args-var $ let[] ~params ~params-var
~@ $ if (empty? body)
quote-replace $ echo "\"WARNING:" ~effect-name "\"lack code for handling effects!"
quasiquote $ echo "\"WARNING:" ~effect-name "\"lack code for handling effects!"
, body
|list-> $ quote
defn list-> (props children) (create-list-element :div props children)
Expand Down Expand Up @@ -1720,7 +1718,7 @@
assert "\"expected symbol" $ symbol? x
assert "\"expected params" $ list? params
assert "\"expected some result" $ > (count body) 0
quote-replace $ defn ~x ~params ~@body
quasiquote $ defn ~x ~params ~@body
|h1 $ quote
defn h1 (props & children)
create-element :h1 props & $ map children confirm-child
Expand All @@ -1738,7 +1736,7 @@
assert "\"expected symbol of comp-name" $ symbol? comp-name
assert "\"expected list for params" $ list? params
assert "\"some component retured" $ &> (count body) 0
quote-replace $ defn ~comp-name (~ params)
quasiquote $ defn ~comp-name (~ params)
extract-effects-list $ %{} schema/Component
:effects $ []
:name $ ~ (turn-keyword comp-name)
Expand Down
6 changes: 3 additions & 3 deletions main.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

import { main_BANG_ } from "./js-out/respo.main.js"
import { main_$x_ } from "./js-out/respo.main.js"

main_BANG_()
main_$x_()

if (import.meta.hot) {
import.meta.hot.accept('./js-out/respo.main.js', (main) => {
main.reload_BANG_()
main.reload_$x_()
})
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "0.14.27",
"version": "0.14.28",
"dependencies": {
"@calcit/procs": "^0.3.37"
"@calcit/procs": "^0.4.0-a3"
},
"scripts": {
"test": "cr --once --emit-js --init-fn=respo.test.main/main! && target=node entry=./test.js yarn webpack && node js-out/bundle.js"
Expand Down
6 changes: 3 additions & 3 deletions test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

import { main_BANG_ } from "./js-out/respo.test.main.js"
import { main_$x_ } from "./js-out/respo.test.main.js"

main_BANG_()
main_$x_()

if (import.meta.hot) {
import.meta.hot.accept('./js-out/respo.test.main.js', (main) => {
main.reload_BANG_()
main.reload_$x_()
})
}
14 changes: 7 additions & 7 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3242f66

Please sign in to comment.