goosed up the array handling and central half-baked the release

dart-ogurets · Oct 15, 2023 · 4e5f5ee · 4e5f5ee
1 parent 317eb8e
commit 4e5f5ee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<artifactId>openapi-dart-generator</artifactId>
 	<packaging>jar</packaging>
 	<name>openapi-dart-generator</name>
-	<version>8.1-RC3-SNAPSHOT</version>
+	<version>8.1-RC4-SNAPSHOT</version>
 
 	<description>
 		dart2 generator from openapi 3.x spec files.

diff --git a/src/main/resources/dart2-v3template/class.mustache b/src/main/resources/dart2-v3template/class.mustache
@@ -28,7 +28,7 @@ class {{{classname}}}{{#parent}} extends {{parent}}{{/parent}} {
   {{^isNullable}}late {{/isNullable}}dynamic json;
 {{/parent}}{{/hasVars}}
 {{#vars}}
-  // {{name}} required: {{required}} nullable: {{isNullable}} default: {{vendorExtensions.original-default}} inherited: {{isInherited}}
+  // {{name}} required: {{required}} nullable: {{isNullable}} default: {{vendorExtensions.original-default}} inherited: {{isInherited}} container {{isContainer}}
 {{/vars}}
 {{{classname}}}(
 {{#hasVars}}{
@@ -38,13 +38,20 @@ class {{{classname}}}{{#parent}} extends {{parent}}{{/parent}} {
       this.{{{name}}}{{^required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/required}}
     {{/vendorExtensions.required-owned}}
     {{^vendorExtensions.required-owned}}
-    {{#isArray}}{{{dataType}}}{{^isNullable}}{{^isInherited}}?{{/isInherited}}{{/isNullable}} {{{name}}}{{/isArray}}
-    {{#isMap}}{{{dataType}}}{{^isNullable}}{{^isInherited}}?{{/isInherited}}{{/isNullable}} {{{name}}}{{/isMap}}
-    {{^isArray}}
-      {{^isMap}}
-        {{#isInherited}}{{{dataType}}} {{/isInherited}}{{^isInherited}}this.{{/isInherited}}{{{name}}}{{^required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/required}}
-      {{/isMap}}
-    {{/isArray}}
+      {{! now we just deal with arrays and maps }}
+      {{#isContainer}}
+        {{#isInherited}}{{{dataType}}} {{{name}}}{{/isInherited}}
+        {{^isInherited}}
+          {{#defaultValue}}{{{dataType}}}{{^isNullable}}?{{/isNullable}} {{{name}}}{{/defaultValue}}
+          {{^defaultValue}}this.{{{name}}}{{/defaultValue}}
+        {{/isInherited}}
+      {{/isContainer}}
+      {{^isContainer}}
+        {{#isInherited}}{{{dataType}}} {{{name}}}{{/isInherited}}
+        {{^isInherited}}
+          this.{{{name}}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
+        {{/isInherited}}
+      {{/isContainer}}
     {{/vendorExtensions.required-owned}}
     {{^-last}}, {{/-last}}
     {{/vars}} }{{/hasVars}}