Added handling for variables in block scope, addressed some PR feedback

Perryvw · Perryvw · commit 22a871d04789 · 2020-01-09T22:39:46.000+01:00
diff --git a/src/transformation/utils/lua-ast.ts b/src/transformation/utils/lua-ast.ts
@@ -143,8 +143,9 @@ export function createLocalOrExportedOrGlobalDeclaration(
         }
     } else {
         const insideFunction = findScope(context, ScopeType.Function) !== undefined;
+        const insideBlock = findScope(context, ScopeType.Block) !== undefined;
 
-        if (context.isModule || getCurrentNamespace(context) || insideFunction) {
+        if (context.isModule || getCurrentNamespace(context) || insideFunction || insideBlock) {
             const scope = peekScope(context);
 
             const isPossibleWrappedFunction =
diff --git a/test/translation/__snapshots__/transformation.spec.ts.snap b/test/translation/__snapshots__/transformation.spec.ts.snap
@@ -1,5 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Transformation (blockScopeVariables) 1`] = `
+"do
+    local a = 1
+    local b = 1
+    local ____ = {c = 1}
+    local c = ____.c
+end"
+`;
+
 exports[`Transformation (characterEscapeSequence) 1`] = `
 "quoteInDoubleQuotes = \\"' ' '\\"
 quoteInTemplateString = \\"' ' '\\"
diff --git a/test/translation/transformation/blockScopeVariables.ts b/test/translation/transformation/blockScopeVariables.ts
@@ -0,0 +1,5 @@
+{
+    const a = 1;
+    const [b] = [1];
+    const { c } = { c: 1 };
+}
diff --git a/test/unit/assignments.spec.ts b/test/unit/assignments.spec.ts
@@ -10,14 +10,12 @@ test("let declaration", () => {
     expect(lua).toContain(`local foo = true`);
 });
 
-test("const declaration top-level is global", () => {
-    const lua = util.testModule`const foo = true;`.getMainLuaCodeChunk();
-    expect(lua).toBe(`foo = true`);
-});
-
-test("let declaration top-level is global", () => {
-    const lua = util.testModule`let foo = true;`.getMainLuaCodeChunk();
-    expect(lua).toBe(`foo = true`);
+test.each(["const", "let"])("%s declaration top-level is global", declarationKind => {
+    util.testModule`
+        ${declarationKind} foo = true;
+        // @ts-ignore
+        return (globalThis as any).foo;
+    `.expectToEqual(true);
 });
 
 test("var declaration is disallowed", () => {
diff --git a/test/unit/objectLiteral.spec.ts b/test/unit/objectLiteral.spec.ts
@@ -22,18 +22,14 @@ describe("property shorthand", () => {
     });
 
     test.each([NaN, Infinity])("should support %p shorthand", identifier => {
-        util.testFunction`return ({ ${identifier} }).${identifier}`.expectToMatchJsResult();
+        util.testExpression`({ ${identifier} }).${identifier}`.expectToMatchJsResult();
     });
 
     test("should support _G shorthand", () => {
-        const luaResult = util.testFunction`
-            return ({ _G })._G.foobar;
-        `
+        util.testExpression`({ _G })._G.foobar`
             .setTsHeader(`declare const _G: any;`)
             .setLuaHeader(`foobar = "foobar"`)
-            .getLuaExecutionResult();
-
-        expect(luaResult).toEqual("foobar");
+            .expectToEqual("foobar");
     });
 
     test("should support export property shorthand", () => {
@@ -55,6 +51,6 @@ test("undefined as object key", () => {
 test.each([`({x: "foobar"}.x)`, `({x: "foobar"}["x"])`, `({x: () => "foobar"}.x())`, `({x: () => "foobar"}["x"]())`])(
     "object literal property access (%p)",
     expression => {
-        util.testFunction`return ${expression}`.expectToMatchJsResult();
+        util.testExpression(expression).expectToMatchJsResult();
     }
 );

Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,9 @@ export function createLocalOrExportedOrGlobalDeclaration(`
`143`	`143`	`}`
`144`	`144`	`} else {`
`145`	`145`	`const insideFunction = findScope(context, ScopeType.Function) !== undefined;`
	`146`	`+ const insideBlock = findScope(context, ScopeType.Block) !== undefined;`
`146`	`147`
`147`		`- if (context.isModule \|\| getCurrentNamespace(context) \|\| insideFunction) {`
	`148`	`+ if (context.isModule \|\| getCurrentNamespace(context) \|\| insideFunction \|\| insideBlock) {`
`148`	`149`	`const scope = peekScope(context);`
`149`	`150`
`150`	`151`	`const isPossibleWrappedFunction =`