chore: updated code

Author: baiwusanyu-c

packages/compiler-core/src/ast.ts

@@ -11,7 +11,8 @@ import {
   CREATE_VNODE,
   CREATE_ELEMENT_VNODE,
   CREATE_BLOCK,
-  CREATE_ELEMENT_BLOCK
+  CREATE_ELEMENT_BLOCK,
+  RESOLVE_SETUP_RETURNED
 } from './runtimeHelpers'
 import { PropsExpression } from './transforms/transformElement'
 import { ImportItem, TransformContext } from './transform'
@@ -822,6 +823,10 @@ export function getVNodeBlockHelper(ssr: boolean, isComponent: boolean) {
   return ssr || isComponent ? CREATE_BLOCK : CREATE_ELEMENT_BLOCK
 }
 
+export function getSetupReturnedHelper() {
+  return RESOLVE_SETUP_RETURNED
+}
+
 export function convertToBlock(
   node: VNodeCall,
   { helper, removeHelper, inSSR }: TransformContext

packages/compiler-core/src/codegen.ts

@@ -26,7 +26,8 @@ import {
   VNodeCall,
   SequenceExpression,
   getVNodeBlockHelper,
-  getVNodeHelper
+  getVNodeHelper,
+  getSetupReturnedHelper
 } from './ast'
 import { SourceMapGenerator, RawSourceMap } from 'source-map-js'
 import {
@@ -231,6 +232,8 @@ export function generate(
   if (!__BROWSER__ && options.bindingMetadata && !options.inline) {
     // binding optimization args
     args.push('$props', '$setup', '$data', '$options')
+    // Add helper 'getSetupReturnedHelper' for $setup
+    context.helper(getSetupReturnedHelper())
   }
   const signature =
     !__BROWSER__ && options.isTS

packages/compiler-core/src/runtimeHelpers.ts

@@ -12,6 +12,7 @@ export const CREATE_COMMENT = Symbol(__DEV__ ? `createCommentVNode` : ``)
 export const CREATE_TEXT = Symbol(__DEV__ ? `createTextVNode` : ``)
 export const CREATE_STATIC = Symbol(__DEV__ ? `createStaticVNode` : ``)
 export const RESOLVE_COMPONENT = Symbol(__DEV__ ? `resolveComponent` : ``)
+export const RESOLVE_SETUP_RETURNED = Symbol(__DEV__ ? `resolveSetupReturned` : ``)
 export const RESOLVE_DYNAMIC_COMPONENT = Symbol(
   __DEV__ ? `resolveDynamicComponent` : ``
 )
@@ -57,6 +58,7 @@ export const helperNameMap: Record<symbol, string> = {
   [CREATE_TEXT]: `createTextVNode`,
   [CREATE_STATIC]: `createStaticVNode`,
   [RESOLVE_COMPONENT]: `resolveComponent`,
+  [RESOLVE_SETUP_RETURNED]:`resolveSetupReturned`,
   [RESOLVE_DYNAMIC_COMPONENT]: `resolveDynamicComponent`,
   [RESOLVE_DIRECTIVE]: `resolveDirective`,
   [RESOLVE_FILTER]: `resolveFilter`,

packages/compiler-core/src/transforms/transformElement.ts

@@ -19,7 +19,8 @@ import {
   TemplateTextChildNode,
   DirectiveArguments,
   createVNodeCall,
-  ConstantTypes
+  ConstantTypes,
+  getSetupReturnedHelper
 } from '../ast'
 import {
   PatchFlags,
@@ -369,10 +370,11 @@ function resolveSetupReference(name: string, context: TransformContext) {
     checkType(BindingTypes.SETUP_REACTIVE_CONST) ||
     checkType(BindingTypes.LITERAL_CONST)
   if (fromConst) {
+    const helper = context.helperString
     return context.inline
       ? // in inline mode, const setup bindings (e.g. imports) can be used as-is
         fromConst
-      : `$setup[${JSON.stringify(fromConst)}]`
+      : `${helper(getSetupReturnedHelper())}(${JSON.stringify(fromConst)}, $setup)`
   }
 
   const fromMaybeRef =

packages/runtime-core/src/helpers/resolveAssets.ts

@@ -141,3 +141,18 @@ function resolve(registry: Record<string, any> | undefined, name: string) {
       registry[capitalize(camelize(name))])
   )
 }
+
+/**
+ * @private
+ */
+export function resolveSetupReturned(name:string, setupReturn: any) {
+  if(!setupReturn) return name
+  const returnValue = setupReturn[name]
+  if(returnValue && returnValue.__file && isLateTag(name as string)){
+    const extra =
+      `\nIf this is a native custom element, make sure to exclude it from ` +
+        `component resolution via compilerOptions.isCustomElement.`
+    warn(`Failed to resolve component: ${name}${extra}`)
+  }
+  return returnValue
+}

packages/runtime-core/src/index.ts

@@ -128,7 +128,8 @@ export {
 export {
   resolveComponent,
   resolveDirective,
-  resolveDynamicComponent
+  resolveDynamicComponent,
+  resolveSetupReturned
 } from './helpers/resolveAssets'
 // For integration with runtime compiler
 export { registerRuntimeCompiler, isRuntimeOnly } from './component'