Skip to content

Commit 508683d

Browse files
authored
Merge pull request #562 from swagger-api/ticket-9909
refs swagger-api/swagger-codegen#9909 - fix javascript generator templateDir and missing template file
2 parents fd87da0 + 328a684 commit 508683d

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ public JavaScriptClientCodegen() {
9292
modelTestTemplateFiles.put("model_test.mustache", ".js");
9393
apiTemplateFiles.put("api.mustache", ".js");
9494
apiTestTemplateFiles.put("api_test.mustache", ".js");
95-
embeddedTemplateDir = templateDir = "javascript";
95+
if (StringUtils.isBlank(templateDir)) {
96+
embeddedTemplateDir = templateDir = getTemplateDir();
97+
}
9698
apiPackage = "api";
9799
modelPackage = "model";
98100
modelDocTemplateFiles.put("model_doc.mustache", ".md");
@@ -765,7 +767,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
765767
@Override
766768
public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> allSchemas) {
767769
CodegenModel codegenModel = super.fromModel(name, schema, allSchemas);
768-
770+
769771
boolean hasEnums = getBooleanValue(codegenModel, HAS_ENUMS_EXT_NAME);
770772
if (allSchemas != null && codegenModel != null && codegenModel.parent != null && hasEnums) {
771773
final Schema parentModel = allSchemas.get(codegenModel.parentSchema);
@@ -789,7 +791,7 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
789791
codegenModel.vendorExtensions.put("x-isPrimitive", true);
790792
}
791793
}
792-
}
794+
}
793795
return codegenModel;
794796
}
795797

@@ -816,7 +818,7 @@ private String getModelledType(String dataType) {
816818

817819
@Override
818820
public String getDefaultTemplateDir() {
819-
return "JavaScript";
821+
return "javascript";
820822
}
821823

822824
private String getJSDocType(CodegenModel cm, CodegenProperty cp) {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"plugins": [
3+
["babel-plugin-transform-builtin-extend", {
4+
globals: ["Error", "Array"]
5+
}]
6+
],
7+
"presets": ["env", "stage-0"]
8+
}

0 commit comments

Comments
 (0)