Browse Source

fix: rename api-query-token options to api-server-token

api-query-token doesn't make sense as a name as it the token isn't
specific to query. This was an accidental name while working on query
cmd
Gabriel Horner 1 tháng trước cách đây
mục cha
commit
610e77bb90

+ 1 - 0
deps/cli/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 0.2.0
 * Add export command to export graph as markdown
 * Like export command, export-edn command defaults to exporting to file
+* Rename --api-query-token options to --api-server-token
 
 ## 0.1.0
 

+ 1 - 1
deps/cli/README.md

@@ -12,7 +12,7 @@ This section assumes you have installed the CLI from npm or via the [dev
 setup](#setup). If you haven't, substitute `node cli.mjs` for `logseq` e.g.
 `node.cli.mjs -h`.
 
-All commands can be used offline or on CI. The `search` command and any command that has an api-query-token option require the [HTTP API Server](https://docs.logseq.com/#/page/local%20http%20server) to be turned on.
+All commands can be used offline or on CI. The `search` command and any command that has an api-server-token option require the [HTTP API Server](https://docs.logseq.com/#/page/local%20http%20server) to be turned on.
 
 Now let's use it!
 

+ 3 - 3
deps/cli/src/logseq/cli/commands/query.cljs

@@ -99,8 +99,8 @@
         (cli-util/error "Graph" (pr-str graph') "does not exist")))))
 
 (defn query
-  [{{:keys [graph args api-query-token]} :opts :as m}]
-  (if api-query-token
+  [{{:keys [graph args api-server-token]} :opts :as m}]
+  (if api-server-token
     ;; graph can be query since it's not used for api-query
-    (api-query (or graph (first args)) api-query-token)
+    (api-query (or graph (first args)) api-server-token)
     (local-query m)))

+ 4 - 4
deps/cli/src/logseq/cli/commands/search.cljs

@@ -41,8 +41,8 @@
                                 (map highlight-fn)))))))
 
 (defn- api-search
-  [search-term {{:keys [api-query-token raw limit]} :opts}]
-  (-> (p/let [resp (cli-util/api-fetch api-query-token "logseq.app.search" [search-term {:limit limit}])]
+  [search-term {{:keys [api-server-token raw limit]} :opts}]
+  (-> (p/let [resp (cli-util/api-fetch api-server-token "logseq.app.search" [search-term {:limit limit}])]
         (if (= 200 (.-status resp))
           (p/let [body (.json resp)]
             (let [{:keys [blocks]} (js->clj body :keywordize-keys true)]
@@ -61,7 +61,7 @@
       (format-results nodes search-term {:raw raw}))
     (cli-util/error "Graph" (pr-str graph) "does not exist")))
 
-(defn search [{{:keys [graph search-terms api-query-token]} :opts :as m}]
-  (if api-query-token
+(defn search [{{:keys [graph search-terms api-server-token]} :opts :as m}]
+  (if api-server-token
     (api-search (string/join " " (into [graph] search-terms)) m)
     (local-search (string/join " " search-terms) m)))

+ 4 - 4
deps/cli/src/logseq/cli/spec.cljs

@@ -34,12 +34,12 @@
                          :desc "Make properties on entity queries show property values instead of ids"}
    :title-query {:alias :t
                  :desc "Invoke local query on :block/title"}
-   :api-query-token {:alias :a
-                     :desc "Query current graph with api server token"}})
+   :api-server-token {:alias :a
+                     :desc "API server token to query current graph"}})
 
 (def search
-  {:api-query-token {:alias :a
-                     :desc "Api server token"}
+  {:api-server-token {:alias :a
+                     :desc "API server token to search current graph"}
    :raw {:alias :r
          :desc "Print raw response"}
    :limit {:alias :l