inline unixify

Author: borkdude

src/nextjournal/clerk/analyzer.clj

@@ -408,7 +408,7 @@
 
 (defn normalize-filename [f]
   (if (fs/windows?)
-    (-> f fs/normalize fs/unixify)
+    (-> f fs/normalize utils/unixify)
     f))
 
 (defn ns->jar [ns]
@@ -456,7 +456,7 @@
                                       "jar" (first (str/split (.getPath resource) #"!"))
                                       "file" (str resource))]
                   (-> resource-file java.net.URI. io/file str))))
-            fs/unixify)))
+            utils/unixify)))
 
 #_(var->location #'inc)
 #_(var->location #'var->location)
@@ -550,7 +550,7 @@
                                  (let [jar? (or (nil? source)
                                                 (str/ends-with? source ".jar"))
                                        gitlib-hash (and (not jar?)
-                                                        (second (re-find #".gitlibs/libs/.*/(\b[0-9a-f]{5,40}\b)/" (fs/unixify source))))]
+                                                        (second (re-find #".gitlibs/libs/.*/(\b[0-9a-f]{5,40}\b)/" (utils/unixify source))))]
                                    (if (or jar? gitlib-hash)
                                      (update g :->analysis-info merge (into {} (map (juxt identity
                                                                                           (constantly (if source

src/nextjournal/clerk/paths.clj

@@ -2,7 +2,8 @@
   "Clerk's paths expansion and paths-fn handling."
   (:require [babashka.fs :as fs]
             [clojure.edn :as edn]
-            [clojure.string :as str])
+            [clojure.string :as str]
+            [nextjournal.clerk.utils :as utils])
   (:import [java.net URL]))
 
 (defn ^:private ensure-not-empty [build-opts {:as opts :keys [error expanded-paths]}]
@@ -130,7 +131,7 @@
              (fs/exists? file))
     (let [rel (fs/relativize (fs/cwd) (fs/canonicalize file #{:nofollow-links}))]
       (when-not (str/starts-with? (str rel) "..")
-        (fs/unixify rel)))))
+        (utils/unixify rel)))))
 
 #_(path-in-cwd "notebooks/rule_30.clj")
 #_(path-in-cwd "/tmp/foo.clj")

src/nextjournal/clerk/utils.clj

@@ -1,5 +1,6 @@
 (ns nextjournal.clerk.utils
-  (:require [alphabase.base58 :as base58]))
+  (:require [alphabase.base58 :as base58]
+            [clojure.string :as str]))
 
 (def bb? (System/getProperty "babashka.version"))
 
@@ -23,3 +24,6 @@
 
 (defn ->base58 [x]
   (base58/encode x))
+
+(defn unixify [x]
+  (str/replace (str x) "\\" "/"))