#4 (#5)

* run with tree-resolved edn
* support aliases
* do not delete __base and use also .cpcache
* README

Author: namenu

.github/workflows/notify-diff.yml

@@ -38,17 +38,7 @@ But it's good to know that such potential risks can be detected in advance.
 
 ## Example
 
-Just make some changes in your `deps.edn` then run:
-
-```sh
-clj -Sdeps '{:deps {io.github.namenu/deps-diff {:git/tag "v1.1" :git/sha "c1e0a84"}}}' \
-    -X namenu.deps-diff/diff \
-    :base '"HEAD"' \
-    :target '"deps.edn"' \
-    :format :cli
-```
-
-... or create a `.github/workflows/deps-diff.yml` file as follows.
+Just create a `.github/workflows/deps-diff.yml` file as follows.
 
 ```yml
 name: Notify dependency diff
@@ -62,13 +52,9 @@ jobs:
   notify:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Required to make it possible to compare with PR base branch
-
       - name: Diff dependencies
         id: diff
-        uses: namenu/deps-diff@v1.0
+        uses: namenu/deps-diff@main
         with:
           format: markdown
           aliases: "[:test]"
@@ -79,8 +65,7 @@ jobs:
           message: |
             ### `deps.edn` dependency changes
 
-            ${{ steps.diff.
-            .deps_diff }}
+            ${{ steps.diff.outputs.deps_diff }}
 ```
 
 This workflow will comment on your PR as shown below.
@@ -90,11 +75,10 @@ This workflow will comment on your PR as shown below.
 
 ## Inputs
 
-| Name        | Description                                                                                                                                     | Default Value              |
-|-------------|-------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------|
-| `base`      | The deps.edn before the change being referenced. You can specify a git ref or file path. The default value is the git ref of the base branch of the PR, referencing the `deps.edn` at the repository's root path. You can specify it like `{{git-ref}}:{{path-to-deps.edn}}`. | Git ref of PR's base branch |
-| `target`    | The deps.edn after the change being referenced. You can specify a git ref or file path. The default value is the deps.edn in the current directory. | `deps.edn` in the current directory |
-| `format`    | Determines the format of the output. You can specify `edn`, `markdown`, or `cli`. The default value is edn | `edn` |
+| Name        | Description                                                                                                                  | Default Value              |
+|-------------|------------------------------------------------------------------------------------------------------------------------------|----------------------------|
+| `base`      | The git sha before the change being referenced. The default value is the git ref of the base branch of the PR.               | Git ref of PR's base branch |
+| `format`    | Determines the format of the output. You can specify `edn`, `markdown`, or `cli`. The default value is edn                   | `edn` |
 | `aliases`   | Specifies the aliases to be used when forming the basis. It must be expressed as a quoted sequence (e.g., `'[:dev :test]'`). | `nil` |
 
 

README.md

@@ -9,10 +9,10 @@ inputs:
     required: true
     description: git/sha of base commit
     default: ${{ github.event.pull_request.base.sha }}
-  target:
+  project:
     required: true
     description: path of the target deps.edn
-    default: 'deps.edn'
+    default: :standard
   aliases:
     required: false
     description: aliases to create basis
@@ -55,17 +55,36 @@ runs:
         restore-keys: |
           ${{ env.cache-name }}-
 
+    - name: Checkout base
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.base.sha }}
+
+    - name: Resolve base
+      shell: bash
+      run: |
+        clojure -X:deps tree :aliases '${{ inputs.aliases }}' :format :edn > __base.edn
+
+    - name: Checkout target
+      uses: actions/checkout@v4
+      with:
+        clean: false
+
+    - name: Resolve target
+      shell: bash
+      run: |
+        clojure -X:deps tree :aliases '${{ inputs.aliases }}' :format :edn > __target.edn
+
     - id: diff
       shell: bash
       run: |
         set +e
         
         DEPS_DIFF=$(clojure -Sdeps '{:deps {namenu/deps-diff {:local/root "${{ github.action_path }}"}}}' \
           -X namenu.deps-diff/diff \
-          :base '"${{ inputs.base }}"' \
-          :target '"${{ inputs.target }}"' \
-          :format :${{ inputs.format }} \
-          :aliases '${{ inputs.aliases }}')
+          :base '"__base.edn"' \
+          :target '"__target.edn"' \
+          :format :${{ inputs.format }})
         EXIT_CODE=$?
         
         echo "DEPS_DIFF<<EOF" >> $GITHUB_OUTPUT

action.yml

@@ -3,46 +3,21 @@
             [clojure.edn :as edn]
             [clojure.set :as set]
             [clojure.spec.alpha :as s]
-            [clojure.string :as str]
-            [clojure.tools.deps :as deps]
-            [clojure.tools.deps.util.maven :as mvn]
             [namenu.deps-diff.output :as output]
             [namenu.deps-diff.spec :as spec]))
 
-;; from tools.gitlibs
-(defn- run-git
-  [& args]
-  (let [command-args (cons "git" (map str args))]
-    (let [proc-builder (ProcessBuilder. ^java.util.List command-args)
-          proc         (.start proc-builder)
-          exit         (.waitFor proc)
-          out          (slurp (.getInputStream proc))
-          err          (slurp (.getErrorStream proc))]
-      {:args command-args, :exit exit, :out out, :err err})))
-
-(defn- read-edn
-  [path]
-  (cond
-    ;; file
-    (.exists (clojure.java.io/file path))
-    (edn/read-string (slurp (str path)))
-
-    ;; git
-    :else
-    (let [path (if (str/ends-with? path "deps.edn")
-                 path
-                 (str path ":" "deps.edn"))
-          sh   (run-git "show" path)]
-      (when-not (zero? (:exit sh))
-        (throw (ex-info (str "Couldn't fetch deps.edn from git ref " path)
-                        {:output (:err sh)})))
-      (edn/read-string (:out sh)))))
-
-(defn- resolve-deps [deps aliases]
-  (-> (deps/create-basis {:project (merge {:mvn/repos mvn/standard-repos} deps)
-                          :aliases aliases})
-      :libs
-      (update-vals #(s/conform ::spec/coord %))))
+(defn- parse-resolved-tree [file]
+  (let [deps-tree (edn/read-string (slurp (str file)))]
+    (letfn [(walk [m]
+              (mapcat (fn [[k v]]
+                        (into [[k (dissoc v :children)]]
+                              (walk (:children v))))
+                      m))]
+      (->> (walk (:children deps-tree))
+           (keep (fn [[k v]]
+                   (if (:include v)
+                     [k (s/conform ::spec/coord (:coord v))])))
+           (into {})))))
 
 (defmulti print-result! (fn [_ opts] (keyword (:format opts))))
 
@@ -59,11 +34,8 @@
   (output/cli data))
 
 (defn diff*
-  [{:keys [base target aliases]}]
-  (let [deps-from (resolve-deps (read-edn base) aliases)
-        deps-to   (resolve-deps (read-edn target) aliases)
-
-        key-set   (comp set keys)
+  [deps-from deps-to]
+  (let [key-set (comp set keys)
 
         [removed-deps added-deps common-deps] (data/diff (key-set deps-from) (key-set deps-to))]
     ;; don't need to sort here
@@ -75,18 +47,19 @@
 (defn diff
   "
   opts
-    :base - git sha
-    :target - file path
-    :aliases - seq of aliases to be used creating basis
+    :base - tree shaped edn of base deps.edn
+    :target - tree shaped edn of target deps.edn
     :format - #{:edn, :markdown, :cli}
   "
-  [{:keys [base target aliases format] :as opts}]
+  [{:keys [base target format] :as opts}]
   (assert (s/valid? ::spec/ref base))
   (assert (s/valid? ::spec/ref target))
-  (assert (s/valid? ::spec/aliases aliases))
   (assert (s/valid? ::spec/format format))
 
-  (let [d         (diff* opts)
+  (let [deps-from (parse-resolved-tree base)
+        deps-to   (parse-resolved-tree target)
+
+        d         (diff* deps-from deps-to)
         exit-code (if (output/equal? d) 0 1)]
     (print-result! d opts)
     (System/exit exit-code)))
@@ -95,22 +68,9 @@
   ;; git show e0f4689c07bc652492bf03eba7edac20ab2bee0f:test/resources/base.edn > base.edn
   ;; clojure -X namenu.deps-diff/diff base.edn deps.edn
 
-  (diff* {:base "HEAD" :target "deps.edn" :format :cli})
-  (diff* {:base    "test-resources/base/deps.edn"
-         :target  "test-resources/target/deps.edn"
-         :aliases [:poly]})
-
-  (diff* {:base   "b2a1ca302959b720e703618a912a4b140389ee55" :target "deps.edn"
-         :format :cli})
-
-  (read-edn "HEAD:deps.edn")
-
-  (resolve-deps (read-edn "HEAD:deps.edn") [])
-  (resolve-deps {:deps      {'green-labs/gosura {:git/url "https://github.com/green-labs/gosura"
-                                                 :git/sha "f1d586669f37a3ca99e14739f9abfb1a02128274"}}
-                 :mvn/repos mvn/standard-repos
-                 }
-                [])
+  (diff*
+    (parse-resolved-tree "test-resources/__base.edn")
+    (parse-resolved-tree "test-resources/__target.edn"))
 
   (make-ver
     (s/conform ::spec/coord