Quellcode durchsuchen

Move graph-parser to its own dir

Gabriel Horner vor 3 Jahren
Ursprung
Commit
4813d903d5
31 geänderte Dateien mit 74 neuen und 10 gelöschten Zeilen
  1. 1 3
      .carve/config.edn
  2. 1 1
      .github/workflows/build.yml
  3. 2 2
      deps.edn
  4. 5 0
      deps/graph-parser/.carve/config.edn
  5. 10 0
      deps/graph-parser/deps.edn
  6. 8 0
      deps/graph-parser/package.json
  7. 0 0
      deps/graph-parser/src/logseq/graph_parser.cljs
  8. 0 0
      deps/graph-parser/src/logseq/graph_parser/block.cljc
  9. 0 0
      deps/graph-parser/src/logseq/graph_parser/cli.cljs
  10. 0 0
      deps/graph-parser/src/logseq/graph_parser/config.cljs
  11. 0 0
      deps/graph-parser/src/logseq/graph_parser/date_time_util.cljs
  12. 0 0
      deps/graph-parser/src/logseq/graph_parser/db.cljs
  13. 0 0
      deps/graph-parser/src/logseq/graph_parser/db/default.cljs
  14. 0 0
      deps/graph-parser/src/logseq/graph_parser/db/schema.cljs
  15. 0 0
      deps/graph-parser/src/logseq/graph_parser/extract.cljc
  16. 0 0
      deps/graph-parser/src/logseq/graph_parser/log.cljs
  17. 0 0
      deps/graph-parser/src/logseq/graph_parser/mldoc.cljc
  18. 0 0
      deps/graph-parser/src/logseq/graph_parser/property.cljs
  19. 0 0
      deps/graph-parser/src/logseq/graph_parser/text.cljs
  20. 0 0
      deps/graph-parser/src/logseq/graph_parser/utf8.cljs
  21. 0 0
      deps/graph-parser/src/logseq/graph_parser/util.cljs
  22. 0 0
      deps/graph-parser/test/logseq/graph_parser/block_test.cljs
  23. 0 0
      deps/graph-parser/test/logseq/graph_parser/extract_test.cljs
  24. 1 1
      deps/graph-parser/test/logseq/graph_parser/mldoc_test.cljs
  25. 0 0
      deps/graph-parser/test/logseq/graph_parser/nbb_test_runner.cljs
  26. 0 0
      deps/graph-parser/test/logseq/graph_parser/property_test.cljs
  27. 1 1
      deps/graph-parser/test/logseq/graph_parser/test/docs_graph_helper.cljs
  28. 0 0
      deps/graph-parser/test/logseq/graph_parser/text_test.cljs
  29. 1 1
      deps/graph-parser/test/logseq/graph_parser_test.cljs
  30. 43 0
      deps/graph-parser/yarn.lock
  31. 1 1
      src/test/frontend/handler/repo_test.cljs

+ 1 - 3
.carve/config.edn

@@ -5,7 +5,5 @@
                   ;; Ignore b/c too many false positives
                   frontend.db
                   ;; Used for debugging
-                  frontend.db.debug
-                  ;; carve doesn't detect nbb only usage
-                  logseq.graph-parser.log]
+                  frontend.db.debug]
  :report {:format :ignore}}

+ 1 - 1
.github/workflows/build.yml

@@ -80,7 +80,7 @@ jobs:
           node static/tests.js
 
       - name: Run nbb tests for graph-parser
-        run: yarn nbb-logseq -cp src/main:src/test -m logseq.graph-parser.nbb-test-runner/run-tests
+        run: yarn nbb-logseq -cp deps/graph-parser/src:deps/graph-parser/test -m logseq.graph-parser.nbb-test-runner/run-tests
       # In this job because it depends on an npm package
       - name: Load nbb compatible namespaces
         run: bb test:load-nbb-compatible-namespaces

+ 2 - 2
deps.edn

@@ -29,8 +29,8 @@
   camel-snake-kebab/camel-snake-kebab   {:mvn/version "0.4.2"}
   instaparse/instaparse                 {:mvn/version "1.4.10"}
   nubank/workspaces                     {:mvn/version "1.1.1"}
-  frankiesardo/linked                   {:mvn/version "1.3.0"}
-  org.clojars.mmb90/cljs-cache          {:mvn/version "0.1.4"}}
+  org.clojars.mmb90/cljs-cache          {:mvn/version "0.1.4"}
+  logseq/graph-parser                   {:local/root "deps/graph-parser"}}
 
  :aliases {:cljs {:extra-paths ["src/dev-cljs/" "src/test/" "src/electron/"]
                   :extra-deps  {org.clojure/clojurescript        {:mvn/version "1.11.54"}

+ 5 - 0
deps/graph-parser/.carve/config.edn

@@ -0,0 +1,5 @@
+{:paths ["src"]
+ :api-namespaces [
+                  ;; carve doesn't detect nbb only usage
+                  logseq.graph-parser.log]
+ :report {:format :ignore}}

+ 10 - 0
deps/graph-parser/deps.edn

@@ -0,0 +1,10 @@
+{:paths ["src"
+         ;; Needed for logseq tests to pull in logseq.graph-parser.test*
+         "test"]
+ :deps
+ ;; Deps should be kept in sync with https://github.com/logseq/nbb-logseq/blob/main/bb.edn
+ {datascript/datascript {:mvn/version "1.3.8"}
+  frankiesardo/linked {:mvn/version "1.3.0"}
+  com.andrewmcveigh/cljs-time {:git/url "https://github.com/logseq/cljs-time" ;; fork
+                               :sha     "5704fbf48d3478eedcf24d458c8964b3c2fd59a9"}
+  com.lambdaisland/glogi {:mvn/version "1.1.144"}}}

+ 8 - 0
deps/graph-parser/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "@logseq/graph-parser",
+  "version": "1.0.0",
+  "private": true,
+  "devDependencies": {
+    "@logseq/nbb-logseq": "^0.5.103"
+  }
+}

+ 0 - 0
src/main/logseq/graph_parser.cljs → deps/graph-parser/src/logseq/graph_parser.cljs


+ 0 - 0
src/main/logseq/graph_parser/block.cljc → deps/graph-parser/src/logseq/graph_parser/block.cljc


+ 0 - 0
src/main/logseq/graph_parser/cli.cljs → deps/graph-parser/src/logseq/graph_parser/cli.cljs


+ 0 - 0
src/main/logseq/graph_parser/config.cljs → deps/graph-parser/src/logseq/graph_parser/config.cljs


+ 0 - 0
src/main/logseq/graph_parser/date_time_util.cljs → deps/graph-parser/src/logseq/graph_parser/date_time_util.cljs


+ 0 - 0
src/main/logseq/graph_parser/db.cljs → deps/graph-parser/src/logseq/graph_parser/db.cljs


+ 0 - 0
src/main/logseq/graph_parser/db/default.cljs → deps/graph-parser/src/logseq/graph_parser/db/default.cljs


+ 0 - 0
src/main/logseq/graph_parser/db/schema.cljs → deps/graph-parser/src/logseq/graph_parser/db/schema.cljs


+ 0 - 0
src/main/logseq/graph_parser/extract.cljc → deps/graph-parser/src/logseq/graph_parser/extract.cljc


+ 0 - 0
src/main/logseq/graph_parser/log.cljs → deps/graph-parser/src/logseq/graph_parser/log.cljs


+ 0 - 0
src/main/logseq/graph_parser/mldoc.cljc → deps/graph-parser/src/logseq/graph_parser/mldoc.cljc


+ 0 - 0
src/main/logseq/graph_parser/property.cljs → deps/graph-parser/src/logseq/graph_parser/property.cljs


+ 0 - 0
src/main/logseq/graph_parser/text.cljs → deps/graph-parser/src/logseq/graph_parser/text.cljs


+ 0 - 0
src/main/logseq/graph_parser/utf8.cljs → deps/graph-parser/src/logseq/graph_parser/utf8.cljs


+ 0 - 0
src/main/logseq/graph_parser/util.cljs → deps/graph-parser/src/logseq/graph_parser/util.cljs


+ 0 - 0
src/test/logseq/graph_parser/block_test.cljs → deps/graph-parser/test/logseq/graph_parser/block_test.cljs


+ 0 - 0
src/test/logseq/graph_parser/extract_test.cljs → deps/graph-parser/test/logseq/graph_parser/extract_test.cljs


+ 1 - 1
src/test/logseq/graph_parser/mldoc_test.cljs → deps/graph-parser/test/logseq/graph_parser/mldoc_test.cljs

@@ -1,7 +1,7 @@
 (ns logseq.graph-parser.mldoc-test
   (:require [logseq.graph-parser.mldoc :as gp-mldoc]
             [clojure.string :as string]
-            [frontend.test.docs-graph-helper :as docs-graph-helper]
+            [logseq.graph-parser.test.docs-graph-helper :as docs-graph-helper]
             [cljs.test :refer [testing deftest are is]]))
 
 (deftest test-link

+ 0 - 0
src/test/logseq/graph_parser/nbb_test_runner.cljs → deps/graph-parser/test/logseq/graph_parser/nbb_test_runner.cljs


+ 0 - 0
src/test/logseq/graph_parser/property_test.cljs → deps/graph-parser/test/logseq/graph_parser/property_test.cljs


+ 1 - 1
src/test/frontend/test/docs_graph_helper.cljs → deps/graph-parser/test/logseq/graph_parser/test/docs_graph_helper.cljs

@@ -1,4 +1,4 @@
-(ns ^:nbb-compatible frontend.test.docs-graph-helper
+(ns ^:nbb-compatible logseq.graph-parser.test.docs-graph-helper
   "Helper fns for running tests against docs graph"
   (:require ["fs" :as fs]
             ["child_process" :as child-process]

+ 0 - 0
src/test/logseq/graph_parser/text_test.cljs → deps/graph-parser/test/logseq/graph_parser/text_test.cljs


+ 1 - 1
src/test/logseq/graph_parser_test.cljs → deps/graph-parser/test/logseq/graph_parser_test.cljs

@@ -3,7 +3,7 @@
   (:require [cljs.test :refer [deftest is testing]]
             [logseq.graph-parser :as graph-parser]
             [logseq.graph-parser.db :as gp-db]
-            [frontend.test.docs-graph-helper :as docs-graph-helper]
+            [logseq.graph-parser.test.docs-graph-helper :as docs-graph-helper]
             [datascript.core :as d]))
 
 (defn- get-top-block-properties

+ 43 - 0
deps/graph-parser/yarn.lock

@@ -0,0 +1,43 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@logseq/nbb-logseq@^0.5.103":
+  version "0.5.103"
+  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-0.5.103.tgz#1084380cd54c92ca8cc94a8934cc777206e45cc0"
+  integrity sha512-V9UW0XrCaaadHUc6/Hp9wfGpQqkzqzoqnDGeSVZkWR6l3QwyqGi9mkhnhVcfTwAvxIfOgrfz93GcaeepV4pYNA==
+  dependencies:
+    import-meta-resolve "^1.1.1"
+
+builtins@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-4.1.0.tgz#1edd016dd91ce771a1ed6fc3b2b71fb918953250"
+  integrity sha512-1bPRZQtmKaO6h7qV1YHXNtr6nCK28k0Zo95KM4dXfILcZZwoHJBN1m3lfLv9LPkcOZlrSr+J1bzMaZFO98Yq0w==
+  dependencies:
+    semver "^7.0.0"
+
+import-meta-resolve@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-1.1.1.tgz#244fd542fd1fae73550d4f8b3cde3bba1d7b2b18"
+  integrity sha512-JiTuIvVyPaUg11eTrNDx5bgQ/yMKMZffc7YSjvQeSMXy58DO2SQ8BtAf3xteZvmzvjYh14wnqNjL8XVeDy2o9A==
+  dependencies:
+    builtins "^4.0.0"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+semver@^7.0.0:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==

+ 1 - 1
src/test/frontend/handler/repo_test.cljs

@@ -2,7 +2,7 @@
   (:require [cljs.test :refer [deftest use-fixtures is testing]]
             [frontend.handler.repo :as repo-handler]
             [frontend.test.helper :as test-helper]
-            [frontend.test.docs-graph-helper :as docs-graph-helper]
+            [logseq.graph-parser.test.docs-graph-helper :as docs-graph-helper]
             [datascript.core :as d]
             [frontend.db.conn :as conn]))