Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use components in template #78

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/compiler-vapor/src/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
type PrependNodeIRNode,
type AppendNodeIRNode,
IRNodeTypes,
CreateComponentIRNode,
} from './ir'
import { SourceMapGenerator } from 'source-map-js'
import { camelize, isGloballyAllowed, isString, makeMap } from '@vue/shared'
Expand Down Expand Up @@ -376,6 +377,8 @@ function genOperation(oper: OperationNode, context: CodegenContext) {
return genSetHtml(oper, context)
case IRNodeTypes.CREATE_TEXT_NODE:
return genCreateTextNode(oper, context)
case IRNodeTypes.CREATE_COMPONENT_NODE:
return genCreateComponentNode(oper, context)
case IRNodeTypes.INSERT_NODE:
return genInsertNode(oper, context)
case IRNodeTypes.PREPEND_NODE:
Expand Down Expand Up @@ -437,6 +440,20 @@ function genCreateTextNode(
)
}

function genCreateComponentNode(
oper: CreateComponentIRNode,
context: CodegenContext,
) {
const { pushNewline, pushFnCall, vaporHelper } = context
pushNewline(`const n${oper.id} = `)
// TODO: support props
pushFnCall(
vaporHelper('createComponent'),
() => genExpression(oper.tag, context),
'{}',
)
}

function genInsertNode(oper: InsertNodeIRNode, context: CodegenContext) {
const { newline, pushFnCall, vaporHelper } = context
const elements = ([] as number[]).concat(oper.element)
Expand Down
8 changes: 8 additions & 0 deletions packages/compiler-vapor/src/ir.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export enum IRNodeTypes {
PREPEND_NODE,
APPEND_NODE,
CREATE_TEXT_NODE,
CREATE_COMPONENT_NODE,

WITH_DIRECTIVE,
}
Expand Down Expand Up @@ -123,6 +124,12 @@ export interface WithDirectiveIRNode extends BaseIRNode {
dir: VaporDirectiveNode
}

export interface CreateComponentIRNode extends BaseIRNode {
type: IRNodeTypes.CREATE_COMPONENT_NODE
id: number
tag: string
}

export type IRNode =
| OperationNode
| RootIRNode
Expand All @@ -138,6 +145,7 @@ export type OperationNode =
| PrependNodeIRNode
| AppendNodeIRNode
| WithDirectiveIRNode
| CreateComponentIRNode

export interface IRDynamicInfo {
id: number | null
Expand Down
16 changes: 14 additions & 2 deletions packages/compiler-vapor/src/transforms/transformElement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,17 @@ export const transformElement: NodeTransform = (node, ctx) => {
const { tag, props } = node
const isComponent = node.tagType === ElementTypes.COMPONENT

ctx.template += `<${tag}`
if (isComponent) {
ctx.dynamic.ghost = true
ctx.registerOperation({
type: IRNodeTypes.CREATE_COMPONENT_NODE,
loc: node.loc,
id: ctx.reference(),
tag,
})
} else {
ctx.template += `<${tag}`
}
if (props.length) {
buildProps(
node,
Expand All @@ -34,7 +44,9 @@ export const transformElement: NodeTransform = (node, ctx) => {
isComponent,
)
}
ctx.template += `>` + ctx.childrenTemplate.join('')
if (!isComponent) {
ctx.template += `>` + ctx.childrenTemplate.join('')
}

// TODO remove unnecessary close tag, e.g. if it's the last element of the template
if (!isVoidTag(tag)) {
Expand Down
8 changes: 8 additions & 0 deletions packages/runtime-vapor/src/apiCreateComponent.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Data } from '@vue/shared'
import { Component } from './component'
import { render } from './render'

export function createComponent(comp: Component, props: Data = {}) {
const instance = render(comp, props)
return instance.block
}
1 change: 1 addition & 0 deletions packages/runtime-vapor/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@ export * from './directive'
export * from './dom'
export * from './directives/vShow'
export * from './apiLifecycle'
export * from './apiCreateComponent'
export { getCurrentInstance, type ComponentInternalInstance } from './component'
15 changes: 9 additions & 6 deletions packages/runtime-vapor/src/render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ export type BlockFn = (props: any, ctx: any) => Block
export function render(
comp: Component,
props: Data,
container: string | ParentNode,
container?: string | ParentNode,
): ComponentInternalInstance {
const instance = createComponentInstance(comp)
initProps(instance, props)
return mountComponent(instance, (container = normalizeContainer(container)))
if (container) container = normalizeContainer(container)
return mountComponent(instance, container as ParentNode)
}

export function normalizeContainer(container: string | ParentNode): ParentNode {
Expand All @@ -35,9 +36,9 @@ export function normalizeContainer(container: string | ParentNode): ParentNode {

export function mountComponent(
instance: ComponentInternalInstance,
container: ParentNode,
container?: ParentNode,
) {
instance.container = container
if (container) instance.container = container

setCurrentInstance(instance)
const block = instance.scope.run(() => {
Expand Down Expand Up @@ -68,8 +69,10 @@ export function mountComponent(
bm && invokeArrayFns(bm)
invokeDirectiveHook(instance, 'beforeMount')

insert(block, instance.container)
instance.isMountedRef.value = true
if (instance.container) {
insert(block, instance.container)
instance.isMountedRef.value = true
}

// hook: mounted
invokeDirectiveHook(instance, 'mounted')
Expand Down
Loading