annotate type for TexNode::type field

qwinsi · Sep 7, 2024 · d14c51c · d14c51c
1 parent 741b877
commit d14c51c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/parser.ts b/src/parser.ts
@@ -42,7 +42,7 @@ const BINARY_COMMANDS = [
     'tbinom',
 ]
 
-const EMPTY_NODE = { 'type': 'empty', 'content': '' }
+const EMPTY_NODE: TexNode = { type: 'empty', content: '' };
 
 function assert(condition: boolean, message: string = ''): void {
     if (!condition) {
@@ -586,12 +586,12 @@ export class LatexParser {
 
         const exprInside = tokens.slice(exprInsideStart, exprInsideEnd);
         const body = this.parse(exprInside);
-        const args = [
+        const args: TexNode[] = [
             { type: 'element', content: leftDelimiter.value },
             body,
             { type: 'element', content: rightDelimiter.value }
         ]
-        const res = { type: 'leftright', content: '', args: args };
+        const res: TexNode = { type: 'leftright', content: '', args: args };
         return [res, pos];
     }
 
@@ -630,7 +630,7 @@ export class LatexParser {
             exprInside.pop();
         }
         const body = this.parseAligned(exprInside);
-        const res = { type: 'beginend', content: envName, data: body };
+        const res: TexNode = { type: 'beginend', content: envName, data: body };
         return [res, pos];
     }
 

diff --git a/src/types.ts b/src/types.ts
@@ -9,7 +9,8 @@ export type TexSqrtData = TexNode;
 export type TexArrayData = TexNode[][];
 
 export interface TexNode {
-    type: string;
+    type: 'element' | 'text' | 'comment' | 'whitespace' | 'newline' | 'control' | 'ordgroup' | 'supsub'
+             | 'unaryFunc' | 'binaryFunc' | 'leftright' | 'beginend' | 'symbol' | 'empty' | 'unknownMacro';
     content: string;
     args?: TexNode[];
     // position?: Position;
@@ -20,7 +21,7 @@ export interface TexNode {
 }
 
 export interface TypstNode {
-    type: 'atom' | 'symbol' | 'text' | 'softSpace' | 'comment' | 'newline',
+    type: 'atom' | 'symbol' | 'text' | 'softSpace' | 'comment' | 'newline';
     content: string;
     args?: TypstNode[];
 }

diff --git a/src/writer.ts b/src/writer.ts
@@ -15,7 +15,7 @@ const TYPST_INTRINSIC_SYMBOLS = [
 ];
 
 export class TypstWriterError extends Error {
-    node: TexNode;
+    node: TexNode | TypstNode;
 
     constructor(message: string, node: TexNode | TypstNode) {
         super(message);
@@ -273,7 +273,6 @@ export class TypstWriter {
                 this.queue.push({ type: 'atom', content: ')'});
                 this.insideFunctionDepth --;
             }
-        } else if (node.type === 'matrix') {
         } else if (node.type === 'unknownMacro') {
             if (this.nonStrict) {
                 this.queue.push({ type: 'symbol', content: node.content });