Moves configuration of ParseOptions into its constructor.

Author: zorkow

mathjax3-ts/input/tex.ts

@@ -35,7 +35,6 @@ import TexError from './tex/TexError.js';
 import ParseOptions from './tex/ParseOptions.js';
 import {TagsFactory} from './tex/Tags.js';
 import {Configuration, ConfigurationHandler} from './tex/Configuration.js';
-import {SubHandlers} from './tex/MapHandler.js';
 // Import base as it is the default package loaded.
 import './tex/base/BaseConfiguration.js';
 
@@ -102,26 +101,6 @@ export class TeX<N, T, D> extends AbstractInputJax<N, T, D> {
 
 
 
-  /**
-   * Initialises the parse options.
-   * @param {Configuration} configuration A configuration.
-   * @return {ParseOptions} The initialised parse options.
-   */
-  private static options(configuration: Configuration): ParseOptions {
-    let options = new ParseOptions();
-    options.handlers = new SubHandlers(configuration);
-    options.itemFactory.configuration = options;
-    // Add node factory methods from packages.
-    options.nodeFactory.configuration = options;
-    options.nodeFactory.setCreators(configuration.nodes);
-    // Add stackitems from packages.
-    options.itemFactory.addStackItems(configuration.items);
-    // Set default options for parser from packages and for tags.
-    defaultOptions(options.options, TeX.OPTIONS, TagsFactory.OPTIONS, configuration.options);
-    return options;
-  };
-
-
   /**
    * Initialises the Tags factory. Add tagging structures from packages and set
    * tagging to given default.
@@ -141,8 +120,8 @@ export class TeX<N, T, D> extends AbstractInputJax<N, T, D> {
   constructor(options: OptionList = {}) {
     let packages = options['packages'] || TeX.OPTIONS['packages'];
     let configuration = TeX.configure(packages);
-    let parseOptions = TeX.options(configuration);
-    defaultOptions(parseOptions.options, {'packages': packages});
+    let parseOptions = new ParseOptions(configuration,
+                                        [TeX.OPTIONS, TagsFactory.OPTIONS, {'packages': packages}]);
     let [tex, find, rest] = separateOptions(options, FindTeX.OPTIONS, parseOptions.options);
     super(tex);
     userOptions(parseOptions.options, options);

mathjax3-ts/input/tex/ParseOptions.ts

@@ -28,7 +28,8 @@ import {HandlerType, SubHandlers} from './MapHandler.js';
 import {NodeFactory} from './NodeFactory.js';
 import {MmlNode} from '../../core/MmlTree/MmlNode.js';
 import TexParser from './TexParser.js';
-import {OptionList} from '../../util/Options.js';
+import {defaultOptions, OptionList} from '../../util/Options.js';
+import {Configuration} from './Configuration.js';
 
 
 /**
@@ -46,19 +47,19 @@ export default class ParseOptions {
    * A set of options, mapping names to string or boolean values.
    * @type {OptionList}
    */
-  public options: OptionList;
+  public options: OptionList = {};
 
   /**
    * The current item factory.
    * @type {StackItemFactory}
    */
-  public itemFactory: StackItemFactory = new StackItemFactory();
+  public itemFactory: StackItemFactory;
 
   /**
    * The current node factory.
    * @type {NodeFactory}
    */
-  public nodeFactory: NodeFactory = new NodeFactory();
+  public nodeFactory: NodeFactory;
 
   /**
    * The current tagging object.
@@ -101,8 +102,18 @@ export default class ParseOptions {
    * @param {{[key: string]: (string|boolean)}} setting A list of option
    *     settings. Those are added to the default options.
    */
-  public constructor(setting: OptionList = {}) {
-    this.options = setting;
+  public constructor(configuration: Configuration, options: OptionList[] = []) {
+    this.handlers = new SubHandlers(configuration);
+    // Add node factory methods from packages.
+    this.nodeFactory = new NodeFactory();
+    this.nodeFactory.configuration = this;
+    this.nodeFactory.setCreators(configuration.nodes);
+    // Add stackitems from packages.
+    this.itemFactory = new StackItemFactory(configuration.items);
+    this.itemFactory.configuration = this;
+    // Set default options for parser from packages and for tags.
+    defaultOptions(this.options, ...options);
+    defaultOptions(this.options, configuration.options);
   }
 
 

mathjax3-ts/input/tex/StackItemFactory.ts

@@ -38,7 +38,7 @@ class DummyItem extends BaseItem {}
  * @constructor
  * @extends {AbstractFactory}
  */
-export default class StackItemFactory extends AbstractFactory<StackItem, StackItemClass>{
+export default class StackItemFactory extends AbstractFactory<StackItem, StackItemClass> {
 
   /**
    * @override
@@ -60,15 +60,4 @@ export default class StackItemFactory extends AbstractFactory<StackItem, StackIt
    */
   public configuration: ParseOptions = null;
 
-
-  /**
-   * 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.setNodeClass(kind, stackItems[kind]);
-    }
-  }
-
 }