refactor: createComponentInstance to call getCurrentInstance

vuejs · Mar 22, 2024 · 339e674 · 339e674
1 parent f40f5a6
commit 339e674
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 42 deletions.
diff --git a/packages/runtime-vapor/__tests__/apiInject.spec.ts b/packages/runtime-vapor/__tests__/apiInject.spec.ts
@@ -27,13 +27,13 @@ describe('api: provide/inject', () => {
     const Provider = define({
       setup() {
         provide('foo', 1)
-        return createComponent(Middle, getCurrentInstance()!)
+        return createComponent(Middle)
       },
     })
 
     const Middle = {
       render() {
-        return createComponent(Consumer, getCurrentInstance()!)
+        return createComponent(Consumer)
       },
     }
 
@@ -59,12 +59,12 @@ describe('api: provide/inject', () => {
     const Provider = define({
       setup() {
         provide(key, 1)
-        return createComponent(Middle, getCurrentInstance()!)
+        return createComponent(Middle)
       },
     })
 
     const Middle = {
-      render: () => createComponent(Consumer, getCurrentInstance()!),
+      render: () => createComponent(Consumer),
     }
 
     const Consumer = {
@@ -86,12 +86,12 @@ describe('api: provide/inject', () => {
     const Provider = define({
       setup() {
         provide('foo', 'foo')
-        return createComponent(Middle, getCurrentInstance()!)
+        return createComponent(Middle)
       },
     })
 
     const Middle = {
-      render: () => createComponent(Consumer, getCurrentInstance()!),
+      render: () => createComponent(Consumer),
     }
 
     const Consumer = {
@@ -120,7 +120,7 @@ describe('api: provide/inject', () => {
       setup() {
         provide('foo', 'foo')
         provide('bar', 'bar')
-        return createComponent(ProviderTwo, getCurrentInstance()!)
+        return createComponent(ProviderTwo)
       },
     })
 
@@ -129,7 +129,7 @@ describe('api: provide/inject', () => {
         // override parent value
         provide('foo', 'fooOverride')
         provide('baz', 'baz')
-        return createComponent(Consumer, getCurrentInstance()!)
+        return createComponent(Consumer)
       },
     }
 
@@ -156,12 +156,12 @@ describe('api: provide/inject', () => {
     const Provider = define({
       setup() {
         provide('count', count)
-        return createComponent(Middle, getCurrentInstance()!)
+        return createComponent(Middle)
       },
     })
 
     const Middle = {
-      render: () => createComponent(Consumer, getCurrentInstance()!),
+      render: () => createComponent(Consumer),
     }
 
     const Consumer = {
@@ -191,12 +191,12 @@ describe('api: provide/inject', () => {
     const Provider = define({
       setup() {
         provide('count', readonly(count))
-        return createComponent(Middle, getCurrentInstance()!)
+        return createComponent(Middle)
       },
     })
 
     const Middle = {
-      render: () => createComponent(Consumer, getCurrentInstance()!),
+      render: () => createComponent(Consumer),
     }
 
     const Consumer = {
@@ -232,12 +232,12 @@ describe('api: provide/inject', () => {
     const Provider = define({
       setup() {
         provide('state', rootState)
-        return createComponent(Middle, getCurrentInstance()!)
+        return createComponent(Middle)
       },
     })
 
     const Middle = {
-      render: () => createComponent(Consumer, getCurrentInstance()!),
+      render: () => createComponent(Consumer),
     }
 
     const Consumer = {
@@ -267,12 +267,12 @@ describe('api: provide/inject', () => {
     const Provider = define({
       setup() {
         provide('state', readonly(rootState))
-        return createComponent(Middle, getCurrentInstance()!)
+        return createComponent(Middle)
       },
     })
 
     const Middle = {
-      render: () => createComponent(Consumer, getCurrentInstance()!),
+      render: () => createComponent(Consumer),
     }
 
     const Consumer = {
@@ -305,12 +305,12 @@ describe('api: provide/inject', () => {
   it('should warn unfound', () => {
     const Provider = define({
       setup() {
-        return createComponent(Middle, getCurrentInstance()!)
+        return createComponent(Middle)
       },
     })
 
     const Middle = {
-      render: () => createComponent(Consumer, getCurrentInstance()!),
+      render: () => createComponent(Consumer),
     }
 
     const Consumer = {
@@ -333,12 +333,12 @@ describe('api: provide/inject', () => {
   it('should not warn when default value is undefined', () => {
     const Provider = define({
       setup() {
-        return createComponent(Middle, getCurrentInstance()!)
+        return createComponent(Middle)
       },
     })
 
     const Middle = {
-      render: () => createComponent(Consumer, getCurrentInstance()!),
+      render: () => createComponent(Consumer),
     }
 
     const Consumer = {

diff --git a/packages/runtime-vapor/__tests__/componentAttrs.spec.ts b/packages/runtime-vapor/__tests__/componentAttrs.spec.ts
@@ -34,7 +34,6 @@ describe('attribute fallthrough', () => {
       render(_ctx: Record<string, any>) {
         return createComponent(
           Child,
-          null,
           [
             {
               foo: () => _ctx.foo,
@@ -80,7 +79,6 @@ describe('attribute fallthrough', () => {
       render(_ctx: Record<string, any>) {
         return createComponent(
           Child,
-          null,
           [
             {
               foo: () => _ctx.foo,
@@ -120,7 +118,6 @@ describe('attribute fallthrough', () => {
       render() {
         const n0 = createComponent(
           Grandson,
-          null,
           [
             {
               'custom-attr': () => 'custom-attr',
@@ -141,7 +138,6 @@ describe('attribute fallthrough', () => {
       render(_ctx: Record<string, any>) {
         return createComponent(
           Child,
-          null,
           [
             {
               foo: () => _ctx.foo,

diff --git a/packages/runtime-vapor/__tests__/componentProps.spec.ts b/packages/runtime-vapor/__tests__/componentProps.spec.ts
@@ -240,7 +240,6 @@ describe('component: props', () => {
       render(_ctx: Record<string, any>) {
         return createComponent(
           Child,
-          null,
           {
             foo: () => _ctx.foo,
             id: () => _ctx.id,
@@ -409,9 +408,7 @@ describe('component: props', () => {
     }
 
     define(() =>
-      createComponent(Comp, null, [
-        () => (passFoo.value ? { foo: () => 'ok' } : {}),
-      ]),
+      createComponent(Comp, [() => (passFoo.value ? { foo: () => 'ok' } : {})]),
     ).render()
 
     expect(initialKeys).toMatchObject(['foo'])

diff --git a/packages/runtime-vapor/__tests__/dom/prop.spec.ts b/packages/runtime-vapor/__tests__/dom/prop.spec.ts
@@ -18,7 +18,7 @@ import { getMetadata, recordPropMetadata } from '../../src/componentMetadata'
 let removeComponentInstance = NOOP
 beforeEach(() => {
   const reset = setCurrentInstance(
-    createComponentInstance((() => {}) as any, null, {}),
+    createComponentInstance((() => {}) as any, {}),
   )
   removeComponentInstance = () => {
     reset()

diff --git a/packages/runtime-vapor/src/apiCreateComponent.ts b/packages/runtime-vapor/src/apiCreateComponent.ts
@@ -1,6 +1,5 @@
 import {
   type Component,
-  type ComponentInternalInstance,
   createComponentInstance,
   currentInstance,
 } from './component'
@@ -10,14 +9,12 @@ import { withAttrs } from './componentAttrs'
 
 export function createComponent(
   comp: Component,
-  parent: ComponentInternalInstance | null,
   rawProps: RawProps | null = null,
   singleRoot: boolean = false,
 ) {
   const current = currentInstance!
   const instance = createComponentInstance(
     comp,
-    parent,
     singleRoot ? withAttrs(rawProps) : rawProps,
   )
   setupComponent(instance, singleRoot)

diff --git a/packages/runtime-vapor/src/apiCreateVaporApp.ts b/packages/runtime-vapor/src/apiCreateVaporApp.ts
@@ -41,12 +41,7 @@ export function createVaporApp(
 
     mount(rootContainer): any {
       if (!instance) {
-        instance = createComponentInstance(
-          rootComponent,
-          null,
-          rootProps,
-          context,
-        )
+        instance = createComponentInstance(rootComponent, rootProps, context)
         setupComponent(instance)
         render(instance, rootContainer)
         return instance

diff --git a/packages/runtime-vapor/src/component.ts b/packages/runtime-vapor/src/component.ts
@@ -187,11 +187,11 @@ const emptyAppContext = createAppContext()
 let uid = 0
 export function createComponentInstance(
   component: ObjectComponent | FunctionalComponent,
-  parent: ComponentInternalInstance | null,
   rawProps: RawProps | null,
   // application root node only
   appContext: AppContext | null = null,
 ): ComponentInternalInstance {
+  const parent = getCurrentInstance()
   const _appContext =
     (parent ? parent.appContext : appContext) || emptyAppContext
 

diff --git a/playground/src/props.js b/playground/src/props.js
@@ -2,7 +2,6 @@
 import {
   createComponent,
   defineComponent,
-  getCurrentInstance,
   on,
   reactive,
   ref,
@@ -34,7 +33,7 @@ export default defineComponent({
       on(n0, 'click', () => handleClick)
       renderEffect(() => setText(n0, count.value))
       /** @type {any} */
-      const n1 = createComponent(child, getCurrentInstance(), [
+      const n1 = createComponent(child, [
         {
           /* <Comp :count="count" /> */
           count: () => {
@@ -45,7 +44,6 @@ export default defineComponent({
           inlineDouble: () => count.value * 2,
           id: () => 'hello',
         },
-
         () => props,
       ])
       return [n0, n1]