Jelajahi Sumber

Moved nbb ns into graph-parser. nbb mldoc tests wip

Gabriel Horner 3 tahun lalu
induk
melakukan
20b8b9624d

+ 1 - 1
src/main/frontend/encrypt.cljs

@@ -1,5 +1,5 @@
 (ns frontend.encrypt
-  (:require [frontend.utf8 :as utf8]
+  (:require [logseq.graph-parser.utf8 :as utf8]
             [frontend.db.utils :as db-utils]
             [frontend.db :as db]
             [promesa.core :as p]

+ 1 - 1
src/main/frontend/extensions/code.cljs

@@ -132,7 +132,7 @@
             [frontend.handler.editor :as editor-handler]
             [frontend.handler.file :as file-handler]
             [frontend.state :as state]
-            [frontend.utf8 :as utf8]
+            [logseq.graph-parser.utf8 :as utf8]
             [frontend.util :as util]
             [frontend.config :as config]
             [goog.dom :as gdom]

+ 1 - 1
src/main/frontend/format/block.cljs

@@ -8,7 +8,7 @@
             [frontend.format :as format]
             [frontend.state :as state]
             [logseq.graph-parser.text :as text]
-            [frontend.utf8 :as utf8]
+            [logseq.graph-parser.utf8 :as utf8]
             [frontend.util :as util]
             [frontend.util.property :as property]
             [logseq.graph-parser.util :as gp-util]

+ 1 - 1
src/main/frontend/handler/editor.cljs

@@ -35,7 +35,7 @@
             [frontend.state :as state]
             [frontend.template :as template]
             [logseq.graph-parser.text :as text]
-            [frontend.utf8 :as utf8]
+            [logseq.graph-parser.utf8 :as utf8]
             [frontend.util :as util :refer [profile]]
             [frontend.util.clock :as clock]
             [frontend.util.cursor :as cursor]

+ 1 - 1
src/main/logseq/graph_parser/mldoc.cljc

@@ -8,7 +8,7 @@
                                  :default [lambdaisland.glogi :as log])
             [goog.object :as gobj]
             [cljs-bean.core :as bean]
-            [frontend.utf8 :as utf8]
+            [logseq.graph-parser.utf8 :as utf8]
             [clojure.string :as string]
             [linked.core :as linked]
             [logseq.graph-parser.util :as gp-util]

+ 1 - 0
src/main/logseq/graph_parser/text.cljs

@@ -367,3 +367,4 @@
 ;; TODO: Properly fix this circular dependency:
 ;; mldoc/->edn > text/parse-property > mldoc/link? ->mldoc/inline->edn + mldoc/default-config
 (set! gp-mldoc/parse-property parse-property)
+; (alter-var-root #'gp-mldoc/parse-property (constantly parse-property))

+ 1 - 1
src/main/frontend/utf8.cljs → src/main/logseq/graph_parser/utf8.cljs

@@ -1,4 +1,4 @@
-(ns ^:nbb-compatible frontend.utf8
+(ns ^:nbb-compatible logseq.graph-parser.utf8
   (:require [goog.object :as gobj]))
 
 (defonce encoder

+ 3 - 2
src/test/logseq/graph_parser/mldoc_test.cljs

@@ -4,7 +4,8 @@
             ["child_process" :as child-process]
             [clojure.string :as string]
             [clojure.edn :as edn]
-            [frontend.format]
+            ;; hack needed for parse-property to exist
+            [logseq.graph-parser.text]
             [cljs.test :refer [testing deftest are is]]))
 
 (deftest test-link
@@ -102,7 +103,7 @@
     ; (prn (butlast (clojure.data/diff (edn/read-string (slurp "mldoc-asts.edn"))
     ;                                  asts-by-file)))
     ;; This is just temporary
-    (is (= (edn/read-string (slurp "mldoc-asts.edn"))
+    #_(is (= (edn/read-string (slurp "mldoc-asts.edn"))
              asts-by-file)
           "Matches initial AST")
     #_(println "Wrote asts for" (count asts-by-file) "files")

+ 11 - 0
src/test/logseq/test/nbb_test_runner.cljs

@@ -0,0 +1,11 @@
+(ns logseq.test.nbb-test-runner
+  (:require [cljs.test :as t]
+            [logseq.graph-parser.mldoc-test]))
+
+(defmethod cljs.test/report [:cljs.test/default :end-run-tests] [m]
+  (when-not (cljs.test/successful? m)
+    (set! (.-exitCode js/process) 1)))
+
+;; run this function with: nbb-logseq -m logseq.test.nbb-test-runner/run-tests
+(defn run-tests []
+  (t/run-tests 'logseq.graph-parser.mldoc-test))