katex 0.16.32 → 0.16.34

package/src/functions/{accentunder.js → accentunder.ts}

@@ -1,4 +1,3 @@
-// @flow
 // Horizontal overlap functions
 import defineFunction from "../defineFunction";
 import {makeSpan, makeVList} from "../buildCommon";

package/src/functions/{arrow.js → arrow.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction from "../defineFunction";
 import {makeSpan, makeVList, wrapFragment} from "../buildCommon";
 import {MathNode} from "../mathMLTree";
@@ -8,9 +7,10 @@ import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
 
 import type {ParseNode} from "../parseNode";
+import type {MathDomNode} from "../mathMLTree";
 
 // Helper function
-const paddedNode = group => {
+const paddedNode = (group?: MathDomNode | null | undefined) => {
     const node = new MathNode("mpadded", group ? [group] : []);
     node.setAttribute("width", "+0.6em");
     node.setAttribute("lspace", "0.3em");
@@ -46,8 +46,6 @@ defineFunction({
             below: optArgs[0],
         };
     },
-    // Flow is unable to correctly infer the type of `group`, even though it's
-    // unambiguously determined from the passed-in `type` above.
     htmlBuilder(group: ParseNode<"xArrow">, options) {
         const style = options.style;
 
@@ -108,8 +106,8 @@ defineFunction({
             }, options);
         }
 
-        // $FlowFixMe: Replace this with passing "svg-align" into makeVList.
-        vlist.children[0].children[0].children[1].classes.push("svg-align");
+        // TODO(ts): Replace this with passing "svg-align" into makeVList.
+        (vlist as any).children[0].children[0].children[1].classes.push("svg-align");
 
         return makeSpan(["mrel", "x-arrow"], [vlist], options);
     },

package/src/functions/{char.js → char.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction from "../defineFunction";
 import ParseError from "../ParseError";
 import {assertNodeType} from "../parseNode";

package/src/functions/{color.js → color.ts}

@@ -1,15 +1,14 @@
-// @flow
 import defineFunction, {ordargument} from "../defineFunction";
 import {makeFragment} from "../buildCommon";
 import {MathNode} from "../mathMLTree";
 import {assertNodeType} from "../parseNode";
-
-import type {AnyParseNode} from '../parseNode';
+import type {AnyParseNode} from "../parseNode";
+import type {HtmlBuilder, MathMLBuilder} from "../defineFunction";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
 
-const htmlBuilder = (group, options) => {
+const htmlBuilder: HtmlBuilder<"color"> = (group, options) => {
     const elements = html.buildExpression(
         group.body,
         options.withColor(group.color),
@@ -23,7 +22,7 @@ const htmlBuilder = (group, options) => {
     return makeFragment(elements);
 };
 
-const mathmlBuilder = (group, options) => {
+const mathmlBuilder: MathMLBuilder<"color"> = (group, options) => {
     const inner = mml.buildExpression(group.body,
         options.withColor(group.color));
 
@@ -49,7 +48,7 @@ defineFunction({
             type: "color",
             mode: parser.mode,
             color,
-            body: (ordargument(body): AnyParseNode[]),
+            body: (ordargument(body) as AnyParseNode[]),
         };
     },
     htmlBuilder,

package/src/functions/{cr.js → cr.ts}

@@ -1,4 +1,3 @@
-//@flow
 // Row breaks within tabular environments, and line breaks at top level
 
 import defineFunction from "../defineFunction";

package/src/functions/{def.js → def.ts}

@@ -1,9 +1,11 @@
-//@flow
 import defineFunction from "../defineFunction";
 import ParseError from "../ParseError";
 import {assertNodeType} from "../parseNode";
+import {Token} from "../Token";
 
-const globalMap = {
+import type Parser from "../Parser";
+
+const globalMap: Record<string, string> = {
     "\\global": "\\global",
     "\\long": "\\\\globallong",
     "\\\\globallong": "\\\\globallong",
@@ -15,7 +17,7 @@ const globalMap = {
     "\\futurelet": "\\\\globalfuture",
 };
 
-const checkControlSequence = (tok) => {
+const checkControlSequence = (tok: Token): string => {
     const name = tok.text;
     if (/^(?:[\\{}$&#^_]|EOF)$/.test(name)) {
         throw new ParseError("Expected a control sequence", tok);
@@ -23,7 +25,7 @@ const checkControlSequence = (tok) => {
     return name;
 };
 
-const getRHS = (parser) => {
+const getRHS = (parser: Parser): Token => {
     let tok = parser.gullet.popToken();
     if (tok.text === "=") { // consume optional equals
         tok = parser.gullet.popToken();
@@ -34,7 +36,7 @@ const getRHS = (parser) => {
     return tok;
 };
 
-const letCommand = (parser, name, tok, global) => {
+const letCommand = (parser: Parser, name: string, tok: Token, global: boolean) => {
     let macro = parser.gullet.macros.get(tok.text);
     if (macro == null) {
         // don't expand it later even if a macro with the same name is defined
@@ -98,8 +100,8 @@ defineFunction({
         }
 
         let numArgs = 0;
-        let insert;
-        const delimiters = [[]];
+        let insert: Token | undefined;
+        const delimiters: string[][] = [[]];
         // <parameter text> contains no braces
         while (parser.gullet.future().text !== "{") {
             tok = parser.gullet.popToken();

package/src/functions/{delimsizing.js → delimsizing.ts}

@@ -1,4 +1,3 @@
-// @flow
 import {makeSpan} from "../buildCommon";
 import defineFunction from "../defineFunction";
 import {makeLeftRightDelim, makeSizedDelim, sizeToMaxHeight} from "../delimiter";
@@ -15,7 +14,10 @@ import type {AnyParseNode, ParseNode, SymbolParseNode} from "../parseNode";
 import type {FunctionContext} from "../defineFunction";
 
 // Extra data needed for the delimiter handler down below
-const delimiterSizes = {
+const delimiterSizes: Record<string, {
+    mclass: "mopen" | "mclose" | "mrel" | "mord";
+    size: 1 | 2 | 3 | 4;
+}> = {
     "\\bigl" : {mclass: "mopen",    size: 1},
     "\\Bigl" : {mclass: "mopen",    size: 2},
     "\\biggl": {mclass: "mopen",    size: 3},
@@ -161,7 +163,7 @@ defineFunction({
             type: "leftright-right",
             mode: context.parser.mode,
             delim: checkDelimiter(args[0], context).text,
-            color, // undefined if not set via \color
+            color: color as string | null | undefined, // undefined if not set via \color
         };
     },
 });
@@ -209,8 +211,8 @@ defineFunction({
         for (let i = 0; i < inner.length; i++) {
             // Property `isMiddle` not defined on `span`. See comment in
             // "middle"'s htmlBuilder.
-            // $FlowFixMe
-            if (inner[i].isMiddle) {
+            // TODO(ts)
+            if ((inner[i] as any).isMiddle) {
                 hadMiddle = true;
             } else {
                 innerHeight = Math.max(inner[i].height, innerHeight);
@@ -244,8 +246,8 @@ defineFunction({
                 const middleDelim = inner[i];
                 // Property `isMiddle` not defined on `span`. See comment in
                 // "middle"'s htmlBuilder.
-                // $FlowFixMe
-                const isMiddle: IsMiddle = middleDelim.isMiddle;
+                // TODO(ts)
+                const isMiddle: IsMiddle = (middleDelim as any).isMiddle;
                 if (isMiddle) {
                     // Apply the options that were active when \middle was called
                     inner[i] = makeLeftRightDelim(
@@ -334,8 +336,8 @@ defineFunction({
             // this file above.
             // TODO: Fix this violation of the `span` type and possibly rename
             // things since `isMiddle` sounds like a boolean, but is a struct.
-            // $FlowFixMe
-            middleDelim.isMiddle = isMiddle;
+            // TODO(ts)
+            (middleDelim as any).isMiddle = isMiddle;
         }
         return middleDelim;
     },

package/src/functions/{enclose.js → enclose.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction from "../defineFunction";
 import {makeSpan, makeSvgSpan, makeVList, wrapFragment} from "../buildCommon";
 import {isCharacterBox} from "../utils";
@@ -11,9 +10,9 @@ import {assertNodeType} from "../parseNode";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
+import type {HtmlBuilder, MathMLBuilder} from "../defineFunction";
 
-
-const htmlBuilder = (group, options) => {
+const htmlBuilder: HtmlBuilder<"enclose"> = (group, options) => {
     // \cancel, \bcancel, \xcancel, \sout, \fbox, \colorbox, \fcolorbox, \phase
     // Some groups can return document fragments.  Handle those by wrapping
     // them in a span.
@@ -165,7 +164,7 @@ const htmlBuilder = (group, options) => {
     }
 };
 
-const mathmlBuilder = (group, options) => {
+const mathmlBuilder: MathMLBuilder<"enclose"> = (group, options) => {
     let fboxsep = 0;
     const node = new MathNode(
         group.label.includes("colorbox") ? "mpadded" : "menclose",

package/src/functions/{environment.js → environment.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction from "../defineFunction";
 import ParseError from "../ParseError";
 import {assertNodeType} from "../parseNode";
@@ -48,8 +47,8 @@ defineFunction({
                     `Mismatch: \\begin{${envName}} matched by \\end{${end.name}}`,
                     endNameToken);
             }
-            // $FlowFixMe, "environment" handler returns an environment ParseNode
-            return result;
+            // TODO(ts), "environment" handler returns an environment ParseNode
+            return result as any;
         }
 
         return {

package/src/functions/{font.js → font.ts}

@@ -1,4 +1,3 @@
-// @flow
 // TODO(kevinb): implement \\sl and \\sc
 
 import {binrelClass} from "./mclass";
@@ -8,21 +7,22 @@ import {isCharacterBox} from "../utils";
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
 
+import type Options from "../Options";
 import type {ParseNode} from "../parseNode";
 
-const htmlBuilder = (group: ParseNode<"font">, options) => {
+const htmlBuilder = (group: ParseNode<"font">, options: Options) => {
     const font = group.font;
     const newOptions = options.withFont(font);
     return html.buildGroup(group.body, newOptions);
 };
 
-const mathmlBuilder = (group: ParseNode<"font">, options) => {
+const mathmlBuilder = (group: ParseNode<"font">, options: Options) => {
     const font = group.font;
     const newOptions = options.withFont(font);
     return mml.buildGroup(group.body, newOptions);
 };
 
-const fontAliases = {
+const fontAliases: Record<string, string> = {
     "\\Bbb": "\\mathbb",
     "\\bold": "\\mathbf",
     "\\frak": "\\mathfrak",

package/src/functions/{genfrac.js → genfrac.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction, {normalizeArgument} from "../defineFunction";
 import {makeLineSpan, makeSpan, makeVList} from "../buildCommon";
 import {makeCustomSizedDelim} from "../delimiter";
@@ -6,13 +5,13 @@ import {MathNode, TextNode} from "../mathMLTree";
 import type {ParseNode} from "../parseNode";
 import Style from "../Style";
 import {assertNodeType} from "../parseNode";
-import type {StyleStr} from "../types";
-
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
 import {calculateSize, makeEm} from "../units";
+import type {StyleStr} from "../types";
+import type {HtmlBuilder, MathMLBuilder} from "../defineFunction";
 
-const htmlBuilder = (group, options) => {
+const htmlBuilder: HtmlBuilder<"genfrac"> = (group, options) => {
     // Fractions are handled in the TeXbook on pages 444-445, rules 15(a-e).
     const style = options.style;
 
@@ -165,7 +164,7 @@ const htmlBuilder = (group, options) => {
         options);
 };
 
-const mathmlBuilder = (group, options) => {
+const mathmlBuilder: MathMLBuilder<"genfrac"> = (group, options) => {
     const node = new MathNode(
         "mfrac",
         [
@@ -228,7 +227,7 @@ const wrapWithStyle = (
         body: [frac],
     };
 
-    // $FlowFixMe: defineFunction handler needs to return ParseNode<"genfrac">
+    // @ts-ignore defineFunction handler needs to return ParseNode<"genfrac">
     return wrapper;
 };
 
@@ -247,9 +246,9 @@ defineFunction({
     handler: ({parser, funcName}, args) => {
         const numer = args[0];
         const denom = args[1];
-        let hasBarLine;
-        let leftDelim = null;
-        let rightDelim = null;
+        let hasBarLine: boolean;
+        let leftDelim: string | null = null;
+        let rightDelim: string | null = null;
 
         switch (funcName) {
             case "\\cfrac":
@@ -285,9 +284,9 @@ defineFunction({
         const continued = funcName === "\\cfrac";
         let style = null;
         if (continued || funcName.startsWith("\\d")) {
-            style = "display";
+            style = "display" as StyleStr;
         } else if (funcName.startsWith("\\t")) {
-            style = "text";
+            style = "text" as StyleStr;
         }
 
         return wrapWithStyle({
@@ -346,7 +345,7 @@ defineFunction({
     },
 });
 
-const stylArray = ["display", "text", "script", "scriptscript"];
+const stylArray: StyleStr[] = ["display", "text", "script", "scriptscript"];
 
 const delimFromValue = function(delimString: string): string | null {
     let delim = null;
@@ -378,7 +377,7 @@ defineFunction({
             ? delimFromValue(rightNode.text) : null;
 
         const barNode = assertNodeType(args[2], "size");
-        let hasBarLine;
+        let hasBarLine: boolean;
         let barSize = null;
         if (barNode.isBlank) {
             // \genfrac acts differently than \above.
@@ -396,11 +395,11 @@ defineFunction({
         if (styl.type === "ordgroup") {
             if (styl.body.length > 0) {
                 const textOrd = assertNodeType(styl.body[0], "textord");
-                size = stylArray[Number(textOrd.text)];
+                size = stylArray[Number(textOrd.text)] as StyleStr;
             }
         } else {
             styl = assertNodeType(styl, "textord");
-            size = stylArray[Number(styl.text)];
+            size = stylArray[Number(styl.text)] as StyleStr;
         }
 
         return wrapWithStyle({

package/src/functions/{hbox.js → hbox.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction, {ordargument} from "../defineFunction";
 import {makeFragment} from "../buildCommon";
 import {MathNode} from "../mathMLTree";

package/src/functions/{horizBrace.js → horizBrace.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction from "../defineFunction";
 import {makeSpan, makeVList} from "../buildCommon";
 import {MathNode} from "../mathMLTree";
@@ -51,8 +50,8 @@ export const htmlBuilder: HtmlBuilderSupSub<"horizBrace"> = (grp, options) => {
                 {type: "elem", elem: braceBody},
             ],
         }, options);
-        // $FlowFixMe: Replace this with passing "svg-align" into makeVList.
-        vlist.children[0].children[0].children[1].classes.push("svg-align");
+        // TODO(ts): Replace this with passing "svg-align" into makeVList.
+        (vlist as any).children[0].children[0].children[1].classes.push("svg-align");
     } else {
         vlist = makeVList({
             positionType: "bottom",
@@ -63,8 +62,8 @@ export const htmlBuilder: HtmlBuilderSupSub<"horizBrace"> = (grp, options) => {
                 {type: "elem", elem: body},
             ],
         }, options);
-        // $FlowFixMe: Replace this with passing "svg-align" into makeVList.
-        vlist.children[0].children[0].children[0].classes.push("svg-align");
+        // TODO(ts): Replace this with passing "svg-align" into makeVList.
+        (vlist as any).children[0].children[0].children[0].classes.push("svg-align");
     }
 
     if (supSubGroup) {

package/src/functions/{href.js → href.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction, {ordargument} from "../defineFunction";
 import {makeAnchor} from "../buildCommon";
 import {assertNodeType} from "../parseNode";
@@ -6,6 +5,7 @@ import {MathNode} from "../mathMLTree";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
+import type {ParseNode} from "../parseNode";
 
 defineFunction({
     type: "href",
@@ -42,7 +42,7 @@ defineFunction({
         if (!(math instanceof MathNode)) {
             math = new MathNode("mrow", [math]);
         }
-        math.setAttribute("href", group.href);
+        (math as MathNode).setAttribute("href", group.href);
         return math;
     },
 });
@@ -65,7 +65,7 @@ defineFunction({
             return parser.formatUnsupportedCmd("\\url");
         }
 
-        const chars = [];
+        const chars: ParseNode<"textord">[] = [];
         for (let i = 0; i < href.length; i++) {
             let c = href[i];
             if (c === "~") {
@@ -77,7 +77,7 @@ defineFunction({
                 text: c,
             });
         }
-        const body = {
+        const body: ParseNode<"text"> = {
             type: "text",
             mode: parser.mode,
             font: "\\texttt",

package/src/functions/{html.js → html.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction, {ordargument} from "../defineFunction";
 import {makeSpan} from "../buildCommon";
 import {assertNodeType} from "../parseNode";
@@ -6,6 +5,7 @@ import ParseError from "../ParseError";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
+import type {AnyTrustContext} from "../Settings";
 
 defineFunction({
     type: "html",
@@ -24,8 +24,8 @@ defineFunction({
                 "HTML extension is disabled on strict mode");
         }
 
-        let trustContext;
-        const attributes = {};
+        let trustContext: AnyTrustContext;
+        const attributes: Record<string, string> = {};
 
         switch (funcName) {
             case "\\htmlClass":

package/src/functions/{htmlmathml.js → htmlmathml.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction, {ordargument} from "../defineFunction";
 import {makeFragment} from "../buildCommon";
 

package/src/functions/{includegraphics.js → includegraphics.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction from "../defineFunction";
 import type {Measurement} from "../units";
 import {calculateSize, validUnit, makeEm} from "../units";

package/src/functions/{kern.js → kern.ts}

@@ -1,4 +1,3 @@
-//@flow
 // Horizontal spacing commands
 
 import defineFunction from "../defineFunction";

package/src/functions/{lap.js → lap.ts}

@@ -1,4 +1,3 @@
-// @flow
 // Horizontal overlap functions
 import defineFunction from "../defineFunction";
 import {makeSpan} from "../buildCommon";

package/src/functions/{math.js → math.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction from "../defineFunction";
 import ParseError from "../ParseError";
 

package/src/functions/{mathchoice.js → mathchoice.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction, {ordargument} from "../defineFunction";
 import {makeFragment} from "../buildCommon";
 import Style from "../Style";
@@ -6,9 +5,10 @@ import Style from "../Style";
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
 
+import type Options from "../Options";
 import type {ParseNode} from "../parseNode";
 
-const chooseMathStyle = (group: ParseNode<"mathchoice">, options) => {
+const chooseMathStyle = (group: ParseNode<"mathchoice">, options: Options) => {
     switch (options.style.size) {
         case Style.DISPLAY.size: return group.display;
         case Style.TEXT.size: return group.text;

package/src/functions/{mclass.js → mclass.ts}

@@ -1,4 +1,3 @@
-// @flow
 import defineFunction, {ordargument} from "../defineFunction";
 import {makeSpan} from "../buildCommon";
 import {isCharacterBox} from "../utils";
@@ -8,14 +7,15 @@ import type {AnyParseNode} from "../parseNode";
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
 
+import type Options from "../Options";
 import type {ParseNode} from "../parseNode";
 
-function htmlBuilder(group: ParseNode<"mclass">, options) {
+function htmlBuilder(group: ParseNode<"mclass">, options: Options) {
     const elements = html.buildExpression(group.body, options, true);
     return makeSpan([group.mclass], elements, options);
 }
 
-function mathmlBuilder(group: ParseNode<"mclass">, options) {
+function mathmlBuilder(group: ParseNode<"mclass">, options: Options) {
     let node: MathNode;
     const inner = mml.buildExpression(group.body, options);
 
@@ -133,7 +133,7 @@ defineFunction({
             mclass = "mrel";  // for \stackrel
         }
 
-        const baseOp = {
+        const baseOp: ParseNode<"op"> = {
             type: "op",
             mode: baseArg.mode,
             limits: true,
@@ -144,7 +144,7 @@ defineFunction({
             body: ordargument(baseArg),
         };
 
-        const supsub = {
+        const supsub: ParseNode<"supsub"> = {
             type: "supsub",
             mode: shiftedArg.mode,
             base: baseOp,
@@ -163,4 +163,3 @@ defineFunction({
     htmlBuilder,
     mathmlBuilder,
 });
-

package/src/functions/{op.js → op.ts}

@@ -1,4 +1,3 @@
-// @flow
 // Limits, symbols
 import defineFunction, {ordargument} from "../defineFunction";
 import {mathsym, makeSpan, makeSymbol, makeVList, staticSvg} from "../buildCommon";
@@ -83,8 +82,8 @@ export const htmlBuilder: HtmlBuilderSupSub<"op"> = (grp, options) => {
             }, options);
             group.name = "\\" + stash;
             base.classes.unshift("mop");
-            // $FlowFixMe
-            base.italic = italic;
+            // TODO(ts)
+            (base as any).italic = italic;
         }
     } else if (group.body) {
         // If this is a list, compose that list.
@@ -99,8 +98,8 @@ export const htmlBuilder: HtmlBuilderSupSub<"op"> = (grp, options) => {
         // Otherwise, this is a text operator. Build the text from the
         // operator's name.
         const output = [];
-        for (let i = 1; i < group.name.length; i++) {
-            output.push(mathsym(group.name[i], group.mode, options));
+        for (let i = 1; i < group.name!.length; i++) {
+            output.push(mathsym(group.name![i], group.mode, options));
         }
         base = makeSpan(["mop"], output, options);
     }
@@ -121,8 +120,8 @@ export const htmlBuilder: HtmlBuilderSupSub<"op"> = (grp, options) => {
             options.fontMetrics().axisHeight;
 
         // The slant of the symbol is just its italic correction.
-        // $FlowFixMe
-        slant = base.italic;
+        // TODO(ts)
+        slant = (base as SymbolNode & {italic?: number}).italic || 0;
     }
 
     if (hasLimits) {
@@ -157,7 +156,7 @@ const mathmlBuilder: MathMLBuilder<"op"> = (group, options) => {
         // This is a text operator. Add all the characters from the
         // operator's name.
         node = new MathNode(
-            "mi", [new TextNode(group.name.slice(1))]);
+            "mi", [new TextNode(group.name!.slice(1))]);
         // Append an <mo>&ApplyFunction;</mo>.
         // ref: https://www.w3.org/TR/REC-MathML/chap3_2.html#sec3.2.4
         const operator = new MathNode("mo",
@@ -172,7 +171,7 @@ const mathmlBuilder: MathMLBuilder<"op"> = (group, options) => {
     return node;
 };
 
-const singleCharBigOps: {[string]: string} = {
+const singleCharBigOps: Record<string, string> = {
     "\u220F": "\\prod",
     "\u2210": "\\coprod",
     "\u2211": "\\sum",
@@ -244,8 +243,7 @@ defineFunction({
 // There are 2 flags for operators; whether they produce limits in
 // displaystyle, and whether they are symbols and should grow in
 // displaystyle. These four groups cover the four possible choices.
-
-const singleCharIntegrals: {[string]: string} = {
+const singleCharIntegrals: Record<string, string> = {
     "\u222b": "\\int",
     "\u222c": "\\iint",
     "\u222d": "\\iiint",