refactor: internal structures (#426)

Author: antfu

src/apis/computed.ts

@@ -1,6 +1,6 @@
-import { getCurrentVue, getCurrentInstance } from '../runtimeContext'
+import { getVueConstructor, getCurrentInstance } from '../runtimeContext'
 import { createRef, Ref } from '../reactivity'
-import { defineComponentInstance } from '../helper'
+import { defineComponentInstance } from '../utils/helper'
 import { warn } from '../utils'
 
 interface Option<T> {
@@ -31,7 +31,7 @@ export function computed<T>(
     set = options.set
   }
 
-  const computedHost = defineComponentInstance(getCurrentVue(), {
+  const computedHost = defineComponentInstance(getVueConstructor(), {
     computed: {
       $$state: {
         get,

src/createApp.ts renamed to src/apis/createApp.ts

@@ -1,7 +1,7 @@
 import type Vue from 'vue'
 import { VueConstructor } from 'vue/types/umd'
-import { getCurrentVue } from './runtimeContext'
-import { warn } from './utils'
+import { getVueConstructor } from '../runtimeContext'
+import { warn } from '../utils'
 
 export interface App {
   config: VueConstructor['config']
@@ -14,7 +14,7 @@ export interface App {
 }
 
 export function createApp(rootComponent: any, rootProps: any = undefined): App {
-  const V = getCurrentVue()!
+  const V = getVueConstructor()!
 
   let mountedVM: Vue | undefined = undefined
 

src/createElement.ts renamed to src/apis/createElement.ts

@@ -1,22 +1,23 @@
 import Vue from 'vue'
-import { currentVM, getCurrentVue } from './runtimeContext'
-import { defineComponentInstance } from './helper'
-import { warn } from './utils'
+import { getVueConstructor, getCurrentInstance } from '../runtimeContext'
+import { defineComponentInstance } from '../utils/helper'
+import { warn } from '../utils'
 
 type CreateElement = Vue['$createElement']
 
 let fallbackCreateElement: CreateElement
 
 export const createElement = (function createElement(...args: any) {
-  if (!currentVM) {
+  const instance = getCurrentInstance()
+  if (!instance) {
     warn('`createElement()` has been called outside of render function.')
     if (!fallbackCreateElement) {
-      fallbackCreateElement = defineComponentInstance(getCurrentVue())
+      fallbackCreateElement = defineComponentInstance(getVueConstructor())
         .$createElement
     }
 
     return fallbackCreateElement.apply(fallbackCreateElement, args)
   }
 
-  return currentVM.$createElement.apply(currentVM, args)
+  return instance.$createElement.apply(instance, args)
 } as any) as CreateElement

src/apis/index.ts

@@ -0,0 +1,8 @@
+export * from './state'
+export * from './lifecycle'
+export * from './watch'
+export * from './computed'
+export * from './inject'
+export { createApp } from './createApp'
+export { nextTick } from './nextTick'
+export { createElement as h } from './createElement'

src/apis/inject.ts

@@ -1,6 +1,5 @@
 import { ComponentInstance } from '../component'
-import { currentVMInFn } from '../helper'
-import { hasOwn, warn } from '../utils'
+import { hasOwn, warn, currentVMInFn } from '../utils'
 import { getCurrentInstance } from '../runtimeContext'
 
 const NOT_FOUND = {}

src/apis/lifecycle.ts

@@ -1,18 +1,18 @@
 import { VueConstructor } from 'vue'
 import { ComponentInstance } from '../component'
 import {
-  getCurrentVue,
-  setCurrentVM,
+  getVueConstructor,
+  setCurrentInstance,
   getCurrentInstance,
 } from '../runtimeContext'
-import { currentVMInFn } from '../helper'
+import { currentVMInFn } from '../utils/helper'
 
 const genName = (name: string) => `on${name[0].toUpperCase() + name.slice(1)}`
 function createLifeCycle(lifeCyclehook: string) {
   return (callback: Function) => {
     const vm = currentVMInFn(genName(lifeCyclehook))
     if (vm) {
-      injectHookOption(getCurrentVue(), vm, lifeCyclehook, callback)
+      injectHookOption(getVueConstructor(), vm, lifeCyclehook, callback)
     }
   }
 }
@@ -31,11 +31,11 @@ function injectHookOption(
 function wrapHookCall(vm: ComponentInstance, fn: Function) {
   return (...args: any) => {
     let preVm = getCurrentInstance()
-    setCurrentVM(vm)
+    setCurrentInstance(vm)
     try {
       return fn(...args)
     } finally {
-      setCurrentVM(preVm)
+      setCurrentInstance(preVm)
     }
   }
 }

src/nextTick.ts renamed to src/apis/nextTick.ts

@@ -1,11 +1,11 @@
 import Vue from 'vue'
-import { currentVue } from './runtimeContext'
+import { getVueConstructor } from '../runtimeContext'
 
 type NextTick = Vue['$nextTick']
 
 export const nextTick: NextTick = function nextTick(
   this: ThisType<NextTick>,
   ...args: Parameters<NextTick>
 ) {
-  return currentVue?.nextTick.apply(this, args)
+  return getVueConstructor()?.nextTick.apply(this, args)
 } as any

src/apis/state.ts

@@ -1,17 +1,18 @@
 export {
+  isReactive,
+  isRef,
+  markRaw,
+  markReactive,
   reactive,
   ref,
   Ref,
-  isRef,
-  toRefs,
   set,
-  toRef,
-  isReactive,
-  UnwrapRef,
-  markRaw,
-  unref,
   shallowReactive,
-  toRaw,
   shallowRef,
+  toRaw,
+  toRef,
+  toRefs,
   triggerRef,
+  unref,
+  UnwrapRef,
 } from '../reactivity'

src/apis/watch.ts

@@ -1,9 +1,12 @@
 import { ComponentInstance } from '../component'
 import { Ref, isRef, isReactive } from '../reactivity'
 import { assert, logError, noopFn, warn, isFunction } from '../utils'
-import { defineComponentInstance } from '../helper'
-import { getCurrentInstance, getCurrentVue } from '../runtimeContext'
-import { WatcherPreFlushQueueKey, WatcherPostFlushQueueKey } from '../symbols'
+import { defineComponentInstance } from '../utils/helper'
+import { getCurrentInstance, getVueConstructor } from '../runtimeContext'
+import {
+  WatcherPreFlushQueueKey,
+  WatcherPostFlushQueueKey,
+} from '../utils/symbols'
 import { ComputedRef } from './computed'
 
 export type WatchEffect = (onInvalidate: InvalidateCbRegistrator) => void
@@ -98,7 +101,7 @@ function getWatcherVM() {
   let vm = getCurrentInstance()
   if (!vm) {
     if (!fallbackVM) {
-      fallbackVM = defineComponentInstance(getCurrentVue())
+      fallbackVM = defineComponentInstance(getVueConstructor())
     }
     vm = fallbackVM
   } else if (!hasWatchEnv(vm)) {

src/env.d.ts

@@ -1,5 +1,5 @@
 import { VueConstructor } from 'vue'
-import { VfaState } from './vmStateManager'
+import { VfaState } from './utils/vmStateManager'
 import { VueWatcher } from './apis/watch'
 
 declare global {
@@ -13,7 +13,7 @@ declare module 'vue/types/vue' {
     readonly _uid: number
     readonly _data: Record<string, any>
     _watchers: VueWatcher[]
-    __secret_vfa_state__?: VfaState
+    __composition_api_state__?: VfaState
   }
 
   interface VueConstructor {