add function macros to rust dast

Doenet · Nov 28, 2023 · 2d0a6ff · 2d0a6ff
1 parent dc07334
commit 2d0a6ff
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/doenetml-worker-rust/doenetml-core/src/dast.rs b/packages/doenetml-worker-rust/doenetml-core/src/dast.rs
@@ -16,13 +16,15 @@ enum DastElementContent {
     Element(DastElement),
     Text(DastText),
     Macro(DastMacro),
+    FunctionMacro(DastFunctionMacro),
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(untagged)]
 enum DastTextMacroContent {
     Text(DastText),
     Macro(DastMacro),
+    FunctionMacro(DastFunctionMacro),
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -82,6 +84,18 @@ struct DastMacro {
     position: Option<Position>,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(tag = "type")]
+#[serde(rename = "function")]
+struct DastFunctionMacro {
+    #[serde(rename = "macro")]
+    function_macro: DastMacro,
+    input: Option<Vec<Vec<DastElementContent>>>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    position: Option<Position>,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "type")]
 #[serde(rename = "pathPart")]
@@ -97,7 +111,7 @@ struct PathPart {
 #[serde(tag = "type")]
 #[serde(rename = "index")]
 struct DastIndex {
-    value: DastTextMacroContent,
+    value: Vec<DastTextMacroContent>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     position: Option<Position>,

diff --git a/packages/test-viewer/src/test/testViewer.tsx b/packages/test-viewer/src/test/testViewer.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 // @ts-ignore
-import { DoenetML } from "@doenet/doenetml";
+// import { DoenetML } from "@doenet/doenetml";
+import { DoenetML } from "@doenet/doenetml-prototype";
 // @ts-ignore
 import doenetMLstring from "./testCode.doenet?raw";
 import { Button } from "@doenet/ui-components";