happy-dom 14.3.2 → 14.3.4

package/src/nodes/element/{Dataset.ts → DatasetFactory.ts}

@@ -1,42 +1,39 @@
 import Element from './Element.js';
 import * as PropertySymbol from '../../PropertySymbol.js';
 import HTMLElementNamedNodeMap from '../html-element/HTMLElementNamedNodeMap.js';
+import DatasetUtility from './DatasetUtility.js';
+import IDataset from './IDataset.js';
 
 /**
- * Storage type for a dataset proxy.
- */
-type DatasetRecord = Record<string, string>;
-
-/**
- * Dataset helper proxy.
+ * Dataset factory.
  *
  * Reference:
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/dataset
  */
-export default class Dataset {
-	public readonly proxy: DatasetRecord;
-
+export default class DatasetFactory {
 	/**
 	 * @param element The parent element.
 	 */
-	constructor(element: Element) {
+	public static createDataset(element: Element): IDataset {
 		// Build the initial dataset record from all data attributes.
-		const dataset: DatasetRecord = {};
+		const dataset: IDataset = {};
 
 		for (let i = 0, max = element[PropertySymbol.attributes].length; i < max; i++) {
 			const attribute = element[PropertySymbol.attributes][i];
 			if (attribute[PropertySymbol.name].startsWith('data-')) {
-				const key = Dataset.kebabToCamelCase(attribute[PropertySymbol.name].replace('data-', ''));
+				const key = DatasetUtility.kebabToCamelCase(
+					attribute[PropertySymbol.name].replace('data-', '')
+				);
 				dataset[key] = attribute[PropertySymbol.value];
 			}
 		}
 
 		// Documentation for Proxy:
 		// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy
-		this.proxy = new Proxy(dataset, {
-			get(dataset: DatasetRecord, key: string): string {
+		return new Proxy(dataset, {
+			get(dataset: IDataset, key: string): string {
 				const attribute = element[PropertySymbol.attributes].getNamedItem(
-					'data-' + Dataset.camelCaseToKebab(key)
+					'data-' + DatasetUtility.camelCaseToKebab(key)
 				);
 				if (attribute) {
 					return (dataset[key] = attribute[PropertySymbol.value]);
@@ -44,18 +41,18 @@ export default class Dataset {
 				delete dataset[key];
 				return undefined;
 			},
-			set(dataset: DatasetRecord, key: string, value: string): boolean {
-				element.setAttribute('data-' + Dataset.camelCaseToKebab(key), value);
+			set(dataset: IDataset, key: string, value: string): boolean {
+				element.setAttribute('data-' + DatasetUtility.camelCaseToKebab(key), value);
 				dataset[key] = value;
 				return true;
 			},
-			deleteProperty(dataset: DatasetRecord, key: string): boolean {
+			deleteProperty(dataset: IDataset, key: string): boolean {
 				(<HTMLElementNamedNodeMap>element[PropertySymbol.attributes])[
 					PropertySymbol.removeNamedItem
-				]('data-' + Dataset.camelCaseToKebab(key));
+				]('data-' + DatasetUtility.camelCaseToKebab(key));
 				return delete dataset[key];
 			},
-			ownKeys(dataset: DatasetRecord): string[] {
+			ownKeys(dataset: IDataset): string[] {
 				// According to Mozilla we have to update the dataset object (target) to contain the same keys as what we return:
 				// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy/Proxy/ownKeys
 				// "The result List must contain the keys of all non-configurable own properties of the target object."
@@ -64,7 +61,7 @@ export default class Dataset {
 				for (let i = 0, max = element[PropertySymbol.attributes].length; i < max; i++) {
 					const attribute = element[PropertySymbol.attributes][i];
 					if (attribute[PropertySymbol.name].startsWith('data-')) {
-						const key = Dataset.kebabToCamelCase(
+						const key = DatasetUtility.kebabToCamelCase(
 							attribute[PropertySymbol.name].replace('data-', '')
 						);
 						keys.push(key);
@@ -79,37 +76,11 @@ export default class Dataset {
 				}
 				return keys;
 			},
-			has(_dataset: DatasetRecord, key: string): boolean {
+			has(_dataset: IDataset, key: string): boolean {
 				return !!element[PropertySymbol.attributes].getNamedItem(
-					'data-' + Dataset.camelCaseToKebab(key)
+					'data-' + DatasetUtility.camelCaseToKebab(key)
 				);
 			}
 		});
 	}
-
-	/**
-	 * Transforms a kebab cased string to camel case.
-	 *
-	 * @param text Text string.
-	 * @returns Camel cased string.
-	 */
-	public static kebabToCamelCase(text: string): string {
-		const parts = text.split('-');
-		for (let i = 0, max = parts.length; i < max; i++) {
-			parts[i] = i > 0 ? parts[i].charAt(0).toUpperCase() + parts[i].slice(1) : parts[i];
-		}
-		return parts.join('');
-	}
-
-	/**
-	 * Transforms a camel cased string to kebab case.
-	 *
-	 * @param text Text string.
-	 * @returns Kebab cased string.
-	 */
-	public static camelCaseToKebab(text: string): string {
-		return text
-			.toString()
-			.replace(/[A-Z]+(?![a-z])|[A-Z]/g, ($, ofs) => (ofs ? '-' : '') + $.toLowerCase());
-	}
 }

package/src/nodes/element/DatasetUtility.ts

@@ -0,0 +1,33 @@
+/**
+ * Dataset utility.
+ *
+ * Reference:
+ * https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/dataset
+ */
+export default class DatasetUtility {
+	/**
+	 * Transforms a kebab cased string to camel case.
+	 *
+	 * @param text Text string.
+	 * @returns Camel cased string.
+	 */
+	public static kebabToCamelCase(text: string): string {
+		const parts = text.split('-');
+		for (let i = 0, max = parts.length; i < max; i++) {
+			parts[i] = i > 0 ? parts[i].charAt(0).toUpperCase() + parts[i].slice(1) : parts[i];
+		}
+		return parts.join('');
+	}
+
+	/**
+	 * Transforms a camel cased string to kebab case.
+	 *
+	 * @param text Text string.
+	 * @returns Kebab cased string.
+	 */
+	public static camelCaseToKebab(text: string): string {
+		return text
+			.toString()
+			.replace(/[A-Z]+(?![a-z])|[A-Z]/g, ($, ofs) => (ofs ? '-' : '') + $.toLowerCase());
+	}
+}

package/src/nodes/element/Element.ts

@@ -851,7 +851,7 @@ export default class Element
 	 * @returns "true" if matching.
 	 */
 	public matches(selector: string): boolean {
-		return !!QuerySelector.match(this, selector);
+		return !!QuerySelector.matches(this, selector);
 	}
 
 	/**
@@ -865,7 +865,7 @@ export default class Element
 		let parent: Element = this;
 
 		while (parent) {
-			if (QuerySelector.match(parent, selector)) {
+			if (QuerySelector.matches(parent, selector)) {
 				return parent;
 			}
 			parent = parent.parentElement;

package/src/nodes/element/IDataset.ts

@@ -0,0 +1,3 @@
+export default interface IDataset {
+	[key: string]: string;
+}

package/src/nodes/html-element/HTMLElement.ts

@@ -2,7 +2,6 @@ import Element from '../element/Element.js';
 import * as PropertySymbol from '../../PropertySymbol.js';
 import CSSStyleDeclaration from '../../css/declaration/CSSStyleDeclaration.js';
 import PointerEvent from '../../event/events/PointerEvent.js';
-import Dataset from '../element/Dataset.js';
 import NodeTypeEnum from '../node/NodeTypeEnum.js';
 import DOMException from '../../exception/DOMException.js';
 import Event from '../../event/Event.js';
@@ -12,6 +11,8 @@ import HTMLElementNamedNodeMap from './HTMLElementNamedNodeMap.js';
 import NodeList from '../node/NodeList.js';
 import Node from '../node/Node.js';
 import HTMLCollection from '../element/HTMLCollection.js';
+import DatasetFactory from '../element/DatasetFactory.js';
+import IDataset from '../element/IDataset.js';
 
 /**
  * HTML Element.
@@ -63,7 +64,7 @@ export default class HTMLElement extends Element {
 	public [PropertySymbol.style]: CSSStyleDeclaration = null;
 
 	// Private properties
-	#dataset: Dataset = null;
+	#dataset: IDataset = null;
 	#customElementDefineCallback: () => void = null;
 
 	/**
@@ -353,8 +354,8 @@ export default class HTMLElement extends Element {
 	 *
 	 * @returns Data set.
 	 */
-	public get dataset(): { [key: string]: string } {
-		return (this.#dataset ??= new Dataset(this)).proxy;
+	public get dataset(): IDataset {
+		return (this.#dataset ??= DatasetFactory.createDataset(this));
 	}
 
 	/**

package/src/nodes/html-iframe-element/HTMLIFrameElementPageLoader.ts

@@ -76,7 +76,7 @@ export default class HTMLIFrameElementPageLoader {
 		const parentWindow = isSameOrigin ? window : new CrossOriginBrowserWindow(window);
 
 		this.#browserIFrame =
-			this.#browserIFrame ?? BrowserFrameFactory.newChildFrame(this.#browserParentFrame);
+			this.#browserIFrame ?? BrowserFrameFactory.createChildFrame(this.#browserParentFrame);
 
 		(<BrowserWindow | CrossOriginBrowserWindow>(<unknown>this.#browserIFrame.window.top)) =
 			parentWindow;

package/src/nodes/svg-element/SVGElement.ts

@@ -3,10 +3,11 @@ import * as PropertySymbol from '../../PropertySymbol.js';
 import Element from '../element/Element.js';
 import SVGSVGElement from './SVGSVGElement.js';
 import Event from '../../event/Event.js';
-import Dataset from '../element/Dataset.js';
 import HTMLElementUtility from '../html-element/HTMLElementUtility.js';
 import NamedNodeMap from '../../named-node-map/NamedNodeMap.js';
 import SVGElementNamedNodeMap from './SVGElementNamedNodeMap.js';
+import DatasetFactory from '../element/DatasetFactory.js';
+import IDataset from '../element/IDataset.js';
 
 /**
  * SVG Element.
@@ -28,7 +29,7 @@ export default class SVGElement extends Element {
 	public [PropertySymbol.style]: CSSStyleDeclaration | null = null;
 
 	// Private properties
-	#dataset: Dataset = null;
+	#dataset: IDataset = null;
 
 	/**
 	 * Returns viewport.
@@ -61,8 +62,8 @@ export default class SVGElement extends Element {
 	 *
 	 * @returns Data set.
 	 */
-	public get dataset(): { [key: string]: string } {
-		return (this.#dataset ??= new Dataset(this)).proxy;
+	public get dataset(): IDataset {
+		return (this.#dataset ??= DatasetFactory.createDataset(this));
 	}
 
 	/**

package/src/query-selector/QuerySelector.ts

@@ -198,9 +198,15 @@ export default class QuerySelector {
 	 *
 	 * @param element Element to match.
 	 * @param selector Selector to match with.
+	 * @param [options] Options.
+	 * @param [options.ignoreErrors] Ignores errors.
 	 * @returns Result.
 	 */
-	public static match(element: Element, selector: string): ISelectorMatch | null {
+	public static matches(
+		element: Element,
+		selector: string,
+		options?: { ignoreErrors?: boolean }
+	): ISelectorMatch | null {
 		if (!selector) {
 			return null;
 		}
@@ -211,14 +217,19 @@ export default class QuerySelector {
 			};
 		}
 
+		const ignoreErrors = options?.ignoreErrors;
+
 		if (INVALID_SELECTOR_REGEXP.test(selector)) {
+			if (ignoreErrors) {
+				return null;
+			}
 			throw new Error(
-				`Failed to execute 'match' on '${element.constructor.name}': '${selector}' is not a valid selector.`
+				`Failed to execute 'matches' on '${element.constructor.name}': '${selector}' is not a valid selector.`
 			);
 		}
 
-		for (const items of SelectorParser.getSelectorGroups(selector)) {
-			const result = this.matchSelector(element, element, items.reverse());
+		for (const items of SelectorParser.getSelectorGroups(selector, options)) {
+			const result = this.matchSelector(element, element, items.reverse(), 0);
 
 			if (result) {
 				return result;

package/src/query-selector/SelectorItem.ts

@@ -18,6 +18,7 @@ export default class SelectorItem {
 	public pseudos: ISelectorPseudo[] | null;
 	public isPseudoElement: boolean;
 	public combinator: SelectorCombinatorEnum;
+	public ignoreErrors: boolean;
 
 	/**
 	 * Constructor.
@@ -30,6 +31,7 @@ export default class SelectorItem {
 	 * @param [options.attributes] Attributes.
 	 * @param [options.pseudos] Pseudos.
 	 * @param [options.isPseudoElement] Is pseudo element.
+	 * @param [options.ignoreErrors] Ignore errors.
 	 */
 	constructor(options?: {
 		tagName?: string;
@@ -39,6 +41,7 @@ export default class SelectorItem {
 		pseudos?: ISelectorPseudo[];
 		isPseudoElement?: boolean;
 		combinator?: SelectorCombinatorEnum;
+		ignoreErrors?: boolean;
 	}) {
 		this.tagName = options?.tagName || null;
 		this.id = options?.id || null;
@@ -47,6 +50,7 @@ export default class SelectorItem {
 		this.pseudos = options?.pseudos || null;
 		this.isPseudoElement = options?.isPseudoElement || false;
 		this.combinator = options?.combinator || SelectorCombinatorEnum.descendant;
+		this.ignoreErrors = options?.ignoreErrors || false;
 	}
 
 	/**
@@ -98,7 +102,7 @@ export default class SelectorItem {
 
 		// Pseudo match
 		if (this.pseudos) {
-			const result = this.matchPsuedo(element);
+			const result = this.matchPseudo(element);
 			if (!result) {
 				return null;
 			}
@@ -114,7 +118,7 @@ export default class SelectorItem {
 	 * @param element Element.
 	 * @returns Result.
 	 */
-	private matchPsuedo(element: Element): ISelectorMatch | null {
+	private matchPseudo(element: Element): ISelectorMatch | null {
 		const parent = <Element>element[PropertySymbol.parentNode];
 		const parentChildren = element[PropertySymbol.parentNode]
 			? (<Element>element[PropertySymbol.parentNode])[PropertySymbol.children]
@@ -135,7 +139,14 @@ export default class SelectorItem {
 				case 'nth-last-child':
 				case 'nth-last-of-type':
 					if (!pseudo.arguments) {
-						throw new DOMException(`The selector "${this.getSelectorString()}" is not valid.`);
+						if (this.ignoreErrors) {
+							return null;
+						}
+						throw new DOMException(
+							`Failed to execute 'matches' on '${
+								element.constructor.name
+							}': '${this.getSelectorString()}' is not a valid selector.`
+						);
 					}
 					break;
 			}
@@ -357,7 +368,7 @@ export default class SelectorItem {
 	 * @returns Selector string.
 	 */
 	private getSelectorString(): string {
-		return `${this.tagName || ''}${this.id ? `#${this.id}` : ''}${
+		return `${this.tagName ? this.tagName.toLowerCase() : ''}${this.id ? `#${this.id}` : ''}${
 			this.classNames ? `.${this.classNames.join('.')}` : ''
 		}${
 			this.attributes

package/src/query-selector/SelectorParser.ts

@@ -63,38 +63,52 @@ export default class SelectorParser {
 	 * Parses a selector string and returns an instance of SelectorItem.
 	 *
 	 * @param selector Selector.
+	 * @param [options] Options.
+	 * @param [options.ignoreErrors] Ignores errors.
 	 * @returns Selector item.
 	 */
-	public static getSelectorItem(selector: string): SelectorItem {
-		return this.getSelectorGroups(selector)[0][0];
+	public static getSelectorItem(
+		selector: string,
+		options?: { ignoreErrors?: boolean }
+	): SelectorItem {
+		return this.getSelectorGroups(selector, options)[0][0];
 	}
 
 	/**
 	 * Parses a selector string and returns groups with SelectorItem instances.
 	 *
 	 * @param selector Selector.
+	 * @param [options] Options.
+	 * @param [options.ignoreErrors] Ignores errors.
 	 * @returns Selector groups.
 	 */
-	public static getSelectorGroups(selector: string): Array<Array<SelectorItem>> {
+	public static getSelectorGroups(
+		selector: string,
+		options?: { ignoreErrors?: boolean }
+	): Array<Array<SelectorItem>> {
+		const ignoreErrors = options?.ignoreErrors;
 		if (selector === '*') {
-			return [[new SelectorItem({ tagName: '*' })]];
+			return [[new SelectorItem({ tagName: '*', ignoreErrors })]];
 		}
 
 		const simpleMatch = selector.match(SIMPLE_SELECTOR_REGEXP);
 
 		if (simpleMatch) {
 			if (simpleMatch[1]) {
-				return [[new SelectorItem({ tagName: selector.toUpperCase() })]];
+				return [[new SelectorItem({ tagName: selector.toUpperCase(), ignoreErrors })]];
 			} else if (simpleMatch[2]) {
-				return [[new SelectorItem({ classNames: selector.replace('.', '').split('.') })]];
+				return [
+					[new SelectorItem({ classNames: selector.replace('.', '').split('.'), ignoreErrors })]
+				];
 			} else if (simpleMatch[3]) {
-				return [[new SelectorItem({ id: selector.replace('#', '') })]];
+				return [[new SelectorItem({ id: selector.replace('#', ''), ignoreErrors })]];
 			}
 		}
 
 		const regexp = new RegExp(SELECTOR_REGEXP);
 		let currentSelectorItem: SelectorItem = new SelectorItem({
-			combinator: SelectorCombinatorEnum.descendant
+			combinator: SelectorCombinatorEnum.descendant,
+			ignoreErrors
 		});
 		let currentGroup: SelectorItem[] = [currentSelectorItem];
 		const groups: Array<Array<SelectorItem>> = [currentGroup];
@@ -147,34 +161,40 @@ export default class SelectorParser {
 					});
 				} else if (match[13] && match[14]) {
 					currentSelectorItem.pseudos = currentSelectorItem.pseudos || [];
-					currentSelectorItem.pseudos.push(this.getPseudo(match[13], match[14]));
+					currentSelectorItem.pseudos.push(this.getPseudo(match[13], match[14], options));
 				} else if (match[15]) {
 					currentSelectorItem.pseudos = currentSelectorItem.pseudos || [];
-					currentSelectorItem.pseudos.push(this.getPseudo(match[15]));
+					currentSelectorItem.pseudos.push(this.getPseudo(match[15], null, options));
 				} else if (match[16]) {
 					currentSelectorItem.isPseudoElement = true;
 				} else if (match[17]) {
 					switch (match[17].trim()) {
 						case ',':
 							currentSelectorItem = new SelectorItem({
-								combinator: SelectorCombinatorEnum.descendant
+								combinator: SelectorCombinatorEnum.descendant,
+								ignoreErrors
 							});
 							currentGroup = [currentSelectorItem];
 							groups.push(currentGroup);
 							break;
 						case '>':
-							currentSelectorItem = new SelectorItem({ combinator: SelectorCombinatorEnum.child });
+							currentSelectorItem = new SelectorItem({
+								combinator: SelectorCombinatorEnum.child,
+								ignoreErrors
+							});
 							currentGroup.push(currentSelectorItem);
 							break;
 						case '+':
 							currentSelectorItem = new SelectorItem({
-								combinator: SelectorCombinatorEnum.adjacentSibling
+								combinator: SelectorCombinatorEnum.adjacentSibling,
+								ignoreErrors
 							});
 							currentGroup.push(currentSelectorItem);
 							break;
 						case '':
 							currentSelectorItem = new SelectorItem({
-								combinator: SelectorCombinatorEnum.descendant
+								combinator: SelectorCombinatorEnum.descendant,
+								ignoreErrors
 							});
 							currentGroup.push(currentSelectorItem);
 							break;
@@ -186,6 +206,9 @@ export default class SelectorParser {
 		}
 
 		if (!isValid) {
+			if (options?.ignoreErrors) {
+				return [];
+			}
 			throw new DOMException(`Invalid selector: "${selector}"`);
 		}
 
@@ -241,9 +264,15 @@ export default class SelectorParser {
 	 *
 	 * @param name Pseudo name.
 	 * @param args Pseudo arguments.
+	 * @param [options] Options.
+	 * @param [options.ignoreErrors] Ignores errors.
 	 * @returns Pseudo.
 	 */
-	private static getPseudo(name: string, args?: string): ISelectorPseudo {
+	private static getPseudo(
+		name: string,
+		args?: string,
+		options?: { ignoreErrors?: boolean }
+	): ISelectorPseudo {
 		const lowerName = name.toLowerCase();
 
 		if (!args) {
@@ -256,7 +285,9 @@ export default class SelectorParser {
 				const nthOfIndex = args.indexOf(' of ');
 				const nthFunction = nthOfIndex !== -1 ? args.substring(0, nthOfIndex) : args;
 				const selectorItem =
-					nthOfIndex !== -1 ? this.getSelectorItem(args.substring(nthOfIndex + 4).trim()) : null;
+					nthOfIndex !== -1
+						? this.getSelectorItem(args.substring(nthOfIndex + 4).trim(), options)
+						: null;
 				return {
 					name: lowerName,
 					arguments: args,
@@ -275,12 +306,12 @@ export default class SelectorParser {
 				return {
 					name: lowerName,
 					arguments: args,
-					selectorItems: [this.getSelectorItem(args)],
+					selectorItems: [this.getSelectorItem(args, options)],
 					nthFunction: null
 				};
 			case 'is':
 			case 'where':
-				const selectorGroups = this.getSelectorGroups(args);
+				const selectorGroups = this.getSelectorGroups(args, options);
 				const selectorItems = [];
 				for (const group of selectorGroups) {
 					selectorItems.push(group[0]);

package/src/storage/Storage.ts

@@ -1,16 +1,63 @@
+import * as PropertySymbol from '../PropertySymbol.js';
+
 /**
  * Storage.
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/API/Storage
  */
 export default class Storage {
+	public [PropertySymbol.data]: { [key: string]: string } = {};
+
+	/**
+	 *
+	 */
+	constructor() {
+		const descriptors = Object.getOwnPropertyDescriptors(Storage.prototype);
+
+		Object.defineProperty(this, 'length', {
+			enumerable: false,
+			configurable: true,
+			get: descriptors['length'].get.bind(this)
+		});
+
+		Object.defineProperty(this, 'key', {
+			enumerable: false,
+			configurable: true,
+			value: descriptors['key'].value.bind(this)
+		});
+
+		Object.defineProperty(this, 'setItem', {
+			enumerable: false,
+			configurable: true,
+			value: descriptors['setItem'].value.bind(this)
+		});
+
+		Object.defineProperty(this, 'getItem', {
+			enumerable: false,
+			configurable: true,
+			value: descriptors['getItem'].value.bind(this)
+		});
+
+		Object.defineProperty(this, 'removeItem', {
+			enumerable: false,
+			configurable: true,
+			value: descriptors['removeItem'].value.bind(this)
+		});
+
+		Object.defineProperty(this, 'clear', {
+			enumerable: false,
+			configurable: true,
+			value: descriptors['clear'].value.bind(this)
+		});
+	}
+
 	/**
 	 * Returns length.
 	 *
 	 * @returns Length.
 	 */
 	public get length(): number {
-		return Object.keys(this).length;
+		return Object.keys(this[PropertySymbol.data]).length;
 	}
 
 	/**
@@ -19,9 +66,9 @@ export default class Storage {
 	 * @param index Index.
 	 * @returns Name.
 	 */
-	public key(index: number): string {
-		const name = Object.keys(this)[index];
-		return name === undefined ? null : name;
+	public key(index: number): string | null {
+		const name = Object.keys(this[PropertySymbol.data])[index];
+		return name !== undefined ? name : null;
 	}
 
 	/**
@@ -31,7 +78,7 @@ export default class Storage {
 	 * @param item Item.
 	 */
 	public setItem(name: string, item: string): void {
-		this[name] = String(item);
+		this[PropertySymbol.data][name] = String(item);
 	}
 
 	/**
@@ -40,8 +87,8 @@ export default class Storage {
 	 * @param name Name.
 	 * @returns Item.
 	 */
-	public getItem(name: string): string {
-		return this[name] === undefined ? null : this[name];
+	public getItem(name: string): string | null {
+		return this[PropertySymbol.data][name] !== undefined ? this[PropertySymbol.data][name] : null;
 	}
 
 	/**
@@ -50,16 +97,13 @@ export default class Storage {
 	 * @param name Name.
 	 */
 	public removeItem(name: string): void {
-		delete this[name];
+		delete this[PropertySymbol.data][name];
 	}
 
 	/**
 	 * Clears storage.
 	 */
 	public clear(): void {
-		const keys = Object.keys(this);
-		for (const key of keys) {
-			delete this[key];
-		}
+		this[PropertySymbol.data] = {};
 	}
 }