X Tutup
Skip to content

Spread LuaPairsIterable and LuaPairsKeysIterable #1409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 2 commits into from
Feb 26, 2023
Merged

Spread LuaPairsIterable and LuaPairsKeysIterable #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb1f123
Spread LuaPairsIterable and LuaPairsKeysIterable
Perryvw Feb 25, 2023
00c3d63
Use expect.toContainEqual in tests
Perryvw Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/transformation/visitors/spread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import * as ts from "typescript";
import { LuaTarget } from "../../CompilerOptions";
import * as lua from "../../LuaAST";
import { assertNever } from "../../utils";
import { FunctionVisitor, TransformationContext } from "../context";
import { isLuaIterable } from "../utils/language-extensions";
import { getIterableExtensionKindForNode, IterableExtensionKind } from "../utils/language-extensions";
import { createUnpackCall } from "../utils/lua-ast";
import { LuaLibFeature, transformLuaLibFunction } from "../utils/lualib";
import {
Expand Down Expand Up @@ -76,11 +77,22 @@ export const transformSpreadElement: FunctionVisitor<ts.SpreadElement> = (node,
const innerExpression = context.transformExpression(node.expression);
if (isMultiReturnCall(context, tsInnerExpression)) return innerExpression;

const type = context.checker.getTypeAtLocation(node.expression); // not ts-inner expression, in case of casts
if (isLuaIterable(context, type)) {
return transformLuaLibFunction(context, LuaLibFeature.LuaIteratorSpread, node, innerExpression);
const iterableExtensionType = getIterableExtensionKindForNode(context, node.expression);
if (iterableExtensionType) {
if (iterableExtensionType === IterableExtensionKind.Iterable) {
return transformLuaLibFunction(context, LuaLibFeature.LuaIteratorSpread, node, innerExpression);
} else if (iterableExtensionType === IterableExtensionKind.Pairs) {
const objectEntries = transformLuaLibFunction(context, LuaLibFeature.ObjectEntries, node, innerExpression);
return createUnpackCall(context, objectEntries, node);
} else if (iterableExtensionType === IterableExtensionKind.PairsKey) {
const objectKeys = transformLuaLibFunction(context, LuaLibFeature.ObjectKeys, node, innerExpression);
return createUnpackCall(context, objectKeys, node);
} else {
assertNever(iterableExtensionType);
}
}

const type = context.checker.getTypeAtLocation(node.expression); // not ts-inner expression, in case of casts
if (isArrayType(context, type)) {
return createUnpackCall(context, innerExpression, node);
}
Expand Down
40 changes: 37 additions & 3 deletions test/unit/spread.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ test.each(["pairs", "ipairs"])("can spread %s (#1244)", func => {
});

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1244
test.each(["LuaTable", "LuaMap"])("can spread %s (#1244)", type => {
test.each(["LuaTable", "LuaMap"])("can spread %s with pairs (#1244)", type => {
const result: Array<[string, string]> = util.testFunction`
const tbl = new ${type}();
tbl.set("foo", "bar");
Expand All @@ -524,6 +524,40 @@ test.each(["LuaTable", "LuaMap"])("can spread %s (#1244)", type => {

// We don't know the order so match like this
expect(result).toHaveLength(2);
expect(result.some(([k, v]) => k === "foo" && v === "bar")).toBe(true);
expect(result.some(([k, v]) => k === "fizz" && v === "buzz")).toBe(true);
expect(result).toContainEqual(["foo", "bar"]);
expect(result).toContainEqual(["fizz", "buzz"]);
});

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1384
test.each(["LuaTable", "LuaMap"])("can spread %s (#1384)", type => {
const result: Array<[string, string]> = util.testFunction`
const tbl = new ${type}();
tbl.set("foo", "bar");
tbl.set("fizz", "buzz");
return [...tbl];
`
.withLanguageExtensions()
.getLuaExecutionResult();

// We don't know the order so match like this
expect(result).toHaveLength(2);
expect(result).toContainEqual(["foo", "bar"]);
expect(result).toContainEqual(["fizz", "buzz"]);
});

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1384
test("can spread LuaSet (#1384)", () => {
const result: Array<[string, string]> = util.testFunction`
const tbl = new LuaSet();
tbl.add("foo");
tbl.add("bar");
return [...tbl];
`
.withLanguageExtensions()
.getLuaExecutionResult();

// We don't know the order so match like this
expect(result).toHaveLength(2);
expect(result).toContain("foo");
expect(result).toContain("bar");
});
X Tutup