commands: Add "hugo config mounts" command

This prints the effective file mounts in a project.

Fixes #6144

diff --git a/commands/config.go b/commands/config.go
index 64f0cdbbf9fb854193310b752d487c99b4f7d12e..72c2a0d9738f70e3acafd2a50d79717ee2a5e4b7 100644 (file)
--- a/commands/config.go
+++ b/commands/config.go
@@ -14,11 +14,18 @@
 package commands
 
 import (
+       "encoding/json"
+       "os"
        "reflect"
        "regexp"
        "sort"
        "strings"
 
+       "github.com/gohugoio/hugo/parser"
+       "github.com/gohugoio/hugo/parser/metadecoders"
+
+       "github.com/gohugoio/hugo/modules"
+
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
        "github.com/spf13/viper"
@@ -40,14 +47,37 @@ func newConfigCmd() *configCmd {
                RunE:  cc.printConfig,
        })
 
-       cc.cmd.Flags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
+       cc.cmd.PersistentFlags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
+
+       printMountsCmd := &cobra.Command{
+               Use:   "mounts",
+               Short: "Print the configured file mounts",
+               RunE:  cc.printMounts,
+       }
+
+       cc.cmd.AddCommand(printMountsCmd)
 
        return cc
 }
 
-func (c *configCmd) printConfig(cmd *cobra.Command, args []string) error {
+func (c *configCmd) printMounts(cmd *cobra.Command, args []string) error {
        cfg, err := initializeConfig(true, false, &c.hugoBuilderCommon, c, nil)
+       if err != nil {
+               return err
+       }
 
+       allModules := cfg.Cfg.Get("allmodules").(modules.Modules)
+
+       for _, m := range allModules {
+               if err := parser.InterfaceToConfig(&modMounts{m: m}, metadecoders.JSON, os.Stdout); err != nil {
+                       return err
+               }
+       }
+       return nil
+}
+
+func (c *configCmd) printConfig(cmd *cobra.Command, args []string) error {
+       cfg, err := initializeConfig(true, false, &c.hugoBuilderCommon, c, nil)
        if err != nil {
                return err
        }
@@ -83,3 +113,35 @@ func (c *configCmd) printConfig(cmd *cobra.Command, args []string) error {
 
        return nil
 }
+
+type modMounts struct {
+       m modules.Module
+}
+
+type modMount struct {
+       Source string `json:"source"`
+       Target string `json:"target"`
+       Lang   string `json:"lang,omitempty"`
+}
+
+func (m *modMounts) MarshalJSON() ([]byte, error) {
+       var mounts []modMount
+
+       for _, mount := range m.m.Mounts() {
+               mounts = append(mounts, modMount{
+                       Source: mount.Source,
+                       Target: mount.Target,
+                       Lang:   mount.Lang,
+               })
+       }
+
+       return json.Marshal(&struct {
+               Path   string     `json:"path"`
+               Dir    string     `json:"dir"`
+               Mounts []modMount `json:"mounts"`
+       }{
+               Path:   m.m.Path(),
+               Dir:    m.m.Dir(),
+               Mounts: mounts,
+       })
+}

diff --git a/hugolib/config.go b/hugolib/config.go
index 07a8d4100f9402ab0f946cc269f5bd63231f0d5f..8c2e44c10aeb48691118d205b6a8532fd42fd40d 100644 (file)
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -217,7 +217,7 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
                mods := m.ActiveModules
 
                // Apply default project mounts.
-               if err := modules.ApplyProjectConfigDefaults(v, mods[len(mods)-1]); err != nil {
+               if err := modules.ApplyProjectConfigDefaults(v, mods[0]); err != nil {
                        return err
                }
 

diff --git a/hugolib/filesystems/basefs.go b/hugolib/filesystems/basefs.go
index e550d7f35cf64889f6989138f5d55355f7468d31..2d8f54d6504dd926a87f063e126fe89c358f4145 100644 (file)
--- a/hugolib/filesystems/basefs.go
+++ b/hugolib/filesystems/basefs.go
@@ -452,20 +452,19 @@ func (b *sourceFilesystemsBuilder) createMainOverlayFs(p *paths.Paths) (*filesys
 
        // The theme components are ordered from left to right.
        // We need to revert it to get the
-       // overlay logic below working as expected, with the project on top (last).
-       for i, mod := range mods {
+       // overlay logic below working as expected, with the project on top.
+       j := 0
+       for i := len(mods) - 1; i >= 0; i-- {
+               mod := mods[i]
                dir := mod.Dir()
 
-               if i < len(mods)-1 {
-                       i = len(mods) - 2 - i
-               }
-
                isMainProject := mod.Owner() == nil
-               modsReversed[i] = mountsDescriptor{
+               modsReversed[j] = mountsDescriptor{
                        Module:        mod,
                        dir:           dir,
                        isMainProject: isMainProject,
                }
+               j++
        }
 
        err := b.createOverlayFs(collector, modsReversed)

diff --git a/hugolib/filesystems/basefs_test.go b/hugolib/filesystems/basefs_test.go
index e4efa68e21c6cdd85cb34ade6e44730e36d83672..3b4e4cd163f74a26c73977bfb743496e73c67fb9 100644 (file)
--- a/hugolib/filesystems/basefs_test.go
+++ b/hugolib/filesystems/basefs_test.go
@@ -62,7 +62,7 @@ func initConfig(fs afero.Fs, cfg config.Provider) error {
                return err
        }
 
-       if err := modules.ApplyProjectConfigDefaults(cfg, moduleConfig.ActiveModules[len(moduleConfig.ActiveModules)-1]); err != nil {
+       if err := modules.ApplyProjectConfigDefaults(cfg, moduleConfig.ActiveModules[0]); err != nil {
                return err
        }
 

diff --git a/modules/collect.go b/modules/collect.go
index 80835360804ef4f6497b7d4d463001a033a9b8d3..9a18f5579c8113398aedbc7585d5a9be506ce0f5 100644 (file)
--- a/modules/collect.go
+++ b/modules/collect.go
@@ -478,8 +478,8 @@ func (c *collector) collect() {
                return
        }
 
-       // Append the project module at the tail.
-       c.modules = append(c.modules, projectMod)
+       // Add the project mod on top.
+       c.modules = append(Modules{projectMod}, c.modules...)
 
 }