Skip to content

Commit 7e0f15f

Browse files
committed
refactor(runtime-vapor): re-organize
1 parent b4da5a8 commit 7e0f15f

File tree

13 files changed

+39
-31
lines changed

13 files changed

+39
-31
lines changed

packages/runtime-vapor/__tests__/dom/prop.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
createComponentInstance,
1414
setCurrentInstance,
1515
} from '../../src/component'
16-
import { getMetadata, recordPropMetadata } from '../../src/metadata'
16+
import { getMetadata, recordPropMetadata } from '../../src/componentMetadata'
1717

1818
let removeComponentInstance = NOOP
1919
beforeEach(() => {

packages/runtime-vapor/src/apiLifecycle.ts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,25 @@ import { warn } from './warning'
77
import { pauseTracking, resetTracking } from '@vue/reactivity'
88
import { ErrorTypeStrings, callWithAsyncErrorHandling } from './errorHandling'
99
import { toHandlerKey } from '@vue/shared'
10-
import { VaporLifecycleHooks } from './enums'
1110

12-
export const injectHook = (
11+
export enum VaporLifecycleHooks {
12+
BEFORE_CREATE = 'bc',
13+
CREATED = 'c',
14+
BEFORE_MOUNT = 'bm',
15+
MOUNTED = 'm',
16+
BEFORE_UPDATE = 'bu',
17+
UPDATED = 'u',
18+
BEFORE_UNMOUNT = 'bum',
19+
UNMOUNTED = 'um',
20+
DEACTIVATED = 'da',
21+
ACTIVATED = 'a',
22+
RENDER_TRIGGERED = 'rtg',
23+
RENDER_TRACKED = 'rtc',
24+
ERROR_CAPTURED = 'ec',
25+
// SERVER_PREFETCH = 'sp',
26+
}
27+
28+
const injectHook = (
1329
type: VaporLifecycleHooks,
1430
hook: Function & { __weh?: Function },
1531
target: ComponentInternalInstance | null = currentInstance,
@@ -49,7 +65,7 @@ export const injectHook = (
4965
)
5066
}
5167
}
52-
export const createHook =
68+
const createHook =
5369
<T extends Function = () => any>(lifecycle: VaporLifecycleHooks) =>
5470
(hook: T, target: ComponentInternalInstance | null = currentInstance) =>
5571
injectHook(lifecycle, (...args: unknown[]) => hook(...args), target)

packages/runtime-vapor/src/component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import {
1515
emit,
1616
normalizeEmitsOptions,
1717
} from './componentEmits'
18+
import { VaporLifecycleHooks } from './apiLifecycle'
1819

1920
import type { Data } from '@vue/shared'
20-
import { VaporLifecycleHooks } from './enums'
2121

2222
export type Component = FunctionalComponent | ObjectComponent
2323

packages/runtime-vapor/src/metadata.ts renamed to packages/runtime-vapor/src/componentMetadata.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ export enum MetadataKind {
66
event,
77
}
88

9-
export type ElementMetadata = [
9+
export type ComponentMetadata = [
1010
props: Data,
1111
events: Record<string, DelegatedHandler[]>,
1212
]
1313

1414
export function getMetadata(
15-
el: Node & { $$metadata?: ElementMetadata },
16-
): ElementMetadata {
15+
el: Node & { $$metadata?: ComponentMetadata },
16+
): ComponentMetadata {
1717
return el.$$metadata || (el.$$metadata = [{}, {}])
1818
}
1919

packages/runtime-vapor/src/directives/vModel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import type {
1515
import { addEventListener } from '../dom/event'
1616
import { nextTick } from '../scheduler'
1717
import { warn } from '../warning'
18-
import { MetadataKind, getMetadata } from '../metadata'
18+
import { MetadataKind, getMetadata } from '../componentMetadata'
1919

2020
type AssignerFn = (value: any) => void
2121
function getModelAssigner(el: Element): AssignerFn {

packages/runtime-vapor/src/dom/event.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ import {
33
onEffectCleanup,
44
onScopeDispose,
55
} from '@vue/reactivity'
6-
import { MetadataKind, getMetadata, recordEventMetadata } from '../metadata'
6+
import {
7+
MetadataKind,
8+
getMetadata,
9+
recordEventMetadata,
10+
} from '../componentMetadata'
711
import { withKeys, withModifiers } from '@vue/runtime-dom'
812
import { queuePostRenderEffect } from '../scheduler'
913

packages/runtime-vapor/src/dom/prop.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ import {
1212
} from '@vue/shared'
1313
import { warn } from '../warning'
1414
import { setStyle } from './style'
15-
import { MetadataKind, getMetadata, recordPropMetadata } from '../metadata'
15+
import {
16+
MetadataKind,
17+
getMetadata,
18+
recordPropMetadata,
19+
} from '../componentMetadata'
1620
import { on } from './event'
1721

1822
export function setClass(el: Element, value: any) {

packages/runtime-vapor/src/dom/style.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
normalizeStyle,
88
} from '@vue/shared'
99
import { warn } from '../warning'
10-
import { recordPropMetadata } from '../metadata'
10+
import { recordPropMetadata } from '../componentMetadata'
1111

1212
export function setStyle(el: HTMLElement, value: any) {
1313
const prev = recordPropMetadata(el, 'style', (value = normalizeStyle(value)))

0 commit comments

Comments
 (0)