Merge branch 'master' into simplify

.goreleaser.yml

@@ -1,12 +1,23 @@
 build:
   main: cmd/swag/main.go
+  goos:
+    - linux
+    - darwin
+  goarch:
+    - amd64
+    - arm64
+    - 386
+  ignore:
+    - goos: darwin
+      goarch: arm64
 archive:
   replacements:
     darwin: Darwin
     linux: Linux
     windows: Windows
     386: i386
     amd64: x86_64
+    arm64: aarch64
 checksum:
   name_template: 'checksums.txt'
 snapshot:

example/object-map-example/go.mod

@@ -6,6 +6,6 @@ require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/gin-gonic/gin v1.6.3
 	github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14
-	github.com/swaggo/gin-swagger v1.2.0
+	github.com/swaggo/gin-swagger v1.3.0
 	github.com/swaggo/swag v1.5.1
 )

schema.go

@@ -155,12 +155,12 @@ func BuildCustomSchema(types []string) (*spec.Schema, error) {
 	}
 
 	switch types[0] {
-	case "primitive":
+	case PRIMITIVE:
 		if len(types) == 1 {
 			return nil, errors.New("need primitive type after primitive")
 		}
 		return BuildCustomSchema(types[1:])
-	case "array":
+	case ARRAY:
 		if len(types) == 1 {
 			return nil, errors.New("need array item type after array")
 		}
@@ -169,9 +169,9 @@ func BuildCustomSchema(types []string) (*spec.Schema, error) {
 			return nil, err
 		}
 		return spec.ArrayProperty(schema), nil
-	case "object":
+	case OBJECT:
 		if len(types) == 1 {
-			return nil, errors.New("need object item type after object")
+			return PrimitiveSchema(types[0]), nil
 		}
 		schema, err := BuildCustomSchema(types[1:])
 		if err != nil {

schema_test.go

@@ -106,8 +106,8 @@ func TestBuildCustomSchema(t *testing.T) {
 	assert.Equal(t, schema.SchemaProps.Items.Schema.SchemaProps.Type, spec.StringOrArray{"string"})
 
 	schema, err = BuildCustomSchema([]string{"object"})
-	assert.Error(t, err)
-	assert.Nil(t, schema)
+	assert.NoError(t, err)
+	assert.Equal(t, schema.SchemaProps.Type, spec.StringOrArray{"object"})
 
 	schema, err = BuildCustomSchema([]string{"object", "oops"})
 	assert.Error(t, err)