Bugfix release

compiler/back-ends/c++-gen/gen-code.c

@@ -1413,8 +1413,12 @@ static bool PrintROSEInvoke(FILE* hdr, FILE* src, Module* m, int bEvents, ValueD
  */
 static void PrintCxxSimpleDef(FILE* hdr, FILE* src, Module* m, CxxRules* r, TypeDef* td, const int genCxxCode_EnumClasses)
 {
+	// The root type is deprecated
 	if (IsDeprecatedNoOutputSequence(m, td->type->cxxTypeRefInfo->className))
 		return;
+	// The type itself is deprecated
+	if (IsDeprecatedNoOutputSequence(m, td->definedName))
+		return;
 
 	fprintf(hdr, "// [%s]\n", __FUNCTION__);
 

compiler/back-ends/ts-gen/gen-ts-code.c

@@ -367,17 +367,26 @@ void PrintTSChoiceDefCode(FILE* src, ModuleList* mods, Module* m, TypeDef* td, T
 
 	FOR_EACH_LIST_ELMT(e, choice->basicType->a.sequence)
 	{
+		if (IsDeprecatedFlaggedMember(m, td, e->fieldName))
+			continue;
+
+		const char* szPropertyName = "";
+		BasicType* type = ResolveBasicTypeReferences(e->type->basicType, &szPropertyName);
+		enum BasicTypeChoiceId choiceId = type->choiceId;
+
 		char szOptionalParam[128] = {0};
 		int id = GetContextID(e->type);
 		if (id >= 0)
-			sprintf_s(szOptionalParam, sizeof(szOptionalParam), ", idBlock: { optionalID: %i }", id);
+		{
+			if (choiceId == BASICTYPE_ANY)
+				strcpy_s(szOptionalParam, sizeof(szOptionalParam), ", optional: true");
+			else
+				sprintf_s(szOptionalParam, sizeof(szOptionalParam), ", idBlock: { optionalID: %i }", id);
+		}
 
 		if (choice->basicType->a.sequence->curr->prev)
 			fprintf(src, ",\n");
 		const char* szFieldName = e->fieldName;
-		const char* szPropertyName = "";
-		BasicType* type = ResolveBasicTypeReferences(e->type->basicType, &szPropertyName);
-		enum BasicTypeChoiceId choiceId = type->choiceId;
 
 		if (choiceId == BASICTYPE_SEQUENCEOF || choiceId == BASICTYPE_SETOF)
 		{
@@ -404,8 +413,13 @@ void PrintTSChoiceDefCode(FILE* src, ModuleList* mods, Module* m, TypeDef* td, T
 	/* Write out properties */
 	FOR_EACH_LIST_ELMT(e, choice->basicType->a.sequence)
 	{
+		if (IsDeprecatedFlaggedMember(m, td, e->fieldName))
+			continue;
 		if (choice->basicType->a.sequence->curr->prev)
 			fprintf(src, "\n");
+
+		printMemberComment(src, m, td, e->fieldName, "\t", COMMENTSTYLE_TYPESCRIPT);
+
 		fprintf(src, "\t");
 		{
 			char* szConverted2 = FixName(e->fieldName);
@@ -585,7 +599,7 @@ void PrintTSSeqDefCode(FILE* src, ModuleList* mods, Module* m, TypeDef* td, Type
 		if (bOptional)
 		{
 			iOptionalID = GetContextID(e->type);
-			if (iOptionalID > -1)
+			if (iOptionalID > -1 && choiceId != BASICTYPE_ANY)
 				sprintf_s(szOptionalParam, sizeof(szOptionalParam), ", idBlock: { optionalID: %i }", iOptionalID);
 			else
 				sprintf_s(szOptionalParam, sizeof(szOptionalParam), "%s", ", optional: true");

compiler/back-ends/ts-gen/gen-ts-combined.c

@@ -1,4 +1,5 @@
 #include "gen-ts-combined.h"
+#include "gen-ts-converter.h"
 #include "../../core/snacc-util.h"
 #include "../str-util.h"
 #include "../structure-util.h"
@@ -137,6 +138,8 @@ void PrintTSImports(FILE* src, ModuleList* mods, Module* mod, bool bIncludeConve
 				Module* referencedModule = GetModuleForImportModule(mods, impMod);
 				if (referencedModule)
 				{
+					if (!ContainsConverters(referencedModule))
+						continue;
 					const char* szNameSpace = GetNameSpace(referencedModule);
 					if (strstr(szAlreadyAdded, szNameSpace) == NULL)
 					{

compiler/back-ends/ts-gen/gen-ts-converter.c

@@ -333,6 +333,8 @@ void Print_JSON_EncoderChoiceDefCode(FILE* src, ModuleList* mods, Module* m, Typ
 	NamedType* e;
 	FOR_EACH_LIST_ELMT(e, choice->basicType->a.sequence)
 	{
+		if (IsDeprecatedFlaggedMember(m, td, e->fieldName))
+			continue;
 		fprintf(src, "\t\t");
 		if (bCurly)
 		{
@@ -386,6 +388,8 @@ void Print_BER_EncoderChoiceDefCode(FILE* src, ModuleList* mods, Module* m, Type
 	NamedType* e;
 	FOR_EACH_LIST_ELMT(e, choice->basicType->a.sequence)
 	{
+		if (IsDeprecatedFlaggedMember(m, td, e->fieldName))
+			continue;
 		Type* type = e->type;
 		enum BasicTypeChoiceId choiceId = type->basicType->choiceId;
 		if (choiceId == BASICTYPE_LOCALTYPEREF || choiceId == BASICTYPE_IMPORTTYPEREF)
@@ -434,6 +438,8 @@ void Print_JSON_DecoderChoiceDefCode(FILE* src, ModuleList* mods, Module* m, Typ
 	NamedType* e;
 	FOR_EACH_LIST_ELMT(e, choice->basicType->a.sequence)
 	{
+		if (IsDeprecatedFlaggedMember(m, td, e->fieldName))
+			continue;
 		BasicType* type = e->type->basicType;
 		const char* szOptional = e->type->optional ? "true" : "false";
 		const char* szTypeName = NULL;
@@ -516,6 +522,8 @@ void Print_BER_DecoderChoiceDefCode(FILE* src, ModuleList* mods, Module* m, Type
 	NamedType* e;
 	FOR_EACH_LIST_ELMT(e, choice->basicType->a.sequence)
 	{
+		if (IsDeprecatedFlaggedMember(m, td, e->fieldName))
+			continue;
 		BasicType* pBasicType = ResolveBasicTypeReferences(e->type->basicType, NULL);
 		enum BasicTypeChoiceId choiceId = pBasicType->choiceId;
 		const char* szOptional = e->type->optional ? "true" : "false";

samples/ts-microservice/client/check-pm.js

@@ -0,0 +1,6 @@
+const userAgent = process.env.npm_config_user_agent || "";
+if (!userAgent.startsWith("pnpm"))
+{
+  console.error("\nERROR: You must use pnpm (preferably via Corepack).\n\n");
+  process.exit(1);
+}