desmost 0.7.3 → 0.8.1

package/src/magic/local/line.ts

@@ -3,27 +3,27 @@ import { Incantation, ArgIncantation, type LOCAL } from "../incantation";
 
 interface LineOptions
 {
-  style?:   keyof typeof Desmos.Styles;  // TODO allow raw enum
-  width?:   number;
-  opacity?: number;
+	style?:   keyof typeof Desmos.Styles;  // TODO allow raw enum
+	width?:   number;
+	opacity?: number;
 }
 
 
 export class LineIncantation extends ArgIncantation<LOCAL>
 {
-  override readonly description
-    = "Change line styles for a rendered block."
+	override readonly description
+		= "Change line styles for a rendered block."
 
-  override readonly identifier   = "line"
-  override readonly requires_arg = true
-  override readonly arg_type     = Incantation.ArgType.OBJECT
+	override readonly identifier   = "line"
+	override readonly requires_arg = true
+	override readonly arg_type     = Incantation.ArgType.OBJECT
 
-  override apply(target: Desmos.ExpressionState, data: LineOptions)
-  {
-    super.require_expr_type(target.type, "expression");
-    
-    if (data.style != undefined)   target.lineStyle   = data.style;
-    if (data.width != undefined)   target.lineWidth   = data.width;
-    if (data.opacity != undefined) target.lineOpacity = data.opacity;
-  }
+	override apply(target: Desmos.ExpressionState, data: LineOptions)
+	{
+		super.require_expr_type(target.type, "expression");
+		
+		if (data.style != undefined)   target.lineStyle   = data.style;
+		if (data.width != undefined)   target.lineWidth   = data.width;
+		if (data.opacity != undefined) target.lineOpacity = data.opacity;
+	}
 }

package/src/magic/local/no-line.ts

@@ -3,14 +3,14 @@ import { Incantation, type LOCAL } from "../incantation";
 
 export class NoLineIncantation extends Incantation<LOCAL>
 {
-  override readonly description
-    = "Disable rendering lines for a block."
-  
-  override readonly identifier = "no-line"
+	override readonly description
+		= "Disable rendering lines for a block."
+	
+	override readonly identifier = "no-line"
 
-  override apply(target: Desmos.ExpressionState)
-  {
-    super.require_expr_type(target.type, "expression");
-    target.lines = false;
-  }
+	override apply(target: Desmos.ExpressionState)
+	{
+		super.require_expr_type(target.type, "expression");
+		target.lines = false;
+	}
 }

package/src/magic/local/point.ts

@@ -3,27 +3,27 @@ import { Incantation, ArgIncantation, type LOCAL } from "../incantation";
 
 interface PointStyles
 {
-  style?:   keyof typeof Desmos.Styles;
-  size?:    number;
-  opacity?: number;
+	style?:   keyof typeof Desmos.Styles;
+	size?:    number;
+	opacity?: number;
 }
 
 
 export class PointIncantation extends ArgIncantation<LOCAL>
 {
-  override readonly description
-    = ""
-  
-  override readonly identifier   = "point"
-  override readonly requires_arg = true
-  override readonly arg_type     = Incantation.ArgType.OBJECT
+	override readonly description
+		= ""
+	
+	override readonly identifier   = "point"
+	override readonly requires_arg = true
+	override readonly arg_type     = Incantation.ArgType.OBJECT
 
-  override apply(target: Desmos.ExpressionState, data: Partial<PointStyles>)
-  {
-    super.require_expr_type(target.type, "expression");
+	override apply(target: Desmos.ExpressionState, data: Partial<PointStyles>)
+	{
+		super.require_expr_type(target.type, "expression");
 
-    if (data.style   != undefined)  target.pointStyle   = data.style;
-    if (data.size    != undefined)  target.pointSize    = data.size;
-    if (data.opacity != undefined)  target.pointOpacity = data.opacity;
-  }
+		if (data.style   != undefined)  target.pointStyle   = data.style;
+		if (data.size    != undefined)  target.pointSize    = data.size;
+		if (data.opacity != undefined)  target.pointOpacity = data.opacity;
+	}
 }

package/src/magic/local/secret.ts

@@ -3,14 +3,14 @@ import { Incantation, type LOCAL } from "../incantation";
 
 export class SecretIncantation extends Incantation<LOCAL>
 {
-  override readonly description
-    = "Turn a block into a secret expression, which is hidden from the end user."
-  
-  override readonly identifier = "secret"
+	override readonly description
+		= "Turn a block into a secret expression, which is hidden from the end user."
+	
+	override readonly identifier = "secret"
 
-  override apply(target: Desmos.ExpressionState)
-  {
-    super.require_expr_type(target.type, "expression");
-    target.secret = true;
-  }
+	override apply(target: Desmos.ExpressionState)
+	{
+		super.require_expr_type(target.type, "expression");
+		target.secret = true;
+	}
 }

package/src/magic/local/slider.ts

@@ -3,25 +3,25 @@ import { Incantation, ArgIncantation, type LOCAL } from "../incantation";
 
 interface SliderBounds
 {
-  min?:  number | string;
-  max?:  number | string;
-  step?: number | string;
+	min?:  number | string;
+	max?:  number | string;
+	step?: number | string;
 }
 
 
 export class SliderIncantation extends ArgIncantation<LOCAL>
 {
-  override readonly description
-    = "Set the bounds of the slider for a variable."
-  
-  override readonly identifier   = "slider"
-  override readonly requires_arg = true
-  override readonly arg_type     = Incantation.ArgType.OBJECT
+	override readonly description
+		= "Set the bounds of the slider for a variable."
+	
+	override readonly identifier   = "slider"
+	override readonly requires_arg = true
+	override readonly arg_type     = Incantation.ArgType.OBJECT
 
-  override apply(target: Desmos.ExpressionState, data: SliderBounds)
-  {
-    super.require_expr_type(target.type, "expression");
-    // @ts-expect-error: outdated types
-    target.sliderBounds = data;
-  }
+	override apply(target: Desmos.ExpressionState, data: SliderBounds)
+	{
+		super.require_expr_type(target.type, "expression");
+		// @ts-expect-error: outdated types
+		target.sliderBounds = data;
+	}
 }

package/src/magic/readme.md

@@ -0,0 +1,5 @@
+# Incantations
+
+This module implements how incantations are represented, and the individual logic for every incantation in Desmost.
+
+Each incantation is defined in its own file as a class deriving from `ArgIncantation` or `Incantation`. They can then implement whatever logic they require for `apply()` and `evaluate_arg()`.

package/src/parser/ast.ts

@@ -4,57 +4,57 @@ import { Incantation, ArgIncantation } from "../magic";
 
 export namespace Ast
 {
-  /** What kind of parse result this is. */
-  export enum Kind
-  {
-    EXPRESSION             = "Expression",
-    INCANTATION_INVOCATION = "Incantation-Invocation",
-    INVALID_INCANTATION    = "Invalid-Incantation",
-  }
+	/** What kind of AST node this is. */
+	export enum Kind
+	{
+		EXPRESSION             = "Expression",
+		INCANTATION_INVOCATION = "Incantation-Invocation",
+		INVALID_INCANTATION    = "Invalid-Incantation",
+	}
 
-  
-  /** A Desmos expression to add to the calculator. */
-  export interface Expression
-  {
-    kind: Kind.EXPRESSION
-    data: Desmos.ExpressionState
-    incantations: Array<
-      | IncantationInvocation<Incantation.Effect.LOCAL>
-      | InvalidInvocation
-      >
-  }
+	
+	/** A Desmos expression to add to the calculator. */
+	export interface Expression
+	{
+		kind: Kind.EXPRESSION
+		data: Desmos.ExpressionState
+		incantations: Array<
+			| IncantationInvocation<Incantation.Effect.LOCAL>
+			| InvalidInvocation
+			>
+	}
 
 
-  /** A pending incantation invocation that requires applying its argument (if any), then applying its effect. */
-  export type IncantationInvocation<Effect extends Incantation.Effect = Incantation.Effect> =
-    | {
-      kind: Kind.INCANTATION_INVOCATION
-      incantation: Incantation<Effect>
-      arg_raw: undefined
-    }
-    | {
-      kind: Kind.INCANTATION_INVOCATION
-      incantation: ArgIncantation<Effect>
-      arg_raw: string | undefined
-    };
+	/** A pending incantation invocation that requires applying its argument (if any), then applying its effect. */
+	export type IncantationInvocation<Effect extends Incantation.Effect = Incantation.Effect> =
+		| {
+			kind: Kind.INCANTATION_INVOCATION
+			incantation: Incantation<Effect>
+			arg_raw: undefined
+		}
+		| {
+			kind: Kind.INCANTATION_INVOCATION
+			incantation: ArgIncantation<Effect>
+			arg_raw: string | undefined
+		};
 
-  /**
-   * An invalid invantation invocation that raised an error when parsed.
-   * 
-   * This will be propogated to the user as an extra Desmos text expression (unless they have `errors: false` configured).
-   */
-  export interface InvalidInvocation
-  {
-    kind: Kind.INVALID_INCANTATION
-    incantation: Incantation
-    arg_raw?: string
-    error: UnrecoverableError
-  }
+	/**
+	 * An invalid invantation invocation that raised an error when parsed.
+	 * 
+	 * This will be propogated to the user as an extra Desmos text expression (unless they have `errors: "suppress"` configured).
+	 */
+	export interface InvalidInvocation
+	{
+		kind: Kind.INVALID_INCANTATION
+		incantation: Incantation
+		arg_raw?: string
+		error: UnrecoverableError
+	}
 }
 
-/** An abstract object produced by parsing a block of source code. */
+/** An abstract object produced by the parser. */
 export type Ast =
-  | Ast.Expression
-  | Ast.IncantationInvocation
-  | Ast.InvalidInvocation
+	| Ast.Expression
+	| Ast.IncantationInvocation
+	| Ast.InvalidInvocation
 ;