Bugfix: Skip reading same file multiple times

Also merge types from schemas read from multiple files

Author: vraut-pdgc

xsd/parse.go

@@ -153,7 +153,14 @@ func Parse(docs ...[]byte) ([]Schema, error) {
 		if err := s.parse(root); err != nil {
 			return nil, err
 		}
-		parsed[tns] = s
+		// schema already exists, so merge types with new ones
+		if ps, ok := parsed[tns]; ok {
+			for name, newType := range s.Types {
+				ps.Types[name] = newType
+			}
+		} else {
+			parsed[tns] = s
+		}
 	}
 
 	for _, s := range parsed {

xsdgen/cli.go

@@ -55,6 +55,7 @@ func (cfg *Config) GenCode(data ...[]byte) (*Code, error) {
 // GenAST creates an *ast.File containing type declarations and
 // associated methods based on a set of XML schema.
 func (cfg *Config) GenAST(files ...string) (*ast.File, error) {
+	cfg.filesRead = make(map[string]bool)
 	data, err := cfg.readFiles(files...)
 	code, err := cfg.GenCode(data...)
 	if err != nil {
@@ -70,11 +71,17 @@ func (cfg *Config) readFiles(files ...string) ([][]byte, error) {
 		if err != nil {
 			return nil, err
 		}
+		if _, ok := cfg.filesRead[path]; ok {
+			// skip reading the file again
+			continue
+		}
+		cfg.filesRead[path] = true
+
 		b, err := ioutil.ReadFile(path)
 		if err != nil {
 			return nil, err
 		}
-		cfg.debugf("read %s(%s)", path, filename)
+		cfg.debugf("read %s", path)
 		if cfg.followImports {
 			dir := filepath.Dir(path)
 			importedRefs, err := xsd.Imports(b)

xsdgen/config.go

@@ -44,6 +44,9 @@ type Config struct {
 	// if populated, only types that are true in this map
 	// will be selected.
 	allowTypes map[xml.Name]bool
+
+	// keep track of files that are read already to avoid reading it again
+	filesRead map[string]bool
 }
 
 type typeTransform func(xsd.Schema, xsd.Type) xsd.Type