fix and generate schema, run prettier

Doenet · Jun 30, 2024 · 5218998 · 5218998
1 parent 6a82051
commit 5218998
Show file tree

Hide file tree

Showing 34 changed files with 9,928 additions and 23,255 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,3 @@
+*.mdx
+generated-assets
+multi-reporter-config.json
diff --git a/packages/codemirror/src/extensions/lsp/tooltip.css b/packages/codemirror/src/extensions/lsp/tooltip.css
@@ -19,11 +19,11 @@
     padding: 0px 2px;
 }
 .cm-lint-body p {
-    margin: .25em 0;
+    margin: 0.25em 0;
 }
 .cm-lint-body p:last-child {
     margin-bottom: 0;
 }
 .cm-lint-body p:first-child {
     margin-top: 0;
-}
+}
diff --git a/packages/codemirror/src/extensions/syntax-highlighting.ts b/packages/codemirror/src/extensions/syntax-highlighting.ts
@@ -1,4 +1,9 @@
-import { LRLanguage, LanguageSupport, foldNodeProp, indentNodeProp } from "@codemirror/language";
+import {
+    LRLanguage,
+    LanguageSupport,
+    foldNodeProp,
+    indentNodeProp,
+} from "@codemirror/language";
 import { parser } from "@doenet/parser";
 import { styleTags, tags as t } from "@lezer/highlight";
 
@@ -57,4 +62,4 @@ const doenetLanguage = LRLanguage.define({
     },
 });
 
-export const syntaxHighlightingExtension = new LanguageSupport(doenetLanguage);
+export const syntaxHighlightingExtension = new LanguageSupport(doenetLanguage);
diff --git a/packages/codemirror/src/extensions/tab.ts b/packages/codemirror/src/extensions/tab.ts
@@ -6,7 +6,7 @@ import { Command, keymap } from "@codemirror/view";
 //tabs = 2 spaces
 const tab = "  ";
 const tabCommand: Command = ({ state, dispatch }) => {
-    console.log("running")
+    console.log("running");
     dispatch(
         state.update(state.replaceSelection(tab), {
             scrollIntoView: true,

diff --git a/packages/doenetml-worker/src/components/abstract/BaseComponent.js b/packages/doenetml-worker/src/components/abstract/BaseComponent.js
@@ -1097,6 +1097,40 @@ export default class BaseComponent {
                                     .numDimensions,
                             );
                     }
+                    let numDim =
+                        stateVariableDescriptions[varName].numDimensions;
+                    if (theStateDef.arrayVarNameFromPropIndex) {
+                        stateVariableDescriptions[
+                            varName
+                        ].arrayVarNameFromPropIndex =
+                            theStateDef.arrayVarNameFromPropIndex;
+                    } else if (numDim > 1) {
+                        stateVariableDescriptions[
+                            varName
+                        ].arrayVarNameFromPropIndex = function (
+                            propIndex,
+                            varName,
+                        ) {
+                            return (
+                                entryPrefixes[0] +
+                                [
+                                    ...propIndex.map((x) =>
+                                        Math.round(Number(x)),
+                                    ),
+                                    ...Array(numDim - propIndex.length).fill(1),
+                                ].join("_")
+                            );
+                        };
+                    } else {
+                        stateVariableDescriptions[
+                            varName
+                        ].arrayVarNameFromPropIndex = function (
+                            propIndex,
+                            varName,
+                        ) {
+                            return entryPrefixes[0] + propIndex[0];
+                        };
+                    }
                 }
             }
         }

diff --git a/packages/doenetml/src/DoenetML.css b/packages/doenetml/src/DoenetML.css
@@ -43,7 +43,8 @@ url(OpenSansRegularWoff) format('woff'); */
     src:
         url("./fonts/files/open-sans-v18-latin-light-italic.woff2")
             format("woff2"),
-        url("./fonts/files/open-sans-v18-latin-light-italic.woff") format("woff");
+        url("./fonts/files/open-sans-v18-latin-light-italic.woff")
+            format("woff");
 }
 
 @font-face {

diff --git a/packages/doenetml/src/Viewer/renderers/booleanInput.css b/packages/doenetml/src/Viewer/renderers/booleanInput.css
@@ -30,7 +30,7 @@
 } */
 
 /* Hide the browser's default checkbox */
-.doenetml-boolean-container input[type='checkbox'] {
+.doenetml-boolean-container input[type="checkbox"] {
     position: absolute;
     opacity: 0;
     cursor: pointer;
@@ -59,22 +59,28 @@
 }
 
 /* On mouse-over, add a light blue background color */
-.doenetml-boolean-container:hover input[type='checkbox'] ~ .doenetml-checkmark {
+.doenetml-boolean-container:hover input[type="checkbox"] ~ .doenetml-checkmark {
     background-color: var(--lightBlue);
 }
 
 /* On mouse-over of disabled, keep the grey background color */
-.doenetml-boolean-container:hover input[type='checkbox'] ~ .doenetml-checkmark-disabled {
+.doenetml-boolean-container:hover
+    input[type="checkbox"]
+    ~ .doenetml-checkmark-disabled {
     background-color: var(--mainGray);
 }
 
 /* When the checkbox is checked, add a dark blue background */
-.doenetml-boolean-container input[type='checkbox']:checked ~ .doenetml-checkmark {
+.doenetml-boolean-container
+    input[type="checkbox"]:checked
+    ~ .doenetml-checkmark {
     background-color: var(--mainBlue);
 }
 
 /* When a checkbox has focus, add a dark blue outline */
-.doenetml-boolean-container:focus-within input[type='checkbox'] ~ .doenetml-checkmark {
+.doenetml-boolean-container:focus-within
+    input[type="checkbox"]
+    ~ .doenetml-checkmark {
     outline: 2px solid var(--canvastext);
     outline-offset: 2px;
 }
@@ -87,7 +93,9 @@
 }
 
 /* Show the checkmark when checked */
-.doenetml-boolean-container input[type='checkbox']:checked ~ .doenetml-checkmark:after {
+.doenetml-boolean-container
+    input[type="checkbox"]:checked
+    ~ .doenetml-checkmark:after {
     display: block;
 }
 

diff --git a/packages/lsp-tools/index.html b/packages/lsp-tools/index.html
@@ -6,7 +6,8 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>LSP Viewer</title>
         <style>
-            html, body {
+            html,
+            body {
                 margin: 0;
                 padding: 0;
                 width: 100%;

diff --git a/packages/lsp-tools/src/auto-completer/methods/get-completion-context.ts b/packages/lsp-tools/src/auto-completer/methods/get-completion-context.ts
@@ -4,8 +4,8 @@ import { AutoCompleter } from "..";
 
 export type CompletionContext =
     | { cursorPos: "body" }
-    | { cursorPos: "element"; complete: boolean;  }
-    | { cursorPos: "macro"; complete: boolean;node: DastMacro | null };
+    | { cursorPos: "element"; complete: boolean }
+    | { cursorPos: "macro"; complete: boolean; node: DastMacro | null };
 
 /**
  * Get context about the current cursor position to determine whether completions should be offered or not,
@@ -34,14 +34,18 @@ export function getCompletionContext(
         prevNonWhitespaceCharOffset,
     );
 
-    const leftNode = this.sourceObj.nodeAtOffset(offset, {side:"left"});
-    
+    const leftNode = this.sourceObj.nodeAtOffset(offset, { side: "left" });
+
     // Check for status inside a macro
     let macro = this.sourceObj.nodeAtOffset(offset, {
         type: "macro",
         side: "left",
     });
-    if (!macro && (prevChar === "." || prevChar === "[") && prevPrevChar !== ")") {
+    if (
+        !macro &&
+        (prevChar === "." || prevChar === "[") &&
+        prevPrevChar !== ")"
+    ) {
         macro = this.sourceObj.nodeAtOffset(offset - 1, {
             type: "macro",
             side: "left",

diff --git a/packages/lsp-tools/src/doenet-source-object/methods/at-offset.ts b/packages/lsp-tools/src/doenet-source-object/methods/at-offset.ts
@@ -34,7 +34,7 @@ export function nodeAtOffset<const T extends DastNodes["type"]>(
     if (offset > 0 && offset === this.source.length && side === "left") {
         // If we ask for a node at the "end" of the file, we probably want
         // the last node, not null; walk back one character.
-        side = "right"
+        side = "right";
         offset -= 1;
     }
 

diff --git a/packages/lsp-tools/test/doenet-source-object.test.ts b/packages/lsp-tools/test/doenet-source-object.test.ts
@@ -130,45 +130,53 @@ describe("DoenetSourceObject", () => {
         source = `<a><b foo="bar">   <c>hi</c></b></a>`;
         sourceObj = new DoenetSourceObject(source);
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(4);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(4);
             expect(cursorPosition).toEqual("openTagName");
             expect(node).toMatchObject({ type: "element", name: "b" });
         }
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(6);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(6);
             expect(cursorPosition).toEqual("attributeName");
             expect(node).toMatchObject({ type: "element", name: "b" });
         }
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(11);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(11);
             expect(cursorPosition).toEqual("attributeValue");
             expect(node).toMatchObject({ type: "element", name: "b" });
         }
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(17);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(17);
             expect(cursorPosition).toEqual("body");
             expect(node).toMatchObject({ type: "element", name: "b" });
         }
 
         source = `<a > </a   >`;
         sourceObj = new DoenetSourceObject(source);
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(3);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(3);
             expect(cursorPosition).toEqual("openTag");
             expect(node).toMatchObject({ type: "element", name: "a" });
         }
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(5);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(5);
             expect(cursorPosition).toEqual("body");
             expect(node).toMatchObject({ type: "element", name: "a" });
         }
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(9);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(9);
             expect(cursorPosition).toEqual("unknown");
             expect(node).toMatchObject({ type: "element", name: "a" });
         }
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(11);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(11);
             expect(cursorPosition).toEqual("unknown");
             expect(node).toMatchObject({ type: "element", name: "a" });
         }
@@ -177,7 +185,8 @@ describe("DoenetSourceObject", () => {
         sourceObj = new DoenetSourceObject(source);
         {
             const offset = source.indexOf("</a>") - 1;
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(offset);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(offset);
             expect(cursorPosition).toEqual("body");
             expect(node).toMatchObject({ type: "element", name: "b" });
         }
@@ -186,7 +195,8 @@ describe("DoenetSourceObject", () => {
             // is a non-closed element inside, we should claim to be inside the body
             // of the non-closed element.
             const offset = source.indexOf("</a>");
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(offset);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(offset);
             expect(cursorPosition).toEqual("body");
             expect(node).toMatchObject({ type: "element", name: "b" });
         }
@@ -196,7 +206,8 @@ describe("DoenetSourceObject", () => {
         sourceObj = new DoenetSourceObject(source);
         {
             const offset = source.indexOf("</a>");
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(offset);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(offset);
             expect(cursorPosition).toEqual("body");
             expect(node).toMatchObject({ type: "element", name: "b" });
         }
@@ -225,23 +236,26 @@ describe("DoenetSourceObject", () => {
         source = `<a    `;
         sourceObj = new DoenetSourceObject(source);
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(3);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(3);
             expect(cursorPosition).toEqual("openTag");
             expect(node).toMatchObject({ type: "element", name: "a" });
         }
 
         source = `<p><a    </p>`;
         sourceObj = new DoenetSourceObject(source);
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(7);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(7);
             expect(cursorPosition).toEqual("openTag");
             expect(node).toMatchObject({ type: "element", name: "a" });
         }
 
         source = `<`;
         sourceObj = new DoenetSourceObject(source);
         {
-            let { cursorPosition, node } = sourceObj.elementAtOffsetWithContext(1);
+            let { cursorPosition, node } =
+                sourceObj.elementAtOffsetWithContext(1);
             expect(cursorPosition).toEqual("unknown");
             expect(node).toEqual(null);
         }

diff --git a/packages/lsp-tools/test/tsconfig.json b/packages/lsp-tools/test/tsconfig.json
@@ -4,9 +4,6 @@
         "rootDir": "../"
     },
     "include": ["../**/*.ts", "../**/*.tsx"],
-    "exclude": [
-        "node_modules",
-        "./vite.config.ts"
-    ],
+    "exclude": ["node_modules", "./vite.config.ts"],
     "references": []
 }
diff --git a/packages/lsp/test/tsconfig.json b/packages/lsp/test/tsconfig.json
@@ -4,9 +4,6 @@
         "rootDir": "../"
     },
     "include": ["../**/*.ts", "../**/*.tsx"],
-    "exclude": [
-        "node_modules",
-        "./vite.config.ts"
-    ],
+    "exclude": ["node_modules", "./vite.config.ts"],
     "references": []
 }
diff --git a/packages/parser/index.html b/packages/parser/index.html
@@ -6,7 +6,8 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>Parser Viewer</title>
         <style>
-            html, body {
+            html,
+            body {
                 margin: 0;
                 padding: 0;
                 width: 100%;

diff --git a/packages/parser/src/lezer-to-dast/lezer-to-dast-utils.ts b/packages/parser/src/lezer-to-dast/lezer-to-dast-utils.ts
@@ -1,4 +1,9 @@
-import { DastAbstractNode, DastNodes, LezerSyntaxNodeName, Position } from "../types";
+import {
+    DastAbstractNode,
+    DastNodes,
+    LezerSyntaxNodeName,
+    Position,
+} from "../types";
 import { SyntaxNode } from "@lezer/common";
 import { entityStringToRawString } from "./entity-to-string";
 import { Root } from "xast";
@@ -306,4 +311,4 @@ export function updateNodePositionData(
     }
     nodeToUpdate.position.end.line += line;
     nodeToUpdate.position.end.column += column;
-}
+}
diff --git a/packages/parser/src/macros-v6/README.md b/packages/parser/src/macros-v6/README.md
@@ -1,4 +1,4 @@
 ## DoenetML v0.6 Macro Parser
 
 DoenetML v0.6 used a different macro format. This parser parses that older macro format.
-It is used by lsp-tools to convert macros to the newer format.
+It is used by lsp-tools to convert macros to the newer format.
diff --git a/packages/parser/src/macros-v6/index.ts b/packages/parser/src/macros-v6/index.ts
@@ -1,8 +1,4 @@
-import {
-    DastText,
-    DastMacroV6,
-    DastFunctionMacroV6,
-} from "../types";
+import { DastText, DastMacroV6, DastFunctionMacroV6 } from "../types";
 import { MacroParser } from "./parser";
 
 /**