Merge branch 'develop' into 17509

.clj-kondo/babashka/fs/config.edn

@@ -0,0 +1 @@
+{:lint-as {babashka.fs/with-temp-dir clojure.core/let}}

.clj-kondo/babashka/sci/config.edn

@@ -0,0 +1 @@
+{:hooks {:macroexpand {sci.core/copy-ns sci.core/copy-ns}}}

.clj-kondo/babashka/sci/sci/core.clj

@@ -0,0 +1,9 @@
+(ns sci.core)
+
+(defmacro copy-ns
+  ([ns-sym sci-ns]
+   `(copy-ns ~ns-sym ~sci-ns nil))
+  ([ns-sym sci-ns opts]
+   `[(quote ~ns-sym)
+     ~sci-ns
+     (quote ~opts)]))

.clj-kondo/config.edn

@@ -1,4 +1,5 @@
-{:lint-as      {status-im.utils.views/defview  clojure.core/defn
+{:config-paths ["status-im"]
+ :lint-as      {status-im.utils.views/defview  clojure.core/defn
                 status-im.utils.views/letsubs  clojure.core/let
                 reagent.core/with-let          clojure.core/let
                 status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all

.clj-kondo/status-im/config.edn

@@ -0,0 +1,2 @@
+{:hooks   {:analyze-call {utils.i18n/label hooks.core/i18n-label}}
+ :linters {:status-im.linter/invalid-translation-keyword {:level :error}}}

.clj-kondo/status-im/hooks/core.clj

@@ -0,0 +1,19 @@
+(ns hooks.core
+  (:require [clj-kondo.hooks-api :as api]))
+
+(defn i18n-label
+  "Verify call to `i18n/label` pass the translation keyword qualified with `t`."
+  [{:keys [node]}]
+  (let [[_ translation-key-node & _] (:children node)]
+    (when (and (api/keyword-node? translation-key-node)
+               (not= "t" (-> translation-key-node api/sexpr namespace)))
+      (api/reg-finding! (assoc (meta translation-key-node)
+                               :message "Translation keyword should be qualified with \"t\""
+                               :type    :status-im.linter/invalid-translation-keyword)))))
+
+(comment
+  ;; Valid
+  (i18n-label {:node (api/parse-string "(i18n/label :t/foo)")})
+
+  ;; Invalid
+  (i18n-label {:node (api/parse-string "(i18n/label :foo)")}))

nix/deps/clojure/README.md

@@ -12,12 +12,13 @@ By using the following command:
 ```sh
 shadow-cljs classpath --force-spawn
 ```
-We both download the necessary JARs and POMs into `~/.m2` folder, but also get the classpath printed into standard output.
+We download the necessary JARs into `~/.m2` folder, but also get the classpath printed into standard output.
+We skip POM files since they are not necessary, and add edge cases we don't want to handle.
 
 We then use the classpath in combination with contents of `~/.m2` folder to generate the following files:
 
 * `deps.list` - List of JARs relative to the `~/.m2` cache folder.
-* `deps.json` - Full list of JARs and POMs including their SHAs.
+* `deps.json` - Full list of JARs including their SHAs.
 
 The `deps.list` file is just intermediate and for debugging purposes.
 The `deps.json` is loaded by the derivation in [`default.nix`](./default.nix) and used to produce a derivation that contains all the necessary dependencies:

nix/deps/clojure/default.nix

@@ -8,28 +8,18 @@ let
   # load dependencies
   deps = importJSON ./deps.json;
 
-  # some .jar files have an `-aot` suffix that doesn't work for .pom files
-  getPOM = jarUrl: "${removeSuffix "-aot" jarUrl}.pom";
-
   script = writeShellScriptBin "create-local-maven-repo" (''
     mkdir -p $out
     cd $out
   '' +
   (concatMapStrings (dep: 
     let
       url = "${dep.host}/${dep.path}";
-      pom = {
-        sha1 = attrByPath [ "pom" "sha1" ] "" dep;
-        sha256 = attrByPath [ "pom" "sha256" ] "" dep;
-      };
-      pom-download = optionalString (pom.sha256 != "") (
-        fetchurl { url = getPOM url; inherit (pom) sha256; }
-      );
       jar = {
         sha1 = attrByPath [ "jar" "sha1" ] "" dep;
         sha256 = attrByPath [ "jar" "sha256" ] "" dep;
       };
-      jar-download = optionalString (jar.sha256 != "") (
+      jarFile = optionalString (jar.sha256 != "") (
         fetchurl { url = "${url}.jar"; inherit (jar) sha256; }
       );
       fileName = last (splitString "/" dep.path);
@@ -38,14 +28,8 @@ let
       ''
         mkdir -p ${directory}
 
-        ${optionalString (pom-download != "") ''
-        ln -s "${pom-download}" "${getPOM dep.path}"
-        ''}
-        ${optionalString (pom.sha1 != "") ''
-        echo "${pom.sha1}" > "${getPOM dep.path}.sha1"
-        ''}
-        ${optionalString (jar-download != "") ''
-        ln -s "${jar-download}" "${dep.path}.jar"
+        ${optionalString (jarFile != "") ''
+        ln -s "${jarFile}" "${dep.path}.jar"
         ''}
         ${optionalString (jar.sha1 != "") ''
         echo "${jar.sha1}" > "${dep.path}.jar.sha1"