fix(detection): better <script/> detect, close #623

lokalise · Jul 16, 2021 · 67dc0b0 · 67dc0b0
1 parent 38a5c47
commit 67dc0b0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 57 deletions.
diff --git a/src/extraction/parsers/html.ts b/src/extraction/parsers/html.ts
@@ -2,6 +2,7 @@ import { Parser } from 'htmlparser2'
 import { DefaultDynamicExtractionsRules, DefaultExtractionRules, ExtractionRule } from '../rules'
 import { shouldExtract } from '../shouldExtract'
 import { ExtractionHTMLOptions } from './options'
+import { shiftDetectionPosition } from './utils'
 import { DetectionResult } from '~/core/types'
 
 const defaultOptions: Required<ExtractionHTMLOptions> = {
@@ -16,7 +17,8 @@ export function detect(
   rules: ExtractionRule[] = DefaultExtractionRules,
   dynamicRules: ExtractionRule[] = DefaultDynamicExtractionsRules,
   userOptions: ExtractionHTMLOptions = {},
-) {
+  extractScripts?: (script: string, start: number) => DetectionResult[],
+): DetectionResult[] {
   const {
     attributes: ATTRS,
     ignoredTags: IGNORED_TAGS,
@@ -80,6 +82,14 @@ export function detect(
       }
     },
     ontext(fullText) {
+      const start = parser.startIndex
+      const end = parser.endIndex! + 1
+
+      if (extractScripts && lastTag === 'script') {
+        detections.push(...shiftDetectionPosition(extractScripts(fullText, start), start))
+        return
+      }
+
       if (IGNORED_TAGS.includes(lastTag))
         return
 
@@ -88,9 +98,6 @@ export function detect(
       if (!shouldExtract(text, rules))
         return
 
-      const start = parser.startIndex
-      const end = parser.endIndex! + 1
-
       detections.push({
         text: fullText,
         fullText,

diff --git a/src/frameworks/svelte.ts b/src/frameworks/svelte.ts
@@ -38,36 +38,18 @@ class SvelteFramework extends Framework {
   detectHardStrings(doc: TextDocument) {
     const text = doc.getText()
 
-    const result: DetectionResult[] = []
-
-    result.push(
-      ...extractionsParsers.html.detect(
-        text,
+    return extractionsParsers.html.detect(
+      text,
+      DefaultExtractionRules,
+      DefaultDynamicExtractionsRules,
+      Config.extractParserHTMLOptions,
+      // <script>
+      script => extractionsParsers.babel.detect(
+        script,
         DefaultExtractionRules,
         DefaultDynamicExtractionsRules,
-        Config.extractParserHTMLOptions,
       ),
     )
-
-    // <script>
-    const scriptMatch = text.match(/(<script[^>]*?>)([\s\S*]*?)<\/script>/)
-    if (scriptMatch && scriptMatch.index != null && scriptMatch.length > 2) {
-      const index = scriptMatch.index + scriptMatch[1].length
-      const code = scriptMatch[2]
-
-      result.push(
-        ...shiftDetectionPosition(
-          extractionsParsers.babel.detect(
-            code,
-            DefaultExtractionRules,
-            DefaultDynamicExtractionsRules,
-          ),
-          index,
-        ),
-      )
-    }
-
-    return result
   }
 }
 

diff --git a/src/frameworks/vue.ts b/src/frameworks/vue.ts
@@ -3,7 +3,6 @@ import { Framework } from './base'
 import { LanguageId } from '~/utils'
 import { DefaultDynamicExtractionsRules, DefaultExtractionRules, extractionsParsers } from '~/extraction'
 import { Config, DetectionResult } from '~/core'
-import { shiftDetectionPosition } from '~/extraction/parsers/utils'
 
 class VueFramework extends Framework {
   id = 'vue'
@@ -68,36 +67,18 @@ class VueFramework extends Framework {
   detectHardStrings(doc: TextDocument) {
     const text = doc.getText()
 
-    const result: DetectionResult[] = []
-
-    result.push(
-      ...extractionsParsers.html.detect(
-        text,
+    return extractionsParsers.html.detect(
+      text,
+      DefaultExtractionRules,
+      DefaultDynamicExtractionsRules,
+      Config.extractParserHTMLOptions,
+      // <script>
+      script => extractionsParsers.babel.detect(
+        script,
         DefaultExtractionRules,
         DefaultDynamicExtractionsRules,
-        Config.extractParserHTMLOptions,
       ),
     )
-
-    // <script>
-    const scriptMatch = text.match(/(<script[^>]*?>)([\s\S*]*?)<\/script>/)
-    if (scriptMatch && scriptMatch.index != null && scriptMatch.length > 2) {
-      const index = scriptMatch.index + scriptMatch[1].length
-      const code = scriptMatch[2]
-
-      result.push(
-        ...shiftDetectionPosition(
-          extractionsParsers.babel.detect(
-            code,
-            DefaultExtractionRules,
-            DefaultDynamicExtractionsRules,
-          ),
-          index,
-        ),
-      )
-    }
-
-    return result
   }
 }