Use TypeScript strict mode (#1208)

posit-dev · Mar 8, 2024 · 446c8ac · 446c8ac
1 parent 1639053
commit 446c8ac
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 40 deletions.
diff --git a/js/build.ts b/js/build.ts
@@ -6,7 +6,7 @@ const outDir = "../shiny/www/shared/py-shiny";
 
 async function bundle_helper(
   options: BuildOptions
-): Promise<ReturnType<typeof build>> {
+): Promise<ReturnType<typeof build> | undefined> {
   try {
     const result = await build({
       format: "esm",

diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/package.json b/js/package.json
@@ -17,7 +17,7 @@
     "@types/node": "^20.2.5",
     "@types/react": "^18.0.33",
     "@types/react-dom": "^18.0.11",
-    "@types/rstudio-shiny": "git+https://git@github.com/rstudio/shiny.git#v1.7.4",
+    "@types/rstudio-shiny": "git+https://git@github.com/rstudio/shiny.git#v1.8.0",
     "@typescript-eslint/eslint-plugin": "^5.59.7",
     "@typescript-eslint/parser": "^5.59.7",
     "esbuild": "^0.18.11",

diff --git a/js/page-output/page-output.ts b/js/page-output/page-output.ts
@@ -8,14 +8,15 @@ class PageOutputBinding extends Shiny.OutputBinding {
   }
 
   onValueError(el: HTMLElement, err: ErrorsMessageValue): void {
-    Shiny.unbindAll(el);
+    if (Shiny.unbindAll) Shiny.unbindAll(el);
     this.renderError(el, err);
   }
 
   async renderValue(
     el: HTMLElement,
-    data: Parameters<typeof Shiny.renderContent>[1]
+    data: Parameters<typeof Shiny.renderContentAsync>[1]
   ): Promise<void> {
+    if (data === null) return;
     if (el !== document.body) {
       throw new Error(
         'Output with class "shiny-page-output" must be a <body> tag.'
@@ -66,7 +67,7 @@ class PageOutputBinding extends Shiny.OutputBinding {
       data.html = content;
     }
 
-    await Shiny.renderContent(el, data);
+    await Shiny.renderContentAsync(el, data);
   }
 }
 

diff --git a/js/text-area/textarea-autoresize.ts b/js/text-area/textarea-autoresize.ts
@@ -8,11 +8,12 @@ export interface DOMEvent<T extends EventTarget> extends Event {
 function onDelegatedEvent(
   eventName: string,
   selector: string,
-  callback: (target: EventTarget) => void
+  callback: (target: HTMLTextAreaElement) => void
 ) {
-  document.addEventListener(eventName, (e: DOMEvent<HTMLTextAreaElement>) => {
-    if (e.target.matches(selector)) {
-      callback(e.target);
+  document.addEventListener(eventName, (e) => {
+    const e2 = e as DOMEvent<HTMLTextAreaElement>;
+    if (e2.target.matches(selector)) {
+      callback(e2.target);
     }
   });
 }
@@ -41,8 +42,9 @@ function update_on_load() {
   }
 
   // document.readyState in ["interactive", "complete"];\
-  document
-    .querySelectorAll("textarea.textarea-autoresize")
-    .forEach(update_height);
+  const textAreas = document.querySelectorAll(
+    "textarea.textarea-autoresize"
+  ) as NodeListOf<HTMLTextAreaElement>;
+  textAreas.forEach(update_height);
 }
 update_on_load();
diff --git a/js/tsconfig.json b/js/tsconfig.json
@@ -1,16 +1,24 @@
 {
   "compilerOptions": {
-    "module": "ES2020",
-    "lib": ["ES2021", "DOM"],
+    "module": "ES2022",
+    "lib": ["ES2022", "dom", "dom.iterable"],
     "jsx": "react",
     "noImplicitAny": true,
     "removeComments": true,
     "preserveConstEnums": true,
     "sourceMap": true,
-    "target": "ES2020",
-    "isolatedModules": true,
     "moduleResolution": "node",
-    "esModuleInterop": true
+    "noEmit": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "target": "ES2022",
+    "allowJs": true,
+    "resolveJsonModule": true,
+    "moduleDetection": "force",
+    "isolatedModules": true,
+    "strict": true,
+    "noUncheckedIndexedAccess": true
   },
-  "include": ["**/*.tsx", "**/*.ts"]
+  "include": ["**/*.tsx", "**/*.ts"],
+  "exclude": ["dataframe/*"],
 }
diff --git a/shiny/www/shared/py-shiny/dataframe/dataframe.js b/shiny/www/shared/py-shiny/dataframe/dataframe.js
diff --git a/shiny/www/shared/py-shiny/dataframe/dataframe.js.map b/shiny/www/shared/py-shiny/dataframe/dataframe.js.map
diff --git a/shiny/www/shared/py-shiny/page-output/page-output.js b/shiny/www/shared/py-shiny/page-output/page-output.js
@@ -1,17 +1,17 @@
 // page-output/page-output.ts
 var PageOutputBinding = class extends Shiny.OutputBinding {
-  constructor() {
-    super(...arguments);
-    this.originalBodyTagAttrs = null;
-  }
+  originalBodyTagAttrs = null;
   find(scope) {
     return $(scope).find(".shiny-page-output");
   }
   onValueError(el, err) {
-    Shiny.unbindAll(el);
+    if (Shiny.unbindAll)
+      Shiny.unbindAll(el);
     this.renderError(el, err);
   }
   async renderValue(el, data) {
+    if (data === null)
+      return;
     if (el !== document.body) {
       throw new Error(
         'Output with class "shiny-page-output" must be a <body> tag.'
@@ -45,7 +45,7 @@ var PageOutputBinding = class extends Shiny.OutputBinding {
     } else {
       data.html = content;
     }
-    await Shiny.renderContent(el, data);
+    await Shiny.renderContentAsync(el, data);
   }
 };
 Shiny.outputBindings.register(

diff --git a/shiny/www/shared/py-shiny/text-area/textarea-autoresize.js b/shiny/www/shared/py-shiny/text-area/textarea-autoresize.js
@@ -1,8 +1,9 @@
 // text-area/textarea-autoresize.ts
 function onDelegatedEvent(eventName, selector, callback) {
   document.addEventListener(eventName, (e) => {
-    if (e.target.matches(selector)) {
-      callback(e.target);
+    const e2 = e;
+    if (e2.target.matches(selector)) {
+      callback(e2.target);
     }
   });
 }
@@ -22,6 +23,9 @@ function update_on_load() {
     setTimeout(update_on_load, 10);
     return;
   }
-  document.querySelectorAll("textarea.textarea-autoresize").forEach(update_height);
+  const textAreas = document.querySelectorAll(
+    "textarea.textarea-autoresize"
+  );
+  textAreas.forEach(update_height);
 }
 update_on_load();