Skip to content

Support for new ecmascript Set methods #1563

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 1 commit into from
Jun 23, 2024
Merged

Support for new ecmascript Set methods #1563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 86 additions & 0 deletions src/lualib/Set.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,90 @@ export class Set<T extends AnyNotNil> {
},
};
}

/**
* @returns a new Set containing all the elements in this Set and also all the elements in the argument.
*/
public union(other: ReadonlySet<T>): Set<T> {
const result = new Set<T>(this);
for (const item of other) {
result.add(item);
}
return result;
}

/**
* @returns a new Set containing all the elements which are both in this Set and in the argument.
*/
public intersection(other: ReadonlySet<T>) {
const result = new Set<T>();
for (const item of this) {
if (other.has(item)) {
result.add(item);
}
}
return result;
}

/**
* @returns a new Set containing all the elements in this Set which are not also in the argument.
*/
public difference(other: ReadonlySet<T>): Set<T> {
const result = new Set<T>(this);
for (const item of other) {
result.delete(item);
}
return result;
}

/**
* @returns a new Set containing all the elements which are in either this Set or in the argument, but not in both.
*/
public symmetricDifference(other: ReadonlySet<T>): Set<T> {
const result = new Set<T>(this);
for (const item of other) {
if (this.has(item)) {
result.delete(item);
} else {
result.add(item);
}
}
return result;
}

/**
* @returns a boolean indicating whether all the elements in this Set are also in the argument.
*/
public isSubsetOf(other: ReadonlySet<unknown>): boolean {
for (const item of this) {
if (!other.has(item)) {
return false;
}
}
return true;
}

/**
* @returns a boolean indicating whether all the elements in the argument are also in this Set.
*/
public isSupersetOf(other: ReadonlySet<unknown>): boolean {
for (const item of other) {
if (!this.has(item as T)) {
return false;
}
}
return true;
}

/**
* @returns a boolean indicating whether this Set has no elements in common with the argument.
*/
public isDisjointFrom(other: ReadonlySetLike<unknown>): boolean {
for (const item of this) {
if (other.has(item)) {
return false;
}
}
return true;
}
}
218 changes: 218 additions & 0 deletions test/unit/builtins/set.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,221 @@ test("instanceof Set without creating set", () => {
return myset instanceof Set;
`.expectToMatchJsResult();
});

describe("new ECMAScript Set methods", () => {
test("union", () => {
util.testFunction`
const set1 = new Set([1,2,3,4,5,6]);
const set2 = new Set([4,5,6,7,8,9]);

const intersection = set1.union(set2);
return [...intersection];
`.expectToEqual([1, 2, 3, 4, 5, 6, 7, 8, 9]);
});

test("union with empty sets", () => {
util.testFunction`
const set1 = new Set([1,2,3,4,5,6]);
const set2 = new Set([]);

const intersection = set1.union(set2);
return [...intersection];
`.expectToEqual([1, 2, 3, 4, 5, 6]);

util.testFunction`
const set1 = new Set([]);
const set2 = new Set([4,5,6,7,8,9]);

const intersection = set1.union(set2);
return [...intersection];
`.expectToEqual([4, 5, 6, 7, 8, 9]);
});

test("intersection", () => {
util.testFunction`
const set1 = new Set([1,2,3,4,5,6]);
const set2 = new Set([4,5,6,7,8,9]);

const intersection = set1.intersection(set2);
return [...intersection];
`.expectToEqual([4, 5, 6]);
});

test("intersection with empty sets", () => {
util.testFunction`
const set1 = new Set([1,2,3,4,5,6]);
const set2 = new Set([]);

const intersection = set1.intersection(set2);
return [...intersection];
`.expectToEqual([]);

util.testFunction`
const set1 = new Set([]);
const set2 = new Set([4,5,6,7,8,9]);

const intersection = set1.intersection(set2);
return [...intersection];
`.expectToEqual([]);
});

test("difference", () => {
util.testFunction`
const set1 = new Set([1,2,3,4,5,6]);
const set2 = new Set([4,5,6,7,8,9]);

const intersection = set1.difference(set2);
return [...intersection];
`.expectToEqual([1, 2, 3]);
});

test("symmetricDifference", () => {
util.testFunction`
const set1 = new Set([1,2,3,4,5,6]);
const set2 = new Set([4,5,6,7,8,9]);

const intersection = set1.symmetricDifference(set2);
return [...intersection];
`.expectToEqual([1, 2, 3, 7, 8, 9]);
});

test("isSubsetOf", () => {
util.testFunction`
const set1 = new Set([3,4,5,6]);
const set2 = new Set([1,2,3,4,5,6,7,8,9]);

return {
set1SubsetOfSet2: set1.isSubsetOf(set2),
set2SubsetOfSet1: set2.isSubsetOf(set1),
};
`.expectToEqual({
set1SubsetOfSet2: true,
set2SubsetOfSet1: false,
});
});

test("isSubsetOf equal", () => {
util.testFunction`
const set1 = new Set([1,2,3,4,5,6,7,8,9]);
const set2 = new Set([1,2,3,4,5,6,7,8,9]);

return {
set1SubsetOfSet2: set1.isSubsetOf(set2),
set2SubsetOfSet1: set2.isSubsetOf(set1),
};
`.expectToEqual({
set1SubsetOfSet2: true,
set2SubsetOfSet1: true,
});
});

test("isSubsetOf empty", () => {
util.testFunction`
const set1 = new Set([]);
const set2 = new Set([1,2,3]);

return {
set1SubsetOfSet2: set1.isSubsetOf(set2),
set2SubsetOfSet1: set2.isSubsetOf(set1),
};
`.expectToEqual({
set1SubsetOfSet2: true,
set2SubsetOfSet1: false,
});
});

test("isSupersetOf", () => {
util.testFunction`
const set1 = new Set([3,4,5,6]);
const set2 = new Set([1,2,3,4,5,6,7,8,9]);

return {
set1SupersetOfSet2: set1.isSupersetOf(set2),
set2SupersetOfSet1: set2.isSupersetOf(set1),
};
`.expectToEqual({
set1SupersetOfSet2: false,
set2SupersetOfSet1: true,
});
});

test("isSupersetOf equal", () => {
util.testFunction`
const set1 = new Set([1,2,3,4,5,6,7,8,9]);
const set2 = new Set([1,2,3,4,5,6,7,8,9]);

return {
set1SupersetOfSet2: set1.isSupersetOf(set2),
set2SupersetOfSet1: set2.isSupersetOf(set1),
};
`.expectToEqual({
set1SupersetOfSet2: true,
set2SupersetOfSet1: true,
});
});

test("isSupersetOf empty", () => {
util.testFunction`
const set1 = new Set([]);
const set2 = new Set([1,2,3]);

return {
set1SupersetOfSet2: set1.isSupersetOf(set2),
set2SupersetOfSet1: set2.isSupersetOf(set1),
};
`.expectToEqual({
set1SupersetOfSet2: false,
set2SupersetOfSet1: true,
});
});

test("isDisjointFrom", () => {
util.testFunction`
const set1 = new Set([3,4,5,6]);
const set2 = new Set([7,8,9]);
const set3 = new Set([1,2,3,4]);

return {
set1DisjointFromSet2: set1.isDisjointFrom(set2),
set2DisjointFromSet1: set2.isDisjointFrom(set1),
set1DisjointFromSet3: set1.isDisjointFrom(set3),
set3DisjointFromSet1: set3.isDisjointFrom(set1),
};
`.expectToEqual({
set1DisjointFromSet2: true,
set2DisjointFromSet1: true,
set1DisjointFromSet3: false,
set3DisjointFromSet1: false,
});
});

test("isDisjointFrom equal", () => {
util.testFunction`
const set1 = new Set([1,2,3,4,5,6,7,8,9]);
const set2 = new Set([1,2,3,4,5,6,7,8,9]);

return {
set1DisjointFromSet2: set1.isDisjointFrom(set2),
set2DisjointFromSet1: set2.isDisjointFrom(set1),
};
`.expectToEqual({
set1DisjointFromSet2: false,
set2DisjointFromSet1: false,
});
});

test("isDisjointFrom empty", () => {
util.testFunction`
const set1 = new Set([]);
const set2 = new Set([1,2,3]);

return {
set1DisjointFromSet2: set1.isDisjointFrom(set2),
set2DisjointFromSet1: set2.isDisjointFrom(set1),
};
`.expectToEqual({
set1DisjointFromSet2: true,
set2DisjointFromSet1: true,
});
});
});