From: 月迷津渡 <wuhao.daraw@bytedance.com>
Date: Sun, 6 Oct 2019 15:55:23 +0000 (+0800)
Subject: workflow(template-explorer): improve types (#128)
X-Git-Tag: v3.0.0-alpha.0~576
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fc2174dcef146fc25dbdbbe7f84c64829c3dc19;p=thirdparty%2Fvuejs%2Fcore.git

workflow(template-explorer): improve types (#128)
---

diff --git a/packages/template-explorer/src/index.ts b/packages/template-explorer/src/index.ts
index 22199eaa03..7e73218265 100644
--- a/packages/template-explorer/src/index.ts
+++ b/packages/template-explorer/src/index.ts
@@ -4,10 +4,16 @@ import { compilerOptions, initOptions } from './options'
 import { watch } from '@vue/runtime-dom'
 import { SourceMapConsumer } from 'source-map'
 
-const self = window as any
+declare global {
+  interface Window {
+    monaco: typeof m
+    _deps: any
+    init: () => void
+  }
+}
 
-self.init = () => {
-  const monaco = (window as any).monaco as typeof m
+window.init = () => {
+  const monaco = window.monaco
   const persistedState = JSON.parse(
     decodeURIComponent(window.location.hash.slice(1)) || `{}`
   )
@@ -28,10 +34,8 @@ self.init = () => {
       monaco.editor.setModelMarkers(editor.getModel()!, `@vue/compiler-dom`, [])
       console.log(`AST: `, ast)
       lastSuccessfulCode = code + `\n\n// Check the console for the AST`
-      lastSuccessfulMap = new self._deps['source-map'].SourceMapConsumer(
-        map
-      ) as SourceMapConsumer
-      lastSuccessfulMap.computeColumnSpans()
+      lastSuccessfulMap = new window._deps['source-map'].SourceMapConsumer(map)
+      lastSuccessfulMap!.computeColumnSpans()
     } catch (e) {
       console.error(e)
     }
@@ -71,7 +75,7 @@ self.init = () => {
     }
   }
 
-  const sharedEditorOptions = {
+  const sharedEditorOptions: m.editor.IEditorConstructionOptions = {
     theme: 'vs-dark',
     fontSize: 14,
     wordWrap: 'on',
@@ -81,30 +85,24 @@ self.init = () => {
     minimap: {
       enabled: false
     }
-  } as const
-
-  const editor = monaco.editor.create(
-    document.getElementById('source') as HTMLElement,
-    {
-      value: persistedState.src || `<div>Hello World!</div>`,
-      language: 'html',
-      ...sharedEditorOptions
-    }
-  )
+  }
+
+  const editor = monaco.editor.create(document.getElementById('source')!, {
+    value: persistedState.src || `<div>Hello World!</div>`,
+    language: 'html',
+    ...sharedEditorOptions
+  })
 
   editor.getModel()!.updateOptions({
     tabSize: 2
   })
 
-  const output = monaco.editor.create(
-    document.getElementById('output') as HTMLElement,
-    {
-      value: '',
-      language: 'javascript',
-      readOnly: true,
-      ...sharedEditorOptions
-    }
-  )
+  const output = monaco.editor.create(document.getElementById('output')!, {
+    value: '',
+    language: 'javascript',
+    readOnly: true,
+    ...sharedEditorOptions
+  })
   output.getModel()!.updateOptions({
     tabSize: 2
   })
@@ -207,7 +205,10 @@ self.init = () => {
   watch(reCompile)
 }
 
-function debounce<T extends Function>(fn: T, delay: number = 300): T {
+function debounce<T extends (...args: any[]) => any>(
+  fn: T,
+  delay: number = 300
+): T {
   let prevTimer: NodeJS.Timeout | null = null
   return ((...args: any[]) => {
     if (prevTimer) {
diff --git a/packages/template-explorer/src/options.ts b/packages/template-explorer/src/options.ts
index 204811102e..fcf518cf7b 100644
--- a/packages/template-explorer/src/options.ts
+++ b/packages/template-explorer/src/options.ts
@@ -53,9 +53,10 @@ const App = {
           checked:
             compilerOptions.prefixIdentifiers ||
             compilerOptions.mode === 'module',
-          onChange(e: any) {
+          onChange(e: Event) {
             compilerOptions.prefixIdentifiers =
-              e.target.checked || compilerOptions.mode === 'module'
+              (<HTMLInputElement>e.target).checked ||
+              compilerOptions.mode === 'module'
           }
         }),
         h('label', { for: 'prefix' }, 'prefixIdentifiers'),
@@ -65,8 +66,8 @@ const App = {
           type: 'checkbox',
           id: 'hoist',
           checked: compilerOptions.hoistStatic,
-          onChange(e: any) {
-            compilerOptions.hoistStatic = e.target.checked
+          onChange(e: Event) {
+            compilerOptions.hoistStatic = (<HTMLInputElement>e.target).checked
           }
         }),
         h('label', { for: 'hoist' }, 'hoistStatic')
@@ -76,5 +77,5 @@ const App = {
 }
 
 export function initOptions() {
-  createApp().mount(App, document.getElementById('header') as HTMLElement)
+  createApp().mount(App, document.getElementById('header')!)
 }