update routes

- nest routes with route directive ‘require’. Required (imported)
directives will have parent paths prefixed.
- move provider/go statement  init/execution prior to sub route
execution.

Author: cheikhshift

loader.go

@@ -23,10 +23,10 @@ func Load(path string) (*Project, error) {
 	var ext = filepath.Ext(path)
 
 	switch ext {
-	case ".yml":
-		err = LoadYAML(path, env)
-	default:
-		err = LoadSE(path, env)
+		case ".yml":
+			err = LoadYAML(path, env)
+		default:
+			err = LoadSE(path, env)
 	}
 
 	if err != nil {

transpiler/http_gen.go

@@ -49,6 +49,10 @@ func ProcessRoute(p *samb.Project, r samb.Route, path string, providers []string
 
 	providers = append(providers, r.Provide...)
 
+	if len(r.Require) > 0 {
+		r.Route = ImportRoutes(r)
+	}
+
 	if len(r.Route) > 0 {
 
 		newRoot := path + r.Path
@@ -75,9 +79,27 @@ func ProcessRoute(p *samb.Project, r samb.Route, path string, providers []string
 		return
 	}
 
-	h := GetHandler(p, r, providers)
+	middleware,h := GetHandler(p, r, providers)
+
+	def = WrapEndpoint(path, r,  middleware + def + h)
+
+	return
+}
+
+// ImportRoutes will get the route definitions
+// specfied by route field Require
+func ImportRoutes(r samb.Route) (result []samb.Route) {
 
-	def = WrapEndpoint(path, r, def + h)
+	for _,req := range r.Require {
+
+		file, err := samb.Load(req)
+
+		if err != nil {
+			panic(err)
+		}
+
+		result = append(result,file.Routes.Route...)
+	}
 
 	return
 }

transpiler/transpiler_util_test.go

@@ -125,8 +125,7 @@ func TestWrapEndpoint(t *testing.T) {
 			result := WrapEndpoint("", tt.route, "")
 
 			if result != expectedValues[i] {
-				println(result)
-				println("///")
+
 				t.Errorf("got  %v, want %v", result, expectedValues[i])
 			}
 
@@ -136,13 +135,11 @@ func TestWrapEndpoint(t *testing.T) {
 
 func TestGetHandler(t *testing.T) {
 
-	blankString := `
-`
+	blankString := "\n"
 
 	expectedValues := []string{
 		blankString,
-		blankString,
-		`
+		blankString,`
 //
 var Foo = string("Foo")
 
@@ -155,11 +152,10 @@ var Foo = string("Foo")
 	for i, tt := range routeTests {
 		t.Run(string(i), func(t *testing.T) {
 
-			result := GetHandler(testProject, tt.route, tt.route.Provide)
+			result,_ := GetHandler(testProject, tt.route, tt.route.Provide)
 
 			if result != expectedValues[i] {
-				println(result)
-				println("///")
+
 				t.Errorf("got  %v, want %v", result, expectedValues[i])
 			}
 

transpiler/transpiler_utils.go

@@ -34,16 +34,15 @@ func WrapEndpoint(path string, r samb.Route, h string) string {
 // GetHandler Generates the Go code executed specified to
 // be executed by
 // a samb route.
-func GetHandler(p *samb.Project, r samb.Route, providers []string) (handler string) {
+func GetHandler(p *samb.Project, r samb.Route, providers []string) (middleware, handler string) {
 
 	gocode := GetCustomCode(r)
-	endPointCode := gocode + r.Handler
-	var providerInitializer = GetProviderInits(p, providers, endPointCode)
+	var providerInitializer = GetProviderInits(p, providers, gocode + r.Handler)
 
-	handler = providerInitializer + endPointCode
+	middleware = providerInitializer + gocode
 
 	if r.Handler != "" {
-		handler = "\n\ntools.ShortenPath(basePath, r)\n" + handler + "\nreturn"
+		handler = "\n\ntools.ShortenPath(basePath, r)\n" + r.Handler + "\nreturn"
 	}
 
 	return

types.go

@@ -68,6 +68,9 @@ type Route struct {
 	// if the request path matches this
 	// routes' path
 	Strict bool
+	// Require will import and nest the
+	// routes from the specified SAMB sources.
+	Require []string
 }
 
 // Array of Go statements