Merge pull request #8 from wings-software/anshul/canoniclTemplateGene…

…ration-2

Added support for projection fields in canonical form

src/compiler/compiler.go

@@ -74,7 +74,7 @@ const queryCanonicalFormsTemplate = `
 
 const canonicalFormTemplate=`
       .add("collection(%s)"
-         + "\n    .filter(%s)")
+         + "\n    .filter(%s)"%s)
 `
 
 const generatedFileTemplate = `package io.harness.beans;
@@ -206,7 +206,24 @@ func (compiler *Compiler) Generate(query *dom.Query) string {
 			canonicalExpression.WriteString(currFieldName + " in list<+>")
 		}
 	}
-	var queryCanonicalForms = fmt.Sprintf(queryCanonicalFormsTemplate, fmt.Sprintf(canonicalFormTemplate, collectionName, canonicalExpression.String()))
+
+
+
+	var canonicalProjections strings.Builder
+	if query.ProjectFields != nil && len(query.ProjectFields) !=0 {
+		for _, field := range query.ProjectFields {
+			if len(canonicalProjections.String()) != 0 {
+				canonicalProjections.WriteString(", ")
+			} else {
+				canonicalProjections.WriteString("\n         + \"\\n    .project(")
+			}
+			canonicalProjections.WriteString(field)
+		}
+		canonicalProjections.WriteString(")\"")
+	}
+
+
+	var queryCanonicalForms = fmt.Sprintf(queryCanonicalFormsTemplate, fmt.Sprintf(canonicalFormTemplate, collectionName, canonicalExpression.String(), canonicalProjections.String()))
 
 	return fmt.Sprintf(generatedFileTemplate, imports, collectionName, name, createMethod, interfaces.String(), queryImpl, queryCanonicalForms)
 }

src/compiler/compiler_test.go

@@ -167,7 +167,8 @@ public class DelegateTaskSelectQuery implements PersistentQuery {
   public List<String> queryCanonicalForms() {
     return ImmutableList.<String>builder()
       .add("collection(DelegateTask)"
-         + "\n    .filter(orange in list<+>, worm = <+>, apple in list<+>, banana in list<+>)")
+         + "\n    .filter(orange in list<+>, worm = <+>, apple in list<+>, banana in list<+>)"
+         + "\n    .project(foo, bar)")
     .build();
   }
 }
@@ -176,4 +177,4 @@ public class DelegateTaskSelectQuery implements PersistentQuery {
 
 	var result = compiler.Generate(&query)
 	assert.Equal(t, expected, result)
-}
+}

src/dom/parser/lexer.go

@@ -1,7 +1,6 @@
 package parser
 
 import (
-	"fmt"
 	"github.com/query-builder-generator/src/dom"
 	"text/scanner"
 )
@@ -44,7 +43,7 @@ func (l *Lexer) Lex(lval *DomSymType) int {
 		}
 	}
 	lval.token = Token{token: tok, literal: lit}
-	fmt.Printf("Scanner: %+v, token: %+v, lit: %+v, tok: %+v \n", l.Scanner, token, lit, tok)
+	//fmt.Printf("Scanner: %+v, token: %+v, lit: %+v, tok: %+v \n", l.Scanner, token, lit, tok)
 	return tok
 }
 func (l *Lexer) Error(e string) {