jodit 3.12.3 → 3.13.2

package/src/core/plugin/plugin-system.ts

@@ -17,8 +17,9 @@ import type {
 	PluginInstance,
 	PluginType,
 	CanPromise,
-	CanUndef
-} from '../../types';
+	CanUndef,
+	Nullable
+} from 'jodit/types';
 
 import {
 	isInitable,
@@ -31,7 +32,7 @@ import {
 	kebabCase,
 	callPromise,
 	isArray
-} from '../helpers';
+} from 'jodit/core/helpers';
 
 /**
  * Jodit plugin system
@@ -50,27 +51,37 @@ export class PluginSystem implements IPluginSystem {
 		return kebabCase(name).toLowerCase();
 	}
 
-	private items = new Map<string, PluginType>();
+	private _items = new Map<string, PluginType>();
+
+	private items(filter: Nullable<string[]>): Array<[string, PluginType]> {
+		const results: Array<[string, PluginType]> = [];
+
+		this._items.forEach((plugin, name) => {
+			results.push([name, plugin]);
+		});
+
+		return results.filter(([name]) => !filter || filter.includes(name));
+	}
 
 	/**
 	 * Add plugin in store
 	 */
 	add(name: string, plugin: PluginType): void {
-		this.items.set(this.normalizeName(name), plugin);
+		this._items.set(this.normalizeName(name), plugin);
 	}
 
 	/**
 	 * Get plugin from store
 	 */
 	get(name: string): PluginType | void {
-		return this.items.get(this.normalizeName(name));
+		return this._items.get(this.normalizeName(name));
 	}
 
 	/**
 	 * Remove plugin from store
 	 */
 	remove(name: string): void {
-		this.items.delete(this.normalizeName(name));
+		this._items.delete(this.normalizeName(name));
 	}
 
 	/**
@@ -87,7 +98,7 @@ export class PluginSystem implements IPluginSystem {
 			promiseList: IDictionary<PluginInstance | undefined> = {},
 			plugins: PluginInstance[] = [],
 			pluginsMap: IDictionary<PluginInstance> = {},
-			makeAndInit = (plugin: PluginType, name: string) => {
+			makeAndInit = ([name, plugin]: [string, PluginType]) => {
 				if (
 					disableList.includes(name) ||
 					doneList.includes(name) ||
@@ -110,10 +121,18 @@ export class PluginSystem implements IPluginSystem {
 
 				const instance = PluginSystem.makePluginInstance(jodit, plugin);
 
-				this.initOrWait(jodit, name, instance, doneList, promiseList);
-
-				plugins.push(instance);
-				pluginsMap[name] = instance;
+				if (instance) {
+					this.initOrWait(
+						jodit,
+						name,
+						instance,
+						doneList,
+						promiseList
+					);
+
+					plugins.push(instance);
+					pluginsMap[name] = instance;
+				}
 			};
 
 		const resultLoadExtras = this.loadExtras(jodit, extrasList);
@@ -123,7 +142,13 @@ export class PluginSystem implements IPluginSystem {
 				return;
 			}
 
-			this.items.forEach(makeAndInit);
+			this.items(
+				jodit.o.safeMode
+					? jodit.o.safePluginsList.concat(
+							extrasList.map(s => s.name)
+					  )
+					: null
+			).forEach(makeAndInit);
 
 			this.addListenerOnBeforeDestruct(jodit, plugins);
 
@@ -150,8 +175,17 @@ export class PluginSystem implements IPluginSystem {
 	static makePluginInstance(
 		jodit: IJodit,
 		plugin: PluginType
-	): PluginInstance {
-		return isFunction(plugin) ? new plugin(jodit) : plugin;
+	): Nullable<PluginInstance> {
+		try {
+			return isFunction(plugin) ? new plugin(jodit) : plugin;
+		} catch (e) {
+			console.error(e);
+			if (!isProd) {
+				throw e;
+			}
+		}
+
+		return null;
 	}
 
 	/**
@@ -172,7 +206,14 @@ export class PluginSystem implements IPluginSystem {
 					!req?.length ||
 					req.every(name => doneList.includes(name))
 				) {
-					plugin.init(jodit);
+					try {
+						plugin.init(jodit);
+					} catch (e) {
+						console.error(e);
+						if (!isProd) {
+							throw e;
+						}
+					}
 					doneList.push(name);
 				} else {
 					promiseList[name] = plugin;
@@ -291,7 +332,7 @@ export class PluginSystem implements IPluginSystem {
 		if (extrasList && extrasList.length) {
 			try {
 				const needLoadExtras = extrasList.filter(
-					extra => !this.items.has(this.normalizeName(extra.name))
+					extra => !this._items.has(this.normalizeName(extra.name))
 				);
 
 				if (needLoadExtras.length) {

package/src/core/plugin/plugin.ts

@@ -10,10 +10,10 @@
  * @module plugin
  */
 
-import type { IJodit, IPlugin, IViewBased } from '../../types';
+import type { IJodit, IPlugin, IViewBased } from 'jodit/types';
 import { ViewComponent, STATUSES } from '../component';
-import { autobind } from '../decorators';
-import { isJoditObject } from '../helpers';
+import { autobind } from 'jodit/core/decorators';
+import { isJoditObject } from 'jodit/core/helpers';
 
 export abstract class Plugin<T extends IViewBased = IJodit>
 	extends ViewComponent<T>

package/src/core/request/ajax.ts

@@ -18,9 +18,9 @@ import type {
 	IAjax,
 	RejectablePromise,
 	IResponse
-} from '../../types';
+} from 'jodit/types';
 
-import { Config } from '../../config';
+import { Config } from 'jodit/config';
 
 import {
 	error,
@@ -30,7 +30,7 @@ import {
 	isString,
 	isFunction,
 	ConfigProto
-} from '../helpers';
+} from 'jodit/core/helpers';
 import { Response } from './response';
 
 import './config';

package/src/core/request/config.ts

@@ -8,10 +8,10 @@
  * @module request
  */
 
-import type { AjaxOptions } from '../../types';
-import { Config } from '../../config';
+import type { AjaxOptions } from 'jodit/types';
+import { Config } from 'jodit/config';
 
-declare module '../../config' {
+declare module 'jodit/config' {
 	interface Config {
 		/**
 		 * A set of key/value pairs that configure the Ajax request. All settings are optional

package/src/core/request/response.ts

@@ -8,7 +8,7 @@
  * @module request
  */
 
-import type { IRequest, IResponse } from '../../types';
+import type { IRequest, IResponse } from 'jodit/types';
 
 export class Response<T> implements IResponse<T> {
 	readonly status: number;

package/src/core/selection/select.ts

@@ -19,17 +19,17 @@ import type {
 	IStyle,
 	MarkerInfo,
 	Nullable
-} from '../../types';
+} from 'jodit/types';
 
-import * as consts from '../constants';
+import * as consts from 'jodit/core/constants';
 
 import {
 	INSEPARABLE_TAGS,
 	INVISIBLE_SPACE,
 	INVISIBLE_SPACE_REG_EXP_END as INV_END,
 	INVISIBLE_SPACE_REG_EXP_START as INV_START
-} from '../constants';
-import { Dom } from '../dom';
+} from 'jodit/core/constants';
+import { Dom } from 'jodit/core/dom';
 
 import {
 	attr,
@@ -41,9 +41,9 @@ import {
 	call,
 	toArray,
 	getScrollParent
-} from '../helpers';
+} from 'jodit/core/helpers';
 import { CommitStyle } from './style/commit-style';
-import { autobind } from '../decorators';
+import { autobind } from 'jodit/core/decorators';
 
 export class Select implements ISelect {
 	constructor(readonly jodit: IJodit) {

package/src/core/selection/style/api/element-has-same-style.ts

@@ -4,9 +4,9 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { IStyle } from '../../../../types';
-import { css, isVoid, normalizeCssValue } from '../../../helpers';
-import { Dom } from '../../../dom';
+import type { IStyle } from 'jodit/types';
+import { css, isVoid, normalizeCssValue } from 'jodit/core/helpers';
+import { Dom } from 'jodit/core/dom';
 
 /**
  * Element has the same styles as in the commit

package/src/core/selection/style/api/extract.ts

@@ -4,10 +4,10 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { IJodit } from '../../../../types';
+import type { IJodit } from 'jodit/types';
 import { Select } from '../../select';
-import { call, trim } from '../../../helpers';
-import { Dom } from '../../../dom';
+import { call, trim } from 'jodit/core/helpers';
+import { Dom } from 'jodit/core/dom';
 
 /**
  * If the selection area is inside an element that matches the commit (suitable relative),

package/src/core/selection/style/api/finite-state-machine.ts

@@ -4,7 +4,7 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { CanUndef, IDictionary } from '../../../../types';
+import type { CanUndef, IDictionary } from 'jodit/types';
 
 /**
  * A state machine implementation for applying styles.

package/src/core/selection/style/api/get-suit-child.ts

@@ -4,9 +4,9 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { Nullable } from '../../../../types';
+import type { Nullable } from 'jodit/types';
 import type { CommitStyle } from '../commit-style';
-import { Dom } from '../../../dom';
+import { Dom } from 'jodit/core/dom';
 import { isNormalNode } from './is-normal-node';
 import { isSuitElement } from './is-suit-element';
 

package/src/core/selection/style/api/get-suit-parent.ts

@@ -4,9 +4,9 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { Nullable } from '../../../../types';
+import type { Nullable } from 'jodit/types';
 import type { CommitStyle } from '../commit-style';
-import { Dom } from '../../../dom';
+import { Dom } from 'jodit/core/dom';
 import { isNormalNode } from './is-normal-node';
 import { isSuitElement } from './is-suit-element';
 

package/src/core/selection/style/api/is-inside-invisible-element.ts

@@ -4,7 +4,7 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import { Dom } from '../../../dom';
+import { Dom } from 'jodit/core/dom';
 
 /**
  * Check if FONT inside STYLE or SCRIPT element

package/src/core/selection/style/api/is-normal-node.ts

@@ -4,8 +4,8 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { Nullable } from '../../../../types';
-import { Dom } from '../../../dom';
+import type { Nullable } from 'jodit/types';
+import { Dom } from 'jodit/core/dom';
 
 /**
  * Is normal usual element

package/src/core/selection/style/api/is-suit-element.ts

@@ -3,14 +3,14 @@
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
-import type { Nullable } from '../../../../types';
+import type { Nullable } from 'jodit/types';
 import type { CommitStyle } from '../commit-style';
 import { isNormalNode } from './is-normal-node';
 import {
 	elementHasSameStyle,
 	elementHasSameStyleKeys
 } from './element-has-same-style';
-import { Dom } from '../../../dom';
+import { Dom } from 'jodit/core/dom';
 
 /**
  * Checks if an item is suitable for applying a commit. The element suits us if it
@@ -54,7 +54,7 @@ export function isSuitElement(
 }
 
 /**
- * Внутри родительского элемента есть блок с теми же стилями
+ * Inside the parent element there is a block with the same styles
  * @example
  * For selection:
  * ```html

package/src/core/selection/style/api/toggle/toggle-css.ts

@@ -4,8 +4,8 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { CommitMode, IJodit } from '../../../../../types';
-import type { CommitStyle } from '../../commit-style';
+import type { CommitMode, IJodit } from 'jodit/types';
+import type { CommitStyle } from 'jodit/core/selection/style/commit-style';
 import {
 	attr,
 	css,
@@ -13,10 +13,10 @@ import {
 	kebabCase,
 	normalizeCssValue,
 	size
-} from '../../../../helpers';
-import { Dom } from '../../../../dom';
-import { CHANGE, UNSET, UNWRAP } from '../../commit-style';
-import { getContainer } from '../../../../global';
+} from 'jodit/core/helpers';
+import { Dom } from 'jodit/core/dom';
+import { CHANGE, UNSET, UNWRAP } from 'jodit/core/selection/style/commit-style';
+import { getContainer } from 'jodit/core/global';
 
 /**
  * Toggles css and classname

package/src/core/selection/style/api/toggle/toggle-ordered-list.ts

@@ -4,9 +4,9 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { IJodit, CommitMode } from '../../../../../types';
+import type { IJodit, CommitMode } from 'jodit/types';
 import type { CommitStyle } from '../../commit-style';
-import { Dom } from '../../../../dom';
+import { Dom } from 'jodit/core/dom';
 import { extractSelectedPart } from '../extract';
 import { CHANGE, INITIAL, REPLACE } from '../../commit-style';
 import { toggleCSS } from './toggle-css';

package/src/core/selection/style/api/toggle-commit-styles.ts

@@ -5,7 +5,7 @@
  */
 
 import type { CommitStyle } from '../commit-style';
-import { Dom } from '../../../dom';
+import { Dom } from 'jodit/core/dom';
 
 /**
  * Add or remove styles to element

package/src/core/selection/style/api/unwrap-children.ts

@@ -5,10 +5,10 @@
  */
 
 import type { CommitStyle } from '../commit-style';
-import { Dom } from '../../../dom';
+import type { IDictionary } from 'jodit/types';
+import { Dom } from 'jodit/core/dom';
 import { isSameStyleChild, isSuitElement } from './is-suit-element';
-import { attr, css } from '../../../helpers';
-import type { IDictionary } from '../../../../types';
+import { attr, css } from 'jodit/core/helpers';
 
 /**
  * Unwrap all suit elements inside

package/src/core/selection/style/api/wrap-and-commit-style.ts

@@ -4,11 +4,11 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { IJodit } from '../../../../types';
+import type { IJodit } from 'jodit/types';
 import type { CommitStyle } from '../commit-style';
-import { Dom } from '../../../dom';
+import { Dom } from 'jodit/core/dom';
 import { wrapUnwrappedText } from './wrap-unwrapped-text';
-import { attr } from '../../../helpers';
+import { attr } from 'jodit/core/helpers';
 import { wrapOrderedList } from './wrap-ordered-list';
 
 /**

package/src/core/selection/style/api/wrap-ordered-list.ts

@@ -4,8 +4,8 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { IJodit } from '../../../../types';
-import { Dom } from '../../../dom';
+import type { IJodit } from 'jodit/types';
+import { Dom } from 'jodit/core/dom';
 import type { CommitStyle } from '../commit-style';
 
 /**

package/src/core/selection/style/api/wrap-unwrapped-text.ts

@@ -4,9 +4,9 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-import type { IJodit, Nullable } from '../../../../types';
+import type { IJodit, Nullable } from 'jodit/types';
 import type { CommitStyle } from '../commit-style';
-import { Dom } from '../../../dom';
+import { Dom } from 'jodit/core/dom';
 
 /**
  * Wrap text or inline elements inside Block element

package/src/core/selection/style/apply-style.ts

@@ -8,9 +8,9 @@
  * @module selection
  */
 
-import type { IJodit, Nullable, CanUndef, CommitMode } from '../../../types';
+import type { IJodit, Nullable, CanUndef, CommitMode } from 'jodit/types';
 import type { CommitStyle } from './commit-style';
-import { normalizeNode } from '../../helpers';
+import { normalizeNode } from 'jodit/core/helpers';
 import {
 	getSuitParent,
 	getSuitChild,
@@ -19,7 +19,7 @@ import {
 	unwrapChildren
 } from './api';
 import { CHANGE, INITIAL, REPLACE, UNWRAP, WRAP } from './commit-style';
-import { Dom } from '../../dom';
+import { Dom } from 'jodit/core/dom';
 import {
 	toggleOrderedList,
 	wrapAndCommitStyle,

package/src/core/selection/style/commit-style.ts

@@ -8,8 +8,8 @@
  * @module selection
  */
 
-import type { HTMLTagNames, IJodit, IStyleOptions } from '../../../types';
-import { IS_BLOCK } from '../../constants';
+import type { HTMLTagNames, IJodit, IStyleOptions } from 'jodit/types';
+import { IS_BLOCK } from 'jodit/core/constants';
 import { ApplyStyle } from './apply-style';
 
 export const WRAP = 'wrap';

package/src/core/storage/engines/local-storage-provider.ts

@@ -8,11 +8,7 @@
  * @module storage/local
  */
 
-import type {
-	BooleanFunction,
-	IStorage,
-	StorageValueType
-} from '../../../types';
+import type { BooleanFunction, IStorage, StorageValueType } from 'jodit/types';
 
 /**
  * Check if user disable local storages/cookie etc.

package/src/core/storage/engines/memory-storage-provider.ts

@@ -8,7 +8,7 @@
  * @module storage/memory
  */
 
-import type { IStorage, StorageValueType } from '../../../types';
+import type { IStorage, StorageValueType } from 'jodit/types';
 
 export class MemoryStorageProvider<T = StorageValueType>
 	implements IStorage<T>

package/src/core/storage/storage.ts

@@ -10,7 +10,7 @@
  * @module storage
  */
 
-import type { IStorage, StorageValueType } from '../../types';
+import type { IStorage, StorageValueType } from 'jodit/types';
 import { camelCase } from '../helpers/';
 import {
 	canUsePersistentStorage,

package/src/core/traits/elms.ts

@@ -8,11 +8,11 @@
  * @module traits
  */
 
-import type { IComponent, IContainer, IElms } from '../../types';
-import { toArray } from '../helpers/array/to-array';
+import type { IComponent, IContainer, IElms, Nullable } from 'jodit/types';
+import { toArray } from 'jodit/core/helpers/array/to-array';
 
 export abstract class Elms implements IElms {
-	abstract getElm(elementName: string): HTMLElement;
+	abstract getElm(elementName: string): Nullable<HTMLElement>;
 
 	abstract getElms(elementName: string): HTMLElement[];
 
@@ -22,11 +22,10 @@ export abstract class Elms implements IElms {
 	static getElm(
 		this: IComponent & IContainer,
 		elementName: string
-	): HTMLElement {
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		return this.container.querySelector<HTMLElement>(
+	): Nullable<HTMLElement> {
+		return this.container.querySelector(
 			`.${this.getFullElName(elementName)}`
-		)!;
+		) as Nullable<HTMLElement>;
 	}
 
 	/**

package/src/core/traits/mods.ts

@@ -8,27 +8,27 @@
  * @module traits
  */
 
-import type { IComponent, IContainer, IDictionary, IMods } from '../../types';
-import { toArray } from '../helpers/array/to-array';
+import type { IComponent, IContainer, IMods, ModType } from 'jodit/types';
+import { toArray } from 'jodit/core/helpers/array/to-array';
+import { isVoid } from 'jodit/core/helpers/checker/is-void';
 
 export abstract class Mods implements IMods {
-	abstract mods: IDictionary<string | boolean | null>;
+	abstract mods: IMods['mods'];
 	abstract componentName: string;
 	abstract container: HTMLElement;
 
-	abstract setMod(name: string, value: string | boolean | null): this;
-
-	abstract getMod(name: string): string | boolean | null;
+	abstract setMod(name: string, value: ModType): this;
+	abstract getMod(name: string): ModType;
 
 	/**
 	 * Set/remove BEM class modification
 	 *
 	 * @param value - if null, mod will be removed
 	 */
-	static setMod(
-		this: IComponent & IContainer & Mods,
+	static setMod<T extends IComponent & IContainer & Mods>(
+		this: T,
 		name: string,
-		value: string | boolean | null,
+		value: ModType,
 		container?: HTMLElement
 	): void {
 		name = name.toLowerCase();
@@ -46,7 +46,7 @@ export abstract class Mods implements IMods {
 			}
 		});
 
-		value != null &&
+		!isVoid(value) &&
 			value !== '' &&
 			cl.add(`${mod}_${value.toString().toLowerCase()}`);
 
@@ -56,10 +56,7 @@ export abstract class Mods implements IMods {
 	/**
 	 * Get BEM class modification value
 	 */
-	static getMod(
-		this: IComponent & IContainer & Mods,
-		name: string
-	): string | boolean | null {
+	static getMod(this: IComponent & IContainer & Mods, name: string): ModType {
 		return this.mods[name] ?? null;
 	}
 }

package/src/core/ui/button/button/button.ts

@@ -16,14 +16,14 @@ import type {
 	IUIButtonStatePartial,
 	IViewBased,
 	ButtonVariant
-} from '../../../../types';
-import { UIElement } from '../../element';
-import { Dom } from '../../../dom';
-import { attr, isString, isFunction } from '../../../helpers';
-import { Icon } from '../../icon';
-import { UIList } from '../../group';
-import { autobind, component, watch } from '../../../decorators';
-import { STATUSES } from '../../../component';
+} from 'jodit/types';
+import { UIElement } from 'jodit/core/ui';
+import { Dom } from 'jodit/core/dom';
+import { attr, isString, isFunction } from 'jodit/core/helpers';
+import { Icon } from 'jodit/core/ui';
+import { UIList } from 'jodit/core/ui';
+import { autobind, component, watch } from 'jodit/core/decorators';
+import { STATUSES } from 'jodit/core/component';
 
 export const UIButtonState = (): IUIButtonState => ({
 	size: 'middle',