Rewrites StackItemFactory to use Factory interface.

Author: zorkow

mathjax3-ts/input/tex/Stack.ts

@@ -87,7 +87,7 @@ export default class Stack {
         continue;
       }
       const item = NodeUtil.isNode(node) ?
-        this._factory.create('mml', node) : node;
+        this._factory.create('mml', node) : node as StackItem;
       item.global = this.global;
       const [top, success] =
         this.stack.length ? this.Top().checkItem(item) : [null, true];

mathjax3-ts/input/tex/StackItem.ts

@@ -23,6 +23,7 @@
  */
 
 import {MmlNode, TextNode} from '../../core/MmlTree/MmlNode.js';
+import {FactoryNodeClass} from '../../core/Tree/Factory.js';
 import TexError from './TexError.js';
 import StackItemFactory from './StackItemFactory.js';
 
@@ -273,6 +274,13 @@ export interface StackItem extends NodeStack {
    */
   setProperty(key: string, value: Prop): StackItem;
 
+  /**
+   * Sets a list of properties.
+   * @param {PropList} def The properties to set.
+   * @return {StackItem} Returns the stack item object for pipelining.
+   */
+  setProperties(def: PropList): StackItem;
+  
   /**
    * Convenience method for returning the string property "name".
    * @return {string} The value for the name property.
@@ -306,8 +314,8 @@ export interface StackItem extends NodeStack {
 
 }
 
-export interface StackItemClass {
-  new (factory: StackItemFactory, ...args: any[]): StackItem;
+export interface StackItemClass extends FactoryNodeClass<StackItem> {
+  // new (factory: StackItemFactory, ...args: any[]): StackItem;
 }
 
 
@@ -469,9 +477,7 @@ export abstract class BaseItem extends MmlStack implements StackItem {
 
 
   /**
-   * Sets a list of properties.
-   * @param {PropList} def The properties to set.
-   * @return {StackItem} Returns the stack item object for pipelining.
+   * @override
    */
   public setProperties(def: PropList) {
     Object.assign(this._properties, def);

mathjax3-ts/input/tex/StackItemFactory.ts

@@ -26,6 +26,7 @@
 import {StackItemClass, StackItem, BaseItem} from './StackItem.js';
 import {MmlNode, TextNode, TEXCLASS} from '../../core/MmlTree/MmlNode.js';
 import ParseOptions from './ParseOptions.js';
+import {AbstractFactory} from '../../core/Tree/Factory.js';
 
 
 class DummyItem extends BaseItem {}
@@ -35,71 +36,39 @@ class DummyItem extends BaseItem {}
  * classes. They can be changed, deleted or added to, if and when necessary.
  *
  * @constructor
+ * @extends {AbstractFactory}
  */
-export default class StackItemFactory {
+export default class StackItemFactory extends AbstractFactory<StackItem, StackItemClass>{
 
-  private static DefaultStackItems: {[kind: string]: StackItemClass} = {
+  /**
+   * @override
+   */
+  public static DefaultStackItems: {[kind: string]: StackItemClass} = {
     [DummyItem.prototype.kind]: DummyItem
   };
 
+
   /**
-   * A default item.
+   * @override
    */
-  public defaultKind: string = 'dummy';
+  public defaultKind = 'dummy';
+
 
   /**
    * The parser configuration.
    * @type {ParseOptions} 
    */
   public configuration: ParseOptions = null;
 
-  private itemMap: Map<string, StackItemClass> = new Map();
-
-  private item: {[kind: string]: (factory: StackItemFactory, ...args: any[]) => StackItem} = {};
-
-  /**
-   * @constructor
-   */
-  constructor() {
-    this.addStackItems(StackItemFactory.DefaultStackItems);
-  }
-
 
   /**
    * Adds a list of stack items to the current factory.
    * @param {Object.<string, StackItemClass>} stackItems A list of stackitems.
    */
   public addStackItems(stackItems: {[kind: string]: StackItemClass}) {
     for (const kind of Object.keys(stackItems)) {
-      this.itemMap.set(kind, stackItems[kind]);
-      let constr = this.itemMap.get(kind);
-      this.item[kind] = (factory: StackItemFactory, ...args: any[]) => {
-        return new constr(factory, ...args);
-      };
+      this.setNodeClass(kind, stackItems[kind]);
     }
   }
 
-
-  /**
-   * Removes stack item classs from the factory.
-   * @param {string[]} keys The classes to remove.
-   */
-  public removeStackItems(keys: string[]) {
-    for (const key of keys) {
-      this.itemMap.delete(key);
-    }
-  }
-
-
-  /**
-   *
-   * @param {string} kind The type of
-   * @return {}
-   */
-  public create(kind: string, ...parameters: any[]) {
-    // return (this.item[kind] || this.item[this.defaultKind])(this, ...parameters);
-    return (this.item[kind] || this.item[this.defaultKind])
-      .apply(null, [this].concat(...parameters));
-  }
-
 }

mathjax3-ts/input/tex/ams/AmsMethods.ts

@@ -117,7 +117,7 @@ AmsMethods.Multline = function (parser: TexParser, begin: StackItem, numbered: b
   // @test Shove*, Multline
   parser.Push(begin);
   ParseUtil.checkEqnEnv(parser);
-  const item = parser.itemFactory.create('multline', numbered, parser.stack);
+  const item = parser.itemFactory.create('multline', numbered, parser.stack) as ArrayItem;
   item.arraydef = {
     displaystyle: true,
     rowspacing: '.5em',

mathjax3-ts/input/tex/base/BaseMethods.ts

@@ -1109,7 +1109,7 @@ BaseMethods.Matrix = function(parser: TexParser, name: string,
     parser.i = 0;
   }
   // @test Matrix Braces, Matrix Columns, Matrix Rows.
-  const array = parser.itemFactory.create('array').setProperty('requireClose', true);
+  const array = parser.itemFactory.create('array').setProperty('requireClose', true) as sitem.ArrayItem;
   array.arraydef = {
     rowspacing: (vspacing || '4pt'),
     columnspacing: (spacing || '1em')
@@ -1395,7 +1395,7 @@ BaseMethods.Array = function(parser: TexParser, begin: StackItem,
   let lines = ('c' + align).replace(/[^clr|:]/g, '').replace(/[^|:]([|:])+/g, '$1');
   align = align.replace(/[^clr]/g, '').split('').join(' ');
   align = align.replace(/l/g, 'left').replace(/r/g, 'right').replace(/c/g, 'center');
-  const array = parser.itemFactory.create('array');
+  const array = parser.itemFactory.create('array') as sitem.ArrayItem;
   array.arraydef = {
     columnalign: align,
     columnspacing: (spacing || '1em'),
@@ -1492,7 +1492,8 @@ BaseMethods.EqnArray = function(parser: TexParser, begin: StackItem,
   }
   align = align.replace(/[^clr]/g, '').split('').join(' ');
   align = align.replace(/l/g, 'left').replace(/r/g, 'right').replace(/c/g, 'center');
-  let newItem = parser.itemFactory.create('eqnarray', begin.getName(), numbered, taggable, parser.stack.global);
+  let newItem = parser.itemFactory.create('eqnarray', begin.getName(),
+                                          numbered, taggable, parser.stack.global) as sitem.ArrayItem;
   newItem.arraydef = {
     displaystyle: true,
     columnalign: align,