Merge pull request #1429 from tdakkota/fix/uri-additional-properties-encoder

fix(gen): properly handle `ir.Map` when generating parameter encoders

Author: tdakkota

gen/_template/uri.tmpl

@@ -3,7 +3,7 @@
 {{- template "header" $ }}
 
 {{- range $_, $t := $.Types }}
-	{{- if and ($t.HasFeature "uri") $t.IsStruct }}
+	{{- if and ($t.HasFeature "uri") (or $t.IsStruct $t.IsMap) }}
 	{{- template "uri/encoders" $t }}
 	{{- end }}
 {{- end }}

gen/_template/uri/decode.tmpl

@@ -73,6 +73,8 @@
 	return nil
 {{- else if $t.IsStruct }}
 	return {{ $var }}.DecodeURI(d)
+{{- else if $t.IsMap }}
+	return {{ $var }}.DecodeURI(d)
 {{- else }}
     {{ errorf "unexpected kind" $t.Kind }}
 {{- end }}

gen/_template/uri/encode.tmpl

@@ -38,6 +38,8 @@
 	return nil
 {{- else if $t.IsStruct }}
 	return {{ $var }}.EncodeURI(e)
+{{- else if $t.IsMap }}
+	return {{ $var }}.EncodeURI(e)
 {{- else }}
 	{{ errorf "unexpected kind %s" $t.Kind }}
 {{- end }}

gen/_template/uri/encoders_map.tmpl

@@ -33,7 +33,7 @@ func (s *{{ $.Name }}) DecodeURI(d uri.Decoder) error {
 		propertiesCount++
 		{{- end }}
 		{{- if $.MapPattern }}
-		switch match, err := pattern.Match(k); {
+		switch match, err := pattern.MatchString(k); {
 		case err != nil:
 			return errors.Wrap(err, "execute regex")
 		case !match:

gen/write.go

@@ -385,6 +385,6 @@ func (g *Generator) hasParams() bool {
 
 func (g *Generator) hasURIObjectParams() bool {
 	return g.hasAnyType(func(t *ir.Type) bool {
-		return t.IsStruct() && t.HasFeature("uri")
+		return (t.IsStruct() || t.IsMap()) && t.HasFeature("uri")
 	})
 }