Skip to content
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

Jump to bottom

Fixes for typescript enums #81

Merged
merged 3 commits into from
Sep 17, 2024
Merged

Fixes for typescript enums #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69e8b73
BUILDSYS-446 fix enum to enum typeref creates not needed converter
JanFellner Sep 17, 2024
4e9adcc
BUILDSYS-446 bumped to 6.0.17
JanFellner Sep 17, 2024
6c1100a
BUILDSYS-444 Use the enum type instead of number in the type definitions
JanFellner Sep 17, 2024
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
96 changes: 59 additions & 37 deletions compiler/back-ends/ts-gen/gen-ts-code.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ void PrintTSNativeType(FILE* hdr, BasicType* pBasicType)
break;
case BASICTYPE_INTEGER:
case BASICTYPE_REAL:
fprintf(hdr, "number");
break;
case BASICTYPE_ENUMERATED:
fprintf(hdr, "number");
break;
Expand Down Expand Up @@ -97,36 +99,33 @@ void PrintTS_JSON_DefaultValue(FILE* hdr, ModuleList* mods, Module* m, TypeDef*
}
else
{
BasicType* pBasicType = t->basicType;
enum BasicTypeChoiceId choiceId = pBasicType->choiceId;
Type* baset = t;
Module* mod = NULL;
enum BasicTypeChoiceId choiceId = t->basicType->choiceId;
if (choiceId == BASICTYPE_IMPORTTYPEREF || choiceId == BASICTYPE_LOCALTYPEREF)
{
if (strcmp(t->cxxTypeRefInfo->className, "AsnSystemTime") == 0)
choiceId = BASICTYPE_UTCTIME;
else if (choiceId == BASICTYPE_IMPORTTYPEREF && t->basicType->a.importTypeRef->link)
else if (t->basicType->choiceId == BASICTYPE_IMPORTTYPEREF)
{
if (IsSimpleType(t->basicType->a.importTypeRef->link->type->basicType->choiceId))
{
pBasicType = t->basicType->a.importTypeRef->link->type->basicType;
choiceId = pBasicType->choiceId;
mod = GetImportModuleRefByClassName(t->cxxTypeRefInfo->className, mods, m);
t = t->basicType->a.importTypeRef->link->type;
choiceId = t->basicType->choiceId;
}
}
else if (choiceId == BASICTYPE_LOCALTYPEREF && t->basicType->a.localTypeRef->link)
else if (t->basicType->choiceId == BASICTYPE_LOCALTYPEREF)
{
if (IsSimpleType(t->basicType->a.localTypeRef->link->type->basicType->choiceId))
{
pBasicType = t->basicType->a.localTypeRef->link->type->basicType;
choiceId = pBasicType->choiceId;
t = t->basicType->a.importTypeRef->link->type;
choiceId = t->basicType->choiceId;
}
}
else
{
snacc_exit("Invalid parameter, choiceID is %i but the associated link is NULL", choiceId);
return;
}
}

if (choiceId == BASICTYPE_OCTETCONTAINING && pBasicType->a.stringContaining->basicType->choiceId == BASICTYPE_UTF8_STR)
if (choiceId == BASICTYPE_OCTETCONTAINING && t->basicType->a.stringContaining->basicType->choiceId == BASICTYPE_UTF8_STR)
choiceId = BASICTYPE_UTF8_STR;

switch (choiceId)
Expand All @@ -135,9 +134,14 @@ void PrintTS_JSON_DefaultValue(FILE* hdr, ModuleList* mods, Module* m, TypeDef*
fprintf(hdr, "false");
break;
case BASICTYPE_INTEGER:
case BASICTYPE_ENUMERATED:
fprintf(hdr, "0");
break;
case BASICTYPE_ENUMERATED:
if (mod)
fprintf(hdr, "%s.", mod->moduleName);
ValueDef* e = FIRST_LIST_ELMT(t->basicType->a.enumerated);
fprintf(hdr, "%s.%s", baset->cxxTypeRefInfo->className, e->definedName);
break;
case BASICTYPE_OCTETSTRING:
case BASICTYPE_OCTETCONTAINING:
fprintf(hdr, "new Uint8Array(0)");
Expand All @@ -153,7 +157,7 @@ void PrintTS_JSON_DefaultValue(FILE* hdr, ModuleList* mods, Module* m, TypeDef*
break;
case BASICTYPE_IMPORTTYPEREF:
{
Module* mod = GetImportModuleRefByClassName(t->cxxTypeRefInfo->className, mods, m);
mod = GetImportModuleRefByClassName(t->cxxTypeRefInfo->className, mods, m);
if (mod)
{
const char* szNameSpace = GetNameSpace(mod);
Expand Down Expand Up @@ -206,9 +210,9 @@ void PrintTS_JSON_DefaultValue(FILE* hdr, ModuleList* mods, Module* m, TypeDef*
*/
void PrintTSType(FILE* hdr, ModuleList* mods, Module* m, TypeDef* td, Type* parent, Type* t)
{
BasicType* basicType = t->basicType;
enum BasicTypeChoiceId choiceId = basicType->choiceId;

Type* baset = t;
Module* mod = NULL;
enum BasicTypeChoiceId choiceId = t->basicType->choiceId;
if (choiceId == BASICTYPE_IMPORTTYPEREF || choiceId == BASICTYPE_LOCALTYPEREF)
{
if (strcmp(t->cxxTypeRefInfo->className, "AsnSystemTime") == 0)
Expand All @@ -217,69 +221,74 @@ void PrintTSType(FILE* hdr, ModuleList* mods, Module* m, TypeDef* td, Type* pare
{
if (IsSimpleType(t->basicType->a.importTypeRef->link->type->basicType->choiceId))
{
basicType = t->basicType->a.importTypeRef->link->type->basicType;
choiceId = basicType->choiceId;
mod = GetImportModuleRefByClassName(t->cxxTypeRefInfo->className, mods, m);
t = t->basicType->a.importTypeRef->link->type;
choiceId = t->basicType->choiceId;
}
}
else if (choiceId == BASICTYPE_LOCALTYPEREF)
{
if (IsSimpleType(t->basicType->a.localTypeRef->link->type->basicType->choiceId))
{
basicType = t->basicType->a.localTypeRef->link->type->basicType;
choiceId = basicType->choiceId;
t = t->basicType->a.importTypeRef->link->type;
choiceId = t->basicType->choiceId;
}
}
}

if (choiceId == BASICTYPE_OCTETCONTAINING && basicType->a.stringContaining->basicType->choiceId == BASICTYPE_UTF8_STR)
if (choiceId == BASICTYPE_OCTETCONTAINING && t->basicType->a.stringContaining->basicType->choiceId == BASICTYPE_UTF8_STR)
choiceId = BASICTYPE_UTF8_STR;

fprintf(hdr, ": ");
switch (choiceId)
{
case BASICTYPE_BOOLEAN:
fprintf(hdr, ": boolean");
fprintf(hdr, "boolean");
break;
case BASICTYPE_INTEGER:
case BASICTYPE_REAL:
fprintf(hdr, "number");
break;
case BASICTYPE_ENUMERATED:
fprintf(hdr, ": number");
if (mod)
fprintf(hdr, "%s.", mod->moduleName);
fprintf(hdr, "%s", baset->cxxTypeRefInfo->className);
break;
case BASICTYPE_UTF8_STR:
fprintf(hdr, ": string");
fprintf(hdr, "string");
break;
case BASICTYPE_OCTETSTRING:
case BASICTYPE_OCTETCONTAINING:
fprintf(hdr, ": Uint8Array");
fprintf(hdr, "Uint8Array");
break;
case BASICTYPE_SEQUENCEOF:
fprintf(hdr, ": %s[]", t->cxxTypeRefInfo->className);
fprintf(hdr, "%s[]", t->cxxTypeRefInfo->className);
break;
case BASICTYPE_NULL:
fprintf(hdr, ": null");
fprintf(hdr, "null");
break;
case BASICTYPE_UTCTIME:
fprintf(hdr, ": Date"); // AsnSystemTime is defined as REAL in the Asn1 file, but is transmitted as a string in the TS.
fprintf(hdr, "Date"); // AsnSystemTime is defined as REAL in the Asn1 file, but is transmitted as a string in the TS.
break;
case BASICTYPE_IMPORTTYPEREF:
{
Module* mod = GetImportModuleRefByClassName(t->cxxTypeRefInfo->className, mods, m);
mod = GetImportModuleRefByClassName(t->cxxTypeRefInfo->className, mods, m);
if (mod)
{
char* szConverted = FixName(t->cxxTypeRefInfo->className);
fprintf(hdr, ": %s.%s", GetNameSpace(mod), szConverted);
fprintf(hdr, "%s.%s", GetNameSpace(mod), szConverted);
free(szConverted);
}
break;
}
case BASICTYPE_LOCALTYPEREF:
{
char* szConverted = FixName(t->basicType->a.localTypeRef->link->definedName);
fprintf(hdr, ": %s", szConverted);
fprintf(hdr, "%s", szConverted);
free(szConverted);
break;
}
case BASICTYPE_ANY:
fprintf(hdr, ": any");
fprintf(hdr, "any");
break;
default:
snacc_exit("Unknown choiceId %d", choiceId);
Expand Down Expand Up @@ -1042,7 +1051,18 @@ void PrintTSCode(ModuleList* allMods, long longJmpVal, int genTypes, int genValu

fprintf(typesFile, "export * as %s from \"./%s%s\";\n", varName, szModName, getCommonJSFileExtension());
if (genJSONEncDec)
fprintf(typesFile, "export * as %s_Converter from \"./%s_Converter%s\";\n", varName, szModName, getCommonJSFileExtension());
{
char szFileName[_MAX_PATH] = {0};
strcat_s(szFileName, _MAX_PATH - 1, szModName);
strcat_s(szFileName, _MAX_PATH - 1, "_Converter.ts");
char* szConverterFileName = MakeFileName(szFileName, "");
FILE* exists = NULL;
if (fopen_s(&exists, szConverterFileName, "r") == 0)
{
fprintf(typesFile, "export * as %s_Converter from \"./%s_Converter%s\";\n", varName, szModName, getCommonJSFileExtension());
fclose(exists);
}
}

free(varName);
free(szModName);
Expand Down Expand Up @@ -1244,6 +1264,8 @@ void PrintTSCode(ModuleList* allMods, long longJmpVal, int genTypes, int genValu
{
if (currMod->ImportedFlag == FALSE)
{
if (!ContainsConverters(currMod))
continue;
if (fopen_s(&encdecFilePtr, currMod->tsConverterFileName, "wt") != 0 || encdecFilePtr == NULL)
{
perror("fopen");
Expand Down
21 changes: 19 additions & 2 deletions compiler/back-ends/ts-gen/gen-ts-converter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,8 +1344,7 @@ void PrintTSEncoderDecoderCode(FILE* src, ModuleList* mods, Module* m, TypeDef*
// brauchen keinen Encoder Decoder

enum BasicTypeChoiceId type = td->type->basicType->choiceId;

if (!IsSimpleType(type))
if (!IsSimpleType(type) && ResolveTypeReferencesToRoot(td->type, NULL)->basicType->choiceId != BASICTYPE_ENUMERATED)
{
fprintf(src, "\n// [%s]\n", __FUNCTION__);
fprintf(src, "export class %s_Converter {", szConverted);
Expand Down Expand Up @@ -1521,6 +1520,24 @@ void PrintTSEncoderDecoderCode(FILE* src, ModuleList* mods, Module* m, TypeDef*
free(szConverted);
}

bool ContainsConverters(Module* m)
{
bool bContainsConverters = false;
TypeDef* td;
FOR_EACH_LIST_ELMT(td, m->typeDefs)
{
if (IsDeprecatedNoOutputSequence(m, td->definedName))
continue;
enum BasicTypeChoiceId type = td->type->basicType->choiceId;
if (!IsSimpleType(type) && ResolveTypeReferencesToRoot(td->type, NULL)->basicType->choiceId != BASICTYPE_ENUMERATED)
{
bContainsConverters = true;
break;
}
}
return bContainsConverters;
}

void PrintTSConverterCode(FILE* src, ModuleList* mods, Module* m, long longJmpVal, int printTypes, int printValues, int printEncoders, int printDecoders, int printTSONEncDec, int novolatilefuncs)
{
fprintf(src, "// [%s]\n", __FUNCTION__);
Expand Down
2 changes: 2 additions & 0 deletions compiler/back-ends/ts-gen/gen-ts-converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ void SaveTSConverterFilesToOutputDirectory(const char* szPath);

void PrintTSConverterCode(FILE* src, ModuleList* mods, Module* m, long longJmpVal, int printTypes, int printValues, int printEncoders, int printDecoders, int printJSONEncDec, int novolatilefuncs);

bool ContainsConverters(Module* m);

#endif // TSCONVERTER_H_INCLUDED
6 changes: 3 additions & 3 deletions version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef VERSION_H
#define VERSION_H

#define VERSION "6.0.16"
#define VERSION_RC 6, 0, 16
#define RELDATE "16.09.2024"
#define VERSION "6.0.17"
#define VERSION_RC 6, 0, 17
#define RELDATE "17.09.2024"

#endif // VERSION_H
Loading