desmost 0.9.0 → 0.10.0

package/dist/compiler/evaluate.js

@@ -1,93 +0,0 @@
-import dedent from "dedent";
-import { format_error, normalise_latex, prettify_latex } from "./format.js";
-import { Ast } from "../parser/index.js";
-import { UnrecoverableError } from "../errors.js";
-import { is_latex } from "../desmos.js";
-/**
- * Evaluate arguments (if any) to a global incantation `invocation`, then apply the incantation to `desmos`.
- */
-export function evaluate_global_incantation(invocation, desmos, options) {
-    let data = undefined;
-    if ("arg_raw" in invocation && invocation.arg_raw != undefined) {
-        try {
-            data = invocation.incantation.evaluate_arg(invocation.arg_raw, options);
-        }
-        catch (e) {
-            let msg = evaluate_error(e, desmos, options);
-            return msg;
-        }
-    }
-    invocation.incantation.apply(desmos, data);
-}
-/**
- * Evaluate local incantation invocations on `expr`, then add `expr` to `desmos`.
- */
-export function evaluate_expr(expr, desmos, options) {
-    let errors = [];
-    for (let invocation of expr.incantations) {
-        if (invocation.kind === Ast.Kind.INVALID_INCANTATION) {
-            let msg = evaluate_error(invocation.error, desmos, { ...options, place_errors: "start" });
-            if (msg != undefined) {
-                errors.push(msg);
-            }
-            continue;
-        }
-        let data = undefined;
-        if ("arg_raw" in invocation && invocation.arg_raw != undefined) {
-            try {
-                data = invocation.incantation.evaluate_arg(invocation.arg_raw, options);
-            }
-            catch (e) {
-                errors.push(format_error(e, options));
-                // if it needs the arg, then we can't press on
-                if (invocation.incantation.requires_arg)
-                    continue;
-            }
-        }
-        try {
-            invocation.incantation.apply(expr.data, data);
-        }
-        catch (e) {
-            errors.push(format_error(e, options));
-        }
-    }
-    if (errors.length > 0) {
-        desmos.setExpression({ type: "text", text: errors.join("\n\n") });
-    }
-    if (is_latex(expr.data)) {
-        expr.data.latex = normalise_latex(expr.data.latex);
-        if (options.prettify) {
-            expr.data.latex = prettify_latex(expr.data.latex);
-        }
-    }
-    else if (expr.data.type === "text" && options.dedent_text) {
-        expr.data.text = dedent(expr.data.text ?? "");
-    }
-    desmos.setExpression(expr.data);
-}
-/**
- * Handle an `InvalidInvocation`, respecting the user's preferences in `options`.
- *
- * If the user set `place_errors: start` or `place_errors: end`, this returns the formatted error message for deferred aggregation.
- */
-export function evaluate_error(error, desmos, options) {
-    switch (options.errors) {
-        case "crash":
-            throw error;
-        case "suppress":
-            console.error(error);
-            break;
-        default: switch (options.place_errors) {
-            case "end":
-            case "start":
-                return format_error(error, options);
-            default:
-                desmos.setExpression({
-                    type: "text",
-                    text: format_error(error, options),
-                });
-                break;
-        }
-    }
-}
-//# sourceMappingURL=evaluate.js.map

package/dist/compiler/evaluate.js.map

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

package/dist/desmos.d.ts

@@ -1,16 +0,0 @@
-/**
- * The Desmos API (currently) is browser-only, so we polyfill the API objects we need here for the server-side.
- */
-export declare enum DesmosColour {
-    RED = "#c74440",
-    BLUE = "#2d70b3",
-    GREEN = "#388c46",
-    PURPLE = "#6042a6",
-    ORANGE = "#fa7e19",
-    BLACK = "#000000"
-}
-/**
- * Is `expr` a Desmos LaTeX expression (as opposed to a note or table)?
- */
-export declare function is_latex(expr: Desmos.ExpressionState): expr is Desmos.Expression;
-//# sourceMappingURL=desmos.d.ts.map

package/dist/desmos.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"desmos.d.ts","sourceRoot":"","sources":["../src/desmos.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,oBAAY,YAAY;IAEvB,GAAG,YAAe;IAClB,IAAI,YAAc;IAClB,KAAK,YAAa;IAClB,MAAM,YAAY;IAClB,MAAM,YAAY;IAClB,KAAK,YAAa;CAClB;AAGD;;GAEG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,eAAe,GAAG,IAAI,IAAI,MAAM,CAAC,UAAU,CAGhF"}

package/dist/desmos.js

@@ -1,19 +0,0 @@
-/**
- * The Desmos API (currently) is browser-only, so we polyfill the API objects we need here for the server-side.
- */
-export var DesmosColour;
-(function (DesmosColour) {
-    DesmosColour["RED"] = "#c74440";
-    DesmosColour["BLUE"] = "#2d70b3";
-    DesmosColour["GREEN"] = "#388c46";
-    DesmosColour["PURPLE"] = "#6042a6";
-    DesmosColour["ORANGE"] = "#fa7e19";
-    DesmosColour["BLACK"] = "#000000";
-})(DesmosColour || (DesmosColour = {}));
-/**
- * Is `expr` a Desmos LaTeX expression (as opposed to a note or table)?
- */
-export function is_latex(expr) {
-    return (expr.type === undefined || expr.type === "expression");
-}
-//# sourceMappingURL=desmos.js.map

package/dist/desmos.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"desmos.js","sourceRoot":"","sources":["../src/desmos.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,CAAN,IAAY,YAQX;AARD,WAAY,YAAY;IAEvB,+BAAkB,CAAA;IAClB,gCAAkB,CAAA;IAClB,iCAAkB,CAAA;IAClB,kCAAkB,CAAA;IAClB,kCAAkB,CAAA;IAClB,iCAAkB,CAAA;AACnB,CAAC,EARW,YAAY,KAAZ,YAAY,QAQvB;AAGD;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,IAA4B;IAEpD,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;AAChE,CAAC"}

package/src/compiler/evaluate.ts

@@ -1,128 +0,0 @@
-import dedent from "dedent";
-
-import { format_error, normalise_latex, prettify_latex } from "./format";
-import type { DesmostOptions } from "../options";
-
-import { Ast } from "../parser";
-import { UnrecoverableError, type Unrecoverable } from "../errors";
-import { is_latex } from "../desmos";
-
-
-/**
- * Evaluate arguments (if any) to a global incantation `invocation`, then apply the incantation to `desmos`.
- */
-export function evaluate_global_incantation(
-	invocation: Ast.IncantationInvocation,
-	desmos: Desmos.Calculator,
-	options: DesmostOptions,
-): Unrecoverable<void | string>
-{
-	let data = undefined;
-
-	if ("arg_raw" in invocation && invocation.arg_raw != undefined) {
-		try {
-			data = invocation.incantation.evaluate_arg(invocation.arg_raw, options);
-		}
-		catch (e) {
-			let msg = evaluate_error(e as Error, desmos, options);
-			return msg;
-		}
-	}
-
-	invocation.incantation.apply(desmos, data);
-}
-
-
-/**
- * Evaluate local incantation invocations on `expr`, then add `expr` to `desmos`.
- */
-export function evaluate_expr(
-	expr: Ast.Expression,
-	desmos: Desmos.Calculator,
-	options: DesmostOptions,
-): Unrecoverable<void | string>
-{
-	let errors: string[] = [];
-
-	for (let invocation of expr.incantations) {
-		if (invocation.kind === Ast.Kind.INVALID_INCANTATION) {
-			let msg = evaluate_error(invocation.error, desmos, { ...options, place_errors: "start" });
-			if (msg != undefined) {
-				errors.push(msg);
-			}
-			continue;
-		}
-
-		let data = undefined;
-
-		if ("arg_raw" in invocation && invocation.arg_raw != undefined) {
-			try {
-				data = invocation.incantation.evaluate_arg(invocation.arg_raw, options);
-			}
-			catch (e) {
-				errors.push(format_error(e as Error, options));
-				// if it needs the arg, then we can't press on
-				if (invocation.incantation.requires_arg) continue;
-			}
-		}
-
-		try {
-			invocation.incantation.apply(expr.data, data);
-		}
-		catch (e) {
-			errors.push(format_error(e as Error, options));
-		}
-	}
-	
-	if (errors.length > 0) {
-		desmos.setExpression({ type: "text", text: errors.join("\n\n") });
-	}
-
-	if (is_latex(expr.data)) {
-		expr.data.latex = normalise_latex(expr.data.latex!);
-
-		if (options.prettify) {
-			expr.data.latex = prettify_latex(expr.data.latex);
-		}
-	}
-	else if (expr.data.type === "text" && options.dedent_text) {
-		expr.data.text = dedent(expr.data.text ?? "");
-	}
-
-	desmos.setExpression(expr.data);
-}
-
-
-/**
- * Handle an `InvalidInvocation`, respecting the user's preferences in `options`.
- * 
- * If the user set `place_errors: start` or `place_errors: end`, this returns the formatted error message for deferred aggregation.
- */
-export function evaluate_error(
-	error: UnrecoverableError,
-	desmos: Desmos.Calculator,
-	options: DesmostOptions,
-): Unrecoverable<void | string>
-{
-	switch (options.errors) {
-		case "crash":
-			throw error;
-
-		case "suppress":
-			console.error(error);
-			break;
-
-		default: switch (options.place_errors) {
-			case "end":
-			case "start":
-				return format_error(error, options);
-			
-			default:
-				desmos.setExpression({
-					type: "text",
-					text: format_error(error, options),
-				});
-				break;
-		}
-	}
-}

package/src/desmos.ts

@@ -1,22 +0,0 @@
-/**
- * The Desmos API (currently) is browser-only, so we polyfill the API objects we need here for the server-side.
- */
-
-export enum DesmosColour
-{
-	RED    = "#c74440",
-	BLUE   = "#2d70b3",
-	GREEN  = "#388c46",
-	PURPLE = "#6042a6",
-	ORANGE = "#fa7e19",
-	BLACK  = "#000000",
-}
-
-
-/**
- * Is `expr` a Desmos LaTeX expression (as opposed to a note or table)?
- */
-export function is_latex(expr: Desmos.ExpressionState): expr is Desmos.Expression
-{
-	return (expr.type === undefined || expr.type === "expression");
-}