refactor: improve logic

yyx990803 · yyx990803 · commit 298fc90804d6 · 2020-11-19T23:11:19.000-05:00
diff --git a/src/index.ts b/src/index.ts
@@ -114,7 +114,7 @@ export default function PluginVue(userOptions: Partial<Options> = {}): Plugin {
             query.type === 'template'
               ? descriptor.template!
               : query.type === 'script'
-              ? getResolvedScript(descriptor, isServer)
+              ? getResolvedScript(descriptor, !isServer)
               : query.type === 'style'
               ? descriptor.styles[query.index]
               : typeof query.index === 'number'
diff --git a/src/script.ts b/src/script.ts
@@ -1,6 +1,8 @@
 import { compileScript, SFCDescriptor, SFCScriptBlock } from '@vue/compiler-sfc'
+import { TransformPluginContext } from 'rollup'
 import { Options } from '.'
 import { getTemplateCompilerOptions } from './template'
+import { createRollupError } from './utils/error'
 
 // since we generate different output based on whether the template is inlined
 // or not, we need to cache the results separately
@@ -9,9 +11,9 @@ const normalCache = new WeakMap<SFCDescriptor, SFCScriptBlock | null>()
 
 export function getResolvedScript(
   descriptor: SFCDescriptor,
-  isServer: boolean
+  enableInline: boolean
 ): SFCScriptBlock | null | undefined {
-  const cacheToUse = isServer ? normalCache : inlinedCache
+  const cacheToUse = enableInline ? inlinedCache : normalCache
   return cacheToUse.get(descriptor)
 }
 
@@ -20,40 +22,44 @@ export function resolveScript(
   scopeId: string,
   isProd: boolean,
   isServer: boolean,
-  options: Options
+  options: Options,
+  pluginContext: TransformPluginContext
 ) {
   if (!descriptor.script && !descriptor.scriptSetup) {
     return null
   }
 
-  const cached = getResolvedScript(descriptor, isServer)
+  const enableInline = !isServer
+  const cacheToUse = enableInline ? inlinedCache : normalCache
+  const cached = cacheToUse.get(descriptor)
   if (cached) {
     return cached
   }
 
-  let resolved: SFCScriptBlock | null
+  let resolved: SFCScriptBlock | null = null
 
   if (compileScript) {
-    resolved = compileScript(descriptor, {
-      id: scopeId,
-      isProd,
-      inlineTemplate: !isServer,
-      templateOptions: getTemplateCompilerOptions(options, descriptor, scopeId),
-    })
+    try {
+      resolved = compileScript(descriptor, {
+        id: scopeId,
+        isProd,
+        inlineTemplate: enableInline,
+        templateOptions: enableInline
+          ? getTemplateCompilerOptions(options, descriptor, scopeId)
+          : undefined,
+      })
+    } catch (e) {
+      pluginContext.error(createRollupError(descriptor.filename, e))
+    }
   } else if (descriptor.scriptSetup) {
-    throw new Error(
+    pluginContext.error(
       `<script setup> is not supported by the installed version of ` +
         `@vue/compiler-sfc - please upgrade.`
     )
   } else {
     resolved = descriptor.script
   }
 
-  if (isServer) {
-    normalCache.set(descriptor, resolved)
-  } else {
-    inlinedCache.set(descriptor, resolved)
-  }
-
+  cacheToUse.set(descriptor, resolved)
   return resolved
 }
diff --git a/src/sfc.ts b/src/sfc.ts
@@ -42,10 +42,8 @@ export function transformSFCEntry(
   // feature information
   const hasScoped = descriptor.styles.some((s) => s.scoped)
 
-  const hasTemplateImport =
-    descriptor.template &&
-    // script setup compiles template inline, do not import again
-    (isServer || !descriptor.scriptSetup)
+  const useInlineTemplate = descriptor.scriptSetup && !isServer
+  const hasTemplateImport = descriptor.template && !useInlineTemplate
 
   const templateImport = hasTemplateImport
     ? genTemplateCode(descriptor, scopeId, isServer)
@@ -62,7 +60,8 @@ export function transformSFCEntry(
     scopeId,
     isProduction,
     isServer,
-    options
+    options,
+    pluginContext
   )
   const stylesCode = genStyleCode(descriptor, scopeId, options.preprocessStyles)
   const customBlocksCode = getCustomBlock(descriptor, filterCustomBlock)
@@ -118,10 +117,18 @@ function genScriptCode(
   scopeId: string,
   isProd: boolean,
   isServer: boolean,
-  options: Options
+  options: Options,
+  pluginContext: TransformPluginContext
 ) {
   let scriptImport = `const script = {}`
-  const script = resolveScript(descriptor, scopeId, isProd, isServer, options)
+  const script = resolveScript(
+    descriptor,
+    scopeId,
+    isProd,
+    isServer,
+    options,
+    pluginContext
+  )
   if (script) {
     const src = script.src || descriptor.filename
     const attrsQuery = attrsToQuery(script.attrs, 'js')
diff --git a/src/template.ts b/src/template.ts
@@ -71,7 +71,7 @@ export function getTemplateCompilerOptions(
     preprocessLang &&
     options.templatePreprocessOptions &&
     options.templatePreprocessOptions[preprocessLang]
-  const resolvedScript = getResolvedScript(descriptor, isServer)
+  const resolvedScript = getResolvedScript(descriptor, !isServer)
   return {
     filename: descriptor.filename,
     inMap: block.src ? undefined : block.map,
