Still work in progress

- Creates directory for generated package
- Adds more XSD elements

Author: c4milo

cli.go

@@ -4,15 +4,14 @@ import (
 	flags "github.com/jessevdk/go-flags"
 	"log"
 	"os"
-	"sync"
 )
 
 const version = "v0.0.1"
 
 var opts struct {
 	Version    bool   `short:"v" long:"version" description:"Shows gowsdl version"`
-	Package    string `short:"p" long:"package" description:"Package under which code will be generated" default:"gowsdl"`
-	OutputFile string `short:"o" long:"output" description:"File where the generated code will be saved" default:"./myservice.go"`
+	Package    string `short:"p" long:"package" description:"Package under which code will be generated" default:"myservice"`
+	OutputFile string `short:"o" long:"output" description:"File where the generated code will be saved" default:"myservice.go"`
 }
 
 func main() {
@@ -42,57 +41,31 @@ func main() {
 		os.Exit(1)
 	}
 
-	err = gowsdl.Unmarshal()
+	gocode, err := gowsdl.Start()
 	if err != nil {
-		logger.Println(err)
-		os.Exit(1)
+		logger.Fatalln(err)
 	}
 
-	var types, operations, proxy []byte
-	var wg sync.WaitGroup
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		var err error
-
-		types, err = gowsdl.GenTypes()
-		if err != nil {
-			logger.Fatalln(err)
-		}
-	}()
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		var err error
+	pkg := "./" + opts.Package
+	err = os.Mkdir(pkg, 0744)
 
-		operations, err = gowsdl.GenOperations()
+	if perr, ok := err.(*os.PathError); ok && os.IsExist(perr.Err) {
+		logger.Println("Package directory already exist, skipping creation")
+	} else {
 		if err != nil {
 			logger.Fatalln(err)
 		}
-	}()
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		var err error
-
-		proxy, err = gowsdl.GenSoapProxy()
-		if err != nil {
-			logger.Fatalln(err)
-		}
-	}()
-
-	wg.Wait()
+	}
 
-	fd, err := os.Create(opts.OutputFile)
+	fd, err := os.Create(pkg + "/" + opts.OutputFile)
 	if err != nil {
 		logger.Fatalln(err)
 	}
 	defer fd.Close()
 
-	fd.Write(types)
-	fd.Write(proxy)
-	fd.Write(operations)
+	fd.Write(gocode["types"])
+	fd.Write(gocode["proxy"])
+	fd.Write(gocode["operations"])
+
+	logger.Println("Done 💩")
 }

gowsdl.go

@@ -6,11 +6,13 @@ import (
 	"log"
 	"os"
 	"strings"
+	"sync"
 )
 
 type GoWsdl struct {
 	file, pkg string
 	logger    *log.Logger
+	wsdl      *Wsdl
 }
 
 func NewGoWsdl(file, pkg string, logger *log.Logger) (*GoWsdl, error) {
@@ -35,34 +37,114 @@ func NewGoWsdl(file, pkg string, logger *log.Logger) (*GoWsdl, error) {
 	}, nil
 }
 
+func (g *GoWsdl) Start() (map[string][]byte, error) {
+	gocode := make(map[string][]byte)
+
+	err := g.Unmarshal()
+	if err != nil {
+		return nil, err
+	}
+
+	var wg sync.WaitGroup
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		var err error
+
+		gocode["types"], err = g.GenTypes()
+		if err != nil {
+			g.logger.Println(err)
+		}
+	}()
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		var err error
+
+		gocode["operations"], err = g.GenOperations()
+		if err != nil {
+			g.logger.Println(err)
+		}
+	}()
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		var err error
+
+		gocode["proxy"], err = g.GenSoapProxy()
+		if err != nil {
+			g.logger.Println(err)
+		}
+	}()
+
+	wg.Wait()
+
+	return gocode, nil
+}
+
 func (g *GoWsdl) Unmarshal() error {
 	g.logger.Printf("Using %s...\n", g.file)
 
-	//URL or local file?
+	//g.file is URL or local file?
 	//if URL, download!
 
 	data, err := ioutil.ReadFile(g.file)
 	if err != nil {
 		return err
 	}
 
-	wsdl := Wsdl{}
-	err = xml.Unmarshal(data, &wsdl)
+	g.wsdl = &Wsdl{}
+	err = xml.Unmarshal(data, g.wsdl)
 	if err != nil {
 		return err
 	}
 
+	//Resolve wsdl imports
+	//Resolve xsd includes
+	//Resolve xsd imports
+
 	return nil
 }
 
 func (g *GoWsdl) GenTypes() ([]byte, error) {
+	if g.wsdl == nil {
+		g.logger.Fatalln("You have to unmarshal the WSDL file first")
+	}
+
+	//element > complexType
+
+	for _, schema := range g.wsdl.Types.Schemas {
+		g.logger.Println(schema.XMLName)
+		// for _, element := range schema.Elements {
+		// 	g.logger.Printf("Type: %s\n", element.Name)
+		// }
+		g.logger.Printf("Total types: %d\n", len(schema.Elements))
+	}
+
 	return nil, nil
 }
 
 func (g *GoWsdl) GenOperations() ([]byte, error) {
+	if g.wsdl == nil {
+		g.logger.Fatalln("You have to unmarshal the WSDL file first")
+	}
+
+	for _, pt := range g.wsdl.PortTypes {
+		// for _, o := range pt.Operations {
+		// 	g.logger.Printf("Operation: %s", o.Name)
+		// }
+		g.logger.Printf("Total ops: %d\n", len(pt.Operations))
+	}
+
 	return nil, nil
 }
 
 func (g *GoWsdl) GenSoapProxy() ([]byte, error) {
+	if g.wsdl == nil {
+		g.logger.Fatalln("You have to unmarshal the WSDL file first")
+	}
 	return nil, nil
 }

xsd.go

@@ -1,66 +1,96 @@
 package main
 
-// import (
-// 	"encoding/xml"
-// )
+import (
+	"encoding/xml"
+)
 
 type XsdSchema struct {
+	XMLName            xml.Name          `xml:"http://www.w3.org/2001/XMLSchema schema"`
+	Tns                string            `xml:"xmlns tns",attr`
+	Xs                 string            `xml:"xmlns xs,attr"`
+	Version            string            `xml:"version,attr"`
 	TargetNamespace    string            `xml:"targetNamespace,attr"`
 	ElementFormDefault string            `xml:"elementFormDefault,attr"`
 	Includes           []*XsdInclude     `xml:"http://www.w3.org/2001/XMLSchema include"`
 	Imports            []*XsdImport      `xml:"http://www.w3.org/2001/XMLSchema import"`
 	Elements           []*XsdElement     `xml:"http://www.w3.org/2001/XMLSchema element"`
-	ComplexTypes       []*XsdComplexType `xml:"http://www.w3.org/2001/XMLSchema complexType"`
+	ComplexTypes       []*XsdComplexType `xml:"http://www.w3.org/2001/XMLSchema complexType"` //global
+	SimpleType         []*XsdSimpleType  `xml:"http://www.w3.org/2001/XMLSchema simpleType"`
 }
 
 type XsdInclude struct {
 	SchemaLocation string `xml:"schemaLocation,attr"`
 }
 
 type XsdImport struct {
-	SchemaLocation string `xml:"schemaLocation,attr"`
-	Namespace      string `xml:"namespace,attr"`
+	XMLName        xml.Name `xml:"http://www.w3.org/2001/XMLSchema import"`
+	SchemaLocation string   `xml:"schemaLocation,attr"`
+	Namespace      string   `xml:"namespace,attr"`
 }
 
 type XsdElement struct {
+	XMLName     xml.Name        `xml:"http://www.w3.org/2001/XMLSchema element"`
 	Name        string          `xml:"name,attr"`
 	Nillable    bool            `xml:"nillable,attr"`
 	Type        string          `xml:"type,attr"`
 	MinOccurs   string          `xml:"minOccurs,attr"`
 	MaxOccurs   string          `xml:"maxOccurs,attr"`
-	ComplexType *XsdComplexType `xml:"http://www.w3.org/2001/XMLSchema complexType"`
+	ComplexType *XsdComplexType `xml:"http://www.w3.org/2001/XMLSchema complexType"` //local
 	SimpleType  *XsdSimpleType  `xml:"http://www.w3.org/2001/XMLSchema simpleType"`
+	Groups      []*XsdGroup     `xml:"http://www.w3.org/2001/XMLSchema group"`
 }
 
 type XsdComplexType struct {
-	Name     string       `xml:"name,attr"`
-	Sequence *XsdSequence `xml:"http://www.w3.org/2001/XMLSchema sequence"`
+	XMLName  xml.Name          `xml:"http://www.w3.org/2001/XMLSchema complexType"`
+	Abstract bool              `xml:"abstract,attr"`
+	Name     string            `xml:"name,attr"`
+	Mixed    bool              `xml:"mixed,attr"`
+	Sequence []XsdElement      `xml:"sequence>element"`
+	Choice   []XsdElement      `xml:"choice>element"`
+	All      []XsdElement      `xml:"all>element"`
+	Content  XsdComplexContent `xml:"http://www.w3.org/2001/XMLSchema complexContent"`
 }
 
-type XsdSimpleType struct {
-	Name     string          `xml:"name,attr"`
-	Sequence *XsdRestriction `xml:"http://www.w3.org/2001/XMLSchema restriction"`
+type XsdGroup struct {
+	Name     string       `xml:"name, attr"`
+	Ref      string       `xml:"ref,attr"`
+	Sequence []XsdElement `xml:"http://www.w3.org/2001/XMLSchema sequence"`
+	Choice   []XsdElement `xml:"http://www.w3.org/2001/XMLSchema choice"`
+	All      []XsdElement `xml:"http://www.w3.org/2001/XMLSchema all"`
 }
 
-type XsdSequence struct {
-	Elements []*XsdElement `xml:"http://www.w3.org/2001/XMLSchema element"`
+type XsdComplexContent struct {
+	XMLName   xml.Name     `xml:"http://www.w3.org/2001/XMLSchema complexContent"`
+	Extension XsdExtension `xml:"http://www.w3.org/2001/XMLSchema extension"`
 }
 
-type XsdRestriction struct {
-	Base         string           `xml:"base,attr"`
-	Pattern      *XsdPattern      `xml:"http://www.w3.org/2001/XMLSchema pattern"`
-	MinInclusive *XsdMinInclusive `xml:"http://www.w3.org/2001/XMLSchema minInclusive"`
-	MaxInclusive *XsdMaxInclusive `xml:"http://www.w3.org/2001/XMLSchema maxInclusive"`
+type XsdExtension struct {
+	XMLName  xml.Name    `xml:"http://www.w3.org/2001/XMLSchema extension"`
+	Base     string      `xml:"base,attr"`
+	Sequence XsdSequence `xml:"http://www.w3.org/2001/XMLSchema extension sequence"`
 }
 
-type XsdPattern struct {
-	Value string `xml:"value,attr"`
+type XsdSimpleType struct {
+	Name       string         `xml:"name,attr"`
+	Retriction XsdRestriction `xml:"http://www.w3.org/2001/XMLSchema restriction"`
 }
 
-type XsdMinInclusive struct {
-	Value string `xml:"value,attr"`
+type XsdSequence struct {
+	Elements []XsdElement `xml:"http://www.w3.org/2001/XMLSchema element"`
+}
+
+type XsdRestriction struct {
+	Base         string                `xml:"base,attr"`
+	Enumeration  []XsdRestrictionValue `xml:"http://www.w3.org/2001/XMLSchema enumeration"`
+	Pattern      XsdRestrictionValue   `xml:"http://www.w3.org/2001/XMLSchema pattern"`
+	MinInclusive XsdRestrictionValue   `xml:"http://www.w3.org/2001/XMLSchema minInclusive"`
+	MaxInclusive XsdRestrictionValue   `xml:"http://www.w3.org/2001/XMLSchema maxInclusive"`
+	WhiteSpace   XsdRestrictionValue   `xml:"http://www.w3.org/2001/XMLSchema whitespace"`
+	Length       XsdRestrictionValue   `xml:"http://www.w3.org/2001/XMLSchema length"`
+	MinLength    XsdRestrictionValue   `xml:"http://www.w3.org/2001/XMLSchema minLength"`
+	MaxLength    XsdRestrictionValue   `xml:"http://www.w3.org/2001/XMLSchema maxLength"`
 }
 
-type XsdMaxInclusive struct {
+type XsdRestrictionValue struct {
 	Value string `xml:"value,attr"`
 }