@vue/runtime-vapor 3.6.0-alpha.6 → 3.6.0-alpha.7

package/dist/runtime-vapor.d.ts

@@ -1,6 +1,6 @@
-import { VNode, GenericComponentInstance, TransitionHooks, TransitionState, TransitionProps, Plugin, SchedulerJob, GenericAppContext, EffectScope as EffectScope$1, EmitFn, SuspenseBoundary, LifecycleHook, NormalizedPropsOptions, ObjectEmitsOptions, ComponentInternalOptions, AsyncComponentInternalOptions, ComponentPropsOptions, EmitsOptions, CreateAppFunction, AsyncComponentLoader, AsyncComponentOptions, DirectiveModifiers, VueElementBase, CustomElementOptions } from '@vue/runtime-dom';
-import { Ref, EffectScope, ReactiveEffect, ShallowRef } from '@vue/reactivity';
-import { Namespace, NormalizedStyle } from '@vue/shared';
+import { VNode, GenericComponentInstance, TransitionHooks, TransitionState, TransitionProps, Plugin, SchedulerJob, EmitsOptions, ComponentObjectPropsOptions, ExtractPropTypes, ReservedProps, AllowedComponentProps, ComponentCustomProps, EmitsToProps, ExtractDefaultPropTypes, EmitFn, ComponentTypeEmits, TypeEmitsToOptions, GenericAppContext, EffectScope as EffectScope$1, ShallowUnwrapRef, SuspenseBoundary, LifecycleHook, NormalizedPropsOptions, ObjectEmitsOptions, ComponentInternalOptions, AsyncComponentInternalOptions, ComponentPropsOptions, CreateAppFunction, AsyncComponentLoader, AsyncComponentOptions, DirectiveModifiers, CustomElementOptions, VueElementBase } from '@vue/runtime-dom';
+import { Ref, EffectScope, ReactiveEffect, ComputedRef, ShallowRef } from '@vue/reactivity';
+import { Prettify, IsKeyValues, Namespace, NormalizedStyle } from '@vue/shared';
 
 type NodeRef = string | Ref | ((ref: Element | VaporComponentInstance, refs: Record<string, any>) => void);
 type RefEl = Element | VaporComponentInstance;
@@ -19,7 +19,7 @@ export declare class VaporFragment<T extends Block = Block> implements Transitio
     remove?: (parent?: ParentNode, transitionHooks?: TransitionHooks) => void;
     hydrate?: (...args: any[]) => void;
     setRef?: (instance: VaporComponentInstance, ref: NodeRef, refFor: boolean, refKey: string | undefined) => void;
-    updated?: ((nodes?: Block) => void)[];
+    onUpdated?: ((nodes?: Block) => void)[];
     constructor(nodes: T);
 }
 declare class ForFragment extends VaporFragment<Block[]> {
@@ -34,16 +34,17 @@ declare class DynamicFragment extends VaporFragment {
     attrs?: Record<string, any>;
     setAsyncRef?: (instance: VaporComponentInstance) => void;
     getScope?: (key: any) => EffectScope | undefined;
-    beforeTeardown?: ((oldKey: any, nodes: Block, scope: EffectScope) => boolean)[];
-    beforeMount?: ((newKey: any, nodes: Block, scope: EffectScope) => void)[];
+    onBeforeTeardown?: ((oldKey: any, nodes: Block, scope: EffectScope) => boolean)[];
+    onBeforeMount?: ((newKey: any, nodes: Block, scope: EffectScope) => void)[];
+    slotOwner: VaporComponentInstance | null;
     constructor(anchorLabel?: string);
     update(render?: BlockFn, key?: any): void;
-    private render;
+    renderBranch(render: BlockFn | undefined, transition: VaporTransitionHooks | undefined, parent: ParentNode | null, instance: GenericComponentInstance | null): void;
     hydrate: (isEmpty?: boolean) => void;
 }
 export declare function isFragment(val: NonNullable<unknown>): val is VaporFragment;
 
-interface VaporTransitionHooks extends TransitionHooks {
+export interface VaporTransitionHooks extends TransitionHooks {
     state: TransitionState;
     props: TransitionProps;
     instance: VaporComponentInstance;
@@ -53,7 +54,7 @@ interface TransitionOptions {
     $key?: any;
     $transition?: VaporTransitionHooks;
 }
-type Block = Node | VaporFragment | DynamicFragment | VaporComponentInstance | Block[];
+export type Block = Node | VaporFragment | DynamicFragment | VaporComponentInstance | Block[];
 type BlockFn = (...args: any[]) => Block;
 export declare function insert(block: Block, parent: ParentNode & {
     $fc?: Node | null;
@@ -87,12 +88,14 @@ type RawSlots = Record<string, VaporSlot> & {
     $?: DynamicSlotSource[];
 };
 type StaticSlots = Record<string, VaporSlot>;
-type VaporSlot = BlockFn;
+export type VaporSlot = BlockFn;
 type DynamicSlot = {
     name: string;
     fn: VaporSlot;
 };
-type DynamicSlotFn = () => DynamicSlot | DynamicSlot[];
+type DynamicSlotFn = (() => DynamicSlot | DynamicSlot[]) & {
+    _cache?: ComputedRef<DynamicSlot | DynamicSlot[]>;
+};
 type DynamicSlotSource = StaticSlots | DynamicSlotFn;
 /**
  * Wrap a slot function to track the slot owner.
@@ -136,19 +139,75 @@ declare class TeleportFragment extends VaporFragment {
     hydrate: () => void;
 }
 
-type VaporComponent = FunctionalVaporComponent | ObjectVaporComponent;
-type VaporSetupFn = (props: any, ctx: Pick<VaporComponentInstance, 'slots' | 'attrs' | 'emit' | 'expose'>) => Block | Record<string, any> | undefined;
-type FunctionalVaporComponent = VaporSetupFn & Omit<ObjectVaporComponent, 'setup'> & {
+export type VaporPublicProps = ReservedProps & AllowedComponentProps & ComponentCustomProps;
+export type VaporRenderResult<T = Block> = VNode | T | VaporRenderResult<T>[];
+type VaporComponentInstanceConstructor<T extends VaporComponentInstance> = {
+    __isFragment?: never;
+    __isTeleport?: never;
+    __isSuspense?: never;
+    new (props?: T['props']): T;
+};
+export type DefineVaporComponent<RuntimePropsOptions = {}, RuntimePropsKeys extends string = string, Emits extends EmitsOptions = {}, RuntimeEmitsKeys extends string = string, Slots extends StaticSlots = StaticSlots, Exposed extends Record<string, any> = Record<string, any>, TypeBlock extends Block = Block, TypeRefs extends Record<string, unknown> = {}, MakeDefaultsOptional extends boolean = true, InferredProps = string extends RuntimePropsKeys ? ComponentObjectPropsOptions extends RuntimePropsOptions ? {} : ExtractPropTypes<RuntimePropsOptions> : {
+    [key in RuntimePropsKeys]?: any;
+}, PublicProps = VaporPublicProps, ResolvedProps = InferredProps & EmitsToProps<Emits>, Defaults = ExtractDefaultPropTypes<RuntimePropsOptions>> = VaporComponentInstanceConstructor<VaporComponentInstance<MakeDefaultsOptional extends true ? keyof Defaults extends never ? Prettify<ResolvedProps> & PublicProps : Partial<Defaults> & Omit<Prettify<ResolvedProps> & PublicProps, keyof Defaults> : Prettify<ResolvedProps> & PublicProps, Emits, Slots, Exposed, TypeBlock, TypeRefs>> & ObjectVaporComponent<RuntimePropsOptions | RuntimePropsKeys[], Emits, RuntimeEmitsKeys, Slots, Exposed>;
+type DefineVaporSetupFnComponent<Props extends Record<string, any> = {}, Emits extends EmitsOptions = {}, Slots extends StaticSlots = StaticSlots, Exposed extends Record<string, any> = Record<string, any>, TypeBlock extends Block = Block, ResolvedProps extends Record<string, any> = Props & EmitsToProps<Emits> & VaporPublicProps> = new (props?: ResolvedProps) => VaporComponentInstance<ResolvedProps, Emits, Slots, Exposed, TypeBlock>;
+export declare function defineVaporComponent<Props extends Record<string, any>, Emits extends EmitsOptions = {}, RuntimeEmitsKeys extends string = string, Slots extends StaticSlots = StaticSlots, Exposed extends Record<string, any> = Record<string, any>, TypeBlock extends Block = Block>(setup: (props: Props, ctx: {
+    emit: EmitFn<Emits>;
+    slots: Slots;
+    attrs: Record<string, any>;
+    expose: (exposed: Exposed) => void;
+}) => VaporRenderResult<TypeBlock> | void, extraOptions?: ObjectVaporComponent<(keyof Props)[], Emits, RuntimeEmitsKeys, Slots, Exposed> & ThisType<void>): DefineVaporSetupFnComponent<Props, Emits, Slots, Exposed, TypeBlock>;
+export declare function defineVaporComponent<Props extends Record<string, any>, Emits extends EmitsOptions = {}, RuntimeEmitsKeys extends string = string, Slots extends StaticSlots = StaticSlots, Exposed extends Record<string, any> = Record<string, any>, TypeBlock extends Block = Block>(setup: (props: Props, ctx: {
+    emit: EmitFn<Emits>;
+    slots: Slots;
+    attrs: Record<string, any>;
+    expose: (exposed: Exposed) => void;
+}) => VaporRenderResult<TypeBlock> | void, extraOptions?: ObjectVaporComponent<ComponentObjectPropsOptions<Props>, Emits, RuntimeEmitsKeys, Slots, Exposed> & ThisType<void>): DefineVaporSetupFnComponent<Props, Emits, Slots, Exposed, TypeBlock>;
+export declare function defineVaporComponent<TypeProps, RuntimePropsOptions extends ComponentObjectPropsOptions = ComponentObjectPropsOptions, RuntimePropsKeys extends string = string, TypeEmits extends ComponentTypeEmits = {}, RuntimeEmitsOptions extends EmitsOptions = {}, RuntimeEmitsKeys extends string = string, Slots extends StaticSlots = StaticSlots, Exposed extends Record<string, any> = Record<string, any>, ResolvedEmits extends EmitsOptions = {} extends RuntimeEmitsOptions ? TypeEmitsToOptions<TypeEmits> : RuntimeEmitsOptions, InferredProps = IsKeyValues<TypeProps> extends true ? TypeProps : string extends RuntimePropsKeys ? ComponentObjectPropsOptions extends RuntimePropsOptions ? {} : ExtractPropTypes<RuntimePropsOptions> : {
+    [key in RuntimePropsKeys]?: any;
+}, TypeRefs extends Record<string, unknown> = {}, TypeBlock extends Block = Block>(options: ObjectVaporComponent<RuntimePropsOptions | RuntimePropsKeys[], ResolvedEmits, RuntimeEmitsKeys, Slots, Exposed, TypeBlock, InferredProps> & {
+    /**
+     * @private for language-tools use only
+     */
+    __typeProps?: TypeProps;
+    /**
+     * @private for language-tools use only
+     */
+    __typeEmits?: TypeEmits;
+    /**
+     * @private for language-tools use only
+     */
+    __typeRefs?: TypeRefs;
+    /**
+     * @private for language-tools use only
+     */
+    __typeEl?: TypeBlock;
+} & ThisType<void>): DefineVaporComponent<RuntimePropsOptions, RuntimePropsKeys, ResolvedEmits, RuntimeEmitsKeys, Slots, Exposed extends Block ? Record<string, any> : Exposed, TypeBlock, TypeRefs, unknown extends TypeProps ? true : false, InferredProps>;
+
+export type VaporComponent = FunctionalVaporComponent | ObjectVaporComponent | DefineVaporComponent;
+export type FunctionalVaporComponent<Props = {}, Emits extends EmitsOptions = {}, Slots extends StaticSlots = StaticSlots, Exposed extends Record<string, any> = Record<string, any>> = ((props: Readonly<Props & EmitsToProps<Emits>>, ctx: {
+    emit: EmitFn<Emits>;
+    slots: Slots;
+    attrs: Record<string, any>;
+    expose: <T extends Record<string, any> = Exposed>(exposed: T) => void;
+}) => VaporRenderResult) & Omit<ObjectVaporComponent<ComponentPropsOptions<Props>, Emits, string, Slots>, 'setup'> & {
     displayName?: string;
 } & SharedInternalOptions;
-interface ObjectVaporComponent extends ComponentInternalOptions, AsyncComponentInternalOptions<ObjectVaporComponent, VaporComponentInstance>, SharedInternalOptions {
-    setup?: VaporSetupFn;
+interface ObjectVaporComponent<Props = {}, Emits extends EmitsOptions = {}, RuntimeEmitsKeys extends string = string, Slots extends StaticSlots = StaticSlots, Exposed extends Record<string, any> = Record<string, any>, TypeBlock extends Block = Block, InferredProps = ComponentObjectPropsOptions extends Props ? {} : ExtractPropTypes<Props>> extends ComponentInternalOptions, AsyncComponentInternalOptions<ObjectVaporComponent, VaporComponentInstance>, SharedInternalOptions {
     inheritAttrs?: boolean;
-    props?: ComponentPropsOptions;
-    emits?: EmitsOptions;
-    render?(ctx: any, props?: any, emit?: EmitFn, attrs?: any, slots?: Record<string, VaporSlot>): Block;
+    props?: Props;
+    emits?: Emits | RuntimeEmitsKeys[];
+    slots?: Slots;
+    setup?: (props: Readonly<InferredProps>, ctx: {
+        emit: EmitFn<Emits>;
+        slots: Slots;
+        attrs: Record<string, any>;
+        expose: <T extends Record<string, any> = Exposed>(exposed: T) => void;
+    }) => TypeBlock | Exposed | Promise<Exposed> | void;
+    render?(ctx: Exposed extends Block ? undefined : ShallowUnwrapRef<Exposed>, props: Readonly<InferredProps>, emit: EmitFn<Emits>, attrs: any, slots: Slots): VaporRenderResult<TypeBlock> | void;
     name?: string;
     vapor?: boolean;
+    components?: Record<string, VaporComponent>;
 }
 interface SharedInternalOptions {
     /**
@@ -173,30 +232,30 @@ type LooseRawSlots = Record<string, VaporSlot | DynamicSlotSource[]> & {
     $?: DynamicSlotSource[];
 };
 export declare function createComponent(component: VaporComponent, rawProps?: LooseRawProps | null, rawSlots?: LooseRawSlots | null, isSingleRoot?: boolean, once?: boolean, appContext?: GenericAppContext): VaporComponentInstance;
-declare class VaporComponentInstance implements GenericComponentInstance {
+export declare class VaporComponentInstance<Props extends Record<string, any> = {}, Emits extends EmitsOptions = {}, Slots extends StaticSlots = StaticSlots, Exposed extends Record<string, any> = Record<string, any>, TypeBlock extends Block = Block, TypeRefs extends Record<string, any> = Record<string, any>> implements GenericComponentInstance {
     vapor: true;
     uid: number;
     type: VaporComponent;
     root: GenericComponentInstance | null;
     parent: GenericComponentInstance | null;
     appContext: GenericAppContext;
-    block: Block;
+    block: TypeBlock;
     scope: EffectScope$1;
     rawProps: RawProps;
     rawSlots: RawSlots;
-    props: Record<string, any>;
+    props: Readonly<Props>;
     attrs: Record<string, any>;
     propsDefaults: Record<string, any> | null;
-    slots: StaticSlots;
+    slots: Slots;
     scopeId?: string | null;
     rawPropsRef?: ShallowRef<any>;
     rawSlotsRef?: ShallowRef<any>;
-    emit: EmitFn;
+    emit: EmitFn<Emits>;
     emitted: Record<string, boolean> | null;
-    expose: (exposed: Record<string, any>) => void;
-    exposed: Record<string, any> | null;
-    exposeProxy: Record<string, any> | null;
-    refs: Record<string, any>;
+    expose: (<T extends Record<string, any> = Exposed>(exposed: T) => void) & string[];
+    exposed: Exposed | null;
+    exposeProxy: Prettify<ShallowUnwrapRef<Exposed>> | null;
+    refs: TypeRefs;
     provides: Record<string, any>;
     ids: [string, number, number];
     suspense: SuspenseBoundary | null;
@@ -224,7 +283,7 @@ declare class VaporComponentInstance implements GenericComponentInstance {
     rtc?: LifecycleHook;
     ec?: LifecycleHook;
     sp?: LifecycleHook<() => Promise<unknown>>;
-    setupState?: Record<string, any>;
+    setupState?: Exposed extends Block ? undefined : ShallowUnwrapRef<Exposed>;
     devtoolsRawSetupState?: any;
     hmrRerender?: () => void;
     hmrReload?: (newComp: VaporComponent) => void;
@@ -257,9 +316,6 @@ export declare function createPlainElement(comp: string, rawProps?: LooseRawProp
 export declare const createVaporApp: CreateAppFunction<ParentNode, VaporComponent>;
 export declare const createVaporSSRApp: CreateAppFunction<ParentNode, VaporComponent>;
 
-/*! #__NO_SIDE_EFFECTS__ */
-export declare function defineVaporComponent(comp: VaporComponent, extraOptions?: Omit<ObjectVaporComponent, 'setup'>): VaporComponent;
-
 export declare function defineVaporAsyncComponent<T extends VaporComponent>(source: AsyncComponentLoader<T> | AsyncComponentOptions<T>): T;
 
 export type VaporDirective = (node: Element | VaporComponentInstance, value?: () => any, argument?: string, modifiers?: DirectiveModifiers) => (() => void) | void;
@@ -273,17 +329,42 @@ export declare function withVaporDirectives(node: Element | VaporComponentInstan
 
 export declare const VaporKeepAliveImpl: ObjectVaporComponent;
 
-type VaporElementConstructor<P = {}> = {
+export type VaporElementConstructor<P = {}> = {
     new (initialProps?: Record<string, any>): VaporElement & P;
 };
-export declare function defineVaporCustomElement(options: any, extraOptions?: Omit<ObjectVaporComponent, 'setup'>, 
-/**
- * @internal
- */
-_createApp?: CreateAppFunction<ParentNode, VaporComponent>): VaporElementConstructor;
+export declare function defineVaporCustomElement<Props, RawBindings = object>(setup: (props: Props, ctx: {
+    attrs: Record<string, any>;
+    slots: StaticSlots;
+    emit: EmitFn;
+    expose: (exposed: Record<string, any>) => void;
+}) => RawBindings | VaporRenderResult, options?: Pick<ObjectVaporComponent, 'name' | 'inheritAttrs' | 'emits'> & CustomElementOptions & {
+    props?: (keyof Props)[];
+}): VaporElementConstructor<Props>;
+export declare function defineVaporCustomElement<Props, RawBindings = object>(setup: (props: Props, ctx: {
+    attrs: Record<string, any>;
+    slots: StaticSlots;
+    emit: EmitFn;
+    expose: (exposed: Record<string, any>) => void;
+}) => RawBindings | VaporRenderResult, options?: Pick<ObjectVaporComponent, 'name' | 'inheritAttrs' | 'emits'> & CustomElementOptions & {
+    props?: ComponentObjectPropsOptions<Props>;
+}): VaporElementConstructor<Props>;
+export declare function defineVaporCustomElement<RuntimePropsOptions extends ComponentObjectPropsOptions = ComponentObjectPropsOptions, RuntimePropsKeys extends string = string, RuntimeEmitsOptions extends EmitsOptions = {}, RuntimeEmitsKeys extends string = string, Slots extends StaticSlots = StaticSlots, InferredProps = string extends RuntimePropsKeys ? ComponentObjectPropsOptions extends RuntimePropsOptions ? {} : ExtractPropTypes<RuntimePropsOptions> : {
+    [key in RuntimePropsKeys]?: any;
+}, ResolvedProps = InferredProps & EmitsToProps<RuntimeEmitsOptions>>(options: CustomElementOptions & {
+    props?: (RuntimePropsOptions & ThisType<void>) | RuntimePropsKeys[];
+    emits?: RuntimeEmitsOptions | RuntimeEmitsKeys[];
+    slots?: Slots;
+    setup?: (props: Readonly<InferredProps>, ctx: {
+        attrs: Record<string, any>;
+        slots: Slots;
+        emit: EmitFn<RuntimeEmitsOptions>;
+        expose: (exposed: Record<string, any>) => void;
+    }) => any;
+} & ThisType<void>, extraOptions?: CustomElementOptions): VaporElementConstructor<ResolvedProps>;
+export declare function defineVaporCustomElement<T extends DefineVaporComponent<any, any, any, any, any, any, any, any, any, any> | DefineVaporSetupFnComponent<any, any, any, any, any>>(options: T, extraOptions?: CustomElementOptions): VaporElementConstructor<T extends DefineVaporComponent<infer RuntimePropsOptions, any, any, any, any, any, any, any, any, any> ? ComponentObjectPropsOptions extends RuntimePropsOptions ? {} : ExtractPropTypes<RuntimePropsOptions> : T extends DefineVaporSetupFnComponent<infer P extends Record<string, any>, any, any, any, any> ? P : unknown>;
 export declare const defineVaporSSRCustomElement: typeof defineVaporCustomElement;
 type VaporInnerComponentDef = VaporComponent & CustomElementOptions;
-declare class VaporElement extends VueElementBase<ParentNode, VaporComponent, VaporInnerComponentDef> {
+export declare class VaporElement extends VueElementBase<ParentNode, VaporComponent, VaporInnerComponentDef> {
     constructor(def: VaporInnerComponentDef, props?: Record<string, any> | undefined, createAppFn?: CreateAppFunction<ParentNode, VaporComponent>);
     protected _needsHydration(): boolean;
     protected _mount(def: VaporInnerComponentDef): void;
@@ -402,7 +483,7 @@ export declare const applyRadioModel: VaporModelDirective<HTMLInputElement>;
 export declare const applySelectModel: VaporModelDirective<HTMLSelectElement, 'number'>;
 export declare const applyDynamicModel: VaporModelDirective;
 
-export declare const VaporTransition: FunctionalVaporComponent;
+export declare const VaporTransition: FunctionalVaporComponent<TransitionProps>;
 
 export declare const VaporTransitionGroup: ObjectVaporComponent;
 

package/dist/runtime-vapor.esm-bundler.js

@@ -1,11 +1,11 @@
 /**
-* @vue/runtime-vapor v3.6.0-alpha.6
+* @vue/runtime-vapor v3.6.0-alpha.7
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
 import { isMismatchAllowed, warn, callWithAsyncErrorHandling, currentInstance, unsafeToTrustedHTML, patchStyle, xlinkNS, mergeProps, shouldSetAsProp, queuePostFlushCb, toClassSet, isSetEqual, warnPropMismatch, toStyleMap, vShowHidden, isMapEqual, isValidHtmlOrSvgAttribute, getAttributeMismatch, watch, onMounted, onUpdated, onBeforeUnmount, isAsyncWrapper, getComponentName, matches, devtoolsComponentAdded, resetShapeFlag, isKeepAlive, ensureRenderer, shallowRef, simpleSetCurrentInstance, renderSlot, ensureVaporSlotFallback, createVNode, shallowReactive, createInternalObject, isEmitListener, onScopeDispose, activate as activate$1, setTransitionHooks as setTransitionHooks$1, normalizeRef, isVNode, Fragment, isRef, ensureHydrationRenderer, setRef as setRef$1, deactivate as deactivate$1, baseEmit, baseNormalizePropsOptions, pushWarningContext, validateProps, popWarningContext, resolvePropValue, setCurrentInstance, startMeasure, queueJob, TransitionPropsValidators, leaveCbKey, baseResolveTransitionHooks, isTemplateNode, checkTransitionMode, resolveTransitionProps, useTransitionState, warnExtraneousAttributes, resolveTeleportTarget, isTeleportDisabled, isTeleportDeferred, performTransitionEnter, performTransitionLeave, getInheritedScopeIds, registerHMR, endMeasure, unregisterHMR, nextUid, EffectScope as EffectScope$1, expose, callWithErrorHandling, markAsyncBoundary, getFunctionalFallthrough, createAppAPI, initFeatureFlags, setDevtoolsHook, flushOnAppMount, normalizeContainer, createAsyncComponentContext, useAsyncComponentState, performAsyncHydrate, handleError, VueElementBase, createCanSetSetupRefChecker, baseUseCssVars, setVarsOnNode, resolveDynamicComponent, vShowOriginalDisplay, vModelTextInit, vModelCheckboxInit, vModelSelectInit, vModelTextUpdate, vModelCheckboxUpdate, vModelGetValue, vModelSetSelected, onBeforeUpdate, hasCSSTransform, callPendingCbs, forceReflow, handleMovedChildren, baseApplyTranslation } from '@vue/runtime-dom';
 import { isArray, normalizeClass, normalizeStyle, includeBooleanAttr, toDisplayString, isString, parseStringStyle, isOn, canSetValueDirectly, camelize, stringifyStyle, normalizeCssVarValue, getEscapedCssVarName, isFunction, extend, invokeArrayFns, isReservedProp, EMPTY_OBJ, hasOwn, EMPTY_ARR, NO, YES, isPromise, getGlobalThis, isPlainObject, isObject, remove as remove$1, NOOP, looseEqual } from '@vue/shared';
-import { onEffectCleanup, pauseTracking, resetTracking, ReactiveEffect, setActiveSub, EffectScope, onScopeDispose as onScopeDispose$1, markRaw, unref, proxyRefs, toRaw, watch as watch$1, isReactive, isShallow, shallowReadArray, isReadonly, toReadonly, toReactive, shallowRef as shallowRef$1, isRef as isRef$1, traverse } from '@vue/reactivity';
+import { onEffectCleanup, pauseTracking, resetTracking, computed, ReactiveEffect, setActiveSub, EffectScope, onScopeDispose as onScopeDispose$1, markRaw, unref, proxyRefs, toRaw, watch as watch$1, isReactive, isShallow, shallowReadArray, isReadonly, toReadonly, toReactive, shallowRef as shallowRef$1, isRef as isRef$1, traverse } from '@vue/reactivity';
 
 let insertionParent;
 let insertionAnchor;
@@ -1006,14 +1006,14 @@ const VaporKeepAliveImpl = defineVaporComponent({
       }
     }
     const injectKeepAliveHooks = (frag) => {
-      (frag.beforeTeardown || (frag.beforeTeardown = [])).push(
+      (frag.onBeforeTeardown || (frag.onBeforeTeardown = [])).push(
         (oldKey, nodes, scope) => {
           processFragment(frag);
           keptAliveScopes.set(oldKey, scope);
           return true;
         }
       );
-      (frag.beforeMount || (frag.beforeMount = [])).push(
+      (frag.onBeforeMount || (frag.onBeforeMount = [])).push(
         () => cacheFragment(frag)
       );
       frag.getScope = (key) => {
@@ -1197,8 +1197,10 @@ const vaporInteropImpl = {
   /**
    * vapor slot in vdom
    */
-  slot(n1, n2, container, anchor) {
+  slot(n1, n2, container, anchor, parentComponent) {
     if (!n1) {
+      const prev = currentInstance;
+      simpleSetCurrentInstance(parentComponent);
       let selfAnchor;
       const { slot, fallback } = n2.vs;
       const propsRef = n2.vs.ref = shallowRef(n2.props);
@@ -1207,6 +1209,7 @@ const vaporInteropImpl = {
         setFragmentFallback(slotBlock, createFallback(fallback));
         selfAnchor = slotBlock.anchor;
       }
+      simpleSetCurrentInstance(prev);
       if (!selfAnchor) selfAnchor = createTextNode();
       insert(n2.el = n2.anchor = selfAnchor, container, anchor);
       insert(n2.vb = slotBlock, container, selfAnchor);
@@ -1370,7 +1373,7 @@ function createVDOMComponent(internals, component, parentComponent, rawProps, ra
       simpleSetCurrentInstance(prev);
     }
     frag.nodes = vnode.el;
-    if (isMounted && frag.updated) frag.updated.forEach((m) => m());
+    if (isMounted && frag.onUpdated) frag.onUpdated.forEach((m) => m());
   };
   frag.remove = unmount;
   frag.setRef = (instance, ref, refFor, refKey) => {
@@ -1412,7 +1415,7 @@ function renderVDOMSlot(internals, slotsRef, name, props, parentComponent, fallb
         internals.um(oldVNode, parentComponent, null);
       }
     };
-    if (isMounted && frag.updated) frag.updated.forEach((m) => m());
+    if (isMounted && frag.onUpdated) frag.onUpdated.forEach((m) => m());
   };
   const render = (parentNode, anchor) => {
     renderEffect(() => {
@@ -1871,6 +1874,12 @@ function setCurrentSlotScopeIds(scopeIds) {
     currentSlotScopeIds = scopeIds;
   }
 }
+function resolveDynamicSlot(source) {
+  if (!source._cache) {
+    source._cache = computed(source);
+  }
+  return source._cache.value;
+}
 const dynamicSlotsProxyHandlers = {
   get: getSlot,
   has: (target, key) => !!getSlot(target, key),
@@ -1891,7 +1900,7 @@ const dynamicSlotsProxyHandlers = {
       keys = keys.filter((k) => k !== "$");
       for (const source of dynamicSources) {
         if (isFunction(source)) {
-          const slot = source();
+          const slot = resolveDynamicSlot(source);
           if (isArray(slot)) {
             for (const s of slot) keys.push(String(s.name));
           } else {
@@ -1916,7 +1925,7 @@ function getSlot(target, key) {
     while (i--) {
       source = dynamicSources[i];
       if (isFunction(source)) {
-        const slot = source();
+        const slot = resolveDynamicSlot(source);
         if (slot) {
           if (isArray(slot)) {
             for (const s of slot) {
@@ -2068,7 +2077,7 @@ class RenderEffect extends ReactiveEffect {
         this.onTrack = instance.rtc ? (e) => invokeArrayFns(instance.rtc, e) : void 0;
         this.onTrigger = instance.rtg ? (e) => invokeArrayFns(instance.rtg, e) : void 0;
       }
-      if (!!(process.env.NODE_ENV !== "production") || instance.type.ce) {
+      if (instance.type.ce) {
         (instance.renderEffects || (instance.renderEffects = [])).push(this);
       }
       job.i = instance;
@@ -2120,61 +2129,59 @@ const decorate$1 = (t) => {
   t.__vapor = true;
   return t;
 };
-const VaporTransition = /* @__PURE__ */ decorate$1(
-  (props, { slots }) => {
-    let resetDisplay;
-    if (isHydrating && currentHydrationNode && isTemplateNode(currentHydrationNode)) {
-      const {
-        content: { firstChild },
-        parentNode
-      } = currentHydrationNode;
-      if (firstChild) {
-        if (firstChild instanceof HTMLElement || firstChild instanceof SVGElement) {
-          const originalDisplay = firstChild.style.display;
-          firstChild.style.display = "none";
-          resetDisplay = () => firstChild.style.display = originalDisplay;
-        }
-        parentNode.replaceChild(firstChild, currentHydrationNode);
-        setCurrentHydrationNode(firstChild);
+const VaporTransition = /* @__PURE__ */ decorate$1((props, { slots }) => {
+  let resetDisplay;
+  if (isHydrating && currentHydrationNode && isTemplateNode(currentHydrationNode)) {
+    const {
+      content: { firstChild },
+      parentNode
+    } = currentHydrationNode;
+    if (firstChild) {
+      if (firstChild instanceof HTMLElement || firstChild instanceof SVGElement) {
+        const originalDisplay = firstChild.style.display;
+        firstChild.style.display = "none";
+        resetDisplay = () => firstChild.style.display = originalDisplay;
       }
+      parentNode.replaceChild(firstChild, currentHydrationNode);
+      setCurrentHydrationNode(firstChild);
     }
-    const children = slots.default && slots.default();
-    if (!children) return;
-    const instance = currentInstance;
-    const { mode } = props;
-    checkTransitionMode(mode);
-    let resolvedProps;
-    let isMounted = false;
-    renderEffect(() => {
-      resolvedProps = resolveTransitionProps(props);
-      if (isMounted) {
-        if (isFragment(children)) {
-          children.$transition.props = resolvedProps;
-        } else {
-          const child = findTransitionBlock(children);
-          if (child) {
-            child.$transition.props = resolvedProps;
-            applyTransitionHooks(child, child.$transition, true);
-          }
-        }
+  }
+  const children = slots.default && slots.default();
+  if (!children) return [];
+  const instance = currentInstance;
+  const { mode } = props;
+  checkTransitionMode(mode);
+  let resolvedProps;
+  let isMounted = false;
+  renderEffect(() => {
+    resolvedProps = resolveTransitionProps(props);
+    if (isMounted) {
+      if (isFragment(children)) {
+        children.$transition.props = resolvedProps;
       } else {
-        isMounted = true;
+        const child = findTransitionBlock(children);
+        if (child) {
+          child.$transition.props = resolvedProps;
+          applyTransitionHooks(child, child.$transition, true);
+        }
       }
-    });
-    const hooks = applyTransitionHooks(children, {
-      state: useTransitionState(),
-      props: resolvedProps,
-      instance
-    });
-    if (resetDisplay && resolvedProps.appear) {
-      const child = findTransitionBlock(children);
-      hooks.beforeEnter(child);
-      resetDisplay();
-      queuePostFlushCb(() => hooks.enter(child));
+    } else {
+      isMounted = true;
     }
-    return children;
+  });
+  const hooks = applyTransitionHooks(children, {
+    state: useTransitionState(),
+    props: resolvedProps,
+    instance
+  });
+  if (resetDisplay && resolvedProps.appear) {
+    const child = findTransitionBlock(children);
+    hooks.beforeEnter(child);
+    resetDisplay();
+    queuePostFlushCb(() => hooks.enter(child));
   }
-);
+  return children;
+});
 const getTransitionHooksContext = (key, props, state, instance, postClone) => {
   const { leavingNodes } = state;
   const context = {
@@ -2407,6 +2414,7 @@ class DynamicFragment extends VaporFragment {
         );
       });
     };
+    this.slotOwner = currentSlotOwner;
     if (isHydrating) {
       this.anchorLabel = anchorLabel;
       locateHydrationNode();
@@ -2427,8 +2435,8 @@ class DynamicFragment extends VaporFragment {
     const transition = this.$transition;
     if (this.scope) {
       let preserveScope = false;
-      if (this.beforeTeardown) {
-        preserveScope = this.beforeTeardown.some(
+      if (this.onBeforeTeardown) {
+        preserveScope = this.onBeforeTeardown.some(
           (hook) => hook(this.current, this.nodes, this.scope)
         );
       }
@@ -2440,7 +2448,7 @@ class DynamicFragment extends VaporFragment {
         applyTransitionLeaveHooks(
           this.nodes,
           transition,
-          () => this.render(render, transition, parent, instance)
+          () => this.renderBranch(render, transition, parent, instance)
         );
         parent && remove(this.nodes, parent);
         if (mode === "out-in") {
@@ -2451,18 +2459,28 @@ class DynamicFragment extends VaporFragment {
         parent && remove(this.nodes, parent);
       }
     }
-    this.render(render, transition, parent, instance);
+    this.renderBranch(render, transition, parent, instance);
     if (this.fallback) {
-      const hasNestedFragment = isFragment(this.nodes);
-      if (hasNestedFragment) {
-        setFragmentFallback(this.nodes, this.fallback);
+      let invalidFragment = null;
+      if (isFragment(this.nodes)) {
+        setFragmentFallback(
+          this.nodes,
+          this.fallback,
+          (frag) => {
+            if (!isValidBlock(frag.nodes)) {
+              invalidFragment = frag;
+            }
+          }
+        );
+      }
+      if (!invalidFragment && !isValidBlock(this.nodes)) {
+        invalidFragment = this;
       }
-      const invalidFragment = findInvalidFragment(this);
       if (invalidFragment) {
         parent && remove(this.nodes, parent);
         const scope = this.scope || (this.scope = new EffectScope());
         scope.run(() => {
-          if (hasNestedFragment) {
+          if (invalidFragment !== this) {
             renderFragmentFallback(invalidFragment);
           } else {
             this.nodes = this.fallback() || [];
@@ -2474,7 +2492,7 @@ class DynamicFragment extends VaporFragment {
     setActiveSub(prevSub);
     if (isHydrating) this.hydrate();
   }
-  render(render, transition, parent, instance) {
+  renderBranch(render, transition, parent, instance) {
     if (render) {
       const scope = this.getScope && this.getScope(this.current);
       if (scope) {
@@ -2482,24 +2500,27 @@ class DynamicFragment extends VaporFragment {
       } else {
         this.scope = new EffectScope();
       }
-      let prev;
-      if (parent && instance) prev = setCurrentInstance(instance);
+      const prevOwner = setCurrentSlotOwner(this.slotOwner);
+      const prev = parent && instance ? setCurrentInstance(instance) : void 0;
       this.nodes = this.scope.run(render) || [];
-      if (parent && instance) setCurrentInstance(...prev);
+      if (prev !== void 0) setCurrentInstance(...prev);
+      setCurrentSlotOwner(prevOwner);
       if (transition) {
         this.$transition = applyTransitionHooks(this.nodes, transition);
       }
-      if (this.beforeMount) {
-        this.beforeMount.forEach(
+      if (this.onBeforeMount) {
+        this.onBeforeMount.forEach(
           (hook) => hook(this.current, this.nodes, this.scope)
         );
       }
       if (parent) {
         if (this.attrs) {
           if (this.nodes instanceof Element) {
-            renderEffect(
-              () => applyFallthroughProps(this.nodes, this.attrs)
-            );
+            this.scope.run(() => {
+              renderEffect(
+                () => applyFallthroughProps(this.nodes, this.attrs)
+              );
+            });
           } else if (!!(process.env.NODE_ENV !== "production") && // preventing attrs fallthrough on slots
           // consistent with VDOM slots behavior
           (this.anchorLabel === "slot" || isArray(this.nodes) && this.nodes.length)) {
@@ -2507,8 +2528,8 @@ class DynamicFragment extends VaporFragment {
           }
         }
         insert(this.nodes, parent, this.anchor);
-        if (this.updated) {
-          this.updated.forEach((hook) => hook(this.nodes));
+        if (this.onUpdated) {
+          this.onUpdated.forEach((hook) => hook(this.nodes));
         }
       }
     } else {
@@ -2517,7 +2538,7 @@ class DynamicFragment extends VaporFragment {
     }
   }
 }
-function setFragmentFallback(fragment, fallback) {
+function setFragmentFallback(fragment, fallback, onFragment) {
   if (fragment.fallback) {
     const originalFallback = fragment.fallback;
     fragment.fallback = () => {
@@ -2530,8 +2551,9 @@ function setFragmentFallback(fragment, fallback) {
   } else {
     fragment.fallback = fallback;
   }
+  if (onFragment) onFragment(fragment);
   if (isFragment(fragment.nodes)) {
-    setFragmentFallback(fragment.nodes, fragment.fallback);
+    setFragmentFallback(fragment.nodes, fragment.fallback, onFragment);
   }
 }
 function renderFragmentFallback(fragment) {
@@ -2541,10 +2563,6 @@ function renderFragmentFallback(fragment) {
     fragment.update(fragment.fallback);
   } else ;
 }
-function findInvalidFragment(fragment) {
-  if (isValidBlock(fragment.nodes)) return null;
-  return isFragment(fragment.nodes) ? findInvalidFragment(fragment.nodes) || fragment : fragment;
-}
 function isFragment(val) {
   return val instanceof VaporFragment;
 }
@@ -2664,11 +2682,13 @@ class TeleportFragment extends VaporFragment {
     const nodes = this.nodes;
     if (this.parentComponent && this.parentComponent.ut) {
       if (isFragment(nodes)) {
-        (nodes.updated || (nodes.updated = [])).push(() => updateCssVars(this));
+        (nodes.onUpdated || (nodes.onUpdated = [])).push(
+          () => updateCssVars(this)
+        );
       } else if (isArray(nodes)) {
         nodes.forEach((node) => {
           if (isFragment(node)) {
-            (node.updated || (node.updated = [])).push(
+            (node.onUpdated || (node.onUpdated = [])).push(
               () => updateCssVars(this)
             );
           }
@@ -2984,12 +3004,9 @@ function hmrRerender(instance) {
   const normalized = normalizeBlock(instance.block);
   const parent = normalized[0].parentNode;
   const anchor = normalized[normalized.length - 1].nextSibling;
+  instance.scope.reset();
   remove(instance.block, parent);
   const prev = setCurrentInstance(instance);
-  if (instance.renderEffects) {
-    instance.renderEffects.forEach((e) => e.stop());
-    instance.renderEffects = [];
-  }
   pushWarningContext(instance);
   devRender(instance);
   popWarningContext();
@@ -3199,7 +3216,7 @@ function setupComponent(instance, component) {
       }
     }
   } else {
-    handleSetupResult(setupResult, component, instance, setupFn);
+    handleSetupResult(setupResult, component, instance);
   }
   setActiveSub(prevSub);
   setCurrentInstance(...prevInstance);
@@ -3396,12 +3413,7 @@ function mountComponent(instance, parent, anchor) {
   if (instance.suspense && instance.asyncDep && !instance.asyncResolved) {
     const component = instance.type;
     instance.suspense.registerDep(instance, (setupResult) => {
-      handleSetupResult(
-        setupResult,
-        component,
-        instance,
-        isFunction(component) ? component : component.setup
-      );
+      handleSetupResult(setupResult, component, instance);
       mountComponent(instance, parent, anchor);
     });
     return;
@@ -3498,7 +3510,7 @@ function getRootElement(block, onDynamicFragment, recurse = true) {
 function isVaporTransition(component) {
   return getComponentName(component) === "VaporTransition";
 }
-function handleSetupResult(setupResult, component, instance, setupFn) {
+function handleSetupResult(setupResult, component, instance) {
   if (!!(process.env.NODE_ENV !== "production")) {
     pushWarningContext(instance);
   }
@@ -3522,7 +3534,7 @@ function handleSetupResult(setupResult, component, instance, setupFn) {
       devRender(instance);
     }
   } else {
-    if (!setupFn && component.render) {
+    if (setupResult === EMPTY_OBJ && component.render) {
       instance.block = callWithErrorHandling(
         component.render,
         instance,
@@ -4211,7 +4223,7 @@ const createFor = (src, renderItem, getKey, flags = 0, setup) => {
     } else {
       oldBlocks = [];
     }
-    if (isMounted && frag.updated) frag.updated.forEach((m) => m());
+    if (isMounted && frag.onUpdated) frag.onUpdated.forEach((m) => m());
     setActiveSub(prevSub);
   };
   const needKey = renderItem.length > 1;
@@ -4916,4 +4928,4 @@ function getFirstConnectedChild(children) {
   }
 }
 
-export { VaporFragment, VaporKeepAliveImpl as VaporKeepAlive, VaporTeleportImpl as VaporTeleport, VaporTransition, VaporTransitionGroup, applyCheckboxModel, applyDynamicModel, applyRadioModel, applySelectModel, applyTextModel, applyVShow, child, createComponent, createComponentWithFallback, createDynamicComponent, createFor, createForSlots, createIf, createInvoker, createKeyedFragment, createPlainElement, createSlot, createTemplateRefSetter, createTextNode, createVaporApp, createVaporSSRApp, defineVaporAsyncComponent, defineVaporComponent, defineVaporCustomElement, defineVaporSSRCustomElement, delegate, delegateEvents, getDefaultValue, getRestElement, insert, isFragment, isVaporComponent, next, nthChild, on, prepend, remove, renderEffect, setAttr, setBlockHtml, setBlockText, setClass, setDOMProp, setDynamicEvents, setDynamicProps, setElementText, setHtml, setInsertionState, setProp, setStyle, setText, setValue, template, txt, useVaporCssVars, vaporInteropPlugin, withVaporCtx, withVaporDirectives };
+export { VaporElement, VaporFragment, VaporKeepAliveImpl as VaporKeepAlive, VaporTeleportImpl as VaporTeleport, VaporTransition, VaporTransitionGroup, applyCheckboxModel, applyDynamicModel, applyRadioModel, applySelectModel, applyTextModel, applyVShow, child, createComponent, createComponentWithFallback, createDynamicComponent, createFor, createForSlots, createIf, createInvoker, createKeyedFragment, createPlainElement, createSlot, createTemplateRefSetter, createTextNode, createVaporApp, createVaporSSRApp, defineVaporAsyncComponent, defineVaporComponent, defineVaporCustomElement, defineVaporSSRCustomElement, delegate, delegateEvents, getDefaultValue, getRestElement, insert, isFragment, isVaporComponent, next, nthChild, on, prepend, remove, renderEffect, setAttr, setBlockHtml, setBlockText, setClass, setDOMProp, setDynamicEvents, setDynamicProps, setElementText, setHtml, setInsertionState, setProp, setStyle, setText, setValue, template, txt, useVaporCssVars, vaporInteropPlugin, withVaporCtx, withVaporDirectives };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/runtime-vapor",
-  "version": "3.6.0-alpha.6",
+  "version": "3.6.0-alpha.7",
   "description": "@vue/runtime-vapor",
   "main": "index.js",
   "module": "dist/runtime-vapor.esm-bundler.js",
@@ -38,10 +38,10 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/dev/packages/runtime-vapor#readme",
   "dependencies": {
-    "@vue/shared": "3.6.0-alpha.6",
-    "@vue/reactivity": "3.6.0-alpha.6"
+    "@vue/shared": "3.6.0-alpha.7",
+    "@vue/reactivity": "3.6.0-alpha.7"
   },
   "peerDependencies": {
-    "@vue/runtime-dom": "3.6.0-alpha.6"
+    "@vue/runtime-dom": "3.6.0-alpha.7"
   }
 }