Adding Android Integration

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build_web:
     name: Build and Test Web
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -22,7 +22,7 @@ jobs:
 
   build_csharp:
     name: Build and Test C#
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -39,7 +39,7 @@ jobs:
 
   build_kotlin:
     name: Build and Test Kotlin
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -53,9 +53,9 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-cache-${{ github.job }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-gradle-cache-v2-${{ github.job }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-gradle-cache-${{ github.job }}-
+            ${{ runner.os }}-gradle-cache-v2-${{ github.job }}-
       - run: npm install
       - run: npm run build-kotlin-ci
       - run: npm run test-kotlin-ci

.github/workflows/publish.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   nighty_web:
     name: Web
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - name: Create cache file
         run: |
@@ -52,7 +52,7 @@ jobs:
 
   nightly_csharp:
     name: C#
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - name: Create cache file
         run: |

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   release_web:
     name: Web
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       # Checkout the repo
       - uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
 
   release_csharp:
     name: C#
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1

.gitignore

@@ -11,7 +11,6 @@ bin/
 test-results/
 debug.log
 src/generated/VersionInfo.ts
-src.kotlin/alphaTab/src/generated/
 
 .gradle
 build/

package.json

@@ -42,15 +42,15 @@
         "build-ci": "npm run clean && npm run build && npm pack",
         "build-csharp": "npm run generate-csharp && cd src.csharp && dotnet build -c Release",
         "build-csharp-ci": "npm run clean && npm run generate-csharp && cd src.csharp && dotnet build -c Release",
-        "build-kotlin": "npm run generate-kotlin && cd src.kotlin/alphaTab && gradlew assemble",
-        "build-kotlin-ci": "npm run clean && npm run generate-kotlin && cd src.kotlin/alphaTab && gradlew assemble",
+        "build-kotlin": "npm run generate-kotlin && cd src.kotlin/alphaTab && gradlew assembleRelease",
+        "build-kotlin-ci": "npm run clean && npm run generate-kotlin && cd src.kotlin/alphaTab && gradlew assembleRelease",
         "start": "node scripts/setup-playground.js && npm run build && concurrently --kill-others \"tsc --project tsconfig.build.json --watch\" \"rollup -c rollup.config.js -w\"",
         "test": "npm run generate-typescript && tsc --project tsconfig.json && concurrently --kill-others \"tsc --project tsconfig.json -w\" \"karma start karma.conf.js --browsers Chrome --no-single-run --reporters spec,kjhtml\"",
         "test-ci": "npm run generate-typescript && tsc --project tsconfig.json && karma start karma.conf.js --browsers ChromeHeadless --single-run --reporters spec",
-        "test-csharp": "cd src.csharp && dotnet test",
-        "test-csharp-ci": "cd src.csharp && dotnet test",
-        "test-kotlin": "cd src.kotlin/alphaTab && gradlew jvmTest",
-        "test-kotlin-ci": "cd src.kotlin/alphaTab && gradlew jvmTest"
+        "test-csharp": "cd src.csharp && dotnet test -c Release",
+        "test-csharp-ci": "cd src.csharp && dotnet test -c Release",
+        "test-kotlin": "cd src.kotlin/alphaTab && gradlew testReleaseUnitTest",
+        "test-kotlin-ci": "cd src.kotlin/alphaTab && gradlew testReleaseUnitTest"
     },
     "devDependencies": {
         "@rollup/plugin-commonjs": "^21.0.1",

src.compiler/AstPrinterBase.ts

@@ -72,10 +72,13 @@ export default abstract class AstPrinterBase {
         }
     }
 
-    protected writeCommaSeparated<T>(values: T[], write: (p: T) => void) {
+    protected writeCommaSeparated<T>(values: T[], write: (p: T) => void, newLine:boolean = false) {
         values.forEach((v, i) => {
             if (i > 0) {
                 this.write(', ');
+                if(newLine) {
+                    this.writeLine();
+                }
             }
             write(v);
         });
@@ -202,7 +205,18 @@ export default abstract class AstPrinterBase {
             this.write('>');
         }
         this.write('(');
-        this.writeCommaSeparated(expr.arguments, a => this.writeExpression(a));
+        if (expr.arguments.length > 5) {
+            this.writeLine();
+            this._indent++;
+            this.writeCommaSeparated(expr.arguments, a => {
+                this.writeExpression(a);
+                this.writeLine();
+            }, true);
+            this._indent--;
+            this.writeLine();
+        } else {
+            this.writeCommaSeparated(expr.arguments, a => this.writeExpression(a));
+        }
         this.write(')');
     }
 

src.compiler/csharp/CSharpAstTransformer.ts

@@ -25,24 +25,19 @@ export default class CSharpAstTransformer {
             path.resolve(this._context.compilerOptions.baseUrl!),
             path.resolve(this._typeScriptFile.fileName)
         );
-        fileName = path.join(context.compilerOptions.outDir!, this.removeExtension(fileName) + this.extension);
+        fileName = this.buildFileName(fileName, context);
 
         this._csharpFile = {
             parent: null,
             tsNode: this._typeScriptFile,
             nodeType: cs.SyntaxKind.SourceFile,
             fileName: fileName,
-            usings: [
-                {
-                    namespaceOrTypeName: this._context.toPascalCase('system'),
-                    nodeType: cs.SyntaxKind.UsingDeclaration
-                } as cs.UsingDeclaration,
-                {
-                    namespaceOrTypeName:
-                        this._context.toPascalCase('alphaTab') + '.' + this._context.toPascalCase('core'),
+            usings: this._context.getDefaultUsings().map(u => {
+                return {
+                    namespaceOrTypeName: u,
                     nodeType: cs.SyntaxKind.UsingDeclaration
-                } as cs.UsingDeclaration
-            ],
+                } as cs.UsingDeclaration;
+            }),
             namespace: {
                 parent: null,
                 nodeType: cs.SyntaxKind.NamespaceDeclaration,
@@ -53,6 +48,10 @@ export default class CSharpAstTransformer {
         this._csharpFile.namespace.parent = this._csharpFile;
     }
 
+    protected buildFileName(fileName: string, context: CSharpEmitterContext): string {
+        return path.join(context.compilerOptions.outDir!, this.removeExtension(fileName) + this.extension);
+    }
+
     public transform() {
         // if the default export is a class:
         //  - global statements will be put into the static constructor of the class
@@ -336,7 +335,6 @@ export default class CSharpAstTransformer {
         return 'csharp';
     }
 
-
     protected visitEnumDeclaration(node: ts.EnumDeclaration) {
         const csEnum: cs.EnumDeclaration = {
             visibility: cs.Visibility.Public,
@@ -427,7 +425,7 @@ export default class CSharpAstTransformer {
             });
         }
 
-        if(!csInterface.skipEmit){
+        if (!csInterface.skipEmit) {
             node.members.forEach(m => this.visitInterfaceElement(csInterface, m));
         }
 
@@ -999,7 +997,7 @@ export default class CSharpAstTransformer {
                 type: this.createUnresolvedTypeNode(null, classElement.type ?? classElement, returnType),
                 skipEmit: this.shouldSkip(classElement, false),
                 tsNode: classElement,
-                tsSymbol: this._context.getSymbolForDeclaration(classElement),
+                tsSymbol: this._context.getSymbolForDeclaration(classElement)
             };
 
             if (this._context.markOverride(classElement)) {
@@ -1071,7 +1069,7 @@ export default class CSharpAstTransformer {
                 type: this.createUnresolvedTypeNode(null, classElement.type ?? classElement, returnType),
                 skipEmit: this.shouldSkip(classElement, false),
                 tsNode: classElement,
-                tsSymbol: this._context.getSymbolForDeclaration(classElement),
+                tsSymbol: this._context.getSymbolForDeclaration(classElement)
             };
 
             if (this._context.markOverride(classElement)) {
@@ -1435,7 +1433,7 @@ export default class CSharpAstTransformer {
                     nodeType: cs.SyntaxKind.TypeReference,
                     parent: variableStatement,
                     tsNode: s,
-                    reference: this._context.makeTypeName('system.Exception')
+                    reference: this._context.makeExceptionType()
                 } as cs.TypeReference;
             } else {
                 variableStatement.type = this.createUnresolvedTypeNode(variableStatement, s.type ?? s, type);
@@ -2821,8 +2819,40 @@ export default class CSharpAstTransformer {
     }
 
     protected visitArrayLiteralExpression(parent: cs.Node, expression: ts.ArrayLiteralExpression) {
-        if (this.isMapInitializer(expression)) {
+        if (this.isMapEntry(expression)) {
             return this.createMapEntry(parent, expression);
+        } else if (this.isMapInitializer(expression)) {
+            const csExpr = {
+                parent: parent,
+                tsNode: expression,
+                nodeType: cs.SyntaxKind.InvocationExpression,
+                arguments: [],
+                expression: {} as cs.Expression
+            } as cs.InvocationExpression;
+
+            csExpr.expression = this.makeMemberAccess(
+                csExpr,
+                this._context.makeTypeName('alphaTab.core.TypeHelper'),
+                this._context.toPascalCase('mapInitializer')
+            );
+
+            expression.elements.forEach(e => {
+                const ex = this.visitExpression(csExpr, e);
+                if (ex) {
+                    csExpr.arguments.push(ex);
+                }
+            });
+
+            // steal generic from inner element
+            if(csExpr.arguments.length > 0 && 
+                cs.isInvocationExpression(csExpr.arguments[0]) &&
+                cs.isTypeReference(csExpr.arguments[0].expression))  {
+                csExpr.typeArguments = [
+                    csExpr.arguments[0].expression
+                ];
+            }
+
+            return csExpr;
         } else if (this.isSetInitializer(expression)) {
             const csExpr = {
                 parent: parent,
@@ -2838,6 +2868,11 @@ export default class CSharpAstTransformer {
                 this._context.toPascalCase('setInitializer')
             );
 
+            const setCreation = expression.parent as ts.NewExpression;
+            if (setCreation.typeArguments) {
+                csExpr.typeArguments = setCreation.typeArguments.map(t => this.createUnresolvedTypeNode(csExpr, t));
+            }
+
             expression.elements.forEach(e => {
                 const ex = this.visitExpression(csExpr, e);
                 if (ex) {
@@ -2895,6 +2930,15 @@ export default class CSharpAstTransformer {
     }
 
     protected isMapInitializer(expression: ts.ArrayLiteralExpression) {
+        const isCandidate = expression.parent.kind === ts.SyntaxKind.NewExpression;
+        if (!isCandidate) {
+            return false;
+        }
+
+        return this._context.typeChecker.getTypeAtLocation(expression.parent).symbol.name === 'Map';
+    }
+
+    protected isMapEntry(expression: ts.ArrayLiteralExpression) {
         const isCandidate =
             expression.elements.length === 2 &&
             expression.parent.kind === ts.SyntaxKind.ArrayLiteralExpression &&
@@ -3237,7 +3281,6 @@ export default class CSharpAstTransformer {
             }
         });
 
-
         if (expression.typeArguments) {
             callExpression.typeArguments = [];
             expression.typeArguments.forEach(a =>
@@ -3271,14 +3314,6 @@ export default class CSharpAstTransformer {
         } as cs.NewExpression;
 
         newExpression.type.parent = newExpression;
-        if (expression.arguments) {
-            expression.arguments.forEach(a => {
-                const e = this.visitExpression(newExpression, a);
-                if (e) {
-                    newExpression.arguments.push(e);
-                }
-            });
-        }
 
         if (expression.typeArguments) {
             csType.typeArguments = [];
@@ -3308,6 +3343,15 @@ export default class CSharpAstTransformer {
             }
         }
 
+        if (expression.arguments) {
+            expression.arguments.forEach(a => {
+                const e = this.visitExpression(newExpression, a);
+                if (e) {
+                    newExpression.arguments.push(e);
+                }
+            });
+        }
+
         if (type && type.symbol && type.symbol.name === 'ArrayConstructor' && newExpression.arguments.length === 1) {
             newExpression.arguments[0] = this.makeInt(newExpression.arguments[0]);
         }
@@ -3424,7 +3468,7 @@ export default class CSharpAstTransformer {
                 (node.tsSymbol.flags & ts.SymbolFlags.Variable) === ts.SymbolFlags.Variable ||
                 (node.tsSymbol.flags & ts.SymbolFlags.EnumMember) === ts.SymbolFlags.EnumMember ||
                 (node.tsSymbol.flags & ts.SymbolFlags.FunctionScopedVariable) ===
-                ts.SymbolFlags.FunctionScopedVariable ||
+                    ts.SymbolFlags.FunctionScopedVariable ||
                 (node.tsSymbol.flags & ts.SymbolFlags.BlockScopedVariable) === ts.SymbolFlags.BlockScopedVariable
             ) {
                 let smartCastType = this._context.getSmartCastType(expression);

src.compiler/csharp/CSharpEmitterContext.ts

@@ -753,6 +753,10 @@ export default class CSharpEmitterContext {
         return null;
     }
 
+    public makeExceptionType(): cs.TypeReferenceType {
+        return this.makeTypeName('system.Exception')
+    }
+
     public makeTypeName(tsName: string): string {
         const parts = tsName.split('.');
         let result = '';
@@ -1490,4 +1494,11 @@ export default class CSharpEmitterContext {
         }
         return type.flags & ts.TypeFlags.String || type.flags & ts.TypeFlags.StringLiteral;
     }
+
+    public getDefaultUsings(): string[] {
+        return [
+            this.toPascalCase('system'),
+            this.toPascalCase('alphaTab') + '.' + this.toPascalCase('core')
+        ];
+    }
 }