Merge branch 'master' into typescript-fetch

Author: john-98point6

pom.xml

@@ -253,7 +253,7 @@
     </dependencies>
     <properties>
         <swagger-codegen-version>3.0.20-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.0.19</swagger-parser-version>
+        <swagger-parser-version>2.0.20-SNAPSHOT</swagger-parser-version>
         <swagger-core-version>2.1.2</swagger-core-version>
         <jackson-version>2.10.3</jackson-version>
         <scala-version>2.11.1</scala-version>

src/main/java/io/swagger/codegen/v3/generators/dotnet/CSharpClientCodegen.java

@@ -10,6 +10,7 @@
 import io.swagger.codegen.v3.CodegenProperty;
 import io.swagger.codegen.v3.CodegenType;
 import io.swagger.codegen.v3.SupportingFile;
+import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
 import io.swagger.v3.oas.models.media.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -491,6 +492,19 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         return objs;
     }
 
+    @Override
+    public String getSchemaType(Schema schema) {
+        String schemaType = super.getSchemaType(schema);
+
+        if (schema.get$ref() != null) {
+            final Schema refSchema = OpenAPIUtil.getSchemaFromName(schemaType, this.openAPI);
+            if (refSchema != null && !isObjectSchema(refSchema) && (refSchema.getEnum() == null || refSchema.getEnum().isEmpty())) {
+                schemaType = super.getSchemaType(refSchema);
+            }
+        }
+        return schemaType;
+    }
+
     @Override
     public CodegenType getTag() {
         return CodegenType.CLIENT;

src/main/resources/handlebars/javascript/.babelrc.mustache

@@ -1,7 +1,7 @@
 {
   "plugins": [
     ["babel-plugin-transform-builtin-extend", {
-      globals: ["Error", "Array"]
+      "globals": ["Error", "Array"]
     }]
   ],
   "presets": ["env", "stage-0"]

src/main/resources/handlebars/javascript/package.mustache

@@ -17,6 +17,7 @@
   },
   "devDependencies": {
     "babel-core": "6.26.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "babel-preset-env": "^1.6.1",
     "babel-preset-stage-0": "^6.24.1",
     "expect.js": "~0.3.1",

src/main/resources/handlebars/javascript/partial_model_generic.mustache

@@ -57,7 +57,7 @@ export default class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtension
     * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}{{#defaultValue}}
     * @default {{{defaultValue}}}{{/defaultValue}}
     */{{/emitJSDoc}}
-    {{baseName}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
+    '{{baseName}}' = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
 {{/vars}}
 
 {{#useInheritance}}{{#interfaceModels}}
@@ -67,7 +67,7 @@ export default class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtension
     * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}{{#defaultValue}}
     * @default {{{defaultValue}}}{{/defaultValue}}
     */{{/emitJSDoc}}
-    {{baseName}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
+    '{{baseName}}' = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
     {{/allVars}}
 {{/interfaceModels}}{{/useInheritance}}