Prepare for recursion support

README.md

@@ -94,8 +94,8 @@ var3 = {path = [[], ".jsonMap"], type = "json"}
 ## further references
 
 [TOML spec](https://toml.io/en/v1.0.0-rc.3#keyvalue-pair)
-
 [envsubst](https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html) cheatsheet:
+[yq expressions](https://mikefarah.gitbook.io/yq/)
 
 
 | __Expression__                | __Meaning__                                                     |
@@ -113,7 +113,7 @@ var3 = {path = [[], ".jsonMap"], type = "json"}
 | `${#var}`                     | String length of `$var`
 | `${var:n}`                    | Offset `$var` `n` characters from start
 | `${var: -n}`                  | Offset `$var` `n` characters from end
-| `${var:n:len}`                | Offset `$var` `n` characters of `len` length
+| `${var:n:len}`                | Offset `$var` `n` characters with max length of `len`
 | `${var#pattern}`              | Strip shortest `pattern` match from start
 | `${var##pattern}`             | Strip longest `pattern` match from start
 | `${var%pattern}`              | Strip shortest `pattern` match from end

cmd/cogs/main.go

@@ -73,17 +73,13 @@ func main() {
 
 		format, err := conf.validate()
 		ifErr(err)
-
-		cfgMap, err := cogs.Generate(conf.Ctx, conf.File, format)
-		ifErr(err)
-
-		cfgMap, err = conf.filterCfgMap(cfgMap)
+		cfgMap, err := cogs.Generate(conf.Ctx, conf.File, format, conf.filterCfgMap)
 		ifErr(err)
 
 		switch format {
 		case cogs.JSON:
 			b, err = json.MarshalIndent(cfgMap, "", "  ")
-			output = string(b)
+			output = string(b) + "\n"
 		case cogs.YAML:
 			b, err = yaml.Marshal(cfgMap)
 			output = string(b)
@@ -111,6 +107,6 @@ func main() {
 		}
 		ifErr(err)
 
-		fmt.Fprintln(os.Stdout, output)
+		fmt.Fprint(os.Stdout, output)
 	}
 }

cmd/cogs/optparse.go

@@ -59,37 +59,15 @@ func modKeys(cfgMap map[string]interface{}, modFn ...func(string) string) map[st
 	return newCfgMap
 }
 
-// exclude produces a laundered map with exclusionList values missing
-func exclude(exclusionList []string, cfgMap map[string]interface{}) map[string]interface{} {
-	newCfgMap := make(map[string]interface{})
-
-	for k := range cfgMap {
-		if inList(k, exclusionList) {
-			continue
-		}
-		newCfgMap[k] = cfgMap[k]
-	}
-	return newCfgMap
-}
-
-func inList(s string, ss []string) bool {
-	for _, v := range ss {
-		if v == s {
-			return true
-		}
-	}
-	return false
-}
-
 // filterCfgMap retains only key names passed to --keys
-func (c *Conf) filterCfgMap(cfgMap map[string]interface{}) (map[string]interface{}, error) {
+func (c *Conf) filterCfgMap(cfgMap cogs.CfgMap) (cogs.CfgMap, error) {
 
 	// --not runs before --keys!
 	// make sure to avoid --not=key_name --key=key_name, ya dingus!
 	var notList []string
 	if c.Not != "" {
 		notList = strings.Split(c.Not, ",")
-		cfgMap = exclude(notList, cfgMap)
+		cfgMap = cogs.Exclude(notList, cfgMap)
 	}
 	if c.Keys == "" {
 		return cfgMap, nil
@@ -101,7 +79,7 @@ func (c *Conf) filterCfgMap(cfgMap map[string]interface{}) (map[string]interface
 		var ok bool
 		if newCfgMap[key], ok = cfgMap[key]; !ok {
 			hint := ""
-			if inList(key, notList) {
+			if cogs.InList(key, notList) {
 				hint = fmt.Sprintf("\n\n--not=%s and --keys=%s were called\n"+
 					"avoid trying to include and exclude the same value, ya dingus!", key, key)
 			}