@lytjs/renderer 6.0.0 → 6.5.0

package/dist/index.d.cts

@@ -1,5 +1,7 @@
 import { Ref } from '@lytjs/reactivity';
 export { getSkippedTrackingCount, resetSkippedTrackingCount, shouldSkipTracking, withFirstRenderOptimization } from '@lytjs/reactivity';
+import { VaporComponentDefinition, VaporApp } from './vapor/vapor-app.cjs';
+export { VaporAppOptions, VaporComponentOptions, VaporContext, PropOptions as VaporPropOptions } from './vapor/vapor-app.cjs';
 import { VNode } from '@lytjs/vdom';
 export { RendererOptions, VNode, createRenderer } from '@lytjs/vdom';
 export { DOMRenderer, EventInvoker, HydrationRenderer, ParsedEvent, WebRendererHost, createDOMRenderer, createHydrationFunctions, createInvoker, createWebHost, getEventKey, normalizeEventName, parseEventModifier, patchAttr, patchClass, patchEvent, patchProp, patchStyle, removeAllEventListeners, wrapDOMEvent } from '@lytjs/adapter-web';
@@ -278,47 +280,6 @@ declare function defineServerComponent(options: Omit<ServerComponentDefinition,
     serializeData?: () => string;
 }): ServerComponentDefinition;
 
-/** Vapor 组件的上下文对象 */
-interface VaporContext {
-    attrs: Record<string, unknown>;
-    slots: Record<string, () => Node>;
-    emit: (event: string, ...args: unknown[]) => void;
-}
-/** Prop 定义选项 */
-interface PropOptions {
-    type?: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'function';
-    default?: unknown;
-    required?: boolean;
-    validator?: (value: unknown) => boolean;
-}
-/** Vapor 组件定义选项 */
-interface VaporComponentOptions {
-    name?: string;
-    props?: Record<string, PropOptions>;
-    setup?: (props: Record<string, unknown>, context: VaporContext) => Record<string, unknown> | void;
-    template: string;
-}
-/** Vapor 组件定义（编译后的结果） */
-interface VaporComponentDefinition {
-    name?: string;
-    props?: Record<string, PropOptions>;
-    setup?: (props: Record<string, unknown>, context: VaporContext) => Record<string, unknown> | void;
-    template: string;
-    compiledCode?: string;
-}
-/** Vapor 应用配置选项 */
-interface VaporAppOptions {
-    /** 根容器属性（传递给根组件的 props） */
-    rootProps?: Record<string, unknown>;
-}
-/** Vapor 应用实例 */
-interface VaporApp {
-    mount(container: Element | string): void;
-    unmount(): void;
-    provide(key: string | symbol, value: unknown): void;
-    component(name: string, component: VaporComponentDefinition): VaporApp;
-}
-
 /** HMR 更新类型 */
 type HMRUpdateType = 'template' | 'script' | 'style' | 'full';
 /** HMR 更新信息 */
@@ -1001,4 +962,4 @@ declare function getDataFetchingFunctions(): Promise<{
     getPrefetchData: typeof getPrefetchData;
 }>;
 
-export { DEFAULT_STATE_PRESERVATION, type DataFetchOptions, type DataFetchState, type HMRStatePreservation, type HMRUpdate, type HMRUpdateType, type HookHandler, type HydrationError, HydrationErrorHandler, type HydrationMismatch, type HydrationMode, type HydrationOptions, type HydrationStats, type ComponentOptions as IslandComponentOptions, type LifecycleEvent, OptimizedSSRStream, type OptimizedStreamOptions, type RendererPlugin as Plugin, type PluginContext, type PrefetchDataEntry, type PrefetchManager, type PreloadHint, type RecoveryStrategy, type RendererPlugin, type ResourceCleanupRenderer, type SSRStreamOptions, type ServerActionRequest, type ServerActionResponse, type ServerComponentDefinition, type SignalRenderer, type StreamStats, type VaporApp, type VaporAppOptions, type VaporComponentDefinition, type VaporComponentOptions, type VaporContext, type VaporHydrationOptions, type PropOptions as VaporPropOptions, type SignalRenderer as VaporRenderer, type VaporSSROptions, type VaporSSRResult, type VaporSSRStreamResult, cleanupComponentResources, createIslandSSRContent, createOptimizedStream, createSignalRenderer, createVaporApp, createVaporRenderer, definePrefetch, defineVaporComponent, executeHooks, getDataFetchingFunctions, getEnhancedHydrationFunctions, getInstalledPlugins, getServerComponentClientFunctions, getServerComponentFunctions, getVaporHMRFunctions, hydrateIsland, hydrateVaporComponent, isPluginInstalled, isVoidElement, registerComponentCleanup, registerComponentEffectSubscription, registerComponentEventListener, registerIslandComponent, removePlugin, renderDocumentToStream, renderToStream, renderToString, renderVaporToStream, renderVaporToString, use, usePrefetchData };
+export { DEFAULT_STATE_PRESERVATION, type DataFetchOptions, type DataFetchState, type HMRStatePreservation, type HMRUpdate, type HMRUpdateType, type HookHandler, type HydrationError, HydrationErrorHandler, type HydrationMismatch, type HydrationMode, type HydrationOptions, type HydrationStats, type ComponentOptions as IslandComponentOptions, type LifecycleEvent, OptimizedSSRStream, type OptimizedStreamOptions, type RendererPlugin as Plugin, type PluginContext, type PrefetchDataEntry, type PrefetchManager, type PreloadHint, type RecoveryStrategy, type RendererPlugin, type ResourceCleanupRenderer, type SSRStreamOptions, type ServerActionRequest, type ServerActionResponse, type ServerComponentDefinition, type SignalRenderer, type StreamStats, VaporApp, VaporComponentDefinition, type VaporHydrationOptions, type SignalRenderer as VaporRenderer, type VaporSSROptions, type VaporSSRResult, type VaporSSRStreamResult, cleanupComponentResources, createIslandSSRContent, createOptimizedStream, createSignalRenderer, createVaporApp, createVaporRenderer, definePrefetch, defineVaporComponent, executeHooks, getDataFetchingFunctions, getEnhancedHydrationFunctions, getInstalledPlugins, getServerComponentClientFunctions, getServerComponentFunctions, getVaporHMRFunctions, hydrateIsland, hydrateVaporComponent, isPluginInstalled, isVoidElement, registerComponentCleanup, registerComponentEffectSubscription, registerComponentEventListener, registerIslandComponent, removePlugin, renderDocumentToStream, renderToStream, renderToString, renderVaporToStream, renderVaporToString, use, usePrefetchData };

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import { Ref } from '@lytjs/reactivity';
 export { getSkippedTrackingCount, resetSkippedTrackingCount, shouldSkipTracking, withFirstRenderOptimization } from '@lytjs/reactivity';
+import { VaporComponentDefinition, VaporApp } from './vapor/vapor-app.js';
+export { VaporAppOptions, VaporComponentOptions, VaporContext, PropOptions as VaporPropOptions } from './vapor/vapor-app.js';
 import { VNode } from '@lytjs/vdom';
 export { RendererOptions, VNode, createRenderer } from '@lytjs/vdom';
 export { DOMRenderer, EventInvoker, HydrationRenderer, ParsedEvent, WebRendererHost, createDOMRenderer, createHydrationFunctions, createInvoker, createWebHost, getEventKey, normalizeEventName, parseEventModifier, patchAttr, patchClass, patchEvent, patchProp, patchStyle, removeAllEventListeners, wrapDOMEvent } from '@lytjs/adapter-web';
@@ -278,47 +280,6 @@ declare function defineServerComponent(options: Omit<ServerComponentDefinition,
     serializeData?: () => string;
 }): ServerComponentDefinition;
 
-/** Vapor 组件的上下文对象 */
-interface VaporContext {
-    attrs: Record<string, unknown>;
-    slots: Record<string, () => Node>;
-    emit: (event: string, ...args: unknown[]) => void;
-}
-/** Prop 定义选项 */
-interface PropOptions {
-    type?: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'function';
-    default?: unknown;
-    required?: boolean;
-    validator?: (value: unknown) => boolean;
-}
-/** Vapor 组件定义选项 */
-interface VaporComponentOptions {
-    name?: string;
-    props?: Record<string, PropOptions>;
-    setup?: (props: Record<string, unknown>, context: VaporContext) => Record<string, unknown> | void;
-    template: string;
-}
-/** Vapor 组件定义（编译后的结果） */
-interface VaporComponentDefinition {
-    name?: string;
-    props?: Record<string, PropOptions>;
-    setup?: (props: Record<string, unknown>, context: VaporContext) => Record<string, unknown> | void;
-    template: string;
-    compiledCode?: string;
-}
-/** Vapor 应用配置选项 */
-interface VaporAppOptions {
-    /** 根容器属性（传递给根组件的 props） */
-    rootProps?: Record<string, unknown>;
-}
-/** Vapor 应用实例 */
-interface VaporApp {
-    mount(container: Element | string): void;
-    unmount(): void;
-    provide(key: string | symbol, value: unknown): void;
-    component(name: string, component: VaporComponentDefinition): VaporApp;
-}
-
 /** HMR 更新类型 */
 type HMRUpdateType = 'template' | 'script' | 'style' | 'full';
 /** HMR 更新信息 */
@@ -1001,4 +962,4 @@ declare function getDataFetchingFunctions(): Promise<{
     getPrefetchData: typeof getPrefetchData;
 }>;
 
-export { DEFAULT_STATE_PRESERVATION, type DataFetchOptions, type DataFetchState, type HMRStatePreservation, type HMRUpdate, type HMRUpdateType, type HookHandler, type HydrationError, HydrationErrorHandler, type HydrationMismatch, type HydrationMode, type HydrationOptions, type HydrationStats, type ComponentOptions as IslandComponentOptions, type LifecycleEvent, OptimizedSSRStream, type OptimizedStreamOptions, type RendererPlugin as Plugin, type PluginContext, type PrefetchDataEntry, type PrefetchManager, type PreloadHint, type RecoveryStrategy, type RendererPlugin, type ResourceCleanupRenderer, type SSRStreamOptions, type ServerActionRequest, type ServerActionResponse, type ServerComponentDefinition, type SignalRenderer, type StreamStats, type VaporApp, type VaporAppOptions, type VaporComponentDefinition, type VaporComponentOptions, type VaporContext, type VaporHydrationOptions, type PropOptions as VaporPropOptions, type SignalRenderer as VaporRenderer, type VaporSSROptions, type VaporSSRResult, type VaporSSRStreamResult, cleanupComponentResources, createIslandSSRContent, createOptimizedStream, createSignalRenderer, createVaporApp, createVaporRenderer, definePrefetch, defineVaporComponent, executeHooks, getDataFetchingFunctions, getEnhancedHydrationFunctions, getInstalledPlugins, getServerComponentClientFunctions, getServerComponentFunctions, getVaporHMRFunctions, hydrateIsland, hydrateVaporComponent, isPluginInstalled, isVoidElement, registerComponentCleanup, registerComponentEffectSubscription, registerComponentEventListener, registerIslandComponent, removePlugin, renderDocumentToStream, renderToStream, renderToString, renderVaporToStream, renderVaporToString, use, usePrefetchData };
+export { DEFAULT_STATE_PRESERVATION, type DataFetchOptions, type DataFetchState, type HMRStatePreservation, type HMRUpdate, type HMRUpdateType, type HookHandler, type HydrationError, HydrationErrorHandler, type HydrationMismatch, type HydrationMode, type HydrationOptions, type HydrationStats, type ComponentOptions as IslandComponentOptions, type LifecycleEvent, OptimizedSSRStream, type OptimizedStreamOptions, type RendererPlugin as Plugin, type PluginContext, type PrefetchDataEntry, type PrefetchManager, type PreloadHint, type RecoveryStrategy, type RendererPlugin, type ResourceCleanupRenderer, type SSRStreamOptions, type ServerActionRequest, type ServerActionResponse, type ServerComponentDefinition, type SignalRenderer, type StreamStats, VaporApp, VaporComponentDefinition, type VaporHydrationOptions, type SignalRenderer as VaporRenderer, type VaporSSROptions, type VaporSSRResult, type VaporSSRStreamResult, cleanupComponentResources, createIslandSSRContent, createOptimizedStream, createSignalRenderer, createVaporApp, createVaporRenderer, definePrefetch, defineVaporComponent, executeHooks, getDataFetchingFunctions, getEnhancedHydrationFunctions, getInstalledPlugins, getServerComponentClientFunctions, getServerComponentFunctions, getVaporHMRFunctions, hydrateIsland, hydrateVaporComponent, isPluginInstalled, isVoidElement, registerComponentCleanup, registerComponentEffectSubscription, registerComponentEventListener, registerIslandComponent, removePlugin, renderDocumentToStream, renderToStream, renderToString, renderVaporToStream, renderVaporToString, use, usePrefetchData };

package/dist/index.mjs

@@ -4,10 +4,10 @@ export { escapeHtml, isBooleanAttr } from '@lytjs/common-string';
 import { isFunction, isArray, isString, isNullish, isObject } from '@lytjs/common-is';
 import { ShapeFlags, Fragment, Text, Comment } from '@lytjs/vdom';
 export { createRenderer } from '@lytjs/vdom';
-import { compile } from '@lytjs/compiler';
+import { clearCompileCache, compile } from '@lytjs/compiler';
 import { effect, ref, watch } from '@lytjs/reactivity';
 export { getSkippedTrackingCount, resetSkippedTrackingCount, shouldSkipTracking, withFirstRenderOptimization } from '@lytjs/reactivity';
-import { reconcileArray, createTemplate, setText, setAttribute, setProperty, setStyle, setClass, insert, remove, createEventHandler, bindEffect, onCleanup, runCleanups } from '@lytjs/dom-runtime';
+import { reconcileArray, createTemplate, setText, setHTML, setAttribute, setProperty, setStyle, setClass, insert, remove, createEventHandler, onCleanup, runCleanups } from '@lytjs/dom-runtime';
 export { WebRendererHost, createDOMRenderer, createHydrationFunctions, createInvoker, createWebHost, getEventKey, normalizeEventName, parseEventModifier, patchAttr, patchClass, patchEvent, patchProp, patchStyle, removeAllEventListeners, wrapDOMEvent } from '@lytjs/adapter-web';
 export { isOn } from '@lytjs/common-events';
 
@@ -1122,17 +1122,13 @@ var signal_renderer_exports = {};
 __export(signal_renderer_exports, {
   createSignalRenderer: () => createSignalRenderer
 });
-function setSafeHTML(el, html) {
-  const wrapper = el;
-  const realNode = "content" in wrapper && "firstChild" in wrapper && wrapper.firstChild !== null ? wrapper.firstChild : el;
-  realNode.textContent = html;
-}
 function createSignalRenderer(template, context) {
   let cleanup = null;
   let code;
   let renderBody;
   try {
-    const compileResult = compile(template, { rendererMode: "signal" });
+    clearCompileCache();
+    const compileResult = compile(template, { rendererMode: "signal", optimizeSignal: false });
     code = compileResult.code;
     renderBody = extractRenderBody(code);
     if (!renderBody) {
@@ -1167,19 +1163,36 @@ function createSignalRenderer(template, context) {
           "insert",
           "remove",
           "createEventHandler",
-          "bindEffect",
           "onCleanup",
           "runCleanups",
           "_ctx",
           "_container",
           renderBody
         );
+        const proxiedCtx = new Proxy(context, {
+          get(target, prop) {
+            const val = target[prop];
+            if (val && typeof val === "object" && "value" in val) {
+              return val.value;
+            }
+            return val;
+          },
+          set(target, prop, value) {
+            const val = target[prop];
+            if (val && typeof val === "object" && "value" in val) {
+              val.value = value;
+              return true;
+            }
+            target[prop] = value;
+            return true;
+          }
+        });
         const cleanupFn = renderFn(
           effect,
           reconcileArray,
           createTemplate,
           setText,
-          setSafeHTML,
+          setHTML,
           setAttribute,
           setProperty,
           setStyle,
@@ -1187,10 +1200,9 @@ function createSignalRenderer(template, context) {
           insert,
           remove,
           createEventHandler,
-          bindEffect,
           onCleanup,
           runCleanups,
-          context,
+          proxiedCtx,
           el
         );
         if (typeof cleanupFn === "function") {