Flag var statements as static if no module exists

lolleko · lolleko · commit 743912a9c65f · 2018-11-28T19:21:47.000+01:00
diff --git a/src/TransformHelper.ts b/src/TransformHelper.ts
@@ -4,9 +4,10 @@ export class TransformHelper {
     // Helper to create simple lua variable statement;
     public static createLuaVariableStatement(identifier: ts.Identifier,
                                              expression?: ts.Expression,
-                                             typeNode?: ts.TypeNode): ts.VariableStatement {
+                                             typeNode?: ts.TypeNode,
+                                             modifiers: ReadonlyArray<ts.Modifier> = []): ts.VariableStatement {
         const declaration = ts.createVariableDeclaration(identifier, typeNode, expression);
-        const statement = ts.createVariableStatement([], ts.createVariableDeclarationList([declaration]));
+        const statement = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([declaration]));
         return statement;
     }
 
diff --git a/src/Transformer.ts b/src/Transformer.ts
@@ -304,6 +304,11 @@ export class LuaTransformer {
         return undefined;
     }
     public visitVariableStatement(node: ts.VariableStatement): ts.VisitResult<ts.VariableStatement> {
+        // TODO maybe flag as gglobal/local here somehow?
+        if (!this.isModule && !this.currentNamespace) {
+            return ts.updateVariableStatement(
+                node, [ts.createModifier(ts.SyntaxKind.StaticKeyword)], node.declarationList);
+        }
         return node;
     }
     public visitExpressionStatement(node: ts.ExpressionStatement): ts.VisitResult<ts.ExpressionStatement> {
diff --git a/test/runner.ts b/test/runner.ts
@@ -23,7 +23,7 @@ fs.copyFileSync(
 testRunner.outputStream
           // this will use alsatian's default output if you remove this
           // you'll get TAP or you can add your favourite TAP reporter in it's place
-          // .pipe(TapBark.create().getPipeable())
+          .pipe(TapBark.create().getPipeable())
           // pipe to the console
           .pipe(process.stdout);
 

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,11 @@ export class LuaTransformer {`
`304`	`304`	`return undefined;`
`305`	`305`	`}`
`306`	`306`	`public visitVariableStatement(node: ts.VariableStatement): ts.VisitResult<ts.VariableStatement> {`
	`307`	`+ // TODO maybe flag as gglobal/local here somehow?`
	`308`	`+ if (!this.isModule && !this.currentNamespace) {`
	`309`	`+ return ts.updateVariableStatement(`
	`310`	`+ node, [ts.createModifier(ts.SyntaxKind.StaticKeyword)], node.declarationList);`
	`311`	`+ }`
`307`	`312`	`return node;`
`308`	`313`	`}`
`309`	`314`	`public visitExpressionStatement(node: ts.ExpressionStatement): ts.VisitResult<ts.ExpressionStatement> {`