Split out directDependencies and devDependencies in pub deps (#4383)

dart-lang · Sep 25, 2024 · 23e3d4f · 23e3d4f
1 parent 1892c46
commit 23e3d4f
Show file tree

Hide file tree

Showing 11 changed files with 196 additions and 22 deletions.
diff --git a/lib/src/command/deps.dart b/lib/src/command/deps.dart
@@ -126,7 +126,17 @@ class DepsCommand extends PubCommand {
           'version': currentPackage.version.toString(),
           'kind': kind,
           'source': source,
-          'dependencies': next,
+          // This field is kept for backwards compatibility with dart 3.5 and
+          // before. Clients should opt to consume directDependencies and
+          // devDependencies separately instead.
+          'dependencies': (isRoot
+                  ? currentPackage.dependencies
+                  : currentPackage.immediateDependencies)
+              .keys
+              .toList(),
+          'directDependencies': currentPackage.dependencies.keys.toList(),
+          if (isRoot)
+            'devDependencies': currentPackage.devDependencies.keys.toList(),
         });
         toVisit.addAll(next);
       }

diff --git a/test/deps_test.dart b/test/deps_test.dart
@@ -158,17 +158,24 @@ void main() {
       "dependencies": [
         "normal",
         "overridden",
-        "from_path",
-        "unittest",
-        "override_only"
+        "from_path"
+      ],
+      "directDependencies": [
+        "normal",
+        "overridden",
+        "from_path"
+      ],
+      "devDependencies": [
+        "unittest"
       ]
     },
     {
       "name": "override_only",
       "version": "1.2.3",
       "kind": "transitive",
       "source": "hosted",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     },
     {
       "name": "unittest",
@@ -178,14 +185,19 @@ void main() {
       "dependencies": [
         "shared",
         "dev_only"
+      ],
+      "directDependencies": [
+        "shared",
+        "dev_only"
       ]
     },
     {
       "name": "dev_only",
       "version": "1.2.3",
       "kind": "transitive",
       "source": "hosted",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     },
     {
       "name": "shared",
@@ -194,6 +206,9 @@ void main() {
       "source": "hosted",
       "dependencies": [
         "other"
+      ],
+      "directDependencies": [
+        "other"
       ]
     },
     {
@@ -203,21 +218,26 @@ void main() {
       "source": "hosted",
       "dependencies": [
         "myapp"
+      ],
+      "directDependencies": [
+        "myapp"
       ]
     },
     {
       "name": "from_path",
       "version": "1.2.3",
       "kind": "direct",
       "source": "path",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     },
     {
       "name": "overridden",
       "version": "2.0.0",
       "kind": "direct",
       "source": "hosted",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     },
     {
       "name": "normal",
@@ -227,6 +247,10 @@ void main() {
       "dependencies": [
         "transitive",
         "circular_a"
+      ],
+      "directDependencies": [
+        "transitive",
+        "circular_a"
       ]
     },
     {
@@ -236,6 +260,9 @@ void main() {
       "source": "hosted",
       "dependencies": [
         "circular_b"
+      ],
+      "directDependencies": [
+        "circular_b"
       ]
     },
     {
@@ -245,6 +272,9 @@ void main() {
       "source": "hosted",
       "dependencies": [
         "circular_a"
+      ],
+      "directDependencies": [
+        "circular_a"
       ]
     },
     {
@@ -254,6 +284,9 @@ void main() {
       "source": "hosted",
       "dependencies": [
         "shared"
+      ],
+      "directDependencies": [
+        "shared"
       ]
     }
   ],

diff --git a/...testdata/goldens/deps/executables_test/applies formatting before printing executables.txt b/...testdata/goldens/deps/executables_test/applies formatting before printing executables.txt
@@ -48,21 +48,28 @@ $ pub deps --json
       "dependencies": [
         "foo",
         "bar"
-      ]
+      ],
+      "directDependencies": [
+        "foo",
+        "bar"
+      ],
+      "devDependencies": []
     },
     {
       "name": "bar",
       "version": "1.0.0",
       "kind": "direct",
       "source": "path",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     },
     {
       "name": "foo",
       "version": "1.0.0",
       "kind": "direct",
       "source": "path",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     }
   ],
   "sdks": [

diff --git a/test/testdata/goldens/deps/executables_test/dev dependencies.txt b/test/testdata/goldens/deps/executables_test/dev dependencies.txt
@@ -34,7 +34,9 @@ $ pub deps --json
       "version": "0.0.0",
       "kind": "root",
       "source": "root",
-      "dependencies": [
+      "dependencies": [],
+      "directDependencies": [],
+      "devDependencies": [
         "foo"
       ]
     },
@@ -43,7 +45,8 @@ $ pub deps --json
       "version": "1.0.0",
       "kind": "dev",
       "source": "path",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     }
   ],
   "sdks": [

diff --git a/test/testdata/goldens/deps/executables_test/lists Dart executables, without entrypoints.txt b/test/testdata/goldens/deps/executables_test/lists Dart executables, without entrypoints.txt
@@ -33,7 +33,9 @@ $ pub deps --json
       "version": "0.0.0",
       "kind": "root",
       "source": "root",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": [],
+      "devDependencies": []
     }
   ],
   "sdks": [

diff --git a/test/testdata/goldens/deps/executables_test/lists executables from a dependency.txt b/test/testdata/goldens/deps/executables_test/lists executables from a dependency.txt
@@ -36,14 +36,19 @@ $ pub deps --json
       "source": "root",
       "dependencies": [
         "foo"
-      ]
+      ],
+      "directDependencies": [
+        "foo"
+      ],
+      "devDependencies": []
     },
     {
       "name": "foo",
       "version": "1.0.0",
       "kind": "direct",
       "source": "path",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     }
   ],
   "sdks": [

diff --git a/...data/goldens/deps/executables_test/lists executables only from immediate dependencies.txt b/...data/goldens/deps/executables_test/lists executables only from immediate dependencies.txt
@@ -40,7 +40,11 @@ $ pub deps --json
       "source": "root",
       "dependencies": [
         "foo"
-      ]
+      ],
+      "directDependencies": [
+        "foo"
+      ],
+      "devDependencies": []
     },
     {
       "name": "foo",
@@ -49,14 +53,18 @@ $ pub deps --json
       "source": "path",
       "dependencies": [
         "baz"
+      ],
+      "directDependencies": [
+        "baz"
       ]
     },
     {
       "name": "baz",
       "version": "1.0.0",
       "kind": "transitive",
       "source": "path",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     }
   ],
   "sdks": [

diff --git a/test/testdata/goldens/deps/executables_test/overriden dependencies executables.txt b/test/testdata/goldens/deps/executables_test/overriden dependencies executables.txt
@@ -41,14 +41,19 @@ $ pub deps --json
       "source": "root",
       "dependencies": [
         "foo"
-      ]
+      ],
+      "directDependencies": [
+        "foo"
+      ],
+      "devDependencies": []
     },
     {
       "name": "foo",
       "version": "2.0.0",
       "kind": "direct",
       "source": "path",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": []
     }
   ],
   "sdks": [

diff --git a/test/testdata/goldens/deps/executables_test/skips executables in sub directories.txt b/test/testdata/goldens/deps/executables_test/skips executables in sub directories.txt
@@ -34,7 +34,9 @@ $ pub deps --json
       "version": "0.0.0",
       "kind": "root",
       "source": "root",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": [],
+      "devDependencies": []
     }
   ],
   "sdks": [

diff --git a/test/testdata/goldens/deps/executables_test/skips non-Dart executables.txt b/test/testdata/goldens/deps/executables_test/skips non-Dart executables.txt
@@ -31,7 +31,9 @@ $ pub deps --json
       "version": "0.0.0",
       "kind": "root",
       "source": "root",
-      "dependencies": []
+      "dependencies": [],
+      "directDependencies": [],
+      "devDependencies": []
     }
   ],
   "sdks": [