Support namespaces in CreateRedoc (#81)

* udpate README

* fix redoc with namespaces

README.md

@@ -97,7 +97,7 @@ export SYSL_TOKENS=github.com:<YOUR_TOKEN_HERE>
 ```
 
 ```bash
-export SYSL_PLANTUML=http://www.plantuml.com/plantuml`
+export SYSL_PLANTUML=http://www.plantuml.com/plantuml
 ```
 
 On macOS, if your `launchctl limit maxfiles` setting is too low (e.g 256) you might see the error message "too many open files" when running make. 

pkg/catalog/create_redoc.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"os"
 	"path"
+	"strings"
 
 	"github.com/anz-bank/sysl/pkg/sysl"
 	"github.com/ghodss/yaml"
@@ -55,6 +56,7 @@ func (p *Generator) CreateRedoc(app *sysl.Application, appName string) string {
 	if !IsOpenAPIFile(importPath) {
 		return ""
 	}
+	appName = strings.ReplaceAll(appName, " :: ", "_")
 	redocOutputPath, _ := CreateFileName(p.CurrentDir, appName+".redoc.html")
 	redocOutputPath = path.Join(p.OutputDir, redocOutputPath)
 	var c []byte

pkg/catalog/util.go

@@ -156,12 +156,12 @@ func JoinAppNameString(an *sysl.AppName) string {
 func GetAppPackageName(a Namer) (string, string) {
 	appName := GetAppNameString(a)
 	packageName := appName
-	if attr := a.GetAttrs()[macropackage_name]; attr != nil {
+	if attr := a.GetAttrs()["package"]; attr != nil {
+		packageName = attr.GetS()
+	} else if attr := a.GetAttrs()[macropackage_name]; attr != nil {
 		packageName = attr.GetS()
 	} else if len(a.GetName().Part) > 1 {
 		packageName = strings.Join(a.GetName().Part[:len(a.GetName().Part)-1], namespaceSeparator)
-	} else if attr := a.GetAttrs()["package"]; attr != nil {
-		packageName = attr.GetS()
 	}
 	return packageName, appName
 }