Merge pull request #559 from mathjax/update_package

Updates package-lock file to latest version.
mathjax · Dec 3, 2020 · b0ca062 · b0ca062
2 parents fbd71f3 + 1f67206
commit b0ca062
Show file tree

Hide file tree

Showing 20 changed files with 927 additions and 4,282 deletions.
diff --git a/components/bin/makeAll b/components/bin/makeAll
@@ -126,7 +126,7 @@ function webpackLib(dir) {
   const wd = process.cwd();
   try {
     process.chdir(dir);
-    const result = execSync('npx webpack --display-modules');
+    const result = execSync('npx webpack --stats-modules');
     console.info('    ' + String(result).replace(/\n/g, '\n    ')
                  .replace(/ \.\.\//g, ' ' + path.dirname(path.resolve(dir)) + '/')
                  .replace(compRE, '[components]')

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,21 +42,21 @@
     "make-components": "cd components && node bin/makeAll src | grep 'Building\\|Webpacking\\|Copying\\|npx'"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.1",
-    "@babel/preset-env": "^7.11.0",
+    "@babel/core": "^7.12.3",
+    "@babel/preset-env": "^7.12.1",
     "babel-loader": "^8.1.0",
-    "copyfiles": "^2.3.0",
+    "copyfiles": "^2.4.0",
     "diff": "^4.0.2",
     "rimraf": "^3.0.2",
     "tape": "^5.0.1",
-    "terser-webpack-plugin": "^4.1.0",
+    "terser-webpack-plugin": "^5.0.3",
     "tslint": "^6.1.3",
     "tslint-jsdoc-rules": "^0.2.0",
     "tslint-unix-formatter": "^0.2.0",
-    "typescript": "~3.9.7",
+    "typescript": "~4.0.5",
     "typescript-tools": "^0.3.1",
-    "webpack": "^4.44.1",
-    "webpack-cli": "^3.3.12"
+    "webpack": "^5.3.2",
+    "webpack-cli": "^4.1.0"
   },
   "dependencies": {
     "esm": "^3.2.25",

diff --git a/ts/core/MmlTree/MmlNode.ts b/ts/core/MmlTree/MmlNode.ts
@@ -226,6 +226,7 @@ export interface MmlNodeClass extends NodeClass {
  */
 
 export abstract class AbstractMmlNode extends AbstractNode implements MmlNode {
+  protected texclass: number = null;
   /**
    * The properties common to all MathML nodes
    */
@@ -280,10 +281,6 @@ export abstract class AbstractMmlNode extends AbstractNode implements MmlNode {
    * The correct values are produced when the setTeXclass() method is called on the tree.
    */
 
-  /**
-   * The TeX class for this node
-   */
-  public texClass: number = null;
   /**
    * The TeX class for the preceding node
    */
@@ -309,7 +306,7 @@ export abstract class AbstractMmlNode extends AbstractNode implements MmlNode {
   /**
    * The node factory is an MmlFactory
    */
-  public factory: MmlFactory;
+  public readonly factory: MmlFactory;
 
   /**
    *  Create an MmlNode:
@@ -333,6 +330,20 @@ export abstract class AbstractMmlNode extends AbstractNode implements MmlNode {
     this.attributes.setList(attributes);
   }
 
+  /**
+   * The TeX class for this node
+   */
+  public get texClass(): number {
+    return this.texclass;
+  }
+
+  /**
+   * The TeX class for this node
+   */
+  public set texClass(texClass: number) {
+    this.texclass = texClass;
+  }
+
   /**
    * @return {boolean}  true if this is a token node
    */

diff --git a/ts/core/MmlTree/MmlNodes/TeXAtom.ts b/ts/core/MmlTree/MmlNodes/TeXAtom.ts
@@ -42,7 +42,7 @@ export class TeXAtom extends AbstractMmlBaseNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/menclose.ts b/ts/core/MmlTree/MmlNodes/menclose.ts
@@ -42,7 +42,7 @@ export class MmlMenclose extends AbstractMmlNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * The menclose kind

diff --git a/ts/core/MmlTree/MmlNodes/merror.ts b/ts/core/MmlTree/MmlNodes/merror.ts
@@ -41,7 +41,7 @@ export class MmlMerror extends AbstractMmlNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/mfenced.ts b/ts/core/MmlTree/MmlNodes/mfenced.ts
@@ -44,7 +44,7 @@ export class MmlMfenced extends AbstractMmlNode {
   /**
    * TeX class is INNER
    */
-  public texClass = TEXCLASS.INNER;
+  protected texclass = TEXCLASS.INNER;
 
   /**
    * Storage for "fake" nodes for the separators

diff --git a/ts/core/MmlTree/MmlNodes/mglyph.ts b/ts/core/MmlTree/MmlNodes/mglyph.ts
@@ -46,7 +46,7 @@ export class MmlMglyph extends AbstractMmlTokenNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/mi.ts b/ts/core/MmlTree/MmlNodes/mi.ts
@@ -50,7 +50,7 @@ export class MmlMi extends AbstractMmlTokenNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/mn.ts b/ts/core/MmlTree/MmlNodes/mn.ts
@@ -41,7 +41,7 @@ export class MmlMn extends AbstractMmlTokenNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/mphantom.ts b/ts/core/MmlTree/MmlNodes/mphantom.ts
@@ -41,7 +41,7 @@ export class MmlMphantom extends AbstractMmlLayoutNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/mroot.ts b/ts/core/MmlTree/MmlNodes/mroot.ts
@@ -41,7 +41,7 @@ export class MmlMroot extends AbstractMmlNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/ms.ts b/ts/core/MmlTree/MmlNodes/ms.ts
@@ -43,7 +43,7 @@ export class MmlMs extends AbstractMmlTokenNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/mspace.ts b/ts/core/MmlTree/MmlNodes/mspace.ts
@@ -45,7 +45,7 @@ export class MmlMspace extends AbstractMmlTokenNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/msqrt.ts b/ts/core/MmlTree/MmlNodes/msqrt.ts
@@ -41,7 +41,7 @@ export class MmlMsqrt extends AbstractMmlNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/mtable.ts b/ts/core/MmlTree/MmlNodes/mtable.ts
@@ -67,7 +67,7 @@ export class MmlMtable extends AbstractMmlNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/MmlTree/MmlNodes/mtext.ts b/ts/core/MmlTree/MmlNodes/mtext.ts
@@ -41,7 +41,7 @@ export class MmlMtext extends AbstractMmlTokenNode {
   /**
    * TeX class is ORD
    */
-  public texClass = TEXCLASS.ORD;
+  protected texclass = TEXCLASS.ORD;
 
   /**
    * @override

diff --git a/ts/core/Tree/Node.ts b/ts/core/Tree/Node.ts
@@ -37,6 +37,10 @@ export type PropertyList = {[key: string]: Property};
 
 export interface Node {
   readonly kind: string;
+  /**
+   * The NodeFactory to use to create additional nodes, as needed
+   */
+  readonly factory: NodeFactory<Node, NodeClass>;
   parent: Node;
   childNodes: Node[];
 
@@ -143,11 +147,6 @@ export abstract class AbstractNode implements Node {
    */
   protected properties: PropertyList = {};
 
-  /**
-   * The NodeFactory to use to create additional nodes, as needed
-   */
-  protected _factory: NodeFactory<Node, NodeClass> = null;
-
   /**
    * The children for this node
    */
@@ -161,8 +160,7 @@ export abstract class AbstractNode implements Node {
    * @constructor
    * @implements {Node}
    */
-  constructor(factory: NodeFactory<Node, NodeClass>, properties: PropertyList = {}, children: Node[] = []) {
-    this._factory = factory;
+  constructor(readonly factory: NodeFactory<Node, NodeClass>, properties: PropertyList = {}, children: Node[] = []) {
     for (const name of Object.keys(properties)) {
       this.setProperty(name, properties[name]);
     }
@@ -171,13 +169,6 @@ export abstract class AbstractNode implements Node {
     }
   }
 
-  /**
-   * @override
-   */
-  public get factory () {
-    return this._factory;
-  }
-
   /**
    * @override
    */

diff --git a/ts/output/common/FontData.ts b/ts/output/common/FontData.ts
@@ -499,7 +499,7 @@ export class FontData<C extends CharOptions, V extends VariantData<C>, D extends
   /**
    * Any styles needed for the font
    */
-  public styles: StyleList;
+  protected _styles: StyleList;
 
   /**
    * @param {CharMap} font   The font to check
@@ -535,6 +535,20 @@ export class FontData<C extends CharOptions, V extends VariantData<C>, D extends
     this.defineRemap('mn', CLASS.defaultMnMap);
   }
 
+  /**
+   * Returns list of styles needed for the font
+   */
+  get styles(): StyleList {
+    return this._styles;
+  }
+
+  /**
+   * Sets styles needed for that font.
+   */
+  set styles(style: StyleList) {
+    this._styles = style;
+  }
+
   /**
    * Creates the data structure for a variant -- an object with
    *   prototype chain that includes a copy of the linked variant,