feat: patch pkg and cli (#6)

Author: adityalstkp

README.md

@@ -1,4 +1,4 @@
-![](https://img.shields.io/badge/version-0.2.0-brightgreen)
+![](https://img.shields.io/badge/version-0.3.0-brightgreen)
 
 # go-ngx-config
 A nginx config parser
@@ -8,11 +8,15 @@ A nginx config parser
 ### Binary
 Usage:
 ```sh
-# -f          file path location nginx configm, e,g: ./examples/basic/nginx.conf
+# Parse
+# -f          file path location nginx configm, e.g: ./examples/basic/nginx.conf
 # -o          output json file path location, e.g: ./examples/basic/output
-
-
 go-ngx-config parse -f <NGINX_CONF_FILE> -o <OUTPUT_JSON_FILE_DUMP>
+
+# Location Matcher
+# -f          file path location nginx configm, e.g: ./examples/basic/nginx.conf
+# -u          url target, e.g: /my-location
+go-ngx-config lt -f <NGINX_CONF_FILE> -u <URL_TARGET>
 ```
 
 <details>
@@ -186,7 +190,7 @@ Exported Global Function
 // Some Basic Example
 await parseConfig(`
 server {
-  server_name my-server.domain.com
+  server_name my-server.domain.com;
 
   location = /my-location {
     proxy_pass http://lite-dev;
@@ -196,21 +200,21 @@ server {
 
 await testLocation(`
 server {
-  server_name my-server.domain.com
+  server_name my-server.domain.com;
 
   location = /my-location {
     proxy_pass http://lite-dev;
   }
 }
 `, '/my-location');
 ```
-![WebExample](./assets/wasm-example.png "Web Example")
 
 <br/>
 
 
 ## TODO(s):
-- [ ] Include directive and reads the glob (?)
+- [x] .wasm binary 
 - [x] Location Tester
+- [ ] Include directive and reads the glob (?)
 - [ ] HTTP Server for see the config on UI browser
 - [ ] And lot more...

assets/wasm-example.png

@@ -1,15 +1,14 @@
 package main
 
 import (
-	"github.com/adityals/go-ngx-config/pkg/parser"
 	"github.com/spf13/cobra"
 )
 
 func NewRootCommand() *cobra.Command {
 	rootCmd := &cobra.Command{
 		Use:     "go-ngx-config COMMAND [ARG...]",
-		Version: parser.VERSION,
 		Short:   "A nginx config build with go",
+		Version: "0.3.0",
 	}
 
 	return rootCmd

cmd/go-ngx-config/commands.go

@@ -42,11 +42,21 @@ func RunNgxLocationTester(cmd *cobra.Command, args []string) error {
 	}
 
 	elapsed := time.Since(startTime)
-	logrus.Info("Process time: ", elapsed)
 
 	logrus.Info("[Match] Modifier: ", match.MatchModifer)
 	logrus.Info("[Match] Path: ", match.MatchPath)
 
+	logrus.Info("[Match] --- Directives Inside --- ")
+	for _, d := range match.Directives {
+		logrus.Info("[Match] Name: ", d.GetName())
+		for _, param := range d.GetParameters() {
+			logrus.Info("[Match] Parameters: ", param)
+		}
+	}
+	logrus.Info("[Match] --- End of Directives Inside --- ")
+
+	logrus.Info("Process time: ", elapsed)
+
 	return nil
 
 }

cmd/go-ngx-config/location_tester_command.go

@@ -27,6 +27,7 @@ http {
         }
 
         location / {
+            add_header 'x-foo' 'x-bar';
             proxy_pass http://my-upstream;
         }
 

examples/basic/nginx.conf

@@ -7,11 +7,13 @@ import (
 	"strings"
 
 	"github.com/adityals/go-ngx-config/internal/ast"
+	"github.com/adityals/go-ngx-config/internal/statement"
 )
 
 type LocationMatcher struct {
 	MatchPath    string
 	MatchModifer string
+	Directives   []statement.IDirective
 }
 
 const (
@@ -50,7 +52,8 @@ func NewLocationMatcher(conf *ast.Config, targetPath string) (*LocationMatcher,
 			Name:       name,
 			Modifier:   modifier,
 			Match:      match,
-			Directives: directives})
+			Directives: directives,
+		})
 	}
 
 	match, err := locationTester(locations, parsedUrl.Path)
@@ -65,7 +68,9 @@ func NewLocationMatcher(conf *ast.Config, targetPath string) (*LocationMatcher,
 
 	return &LocationMatcher{
 		MatchModifer: match.MatchModifer,
-		MatchPath:    match.MatchPath}, nil
+		MatchPath:    match.MatchPath,
+		Directives:   match.Directives,
+	}, nil
 }
 
 func locationTester(locationsTarget []ast.Location, targetPath string) (*LocationMatcher, error) {
@@ -75,7 +80,11 @@ func locationTester(locationsTarget []ast.Location, targetPath string) (*Locatio
 		}
 
 		if location.Match == targetPath {
-			return &LocationMatcher{MatchPath: location.Match, MatchModifer: location.Modifier}, nil
+			return &LocationMatcher{
+				MatchPath:    location.Match,
+				MatchModifer: location.Modifier,
+				Directives:   location.Directives,
+			}, nil
 		}
 	}
 
@@ -110,13 +119,21 @@ func locationTester(locationsTarget []ast.Location, targetPath string) (*Locatio
 
 			match := reg.FindString(targetPath)
 			if match != "" {
-				return &LocationMatcher{MatchPath: location.Match, MatchModifer: location.Modifier}, nil
+				return &LocationMatcher{
+					MatchPath:    location.Match,
+					MatchModifer: location.Modifier,
+					Directives:   location.Directives,
+				}, nil
 			}
 		}
 	}
 
 	if bestMatch != nil {
-		return &LocationMatcher{MatchPath: bestMatch.Match, MatchModifer: bestMatch.Modifier}, nil
+		return &LocationMatcher{
+			MatchPath:    bestMatch.Match,
+			MatchModifer: bestMatch.Modifier,
+			Directives:   bestMatch.Directives,
+		}, nil
 	}
 
 	return nil, nil

internal/matcher/location.go

@@ -0,0 +1,7 @@
+{
+    "name": "go-ngx-config",
+    "description": "Go Nginx Configuration",
+    "authors": "Aditya Septiadi",
+    "version": "0.3.0",
+    "license": "MIT"
+}

package.json

@@ -0,0 +1,31 @@
+package matcher
+
+import (
+	"errors"
+
+	"github.com/adityals/go-ngx-config/internal/matcher"
+	"github.com/adityals/go-ngx-config/internal/parser"
+)
+
+func NewLocationMatcher(locMatcherOpts LocationMatcherOptions) (*matcher.LocationMatcher, error) {
+	parser, err := parser.NewParser(locMatcherOpts.Filepath)
+	if err != nil {
+		return nil, err
+	}
+
+	parsedConf := parser.Parse()
+	if parsedConf == nil {
+		return nil, errors.New("cannot be parsed")
+	}
+
+	match, err := matcher.NewLocationMatcher(parsedConf, locMatcherOpts.UrlTarget)
+	if err != nil {
+		return nil, err
+	}
+
+	if match == nil {
+		return nil, errors.New("match is nil")
+	}
+
+	return match, nil
+}

pkg/matcher/loc_matcher.go

@@ -0,0 +1,6 @@
+package matcher
+
+type LocationMatcherOptions struct {
+	Filepath  string
+	UrlTarget string
+}