X Tutup
Skip to content

Fix delete operator #1160

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 3 commits into from
Nov 9, 2021
Merged

Fix delete operator #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d07868f
Fix delete operator
GlassBricks Nov 7, 2021
0973900
Fix delete test formatting
GlassBricks Nov 8, 2021
dd552fe
strict mode on object delete test
GlassBricks Nov 8, 2021
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
2 changes: 1 addition & 1 deletion src/LuaLib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const luaLibDependencies: Partial<Record<LuaLibFeature, LuaLibFeature[]>> = {
Await: [LuaLibFeature.InstanceOf, LuaLibFeature.New],
Decorate: [LuaLibFeature.ObjectGetOwnPropertyDescriptor, LuaLibFeature.SetDescriptor, LuaLibFeature.ObjectAssign],
DelegatedYield: [LuaLibFeature.StringAccess],
Delete: [LuaLibFeature.ObjectGetOwnPropertyDescriptors],
Delete: [LuaLibFeature.ObjectGetOwnPropertyDescriptors, LuaLibFeature.Error, LuaLibFeature.New],
Error: [LuaLibFeature.Class, LuaLibFeature.ClassExtends, LuaLibFeature.New],
FunctionBind: [LuaLibFeature.Unpack],
Generator: [LuaLibFeature.Symbol],
Expand Down
10 changes: 3 additions & 7 deletions src/lualib/Delete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@ function __TS__Delete(this: void, target: any, key: any): boolean {
const descriptor = descriptors[key];
if (descriptor) {
if (!descriptor.configurable) {
throw `Cannot delete property ${key} of ${target}.`;
throw new TypeError(`Cannot delete property ${key} of ${target}.`);
}

descriptors[key] = undefined;
return true;
}

if (target[key] !== undefined) {
target[key] = undefined;
return true;
}

return false;
target[key] = undefined;
return true;
}
39 changes: 31 additions & 8 deletions test/unit/builtins/object.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,22 +222,45 @@ describe("delete from object", () => {
test("delete from object", () => {
util.testFunction`
const obj = { foo: "bar", bar: "baz" };
delete obj["foo"];
return obj;
`
.setTsHeader("declare function setmetatable<T extends object>(this: void, table: T, metatable: any): T;")
.expectToEqual({ bar: "baz" });
return [delete obj["foo"], obj];
`.expectToMatchJsResult();
});

test("delete nonexistent property", () => {
util.testFunction`
const obj = {} as any
return [delete obj["foo"], obj];
`.expectToMatchJsResult();
});

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/993
test("delete from object with metatable", () => {
util.testFunction`
const obj = { foo: "bar", bar: "baz" };
setmetatable(obj, {});
delete obj["foo"];
return obj;
return [delete obj["foo"], obj];
`
.setTsHeader("declare function setmetatable<T extends object>(this: void, table: T, metatable: any): T;")
.expectToEqual({ bar: "baz" });
.expectToEqual([true, { bar: "baz" }]);
});

test("delete nonconfigurable own property", () => {
util.testFunction`
const obj = {} as any
Object.defineProperty(obj, "foo", {
configurable: false,
value: true
})
try {
delete obj["foo"]
return "deleted"
} catch (e) {
return e instanceof TypeError
}
`
.setOptions({
strict: true,
})
.expectToMatchJsResult();
});
});
X Tutup