build(cross): Nullable tuple handling

Author: Danielku15

src.compiler/csharp/CSharpAstPrinter.ts

@@ -864,7 +864,7 @@ export default class CSharpAstPrinter extends AstPrinterBase {
 
     protected writeNonNullExpression(expr: cs.NonNullExpression) {
         this.writeExpression(expr.expression);
-        if (!cs.isNonNullExpression(expr)) {
+        if (!cs.isNonNullExpression(expr.expression)) {
             this.write('!');
         }
     }

src.compiler/csharp/CSharpAstTransformer.ts

@@ -3217,11 +3217,18 @@ export default class CSharpAstTransformer {
 
             csExpr.type = this._context.makeArrayTupleType(csExpr, []);
 
-            const tupleType = this._context.typeChecker.getContextualType(expression) ?? type;
+            let tupleType = this._context.typeChecker.getContextualType(expression);
+            let typeArgs = tupleType
+                ? this._context.typeChecker.getTypeArguments(tupleType as ts.TypeReference)
+                : undefined;
+            if (!typeArgs || typeArgs.length !== expression.elements.length) {
+                tupleType = type;
+                typeArgs = this._context.typeChecker.getTypeArguments(tupleType as ts.TypeReference);
+            }
 
-            (csExpr.type as cs.ArrayTupleNode).types = this._context.typeChecker
-                .getTypeArguments(tupleType as ts.TypeReference)
-                .map((p, i) => this.createUnresolvedTypeNode(csExpr.type, expression.elements[i], p));
+            (csExpr.type as cs.ArrayTupleNode).types = typeArgs!.map((p, i) =>
+                this.createUnresolvedTypeNode(csExpr.type, expression.elements[i], p)
+            );
 
             for (const e of expression.elements) {
                 const ex = this.visitExpression(csExpr, e);

src.compiler/csharp/CSharpEmitterContext.ts

@@ -656,7 +656,10 @@ export default class CSharpEmitterContext {
                         }
                     }
                     break;
+                case cs.SyntaxKind.ArrayTupleNode:
+                    return true;
             }
+
         }
         return false;
     }
@@ -1759,7 +1762,7 @@ export default class CSharpEmitterContext {
             return true;
         }
 
-        return this.isEnum(tsType);
+        return this.isEnum(tsType) || this.typeChecker.isTupleType(tsType);
     }
 
     public isEnum(tsType: ts.Type) {

src.compiler/kotlin/KotlinEmitterContext.ts

@@ -69,6 +69,13 @@ export default class KotlinEmitterContext extends CSharpEmitterContext {
         return undefined;
     }
 
+    protected isCsValueType(mapValueType: cs.TypeNode | null): boolean {
+        if(mapValueType?.nodeType === cs.SyntaxKind.ArrayTupleNode) {
+            return false;
+        }
+        return super.isCsValueType(mapValueType);
+    }
+
     public override getMethodNameFromSymbol(symbol: ts.Symbol): string {
         const parent = 'parent' in symbol ? (symbol.parent as ts.Symbol) : undefined;
 

src/importer/MusicXmlImporter.ts

@@ -2353,8 +2353,8 @@ export class MusicXmlImporter extends ScoreImporter {
             }
 
             if(this._keyAllStaves != null) {
-                newBar.keySignature = this._keyAllStaves[0];
-                newBar.keySignatureType = this._keyAllStaves[1];
+                newBar.keySignature = this._keyAllStaves![0];
+                newBar.keySignatureType = this._keyAllStaves![1];
             }
 
             for (let i = 0; i < voiceCount; i++) {

test/importer/__snapshots__/musicxmlimporter.test.ts.snap

@@ -1040,7 +1040,6 @@ Map {
   "masterbars" => Array [
     Map {
       "__kind" => "MasterBar",
-      "keysignature" => 4,
       "timesignaturecommon" => true,
     },
     Map {
@@ -1509,6 +1508,7 @@ Map {
                   ],
                 },
               ],
+              "keysignature" => 4,
             },
             Map {
               "__kind" => "Bar",
@@ -1616,6 +1616,7 @@ Map {
                   ],
                 },
               ],
+              "keysignature" => 4,
             },
           ],
         },
@@ -1640,7 +1641,6 @@ Map {
   "masterbars" => Array [
     Map {
       "__kind" => "MasterBar",
-      "keysignature" => 4,
       "timesignaturecommon" => true,
     },
   ],
@@ -1772,6 +1772,7 @@ Map {
                   ],
                 },
               ],
+              "keysignature" => 4,
             },
           ],
         },
@@ -2233,6 +2234,7 @@ Map {
                   ],
                 },
               ],
+              "keysignature" => 4,
             },
           ],
         },