kangaroo-and-rabbit/archidata
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[DEV] update some zond generation file

Browse Source
This commit is contained in:
Edouard DUPIN 2024-04-19 08:44:34 +02:00
parent f069ce7cc3
commit 3309abe053
3 changed files with 98 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/kar/archidata/annotation/AsyncType.java
View File

@ -9,5 +9,9 @@ import java.lang.annotation.Target;
@Target({ ElementType.PARAMETER, ElementType.METHOD }) @Target({ ElementType.PARAMETER, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface AsyncType { public @interface AsyncType {
Class<?> value(); // Possible class values.
Class<?>[] value();
// direct copy value in the TypeScript (separate with type by a |
String[] tsComplement() default {};
} }

127
src/org/kar/archidata/dataAccess/DataFactoryTsApi.java
View File

@ -57,7 +57,16 @@ public class DataFactoryTsApi {
/** /**
* API of the server (auto-generated code) * API of the server (auto-generated code)
*/ */
import { HTTPMimeType, HTTPRequestModel, ModelResponseHttp, RESTConfig, RESTCallbacks, RESTRequestJson, RESTRequestJsonArray, RESTRequestVoid } from "./rest-tools" import {
HTTPMimeType,
HTTPRequestModel,
ModelResponseHttp,
RESTCallbacks,
RESTConfig,
RESTRequestJson,
RESTRequestJsonArray,
RESTRequestVoid
} from "./rest-tools"
import {"""; import {""";
for (final Class<?> clazz : classs) { for (final Class<?> clazz : classs) {
@ -74,6 +83,7 @@ public class DataFactoryTsApi {
if (classElement.nativeType) { if (classElement.nativeType) {
continue; continue;
} }
generatedData.append("\n ");
generatedData.append(classElement.tsTypeName); generatedData.append(classElement.tsTypeName);
generatedData.append(","); generatedData.append(",");
} }
@ -85,10 +95,11 @@ public class DataFactoryTsApi {
if (classElement.nativeType) { if (classElement.nativeType) {
continue; continue;
} }
generatedData.append("\n ");
generatedData.append(classElement.tsCheckType); generatedData.append(classElement.tsCheckType);
generatedData.append(","); generatedData.append(",");
} }
generatedData.append("} from \"./model\"\n"); generatedData.append("\n} from \"./model\"\n");
generatedData.append(api.data()); generatedData.append(api.data());
String fileName = api.className(); String fileName = api.className();
@ -201,7 +212,7 @@ public class DataFactoryTsApi {
return ((FormDataParam) annotation[0]).value(); return ((FormDataParam) annotation[0]).value();
} }
public static Class<?> apiAnnotationGetAsyncType(final Parameter element) throws Exception { public static Class<?>[] apiAnnotationGetAsyncType(final Parameter element) throws Exception {
final Annotation[] annotation = element.getDeclaredAnnotationsByType(AsyncType.class); final Annotation[] annotation = element.getDeclaredAnnotationsByType(AsyncType.class);
if (annotation.length == 0) { if (annotation.length == 0) {
return null; return null;
@ -209,7 +220,7 @@ public class DataFactoryTsApi {
return ((AsyncType) annotation[0]).value(); return ((AsyncType) annotation[0]).value();
} }
public static Class<?> apiAnnotationGetAsyncType(final Method element) throws Exception { public static Class<?>[] apiAnnotationGetAsyncType(final Method element) throws Exception {
final Annotation[] annotation = element.getDeclaredAnnotationsByType(AsyncType.class); final Annotation[] annotation = element.getDeclaredAnnotationsByType(AsyncType.class);
if (annotation.length == 0) { if (annotation.length == 0) {
return null; return null;
@ -245,6 +256,20 @@ public class DataFactoryTsApi {
return element.getDeclaredAnnotationsByType(Context.class).length != 0; return element.getDeclaredAnnotationsByType(Context.class).length != 0;
} }
public static String convertInTypeScriptType(final List<ClassElement> tmp, final boolean isList) {
String out = "";
for (final ClassElement elem : tmp) {
if (out.length() != 0) {
out += " | ";
}
out += elem.tsTypeName;
if (isList) {
out += "[]";
}
}
return out;
}
public static APIModel createSingleApi(final Class<?> clazz, final Set<Class<?>> includeModel, final Set<Class<?>> includeCheckerModel, final GeneratedTypes previous) throws Exception { public static APIModel createSingleApi(final Class<?> clazz, final Set<Class<?>> includeModel, final Set<Class<?>> includeCheckerModel, final GeneratedTypes previous) throws Exception {
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
// the basic path has no specific elements... // the basic path has no specific elements...
@ -271,30 +296,35 @@ public class DataFactoryTsApi {
LOGGER.trace(" description: {}", methodDescription); LOGGER.trace(" description: {}", methodDescription);
} }
final boolean needGenerateProgress = apiAnnotationTypeScriptProgress(method); final boolean needGenerateProgress = apiAnnotationTypeScriptProgress(method);
Class<?> returnTypeModel = apiAnnotationGetAsyncType(method); Class<?>[] returnTypeModel = apiAnnotationGetAsyncType(method);
Class<?> returnTypeModelRaw = method.getReturnType();
if (returnTypeModel == null) { if (returnTypeModel == null) {
returnTypeModel = method.getReturnType(); returnTypeModel = new Class<?>[] { returnTypeModelRaw };
returnTypeModelRaw = null;
} }
boolean isUnmanagedReturnType = false; boolean isUnmanagedReturnType = false;
if (returnTypeModel == Response.class) { if (returnTypeModelRaw == Response.class) {
isUnmanagedReturnType = true; isUnmanagedReturnType = true;
returnTypeModel = Void.class; returnTypeModel = new Class<?>[] { Void.class };
} }
boolean returnModelIsArray = false; boolean returnModelIsArray = false;
ClassElement tmpReturn; List<ClassElement> tmpReturn;
if (returnTypeModel == List.class) { if (returnTypeModelRaw == List.class) {
final ParameterizedType listType = (ParameterizedType) method.getGenericReturnType(); final ParameterizedType listType = (ParameterizedType) method.getGenericReturnType();
returnTypeModel = (Class<?>) listType.getActualTypeArguments()[0]; returnTypeModelRaw = (Class<?>) listType.getActualTypeArguments()[0];
tmpReturn = DataFactoryZod.createTable(returnTypeModel, previous); tmpReturn = List.of(DataFactoryZod.createTable(returnTypeModelRaw, previous));
returnModelIsArray = true; returnModelIsArray = true;
includeModel.add(tmpReturn.model[0]);
} else { } else {
tmpReturn = DataFactoryZod.createTable(returnTypeModel, previous); tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
}
for (final ClassElement elem : tmpReturn) {
includeModel.add(elem.model[0]);
includeCheckerModel.add(elem.model[0]);
}
LOGGER.trace(" return: {}", tmpReturn.size());
for (final ClassElement elem : tmpReturn) {
LOGGER.trace(" - {}", elem.tsTypeName);
} }
includeModel.add(tmpReturn.model[0]);
includeCheckerModel.add(tmpReturn.model[0]);
LOGGER.trace(" return: {}", tmpReturn.tsTypeName);
final Map<String, String> queryParams = new HashMap<>(); final Map<String, String> queryParams = new HashMap<>();
final Map<String, String> pathParams = new HashMap<>(); final Map<String, String> pathParams = new HashMap<>();
final Map<String, String> formDataParams = new HashMap<>(); final Map<String, String> formDataParams = new HashMap<>();
@ -307,24 +337,28 @@ public class DataFactoryTsApi {
} }
final Class<?> parameterType = parameter.getType(); final Class<?> parameterType = parameter.getType();
String parameterTypeString; String parameterTypeString;
final Class<?> asyncType = apiAnnotationGetAsyncType(parameter); final Class<?>[] asyncType = apiAnnotationGetAsyncType(parameter);
if (parameterType == List.class) { if (parameterType == List.class) {
if (asyncType == null) { if (asyncType == null) {
LOGGER.warn("Detext List param ==> not managed type ==> any[] !!!"); LOGGER.warn("Detect List param ==> not managed type ==> any[] !!!");
parameterTypeString = "any[]"; parameterTypeString = "any[]";
} else { } else {
final ClassElement tmp = DataFactoryZod.createTable(asyncType, previous); final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
includeModel.add(tmp.model[0]); for (final ClassElement elem : tmp) {
parameterTypeString = tmp.tsTypeName + "[]"; includeModel.add(elem.model[0]);
}
parameterTypeString = convertInTypeScriptType(tmp, true);
} }
} else if (asyncType == null) { } else if (asyncType == null) {
final ClassElement tmp = DataFactoryZod.createTable(parameterType, previous); final ClassElement tmp = DataFactoryZod.createTable(parameterType, previous);
includeModel.add(tmp.model[0]); includeModel.add(tmp.model[0]);
parameterTypeString = tmp.tsTypeName; parameterTypeString = tmp.tsTypeName;
} else { } else {
final ClassElement tmp = DataFactoryZod.createTable(asyncType, previous); final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
includeModel.add(tmp.model[0]); for (final ClassElement elem : tmp) {
parameterTypeString = tmp.tsTypeName; includeModel.add(elem.model[0]);
}
parameterTypeString = convertInTypeScriptType(tmp, true);
} }
final String pathParam = apiAnnotationGetPathParam(parameter); final String pathParam = apiAnnotationGetPathParam(parameter);
final String queryParam = apiAnnotationGetQueryParam(parameter); final String queryParam = apiAnnotationGetQueryParam(parameter);
@ -336,9 +370,15 @@ public class DataFactoryTsApi {
} else if (formDataParam != null) { } else if (formDataParam != null) {
formDataParams.put(formDataParam, parameterTypeString); formDataParams.put(formDataParam, parameterTypeString);
} else if (asyncType != null) { } else if (asyncType != null) {
final ClassElement tmp = DataFactoryZod.createTable(asyncType, previous); final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
includeModel.add(tmp.model[0]); parameterTypeString = "";
emptyElement.add(tmp.tsTypeName); for (final ClassElement elem : tmp) {
includeModel.add(elem.model[0]);
if (parameterTypeString.length() != 0) {
parameterTypeString += " | ";
}
parameterTypeString += elem.tsTypeName + "[]";
}
} else if (parameterType == List.class) { } else if (parameterType == List.class) {
parameterTypeString = "any[]"; parameterTypeString = "any[]";
final Class<?> plop = parameterType.arrayType(); final Class<?> plop = parameterType.arrayType();
@ -382,32 +422,30 @@ public class DataFactoryTsApi {
} }
builder.append("\n\texport function "); builder.append("\n\texport function ");
builder.append(methodName); builder.append(methodName);
builder.append("({ restConfig,"); builder.append("({\t\t\trestConfig,");
if (!queryParams.isEmpty()) { if (!queryParams.isEmpty()) {
builder.append(" queries,"); builder.append("\n\t\t\tqueries,");
} }
if (!pathParams.isEmpty()) { if (!pathParams.isEmpty()) {
builder.append(" params,"); builder.append("\n\t\t\tparams,");
} }
if (produces.size() > 1) { if (produces.size() > 1) {
builder.append(" produce,"); builder.append("\n\t\t\tproduce,");
} }
if (emptyElement.size() == 1) { if (emptyElement.size() == 1 || formDataParams.size() != 0) {
builder.append(" data,"); builder.append("\n\t\t\tdata,");
} else if (formDataParams.size() != 0) {
builder.append(" data,");
} }
if (needGenerateProgress) { if (needGenerateProgress) {
builder.append(" callback,"); builder.append(" callback,");
} }
builder.append(" }: {"); builder.append("\n\t\t}: {");
builder.append("\n\t\trestConfig: RESTConfig,"); builder.append("\n\t\trestConfig: RESTConfig,");
if (!queryParams.isEmpty()) { if (!queryParams.isEmpty()) {
builder.append("\n\t\tqueries: {"); builder.append("\n\t\tqueries: {");
for (final Entry<String, String> queryEntry : queryParams.entrySet()) { for (final Entry<String, String> queryEntry : queryParams.entrySet()) {
builder.append("\n\t\t\t"); builder.append("\n\t\t\t");
builder.append(queryEntry.getKey()); builder.append(queryEntry.getKey());
builder.append(": "); builder.append("?: ");
builder.append(queryEntry.getValue()); builder.append(queryEntry.getValue());
builder.append(","); builder.append(",");
} }
@ -471,12 +509,9 @@ public class DataFactoryTsApi {
builder.append("\n\t\tcallback?: RESTCallbacks,"); builder.append("\n\t\tcallback?: RESTCallbacks,");
} }
builder.append("\n\t}): Promise<"); builder.append("\n\t}): Promise<");
builder.append(tmpReturn.tsTypeName); builder.append(convertInTypeScriptType(tmpReturn, returnModelIsArray));
if (returnModelIsArray) {
builder.append("[]");
}
builder.append("> {"); builder.append("> {");
if (tmpReturn.tsTypeName.equals("void")) { if (tmpReturn.size() == 0 || tmpReturn.get(0).tsTypeName == null || tmpReturn.get(0).tsTypeName.equals("void")) {
builder.append("\n\t\treturn RESTRequestVoid({"); builder.append("\n\t\treturn RESTRequestVoid({");
} else if (returnModelIsArray) { } else if (returnModelIsArray) {
builder.append("\n\t\treturn RESTRequestJsonArray({"); builder.append("\n\t\treturn RESTRequestJsonArray({");
@ -539,9 +574,9 @@ public class DataFactoryTsApi {
builder.append("\n\t\t\tcallback,"); builder.append("\n\t\t\tcallback,");
} }
builder.append("\n\t\t}"); builder.append("\n\t\t}");
if (tmpReturn.tsCheckType != null) { if (tmpReturn.size() != 0 && tmpReturn.get(0).tsTypeName != null && !tmpReturn.get(0).tsTypeName.equals("void")) {
builder.append(", "); builder.append(", ");
builder.append(tmpReturn.tsCheckType); builder.append(convertInTypeScriptType(tmpReturn, returnModelIsArray));
} }
builder.append(");"); builder.append(");");
builder.append("\n\t};"); builder.append("\n\t};");

8
src/org/kar/archidata/dataAccess/DataFactoryZod.java
View File

@ -290,6 +290,14 @@ public class DataFactoryZod {
return generatedData.toString(); return generatedData.toString();
} }
public static List<ClassElement> createTables(final Class<?>[] classs, final GeneratedTypes previous) throws Exception {
final List<ClassElement> out = new ArrayList<>();
for (final Class<?> clazz : classs) {
out.add(createTable(clazz, previous));
}
return out;
}
public static ClassElement createTable(final Class<?> clazz, final GeneratedTypes previous) throws Exception { public static ClassElement createTable(final Class<?> clazz, final GeneratedTypes previous) throws Exception {
if (clazz == null) { if (clazz == null) {
return null; return null;