update to latest Rust runtime; bump 0.0.2

Cumulo · Aug 20, 2021 · e55cd60 · e55cd60
1 parent 2d3c42c
commit e55cd60
Show file tree

Hide file tree

Showing 7 changed files with 1,371 additions and 904 deletions.
diff --git a/.github/workflows/compile.yaml b/.github/workflows/compile.yaml
@@ -4,23 +4,43 @@ on:
   push:
     branches:
       - master
+      - main
   pull_request: {}
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: wget
-      run: mkdir ci-bin/ && wget -O ci-bin/calcit_runner http://repo.calcit-lang.org/binaries/linux/calcit_runner
-    - name: "permission"
-      run: chmod +x ci-bin/calcit_runner
+    - uses: actions/checkout@v2
+
+
+    - name: Get yarn cache
+      id: yarn-cache
+      run: echo "::set-output name=dir::$(yarn cache dir)"
+
+    - uses: actions/cache@v2
+      name: Cache node modules of yarn
+      with:
+        path: ${{ steps.yarn-cache.outputs.dir }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-yarn-
+    - name: ACTIONS_ALLOW_UNSECURE_COMMANDS
+      id: ACTIONS_ALLOW_UNSECURE_COMMANDS
+      run: echo 'ACTIONS_ALLOW_UNSECURE_COMMANDS=true' >> $GITHUB_ENV
+
+    - name: add cr
+      run: |
+        mkdir -p $GITHUB_WORKSPACE/bin
+        wget -O $GITHUB_WORKSPACE/bin/cr http://repo.calcit-lang.org/binaries/linux/cr
+        chmod +x $GITHUB_WORKSPACE/bin/cr
+        echo "::add-path::$GITHUB_WORKSPACE/bin"
 
     - name: "prepare modules"
       run: >
         mkdir -p ~/.config/calcit/modules/ && cd ~/.config/calcit/modules/
 
     - name: "compiles to js"
       run: >
-        ./ci-bin/calcit_runner --emit-js --once
-        && ./ci-bin/calcit_runner --emit-js --once --emit-path out-page/ --init-fn cumulo-util.client/main! --reload-fn cumulo-util.client/reload!
+        cr --emit-js --once
+        && cr --emit-js --once --emit-path out-page/ --init-fn cumulo-util.client/main! --reload-fn cumulo-util.client/reload!
diff --git a/calcit.cirru b/calcit.cirru
diff --git a/compact.cirru b/compact.cirru
@@ -2,8 +2,18 @@
 {} (:package |cumulo-util)
   :configs $ {} (:init-fn |cumulo-util.app/main!) (:reload-fn |cumulo-util.app/reload!)
     :modules $ []
-    :version |0.0.1
+    :version |0.0.2
   :files $ {}
+    |cumulo-util.client $ {}
+      :ns $ quote
+        ns cumulo-util.client $ :require
+          [] cumulo-util.core :refer $ [] on-page-touch
+      :defs $ {}
+        |main! $ quote
+          defn main! () $ on-page-touch
+            fn () $ println "\"called"
+        |reload! $ quote
+          defn reload! $
     |cumulo-util.app $ {}
       :ns $ quote
         ns cumulo-util.app $ :require
@@ -12,29 +22,16 @@
       :defs $ {}
         |main! $ quote
           defn main! () (println "\"Started") (task!) (write-mildly! "\"a/a/a" "\"a")
-        |reload! $ quote
-          defn reload! () (println "\"Reload") (task!)
         |task! $ quote
           defn task! () $ echo "\"Task..."
-      :proc $ quote ()
-    |cumulo-util.client $ {}
-      :ns $ quote
-        ns cumulo-util.client $ :require
-          [] cumulo-util.core :refer $ [] on-page-touch
-      :defs $ {}
-        |main! $ quote
-          defn main! () $ on-page-touch
-            fn () $ println "\"called"
         |reload! $ quote
-          defn reload! $
-      :proc $ quote ()
+          defn reload! () (println "\"Reload") (task!)
     |cumulo-util.core $ {}
       :ns $ quote
         ns cumulo-util.core $ :require ([] "\"shortid" :as shortid)
       :defs $ {}
-        |delay! $ quote
-          defn delay! (duration task)
-            js/setTimeout task $ * 1000 duration
+        |unix-time! $ quote
+          defn unix-time! () $ .valueOf (new js/Date)
         |id! $ quote
           defn id! () $ shortid/generate
         |on-page-touch $ quote
@@ -48,17 +45,20 @@
                 when
                   = "\"visible" $ .-visibilityState js/document
                   call-listener
+        |*cooling $ quote (defatom *cooling false)
+        |delay! $ quote
+          defn delay! (duration task)
+            js/setTimeout task $ * 1000 duration
         |repeat! $ quote
           defn repeat! (duration task)
             js/setInterval task $ * 1000 duration
-        |unix-time! $ quote
-          defn unix-time! () $ .valueOf (new js/Date)
-        |*cooling $ quote (defatom *cooling false)
-      :proc $ quote ()
     |cumulo-util.file $ {}
       :ns $ quote
         ns cumulo-util.file $ :require ([] "\"path" :as path) ([] "\"fs" :as fs) ([] "\"child_process" :as cp) ([] "\"net" :as net)
       :defs $ {}
+        |sh! $ quote
+          defn sh! (command) (println command)
+            println $ .toString (cp/execSync command)
         |get-backup-path! $ quote
           defn get-backup-path! () $ let
               now $ new js/Date
@@ -73,15 +73,12 @@
               if found?
                 parse-cirru-edn $ fs/readFileSync filepath |utf8
                 , nil
-        |sh! $ quote
-          defn sh! (command) (println command)
-            println $ .toString (cp/execSync command)
         |write-mildly! $ quote
           defn write-mildly! (file-path content)
             let
                 dir $ path/dirname file-path
                 filename $ path/basename file-path
-                temp-name $ str "\"/tmp/" (.now js/Date) "\"-" (.random js/Math) "\"-" filename
+                temp-name $ str "\"/tmp/" (js/Date.now) "\"-" (js/Math.random) "\"-" filename
                 do-write! $ fn () (fs/writeFileSync temp-name content) (fs/renameSync temp-name file-path) (println "\"Write to file:" file-path)
               if (fs/existsSync file-path)
                 let
@@ -94,4 +91,3 @@
                     fs/mkdirSync dir $ to-js-data
                       {} $ :recursive true
                   do-write!
-      :proc $ quote ()
diff --git a/main.js b/main.js
@@ -1,10 +1,10 @@
 
-import { main_BANG_ } from "./out-page/cumulo-util.client.js"
+import { main_$x_ } from "./out-page/cumulo-util.client.js"
 
-main_BANG_()
+main_$x_()
 
 if (import.meta.hot) {
   import.meta.hot.accept('./out-page/cumulo-util.client.js', (main) => {
-    main.reload_BANG_()
+    main.reload_$x_()
   })
 }
diff --git a/package.json b/package.json
@@ -1,18 +1,18 @@
 {
   "dependencies": {
-    "@calcit/procs": "^0.3.0-a11"
+    "@calcit/procs": "^0.4.18"
   },
   "scripts": {
-    "watch-server": "calcit_runner --emit-js",
+    "watch-server": "cr --emit-js",
     "build-server": "target=node entry=./server.js yarn webpack && node js-out/bundle.js",
-    "watch-page": "calcit_runner --emit-js --emit-path out-page/ --init-fn cumulo-util.client/main! --reload-fn cumulo-util.client/reload!"
+    "watch-page": "cr --emit-js --emit-path out-page/ --init-fn cumulo-util.client/main! --reload-fn cumulo-util.client/reload!"
   },
   "devDependencies": {
     "shortid": "^2.2.16",
-    "vite": "^2.2.3",
-    "webpack": "^5.36.0",
-    "webpack-cli": "^4.6.0",
-    "ws": "^7.4.5"
+    "vite": "^2.5.0",
+    "webpack": "^5.51.1",
+    "webpack-cli": "^4.8.0",
+    "ws": "^8.2.0"
   },
-  "version": "0.0.1"
+  "version": "0.0.2"
 }
diff --git a/server.js b/server.js
@@ -1,10 +1,10 @@
 
-import { main_BANG_ } from "./js-out/cumulo-util.app.js"
+import { main_$x_ } from "./js-out/cumulo-util.app.js"
 
-main_BANG_()
+main_$x_()
 
 if (import.meta.hot) {
   import.meta.hot.accept('./js-out/cumulo-util.app.js', (main) => {
-    main.reload_BANG_()
+    main.reload_$x_()
   })
 }