Clean up some typing in website

captbaritone · Apr 20, 2024 · 808a452 · 808a452
1 parent 009864e
commit 808a452
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 28 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/website/package.json b/website/package.json
@@ -33,6 +33,7 @@
     "@graphql-tools/utils": "^9.2.1",
     "@mdx-js/react": "^1.6.22",
     "@types/node": "^18.15.0",
+    "@types/react": "^18",
     "@typescript/vfs": "1.5.0",
     "clsx": "^1.2.1",
     "cm6-graphql": "^0.0.3",

diff --git a/website/src/components/GratsCode.tsx b/website/src/components/GratsCode.tsx
@@ -22,7 +22,7 @@ export default function GratsCode({ out, mode }: Props) {
       throw new Error("Expected children to be special grats code");
     }
     return chunks;
-  });
+  }, [out]);
 
   switch (mode) {
     case "ts":

diff --git a/website/src/components/PlaygroundFeatures/editors/InputView.tsx b/website/src/components/PlaygroundFeatures/editors/InputView.tsx
@@ -15,13 +15,14 @@ import { getConfig, getDoc, getView, onSelectorChange } from "../store";
 import { createSelector } from "reselect";
 import { Theme } from "./theme";
 import store, { useUrlState } from "../store";
+import { GratsConfig } from "grats";
 
 export default function InputView() {
   useEffect(() => {
     store.dispatch({ type: "SET_STATE_FROM_URL" });
   }, []);
   useUrlState(store);
-  const [ref, setRef] = useState(null);
+  const [ref, setRef] = useState<HTMLDivElement | null>(null);
   const fsMap = useFsMap();
   useEffect(() => {
     if (ref != null && fsMap != null) {
@@ -41,7 +42,7 @@ export default function InputView() {
 }
 
 function useFsMap() {
-  const [fsMap, setFsMap] = useState(null);
+  const [fsMap, setFsMap] = useState<Map<string, string> | null>(null);
 
   useEffect(() => {
     let unmounted = false;
@@ -71,9 +72,13 @@ async function createInputView(store, fsMap, left) {
   const state = store.getState();
 
   // Create a selector that memoizes the linter and closes over the fsMap
-  const getLinter = createSelector(getView, getConfig, (view, config) => {
-    return createLinter(fsMap, view, config);
-  });
+  const getLinter = createSelector(
+    getView,
+    getConfig,
+    (view, config: GratsConfig) => {
+      return createLinter(fsMap, view, config);
+    },
+  );
 
   const linter = getLinter(state);
 

diff --git a/website/src/components/PlaygroundFeatures/linter.ts b/website/src/components/PlaygroundFeatures/linter.ts
@@ -26,7 +26,11 @@ if (ExecutionEnvironment.canUseDOM) {
   };
 }
 
-function buildSchemaResultWithFsMap(fsMap, text: string, config: GratsConfig) {
+function buildSchemaResultWithFsMap(
+  fsMap: Map<string, string>,
+  text: string,
+  config: GratsConfig,
+) {
   fsMap.set("index.ts", text);
   fsMap.set(GRATS_PATH, GRATS_TYPE_DECLARATIONS);
   // TODO: Don't recreate the system each time!
@@ -65,7 +69,11 @@ function buildSchemaResultWithFsMap(fsMap, text: string, config: GratsConfig) {
   }
 }
 
-export function createLinter(fsMap, view, config: GratsConfig) {
+export function createLinter(
+  fsMap: Map<string, string>,
+  view,
+  config: GratsConfig,
+) {
   return linter((codeMirrorView) => {
     const text = codeMirrorView.viewState.state.doc.toString();
 

diff --git a/website/tsconfig.json b/website/tsconfig.json
@@ -2,6 +2,16 @@
   // This file is not used in compilation. It is here just for a nice editor experience.
   "extends": "@tsconfig/docusaurus/tsconfig.json",
   "compilerOptions": {
-    "baseUrl": "."
-  }
+    "baseUrl": ".",
+    "skipLibCheck": true,
+    // typescript options here
+    "experimentalDecorators": true,
+    "outDir": "dist",
+    "downlevelIteration": true,
+    "strictNullChecks": true,
+    "declaration": true,
+    "resolveJsonModule": true,
+    "strictPropertyInitialization": true
+  },
+  "exclude": ["node_modules", "build", "**/*.grats.ts"]
 }