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

[FIX] correct input order.

Browse Source
This commit is contained in:
Edouard DUPIN 2024-05-28 22:07:41 +02:00
parent 3c85af5af9
commit 6104b68a02
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/kar/archidata/externalRestApi/TsApiGeneration.java
View File

@ -9,6 +9,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
import org.kar.archidata.dataAccess.DataExport; import org.kar.archidata.dataAccess.DataExport;
import org.kar.archidata.externalRestApi.TsClassElement.DefinedPosition; import org.kar.archidata.externalRestApi.TsClassElement.DefinedPosition;
@ -379,14 +380,14 @@ public class TsApiGeneration {
out.append("import { z as zod } from \"zod\"\n"); out.append("import { z as zod } from \"zod\"\n");
} }
final List<String> finalImportList = new ArrayList<>(); final Set<String> finalImportSet = new TreeSet<>();
for (final ClassModel model : imports) { for (final ClassModel model : imports) {
final TsClassElement tsModel = tsGroup.find(model); final TsClassElement tsModel = tsGroup.find(model);
if (tsModel.nativeType == DefinedPosition.NATIVE) { if (tsModel.nativeType == DefinedPosition.NATIVE) {
continue; continue;
} }
finalImportList.add(tsModel.tsTypeName); finalImportSet.add(tsModel.tsTypeName);
} }
for (final ClassModel model : isImports) { for (final ClassModel model : isImports) {
final TsClassElement tsModel = tsGroup.find(model); final TsClassElement tsModel = tsGroup.find(model);
@ -394,7 +395,7 @@ public class TsApiGeneration {
continue; continue;
} }
if (tsModel.tsCheckType != null) { if (tsModel.tsCheckType != null) {
finalImportList.add(tsModel.tsCheckType); finalImportSet.add(tsModel.tsCheckType);
} }
} }
for (final ClassModel model : zodImports) { for (final ClassModel model : zodImports) {
@ -402,20 +403,19 @@ public class TsApiGeneration {
if (tsModel.nativeType == DefinedPosition.NATIVE) { if (tsModel.nativeType == DefinedPosition.NATIVE) {
continue; continue;
} }
finalImportList.add("Zod" + tsModel.tsTypeName); finalImportSet.add("Zod" + tsModel.tsTypeName);
} }
for (final ClassModel model : writeImports) { for (final ClassModel model : writeImports) {
final TsClassElement tsModel = tsGroup.find(model); final TsClassElement tsModel = tsGroup.find(model);
if (tsModel.nativeType == DefinedPosition.NATIVE) { if (tsModel.nativeType == DefinedPosition.NATIVE) {
continue; continue;
} }
finalImportList.add(tsModel.tsTypeName + "Write"); finalImportSet.add(tsModel.tsTypeName + "Write");
} }
Collections.sort(finalImportList);
if (finalImportList.size() != 0) { if (finalImportSet.size() != 0) {
out.append("import {"); out.append("import {");
for (final String elem : finalImportList) { for (final String elem : finalImportSet) {
out.append("\n\t"); out.append("\n\t");
out.append(elem); out.append(elem);
out.append(","); out.append(",");