Twoslash perf improvements (microsoft#1115)

Orta Therox · web-flow · commit 5e90f975c856 · 2020-09-21T11:56:29.000-04:00
* Improve the logging system

* Better naming

* Update twoslash perf

* Bug fixes

* Adds the PR json to the artifact

* Post-CI improvements
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -51,6 +51,9 @@ jobs:
       - name: "Validates that TypeScript plugins work"
         run: npm init typescript-playground-plugin playground-my-plugin
 
+      - name: "Copy PR JSON"
+        run: cp $GITHUB_EVENT_PATH ${{ github.workspace }}/packages/typescriptlang-org/public/pr.json
+
       - uses: actions/upload-artifact@v2
         with:
           name: built-site
diff --git a/dangerfile.ts b/dangerfile.ts
@@ -12,7 +12,8 @@ import { readFileSync } from "fs"
 
 export default () => {
   // JSON reference: https://github.com/haya14busa/github-actions-playground/runs/987846369
-  const contextText = readFileSync(process.env.GITHUB_EVENT_PATH, "utf8")
+  const contextText = readFileSync("built/public/pr.json", "utf8")
+  console.log(contextText)
   const context = JSON.parse(contextText)
 
   const repo = { owner: context.event.repository.owner.login, repo: context.event.repository.name }
diff --git a/packages/sandbox/src/index.ts b/packages/sandbox/src/index.ts
@@ -200,13 +200,14 @@ export const createTypeScriptSandbox = (
     // Don't update a compiler setting if it's the same
     // as the current setting
     newKeys.forEach(key => {
-      if (compilerOptions[key] === opts[key]) delete opts[key]
+      if (compilerOptions[key] == opts[key]) delete opts[key]
     })
 
     if (!Object.keys(opts).length) return
 
     config.logger.log("[Compiler] Updating compiler options: ", opts)
-    compilerOptions = { ...opts, ...compilerOptions }
+
+    compilerOptions = { ...compilerOptions, ...opts }
     defaults.setCompilerOptions(compilerOptions)
     didUpdateCompilerSettings(compilerOptions)
   }
diff --git a/packages/sandbox/src/twoslashSupport.ts b/packages/sandbox/src/twoslashSupport.ts
@@ -12,7 +12,7 @@ type CompilerOptions = import("typescript").CompilerOptions
  */
 
 export const extractTwoSlashComplierOptions = (ts: TS) => {
-  const optMap = new Map<string, any>()
+  let optMap = new Map<string, any>()
 
   // @ts-ignore - optionDeclarations is not public API
   for (const opt of ts.optionDeclarations) {
@@ -26,10 +26,15 @@ export const extractTwoSlashComplierOptions = (ts: TS) => {
     codeLines.forEach(line => {
       let match
       if ((match = booleanConfigRegexp.exec(line))) {
-        options[match[1]] = true
-        setOption(match[1], "true", options, optMap)
+        if (optMap.has(match[1].toLowerCase())) {
+          options[match[1]] = true
+          setOption(match[1], "true", options, optMap)
+        }
       } else if ((match = valuedConfigRegexp.exec(line))) {
-        setOption(match[1], match[2], options, optMap)
+        console.log(match)
+        if (optMap.has(match[1].toLowerCase())) {
+          setOption(match[1], match[2], options, optMap)
+        }
       }
     })
     return options
diff --git a/packages/sandbox/test/twoslashSupport.test.ts b/packages/sandbox/test/twoslashSupport.test.ts
@@ -1,13 +1,13 @@
-import { extractTwoSlashComplierOptions } from '../src/twoslashSupport'
-import typescript from 'typescript'
+import { extractTwoSlashComplierOptions } from "../src/twoslashSupport"
+import typescript from "typescript"
 
 const sandboxMock: any = (code: string) => ({
   getText: () => code,
   ts: typescript,
 })
 
-describe('gets twoslash compiler error messages', () => {
-  it('gets the right vars', () => {
+describe("gets twoslash compiler error messages", () => {
+  it.only("gets the right vars", () => {
     const sandbox = sandboxMock(`
 // @noImplicitAny: false
 // @target: ES2015
@@ -27,4 +27,24 @@ fn(42)
       }
     `)
   })
+
+  it("ignores unknown vars", () => {
+    const sandbox = sandboxMock(`
+// @noImplicny: false
+// @target: ES2015
+
+// This will not throw because of the noImplicitAny
+function fn(s) {
+  console.log(s.subtr(3))
+}
+
+fn(42)
+`)
+    const compilerOptions = extractTwoSlashComplierOptions(sandbox.ts)(sandbox.getText())
+    expect(compilerOptions).toMatchInlineSnapshot(`
+      Object {
+        "target": 2,
+      }
+    `)
+  })
 })
