@viewfly/core 2.0.0-alpha.5 → 2.0.0-alpha.7

package/bundles/index.d.ts

@@ -211,7 +211,7 @@ declare function comparePropsWithCallbacks(oldProps: Record<string, any>, newPro
 declare const TextAtomType: unique symbol;
 declare const ElementAtomType: unique symbol;
 declare const ComponentAtomType: unique symbol;
-type ElementNamespace = string | undefined;
+type ElementNamespace = string | void;
 interface TextAtom {
     type: typeof TextAtomType;
     index: number;
@@ -264,6 +264,7 @@ declare abstract class NativeRenderer<ElementNode = NativeNode, TextNode = Nativ
     abstract cleanChildren(node: ElementNode, namespace: ElementNamespace): void;
     abstract syncTextContent(target: TextNode, content: string, namespace: ElementNamespace): void;
     abstract insertAfter(newNode: ElementNode | TextNode, ref: ElementNode | TextNode, namespace: ElementNamespace): void;
+    abstract getNameSpace(type: string, namespace: ElementNamespace): string | void;
 }
 
 interface RefListener<T> {
@@ -439,6 +440,16 @@ declare function getCurrentInstance(): Component;
 declare function registryComponentDestroyCallback(fn: () => void): void;
 
 declare function createContext(providers: Provider[], scope?: Scope | null, parentInjector?: Injector): (props: Props) => () => JSXNode | JSXNode[];
+interface ContextProviderParams<T> {
+    provide: Type<T> | AbstractType<T> | InjectionToken<T>;
+}
+interface ContextProvider<T> extends Props {
+    useClass?: ClassProvider<T>['useClass'];
+    useFactory?: FactoryProvider<T>['useFactory'];
+    useValue?: ValueProvider<T>['useValue'];
+    useExisting?: ExistingProvider<T>['useExisting'];
+}
+declare function createContextProvider<T>(params: ContextProviderParams<T>): (props: ContextProvider<T>) => () => ViewFlyNode<string | ComponentSetup<any>>;
 /**
  * 通过组件上下文获取 IoC 容器内数据的勾子方法
  */
@@ -480,10 +491,6 @@ declare function popDepContext(): void;
 
 declare function withMemo<T extends Props = Props>(canUseMemo: ComponentInstance<T>['$useMemo'], render: () => JSXNode): ComponentInstance<T>;
 
-declare const ElementNamespaceMap: {
-    readonly svg: "svg";
-    readonly math: "mathml";
-};
 declare function createRenderer(component: Component, nativeRenderer: NativeRenderer, namespace: ElementNamespace): (host: NativeNode) => void;
 
 /**
@@ -711,4 +718,4 @@ declare function createEffect<T, T1, T2, T3, T4, T5, T6, T7>(deps: [Signal<T>, S
 declare function createEffect<T>(deps: () => T, callback: EffectCallback<T>): () => void;
 declare function createEffect<T = any>(deps: Signal<any>[], callback: EffectCallback<T[]>): () => void;
 
-export { type AbstractInstanceType, type AbstractProvider, type AbstractType, type Application, ArrayReactiveHandler, type Atom, type ClassNames, type ClassProvider, Component, type ComponentAnnotation, type ComponentInstance, type ComponentSetup, type ComponentViewMetadata, type Computed, type Config, type ConstructorProvider, Dep, DynamicRef, type EffectCallback, type ElementNamespace, ElementNamespaceMap, type ExistingProvider, type ExtractInstanceType, type ExtractValueType, type FactoryProvider, ForwardRef, Fragment, Inject, type InjectDecorator, InjectFlags, Injectable, type InjectableDecorator, type InjectableOptions, InjectionToken, Injector, JSX, type JSXNode, JSXNodeFactory, type Key, type LifeCycleCallback, MapReactiveHandler, type Module, type NativeNode, NativeRenderer, type NormalizedProvider, NullInjector, ObjectReactiveHandler, Optional, type OptionalDecorator, Prop, type PropDecorator, type Props, type ProvideScope, type Provider, type ReactiveConfig, type RefListener, type ReflectiveDependency, ReflectiveInjector, RootComponent, Scope, Self, type SelfDecorator, SetReactiveHandler, type Signal, SkipSelf, type SkipSelfDecorator, type StaticProvider, StaticRef, THROW_IF_NOT_FOUND, TrackOpTypes, TriggerOpTypes, Type, type TypeProvider, type ValueProvider, type ViewFlyNode, comparePropsWithCallbacks, computed, createContext, createDerived, createDynamicRef, createEffect, createRef, createRenderer, createSignal, defaultArrayReactiveHandler, defaultMapReactiveHandler, defaultObjectReactiveHandler, defaultSetReactiveHandler, defaultShallowArrayReactiveHandler, defaultShallowMapReactiveHandler, defaultShallowObjectReactiveHandler, defaultShallowSetReactiveHandler, forwardRef, getCurrentInstance, getDepContext, getSetupContext, inject, internalWrite, isReactive, jsx, jsxs, makeError, normalizeProvider, onMounted, onUnmounted, onUpdated, popDepContext, proxyToRawCache, pushDepContext, rawToProxyCache, reactive, readonlyProxyHandler, registryComponentDestroyCallback, shallowReactive, toRaw, track, trigger, viewfly, watch, withAnnotation, withMemo };
+export { type AbstractInstanceType, type AbstractProvider, type AbstractType, type Application, ArrayReactiveHandler, type Atom, type ClassNames, type ClassProvider, Component, type ComponentAnnotation, type ComponentInstance, type ComponentSetup, type ComponentViewMetadata, type Computed, type Config, type ConstructorProvider, type ContextProvider, type ContextProviderParams, Dep, DynamicRef, type EffectCallback, type ElementNamespace, type ExistingProvider, type ExtractInstanceType, type ExtractValueType, type FactoryProvider, ForwardRef, Fragment, Inject, type InjectDecorator, InjectFlags, Injectable, type InjectableDecorator, type InjectableOptions, InjectionToken, Injector, JSX, type JSXNode, JSXNodeFactory, type Key, type LifeCycleCallback, MapReactiveHandler, type Module, type NativeNode, NativeRenderer, type NormalizedProvider, NullInjector, ObjectReactiveHandler, Optional, type OptionalDecorator, Prop, type PropDecorator, type Props, type ProvideScope, type Provider, type ReactiveConfig, type RefListener, type ReflectiveDependency, ReflectiveInjector, RootComponent, Scope, Self, type SelfDecorator, SetReactiveHandler, type Signal, SkipSelf, type SkipSelfDecorator, type StaticProvider, StaticRef, THROW_IF_NOT_FOUND, TrackOpTypes, TriggerOpTypes, Type, type TypeProvider, type ValueProvider, type ViewFlyNode, comparePropsWithCallbacks, computed, createContext, createContextProvider, createDerived, createDynamicRef, createEffect, createRef, createRenderer, createSignal, defaultArrayReactiveHandler, defaultMapReactiveHandler, defaultObjectReactiveHandler, defaultSetReactiveHandler, defaultShallowArrayReactiveHandler, defaultShallowMapReactiveHandler, defaultShallowObjectReactiveHandler, defaultShallowSetReactiveHandler, forwardRef, getCurrentInstance, getDepContext, getSetupContext, inject, internalWrite, isReactive, jsx, jsxs, makeError, normalizeProvider, onMounted, onUnmounted, onUpdated, popDepContext, proxyToRawCache, pushDepContext, rawToProxyCache, reactive, readonlyProxyHandler, registryComponentDestroyCallback, shallowReactive, toRaw, track, trigger, viewfly, watch, withAnnotation, withMemo };

package/bundles/index.esm.js

@@ -1167,12 +1167,13 @@ class ObjectReactiveHandler {
         if (this.isReadonly && !fromInternalWrite) {
             throw reactiveErrorFn('Object is readonly!');
         }
-        newValue = toRaw(newValue);
+        const rawValue = toRaw(newValue);
         const oldValue = target[p];
-        if (oldValue === newValue) {
-            return Reflect.set(target, p, newValue, receiver);
+        const v = this.isShallow ? newValue : rawValue;
+        if (oldValue === rawValue) {
+            return Reflect.set(target, p, v, receiver);
         }
-        const b = Reflect.set(target, p, newValue, receiver);
+        const b = Reflect.set(target, p, v, receiver);
         fromInternalWrite = false;
         if (hasOwn(target, p)) {
             trigger(target, TriggerOpTypes.Set, p);
@@ -1634,6 +1635,53 @@ function registryComponentDestroyCallback(fn) {
     }
 }
 
+function Fragment(props) {
+    return () => {
+        return props.children;
+    };
+}
+function jsx(type, props, key) {
+    return JSXNodeFactory.createNode(type, props, key);
+}
+const jsxs = jsx;
+const JSXNodeFactory = {
+    createNode(type, props, key) {
+        return {
+            type,
+            props,
+            key
+        };
+    }
+};
+
+function watch(trigger, callback) {
+    let prevFn;
+    const dep = new Dep(() => {
+        pushDepContext(dep);
+        const newValue = trigger();
+        popDepContext();
+        if (newValue === oldValue) {
+            return;
+        }
+        if (prevFn) {
+            prevFn();
+        }
+        prevFn = callback(newValue, oldValue);
+        oldValue = newValue;
+    });
+    pushDepContext(dep);
+    let oldValue = trigger();
+    popDepContext();
+    dep.destroyCallbacks.push(() => {
+        prevFn === null || prevFn === void 0 ? void 0 : prevFn();
+    });
+    function unWatch() {
+        dep.destroy();
+    }
+    registryComponentDestroyCallback(unWatch);
+    return unWatch;
+}
+
 const injectMap = new WeakMap();
 function getInjector(start) {
     while (start) {
@@ -1655,6 +1703,19 @@ function createContext(providers, scope, parentInjector) {
         };
     };
 }
+function createContextProvider(params) {
+    return function contextProvider(props) {
+        let Context = createContext([Object.assign({ provide: params.provide }, props)]);
+        watch(() => {
+            return props.useClass || props.useFactory || props.useValue || props.useExisting;
+        }, () => {
+            Context = createContext([Object.assign({ provide: params.provide }, props)]);
+        });
+        return () => {
+            return jsx(Context, { children: props.children });
+        };
+    };
+}
 /**
  * 通过组件上下文获取 IoC 容器内数据的勾子方法
  */
@@ -1700,25 +1761,6 @@ function withAnnotation(annotation, componentSetup) {
 class NativeRenderer {
 }
 
-function Fragment(props) {
-    return () => {
-        return props.children;
-    };
-}
-function jsx(type, props, key) {
-    return JSXNodeFactory.createNode(type, props, key);
-}
-const jsxs = jsx;
-const JSXNodeFactory = {
-    createNode(type, props, key) {
-        return {
-            type,
-            props,
-            key
-        };
-    }
-};
-
 function withMemo(canUseMemo, render) {
     return {
         $useMemo: canUseMemo,
@@ -1726,10 +1768,6 @@ function withMemo(canUseMemo, render) {
     };
 }
 
-const ElementNamespaceMap = {
-    svg: 'svg',
-    math: 'mathml',
-};
 const listenerReg = /^on[A-Z]/;
 function createRenderer(component, nativeRenderer, namespace) {
     let isInit = true;
@@ -1780,7 +1818,7 @@ function buildElementChildren(atom, nativeRenderer, parentComponent, context) {
 }
 function patchComponent(nativeRenderer, component, oldChildAtom, newAtom, context, needMove) {
     const newTemplate = component.rerender();
-    newAtom.child = createChildChain(newTemplate, newAtom.namespace);
+    newAtom.child = createChildChain(newTemplate, nativeRenderer, newAtom.namespace);
     diff(nativeRenderer, component, newAtom.child, oldChildAtom, context, needMove);
 }
 function deepUpdateByComponentDirtyTree(nativeRenderer, component, needMove) {
@@ -2003,7 +2041,7 @@ function cleanChildren(atom, nativeRenderer, needClean) {
 }
 function componentRender(nativeRenderer, component, from, context) {
     component.render((template, portalHost) => {
-        from.child = createChildChain(template, from.namespace);
+        from.child = createChildChain(template, nativeRenderer, from.namespace);
         context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
         component.viewMetadata = Object.assign({ atom: from }, context);
         let child = from.child;
@@ -2028,7 +2066,7 @@ function createChainByJSXNode(type, jsxNode, nodeType, prevAtom, namespace, key)
     prevAtom.sibling = atom;
     return atom;
 }
-function createChainByNode(jsxNode, prevAtom, elementNamespace) {
+function createChainByNode(jsxNode, prevAtom, nativeRenderer, elementNamespace) {
     const type = typeof jsxNode;
     if (jsxNode != null && type !== 'boolean') {
         if (type === 'string') {
@@ -2036,11 +2074,11 @@ function createChainByNode(jsxNode, prevAtom, elementNamespace) {
         }
         if (type === 'object') {
             if (Array.isArray(jsxNode)) {
-                return createChainByChildren(jsxNode, prevAtom, elementNamespace);
+                return createChainByChildren(jsxNode, prevAtom, nativeRenderer, elementNamespace);
             }
             const nodeType = typeof jsxNode.type;
             if (nodeType === 'string') {
-                return createChainByJSXNode(ElementAtomType, jsxNode, jsxNode.type, prevAtom, elementNamespace || ElementNamespaceMap[jsxNode.type], jsxNode.key);
+                return createChainByJSXNode(ElementAtomType, jsxNode, jsxNode.type, prevAtom, nativeRenderer.getNameSpace(jsxNode.type, elementNamespace), jsxNode.key);
             }
             else if (nodeType === 'function') {
                 return createChainByJSXNode(ComponentAtomType, jsxNode, jsxNode.type, prevAtom, elementNamespace, jsxNode.key);
@@ -2051,17 +2089,17 @@ function createChainByNode(jsxNode, prevAtom, elementNamespace) {
     }
     return prevAtom;
 }
-function createChainByChildren(children, prevAtom, elementNamespace) {
+function createChainByChildren(children, prevAtom, nativeRenderer, elementNamespace) {
     const len = children.length;
     for (let i = 0; i < len; i++) {
         const item = children[i];
-        prevAtom = createChainByNode(item, prevAtom, elementNamespace);
+        prevAtom = createChainByNode(item, prevAtom, nativeRenderer, elementNamespace);
     }
     return prevAtom;
 }
-function createChildChain(template, namespace) {
+function createChildChain(template, nativeRenderer, namespace) {
     const beforeAtom = { sibling: null, index: -1 };
-    createChainByNode(template, beforeAtom, namespace);
+    createChainByNode(template, beforeAtom, nativeRenderer, namespace);
     return beforeAtom.sibling;
 }
 function insertNode(nativeRenderer, atom, context) {
@@ -2077,11 +2115,9 @@ function insertNode(nativeRenderer, atom, context) {
         nativeRenderer.insertAfter(atom.nativeNode, context.host, atom.namespace);
     }
 }
-function createElementChildren(type, children, namespace) {
-    if (type === 'foreignObject' && namespace === ElementNamespaceMap.svg) {
-        return createChildChain(children, void 0);
-    }
-    return createChildChain(children, namespace);
+function createElementChildren(type, children, nativeRenderer, namespace) {
+    const ns = nativeRenderer.getNameSpace(type, namespace);
+    return createChildChain(children, nativeRenderer, ns);
 }
 function createElement(nativeRenderer, atom, parentComponent, context) {
     const { namespace, jsxNode } = atom;
@@ -2090,7 +2126,7 @@ function createElement(nativeRenderer, atom, parentComponent, context) {
     let bindingRefs;
     for (const key in props) {
         if (key === 'children') {
-            atom.child = createElementChildren(jsxNode.type, props.children, namespace);
+            atom.child = createElementChildren(jsxNode.type, props.children, nativeRenderer, namespace);
             continue;
         }
         if (key === 'class') {
@@ -2181,7 +2217,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     }, (key, value) => {
         if (key === 'children') {
             updatedChildren = true;
-            newAtom.child = createElementChildren(newVNode.type, value, isSvg);
+            newAtom.child = createElementChildren(newVNode.type, value, nativeRenderer, isSvg);
             buildElementChildren(newAtom, nativeRenderer, parentComponent, context);
             return;
         }
@@ -2210,7 +2246,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     }, (key, newValue, oldValue) => {
         if (key === 'children') {
             updatedChildren = true;
-            newAtom.child = createElementChildren(newVNode.type, newValue, isSvg);
+            newAtom.child = createElementChildren(newVNode.type, newValue, nativeRenderer, isSvg);
             if (!newAtom.child) {
                 cleanElementChildren(oldAtom, nativeRenderer);
             }
@@ -2471,34 +2507,6 @@ function shallowReactive(raw) {
     return proxy;
 }
 
-function watch(trigger, callback) {
-    let prevFn;
-    const dep = new Dep(() => {
-        pushDepContext(dep);
-        const newValue = trigger();
-        popDepContext();
-        if (newValue === oldValue) {
-            return;
-        }
-        if (prevFn) {
-            prevFn();
-        }
-        prevFn = callback(newValue, oldValue);
-        oldValue = newValue;
-    });
-    pushDepContext(dep);
-    let oldValue = trigger();
-    popDepContext();
-    dep.destroyCallbacks.push(() => {
-        prevFn === null || prevFn === void 0 ? void 0 : prevFn();
-    });
-    function unWatch() {
-        dep.destroy();
-    }
-    registryComponentDestroyCallback(unWatch);
-    return unWatch;
-}
-
 /**
  * 组件状态管理器
  * @param state 初始状态
@@ -2618,4 +2626,4 @@ function createEffect(deps, callback) {
     return unWatch;
 }
 
-export { ArrayReactiveHandler, Component, Dep, DynamicRef, ElementNamespaceMap, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXNodeFactory, MapReactiveHandler, NativeRenderer, NullInjector, ObjectReactiveHandler, Optional, Prop, ReflectiveInjector, RootComponent, Scope, Self, SetReactiveHandler, SkipSelf, StaticRef, THROW_IF_NOT_FOUND, TrackOpTypes, TriggerOpTypes, Type, comparePropsWithCallbacks, computed, createContext, createDerived, createDynamicRef, createEffect, createRef, createRenderer, createSignal, defaultArrayReactiveHandler, defaultMapReactiveHandler, defaultObjectReactiveHandler, defaultSetReactiveHandler, defaultShallowArrayReactiveHandler, defaultShallowMapReactiveHandler, defaultShallowObjectReactiveHandler, defaultShallowSetReactiveHandler, forwardRef, getCurrentInstance, getDepContext, getSetupContext, inject, internalWrite, isReactive, jsx, jsxs, makeError, normalizeProvider, onMounted, onUnmounted, onUpdated, popDepContext, proxyToRawCache, pushDepContext, rawToProxyCache, reactive, readonlyProxyHandler, registryComponentDestroyCallback, shallowReactive, toRaw, track, trigger, viewfly, watch, withAnnotation, withMemo };
+export { ArrayReactiveHandler, Component, Dep, DynamicRef, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXNodeFactory, MapReactiveHandler, NativeRenderer, NullInjector, ObjectReactiveHandler, Optional, Prop, ReflectiveInjector, RootComponent, Scope, Self, SetReactiveHandler, SkipSelf, StaticRef, THROW_IF_NOT_FOUND, TrackOpTypes, TriggerOpTypes, Type, comparePropsWithCallbacks, computed, createContext, createContextProvider, createDerived, createDynamicRef, createEffect, createRef, createRenderer, createSignal, defaultArrayReactiveHandler, defaultMapReactiveHandler, defaultObjectReactiveHandler, defaultSetReactiveHandler, defaultShallowArrayReactiveHandler, defaultShallowMapReactiveHandler, defaultShallowObjectReactiveHandler, defaultShallowSetReactiveHandler, forwardRef, getCurrentInstance, getDepContext, getSetupContext, inject, internalWrite, isReactive, jsx, jsxs, makeError, normalizeProvider, onMounted, onUnmounted, onUpdated, popDepContext, proxyToRawCache, pushDepContext, rawToProxyCache, reactive, readonlyProxyHandler, registryComponentDestroyCallback, shallowReactive, toRaw, track, trigger, viewfly, watch, withAnnotation, withMemo };

package/bundles/index.js

@@ -1169,12 +1169,13 @@ class ObjectReactiveHandler {
         if (this.isReadonly && !fromInternalWrite) {
             throw reactiveErrorFn('Object is readonly!');
         }
-        newValue = toRaw(newValue);
+        const rawValue = toRaw(newValue);
         const oldValue = target[p];
-        if (oldValue === newValue) {
-            return Reflect.set(target, p, newValue, receiver);
+        const v = this.isShallow ? newValue : rawValue;
+        if (oldValue === rawValue) {
+            return Reflect.set(target, p, v, receiver);
         }
-        const b = Reflect.set(target, p, newValue, receiver);
+        const b = Reflect.set(target, p, v, receiver);
         fromInternalWrite = false;
         if (hasOwn(target, p)) {
             trigger(target, exports.TriggerOpTypes.Set, p);
@@ -1636,6 +1637,53 @@ function registryComponentDestroyCallback(fn) {
     }
 }
 
+function Fragment(props) {
+    return () => {
+        return props.children;
+    };
+}
+function jsx(type, props, key) {
+    return JSXNodeFactory.createNode(type, props, key);
+}
+const jsxs = jsx;
+const JSXNodeFactory = {
+    createNode(type, props, key) {
+        return {
+            type,
+            props,
+            key
+        };
+    }
+};
+
+function watch(trigger, callback) {
+    let prevFn;
+    const dep = new Dep(() => {
+        pushDepContext(dep);
+        const newValue = trigger();
+        popDepContext();
+        if (newValue === oldValue) {
+            return;
+        }
+        if (prevFn) {
+            prevFn();
+        }
+        prevFn = callback(newValue, oldValue);
+        oldValue = newValue;
+    });
+    pushDepContext(dep);
+    let oldValue = trigger();
+    popDepContext();
+    dep.destroyCallbacks.push(() => {
+        prevFn === null || prevFn === void 0 ? void 0 : prevFn();
+    });
+    function unWatch() {
+        dep.destroy();
+    }
+    registryComponentDestroyCallback(unWatch);
+    return unWatch;
+}
+
 const injectMap = new WeakMap();
 function getInjector(start) {
     while (start) {
@@ -1657,6 +1705,19 @@ function createContext(providers, scope, parentInjector) {
         };
     };
 }
+function createContextProvider(params) {
+    return function contextProvider(props) {
+        let Context = createContext([Object.assign({ provide: params.provide }, props)]);
+        watch(() => {
+            return props.useClass || props.useFactory || props.useValue || props.useExisting;
+        }, () => {
+            Context = createContext([Object.assign({ provide: params.provide }, props)]);
+        });
+        return () => {
+            return jsx(Context, { children: props.children });
+        };
+    };
+}
 /**
  * 通过组件上下文获取 IoC 容器内数据的勾子方法
  */
@@ -1702,25 +1763,6 @@ function withAnnotation(annotation, componentSetup) {
 class NativeRenderer {
 }
 
-function Fragment(props) {
-    return () => {
-        return props.children;
-    };
-}
-function jsx(type, props, key) {
-    return JSXNodeFactory.createNode(type, props, key);
-}
-const jsxs = jsx;
-const JSXNodeFactory = {
-    createNode(type, props, key) {
-        return {
-            type,
-            props,
-            key
-        };
-    }
-};
-
 function withMemo(canUseMemo, render) {
     return {
         $useMemo: canUseMemo,
@@ -1728,10 +1770,6 @@ function withMemo(canUseMemo, render) {
     };
 }
 
-const ElementNamespaceMap = {
-    svg: 'svg',
-    math: 'mathml',
-};
 const listenerReg = /^on[A-Z]/;
 function createRenderer(component, nativeRenderer, namespace) {
     let isInit = true;
@@ -1782,7 +1820,7 @@ function buildElementChildren(atom, nativeRenderer, parentComponent, context) {
 }
 function patchComponent(nativeRenderer, component, oldChildAtom, newAtom, context, needMove) {
     const newTemplate = component.rerender();
-    newAtom.child = createChildChain(newTemplate, newAtom.namespace);
+    newAtom.child = createChildChain(newTemplate, nativeRenderer, newAtom.namespace);
     diff(nativeRenderer, component, newAtom.child, oldChildAtom, context, needMove);
 }
 function deepUpdateByComponentDirtyTree(nativeRenderer, component, needMove) {
@@ -2005,7 +2043,7 @@ function cleanChildren(atom, nativeRenderer, needClean) {
 }
 function componentRender(nativeRenderer, component, from, context) {
     component.render((template, portalHost) => {
-        from.child = createChildChain(template, from.namespace);
+        from.child = createChildChain(template, nativeRenderer, from.namespace);
         context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
         component.viewMetadata = Object.assign({ atom: from }, context);
         let child = from.child;
@@ -2030,7 +2068,7 @@ function createChainByJSXNode(type, jsxNode, nodeType, prevAtom, namespace, key)
     prevAtom.sibling = atom;
     return atom;
 }
-function createChainByNode(jsxNode, prevAtom, elementNamespace) {
+function createChainByNode(jsxNode, prevAtom, nativeRenderer, elementNamespace) {
     const type = typeof jsxNode;
     if (jsxNode != null && type !== 'boolean') {
         if (type === 'string') {
@@ -2038,11 +2076,11 @@ function createChainByNode(jsxNode, prevAtom, elementNamespace) {
         }
         if (type === 'object') {
             if (Array.isArray(jsxNode)) {
-                return createChainByChildren(jsxNode, prevAtom, elementNamespace);
+                return createChainByChildren(jsxNode, prevAtom, nativeRenderer, elementNamespace);
             }
             const nodeType = typeof jsxNode.type;
             if (nodeType === 'string') {
-                return createChainByJSXNode(ElementAtomType, jsxNode, jsxNode.type, prevAtom, elementNamespace || ElementNamespaceMap[jsxNode.type], jsxNode.key);
+                return createChainByJSXNode(ElementAtomType, jsxNode, jsxNode.type, prevAtom, nativeRenderer.getNameSpace(jsxNode.type, elementNamespace), jsxNode.key);
             }
             else if (nodeType === 'function') {
                 return createChainByJSXNode(ComponentAtomType, jsxNode, jsxNode.type, prevAtom, elementNamespace, jsxNode.key);
@@ -2053,17 +2091,17 @@ function createChainByNode(jsxNode, prevAtom, elementNamespace) {
     }
     return prevAtom;
 }
-function createChainByChildren(children, prevAtom, elementNamespace) {
+function createChainByChildren(children, prevAtom, nativeRenderer, elementNamespace) {
     const len = children.length;
     for (let i = 0; i < len; i++) {
         const item = children[i];
-        prevAtom = createChainByNode(item, prevAtom, elementNamespace);
+        prevAtom = createChainByNode(item, prevAtom, nativeRenderer, elementNamespace);
     }
     return prevAtom;
 }
-function createChildChain(template, namespace) {
+function createChildChain(template, nativeRenderer, namespace) {
     const beforeAtom = { sibling: null, index: -1 };
-    createChainByNode(template, beforeAtom, namespace);
+    createChainByNode(template, beforeAtom, nativeRenderer, namespace);
     return beforeAtom.sibling;
 }
 function insertNode(nativeRenderer, atom, context) {
@@ -2079,11 +2117,9 @@ function insertNode(nativeRenderer, atom, context) {
         nativeRenderer.insertAfter(atom.nativeNode, context.host, atom.namespace);
     }
 }
-function createElementChildren(type, children, namespace) {
-    if (type === 'foreignObject' && namespace === ElementNamespaceMap.svg) {
-        return createChildChain(children, void 0);
-    }
-    return createChildChain(children, namespace);
+function createElementChildren(type, children, nativeRenderer, namespace) {
+    const ns = nativeRenderer.getNameSpace(type, namespace);
+    return createChildChain(children, nativeRenderer, ns);
 }
 function createElement(nativeRenderer, atom, parentComponent, context) {
     const { namespace, jsxNode } = atom;
@@ -2092,7 +2128,7 @@ function createElement(nativeRenderer, atom, parentComponent, context) {
     let bindingRefs;
     for (const key in props) {
         if (key === 'children') {
-            atom.child = createElementChildren(jsxNode.type, props.children, namespace);
+            atom.child = createElementChildren(jsxNode.type, props.children, nativeRenderer, namespace);
             continue;
         }
         if (key === 'class') {
@@ -2183,7 +2219,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     }, (key, value) => {
         if (key === 'children') {
             updatedChildren = true;
-            newAtom.child = createElementChildren(newVNode.type, value, isSvg);
+            newAtom.child = createElementChildren(newVNode.type, value, nativeRenderer, isSvg);
             buildElementChildren(newAtom, nativeRenderer, parentComponent, context);
             return;
         }
@@ -2212,7 +2248,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     }, (key, newValue, oldValue) => {
         if (key === 'children') {
             updatedChildren = true;
-            newAtom.child = createElementChildren(newVNode.type, newValue, isSvg);
+            newAtom.child = createElementChildren(newVNode.type, newValue, nativeRenderer, isSvg);
             if (!newAtom.child) {
                 cleanElementChildren(oldAtom, nativeRenderer);
             }
@@ -2473,34 +2509,6 @@ function shallowReactive(raw) {
     return proxy;
 }
 
-function watch(trigger, callback) {
-    let prevFn;
-    const dep = new Dep(() => {
-        pushDepContext(dep);
-        const newValue = trigger();
-        popDepContext();
-        if (newValue === oldValue) {
-            return;
-        }
-        if (prevFn) {
-            prevFn();
-        }
-        prevFn = callback(newValue, oldValue);
-        oldValue = newValue;
-    });
-    pushDepContext(dep);
-    let oldValue = trigger();
-    popDepContext();
-    dep.destroyCallbacks.push(() => {
-        prevFn === null || prevFn === void 0 ? void 0 : prevFn();
-    });
-    function unWatch() {
-        dep.destroy();
-    }
-    registryComponentDestroyCallback(unWatch);
-    return unWatch;
-}
-
 /**
  * 组件状态管理器
  * @param state 初始状态
@@ -2624,7 +2632,6 @@ exports.ArrayReactiveHandler = ArrayReactiveHandler;
 exports.Component = Component;
 exports.Dep = Dep;
 exports.DynamicRef = DynamicRef;
-exports.ElementNamespaceMap = ElementNamespaceMap;
 exports.ForwardRef = ForwardRef;
 exports.Fragment = Fragment;
 exports.Inject = Inject;
@@ -2650,6 +2657,7 @@ exports.Type = Type;
 exports.comparePropsWithCallbacks = comparePropsWithCallbacks;
 exports.computed = computed;
 exports.createContext = createContext;
+exports.createContextProvider = createContextProvider;
 exports.createDerived = createDerived;
 exports.createDynamicRef = createDynamicRef;
 exports.createEffect = createEffect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.7",
   "description": "Viewfly is a simple and easy-to-use JavaScript framework with an intuitive development experience.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -50,7 +50,7 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "4033e6f38e517c754bea8786459eba0e0f2197d9",
+  "gitHead": "b66ca589f7662cd518fc2e5955b3e3ff9de83f94",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }