fixed recursive model break issue for javascript generator

Author: HugoMario

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java

@@ -1051,9 +1051,11 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
 
         // Provide access to all property models.
         for (CodegenModel cgModel : new HashSet<CodegenModel>(cgModels.values())) {
+            detectRecursiveModel(cgModel.allVars, cgModel.classname, cgModels);
             postProcessProperties(cgModel.vars, cgModels);
-            if (cgModel.allVars != cgModel.vars)
+            if (cgModel.allVars != cgModel.vars) {
                 postProcessProperties(cgModel.allVars, cgModels);
+            }
         }
 
         return objs;
@@ -1305,6 +1307,27 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         return objs;
     }
 
+    public void detectRecursiveModel(List<CodegenProperty> allVars, String className, Map<String, CodegenModel> allModels) {
+        if (allVars == null || allVars.isEmpty()) {
+            return;
+        }
+        for (CodegenProperty codegenProperty : allVars) {
+            if (codegenProperty.isPrimitiveType) {
+                continue;
+            }
+            if (codegenProperty.isListContainer || codegenProperty.isMapContainer) {
+                if (className.equalsIgnoreCase(codegenProperty.items.datatype)) {
+                    codegenProperty.items.vendorExtensions.put("x-is-recursive-model", Boolean.TRUE);
+                    continue;
+                }
+            }
+            if (className.equalsIgnoreCase(codegenProperty.datatype)) {
+                codegenProperty.vendorExtensions.put("x-is-recursive-model", Boolean.TRUE);
+                continue;
+            }
+        }
+    }
+
     @Override
     protected boolean needToImport(String type) {
         return !defaultIncludes.contains(type)

modules/swagger-codegen/src/main/resources/Javascript/api-test-response-property.mustache

@@ -14,11 +14,13 @@
                 }}{{^loadTestDataFromFile}}{{>api-test-property}}{{/loadTestDataFromFile}});
       {{/isPrimitiveType}}
       {{^isPrimitiveType}}
-        {{#vendorExtensions.x-indent}}
-          {{#vendorExtensions.x-indent}}
+        {{^vendorExtensions.x-is-recursive-model}}
+            {{#vendorExtensions.x-indent}}
+              {{#vendorExtensions.x-indent}}
 {{>api-test-response-complex}}{{!
-          }}{{/vendorExtensions.x-indent}}{{!
-        }}{{/vendorExtensions.x-indent}}{{!
+              }}{{/vendorExtensions.x-indent}}{{!
+            }}{{/vendorExtensions.x-indent}}
+        {{/vendorExtensions.x-is-recursive-model}}{{!
       }}{{/isPrimitiveType}}{{!
 }}              }
     {{/items}}

modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavascriptClientCodegenTest.java

@@ -1,11 +1,17 @@
 package io.swagger.codegen.javascript;
 
+import io.swagger.codegen.ClientOptInput;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.codegen.config.CodegenConfigurator;
+import org.junit.rules.TemporaryFolder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.languages.JavascriptClientCodegen;
 
+import java.io.File;
+
 public class JavascriptClientCodegenTest {
 
     @Test
@@ -43,4 +49,42 @@ public void testAdditionalPropertiesPutForConfigValues() throws Exception {
         Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
     }
 
+    @Test
+    public void testRecursiveModel() {
+        //final TemporaryFolder folder = new TemporaryFolder();
+
+        //folder.create();
+        //final File output = folder.getRoot();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setLang("javascript")
+                .setInputSpec("src/test/resources/2_0/recursive_model.yaml")
+                .setOutputDir("/Users/hugomercado/Dropbox/Documents/swagger-codegen/output");
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        new DefaultGenerator().opts(clientOptInput).generate();
+
+
+        //folder.delete();
+
+//        final TemporaryFolder folder = new TemporaryFolder();
+//
+//        folder.create();
+//        final File output = folder.getRoot();
+//
+//        final CodegenConfigurator configurator = new CodegenConfigurator()
+//                .setLang("javascript")
+//                .setInputSpec("src/test/resources/2_0/recursive_model.yaml")
+//                .setOutputDir(output.getAbsolutePath());
+//
+//        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+//        new DefaultGenerator().opts(clientOptInput).generate();
+//
+//        final File orderFile = new File(output, "src/api/TestClassApi.js");
+//        Assert.assertTrue(orderFile.exists());
+//
+//        folder.delete();
+
+    }
+
 }

modules/swagger-codegen/src/test/resources/2_0/recursive_model.yaml

@@ -0,0 +1,30 @@
+swagger: '2.0'
+info:
+  title: My API
+  version: v1
+paths:
+  /api/test:
+    get:
+      tags:
+        - TestClass
+      produces:
+        - text/plain
+        - application/json
+        - text/json
+      responses:
+        '200':
+          description: Success
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/TestClass'
+definitions:
+  TestClass:
+    type: object
+    properties:
+      name:
+        type: string
+      children:
+        type: array
+        items:
+          $ref: '#/definitions/TestClass'