-
Notifications
You must be signed in to change notification settings - Fork 6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from swagger-api/develop_2.0
Develop 2.0
- Loading branch information
Showing
74 changed files
with
2,749 additions
and
1,711 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
143 changes: 143 additions & 0 deletions
143
...r-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| package io.swagger.codegen.languages; | ||
|
|
||
| import io.swagger.codegen.*; | ||
| import io.swagger.models.properties.*; | ||
|
|
||
| import java.util.*; | ||
| import java.io.File; | ||
|
|
||
| public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig { | ||
| @Override | ||
| public CodegenType getTag() { | ||
| return CodegenType.CLIENT; | ||
| } | ||
|
|
||
| public AbstractTypeScriptClientCodegen() { | ||
| super(); | ||
| reservedWords = new HashSet<String>(Arrays.asList("abstract", | ||
| "continue", "for", "new", "switch", "assert", "default", "if", | ||
| "package", "synchronized", "do", "goto", "private", | ||
| "this", "break", "double", "implements", "protected", "throw", | ||
| "byte", "else", "import", "public", "throws", "case", "enum", | ||
| "instanceof", "return", "transient", "catch", "extends", "int", | ||
| "short", "try", "char", "final", "interface", "static", "void", | ||
| "class", "finally", "const", "super", "while")); | ||
|
|
||
| languageSpecificPrimitives = new HashSet<String>(Arrays.asList( | ||
| "String", | ||
| "boolean", | ||
| "Boolean", | ||
| "Double", | ||
| "Integer", | ||
| "Long", | ||
| "Float", | ||
| "Object")); | ||
| instantiationTypes.put("array", "Array"); | ||
|
|
||
| typeMapping = new HashMap<String, String>(); | ||
| typeMapping.put("Array", "Array"); | ||
| typeMapping.put("array", "Array"); | ||
| typeMapping.put("List", "Array"); | ||
| typeMapping.put("boolean", "boolean"); | ||
| typeMapping.put("string", "string"); | ||
| typeMapping.put("int", "number"); | ||
| typeMapping.put("float", "number"); | ||
| typeMapping.put("number", "number"); | ||
| typeMapping.put("long", "number"); | ||
| typeMapping.put("short", "number"); | ||
| typeMapping.put("char", "string"); | ||
| typeMapping.put("double", "number"); | ||
| typeMapping.put("object", "any"); | ||
| typeMapping.put("integer", "number"); | ||
| typeMapping.put("Map", "any"); | ||
| typeMapping.put("DateTime", "Date"); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public String escapeReservedWord(String name) { | ||
| return "_" + name; | ||
| } | ||
|
|
||
| @Override | ||
| public String apiFileFolder() { | ||
| return outputFolder + "/" + apiPackage().replace('.', File.separatorChar); | ||
| } | ||
|
|
||
| public String modelFileFolder() { | ||
| return outputFolder + "/" + modelPackage().replace('.', File.separatorChar); | ||
| } | ||
|
|
||
| @Override | ||
| public String toVarName(String name) { | ||
| // replace - with _ e.g. created-at => created_at | ||
| name = name.replaceAll("-", "_"); | ||
|
|
||
| // if it's all uppper case, do nothing | ||
| if (name.matches("^[A-Z_]*$")) | ||
| return name; | ||
|
|
||
| // camelize the variable name | ||
| // pet_id => PetId | ||
| name = camelize(name, true); | ||
|
|
||
| // for reserved word or word starting with number, append _ | ||
| if (reservedWords.contains(name) || name.matches("^\\d.*")) | ||
| name = escapeReservedWord(name); | ||
|
|
||
| return name; | ||
| } | ||
|
|
||
| @Override | ||
| public String toParamName(String name) { | ||
| // should be the same as variable name | ||
| return toVarName(name); | ||
| } | ||
|
|
||
| @Override | ||
| public String toModelName(String name) { | ||
| // model name cannot use reserved keyword, e.g. return | ||
| if (reservedWords.contains(name)) | ||
| throw new RuntimeException(name | ||
| + " (reserved word) cannot be used as a model name"); | ||
|
|
||
| // camelize the model name | ||
| // phone_number => PhoneNumber | ||
| return camelize(name); | ||
| } | ||
|
|
||
| @Override | ||
| public String toModelFilename(String name) { | ||
| // should be the same as the model name | ||
| return toModelName(name); | ||
| } | ||
|
|
||
| @Override | ||
| public String getTypeDeclaration(Property p) { | ||
| if (p instanceof ArrayProperty) { | ||
| ArrayProperty ap = (ArrayProperty) p; | ||
| Property inner = ap.getItems(); | ||
| return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">"; | ||
| } else if (p instanceof MapProperty) { | ||
| MapProperty mp = (MapProperty) p; | ||
| Property inner = mp.getAdditionalProperties(); | ||
| return "{ [key: string]: "+ getTypeDeclaration(inner) + "; }"; | ||
| } else if (p instanceof FileProperty) { | ||
| return "any"; | ||
| } | ||
| return super.getTypeDeclaration(p); | ||
| } | ||
|
|
||
| @Override | ||
| public String getSwaggerType(Property p) { | ||
| String swaggerType = super.getSwaggerType(p); | ||
| String type = null; | ||
| if (typeMapping.containsKey(swaggerType)) { | ||
| type = typeMapping.get(swaggerType); | ||
| if (languageSpecificPrimitives.contains(type)) | ||
| return type; | ||
| } else | ||
| type = swaggerType; | ||
| return type; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 11 additions & 8 deletions
19
...er-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,28 @@ | ||
| package io.swagger.codegen.languages; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| import io.swagger.codegen.SupportingFile; | ||
|
|
||
| public class TypeScriptAngularClientCodegen extends TypeScriptNodeClientCodegen { | ||
| import java.io.File; | ||
|
|
||
| public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCodegen { | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return "typescript-angular"; | ||
| } | ||
|
|
||
|
|
||
| public String getHelp() { | ||
| return "Generates a TypeScript AngurlarJS client library."; | ||
| } | ||
|
|
||
| public TypeScriptAngularClientCodegen() { | ||
| super(); | ||
| outputFolder = "generated-code/typescript-angular"; | ||
| modelTemplateFiles.put("model.mustache", ".ts"); | ||
| apiTemplateFiles.put("api.mustache", ".ts"); | ||
| templateDir = "TypeScript-Angular"; | ||
| apiPackage = "api"; | ||
| modelPackage = "model"; | ||
|
|
||
| supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage + File.separator, "api.d.ts")); | ||
| apiPackage = "API.Client"; | ||
| modelPackage = "API.Client"; | ||
| supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage().replace('.', File.separatorChar), "api.d.ts")); | ||
| } | ||
| } |
Oops, something went wrong.