Typescriptify VII 📺

rollup.config.js

@@ -43,10 +43,14 @@ export default args => [
     }
   },
   {
-    input: 'tests/index.js',
+    input: 'tests/index.ts',
     plugins: [
       ...commonPlugins(),
-      globImport(),
+      globImport({
+        // without this option, the plugin will try to parse imported files (as
+        // JS) and fail with TS files
+        format: 'import'
+      }),
       copy({
         targets: [
           { src: 'dist/mobiledoc.js', dest: 'assets/demo' },

src/js/models/atom-node.ts

@@ -12,7 +12,7 @@ export interface AtomRenderOptions {
   payload: JsonData
 }
 
-export type AtomRenderHook = (options: AtomRenderOptions) => Maybe<Element>
+export type AtomRenderHook = (options: AtomRenderOptions) => Maybe<Element | Text> | void
 
 export type AtomData = {
   name: string
@@ -46,7 +46,7 @@ export default class AtomNode {
         model: { value, payload },
       } = this
       // cache initial render
-      this._rendered = this.atom.render({ options, env, value, payload })
+      this._rendered = this.atom.render({ options, env, value, payload }) || null
     }
 
     this._validateAndAppendRenderResult(this._rendered!)

src/js/models/card-node.ts

@@ -4,7 +4,7 @@ import { Dict, Maybe } from '../utils/types'
 
 export type CardNodeOptions = Dict<unknown>
 
-export type CardRenderHook = (...args: any[]) => Maybe<Element>
+export type CardRenderHook = (...args: any[]) => void | Maybe<Element>
 
 type DidRenderCallback = null | (() => void)
 type TeardownCallback = null | (() => void)
@@ -54,11 +54,12 @@ export default class CardNode {
     let method = this.card[methodName]
 
     assert(`Card is missing "${methodName}" (tried to render mode: "${mode}")`, !!method)
-    let rendered = method({
-      env: this.env,
-      options: this.options,
-      payload: this.section.payload,
-    })
+    let rendered =
+      method({
+        env: this.env,
+        options: this.options,
+        payload: this.section.payload,
+      }) || null
 
     this._validateAndAppendRenderResult(rendered)
   }