Support required vs. optional properties (#9)

webrpc · Jul 10, 2023 · 5f47cad · 5f47cad
1 parent 1ebf182
commit 5f47cad
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/_examples/openapi.gen.yaml b/_examples/openapi.gen.yaml
@@ -1,4 +1,4 @@
-# example v0.0.1 8c962b82639c77d8c62f134f5c009611f35c7f8f
+# example v0.0.1 21006c2dc2dc334a0382a645c1103910d151bb8c
 # --
 # Code generated by [email protected] with custom generator; DO NOT EDIT
 # 
@@ -218,6 +218,10 @@ components:
         - ADMIN
     User:
       type: object
+      required:
+        - id
+        - username
+        - role
       properties:
         id:
           type: number
@@ -227,11 +231,19 @@ components:
           type: string
     SearchFilter:
       type: object
+      required:
+        - q
       properties:
         q:
           type: string
+        active:
+          type: boolean
     Version:
       type: object
+      required:
+        - webrpcVersion
+        - schemaVersion
+        - schemaHash
       properties:
         webrpcVersion:
           type: string
@@ -241,6 +253,16 @@ components:
           type: string
     ComplexType:
       type: object
+      required:
+        - meta
+        - metaNestedExample
+        - namesList
+        - numsList
+        - doubleArray
+        - listOfMaps
+        - listOfUsers
+        - mapOfUsers
+        - user
       properties:
         meta:
           type: object

diff --git a/_examples/proto.ridl b/_examples/proto.ridl
@@ -22,6 +22,7 @@ struct User
 
 struct SearchFilter
   - q: string
+  - active?: bool
 
 struct Version
   - webrpcVersion: string

diff --git a/type.go.tmpl b/type.go.tmpl
@@ -17,11 +17,17 @@
     {{else}}
       type: object
       {{- if gt (len $type.Fields) 0}}
+      required:
+      {{- range $i, $field := $type.Fields -}}
+        {{- if not $field.Optional }}
+        - {{$field.Name}}
+        {{- end -}}
+      {{- end }}
       properties:
       {{- end -}}
-      {{- range $i, $fields := $type.Fields }}
-        {{.Name -}}:
-          {{ template "fieldType" dict "Type" .Type "TypeMap" $typeMap "Indent" "          " }}
+      {{- range $i, $field := $type.Fields }}
+        {{$field.Name -}}:
+          {{ template "fieldType" dict "Type" $field.Type "TypeMap" $typeMap "Indent" "          " }}
       {{- end -}}
     {{- end -}}
 {{- end -}}