Make TableExpression.fields not optional

ark120202 · ark120202 · commit 2112cd4ca18c · 2019-07-08T23:20:32.000+05:00
diff --git a/src/LuaAST.ts b/src/LuaAST.ts
@@ -687,15 +687,15 @@ export function createTableFieldExpression(
 
 export interface TableExpression extends Expression {
     kind: SyntaxKind.TableExpression;
-    fields?: TableFieldExpression[];
+    fields: TableFieldExpression[];
 }
 
 export function isTableExpression(node: Node): node is TableExpression {
     return node.kind === SyntaxKind.TableExpression;
 }
 
 export function createTableExpression(
-    fields?: TableFieldExpression[],
+    fields: TableFieldExpression[] = [],
     tsOriginal?: ts.Node,
     parent?: Node
 ): TableExpression {
diff --git a/src/LuaPrinter.ts b/src/LuaPrinter.ts
@@ -571,17 +571,7 @@ export class LuaPrinter {
     }
 
     public printTableExpression(expression: tstl.TableExpression): SourceNode {
-        const chunks: SourceChunk[] = [];
-
-        chunks.push("{");
-
-        if (expression.fields) {
-            chunks.push(...this.printExpressionList(expression.fields));
-        }
-
-        chunks.push("}");
-
-        return this.createSourceNode(expression, chunks);
+        return this.createSourceNode(expression, ["{", ...this.printExpressionList(expression.fields), "}"]);
     }
 
     public printUnaryExpression(expression: tstl.UnaryExpression): SourceNode {
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -785,7 +785,7 @@ export class LuaTransformer {
         const result: tstl.Statement[] = [];
 
         // [____exports.]className = {}
-        const classTable: tstl.Expression = tstl.createTableExpression([]);
+        const classTable: tstl.Expression = tstl.createTableExpression();
 
         const classVar = this.createLocalOrExportedOrGlobalDeclaration(className, classTable, statement);
         result.push(...classVar);
@@ -4830,16 +4830,14 @@ export class LuaTransformer {
         const stringTableLiteral = tstl.createTableExpression(
             strings.map(partialString => tstl.createTableFieldExpression(tstl.createStringLiteral(partialString)))
         );
-        if (stringTableLiteral.fields) {
-            const rawStringArray = tstl.createTableExpression(
-                rawStrings.map(stringLiteral =>
-                    tstl.createTableFieldExpression(tstl.createStringLiteral(stringLiteral))
-                )
-            );
-            stringTableLiteral.fields.push(
-                tstl.createTableFieldExpression(rawStringArray, tstl.createStringLiteral("raw"))
-            );
-        }
+        const rawStringArray = tstl.createTableExpression(
+            rawStrings.map(stringLiteral =>
+                tstl.createTableFieldExpression(tstl.createStringLiteral(stringLiteral))
+            )
+        );
+        stringTableLiteral.fields.push(
+            tstl.createTableFieldExpression(rawStringArray, tstl.createStringLiteral("raw"))
+        );
 
         // Evaluate if there is a self parameter to be used.
         const signature = this.checker.getResolvedSignature(expression);
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -869,7 +869,7 @@ export function isSimpleExpression(expression: tstl.Expression): boolean {
 
         case tstl.SyntaxKind.TableExpression:
             const tableExpression = expression as tstl.TableExpression;
-            return !tableExpression.fields || tableExpression.fields.every(e => isSimpleExpression(e));
+            return tableExpression.fields.every(e => isSimpleExpression(e));
 
         case tstl.SyntaxKind.TableFieldExpression:
             const fieldExpression = expression as tstl.TableFieldExpression;
