Update selector manager TS

src/abstract/Module.ts

@@ -34,7 +34,7 @@ export interface IStorableModule extends IModule {
 
 export default abstract class Module<T extends ModuleConfig = ModuleConfig> implements IModule<T> {
   private _em: EditorModel;
-  private _config: T;
+  private _config: T & { pStylePrefix?: string };
   private _name: string;
   cls: any[] = [];
   events: any;
@@ -75,7 +75,9 @@ export default abstract class Module<T extends ModuleConfig = ModuleConfig> impl
     return this._name;
   }
 
-  getConfig(name?: string) {
+  getConfig<P extends keyof T | undefined = undefined, R = P extends keyof T ? T[P] : T>(
+    name?: P
+  ): R & { pStylePrefix?: string } {
     // @ts-ignore
     return name ? this.config[name] : this.config;
   }
@@ -96,7 +98,7 @@ export default abstract class Module<T extends ModuleConfig = ModuleConfig> impl
     if (elTo) {
       const el = isElement(elTo) ? elTo : document.querySelector(elTo);
       if (!el) return this.__logWarn('"appendTo" element not found');
-      el.appendChild(this.render());
+      el.appendChild(this.render() as any);
     }
   }
 }

src/asset_manager/index.ts

@@ -135,7 +135,9 @@ export default class AssetManager extends ItemManagerModule<AssetManagerConfig,
 
   __trgCustom() {
     const bhv = this.__getBehaviour();
-    if (!bhv.container && !this.getConfig().custom.open) {
+    const custom = this.getConfig().custom;
+
+    if (!bhv.container && !(custom as any).open) {
       return;
     }
     this.em.trigger(this.events.custom, this.__customData());

src/block_manager/index.ts

@@ -112,6 +112,13 @@ export default class BlockManager extends ItemManagerModule<BlockManagerConfig,
     return this;
   }
 
+  /**
+   * Get configuration object
+   * @name getConfig
+   * @function
+   * @return {Object}
+   */
+
   __trgCustom() {
     this.em.trigger(this.events.custom, this.__customData());
   }
@@ -204,14 +211,6 @@ export default class BlockManager extends ItemManagerModule<BlockManagerConfig,
     this.__endDrag();
   }
 
-  /**
-   * Get configuration object
-   * @return {Object}
-   */
-  getConfig() {
-    return this.config;
-  }
-
   postRender() {
     const { categories, config, em } = this;
     const collection = this.blocksVisible;

src/common/index.ts

@@ -5,3 +5,5 @@ export { default as View } from './View';
 export type SetOptions = Backbone.ModelSetOptions & { avoidStore?: boolean };
 
 export type AddOptions = Backbone.AddOptions;
+
+export type RemoveOptions = Backbone.Silenceable;

src/editor/model/Editor.ts

@@ -760,7 +760,7 @@ export default class EditorModel extends Model {
    * Get the current selector state
    * @returns {String}
    */
-  getState() {
+  getState(): string {
     return this.get('state') || '';
   }
 

src/i18n/index.ts

@@ -51,12 +51,11 @@ export default class I18nModule extends Module<I18nConfig & { stylePrefix?: stri
   }
 
   /**
-   * Get module configurations
-   * @returns {Object} Configuration object
+   * Get configuration object
+   * @name getConfig
+   * @function
+   * @return {Object}
    */
-  getConfig() {
-    return this.config;
-  }
 
   /**
    * Update current locale

src/keymaps/index.ts

@@ -61,14 +61,6 @@ export default class KeymapsModule extends Module<KeymapsConfig & { name?: strin
     this.keymaps = {};
   }
 
-  /**
-   * Get module configurations
-   * @return {Object} Configuration object
-   */
-  getConfig() {
-    return this.config;
-  }
-
   onLoad() {
     const defKeys = this.config.defaults;
 
@@ -78,6 +70,13 @@ export default class KeymapsModule extends Module<KeymapsConfig & { name?: strin
     }
   }
 
+  /**
+   * Get configuration object
+   * @name getConfig
+   * @function
+   * @return {Object}
+   */
+
   /**
    * Add new keymap
    * @param {string} id Keymap id

src/parser/index.ts

@@ -42,14 +42,11 @@ export default class ParserModule extends Module<ParserConfig & { name?: string
   }
 
   /**
-   * Get the configuration object
-   * @returns {Object} Configuration object
-   * @example
-   * console.log(Parser.getConfig())
+   * Get configuration object
+   * @name getConfig
+   * @function
+   * @return {Object}
    */
-  getConfig() {
-    return this.config;
-  }
 
   /**
    * Parse HTML string and return the object containing the Component Definition

src/rich_text_editor/index.ts

@@ -61,9 +61,12 @@ export default class RichTextEditorModule extends Module<RichTextEditorConfig &
   actions?: (RichTextEditorAction | string)[];
   customRte?: CustomRTE;
 
-  getConfig() {
-    return this.config;
-  }
+  /**
+   * Get configuration object
+   * @name getConfig
+   * @function
+   * @return {Object}
+   */
 
   constructor(em: EditorModel) {
     super(em, 'RichTextEditor', defaults);

src/selector_manager/index.ts

@@ -74,7 +74,7 @@
 
 import { isString, debounce, isObject, isArray, bindAll } from 'underscore';
 import { isComponent, isRule } from '../utils/mixins';
-import { Model, Collection } from '../common';
+import { Model, Collection, RemoveOptions } from '../common';
 import defaults, { SelectorManagerConfig } from './config/config';
 import Selector from './model/Selector';
 import Selectors from './model/Selectors';
@@ -107,6 +107,8 @@ const events = {
   custom: evCustom,
 };
 
+type SelectorStringObject = string | { name?: string; label?: string };
+
 export default class SelectorManager extends ItemManagerModule<SelectorManagerConfig & { pStylePrefix?: string }> {
   Selector = Selector;
 
@@ -198,11 +200,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
     return this;
   }
 
-  addSelector(
-    name: string | { name?: string; label?: string } | Selector,
-    opts = {},
-    cOpts = {}
-  ): Selector | Selector[] {
+  addSelector(name: SelectorStringObject | Selector, opts = {}, cOpts = {}): Selector {
     let props: any = { ...opts };
 
     if (isObject(name)) {
@@ -225,7 +223,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
     const cname = props.name;
     const config = this.getConfig();
     const { all, em } = this;
-    const selector = cname ? this.get(cname, props.type) : all.where(props)[0];
+    const selector = cname ? (this.get(cname, props.type) as Selector) : all.where(props)[0];
 
     if (!selector) {
       const selModel = props instanceof Selector ? props : new Selector(props, { ...cOpts, config, em });
@@ -235,7 +233,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
     return selector;
   }
 
-  getSelector(name: string, type = Selector.TYPE_CLASS) {
+  getSelector(name: string, type = Selector.TYPE_CLASS): Selector | undefined {
     if (isId(name)) {
       name = name.substr(1);
       type = Selector.TYPE_ID;
@@ -259,7 +257,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
    * const selector = selectorManager.add('.my-class');
    * console.log(selector.toString()) // `.my-class`
    * */
-  add(props: string | { name?: string; label?: string }, opts = {}) {
+  add(props: SelectorStringObject, opts = {}) {
     const cOpts = isString(props) ? {} : opts;
     // Keep support for arrays but avoid it in docs
     if (isArray(props)) {
@@ -281,13 +279,13 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
    * // -> [SelectorObject, ...]
    */
   addClass(classes: string | string[]) {
-    const added: any = [];
+    const added: Selector[] = [];
 
     if (isString(classes)) {
       classes = classes.trim().split(' ');
     }
 
-    classes.forEach(name => added.push(this.addSelector(name)));
+    classes.forEach(name => added.push(this.addSelector(name) as Selector));
     return added;
   }
 
@@ -304,7 +302,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
     // Keep support for arrays but avoid it in docs
     if (isArray(name)) {
       const result: Selector[] = [];
-      const selectors = name.map(item => this.getSelector(item)).filter(item => item);
+      const selectors = name.map(item => this.getSelector(item)).filter(Boolean) as Selector[];
       selectors.forEach(item => result.indexOf(item) < 0 && result.push(item));
       return result;
     } else {
@@ -321,7 +319,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
    * // or by passing the Selector
    * selectorManager.remove(selectorManager.get('.myclass'));
    */
-  remove(selector: string | Selector, opts?: any) {
+  remove(selector: string | Selector, opts?: RemoveOptions) {
     return this.__remove(selector, opts);
   }
 
@@ -398,7 +396,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
    * @example
    * selectorManager.addSelected('.new-class');
    */
-  addSelected(props: string | { name?: string; label?: string }) {
+  addSelected(props: SelectorStringObject) {
     const added = this.add(props);
     // TODO: target should be the one from StyleManager
     this.em.getSelectedAll().forEach(target => {
@@ -413,7 +411,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
    * @example
    * selectorManager.removeSelected('.myclass');
    */
-  removeSelected(selector: any) {
+  removeSelected(selector: Selector) {
     this.em.getSelectedAll().forEach(trg => {
       !selector.get('protected') && trg && trg.getSelectors().remove(selector);
     });
@@ -427,7 +425,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
    * console.log(targetsToStyle.map(target => target.getSelectorsString()))
    */
   getSelectedTargets() {
-    return this.em.get('StyleManager').getSelectedAll();
+    return this.em.Styles.getSelectedAll();
   }
 
   /**
@@ -446,7 +444,7 @@ export default class SelectorManager extends ItemManagerModule<SelectorManagerCo
    * @return {Boolean}
    */
   getComponentFirst() {
-    return this.getConfig().componentFirst;
+    return this.getConfig().componentFirst!;
   }
 
   /**

src/storage_manager/index.ts

@@ -325,7 +325,7 @@ export default class StorageManager extends Module<
   getCurrentOptions(type?: string): StorageOptions {
     const config = this.getConfig();
     const current = type || this.getCurrent();
-    return config.options[current] || {};
+    return config.options![current] || {};
   }
 
   /**

src/trait_manager/index.ts

@@ -147,14 +147,14 @@ export default class TraitManager extends Module<TraitManagerConfig & { pStylePr
   }
 
   render() {
-    let { view } = this;
+    let { view, em } = this;
     const config = this.getConfig();
     const el = view && view.el;
     view = new TraitsView(
       {
         el,
         collection: [],
-        editor: config.em,
+        editor: em,
         config,
       },
       this.getTypes()

src/undo_manager/index.ts

@@ -151,9 +151,6 @@ export default class UndoManagerModule extends Module<UndoManagerConfig & { name
    * const config = um.getConfig();
    * // { ... }
    */
-  getConfig() {
-    return this.config;
-  }
 
   /**
    * Add an entity (Model/Collection) to track