Added FORM

.vscode/launch.json

@@ -4,6 +4,8 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+
+
         {
             "type": "by-gdb",
             "request": "launch",
@@ -20,7 +22,8 @@
             "request": "launch",
             "mode": "auto",
             "program": "${fileDirname}",
-            "args": ["-h"]
-        }
+            "args": ["testform1.l2"],
+            "dlvFlags": ["--check-go-version=false"] 
+        },
     ]
 }

cmdgen/cmdgen.go

@@ -15,13 +15,14 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, headers *gabs.Container, multipart bool, o *lama2cmd.Opts) ([]string, string) {
+func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, headers *gabs.Container, multipart bool, form bool, o *lama2cmd.Opts) ([]string, string) {
 	command := make([]string, 0)
 	log.Info().
 		Str("Type", "Construct Command").
 		Str("httpv", httpv).
 		Str("url", url).
 		Bool("multipart", multipart).
+		Bool("form",form).
 		Msg(fmt.Sprint("Construct parameters"))
 
 	log.Debug().
@@ -39,7 +40,7 @@ func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, header
 	}
 
 	jsonStr := ""
-	if jsonObj != nil && !multipart {
+	if jsonObj != nil && !multipart && !form {
 		dst := &bytes.Buffer{}
 		if err := json.Compact(dst, []byte(jsonObj.String())); err != nil {
 			log.Fatal().
@@ -60,8 +61,9 @@ func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, header
 	if o.Nocolor {
 		command = append(command, "--pretty=none ")
 	}
-	if multipart {
-		command = append(command, "--headers", "--ignore-stdin", "--form")
+	if multipart || form {
+		command = append(command, //"--headers",
+		"--ignore-stdin", "--form")
 	}
 
 	command = append(command, httpv+" ")
@@ -76,6 +78,13 @@ func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, header
 		}
 	}
 
+	if form {
+		for key, val := range jsonObj.Data().(*gabs.Container).ChildrenMap() {
+			command = append(command, "'"+key+"'='"+val.Data().(string)+"'  ")
+		}
+
+	}
+
 	if headers != nil {
 		for key, val := range headers.Data().(*gabs.Container).ChildrenMap() {
 			command = append(command, key+":"+val.Data().(*gabs.Container).Data().(string))
@@ -86,7 +95,7 @@ func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, header
 		cleanC := strings.TrimSpace(c)
 		cleanCommand = append(cleanCommand, cleanC)
 	}
-	if multipart {
+	if multipart || form {
 		return cleanCommand, ""
 	}
 	return cleanCommand, jsonStr
@@ -107,7 +116,12 @@ func ConstructCommand(parsedInput *gabs.Container, o *lama2cmd.Opts) ([]string,
 	if multipart != nil {
 		multipartBool = true
 	}
+	form := parsedInput.S("form","value")
+	formBool := false
+	if form !=nil {
+		formBool = true
+	}
 
-	res, stdinBody := assembleCmdString(httpv.Data().(string), url.Data().(string), jsonObj, headers, multipartBool, o)
+	res, stdinBody := assembleCmdString(httpv.Data().(string), url.Data().(string), jsonObj, headers, multipartBool,formBool, o)
 	return res, stdinBody
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/HexmosTech/lama2
 
-go 1.19
+go 1.18
 
 require (
 	github.com/HexmosTech/gabs/v2 v2.6.5

local_update.sh

@@ -0,0 +1,2 @@
+make buildme
+sudo mv build/l2 /usr/local/bin

parser/lama2parser.go

@@ -153,6 +153,11 @@ func (p *Lama2Parser) Requester() (*gabs.Container, error) {
 		temp.Set(res, "multipart")
 	}
 
+	res, e = p.Match([]string{"Form"})
+	if e == nil {
+		temp.Set(res, "form")
+	}
+
 	res, e = p.Match([]string{"TheURL"})
 	if e == nil {
 		temp.Set(res, "url")
@@ -230,6 +235,7 @@ func (p *Lama2Parser) Multipart() (*gabs.Container, error) {
 	_, e := p.Keyword("multipart", true, true, true)
 	if e == nil {
 		temp := gabs.New()
+
 		temp.Set(true, "value")
 		temp.Set("Multipart", "type")
 		p.Context["multipart"] = true
@@ -239,6 +245,19 @@ func (p *Lama2Parser) Multipart() (*gabs.Container, error) {
 		"Expected 'multipart', but couldn't find", []string{})
 }
 
+func (p *Lama2Parser) Form() (*gabs.Container, error) {
+	_, e := p.Keyword("form", true, true, true)
+	if e == nil {
+		temp := gabs.New()
+		temp.Set(true, "value")
+		temp.Set("Form", "type")
+		p.Context["form"] = true
+		return temp, nil
+	}
+	return nil, utils.NewParseError(p.Pos+1, p.LineNum+1,
+		"Expected 'form', but couldn't find", []string{})
+}
+
 func (p *Lama2Parser) Details() (*gabs.Container, error) {
 	res, e := p.Match([]string{"HeaderData", "DataHeader"})
 	if e == nil {

parser/varjson.go

@@ -8,23 +8,28 @@ import (
 )
 
 // Method VarJSON behaves in two ways depending
-// on whether `multipart` is true or not.
+// on whether `multipart` or `form` is true or not.
 // If there is no multipart, then VarJSON tries
 // to match one or more VarJSONPairs
-// However, if there is multipart, we try to match
+// However, if there is multipart or form, we try to match
 // zero or more VarJSON, followed by zero or more
 // file fields (separated by `@`). If there is no match
 // at all, we return a ParseError; otherwise the
 // we return the parsed data.
 func (p *Lama2Parser) VarJSON() (*gabs.Container, error) {
 	temp := gabs.New()
 	hasMultipart := false
+	hasForm := false
 	if val, ok := p.Context["multipart"]; ok {
 		hasMultipart = val
 	}
 
+	if val, ok := p.Context["form"]; ok {
+		hasForm = val
+	}
+
 	pair, e1 := p.Match([]string{"VarJSONPair"})
-	if e1 != nil && !hasMultipart {
+	if e1 != nil && (!hasMultipart || !hasForm) {
 		return nil, e1
 	}
 	temp.Merge(pair)
@@ -38,7 +43,7 @@ func (p *Lama2Parser) VarJSON() (*gabs.Container, error) {
 		temp.Merge(pair)
 	}
 
-	if hasMultipart {
+	if (hasMultipart) {
 		filesObj := gabs.New()
 		for {
 			pair, e1 = p.Match([]string{"FilesPair"})

prettify/prettify.go

@@ -28,7 +28,7 @@ func Prettify(parsedAPI *gabs.Container, context map[string]bool, markRange map[
 			jsonObj := block.S("details", "ip_data")
 
 			res := content[:markRange["DataStart"]] + jsonObj.StringIndent("", "  ") + "\n" + content[markRange["DataEnd"]:]
-			os.WriteFile(fPath, []byte(res), 0644)
+			os.WriteFile(fPath, []byte(res), 0o644)
 		}
 	}
 }

testform1.l2

@@ -0,0 +1,8 @@
+POST
+FORM
+http://httpbin.org/post
+
+# DATA
+first='second'
+
+

testform2.l2

@@ -0,0 +1,9 @@
+POST
+MULTIPART
+https://httpbin.org/post
+
+# HEADERS
+Cookie:"sessionid=foo;another-cookie=bar"
+
+# DATA
+hello=world

testmulti.l2

@@ -0,0 +1,12 @@
+POST
+MULTIPART
+http://httpbin.org/post
+
+'X-Parse-Application-Id':hello
+X-Parse-REST-API-Key:"world"
+
+# DATA
+first=second
+
+# FILES
+myfile@./image.jpeg

tests/codegen_test.go

@@ -33,7 +33,7 @@ func TestSplitLangLib2(t *testing.T) {
 	}
 }
 
-func TestGenerateMultiStage(t *testing.T) {
+func TestGenerateMultiStage(_ *testing.T) {
 	l2Path := "../examples/0009_processor_basic/0009_processor_basic.l2"
 	apiContent, _ := os.ReadFile(l2Path)
 	_, dir, _ := utils.GetFilePathComponents(l2Path)