Merge pull request #8 from Cirru/migrate-cirru

migrate to stack.cirru storage file

Author: soyaine

README.md

@@ -19,7 +19,7 @@ Stack Editor
 npm install -g stack-editor
 ```
 
-Create `ir.edn`:
+Create `stack.cirru`:
 
 ```clojure
 {:package "demo"
@@ -29,7 +29,7 @@ Create `ir.edn`:
 Run editor:
 
 ```bash
-stack-editor ir.edn
+stack-editor stack.cirru
 ```
 
 ![Command Line](https://pbs.twimg.com/media/DClMKBMUIAAL5X5.png:large)
@@ -49,7 +49,7 @@ For the UI part of the editor, it's based on the address:
 For the [server part](https://github.com/Cirru/stack-server), is an npm command line:
 
 ```bash
-op=watch port=7010 extension=.cljs out=src/ stack-editor ir.edn
+op=watch port=7010 extension=.cljs out=src/ stack-editor stack.cirru
 ```
 
 * `port`, defaults to `7010`, server port corresponding to the UI part

ir.edn

@@ -8,6 +8,14 @@
 
 (defonce *remote-sepal (atom nil))
 
+(defn display-code! [store]
+  (let [writer (:writer store)
+        collection (:collection store)
+        path-info (get (:stack writer) (:pointer writer))
+        tree (get-in store (make-path path-info))]
+    (if (some? tree)
+      (-> js/window (.open) (.-document) (.write "<pre><code>" (pr-str tree) "</code></pre>")))))
+
 (def options
   (merge {"port" "7010", "host" "localhost"} (parse-query (.-search js/location))))
 
@@ -59,11 +67,3 @@
         (dispatch! :notification/add-one "Connection failed!")
         (let [response (read-string (:response error))]
           (dispatch! :notification/add-one (:status response)))))}))
-
-(defn display-code! [store]
-  (let [writer (:writer store)
-        collection (:collection store)
-        path-info (get (:stack writer) (:pointer writer))
-        tree (get-in store (make-path path-info))]
-    (if (some? tree)
-      (-> js/window (.open) (.-document) (.write "<pre><code>" (pr-str tree) "</code></pre>")))))

src/app/actions.cljs

@@ -8,15 +8,19 @@
             [app.style.widget :as widget]
             [app.util.keycode :as keycode]))
 
-(defn on-input [e d! m!] (m! (:value e)))
+(defn on-edit-def [ns-text def-text]
+  (fn [e dispatch!]
+    (dispatch! :collection/edit {:kind :defs, :ns ns-text, :extra def-text, :focus [2]})))
+
+(defn on-edit-ns [ns-text]
+  (fn [e dispatch!]
+    (dispatch! :collection/edit {:kind :ns, :ns ns-text, :extra nil, :focus []})))
 
 (defn on-edit-procs [ns-text]
   (fn [e dispatch!]
     (dispatch! :collection/edit {:kind :procs, :ns ns-text, :extra nil, :focus []})))
 
-(def style-link {:cursor :pointer})
-
-(defn on-remove [ns-text] (fn [e d! m!] (d! :collection/remove-file ns-text)))
+(defn on-input [e d! m!] (m! (:value e)))
 
 (defn on-keydown [ns-text def-text]
   (fn [e d! m!]
@@ -25,16 +29,12 @@
       (if (not (string/blank? def-text))
         (do (d! :collection/add-definition [ns-text def-text]) (m! ""))))))
 
-(defn on-edit-ns [ns-text]
-  (fn [e dispatch!]
-    (dispatch! :collection/edit {:kind :ns, :ns ns-text, :extra nil, :focus []})))
-
-(defn on-edit-def [ns-text def-text]
-  (fn [e dispatch!]
-    (dispatch! :collection/edit {:kind :defs, :ns ns-text, :extra def-text, :focus [2]})))
+(defn on-remove [ns-text] (fn [e d! m!] (d! :collection/remove-file ns-text)))
 
 (def style-file {:padding "16px", :font-size 16, :line-height 1.6})
 
+(def style-link {:cursor :pointer})
+
 (defcomp
  comp-brief-file
  (states ns-text file)

src/app/comp/brief_file.cljs

@@ -4,15 +4,15 @@
             [respo.core :refer [defcomp div <> span input]]
             [hsl.core :refer [hsl]]))
 
+(defn on-click [on-select] (fn [e dispatch!] (on-select dispatch!)))
+
 (def style-command
   {:backgroud-color (hsl 0 0 0),
    :padding "0 8px",
    :line-height 2.4,
    :font-family "Source Code Pro, Menlo,monospace",
    :cursor "pointer"})
 
-(defn on-click [on-select] (fn [e dispatch!] (on-select dispatch!)))
-
 (defcomp
  comp-command
  (command selected? on-select)

src/app/comp/command.cljs

@@ -17,15 +17,15 @@
 
 (def style-circular {:text-decoration :underline})
 
+(def style-count {:font-size 12, :color (hsl 0 0 100 0.4)})
+
 (def style-def
   {:color (hsl 0 0 70 0.7), :font-size 14, :cursor :pointer, :white-space :nowrap})
 
 (def style-external {:color (hsl 260 16 44), :font-size 12, :cursor :default})
 
 (def style-highlight {:color (hsl 0 0 100 0.86)})
 
-(def style-count {:font-size 12, :color (hsl 0 0 100 0.4)})
-
 (defcomp
  comp-def
  (child-node path selected?)

src/app/comp/def.cljs

@@ -10,20 +10,9 @@
             [app.style.widget :as widget]
             [app.util.keycode :as keycode]))
 
-(def style-body {:flex 1, :overflow :auto})
-
-(def style-highlight {:color (hsl 0 0 100 0.9)})
-
-(def style-toolbar {:padding "16px 16px"})
-
-(def style-column {:padding "16px 16px", :min-width 80, :line-height 1.6, :overflow :auto})
-
-(defn on-view [path ns-piece]
-  (fn [e dispatch!] (dispatch! :graph/view-ns (conj path ns-piece))))
-
 (defn on-change [cursor] (fn [e dispatch!] (dispatch! :states [cursor (:value e)])))
 
-(def style-file-tree {:background-color (hsl 0 0 0)})
+(defn on-graph [e dispatch!] (dispatch! :router/route {:name :graph, :data nil}))
 
 (defn on-keydown [state cursor]
   (fn [e dispatch!]
@@ -34,10 +23,13 @@
          (dispatch! :collection/add-namespace state))
        (dispatch! :states [cursor ""])))))
 
-(defn on-graph [e dispatch!] (dispatch! :router/route {:name :graph, :data nil}))
-
 (defn on-stack [e d! m!] (d! :router/route {:name :workspace, :data nil}))
 
+(defn on-view [path ns-piece]
+  (fn [e dispatch!] (dispatch! :graph/view-ns (conj path ns-piece))))
+
+(def style-toolbar {:padding "16px 16px"})
+
 (defn render-toolbar [state cursor]
   (div
    {:style style-toolbar}
@@ -52,9 +44,17 @@
      :on-input (on-change cursor),
      :on-keydown (on-keydown state cursor)})))
 
+(def style-body {:flex 1, :overflow :auto})
+
+(def style-column {:padding "16px 16px", :min-width 80, :line-height 1.6, :overflow :auto})
+
 (def style-file
   {:cursor :pointer, :color (hsl 0 0 100 0.5), :white-space :nowrap, :font-size 16})
 
+(def style-file-tree {:background-color (hsl 0 0 0)})
+
+(def style-highlight {:color (hsl 0 0 100 0.9)})
+
 (defcomp
  comp-file-tree
  (states store)

src/app/comp/file_tree.cljs

@@ -9,21 +9,15 @@
             [app.style.widget :as widget]
             [clojure.set :as set]))
 
-(def style-body {:flex 1, :overflow :auto})
-
-(def style-graph {:background-color (hsl 0 0 0), :overflow :auto})
-
-(defn on-load [e dispatch!] (dispatch! :graph/load-graph nil))
-
-(def style-toolbar {:padding 16})
+(defn on-edit [e dispatch!] (dispatch! :graph/edit-current nil))
 
 (defn on-files [e dispatch!] (dispatch! :router/route {:name :file-tree, :data nil}))
 
-(def style-column {:min-width 80, :overflow :auto, :padding "16px 16px", :flex-shrink 0})
+(defn on-load [e dispatch!] (dispatch! :graph/load-graph nil))
 
 (defn on-orphans [e dispatch!] (dispatch! :graph/show-orphans nil))
 
-(defn on-edit [e dispatch!] (dispatch! :graph/edit-current nil))
+(def style-toolbar {:padding 16})
 
 (defn render-toolbar []
   (div
@@ -38,6 +32,12 @@
     (=< 8 nil)
     (button {:inner-text "Find orphans", :style widget/button, :on-click on-orphans}))))
 
+(def style-body {:flex 1, :overflow :auto})
+
+(def style-column {:min-width 80, :overflow :auto, :padding "16px 16px", :flex-shrink 0})
+
+(def style-graph {:background-color (hsl 0 0 0), :overflow :auto})
+
 (defcomp
  comp-graph
  (store)

src/app/comp/graph.cljs

@@ -8,6 +8,17 @@
             [cljs.reader :refer [read-string]]
             [app.util.detect :refer [cirru-vec?]]))
 
+(defn on-change [cursor] (fn [e dispatch!] (dispatch! :states [cursor (:value e)])))
+
+(defn on-hydrate [text]
+  (fn [e dispatch!]
+    (let [piece (read-string text)]
+      (if (cirru-vec? piece)
+        (do (dispatch! :collection/hydrate piece) (dispatch! :modal/recycle nil))
+        (dispatch! :notification/add-one (str "Checking failed: " (pr-str text)))))))
+
+(def style-hint {:font-family "Hind"})
+
 (def style-textarea
   {:background-color (hsl 0 0 100 0.2),
    :font-family "Source Code Pro, Menlo",
@@ -17,19 +28,8 @@
    :height 200,
    :line-height "24px"})
 
-(def style-hint {:font-family "Hind"})
-
 (def style-toolbar {:justify-content :flex-end})
 
-(defn on-change [cursor] (fn [e dispatch!] (dispatch! :states [cursor (:value e)])))
-
-(defn on-hydrate [text]
-  (fn [e dispatch!]
-    (let [piece (read-string text)]
-      (if (cirru-vec? piece)
-        (do (dispatch! :collection/hydrate piece) (dispatch! :modal/recycle nil))
-        (dispatch! :notification/add-one (str "Checking failed: " (pr-str text)))))))
-
 (defcomp
  comp-hydrate
  (states)

src/app/comp/hydrate.cljs

@@ -8,8 +8,19 @@
             [app.comp.hydrate :refer [comp-hydrate]]
             [app.comp.orphans :refer [comp-orphans]]))
 
+(defn on-recycle [e dispatch!] (dispatch! :modal/recycle nil))
+
 (defn on-tip [e dispatch!] )
 
+(defn renderer [states kind title data]
+  (div
+   {}
+   (case title
+     :rename-path (comp-rename-path (>> states :rename-path) data)
+     :hydrate (comp-hydrate (>> states :hydrate))
+     :orphans (comp-orphans data)
+     (<> span title nil))))
+
 (def style-modal
   (merge
    ui/center
@@ -21,17 +32,6 @@
     :width "100%",
     :height "100%"}))
 
-(defn on-recycle [e dispatch!] (dispatch! :modal/recycle nil))
-
-(defn renderer [states kind title data]
-  (div
-   {}
-   (case title
-     :rename-path (comp-rename-path (>> states :rename-path) data)
-     :hydrate (comp-hydrate (>> states :hydrate))
-     :orphans (comp-orphans data)
-     (<> span title nil))))
-
 (defcomp
  comp-modal-stack
  (states modal-stack)

src/app/comp/modal_stack.cljs

@@ -4,20 +4,20 @@
             [respo.core :refer [defcomp div list-> <> span input]]
             [respo-ui.core :as ui]))
 
-(def style-container
-  {:width 800, :height 400, :overflow :auto, :padding 16, :background (hsl 0 0 0 0.9)})
-
-(def style-def {:min-width 200, :display :inline-block, :cursor :pointer})
-
-(def style-title {:font-size 24, :font-weight 100, :font-family "Josefin Sans"})
-
 (defn on-edit [def-info]
   (fn [e dispatch!]
     (dispatch!
      :collection/edit
      {:kind :defs, :ns (:ns def-info), :extra (:def def-info), :focus [1]})
     (dispatch! :modal/recycle nil)))
 
+(def style-container
+  {:width 800, :height 400, :overflow :auto, :padding 16, :background (hsl 0 0 0 0.9)})
+
+(def style-def {:min-width 200, :display :inline-block, :cursor :pointer})
+
+(def style-title {:font-size 24, :font-weight 100, :font-family "Josefin Sans"})
+
 (defcomp
  comp-orphans
  (orphans)

src/app/comp/orphans.cljs

@@ -10,8 +10,7 @@
             [app.style.widget :as widget]
             [app.util.detect :refer [fuzzy-search]]))
 
-(defn on-input [cursor state]
-  (fn [e dispatch!] (dispatch! :states [cursor (merge state {:text (:value e), :cursor 0})])))
+(def basic-commands [[:save] [:load] [:hydrate] [:dehydrate] [:graph]])
 
 (defn handle-command [cursor commands files dispatch!]
   (let [command (get (into [] commands) cursor)]
@@ -37,18 +36,12 @@
         (do
          (dispatch!
           :collection/edit
-          {:ns (get command 1), :kind :procs, :extra nil, :focus [0]}))
-      nil)))
-
-(def style-container
-  {:position "fixed", :background-color (hsl 200 40 10 0.8), :justify-content "center"})
-
-(defn on-select [cursor commands files]
-  (fn [dispatch!] (handle-command cursor commands files dispatch!)))
+          {:ns (get command 1), :kind :procs, :extra nil, :focus [0]})))))
 
 (def initial-state {:text "", :cursor 0})
 
-(def basic-commands [[:save] [:load] [:hydrate] [:dehydrate] [:graph]])
+(defn on-input [cursor state]
+  (fn [e dispatch!] (dispatch! :states [cursor (merge state {:text (:value e), :cursor 0})])))
 
 (defn on-keydown [respo-cursor state commands cursor collection]
   (fn [e dispatch!]
@@ -71,6 +64,12 @@
            (handle-command cursor commands collection dispatch!))
         :else nil))))
 
+(defn on-select [cursor commands files]
+  (fn [dispatch!] (handle-command cursor commands files dispatch!)))
+
+(def style-container
+  {:position "fixed", :background-color (hsl 200 40 10 0.8), :justify-content "center"})
+
 (defcomp
  comp-palette
  (states files)

src/app/comp/palette.cljs

@@ -12,9 +12,6 @@
 
 (defn on-input [e dispatch! m!] (m! (:value e)))
 
-(defn on-rename [code-path text]
-  (fn [e d! m!] (d! :collection/rename [code-path text]) (d! :modal/recycle nil) (m! nil)))
-
 (defn on-keydown [code-path text]
   (fn [e d! m!]
     (println keycode/key-esc)
@@ -24,6 +21,9 @@
       (= (:key-code e) keycode/key-esc) (d! :modal/recycle nil)
       :else nil)))
 
+(defn on-rename [code-path text]
+  (fn [e d! m!] (d! :collection/rename [code-path text]) (d! :modal/recycle nil) (m! nil)))
+
 (defcomp
  comp-rename-path
  (states code-path)