From 8f8e601bb69f9cf05756700481cfc8db0fa50672 Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 01:18:19 +0800
Subject: [PATCH 01/11] feat(compiler-sfc): default script lang

---
 packages/compiler-sfc/src/parse.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/src/parse.ts b/packages/compiler-sfc/src/parse.ts
index 79065fc667e..f8f3e7a5392 100644
--- a/packages/compiler-sfc/src/parse.ts
+++ b/packages/compiler-sfc/src/parse.ts
@@ -22,6 +22,9 @@ export interface SFCParseOptions {
   pad?: boolean | 'line' | 'space'
   ignoreEmpty?: boolean
   compiler?: TemplateCompiler
+
+  defaultScriptLang?: string
+  defaultScriptSetupLang?: string
 }
 
 export interface SFCBlock {
@@ -95,7 +98,9 @@ export function parse(
     sourceRoot = '',
     pad = false,
     ignoreEmpty = true,
-    compiler = CompilerDOM
+    compiler = CompilerDOM,
+    defaultScriptLang,
+    defaultScriptSetupLang
   }: SFCParseOptions = {}
 ): SFCParseResult {
   const sourceKey =
@@ -190,6 +195,14 @@ export function parse(
       case 'script':
         const scriptBlock = createBlock(node, source, pad) as SFCScriptBlock
         const isSetup = !!scriptBlock.attrs.setup
+        if (isSetup && defaultScriptSetupLang) {
+          scriptBlock.lang ??= defaultScriptSetupLang
+        }
+
+        if (defaultScriptLang) {
+          scriptBlock.lang ??= defaultScriptLang
+        }
+
         if (isSetup && !descriptor.scriptSetup) {
           descriptor.scriptSetup = scriptBlock
           break

From 415f75e06024f576e565b840a9c6491fe931bda2 Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 01:43:23 +0800
Subject: [PATCH 02/11] test(compiler-sfc): cases for default lang

---
 packages/compiler-sfc/__tests__/parse.spec.ts | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/packages/compiler-sfc/__tests__/parse.spec.ts b/packages/compiler-sfc/__tests__/parse.spec.ts
index 5f1db5e2499..4634e2f82a4 100644
--- a/packages/compiler-sfc/__tests__/parse.spec.ts
+++ b/packages/compiler-sfc/__tests__/parse.spec.ts
@@ -319,5 +319,32 @@ h1 { color: red }
         `At least one <template> or <script> is required in a single file component`
       )
     })
+
+    test('different default lang for script & script setup', () => {
+      const { descriptor, errors } = parse(
+        `<script setup>const foo: string = 'bar'</script>
+        <script>console.log(1)</script>`,
+        {
+          defaultScriptLang: 'ts',
+          defaultScriptSetupLang: 'tsx'
+        }
+      )
+      expect(errors.length).toBe(0)
+      expect(descriptor.script?.lang).toBe('ts')
+      expect(descriptor.scriptSetup?.lang).toBe('tsx')
+    })
+
+    test('the same default lang for script & script setup', () => {
+      const { descriptor, errors } = parse(
+        `<script setup>const foo: string = 'bar'</script>
+        <script>console.log(1)</script>`,
+        {
+          defaultScriptLang: 'ts'
+        }
+      )
+      expect(errors.length).toBe(0)
+      expect(descriptor.script?.lang).toBe('ts')
+      expect(descriptor.scriptSetup?.lang).toBe('ts')
+    })
   })
 })

From 2e1556a08bbc0711e5e87e84313e27547840f1ee Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 02:20:10 +0800
Subject: [PATCH 03/11] fix: avoid duplicated equals

---
 packages/compiler-sfc/src/parse.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/compiler-sfc/src/parse.ts b/packages/compiler-sfc/src/parse.ts
index f8f3e7a5392..09c4f2f7412 100644
--- a/packages/compiler-sfc/src/parse.ts
+++ b/packages/compiler-sfc/src/parse.ts
@@ -195,19 +195,14 @@ export function parse(
       case 'script':
         const scriptBlock = createBlock(node, source, pad) as SFCScriptBlock
         const isSetup = !!scriptBlock.attrs.setup
-        if (isSetup && defaultScriptSetupLang) {
-          scriptBlock.lang ??= defaultScriptSetupLang
-        }
-
-        if (defaultScriptLang) {
-          scriptBlock.lang ??= defaultScriptLang
-        }
 
         if (isSetup && !descriptor.scriptSetup) {
+          scriptBlock.lang ??= defaultScriptSetupLang ?? defaultScriptLang
           descriptor.scriptSetup = scriptBlock
           break
         }
         if (!isSetup && !descriptor.script) {
+          scriptBlock.lang ??= defaultScriptLang
           descriptor.script = scriptBlock
           break
         }

From e42a6e4e868762c1c5a68d0e9ef6099b5e48441e Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 02:20:45 +0800
Subject: [PATCH 04/11] fix: tests

---
 packages/compiler-sfc/__tests__/parse.spec.ts | 54 +++++++++++++++++--
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/parse.spec.ts b/packages/compiler-sfc/__tests__/parse.spec.ts
index 4634e2f82a4..403825321f0 100644
--- a/packages/compiler-sfc/__tests__/parse.spec.ts
+++ b/packages/compiler-sfc/__tests__/parse.spec.ts
@@ -319,11 +319,57 @@ h1 { color: red }
         `At least one <template> or <script> is required in a single file component`
       )
     })
+  })
+
+  describe('default script lang', () => {
+    test('default script lang', () => {
+      const { descriptor, errors } = parse(
+        `<script>console.log(0x0f)</script>`,
+        {
+          defaultScriptLang: 'ts'
+        }
+      )
+      expect(errors.length).toBe(0)
+      expect(descriptor.script?.lang).toBe('ts')
+    })
+
+    test('default script setup lang without default script lang', () => {
+      const { descriptor, errors } = parse(
+        `<script>console.log(0x02)</script>`,
+        {
+          defaultScriptSetupLang: 'ts'
+        }
+      )
+      expect(errors.length).toBe(0)
+      expect(descriptor.script?.lang).toBeUndefined()
+    })
+
+    test('default script setup lang', () => {
+      const { descriptor, errors } = parse(
+        `<script setup>console.log(0x03)</script>`,
+        {
+          defaultScriptLang: 'ts'
+        }
+      )
+      expect(errors.length).toBe(0)
+      expect(descriptor.scriptSetup?.lang).toBe('ts')
+    })
+
+    test('default script setup lang by `defaultScriptSetupLang`', () => {
+      const { descriptor, errors } = parse(
+        `<script setup>console.log(0x04)</script>`,
+        {
+          defaultScriptSetupLang: 'tsx'
+        }
+      )
+      expect(errors.length).toBe(0)
+      expect(descriptor.scriptSetup?.lang).toBe('tsx')
+    })
 
     test('different default lang for script & script setup', () => {
       const { descriptor, errors } = parse(
         `<script setup>const foo: string = 'bar'</script>
-        <script>console.log(1)</script>`,
+        <script>console.log(0x05)</script>`,
         {
           defaultScriptLang: 'ts',
           defaultScriptSetupLang: 'tsx'
@@ -336,8 +382,10 @@ h1 { color: red }
 
     test('the same default lang for script & script setup', () => {
       const { descriptor, errors } = parse(
-        `<script setup>const foo: string = 'bar'</script>
-        <script>console.log(1)</script>`,
+        `
+        <script>console.log(0x06)</script>
+        <script setup>console.log(0x07)</script>
+        `,
         {
           defaultScriptLang: 'ts'
         }

From f385feeb46997fb1b6a88c57c35159d0b137e6f6 Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 02:44:41 +0800
Subject: [PATCH 05/11] fix: remove script setup option

---
 packages/compiler-sfc/src/parse.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/compiler-sfc/src/parse.ts b/packages/compiler-sfc/src/parse.ts
index 09c4f2f7412..8914f8cf6ee 100644
--- a/packages/compiler-sfc/src/parse.ts
+++ b/packages/compiler-sfc/src/parse.ts
@@ -22,9 +22,7 @@ export interface SFCParseOptions {
   pad?: boolean | 'line' | 'space'
   ignoreEmpty?: boolean
   compiler?: TemplateCompiler
-
   defaultScriptLang?: string
-  defaultScriptSetupLang?: string
 }
 
 export interface SFCBlock {
@@ -99,8 +97,7 @@ export function parse(
     pad = false,
     ignoreEmpty = true,
     compiler = CompilerDOM,
-    defaultScriptLang,
-    defaultScriptSetupLang
+    defaultScriptLang
   }: SFCParseOptions = {}
 ): SFCParseResult {
   const sourceKey =
@@ -195,9 +192,8 @@ export function parse(
       case 'script':
         const scriptBlock = createBlock(node, source, pad) as SFCScriptBlock
         const isSetup = !!scriptBlock.attrs.setup
-
         if (isSetup && !descriptor.scriptSetup) {
-          scriptBlock.lang ??= defaultScriptSetupLang ?? defaultScriptLang
+          scriptBlock.lang ??= defaultScriptLang
           descriptor.scriptSetup = scriptBlock
           break
         }

From 5b3a031c110be5e2488c5f4a943cc8ba686808f1 Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 02:45:02 +0800
Subject: [PATCH 06/11] fix: remove tests

---
 packages/compiler-sfc/__tests__/parse.spec.ts | 42 ++-----------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/parse.spec.ts b/packages/compiler-sfc/__tests__/parse.spec.ts
index 403825321f0..2fac00dfbdd 100644
--- a/packages/compiler-sfc/__tests__/parse.spec.ts
+++ b/packages/compiler-sfc/__tests__/parse.spec.ts
@@ -322,7 +322,7 @@ h1 { color: red }
   })
 
   describe('default script lang', () => {
-    test('default script lang', () => {
+    test('default lang for script', () => {
       const { descriptor, errors } = parse(
         `<script>console.log(0x0f)</script>`,
         {
@@ -333,18 +333,7 @@ h1 { color: red }
       expect(descriptor.script?.lang).toBe('ts')
     })
 
-    test('default script setup lang without default script lang', () => {
-      const { descriptor, errors } = parse(
-        `<script>console.log(0x02)</script>`,
-        {
-          defaultScriptSetupLang: 'ts'
-        }
-      )
-      expect(errors.length).toBe(0)
-      expect(descriptor.script?.lang).toBeUndefined()
-    })
-
-    test('default script setup lang', () => {
+    test('default lang for script setup', () => {
       const { descriptor, errors } = parse(
         `<script setup>console.log(0x03)</script>`,
         {
@@ -355,32 +344,7 @@ h1 { color: red }
       expect(descriptor.scriptSetup?.lang).toBe('ts')
     })
 
-    test('default script setup lang by `defaultScriptSetupLang`', () => {
-      const { descriptor, errors } = parse(
-        `<script setup>console.log(0x04)</script>`,
-        {
-          defaultScriptSetupLang: 'tsx'
-        }
-      )
-      expect(errors.length).toBe(0)
-      expect(descriptor.scriptSetup?.lang).toBe('tsx')
-    })
-
-    test('different default lang for script & script setup', () => {
-      const { descriptor, errors } = parse(
-        `<script setup>const foo: string = 'bar'</script>
-        <script>console.log(0x05)</script>`,
-        {
-          defaultScriptLang: 'ts',
-          defaultScriptSetupLang: 'tsx'
-        }
-      )
-      expect(errors.length).toBe(0)
-      expect(descriptor.script?.lang).toBe('ts')
-      expect(descriptor.scriptSetup?.lang).toBe('tsx')
-    })
-
-    test('the same default lang for script & script setup', () => {
+    test('default lang for script & script setup', () => {
       const { descriptor, errors } = parse(
         `
         <script>console.log(0x06)</script>

From 7dcdb8959d222d589b5c87a63a9084c6140b16b8 Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 02:51:05 +0800
Subject: [PATCH 07/11] fix: source cache key

---
 packages/compiler-sfc/src/parse.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/src/parse.ts b/packages/compiler-sfc/src/parse.ts
index 8914f8cf6ee..29d9b414f22 100644
--- a/packages/compiler-sfc/src/parse.ts
+++ b/packages/compiler-sfc/src/parse.ts
@@ -101,7 +101,13 @@ export function parse(
   }: SFCParseOptions = {}
 ): SFCParseResult {
   const sourceKey =
-    source + sourceMap + filename + sourceRoot + pad + compiler.parse
+    source +
+    sourceMap +
+    filename +
+    sourceRoot +
+    pad +
+    compiler.parse +
+    (defaultScriptLang ?? '')
   const cache = sourceToSFC.get(sourceKey)
   if (cache) {
     return cache

From 34ddf409db942270372cee1e7a4babe7a8ec88ae Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 02:54:50 +0800
Subject: [PATCH 08/11] test: add source cache key test

---
 packages/compiler-sfc/__tests__/parse.spec.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/compiler-sfc/__tests__/parse.spec.ts b/packages/compiler-sfc/__tests__/parse.spec.ts
index 2fac00dfbdd..11a83f93688 100644
--- a/packages/compiler-sfc/__tests__/parse.spec.ts
+++ b/packages/compiler-sfc/__tests__/parse.spec.ts
@@ -358,5 +358,20 @@ h1 { color: red }
       expect(descriptor.script?.lang).toBe('ts')
       expect(descriptor.scriptSetup?.lang).toBe('ts')
     })
+
+    test('source cache key', () => {
+      const { descriptor, errors } = parse(
+        `
+        <script>console.log(0x06)</script>
+        <script setup>console.log(0x07)</script>
+        `,
+        {
+          defaultScriptLang: 'tsx'
+        }
+      )
+      expect(errors.length).toBe(0)
+      expect(descriptor.script?.lang).toBe('tsx')
+      expect(descriptor.scriptSetup?.lang).toBe('tsx')
+    })
   })
 })

From b0428a838ecbe84911636a8160ca1a1bfea1821b Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 07:58:26 +0800
Subject: [PATCH 09/11] chore: format

---
 packages/compiler-sfc/src/parse.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/compiler-sfc/src/parse.ts b/packages/compiler-sfc/src/parse.ts
index 29d9b414f22..2d766caa10f 100644
--- a/packages/compiler-sfc/src/parse.ts
+++ b/packages/compiler-sfc/src/parse.ts
@@ -107,7 +107,7 @@ export function parse(
     sourceRoot +
     pad +
     compiler.parse +
-    (defaultScriptLang ?? '')
+    (defaultScriptLang || '')
   const cache = sourceToSFC.get(sourceKey)
   if (cache) {
     return cache
@@ -199,12 +199,12 @@ export function parse(
         const scriptBlock = createBlock(node, source, pad) as SFCScriptBlock
         const isSetup = !!scriptBlock.attrs.setup
         if (isSetup && !descriptor.scriptSetup) {
-          scriptBlock.lang ??= defaultScriptLang
+          if (!scriptBlock.lang) scriptBlock.lang = defaultScriptLang
           descriptor.scriptSetup = scriptBlock
           break
         }
         if (!isSetup && !descriptor.script) {
-          scriptBlock.lang ??= defaultScriptLang
+          if (!scriptBlock.lang) scriptBlock.lang = defaultScriptLang
           descriptor.script = scriptBlock
           break
         }

From 877ccf919a70a5aeba43dd0f67d3e20aee8e595d Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 08:02:29 +0800
Subject: [PATCH 10/11] chore: comment

---
 packages/compiler-sfc/__tests__/parse.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/compiler-sfc/__tests__/parse.spec.ts b/packages/compiler-sfc/__tests__/parse.spec.ts
index 11a83f93688..767dc8fcef9 100644
--- a/packages/compiler-sfc/__tests__/parse.spec.ts
+++ b/packages/compiler-sfc/__tests__/parse.spec.ts
@@ -359,7 +359,9 @@ h1 { color: red }
       expect(descriptor.scriptSetup?.lang).toBe('ts')
     })
 
+    // This only tests if the "source to sfc" cache has "defaultScriptLang" as part of the cache key.
     test('source cache key', () => {
+      // The same SFC as previous test
       const { descriptor, errors } = parse(
         `
         <script>console.log(0x06)</script>

From 01f0891116c5ac98387199ed6ee2eead2bdc8995 Mon Sep 17 00:00:00 2001
From: Hydrogen <3038094028@qq.com>
Date: Sat, 19 Nov 2022 17:43:26 +0800
Subject: [PATCH 11/11] fix: cache key may conflict

---
 packages/compiler-sfc/src/parse.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/src/parse.ts b/packages/compiler-sfc/src/parse.ts
index 2d766caa10f..c4bde57b39f 100644
--- a/packages/compiler-sfc/src/parse.ts
+++ b/packages/compiler-sfc/src/parse.ts
@@ -107,7 +107,7 @@ export function parse(
     sourceRoot +
     pad +
     compiler.parse +
-    (defaultScriptLang || '')
+    (defaultScriptLang ? '@' + defaultScriptLang : '')
   const cache = sourceToSFC.get(sourceKey)
   if (cache) {
     return cache