desmost 0.1.2 → 0.3.0

package/dist/parser/generic-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"generic-parser.js","sourceRoot":"","sources":["../../src/parser/generic-parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generic-parser.js","sourceRoot":"","sources":["../../src/parser/generic-parser.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "desmost",
   "author": "Sup#2.0",
-  "version": "0.1.2",
+  "version": "0.3.0",
   "license": "MIT",
 
   "description": "A tiny DSL for compiling LaTeX to Desmos",
@@ -23,7 +23,8 @@
     "./src/",
     "./dist/",
     "package.json",
-    "LICENCE"
+    "LICENCE",
+    "README.md"
   ],
   "exports": {
     ".": {
@@ -51,6 +52,11 @@
     "json5": "^2.2"
   },
 
+  "peerDependencies":
+  {
+    "@types/desmos": "1.11"
+  },
+
   "devDependencies":
   {
     "@types/desmos": "1.11",
@@ -58,7 +64,7 @@
     "oxlint": "^1.78",
     "oxlint-tsgolint": "^7.0",
     "tsc-alias": "^1.9",
-    "typescript": "^7.0",
+    "typescript": "^6.0",
     "vitest": "^4.0"
   }
 }

package/src/compiler/evaluate.ts

@@ -69,6 +69,18 @@ export function evaluate_expr(
   if (errors.length > 0) {
     desmos.setExpression({ type: "text", text: errors.join("\n\n") });
   }
+
+  // @ts-expect-error: outdated types
+  if (expr.data.latex != undefined) {
+    // @ts-expect-error: outdated types
+    expr.data.latex = normalise_latex(expr.data.latex);
+
+    if (options.prettify) {
+      // @ts-expect-error: outdated types
+      expr.data.latex = prettify_latex(expr.data.latex);
+    }
+  }
+
   desmos.setExpression(expr.data);
 }
 
@@ -108,6 +120,41 @@ export function evaluate_error(
 }
 
 
+/**
+ * Remove line breaks from `latex` so Desmos can properly consume it.
+ */
+function normalise_latex(latex: string): string
+{
+  return latex.replaceAll("\n", " ");
+}
+
+
+/**
+ * Prettify `latex` to render nicely in Desmos, reflecting how you would type directly into Desmos.
+ * 
+ * This includes:
+ * 
+ * - Replace `()`, `[]`, etc. with `\left(\right)`
+ * - Replace `min()`, `max()`, etc. with `\operatorname{min}()`
+ */
+function prettify_latex(latex: string): string
+{
+  latex = latex.replaceAll(/(?<!\\left)\(/g, "\\left(");
+  latex = latex.replaceAll(/(?<!\\right)\)/g, "\\right)");
+  latex = latex.replaceAll(/(?<!\\left)\[/g, "\\left[");
+  latex = latex.replaceAll(/(?<!\\right)\]/g, "\\right]");
+  latex = latex.replaceAll("\\{", "\\left{");
+  latex = latex.replaceAll("\\}", "\\right}");
+
+  latex = latex.replaceAll(
+    /(?<=[^\w]|^)\\?(mean|median|count|total|repeat|join|sort|shuffle|unique|mod|ceil|floor|round|sign)(?=\(|\\left\()/g,
+    "\\operatorname{$1}"
+  );
+
+  return latex;
+}
+
+
 function format_error(
   e: UnrecoverableError,
   options: Required<DesmostOptions>,

package/src/compiler/options.ts

@@ -47,6 +47,13 @@ export interface DesmostOptions
    */
   ignore_trailing_blanks?: boolean
 
+  /**
+   * Prettify LaTeX output so it renders nicely in the Desmos editor?
+   * 
+   * Defaults to `true`, meaning LaTeX is prettified.
+   */
+  prettify?: boolean
+
   /**
    * Return debug diagnostics? This includes the unevaluated AST, and performance diagnostics.
    * 
@@ -71,6 +78,7 @@ export function set_default_options(options: Partial<DesmostOptions> | undefined
   options.ignore_line_breaks ??= false;
   options.ignore_trailing_blanks ??= false;
 
+  options.prettify ??= true;
   options.debug ??= false;
 
   return options as Required<DesmostOptions>;

package/src/errors.ts

@@ -29,18 +29,18 @@ export namespace UnrecoverableError
 
 
 /** The compiler encountered a non-fatal recoverable failure (usually during speculative parsing), which only results in internal backtracking. */
-export class RecoverableFail {}
+export const FAIL = Symbol("fail");
 
+/** The compiler encountered a non-fatal recoverable failure (usually during speculative parsing), which only results in internal backtracking. */
+export type RecoverableFail = typeof FAIL & { readonly __brand?: unique symbol };
 
-/** Indicates that a function may throw a `RecoverableFail`. */
-export type Recoverable<Result> = Result | Result & { readonly __brand?: unique symbol };
 
 /** Indicates that a function may throw an `UnrecoverableError`. */
-export type Unrecoverable<Result> = Result | Result & { readonly __brand?: unique symbol };;
+export type Unrecoverable<Result> = Result | Result & { readonly __brand?: unique symbol };
 
 /**
- * Indicates that a function may throw either a `RecoverableFail` *or* an `UnrecoverableError`.
+ * Indicates that a function may either return a `RecoverableFail` *or* throw an `UnrecoverableError`.
  * 
  * This is used in potentially ambiguous cases. For instance, the user might have invoked an unknown incantation, in which case we might want to `RecoverableFail` and fallback to parsing it as LaTeX; on the other hand, if they invoked a valid incantation, but did not supply the required argument, that's a definite `UnrecoverableError`.
  */
-export type MaybeRecoverable<Result> = Recoverable<Result> | Unrecoverable<Result>;
+export type MaybeRecoverable<Result> = RecoverableFail | Unrecoverable<Result>;

package/src/magic/local/index.ts

@@ -3,11 +3,12 @@ import { AnimIncantation } from "./anim";
 
 import { ColourIncantation } from "./colour";
 import { DashedIncantation } from "./dashed";
-import { FillIncantation } from "./fill";
-import { HideIncantation } from "./hide";
-import { LineIncantation } from "./line";
+import { FillIncantation   } from "./fill";
+import { HideIncantation   } from "./hide";
+import { LabelIncantation  } from "./label";
+import { LineIncantation   } from "./line";
 import { NoLineIncantation } from "./no-line";
-import { PointIncantation } from "./point";
+import { PointIncantation  } from "./point";
 import { SecretIncantation } from "./secret";
 import { SliderIncantation } from "./slider";
 
@@ -19,6 +20,7 @@ export const LOCAL_INCANTATIONS: Incantation<LOCAL>[] =
   new DashedIncantation(),
   new FillIncantation(),
   new HideIncantation(),
+  new LabelIncantation(),
   new LineIncantation(),
   new NoLineIncantation(),
   new PointIncantation(),

package/src/magic/local/label.ts

@@ -0,0 +1,58 @@
+import { UnrecoverableError } from "../../errors";
+import { Incantation, ArgIncantation, type LOCAL } from "../incantation";
+
+
+interface LabelOptions
+{
+  text: string;
+  show?: boolean;
+  size?: number | keyof typeof Desmos.LabelSizes;
+  pos?: keyof typeof Desmos.LabelOrientations;
+}
+
+
+export class LabelIncantation extends ArgIncantation<LOCAL>
+{
+  override readonly description
+    = ""
+
+  override readonly identifier   = "label"
+  override readonly requires_arg = true
+  override readonly arg_type     = Incantation.ArgType.OBJECT
+
+  override apply(target: Desmos.ExpressionState, data: LabelOptions)
+  {
+    super.require_expr_type(target.type, "expression");
+    target.label = data.text;
+    if (data.show != undefined) target.showLabel = data.show;
+    // @ts-expect-error: outdated types TODO check
+    if (data.size != undefined) target.labelSize = data.size;
+    if (data.pos  != undefined) target.labelOrientation = data.pos;
+  }
+
+  override evaluate_arg(raw: string): LabelOptions
+  {
+    let out = super.evaluate_arg(raw) as LabelOptions;
+
+    if (!("text" in out)) {
+      throw new UnrecoverableError.InvalidArgument(
+        `/label requires a \`text\` argument, such as: \`/label{ text: "sup world!" }\``
+      );
+    }
+
+    if (typeof out.pos != "undefined") {
+      switch (out.pos.trim().toUpperCase()) {
+        case "ABOVE": out.pos = Desmos.LabelOrientations.ABOVE; break;
+        case "BELOW": out.pos = Desmos.LabelOrientations.BELOW; break;
+        case "LEFT":  out.pos = Desmos.LabelOrientations.LEFT; break;
+        case "RIGHT": out.pos = Desmos.LabelOrientations.RIGHT; break;
+        default:
+          throw new UnrecoverableError.InvalidArgument(
+            `/label: Invalid label position: ${out.pos}`
+          );
+      }
+    }
+
+    return out;
+  }
+}

package/src/parser/desmost-parser.ts

@@ -1,8 +1,8 @@
 import { GenericParser } from "./generic-parser";
 import { Ast } from "./ast";
 
-import { RecoverableFail, UnrecoverableError } from "../errors";
-import type { Recoverable, Unrecoverable, MaybeRecoverable } from "../errors";
+import { FAIL, UnrecoverableError } from "../errors";
+import type { RecoverableFail, Unrecoverable, MaybeRecoverable } from "../errors";
 
 import {
   Incantation, ArgIncantation,
@@ -18,9 +18,9 @@ import type { DesmostOptions } from "../compiler";
  */
 export class DesmostParser extends GenericParser
 {
-  constructor(source: string, options?: DesmostOptions)
+  constructor(source: string, protected options?: DesmostOptions)
   {
-    super(options?.ignore_trailing_blanks ? source : (source + "\n"));
+    super(source + "\n");
   }
 
 
@@ -48,6 +48,10 @@ export class DesmostParser extends GenericParser
       // 1+ locals + 1 expr
       let incantations = r.local;
 
+      if (incantations.length > 0) {
+        this.parse_sep();
+      }
+
       var expr = this.parse_post_sep();
 
       for (let invocation of incantations) {
@@ -80,34 +84,23 @@ export class DesmostParser extends GenericParser
     >
   {
     // 1 global incantation
-    try {
-      let r = this.try_parse_global_incantation();
+    let r = this.try_parse_global_incantation();
 
+    if (r !== FAIL) {
       this.consume_end_of_block(
         `Received excess input after global incantation /${r.incantation.identifier}`
       );
 
       return { global: r };
     }
-    catch (e) {
-      if (!(e instanceof RecoverableFail)) throw e;
-    }
 
+    // 1+ local incantations
     let incantations = [];
 
-    // 1+ local incantations
     while (this.current === "/") {
-      try {
-        incantations.push(this.try_parse_local_incantation());
-      }
-      catch (e) {
-        if (!(e instanceof RecoverableFail)) throw e;
-        break;
-      }
-    }
-
-    if (incantations.length > 0) {
-      this.parse_sep();
+      let invocation = this.try_parse_local_incantation();
+      if (invocation === FAIL) break;
+      incantations.push(invocation);
     }
 
     return { local: incantations };
@@ -122,6 +115,7 @@ export class DesmostParser extends GenericParser
     this.consume("::",
       `Expected \`::\` separator between local incantations and expression, but found: \`${this.preview()}\``
     );
+    this.consume_whitespace();
   }
 
   /**
@@ -145,11 +139,9 @@ export class DesmostParser extends GenericParser
 
       // expr incantation
       case "/":
-        try {
-          return this.try_parse_expr_incantation();
-        }
-        catch (e) {
-          if (!(e instanceof RecoverableFail)) throw e;
+        let incantation = this.try_parse_expr_incantation();
+        if (incantation !== FAIL) return incantation;
+        else {
           // plain LaTeX (fallback)
           return this.parse_latex_line();
         }
@@ -176,7 +168,7 @@ export class DesmostParser extends GenericParser
 
     return {
       kind: Ast.Kind.EXPRESSION,
-      data: { latex: this.source.slice(init, this.i) },
+      data: { latex: this.source.slice(init, this.i).trimEnd() },
       incantations: [],
     };
   }
@@ -186,23 +178,18 @@ export class DesmostParser extends GenericParser
    * Attempt to parse a global incantation invocation.
    */
   try_parse_global_incantation():
-    Recoverable<
     | Ast.IncantationInvocation<GLOBAL>
     | Ast.InvalidInvocation
-    >
+    | RecoverableFail
   {
     let init = this.i;
 
-    this.try_consume("/");
+    if (this.try_consume("/") === FAIL) return FAIL;
 
-    try {
-      var incantation = this.try_parse_identifier(GLOBAL_INCANTATIONS);
-    }
-    catch (e) {
-      if (e instanceof RecoverableFail) {
-        this.i = init;
-      }
-      throw e;
+    let incantation = this.try_parse_identifier(GLOBAL_INCANTATIONS);
+    if (incantation === FAIL) {
+      this.i = init;
+      return FAIL;
     }
 
     let data = undefined;
@@ -224,6 +211,7 @@ export class DesmostParser extends GenericParser
 
     this.consume_spaces();
 
+    // @ts-expect-error: FIXME
     return {
       kind: Ast.Kind.INCANTATION_INVOCATION,
       incantation,
@@ -235,23 +223,18 @@ export class DesmostParser extends GenericParser
    * Attempt to parse a local incantation invocation.
    */
   try_parse_local_incantation():
-    Recoverable<
     | Ast.IncantationInvocation<LOCAL>
     | Ast.InvalidInvocation
-    >
+    | RecoverableFail
   {
     let init = this.i;
 
-    this.try_consume("/");
+    if (this.try_consume("/") === FAIL) return FAIL;
 
-    try {
-      var incantation = this.try_parse_identifier(LOCAL_INCANTATIONS);
-    }
-    catch (e) {
-      if (e instanceof RecoverableFail) {
-        this.i = init;
-      }
-      throw e;
+    let incantation = this.try_parse_identifier(LOCAL_INCANTATIONS);
+    if (incantation === FAIL) {
+      this.i = init;
+      return FAIL;
     }
 
     let arg_raw = undefined;
@@ -273,6 +256,7 @@ export class DesmostParser extends GenericParser
 
     this.consume_whitespace();
 
+    // @ts-expect-error: FIXME
     return {
       kind: Ast.Kind.INCANTATION_INVOCATION,
       incantation,
@@ -282,23 +266,18 @@ export class DesmostParser extends GenericParser
 
   try_parse_expr_incantation(): MaybeRecoverable<Ast.Expression>
   {
-    // TODO refactor with `backtrack()` helper
     let init = this.i;
 
-    this.try_consume("/");
+    if (this.try_consume("/") === FAIL) return FAIL;
 
-    try {
-      var incantation = this.try_parse_identifier(EXPR_INCANTATIONS) as ArgIncantation<EXPR>;
-    }
-    catch (e) {
-      if (e instanceof RecoverableFail) {
-        // TODO maybe flag to user
-        this.i = init;
-      }
-      throw e;
+    let incantation = this.try_parse_identifier(EXPR_INCANTATIONS);
+    if (incantation === FAIL) {
+      // TODO maybe flag to user
+      this.i = init;
+      return FAIL;
     }
 
-    let arg_raw = this.parse_incantation_arg(incantation.arg_type);
+    let arg_raw = this.parse_incantation_arg((incantation as ArgIncantation<EXPR>).arg_type);
 
     let data = {};
     incantation.apply(data, arg_raw);
@@ -315,30 +294,20 @@ export class DesmostParser extends GenericParser
    */
   try_parse_identifier<Effect extends Incantation.Effect>(
     incantations: Incantation<Effect>[]
-  ): Recoverable<Incantation<Effect>>
+  ): Incantation<Effect> | RecoverableFail
   {
     for (let incantation of incantations) {
       // yeah the duplication here is a little meh, unfortunately needing `return` means we can't extract it into a helper
-      try {
-        this.try_consume(incantation.identifier);
-        return incantation;
-      }
-      catch (e) {
-        if (!(e instanceof RecoverableFail)) throw e;
-      }
+      let r = this.try_consume(incantation.identifier);
+      if (r !== FAIL) return incantation;
 
       if (incantation.alias != undefined) {
-        try {
-          this.try_consume(incantation.alias);
-          return incantation;
-        }
-        catch (e) {
-          if (!(e instanceof RecoverableFail)) throw e;
-        }
+        let r = this.try_consume(incantation.alias);
+        if (r !== FAIL) return incantation;
       }
     }
 
-    throw new RecoverableFail();
+    return FAIL;
   }
 
   /**
@@ -410,25 +379,13 @@ export class DesmostParser extends GenericParser
 
     /**
      * Pop `ctx` if it is the currently active context, returning `true` if successful.
-     * 
-     * If `{ force: true }`, backtrack the stack and report errors for unterminated contexts.
     */
-    function try_pop(ctx: Ctx, options?: { force: boolean }): boolean
+    function try_pop(ctx: Ctx): boolean
     {
       if (stack.at(-1) === ctx) {
         stack.pop();
         return true;
       }
-      else if (options?.force) {
-        if (stack.includes(ctx)) {
-          /* NOTE: We could report errors for unterminated contexts, but we'll leave that for the actual evaluation - in case we get something wrong ;) */
-          while (stack.at(-1) !== ctx) {
-            stack.pop();
-          }
-
-          return true;
-        }
-      }
 
       return false;
     }
@@ -445,21 +402,34 @@ export class DesmostParser extends GenericParser
       switch (this.current) {
         case Ctx.ESCAPE: stack.push(Ctx.ESCAPE); break;
 
-        /* NOTE: *Currently* `{}` should be ignored in all contexts except `Ctx.BLOCK`. This might change if more contexts are added in future! */
         case Char.L_BRACE:
+          /* NOTE: *Currently* `{}` should be ignored in all contexts except `Ctx.BLOCK`. This might change if more contexts are added in future! */
           if (top !== Ctx.BLOCK) break;
           stack.push(Ctx.BLOCK); break;
 
         case Char.R_BRACE:
-          if (top !== Ctx.BLOCK) break;
-          try_pop(Ctx.BLOCK, { force: true }); break;
+          try_pop(Ctx.BLOCK); break;
       }
 
       if (arg_type === Incantation.ArgType.OBJECT) {
         switch (this.current) {
-          case Ctx.STR_1: try_pop(Ctx.STR_1) || stack.push(Ctx.STR_1); break;
-          case Ctx.STR_2: try_pop(Ctx.STR_2) || stack.push(Ctx.STR_2); break;
-          case Ctx.STR_F: try_pop(Ctx.STR_F) || stack.push(Ctx.STR_F); break;
+          case Ctx.STR_1:
+            if (top === Ctx.STR_2) break;
+            if (top === Ctx.STR_F) break;
+            try_pop(Ctx.STR_1) || stack.push(Ctx.STR_1);
+            break;
+            
+          case Ctx.STR_2:
+            if (top === Ctx.STR_1) break;
+            if (top === Ctx.STR_F) break;
+            try_pop(Ctx.STR_2) || stack.push(Ctx.STR_2);
+            break;
+
+          case Ctx.STR_F:
+            if (top === Ctx.STR_1) break;
+            if (top === Ctx.STR_2) break;
+            try_pop(Ctx.STR_F) || stack.push(Ctx.STR_F);
+            break;
         }
       }