Ensure query --include-dependents being ignored

The `--include-dependents` query directive was being excluded for usages
alongside `--filter` resulting in broken graphs.

Author: julienvincent

packages/kmono-cli/src/k16/kmono/cli/commands/query.clj

@@ -28,7 +28,8 @@
         {:keys [root packages]} (common.context/load-context opts)
         packages (cond->> packages
                    filter'
-                   (core.graph/filter-by (core.packages/name-matches? filter'))
+                   (core.graph/filter-by (core.packages/name-matches? filter')
+                                         {:include-dependents include-dependents})
 
                    with-versions
                    (kmono.version/resolve-package-versions root)

packages/kmono-core/src/k16/kmono/core/fs.clj

@@ -118,7 +118,7 @@
 (defn find-package-directories
   "Find packages in a given `root` that are described by the given set of
    `package-globs`."
-  {:malli/schema [:-> :string [:or :string [:set :string]] [:vector ?Path]]}
+  {:malli/schema [:-> :string [:or :string [:set :string]] [:set ?Path]]}
   [root package-globs]
   (let [root (-> (fs/path root)
                  fs/normalize