Refactor Set introducing a new static factory and put the main constructor private

Author: widoz

sources/client/src/api/search-entities.ts

@@ -54,7 +54,7 @@ export async function searchEntities<E>(
 		throw error;
 	});
 
-	return new Set(entities);
+	return Set.new(entities);
 }
 
 function serializeFields(fields: EntitiesSearch.SearchQueryFields): string {

sources/client/src/components/composite-entities-by-kind.tsx

@@ -32,7 +32,7 @@ export function CompositeEntitiesByKind<E, K>(
 		if (entities.length() <= 0) {
 			dispatch({
 				type: 'UPDATE_SELECTED_ENTITIES_OPTIONS',
-				selectedEntitiesOptions: new Set(),
+				selectedEntitiesOptions: Set.new(),
 			});
 			return;
 		}
@@ -45,8 +45,8 @@ export function CompositeEntitiesByKind<E, K>(
 			}),
 		])
 			.then((result) => {
-				const currentEntitiesOptions = result[0] ?? new Set();
-				const selectedEntitiesOptions = result[1] ?? new Set();
+				const currentEntitiesOptions = result[0] ?? Set.new();
+				const selectedEntitiesOptions = result[1] ?? Set.new();
 
 				dispatch({
 					type: 'UPDATE_SELECTED_ENTITIES_OPTIONS',
@@ -63,8 +63,8 @@ export function CompositeEntitiesByKind<E, K>(
 	};
 
 	const onChangeKind = (kind: EntitiesSearch.Kind<K>) => {
-		const _kind = kind instanceof Set ? kind : new Set([kind]);
-		const emptySet = new Set<any>();
+		const _kind = kind instanceof Set ? kind : Set.new([kind]);
+		const emptySet = Set.new<any>();
 
 		props.kind.onChange(_kind);
 		props.entities.onChange(emptySet);

sources/client/src/components/plural-select-control.tsx

@@ -19,7 +19,7 @@ export function PluralSelectControl(
 
 	const onChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
 		if (event.target.selectedOptions.length <= 0) {
-			props.onChange(new Set());
+			props.onChange(Set.new());
 		}
 
 		const selectedOptions = Array.from(event.target.selectedOptions).map(

sources/client/src/hooks/use-entities-options-storage.ts

@@ -39,8 +39,8 @@ export function useEntitiesOptionsStorage<E, K>(
 				: undefined,
 		])
 			.then((result) => {
-				const currentEntitiesOptions = result[0] ?? new Set();
-				const selectedEntitiesOptions = result[1] ?? new Set();
+				const currentEntitiesOptions = result[0] ?? Set.new();
+				const selectedEntitiesOptions = result[1] ?? Set.new();
 
 				dispatch({
 					type: 'UPDATE_SELECTED_ENTITIES_OPTIONS',

sources/client/src/hooks/use-entity-records.ts

@@ -29,7 +29,7 @@ export function useEntityRecords<Entity>(
 	const status = entities.status as any as ResolveStatus;
 
 	return Object.freeze({
-		records: () => new Set(entities.records ?? []),
+		records: () => Set.new(entities.records ?? []),
 		isResolving: () =>
 			entities.isResolving &&
 			!entities.hasResolved &&

sources/client/src/hooks/use-search.ts

@@ -30,7 +30,7 @@ export function useSearch<E, K>(
 				)
 				.catch((error) => {
 					doAction('wp-entities-search.on-search.error', error);
-					const emptySet = new Set<EntitiesSearch.ControlOption<E>>();
+					const emptySet = Set.new<EntitiesSearch.ControlOption<E>>();
 					dispatch({
 						type: 'UPDATE_CURRENT_ENTITIES_OPTIONS',
 						currentEntitiesOptions: emptySet,

sources/client/src/storage/entities/initial-state.ts

@@ -8,11 +8,11 @@ export function makeInitialState<E, K>(
 	initialState: Partial<EntitiesSearch.EntitiesState<E, K>>
 ): EntitiesSearch.EntitiesState<E, K> {
 	return {
-		entities: new Set<E>([]),
-		kind: new Set<K>([]),
-		contextualEntitiesOptions: new Set<Options<E>>(),
-		currentEntitiesOptions: new Set<Options<E>>(),
-		selectedEntitiesOptions: new Set<Options<E>>(),
+		entities: Set.new<E>([]),
+		kind: Set.new<K>([]),
+		contextualEntitiesOptions: Set.new<Options<E>>(),
+		currentEntitiesOptions: Set.new<Options<E>>(),
+		selectedEntitiesOptions: Set.new<Options<E>>(),
 		searchPhrase: '',
 		...initialState,
 	};

sources/client/src/storage/entities/reducer.ts

@@ -43,18 +43,18 @@ export function reducer<E, K>(
 		case 'CLEAN_ENTITIES_OPTIONS':
 			return {
 				...state,
-				selectedEntitiesOptions: new Set(),
-				contextualEntitiesOptions: new Set(),
-				currentEntitiesOptions: new Set(),
+				selectedEntitiesOptions: Set.new(),
+				contextualEntitiesOptions: Set.new(),
+				currentEntitiesOptions: Set.new(),
 			};
 
 		case 'UPDATE_ENTITIES_OPTIONS_FOR_NEW_KIND':
 			return {
 				...state,
 				contextualEntitiesOptions: action.entitiesOptions,
 				currentEntitiesOptions: action.entitiesOptions,
-				selectedEntitiesOptions: new Set(),
-				entities: new Set(),
+				selectedEntitiesOptions: Set.new(),
+				entities: Set.new(),
 				kind: action.kind,
 			};
 

sources/client/src/utils/order-selected-options-at-the-top.ts

@@ -13,8 +13,8 @@ export function orderSelectedOptionsAtTheTop<V>(
 		return options;
 	}
 
-	let _collection = new Set<EntitiesSearch.ControlOption<V>>();
-	let _options = new Set<EntitiesSearch.ControlOption<V>>();
+	let _collection = Set.new<EntitiesSearch.ControlOption<V>>();
+	let _options = Set.new<EntitiesSearch.ControlOption<V>>();
 
 	options.forEach((option) => {
 		if (collection.has(option.value)) {

sources/client/src/utils/unique-control-options.ts

@@ -6,7 +6,7 @@ import { Set } from '../vo/set';
 export function uniqueControlOptions<V>(
 	set: Set<EntitiesSearch.ControlOption<V>>
 ): Set<EntitiesSearch.ControlOption<V>> {
-	let uniqueOptions = new Set<EntitiesSearch.ControlOption<V>>();
+	let uniqueOptions = Set.new<EntitiesSearch.ControlOption<V>>();
 	const temp: Array<EntitiesSearch.ControlOption<V>['value']> = [];
 
 	for (const option of set) {