Math directive with label

* Better typing for options

Author: rowanc1

src/directives/admonitions.ts

@@ -18,7 +18,7 @@ class BaseAdmonition extends Directive {
     name: unchanged
   }
   public title = ""
-  run(data: IDirectiveData): Token[] {
+  run(data: IDirectiveData<keyof BaseAdmonition["option_spec"]>): Token[] {
     const newTokens: Token[] = []
 
     // we create an overall container, then individual containers for the title and body

src/directives/code.ts

@@ -29,7 +29,7 @@ export class Code extends Directive {
     name: unchanged,
     class: class_option
   }
-  run(data: IDirectiveData): Token[] {
+  run(data: IDirectiveData<keyof Code["option_spec"]>): Token[] {
     // TODO handle options
     this.assert_has_content(data)
     const token = this.createToken("fence", "code", 0, {
@@ -68,7 +68,7 @@ export class CodeBlock extends Directive {
     name: unchanged,
     class: class_option
   }
-  run(data: IDirectiveData): Token[] {
+  run(data: IDirectiveData<keyof CodeBlock["option_spec"]>): Token[] {
     // TODO handle options
     this.assert_has_content(data)
     const token = this.createToken("fence", "code", 0, {
@@ -89,7 +89,7 @@ export class CodeCell extends Directive {
   public has_content = true
   public rawOptions = true
 
-  run(data: IDirectiveData): Token[] {
+  run(data: IDirectiveData<keyof CodeCell["option_spec"]>): Token[] {
     // TODO store options and the fact that this is a code cell rather than a fence?
     const token = this.createToken("fence", "code", 0, {
       info: data.args ? data.args[0] : "",

src/directives/images.ts

@@ -38,7 +38,7 @@ export class Image extends Directive {
     ...shared_option_spec,
     align: create_choice(["left", "center", "right", "top", "middle", "bottom"])
   }
-  create_image(data: IDirectiveData): Token {
+  create_image(data: IDirectiveData<keyof Image["option_spec"]>): Token {
     // get URI
     const src = uri(data.args[0] || "")
 
@@ -89,7 +89,7 @@ export class Figure extends Image {
     figclass: class_option
   }
   public has_content = true
-  run(data: IDirectiveData): Token[] {
+  run(data: IDirectiveData<keyof Figure["option_spec"]>): Token[] {
     const openToken = this.createToken("figure_open", "figure", 1, { map: data.map })
     if (data.options.figclass) {
       openToken.attrJoin("class", data.options.figclass.join(" "))

src/directives/main.ts

@@ -65,9 +65,7 @@ export interface IDirectiveSpec {
   /** if body content is allowed */
   has_content?: boolean
   /** mapping known option names to conversion functions */
-  option_spec?: {
-    [key: string]: OptionSpecConverter
-  }
+  option_spec?: Record<string, OptionSpecConverter>
   /** If true, do not attempt to validate/convert options. */
   rawOptions?: boolean
 }
@@ -153,10 +151,10 @@ export class Directive implements IDirectiveSpec {
 }
 
 /** Data structure of a directive */
-export interface IDirectiveData {
+export interface IDirectiveData<T extends string = string> {
   map: [number, number]
   args: string[]
-  options: { [key: string]: any }
+  options: Record<T, any>
   body: string
   bodyMap: [number, number]
 }

src/directives/math.ts

@@ -0,0 +1,35 @@
+/** Admonitions to visualise programming codes */
+import type Token from "markdown-it/lib/token"
+import { Directive, IDirectiveData } from "./main"
+import { unchanged } from "./options"
+
+/** Math directive with a label
+ */
+export class Math extends Directive {
+  public required_arguments = 0
+  public optional_arguments = 0
+  public final_argument_whitespace = false
+  public has_content = true
+  public option_spec = {
+    label: unchanged
+  }
+  run(data: IDirectiveData<keyof Math["option_spec"]>): Token[] {
+    // TODO handle options
+    this.assert_has_content(data)
+    const token = this.createToken("math_block", "div", 0, {
+      content: data.body,
+      map: data.bodyMap,
+      block: true
+    })
+    token.attrSet("class", "math block")
+    if (data.options.label) {
+      token.info = data.options.label
+      token.meta = { label: data.options.label, numbered: true }
+    }
+    return [token]
+  }
+}
+
+export const math = {
+  math: Math
+}

src/index.ts

@@ -6,6 +6,7 @@ import directivePlugin, { IOptions as IDirectiveOptions } from "./directives/plu
 import { tables } from "./directives/tables"
 import { roles } from "./roles/main"
 import rolePlugin, { IOptions as IRoleOptions } from "./roles/plugin"
+import { math } from "./directives/math"
 
 /** Allowed options for docutils plugin */
 export interface IOptions extends IDirectiveOptions, IRoleOptions {
@@ -18,7 +19,7 @@ const OptionDefaults: IOptions = {
   replaceFences: true,
   rolesAfter: "inline",
   directivesAfter: "block",
-  directives: { ...admonitions, ...images, ...code, ...tables },
+  directives: { ...admonitions, ...images, ...code, ...tables, ...math },
   roles: { ...roles }
 }
 

tests/fixtures/directives.math.md

@@ -0,0 +1,23 @@
+math directive
+.
+```{math}
+w_{t+1} = (1 + r_{t+1}) s(w_t) + y_{t+1}
+```
+.
+<div class="math block">
+w_{t+1} = (1 + r_{t+1}) s(w_t) + y_{t+1}
+</div>
+.
+
+math directive with label
+.
+```{math}
+:label: my_label
+w_{t+1} = (1 + r_{t+1}) s(w_t) + y_{t+1}
+```
+.
+<div class="math block">
+w_{t+1} = (1 + r_{t+1}) s(w_t) + y_{t+1}
+</div>
+.
+