[FEAT] generate a full Zod object for write mode.
- Add @NoWriteSpecificMode to permit to remove specific object write model - refactor Zod Write model - Add .nullable() in write Optional element Residual bug element use in APi that is mark as no write
This commit is contained in:
parent
e4c56a4da5
commit
09cfcfc578
@ -25,7 +25,7 @@
|
|||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
4
.project
4
.project
@ -11,12 +11,12 @@
|
|||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
<buildCommand>
|
<buildCommand>
|
||||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
|
||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
<buildCommand>
|
<buildCommand>
|
||||||
<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
|
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
|
@ -80,6 +80,14 @@ public class AnnotationTools {
|
|||||||
return ((Schema) annotation[0]).example();
|
return ((Schema) annotation[0]).example();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean getNoWriteSpecificMode(final Class<?> element) {
|
||||||
|
final Annotation[] annotation = element.getDeclaredAnnotationsByType(NoWriteSpecificMode.class);
|
||||||
|
if (annotation.length == 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public static String getSchemaDescription(final Class<?> element) throws DataAccessException {
|
public static String getSchemaDescription(final Class<?> element) throws DataAccessException {
|
||||||
final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
|
final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
|
||||||
if (annotation.length == 0) {
|
if (annotation.length == 0) {
|
||||||
|
13
src/org/kar/archidata/annotation/NoWriteSpecificMode.java
Normal file
13
src/org/kar/archidata/annotation/NoWriteSpecificMode.java
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
package org.kar.archidata.annotation;
|
||||||
|
|
||||||
|
import java.lang.annotation.ElementType;
|
||||||
|
import java.lang.annotation.Retention;
|
||||||
|
import java.lang.annotation.RetentionPolicy;
|
||||||
|
import java.lang.annotation.Target;
|
||||||
|
|
||||||
|
/** When we wend to have only One type for read and write mode (Wrapping API). */
|
||||||
|
@Target({ ElementType.TYPE })
|
||||||
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
public @interface NoWriteSpecificMode {
|
||||||
|
|
||||||
|
}
|
@ -3,12 +3,14 @@ package org.kar.archidata.catcher;
|
|||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
import org.kar.archidata.annotation.NoWriteSpecificMode;
|
||||||
import org.kar.archidata.tools.UuidUtils;
|
import org.kar.archidata.tools.UuidUtils;
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import jakarta.ws.rs.core.Response;
|
import jakarta.ws.rs.core.Response;
|
||||||
|
|
||||||
|
@NoWriteSpecificMode
|
||||||
public class RestErrorResponse {
|
public class RestErrorResponse {
|
||||||
public UUID uuid = UuidUtils.nextUUID();
|
public UUID uuid = UuidUtils.nextUUID();
|
||||||
@NotNull
|
@NotNull
|
||||||
|
@ -10,6 +10,7 @@ public class ClassEnumModel extends ClassModel {
|
|||||||
|
|
||||||
protected ClassEnumModel(final Class<?> clazz) {
|
protected ClassEnumModel(final Class<?> clazz) {
|
||||||
this.originClasses = clazz;
|
this.originClasses = clazz;
|
||||||
|
this.noWriteSpecificMode = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -11,12 +11,17 @@ import java.util.Set;
|
|||||||
public abstract class ClassModel {
|
public abstract class ClassModel {
|
||||||
protected boolean analyzeDone = false;
|
protected boolean analyzeDone = false;
|
||||||
protected Class<?> originClasses = null;
|
protected Class<?> originClasses = null;
|
||||||
|
protected boolean noWriteSpecificMode = false;
|
||||||
protected List<ClassModel> dependencyModels = new ArrayList<>();
|
protected List<ClassModel> dependencyModels = new ArrayList<>();
|
||||||
|
|
||||||
public Class<?> getOriginClasses() {
|
public Class<?> getOriginClasses() {
|
||||||
return this.originClasses;
|
return this.originClasses;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isNoWriteSpecificMode() {
|
||||||
|
return this.noWriteSpecificMode;
|
||||||
|
}
|
||||||
|
|
||||||
protected boolean isCompatible(final Class<?> clazz) {
|
protected boolean isCompatible(final Class<?> clazz) {
|
||||||
return this.originClasses == clazz;
|
return this.originClasses == clazz;
|
||||||
}
|
}
|
||||||
|
@ -123,6 +123,7 @@ public class ClassObjectModel extends ClassModel {
|
|||||||
}
|
}
|
||||||
this.analyzeDone = true;
|
this.analyzeDone = true;
|
||||||
final Class<?> clazz = this.originClasses;
|
final Class<?> clazz = this.originClasses;
|
||||||
|
this.noWriteSpecificMode = AnnotationTools.getNoWriteSpecificMode(clazz);
|
||||||
this.isPrimitive = clazz.isPrimitive();
|
this.isPrimitive = clazz.isPrimitive();
|
||||||
if (this.isPrimitive) {
|
if (this.isPrimitive) {
|
||||||
return;
|
return;
|
||||||
|
@ -181,12 +181,18 @@ public class TsClassElement {
|
|||||||
if (tsModel.nativeType != DefinedPosition.NATIVE) {
|
if (tsModel.nativeType != DefinedPosition.NATIVE) {
|
||||||
out.append("import {");
|
out.append("import {");
|
||||||
out.append(tsModel.zodName);
|
out.append(tsModel.zodName);
|
||||||
|
if (tsModel.nativeType == DefinedPosition.NORMAL && !(tsModel.models.get(0).isNoWriteSpecificMode())) {
|
||||||
|
out.append(", ");
|
||||||
|
out.append(tsModel.zodName);
|
||||||
|
out.append("Write ");
|
||||||
|
}
|
||||||
out.append("} from \"./");
|
out.append("} from \"./");
|
||||||
out.append(tsModel.fileName);
|
out.append(tsModel.fileName);
|
||||||
out.append("\";\n");
|
out.append("\";\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return out.toString();
|
return out.toString();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Object generateComment(final ClassObjectModel model) {
|
private Object generateComment(final ClassObjectModel model) {
|
||||||
@ -215,22 +221,38 @@ public class TsClassElement {
|
|||||||
return out.toString();
|
return out.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String optionalTypeZod(final FieldProperty field) {
|
public boolean isOptionalTypeZod(final FieldProperty field) {
|
||||||
// Common checking element (apply to List, Map, ...)
|
// Common checking element (apply to List, Map, ...)
|
||||||
if (field.nullable()) {
|
if (field.nullable()) {
|
||||||
return ".optional()";
|
return true;
|
||||||
}
|
}
|
||||||
if (field.notNull()) {
|
if (field.notNull()) {
|
||||||
return "";
|
return false;
|
||||||
}
|
}
|
||||||
// Other object:
|
// Other object:
|
||||||
if (field.model().getOriginClasses() == null || field.model().getOriginClasses().isPrimitive()) {
|
if (field.model().getOriginClasses() == null || field.model().getOriginClasses().isPrimitive()) {
|
||||||
return "";
|
return false;
|
||||||
}
|
}
|
||||||
if (field.columnNotNull()) {
|
if (field.columnNotNull()) {
|
||||||
return "";
|
return false;
|
||||||
}
|
}
|
||||||
return ".optional()";
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String optionalTypeZod(final FieldProperty field) {
|
||||||
|
// Common checking element (apply to List, Map, ...)
|
||||||
|
if (isOptionalTypeZod(field)) {
|
||||||
|
return ".optional()";
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
public String optionalWriteTypeZod(final FieldProperty field) {
|
||||||
|
// Common checking element (apply to List, Map, ...)
|
||||||
|
if (isOptionalTypeZod(field)) {
|
||||||
|
return ".nullable()";
|
||||||
|
}
|
||||||
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
public String maxSizeZod(final FieldProperty field) {
|
public String maxSizeZod(final FieldProperty field) {
|
||||||
@ -270,7 +292,9 @@ public class TsClassElement {
|
|||||||
out.append(getBaseHeader());
|
out.append(getBaseHeader());
|
||||||
out.append(generateImports(model.getDependencyModels(), tsGroup));
|
out.append(generateImports(model.getDependencyModels(), tsGroup));
|
||||||
out.append("\n");
|
out.append("\n");
|
||||||
|
// ------------------------------------------------------------------------
|
||||||
|
// -- Generate read mode
|
||||||
|
// ------------------------------------------------------------------------
|
||||||
out.append(generateComment(model));
|
out.append(generateComment(model));
|
||||||
out.append("export const ");
|
out.append("export const ");
|
||||||
out.append(this.zodName);
|
out.append(this.zodName);
|
||||||
@ -315,27 +339,85 @@ public class TsClassElement {
|
|||||||
out.append("\n});\n");
|
out.append("\n});\n");
|
||||||
out.append(generateZodInfer(this.tsTypeName, this.zodName));
|
out.append(generateZodInfer(this.tsTypeName, this.zodName));
|
||||||
out.append(generateExportCheckFunctionWrite(""));
|
out.append(generateExportCheckFunctionWrite(""));
|
||||||
|
// check if we need to generate write mode :
|
||||||
|
if (!model.isNoWriteSpecificMode()) {
|
||||||
|
// ------------------------------------------------------------------------
|
||||||
|
// -- Generate write mode
|
||||||
|
// ------------------------------------------------------------------------
|
||||||
|
//out.append(generateComment(model));
|
||||||
|
out.append("export const ");
|
||||||
|
out.append(this.zodName);
|
||||||
|
out.append("Write = ");
|
||||||
|
|
||||||
// Generate the Write Type associated.
|
if (model.getExtendsClass() != null) {
|
||||||
out.append("\nexport const ");
|
final ClassModel parentClass = model.getExtendsClass();
|
||||||
out.append(this.zodName);
|
final TsClassElement tsParentModel = tsGroup.find(parentClass);
|
||||||
out.append("Write = ");
|
out.append(tsParentModel.zodName);
|
||||||
out.append(this.zodName);
|
out.append("Write");
|
||||||
if (omitField.size() != 0) {
|
out.append(".extend({");
|
||||||
out.append(".omit({\n");
|
} else {
|
||||||
for (final String elem : omitField) {
|
out.append("zod.object({");
|
||||||
out.append("\t");
|
|
||||||
out.append(elem);
|
|
||||||
out.append(": true,\n");
|
|
||||||
}
|
}
|
||||||
out.append("\n})");
|
out.append("\n");
|
||||||
|
for (final FieldProperty field : model.getFields()) {
|
||||||
|
// remove all readOnly field
|
||||||
|
if (field.readOnly()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
final ClassModel fieldModel = field.model();
|
||||||
|
if (field.comment() != null) {
|
||||||
|
out.append("\t/**\n");
|
||||||
|
out.append("\t * ");
|
||||||
|
out.append(field.comment());
|
||||||
|
out.append("\n\t */\n");
|
||||||
|
}
|
||||||
|
out.append("\t");
|
||||||
|
out.append(field.name());
|
||||||
|
out.append(": ");
|
||||||
|
if (fieldModel instanceof ClassEnumModel || fieldModel instanceof ClassObjectModel) {
|
||||||
|
final TsClassElement tsFieldModel = tsGroup.find(fieldModel);
|
||||||
|
out.append(tsFieldModel.zodName);
|
||||||
|
} else if (fieldModel instanceof final ClassListModel fieldListModel) {
|
||||||
|
final String data = generateTsList(fieldListModel, tsGroup);
|
||||||
|
out.append(data);
|
||||||
|
} else if (fieldModel instanceof final ClassMapModel fieldMapModel) {
|
||||||
|
final String data = generateTsMap(fieldMapModel, tsGroup);
|
||||||
|
out.append(data);
|
||||||
|
}
|
||||||
|
out.append(maxSizeZod(field));
|
||||||
|
out.append(optionalWriteTypeZod(field));
|
||||||
|
// all write field are optional
|
||||||
|
if (field.model() instanceof final ClassObjectModel plop) {
|
||||||
|
if (!plop.isPrimitive()) {
|
||||||
|
out.append(".optional()");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
out.append(".optional()");
|
||||||
|
}
|
||||||
|
out.append(",\n");
|
||||||
|
}
|
||||||
|
out.append("\n});\n");
|
||||||
|
out.append(generateZodInfer(this.tsTypeName + "Write", this.zodName + "Write"));
|
||||||
|
// Check only the input value ==> no need of the output
|
||||||
|
out.append(generateExportCheckFunctionWrite("Write"));
|
||||||
|
// Generate the Write Type associated.
|
||||||
|
/*
|
||||||
|
out.append("\nexport const ");
|
||||||
|
out.append(this.zodName);
|
||||||
|
out.append("Write = ");
|
||||||
|
out.append(this.zodName);
|
||||||
|
if (omitField.size() != 0) {
|
||||||
|
out.append(".omit({\n");
|
||||||
|
for (final String elem : omitField) {
|
||||||
|
out.append("\t");
|
||||||
|
out.append(elem);
|
||||||
|
out.append(": true,\n");
|
||||||
|
}
|
||||||
|
out.append("\n})");
|
||||||
|
}
|
||||||
|
out.append(".partial();\n");
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
out.append(".partial();\n");
|
|
||||||
out.append(generateZodInfer(this.tsTypeName + "Write", this.zodName + "Write"));
|
|
||||||
|
|
||||||
// Check only the input value ==> no need of the output
|
|
||||||
out.append(generateExportCheckFunctionWrite("Write"));
|
|
||||||
|
|
||||||
return out.toString();
|
return out.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user