Skip to content

refactor(typescript-fetch): centralize date type handling in TypeScriptFetchClientCodegen #24715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mattias-Sehlstedt wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −8
Open

refactor(typescript-fetch): centralize date type handling in TypeScriptFetchClientCodegen #24715

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions ...erator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
private static final String X_KEEP_AS_JS_OBJECT = "x-keepAsJSObject";
private static final String X_TYPESCRIPT_FETCH_API_EXAMPLE = "x-typescriptFetchApiExample";
private static final String BLOB_API_EXAMPLE = "new Blob(['example file content'], { type: 'application/octet-stream' })";
private static final String DATE_TYPE = "date";
private static final String DATE_TIME_TYPE = "DateTime";
private static final String TS_DATE_TYPE = "Date";

protected boolean sagasAndRecords = false;
@Getter @Setter
Expand Down Expand Up @@ -317,8 +320,8 @@ public void processOpts() {

if (!withoutRuntimeChecks) {
this.modelTemplateFiles.put("models.mustache", ".ts");
typeMapping.put("date", "Date");
typeMapping.put("DateTime", "Date");
typeMapping.put(DATE_TYPE, TS_DATE_TYPE);
typeMapping.put(DATE_TIME_TYPE, TS_DATE_TYPE);
}

if (additionalProperties.containsKey(SAGAS_AND_RECORDS)) {
Expand Down Expand Up @@ -1484,11 +1487,11 @@ public String getItemsDataType() {
}

public boolean isDateType() {
return isDate && "Date".equals(dataType);
return isDate && TypeScriptFetchClientCodegen.isDateType(dataType);
}

public boolean isDateTimeType() {
return isDateTime && "Date".equals(dataType);
return isDateTime && TypeScriptFetchClientCodegen.isDateTimeType(dataType);
}

public ExtendedCodegenParameter(CodegenParameter cp) {
Expand Down Expand Up @@ -1635,11 +1638,11 @@ public String getItemsDataType() {
}

public boolean isDateType() {
return isDate && "Date".equals(dataType);
return isDate && TypeScriptFetchClientCodegen.isDateType(dataType);
}

public boolean isDateTimeType() {
return isDateTime && "Date".equals(dataType);
return isDateTime && TypeScriptFetchClientCodegen.isDateTimeType(dataType);
}

public ExtendedCodegenProperty(CodegenProperty cp) {
Expand Down Expand Up @@ -1923,12 +1926,13 @@ public class ExtendedCodegenModel extends CodegenModel {
public boolean hasSelfReferencingDiscriminatorMapping(){
return selfReferencingDiscriminatorMapping != null;
}

public boolean isDateType() {
return isDate && "Date".equals(dataType);
return isDate && TypeScriptFetchClientCodegen.isDateType(dataType);
}

public boolean isDateTimeType() {
return isDateTime && "Date".equals(dataType);
return isDateTime && TypeScriptFetchClientCodegen.isDateTimeType(dataType);
}

public ExtendedCodegenModel(CodegenModel cm) {
Expand Down Expand Up @@ -2069,4 +2073,12 @@ public String toString() {
protected String getLicenseNameDefaultValue() {
return null;
}

private static boolean isDateType(String dataType) {
return TS_DATE_TYPE.equals(dataType);
}

private static boolean isDateTimeType(String dataType) {
Comment thread
Mattias-Sehlstedt marked this conversation as resolved.
return TS_DATE_TYPE.equals(dataType);
}
}
Loading