Convert CharPos to number in renderInterpreter. (#116)

* Convert CharPos to number in renderInterpreter. * Add strict check to tsconfig and cleanup.
cognitive-engineering-lab · Sep 27, 2023 · f8effad · f8effad
1 parent 2ed6a15
commit f8effad
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 46 deletions.
diff --git a/frontend/packages/aquascope-editor/src/editor-utils/interpreter.tsx b/frontend/packages/aquascope-editor/src/editor-utils/interpreter.tsx
@@ -379,7 +379,7 @@ let FrameView = ({
   frame: MFrame<CharRange>;
 }) => {
   let code = useContext(CodeContext);
-  let snippet = codeRange(code, frame.location);
+  let snippet = codeRange(code!, frame.location);
   return (
     <div className="frame">
       <Header className="frame-header">{frame.name}</Header>
@@ -820,8 +820,8 @@ export function renderInterpreter(
     widgetRanges = sortedMarks;
     trace.steps = filteredSteps;
   } else {
-    widgetRanges = trace.steps.map(
-      step => _.last(step.stack.frames)!.location.end
+    widgetRanges = trace.steps.map(step =>
+      linecolToPosition(_.last(step.stack.frames)!.location.end, view.state.doc)
     );
   }
 

diff --git a/frontend/packages/aquascope-embed/package.json b/frontend/packages/aquascope-embed/package.json
@@ -11,6 +11,8 @@
     "@codemirror/view": "^6.4.0",
     "@floating-ui/react-dom": "^1.3.0",
     "@lezer/highlight": "^1.1.3",
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.2.0",
     "@vitejs/plugin-react": "^4.0.3",
     "aquascope-editor": "workspace:*",
     "puppeteer": "^19.6.0",

diff --git a/frontend/packages/aquascope-embed/src/main.tsx b/frontend/packages/aquascope-embed/src/main.tsx
@@ -111,7 +111,7 @@ let BugReporter = () => (
   <ContextProvider title={"Report a bug"} buttonText={"🐞"}>
     {close => {
       let code = useContext(CodeContext);
-      let onSubmit: React.FormEventHandler<HTMLFormElement> = event => {
+      let onSubmit: React.FormEventHandler<HTMLFormElement> = (event: any) => {
         let data = new FormData(event.target as any);
         let feedback = data.get("feedback")!.toString();
         window.telemetry!.log("aquascopeBug", { code, feedback });

diff --git a/frontend/packages/aquascope-standalone/tests/standalone.test.ts b/frontend/packages/aquascope-standalone/tests/standalone.test.ts
@@ -4,7 +4,7 @@ import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 const permStackSelector = ".permission-stack";
 const permStepSelector = ".step-widget-container";
-const interpSelector = ".interpreter";
+const _interpSelector = ".interpreter";
 
 describe("Aquascope Standalone", () => {
   let browser: Browser;

diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -5,6 +5,7 @@
     "declaration": true,
     "jsx": "react",
     "esModuleInterop": true,
-    "allowJs": true
+    "allowJs": true,
+    "strict": true
   }
-}
+}