Carve up to frontend.components.sidebar

.carve/ignore

@@ -1,20 +1,10 @@
-electron.configs/del-item!
-electron.core/ROOT_PATH
+;; Used by shadow-cljs
 electron.core/main
 electron.core/start
 electron.core/stop
-electron.git/dot-git-exists?
-electron.search/error
+;; repl fn
 electron.search/query
 frontend.blob/blob
-frontend.commands/insert-before!
-frontend.commands/get-command-input
-frontend.components.block/selection-range-in-block?
-frontend.components.block/blocks-cp
-frontend.components.export/export-page
-frontend.components.page/get-page-format
-frontend.components.page/show-journal?
-frontend.components.settings/set-cors
 frontend.components.sidebar/nav-item
 frontend.components.svg/arrow-left
 frontend.components.svg/arrow-right

scripts/carve.clj

@@ -35,7 +35,8 @@ in an optional string of options"
   [args]
   (let [default-opts (slurp ".carve/config.edn")
          opts (if-let [more-opts (first args)]
-                (pr-str (merge (edn/read-string default-opts) (edn/read-string more-opts)))
+                (pr-str (merge (select-keys (edn/read-string default-opts) [:paths :api-namespaces])
+                               (edn/read-string more-opts)))
                 default-opts)]
     (apply carve.main/-main ["--opts" opts])))
 

src/electron/electron/configs.cljs

@@ -32,12 +32,6 @@
         cfg (assoc cfg k v)]
     (write-cfg! cfg)))
 
-(defn del-item!
-  [k]
-  (when-let [cfg (and k (ensure-cfg))]
-    (let [cfg (dissoc cfg k)]
-      (write-cfg! cfg))))
-
 (defn get-item
   [k]
   (when-let [cfg (and k (ensure-cfg))]

src/electron/electron/core.cljs

@@ -24,8 +24,6 @@
 (defonce STATIC_URL (str LSP_PROTOCOL "logseq.com/"))
 (defonce PLUGINS_ROOT (.join path (.homedir os) ".logseq/plugins"))
 
-(def ROOT_PATH (path/join js/__dirname ".."))
-
 (defonce *setup-fn (volatile! nil))
 (defonce *teardown-fn (volatile! nil))
 (defonce *quit-dirty? (volatile! true))

src/electron/electron/git.cljs

@@ -20,11 +20,6 @@
       (. fs ensureDirSync dir)
       dir)))
 
-(defn dot-git-exists?
-  []
-  (let [p (.join path (state/get-graph-path) ".git")]
-    (fs/existsSync p)))
-
 (defn run-git!
   [commands]
   (when-let [path (state/get-graph-path)]

src/electron/electron/search.cljs

@@ -3,13 +3,10 @@
             ["fs-extra" :as fs]
             ["better-sqlite3" :as sqlite3]
             [clojure.string :as string]
-            [electron.utils :refer [logger] :as utils]
             ["electron" :refer [app]]))
 
 (defonce version "0.0.1")
 
-(def error (partial (.-error logger) "[Search]"))
-
 (defonce databases (atom nil))
 
 (defn close!

src/main/frontend/commands.cljs

@@ -416,26 +416,6 @@
     (when check-fn
       (check-fn new-value (dec (count prefix)) new-pos))))
 
-(defn insert-before!
-  [id value
-   {:keys [backward-pos forward-pos check-fn]
-    :as _option}]
-  (let [input (gdom/getElement id)
-        edit-content (gobj/get input "value")
-        current-pos (cursor/pos input)
-        suffix (subs edit-content 0 current-pos)
-        new-value (str value
-                       suffix
-                       (subs edit-content current-pos))
-        new-pos (- (+ (count suffix)
-                      (count value)
-                      (or forward-pos 0))
-                   (or backward-pos 0))]
-    (state/set-block-content-and-last-pos! id new-value new-pos)
-    (cursor/move-cursor-to input new-pos)
-    (when check-fn
-      (check-fn new-value (dec (count suffix)) new-pos))))
-
 (defn simple-replace!
   [id value selected
    {:keys [backward-pos forward-pos check-fn]
@@ -482,14 +462,6 @@
                         :extract-fn first
                         :limit 50)))
 
-(defn get-command-input
-  [edit-content]
-  (when-not (string/blank? edit-content)
-    (let [result (last (util/split-last (state/get-editor-command-trigger) edit-content))]
-      (if (string/blank? result)
-        nil
-        result))))
-
 (defmulti handle-step first)
 
 (defmethod handle-step :editor/hook [[_ event {:keys [pid uuid] :as payload}] format]

src/main/frontend/components/block.cljs

@@ -708,13 +708,6 @@
     (let [inline-list (mldoc/inline->edn v (mldoc/default-config format))]
       [:div.inline.mr-1 (map-inline {} inline-list)])))
 
-(defn selection-range-in-block? []
-  (and (= "Range" (. (js/window.getSelection) -type))
-       (-> (js/window.getSelection)
-           (.-anchorNode)
-           (.-parentNode)
-           (.closest ".block-content"))))
-
 (defn- render-macro
   [config name arguments macro-content format]
   (if macro-content
@@ -1340,8 +1333,6 @@
     :else
     ""))
 
-(declare blocks-cp)
-
 (rum/defc block-child
   [block]
   block)

src/main/frontend/components/export.cljs

@@ -43,25 +43,6 @@
        [:a#convert-markdown-to-unordered-list-or-heading.hidden]])))
 
 
-(rum/defc export-page
-  []
-  #_:clj-kondo/ignore
-  (when-let [current-repo (state/get-current-repo)]
-    (when-let [page (state/get-current-page)]
-      (rum/with-context [[t] i18n/*tongue-context*]
-        [:div.export
-         [:h1.title "Export"]
-         [:ul.mr-1
-          [:li.mb-4
-           [:a.font-medium {:on-click #(export/export-page-as-markdown! page)}
-            (t :export-markdown)]]
-          [:li.mb-4
-           [:a.font-medium {:on-click #(export/export-page-as-opml! page)}
-            (t :export-opml)]]]
-         [:a#export-page-as-markdown.hidden]
-         [:a#export-page-as-opml.hidden]
-         [:a#convert-markdown-to-unordered-list-or-heading.hidden]]))))
-
 (def *export-block-type (atom :text))
 
 (def text-indent-style-options [{:label "dashes"

src/main/frontend/components/page.cljs

@@ -78,15 +78,6 @@
 
 (declare page)
 
-(defn- get-page-format
-  [page-name]
-  (let [block? (util/uuid-string? page-name)
-        block-id (and block? (uuid page-name))
-        page (if block-id
-               (:block/name (:block/page (db/entity [:block/uuid block-id])))
-               page-name)]
-    (db/get-page-format page)))
-
 (rum/defc dummy-block
   [page-name]
   [:div.ls-block.flex-1.flex-col.rounded-sm {:style {:width "100%"}}
@@ -341,8 +332,6 @@
 
 (defonce layout (atom [js/window.innerWidth js/window.innerHeight]))
 
-(defonce show-journal? (atom false))
-
 ;; scrollHeight
 (rum/defcs graph-filter-section < (rum/local false ::open?)
   [state title content {:keys [search-filters]}]

src/main/frontend/components/settings.cljs

@@ -50,30 +50,6 @@
 
       [:span.pl-1.opacity-70 "Git commit requires the email address."]]]))
 
-(rum/defcs set-cors < (rum/local "" ::cors)
-  [state]
-  (let [cors (get state ::cors)]
-    [:div.p-8.flex.items-center.justify-center
-     [:div.w-full.mx-auto
-      [:div
-       [:div
-        [:h1.title.mb-1
-         "Your cors address:"]
-        [:div.mt-2.mb-4.relative.rounded-md.max-w-xs
-         [:input#.form-input.is-small
-          {:autoFocus true
-           :on-change (fn [e]
-                        (reset! cors (util/evalue e)))}]]]]
-      (ui/button
-       "Submit"
-       :on-click
-       (fn []
-         (user-handler/set-cors! @cors)))
-
-      [:hr]
-
-      [:span.pl-1.opacity-70 "Git commit requires the cors address."]]]))
-
 (defn toggle
   [label-for name state on-toggle & [detail-text]]
   [:div.it.sm:grid.sm:grid-cols-3.sm:gap-4.sm:items-start

src/main/frontend/handler/export.cljs

@@ -430,25 +430,6 @@
           (.setAttribute anchor "download" (.-name zipfile))
           (.click anchor))))))
 
-(defn export-page-as-markdown!
-  [page-name]
-  (when-let [repo (state/get-current-repo)]
-    (when-let [file (db/get-page-file page-name)]
-      (when-let [path (:file/path file)]
-        (when-let [content (get-page-content repo page-name)]
-          (let [names [page-name]
-                format (f/get-format path)
-                files [{:path path :content content :names names :format format}]
-                files
-                (export-files-as-markdown repo files (state/export-heading-to-list?))
-                data (js/Blob. [(second (first files))]
-                               (clj->js {:type "text/plain;charset=utf-8,"}))
-                anchor (gdom/getElement "export-page-as-markdown")
-                url (js/window.URL.createObjectURL data)]
-            (.setAttribute anchor "href" url)
-            (.setAttribute anchor "download" path)
-            (.click anchor)))))))
-
 (defn export-repo-as-opml!
   #_:clj-kondo/ignore
   [repo]
@@ -462,25 +443,6 @@
                  (.setAttribute anchor "download" (.-name zipfile))
                  (.click anchor)))))))
 
-(defn export-page-as-opml!
-  [page-name]
-  (when-let [repo (state/get-current-repo)]
-    (when-let [file (db/get-page-file page-name)]
-      (when-let [path (:file/path file)]
-        (when-let [content (get-page-content repo page-name)]
-          (let [names [page-name]
-                format (f/get-format path)
-                files [{:path path :content content :names names :format format}]
-                files (export-files-as-opml repo files)
-                data (js/Blob. [(second (first files))]
-                               (clj->js {:type "text/plain;charset=utf-8,"}))
-                anchor (gdom/getElement "export-page-as-opml")
-                url (js/window.URL.createObjectURL data)
-                opml-path (string/replace (string/lower-case path) #"(.+)\.(md|org|markdown)$" "$1.opml")]
-            (.setAttribute anchor "href" url)
-            (.setAttribute anchor "download" opml-path)
-            (.click anchor)))))))
-
 (defn convert-page-markdown-unordered-list-or-heading!
   [page-name]
   (when-let [repo (state/get-current-repo)]