Merge pull request #61 from zen-lang/feat/work-with-fs

Use io/file for work creating file path

Author: carbon-hvze

.clj-kondo/config.edn

@@ -0,0 +1,37 @@
+{:lint-as       {}
+ :ns-groups     [{:pattern "^.*-test$" :name tests}]
+ :skip-comments true
+ :config-in-ns  {tests                        {:linters {:inline-def {:level :off}}}}
+
+ :linters       {:not-empty? {:level :off}
+                 #_#_:line-length {:max-line-length 120}
+                 :warn-on-reflection {:level :off
+                                      :warn-only-on-interop true}
+                 :used-underscored-binding {:level :warning}
+                 :shadowed-var {:level :off}
+                 :inline-def {:level :warning}
+                 :reduce-without-init {:level :off}
+                 :keyword-binding {:level :warning}
+                 :main-without-gen-class {:level :warning}
+                 :cond-else {:level :warning}
+                 :aliased-namespace-symbol {:level :warning
+                                            :exclude [clojure.string]}
+                 :duplicate-require {:level :warning}
+                 :deprecated-var {:level :warning}
+                 :docstring-no-summary {:level :warning}
+                 :unresolved-namespace {:level :warning}
+                 :unused-namespace {:level :warning}
+                 :unsorted-required-namespaces {:level :warning}
+                 :unused-binding {:level :warning}
+                 :redundant-call {:level :warning}
+                 :redundant-fn-wrapper {:level :warning}
+                 :namespace-name-mismatch {:level :warning}
+                 :missing-body-in-when {:level :warning}
+                 :refer-all {:level :warning}
+                 :single-key-in {:level :warning}
+                 :missing-clause-in-try {:level :warning}
+                 :docstring-leading-trailing-whitespace {:level :warning}
+                 :missing-else-branch {:level :off}
+                 :non-arg-vec-return-type-hint {:level :off}
+                 :unused-private-var {:level :off}}
+ :output        {:show-rule-name-in-message true}}

.github/workflows/clojure.yml

@@ -15,9 +15,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install all the tools
-        uses: DeLaGuardo/setup-clojure@10.3
+        uses: DeLaGuardo/setup-clojure@11.0
         with:
-          cli: 1.11.1.1149
+          cli: 1.11.1.1347
           bb: latest
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Cache clojure dependencies
@@ -32,4 +32,3 @@ jobs:
           restore-keys: cljdeps-
       - name: Run tests
         run: bb test-ci
-

.gitignore

@@ -3,8 +3,9 @@
 .nrepl-port
 target
 .env
-/.clj-kondo
-/.calva
+!.clj-kondo/config.edn
+.clj-kondo/
+.calva
 
 # pulled dependencies for zen-package used for benchmark fixtures
 /pkg/zen-pkg/zen-packages/

deps.edn

@@ -4,7 +4,7 @@
  :version "0.0.1-SNAPSHOT"
 
  :deps {org.clojure/clojure  {:mvn/version "1.11.1"}
-        borkdude/edamame     {:mvn/version "1.0.16"}
+        borkdude/edamame     {:mvn/version "1.3.22"}
         hawk/hawk            {:mvn/version "0.2.11"}
         healthsamurai/matcho {:mvn/version "0.3.10"}}
 
@@ -13,7 +13,7 @@
   {:extra-paths []
    :extra-deps {org.clojure/tools.nrepl       {:mvn/version "0.2.13"}
                 org.clojure/core.rrb-vector   {:mvn/version "0.1.2"}
-                cider/cider-nrepl             {:mvn/version "0.29.0"}
+                cider/cider-nrepl             {:mvn/version "0.30.0"}
                 refactor-nrepl/refactor-nrepl {:mvn/version "3.6.0"}}
 
    :jvm-opts ^:replace ["-XX:-OmitStackTraceInFastThrow"]
@@ -27,9 +27,9 @@
                        "-XX:+UnlockDiagnosticVMOptions"
                        "-XX:+DebugNonSafepoints"]
             :extra-deps {criterium/criterium {:mvn/version "0.4.6"}
-                         com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.0.3"}}}
+                         com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.0.4"}}}
   :kaocha
-  {:extra-deps {lambdaisland/kaocha {:mvn/version "1.76.1230"}}
+  {:extra-deps {lambdaisland/kaocha {:mvn/version "1.85.1342"}}
    :extra-paths ["runner" "test"]
    :jvm-opts    ^:replace ["-XX:-OmitStackTraceInFastThrow"]
    :main-opts   ["-m" "kaocha.runner" "--config-file" "kaocha.edn"]}
@@ -39,7 +39,7 @@
    :ns-default build.zen
    :jvm-opts ^:replace ["-XX:-OmitStackTraceInFastThrow"]
    :extra-deps {io.github.clojure/tools.build {:git/url "https://github.com/clojure/tools.build"
-                                               :sha "984a24c0ef0a6af3f304b567adb45af40baefd08"}}}
+                                               :sha "fcb8ecb555d5db341c7fb8310a00c8c86c78aae3"}}}
   :deploy
   {:extra-deps {slipset/deps-deploy {:mvn/version "RELEASE"}}
    :main-opts ["-m" "deps-deploy.deps-deploy" "deploy" "target/zen.jar"]}}}

doc.md

@@ -1,4 +1,4 @@
-## zen
+# zen
 
 Zen is declarative language to describe models with data.
 Zen syntax is based on extensible data notation (edn) - [see refs](https://github.com/edn-format/edn)
@@ -24,11 +24,8 @@ Namespace should have a name under `ns` key.
 
 By convention path to file should match namespace name: i.e.   `my/package/model.edn` <-> `my.package.model**
 
-
-
 ## v2
 
-
 zen model is just a data in edn format
 
 edn primer:
@@ -44,7 +41,7 @@ edn primer:
 
 models are grouped into namespaces, map of model names (keys) and model's data (values).
 
-Each namespace should have a name - `ns` key. 
+Each namespace should have a name - `ns` key.
 
 Each model in namespace can be references by full name `<ns-name>/<model-key>`
 
@@ -54,9 +51,7 @@ symbols in zen are reference to other models.
 zen checks that referenced name exists.
 
 Local refs can by unnamespaced names (current namespace name is assumed)
-Symbols from other namespaces are referenced with full name - <ns-name>/<model-name>
-
-
+Symbols from other namespaces are referenced with full name - `<ns-name>/<model-name>`
 
 ## Namespaces & references
 
@@ -70,7 +65,7 @@ There are two special keys:
 Other keys are names of **models** or **symbols**, which are just arbitrary data in edn
 
 ```edn
-;; file name: my-pachage/my-namespace.edn
+;; file name: my-package/my-namespace.edn
 {
   ;; namespace name
   ns my-package.my-namespace
@@ -92,18 +87,18 @@ Other keys are names of **models** or **symbols**, which are just arbitrary data
 
 ```
 
-Zen project contains one or more edn files with namespaces. 
-By convention path to file should match namespace name: 
+Zen project contains one or more edn files with namespaces.
+By convention path to file should match namespace name:
 i.e.   `my/package/model.edn` <-> `my.package.model**
 
 One file should contain only one namespace!
 
 Symbols in zen models are interpreted as references to other models.
 
 To reference symbol in same namespace simple name may be used, zen checker
-will interpret it as <current-namespace-name>/<symbol-name>.
+will interpret it as `<current-namespace-name>/<symbol-name>`.
 
-To reference symbol from other namespace, full name should be used <other-namespace>/<symbol-name>.
+To reference symbol from other namespace, full name should be used `<other-namespace>/<symbol-name>`.
 Zen load should check, that referenced namespace is imported and referenced symbol exists in it.
 
 No cyclic references are allowed between namespaces.
@@ -144,7 +139,7 @@ Zen runtime should provide an procedure to load all symbols with specific tag!
 
 ## zen/schema
 
-Zen is coming with built-in schema language - `zen/schema`, 
+Zen is coming with built-in schema language - `zen/schema`,
 to describe shape of data in an open way.
 
 zen/schema is a map, where each key is validation instruction.
@@ -165,4 +160,4 @@ Other keys are enabled only for specific "types".
 
 zen/schema engine should validate current schema and all referenced schemas.
 
-`:confirms` 
+`:confirms`

kaocha.edn

@@ -1,15 +1,18 @@
 #kaocha/v1
-{:fail-fast?                  false
- :color?                      true
+ {:fail-fast?                  false
+  :color?                      true
  ;; :reporter                 [kaocha.report/dots]
  ;;:reporter                  [kaocha.report.progress/report]
- :reporter                    [kaocha.report/documentation]
+  :reporter                    [kaocha.report/documentation]
 
- :plugins                     [:hooks
+  :plugins                     [:hooks
                                ;; :kaocha.plugin/filter
                                ;; :kaocha.plugin/capture-output
-                               :kaocha.plugin/print-invocations
-                               :kaocha.plugin/profiling]
-
- :kaocha.plugin.randomize/randomize? false
- :kaocha.plugin.profiling/profiling? true}
+                                :kaocha.plugin/print-invocations
+                                :kaocha.plugin/profiling]
+  :tests                       [{:id   :unit
+                                 :source-paths  ["src"]
+                                 :test-paths    ["test"]
+                                 :ns-patterns   ["-test$"]}]
+  :kaocha.plugin.randomize/randomize? false
+  :kaocha.plugin.profiling/profiling? true}

lib/auth/auth.edn

@@ -13,20 +13,15 @@
       <artifactId>clojure</artifactId>
       <version>1.11.1</version>
     </dependency>
-    <dependency>
-      <groupId>cli-matic</groupId>
-      <artifactId>cli-matic</artifactId>
-      <version>0.5.4</version>
-    </dependency>
     <dependency>
       <groupId>healthsamurai</groupId>
       <artifactId>matcho</artifactId>
-      <version>0.3.9</version>
+      <version>0.3.10</version>
     </dependency>
     <dependency>
       <groupId>borkdude</groupId>
       <artifactId>edamame</artifactId>
-      <version>1.0.0</version>
+      <version>1.3.22</version>
     </dependency>
     <dependency>
       <groupId>hawk</groupId>

lib/auth/auth/op.edn

@@ -6,7 +6,6 @@
 
 (defn namespace-check [acc old-ztx new-ztx]
   (let [get-set-of-ns #(set (keys (:ns %)))
-
         [lost new same]
         (clojure.data/diff (get-set-of-ns @old-ztx)
                            (get-set-of-ns @new-ztx))]
@@ -20,12 +19,12 @@
                                  :namespace lost-ns}))
                          lost)
       (seq new) (update :changes
-                         into
-                         (map (fn [new-ns]
-                                {:type      :namespace/new
-                                 :message   (str "New namespace: "  new-ns)
-                                 :namespace new-ns}))
-                         new))))
+                        into
+                        (map (fn [new-ns]
+                               {:type      :namespace/new
+                                :message   (str "New namespace: "  new-ns)
+                                :namespace new-ns}))
+                        new))))
 
 
 (def core-zen-syms #{'import 'ns 'alias})
@@ -65,12 +64,12 @@
                                  :symbol  lost-sym}))
                          lost)
       (seq new)  (update :changes
-                        into
-                        (map (fn [new-sym]
-                               {:type    :symbol/new
-                                :message (str "New symbol: " new-sym)
-                                :symbol  new-sym}))
-                        new))))
+                         into
+                         (map (fn [new-sym]
+                                {:type    :symbol/new
+                                 :message (str "New symbol: " new-sym)
+                                 :symbol  new-sym}))
+                         new))))
 
 
 (defn index-sch-seq [sch-seq]
@@ -112,7 +111,7 @@
                  :new new}
                 old)]
 
-    (reduce (fn [acc [ch-pth new-el]]
+    (reduce (fn [acc [_ch-pth new-el]]
               (let [{:keys [path]} new-el
                     change (process-change sym path nil (:value new-el))]
                 (cond-> acc (some? change) (conj change))))