diff --git a/.github/workflows/commit_validation.yml b/.github/workflows/commit_validation.yml index 45d05af8..75a1fb05 100644 --- a/.github/workflows/commit_validation.yml +++ b/.github/workflows/commit_validation.yml @@ -12,4 +12,4 @@ jobs: # this is to fix GIT not liking owner of the checkout dir, See https://github.com/actions/runner/issues/2033 chown -R $(id -u):$(id -g) $PWD - name: Base image - uses: docker://hephaistox/gha-automaton-core:1.1.2-la + uses: docker://hephaistox/gha-automaton-core:1.2.0-la diff --git a/bb.edn b/bb.edn index ef62b6d1..3cf8024d 100644 --- a/bb.edn +++ b/bb.edn @@ -1,5 +1,5 @@ ;; The file is updated automatically -{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "1.3.1-la"}} +{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "1.4.1-la"}} :paths [] :tasks {:requires diff --git a/build_config.edn b/build_config.edn index 1fdd235b..cd77ccfd 100644 --- a/build_config.edn +++ b/build_config.edn @@ -17,7 +17,8 @@ ".shadow-cljs/builds/"]} :lfe-test {} :lfe-watch {} - :update-deps {:exclude-libs #{"com.taoensso/encore" - "org.clojars.hephaistox/automaton-build@*-*"}} :reports {:forbiddenwords-words #{"automaton-build" "automaton-web" - "landing" "tap>"}}}} + "landing" "tap>"}} + :update-deps {:exclude-libs + #{"com.taoensso/encore" + "org.clojars.hephaistox/automaton-build@*-*"}}}} diff --git a/deps.edn b/deps.edn index 14e24155..2de15bea 100644 --- a/deps.edn +++ b/deps.edn @@ -1,10 +1,10 @@ {:aliases - {:bb-deps {:extra-deps {org.clojars.hephaistox/automaton-build - #:mvn{:version "1.3.1-la"}}} + {:bb-deps {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version + "1.4.1-la"}}} :build {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version - "1.3.1-la"}}} + "1.4.1-la"}}} :cljs-deps {:extra-deps {binaryage/devtools #:mvn{:version "1.0.7"} - thheller/shadow-cljs #:mvn{:version "2.28.3"}} + thheller/shadow-cljs #:mvn{:version "2.28.2"}} :extra-paths ["src/cljs/" "src/cljc/" "resources/" @@ -48,12 +48,12 @@ com.taoensso/encore #:mvn{:version "3.62.1"} com.taoensso/tempura #:mvn{:version "1.5.3"} danlentz/clj-uuid #:mvn{:version "0.1.9"} - djblue/portal #:mvn{:version "0.54.1"} + djblue/portal #:mvn{:version "0.53.0"} http-kit/http-kit #:mvn{:version "2.7.0"} io.sentry/sentry #:mvn{:version "7.6.0"} io.sentry/sentry-clj #:mvn{:version "7.6.215"} lambdaisland/uri #:mvn{:version "1.19.155"} - metosin/malli #:mvn{:version "0.15.0"} + metosin/malli #:mvn{:version "0.14.0"} mount/mount #:mvn{:version "0.1.18"} nrepl/nrepl #:mvn{:version "1.1.1"} org.apache.logging.log4j/log4j-api #:mvn{:version "2.23.1"} diff --git a/env/development/config.edn b/env/development/config.edn index 7d0fe742..5afc6f31 100644 --- a/env/development/config.edn +++ b/env/development/config.edn @@ -1,4 +1,4 @@ {:dev {:clj-nrepl-port 8012 :portal-port 8351} - :test-type-arg? false - :env :development} + :env :development + :test-type-arg? false} diff --git a/env/development/src/cljs/cljs/user.cljs b/env/development/src/cljs/cljs/user.cljs index f1ba58b0..e31839a7 100644 --- a/env/development/src/cljs/cljs/user.cljs +++ b/env/development/src/cljs/cljs/user.cljs @@ -6,5 +6,5 @@ (comment (client-connect) (tst) -; - ) + ; +) diff --git a/pom.xml b/pom.xml index d92a9ca8..537a16e4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ jar org.clojars.hephaistox automaton-core - 1.1.2-la + 1.2.0-la automaton-core @@ -70,7 +70,7 @@ djblue portal - 0.54.1 + 0.53.0 org.apache.logging.log4j @@ -85,7 +85,7 @@ metosin malli - 0.15.0 + 0.14.0 babashka diff --git a/src/cljc/automaton_core/adapters/schema.cljc b/src/cljc/automaton_core/adapters/schema.cljc index 2eddc9a9..fda7d65d 100644 --- a/src/cljc/automaton_core/adapters/schema.cljc +++ b/src/cljc/automaton_core/adapters/schema.cljc @@ -3,9 +3,8 @@ Is a proxy for malli" (:require - [malli.core :as malli] - [malli.error :as malli-error] - [automaton-core.log :as core-log])) + [malli.core :as malli] + [malli.error :as malli-error])) (defn validate-data "Return true if the data is matching the schema @@ -33,12 +32,12 @@ Params: * `schema` schema to test" [schema] - (try - (malli/schema schema) - true - (catch #?(:clj Exception - :cljs :default) _ - false))) + (try (malli/schema schema) + true + (catch #?(:clj Exception + :cljs :default) + _ + false))) (defn validate-humanize "Test the schema parameter is valid @@ -48,35 +47,9 @@ Params: * `schema` schema to test" [schema] - (try - (malli/schema schema) - nil - (catch #?(:clj Exception - :cljs :default) _ - (str "Schema not valid" - (str schema))))) - -(defn- schema-valid-with-log - [schema data message] - (if (validate-data schema data) - true - (do - (core-log/error (str message ": " (validate-data-humanize schema data))) - false))) - -(defn assert-schema - "Assert the `data` is complying the `schema` - Params: - * `schema` - * `data` - * `message`" - [schema data message] - (assert (schema-valid-with-log schema data message))) - -(defn assert-schemas - "Assert the `data` is complying the `schema` - Params: - * `schema-datas` sequence of schema data" - [& schema-datas] - (doseq [[schema data message] (partition 3 schema-datas)] - (assert-schema schema data message))) + (try (malli/schema schema) + nil + (catch #?(:clj Exception + :cljs :default) + _ + (str "Schema not valid" (str schema))))) diff --git a/src/cljc/automaton_core/configuration.cljc b/src/cljc/automaton_core/configuration.cljc index d71cf413..83202d74 100644 --- a/src/cljc/automaton_core/configuration.cljc +++ b/src/cljc/automaton_core/configuration.cljc @@ -11,10 +11,10 @@ gathering all classpath, so all `config.edn` versions. The solution was to be based on environment parameter. So each alias can tell which version it uses, especially monorepo could be different." (:require - [automaton-core.configuration.protocol :as core-conf-prot] - [automaton-core.configuration.files :as core-conf-files] [automaton-core.configuration.environment :as core-conf-env] - [mount.core :refer [defstate in-cljc-mode]])) + [automaton-core.configuration.files :as core-conf-files] + [automaton-core.configuration.protocol :as core-conf-prot] + [mount.core :refer [defstate in-cljc-mode]])) ;; Force the use of `cljc mode` in mount library, so call to `@` will work (in-cljc-mode) @@ -27,7 +27,7 @@ [conf env-conf]) (catch #?(:clj Throwable :cljs :default) - e + e (println "Configuration failed" e)))) (defn stop-conf [] (println "Stop configuration component")) @@ -37,9 +37,9 @@ (defn read-param "Returns value under `key-path` vector." ([key-path default-value] - (let [param-values [(core-conf-prot/read-conf-param (first @conf-state) key-path) - (core-conf-prot/read-conf-param (second @conf-state) - key-path)] + (let [param-values + [(core-conf-prot/read-conf-param (first @conf-state) key-path) + (core-conf-prot/read-conf-param (second @conf-state) key-path)] value (->> param-values (filter some?) first)] diff --git a/src/cljc/automaton_core/configuration/environment.cljc b/src/cljc/automaton_core/configuration/environment.cljc index 34c3f0b9..7c0b3dba 100644 --- a/src/cljc/automaton_core/configuration/environment.cljc +++ b/src/cljc/automaton_core/configuration/environment.cljc @@ -4,8 +4,8 @@ #?@(:clj [[clojure.edn :as edn]] :cljs [[cljs.reader :as edn] [goog.object :as obj]]) [automaton-core.configuration.protocol :as core-conf-prot] - [automaton-core.utils.keyword :as core-keyword] - [clojure.string :as str])) + [automaton-core.utils.keyword :as core-keyword] + [clojure.string :as str])) #?(:cljs (def ^:private nodejs? (exists? js/require))) diff --git a/src/cljc/automaton_core/configuration/files.cljc b/src/cljc/automaton_core/configuration/files.cljc index 754499fb..b1b10311 100644 --- a/src/cljc/automaton_core/configuration/files.cljc +++ b/src/cljc/automaton_core/configuration/files.cljc @@ -7,8 +7,8 @@ [automaton-core.adapters.java-properties :as java-properties]] :cljs [[cljs.reader :as edn]]) [automaton-core.configuration.protocol :as core-conf-prot] - [automaton-core.utils.keyword :as core-keyword] - [automaton-core.utils.map :as utils-map])) + [automaton-core.utils.keyword :as core-keyword] + [automaton-core.utils.map :as utils-map])) #?(:cljs (def ^:private nodejs? (exists? js/require))) #?(:cljs (def ^:private fs (when nodejs? (js/require "fs")))) @@ -19,7 +19,7 @@ :cljs (when ^js (.existsSync fs f) (str ^js (.readFileSync fs f)))) (catch #?(:clj Exception :cljs js/Error) - _ + _ (println (str "Reading file " f " failed"))))) (defn read-config-file @@ -59,7 +59,7 @@ (defrecord FilesConf [conf] core-conf-prot/Conf - (read-conf-param [_this key-path] (get-in conf key-path)) - (config [_this] conf)) + (read-conf-param [_this key-path] (get-in conf key-path)) + (config [_this] conf)) (defn make-files-conf [] (->FilesConf (read-config))) diff --git a/src/cljc/automaton_core/i18n/language.cljc b/src/cljc/automaton_core/i18n/language.cljc index 43248199..ead2e436 100644 --- a/src/cljc/automaton_core/i18n/language.cljc +++ b/src/cljc/automaton_core/i18n/language.cljc @@ -6,7 +6,7 @@ See cust-app themselves to know what language they use" (:require [automaton-core.utils.map :as utils-map] - [clojure.set :as set])) + [clojure.set :as set])) (defprotocol Languages (language [this lang-id] diff --git a/src/cljc/automaton_core/i18n/missing_translation_report.cljc b/src/cljc/automaton_core/i18n/missing_translation_report.cljc index 7379ee82..5943ef30 100644 --- a/src/cljc/automaton_core/i18n/missing_translation_report.cljc +++ b/src/cljc/automaton_core/i18n/missing_translation_report.cljc @@ -2,7 +2,7 @@ "Helper functions to test correctness of translation data including dictionaries" (:require [automaton-core.utils.map :as utils-map] - [clojure.set :refer [union]])) + [clojure.set :refer [union]])) (defn language-report "For all keys of a dictionnary, return the list of languages set diff --git a/src/cljc/automaton_core/i18n/translator/tempura.cljc b/src/cljc/automaton_core/i18n/translator/tempura.cljc index 945cf0c5..c862caf2 100644 --- a/src/cljc/automaton_core/i18n/translator/tempura.cljc +++ b/src/cljc/automaton_core/i18n/translator/tempura.cljc @@ -4,11 +4,11 @@ Is an adapter for translation in `automaton-core`, so no web related technology is mentionned there, even if tempura provides them. It will be the job of `automton-web` to provide that features" (:require - [automaton-core.i18n.dict.text :as core-dict] + [automaton-core.i18n.dict.text :as core-dict] [automaton-core.i18n.translator :as core-translator] - [automaton-core.log :as core-log] - [automaton-core.utils.map :as utils-map] - [taoensso.tempura :as tempura])) + [automaton-core.log :as core-log] + [automaton-core.utils.map :as utils-map] + [taoensso.tempura :as tempura])) (def tempura-missing-text "Necessary for tempura, a missing key is expected for all languages marked with `:core-dict?` in `automaton-core.i18n.language`" diff --git a/src/cljc/automaton_core/log.cljc b/src/cljc/automaton_core/log.cljc index 8e5619c8..94aa02e5 100644 --- a/src/cljc/automaton_core/log.cljc +++ b/src/cljc/automaton_core/log.cljc @@ -14,11 +14,10 @@ * This namespace is the entrypoint for both clj and cljs implementations " (:require - [automaton-core.configuration :as core-conf] - [automaton-core.log.strategy.static-ns-level - :as - log-static-ns-level-strategy] - [automaton-core.log.strategy :as log-strategy] + [automaton-core.configuration :as core-conf] + [automaton-core.log.strategy :as log-strategy] + [automaton-core.log.strategy.static-ns-level :as + log-static-ns-level-strategy] #?(:clj [automaton-core.log.be-log] :cljs [automaton-core.log.fe-log])) #?(:cljs (:require-macros [automaton-core.log]))) diff --git a/src/cljc/automaton_core/log/strategy/static_ns_level.cljc b/src/cljc/automaton_core/log/strategy/static_ns_level.cljc index 734b1b39..5128c7a3 100644 --- a/src/cljc/automaton_core/log/strategy/static_ns_level.cljc +++ b/src/cljc/automaton_core/log/strategy/static_ns_level.cljc @@ -10,8 +10,8 @@ See `automaton-core.log.strategy.static-ns-level/ns-rules` for rule definition details " (:require [automaton-core.log.log-levels :as log-levels] - [automaton-core.log.strategy :as log-strategy] - [automaton-core.log.registry :as log-registry])) + [automaton-core.log.registry :as log-registry] + [automaton-core.log.strategy :as log-strategy])) (def ns-rules "Decides the level of log depending on namespace diff --git a/src/cljc/automaton_core/protocols/test_registry.cljc b/src/cljc/automaton_core/protocols/test_registry.cljc index ac1d6f68..50cb8335 100644 --- a/src/cljc/automaton_core/protocols/test_registry.cljc +++ b/src/cljc/automaton_core/protocols/test_registry.cljc @@ -4,7 +4,7 @@ See ADR-0015" (:require [automaton-core.adapters.schema :as core-schema] - [automaton-core.log :as core-log])) + [automaton-core.log :as core-log])) (def ^:private test-registry-schema "Test registry schema" diff --git a/src/cljc/automaton_core/utils/map.cljc b/src/cljc/automaton_core/utils/map.cljc index ed35389f..74fb50d1 100644 --- a/src/cljc/automaton_core/utils/map.cljc +++ b/src/cljc/automaton_core/utils/map.cljc @@ -1,7 +1,7 @@ (ns automaton-core.utils.map "Utility for map data structure" (:require - [clojure.set :as set] + [clojure.set :as set] [clojure.walk :as walk])) (defn idx-of diff --git a/src/cljc/automaton_core/utils/string_to_id.cljc b/src/cljc/automaton_core/utils/string_to_id.cljc index f07757dd..e32046d0 100644 --- a/src/cljc/automaton_core/utils/string_to_id.cljc +++ b/src/cljc/automaton_core/utils/string_to_id.cljc @@ -2,8 +2,8 @@ "Transform a string into an id That id are currently used and tested for React" (:require - [clojure.string :as str] - [automaton-core.utils.uuid-gen :as uuid-gen])) + [automaton-core.utils.uuid-gen :as uuid-gen] + [clojure.string :as str])) (defn string-to-id "Transform what is not alphanumerical to an id diff --git a/src/cljs/automaton_core/log/fe_log.cljc b/src/cljs/automaton_core/log/fe_log.cljc index 19d62f90..d1831ff6 100644 --- a/src/cljs/automaton_core/log/fe_log.cljc +++ b/src/cljs/automaton_core/log/fe_log.cljc @@ -1,8 +1,8 @@ (ns automaton-core.log.fe-log "Factory generating log function" (:require - [automaton-core.log.strategy] [automaton-core.log.fe-registry] + [automaton-core.log.strategy] [automaton-core.log.strategy.static-ns-level]) #?(:cljs (:require-macros [automaton-core.log.fe-log]))) diff --git a/src/cljs/automaton_core/log/fe_registry.cljc b/src/cljs/automaton_core/log/fe_registry.cljc index 7e215ec8..1ada5472 100644 --- a/src/cljs/automaton_core/log/fe_registry.cljc +++ b/src/cljs/automaton_core/log/fe_registry.cljc @@ -24,9 +24,7 @@ ::log-registry/error-tracking-context {:description "For registering information for monitoring exceptions in the application" - #?@(:cljs [:impl - automaton-core.log.tracking.fe-error-tracking/add-context])} + #?@(:cljs [:impl automaton-core.log.tracking.fe-error-tracking/add-context])} ::log-registry/error-tracking-alert {:description "For alerting about monitoring exceptions in the application" - #?@(:cljs [:impl - automaton-core.log.tracking.fe-error-tracking/error-alert])}}) + #?@(:cljs [:impl automaton-core.log.tracking.fe-error-tracking/error-alert])}}) diff --git a/src/cljs/automaton_core/portal/client.cljs b/src/cljs/automaton_core/portal/client.cljs index 63384e9c..cc36b6d8 100644 --- a/src/cljs/automaton_core/portal/client.cljs +++ b/src/cljs/automaton_core/portal/client.cljs @@ -1,18 +1,15 @@ (ns automaton-core.portal.client "Client connection to the portal" - (:require [portal.client.web :as p])) + (:require + [portal.client.web :as p-web])) -(def submit (partial p/submit {:port 8351})) +(def submit (partial p-web/submit {:port 8351})) -(defn tst - [] - (js/alert "from REPL")) +(defn tst [] (js/alert "from REPL")) -(defn client-connect - [] - (add-tap #'submit)) +(defn client-connect [] (add-tap #'submit)) (comment - (client-connect) -; - ) + (client-connect) + ; +) diff --git a/test/clj/automaton_core/adapters/schema_test.clj b/test/clj/automaton_core/adapters/schema_test.clj index a6da7bf4..7b003ac9 100644 --- a/test/clj/automaton_core/adapters/schema_test.clj +++ b/test/clj/automaton_core/adapters/schema_test.clj @@ -16,18 +16,3 @@ (is (some? (sut/validate-humanize nil))) (is (some? (sut/validate-humanize 12))))) -(deftest assert-schema-test - (testing "Test succesful assertions" - (is (nil? (sut/assert-schema :int 2 "Error")))) - (testing "Test unsuccesful assertions" - (is (thrown-with-msg? java.lang.AssertionError - #"Assert" - (sut/assert-schema :int "foo" "Error"))))) - -(deftest assert-schemas-test - (testing "Succesful assertions" - (is (nil? (sut/assert-schemas :int 2 :string "foo")))) - (testing "Unsuccesful assertions" - (is (thrown-with-msg? java.lang.AssertionError - #"Assert" - (sut/assert-schemas :int "foo" :string "foo"))))) diff --git a/test/cljc/automaton_core/adapters/string_test.cljc b/test/cljc/automaton_core/adapters/string_test.cljc index 1a4a7899..516a48f0 100644 --- a/test/cljc/automaton_core/adapters/string_test.cljc +++ b/test/cljc/automaton_core/adapters/string_test.cljc @@ -3,7 +3,7 @@ #?(:clj [clojure.test :refer [deftest is testing]] :cljs [cljs.test :refer [deftest is testing] :include-macros true]) [automaton-core.adapters.string :as sut] - [clojure.string :as str])) + [clojure.string :as str])) (deftest remove-last-character (testing "Remove a character" diff --git a/test/cljc/automaton_core/i18n/dict/text_test.cljc b/test/cljc/automaton_core/i18n/dict/text_test.cljc index d16bd87e..5e10b5a9 100644 --- a/test/cljc/automaton_core/i18n/dict/text_test.cljc +++ b/test/cljc/automaton_core/i18n/dict/text_test.cljc @@ -2,11 +2,11 @@ (:require #?(:clj [clojure.test :refer [deftest is testing]] :cljs [cljs.test :refer [deftest is testing] :include-macros true]) - [automaton-core.i18n.dict.text :as sut] - [automaton-core.i18n.language :as core-lang] + [automaton-core.i18n.dict.text :as sut] + [automaton-core.i18n.language :as core-lang] [automaton-core.i18n.missing-translation-report :as b-language] - [clojure.set :as set] - [clojure.string :as str])) + [clojure.set :as set] + [clojure.string :as str])) (deftest dict-test (testing diff --git a/test/cljc/automaton_core/i18n/translator/tempura_test.cljc b/test/cljc/automaton_core/i18n/translator/tempura_test.cljc index 586199f9..2366028f 100644 --- a/test/cljc/automaton_core/i18n/translator/tempura_test.cljc +++ b/test/cljc/automaton_core/i18n/translator/tempura_test.cljc @@ -2,8 +2,8 @@ (:require #?(:clj [clojure.test :refer [deftest is testing]] :cljs [cljs.test :refer [deftest is testing] :include-macros true]) - [automaton-core.i18n.language :as core-lang] - [automaton-core.i18n.translator :as core-translator] + [automaton-core.i18n.language :as core-lang] + [automaton-core.i18n.translator :as core-translator] [automaton-core.i18n.translator.tempura :as sut])) (def dict-stub diff --git a/test/cljc/automaton_core/log/strategy/static_ns_level_test.cljc b/test/cljc/automaton_core/log/strategy/static_ns_level_test.cljc index c83084e9..def4b520 100644 --- a/test/cljc/automaton_core/log/strategy/static_ns_level_test.cljc +++ b/test/cljc/automaton_core/log/strategy/static_ns_level_test.cljc @@ -3,8 +3,8 @@ (:require #?(:clj [clojure.test :refer [deftest is testing]] :cljs [cljs.test :refer [deftest is testing] :include-macros true]) - [automaton-core.log.strategy :as log-strategy] - [automaton-core.log.registry :as log-registry] + [automaton-core.log.registry :as log-registry] + [automaton-core.log.strategy :as log-strategy] [automaton-core.log.strategy.static-ns-level :as sut])) (deftest ns-rules-test diff --git a/test/cljc/automaton_core/utils/sequences_test.cljc b/test/cljc/automaton_core/utils/sequences_test.cljc index f4e100e8..8f3979a9 100644 --- a/test/cljc/automaton_core/utils/sequences_test.cljc +++ b/test/cljc/automaton_core/utils/sequences_test.cljc @@ -3,7 +3,7 @@ [automaton-core.utils.sequences :as sut] #?(:clj [clojure.test :refer [deftest is testing]] :cljs [cljs.test :refer [deftest is testing] :include-macros true]) - [clojure.string :as str])) + [clojure.string :as str])) (deftest trim-leading-nil-test (testing "basic example" diff --git a/test/cljc/automaton_core/utils/uuid_gen_test.cljc b/test/cljc/automaton_core/utils/uuid_gen_test.cljc index f99fb54b..582150bd 100644 --- a/test/cljc/automaton_core/utils/uuid_gen_test.cljc +++ b/test/cljc/automaton_core/utils/uuid_gen_test.cljc @@ -1,7 +1,7 @@ (ns automaton-core.utils.uuid-gen-test (:require [automaton-core.utils.uuid-gen :as sut] - [clojure.test :refer [testing deftest is]])) + [clojure.test :refer [deftest is testing]])) (deftest unguessable (testing "check that generates proper uuid" diff --git a/test/cljs/automaton_core/log/fe_log_test.cljs b/test/cljs/automaton_core/log/fe_log_test.cljs index fec1c9c7..03d0c6ad 100644 --- a/test/cljs/automaton_core/log/fe_log_test.cljs +++ b/test/cljs/automaton_core/log/fe_log_test.cljs @@ -1,7 +1,8 @@ (ns automaton-core.log.fe-log-test (:require [automaton-core.log.fe-log :as sut] - [cljs.test :refer [deftest is testing] :include-macros true])) + [cljs.test :refer [deftest is testing] + :include-macros true])) (deftest log-fatal-test (testing "Fatal is always printing something" diff --git a/version.edn b/version.edn index 310b372c..4c03f349 100644 --- a/version.edn +++ b/version.edn @@ -1,2 +1,2 @@ ;; Last generated version, note a failed push consume a number -{:version "1.1.2-la"} \ No newline at end of file +{:version "1.2.0-la"} \ No newline at end of file