@viewfly/core 1.0.4 → 1.1.0

package/bundles/index.d.ts

@@ -198,7 +198,7 @@ declare function Fragment(props: Props): () => JSXNode | JSXNode[];
 interface ContextProps extends Props {
     providers: Provider[];
 }
-declare function Context(props: ContextProps): () => JSXNode | JSXNode[];
+declare function Context(props: ContextProps): () => ViewFlyNode<string | ComponentSetup<any>>;
 type Key = number | string;
 declare function jsx(type: string | ComponentSetup, props: Props & Record<string, any>, key?: Key): ViewFlyNode;
 declare const jsxs: typeof jsx;
@@ -211,23 +211,68 @@ declare const JSXNodeFactory: {
     createNode<T = string | ComponentSetup<any>>(type: T, props: Props & Record<string, any>, key?: Key): ViewFlyNode<T>;
 };
 
+declare const TextAtomType: unique symbol;
+declare const ElementAtomType: unique symbol;
+declare const ComponentAtomType: unique symbol;
+type ElementNamespace = string | undefined;
+interface TextAtom {
+    type: typeof TextAtomType;
+    index: number;
+    jsxNode: string;
+    nodeType: string;
+    key?: null;
+    nativeNode: NativeNode | null;
+    child: Atom | null;
+    sibling: Atom | null;
+    namespace: ElementNamespace;
+}
+interface ElementAtom {
+    type: typeof ElementAtomType;
+    index: number;
+    nodeType: string;
+    key?: Key;
+    jsxNode: ViewFlyNode<string>;
+    nativeNode: NativeNode | null;
+    child: Atom | null;
+    sibling: Atom | null;
+    namespace: ElementNamespace;
+}
+interface ComponentAtom {
+    type: typeof ComponentAtomType;
+    index: number;
+    nodeType: ComponentSetup;
+    key?: Key;
+    jsxNode: ViewFlyNode<ComponentSetup> | Component;
+    nativeNode: NativeNode | null;
+    child: Atom | null;
+    sibling: Atom | null;
+    namespace: ElementNamespace;
+}
+type Atom = TextAtom | ElementAtom | ComponentAtom;
+interface ComponentView {
+    atom: ComponentAtom;
+    host: NativeNode;
+    isParent: boolean;
+    rootHost: NativeNode;
+}
+
 type NativeNode = Record<string, any>;
 declare abstract class NativeRenderer<ElementNode = NativeNode, TextNode = NativeNode> {
-    abstract createElement(name: string, isSvg: boolean): ElementNode;
-    abstract createTextNode(textContent: string, isSvg: boolean): TextNode;
-    abstract setProperty(node: ElementNode, key: string, value: any, isSvg: boolean): void;
-    abstract appendChild(parent: ElementNode, newChild: ElementNode | TextNode, isSvg: boolean): void;
-    abstract prependChild(parent: ElementNode, newChild: ElementNode | TextNode, isSvg: boolean): void;
-    abstract removeProperty(node: ElementNode, key: string, isSvg: boolean): void;
-    abstract setStyle(target: ElementNode, key: string, value: any, isSvg: boolean): void;
-    abstract removeStyle(target: ElementNode, key: string, isSvg: boolean): void;
-    abstract setClass(target: ElementNode, value: string, isSvg: boolean): void;
-    abstract listen<T = any>(node: ElementNode, type: string, callback: (ev: T) => any, isSvg: boolean): void;
-    abstract unListen(node: ElementNode, type: string, callback: (ev: any) => any, isSvg: boolean): void;
-    abstract remove(node: ElementNode | TextNode, isSvg: boolean): void;
-    abstract cleanChildren(node: ElementNode, isSvg: boolean): void;
-    abstract syncTextContent(target: TextNode, content: string, isSvg: boolean): void;
-    abstract insertAfter(newNode: ElementNode | TextNode, ref: ElementNode | TextNode, isSvg: boolean): void;
+    abstract createElement(name: string, namespace: ElementNamespace): ElementNode;
+    abstract createTextNode(textContent: string, namespace: ElementNamespace): TextNode;
+    abstract setProperty(node: ElementNode, key: string, value: any, namespace: ElementNamespace): void;
+    abstract appendChild(parent: ElementNode, newChild: ElementNode | TextNode, namespace: ElementNamespace): void;
+    abstract prependChild(parent: ElementNode, newChild: ElementNode | TextNode, namespace: ElementNamespace): void;
+    abstract removeProperty(node: ElementNode, key: string, namespace: ElementNamespace): void;
+    abstract setStyle(target: ElementNode, key: string, value: any, namespace: ElementNamespace): void;
+    abstract removeStyle(target: ElementNode, key: string, namespace: ElementNamespace): void;
+    abstract setClass(target: ElementNode, value: string, namespace: ElementNamespace): void;
+    abstract listen<T = any>(node: ElementNode, type: string, callback: (ev: T) => any, namespace: ElementNamespace): void;
+    abstract unListen(node: ElementNode, type: string, callback: (ev: any) => any, namespace: ElementNamespace): void;
+    abstract remove(node: ElementNode | TextNode, namespace: ElementNamespace): void;
+    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;
 }
 
 declare namespace JSX {
@@ -260,6 +305,7 @@ declare namespace JSX {
     }
 }
 
+declare function getSetupContext(need?: boolean): Component;
 type ClassNames = string | Record<string, unknown> | false | null | undefined | ClassNames[];
 interface ComponentInstance<P> {
     $portalHost?: NativeNode;
@@ -295,9 +341,9 @@ declare class Component extends ReflectiveInjector {
     private propsChangedDestroyCallbacks?;
     protected _dirty: boolean;
     protected _changed: boolean;
-    private unWatch?;
     private isFirstRendering;
     private refs;
+    private listener;
     constructor(parentComponent: Injector | null, type: ComponentSetup, props: Props, key?: Key | undefined);
     markAsDirtied(): void;
     markAsChanged(changedComponent?: Component): void;
@@ -314,7 +360,7 @@ interface LifeCycleCallback {
     (): void | (() => void);
 }
 interface PropsChangedCallback<T extends Props> {
-    (currentProps: T | null, oldProps: T | null): void | (() => void);
+    (currentProps: T, oldProps: T): void | (() => void);
 }
 /**
  * 当组件第一次渲染完成时触发
@@ -412,13 +458,53 @@ declare class StaticRef<T> extends DynamicRef<T> {
     constructor();
 }
 declare function createRef<T, U = ExtractInstanceType<T>>(): StaticRef<U>;
-declare const depsKey: unique symbol;
 /**
- * 组件状态实例，直接调用可以获取最新的状态，通过 set 方法可以更新状态
+ * 给组件添加注解
+ * @param annotation
+ * @param componentSetup
+ * @example
+ * ```ts
+ * export customScope = new Scope('scopeName')
+ * export const App = withAnnotation({
+ *   scope: customScope,
+ *   providers: [
+ *     ExampleService
+ *   ]
+ * }, function(props: Props) {
+ *   return () => {
+ *     return <div>...</div>
+ *   }
+ * })
  * ```
  */
+declare function withAnnotation<T extends ComponentSetup>(annotation: ComponentAnnotation, componentSetup: T): T;
+/**
+ * 通过组件上下文获取 IoC 容器内数据的勾子方法
+ */
+declare function inject<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = never>(token: T, notFoundValue?: U, flags?: InjectFlags): ExtractValueType<T> | U;
+/**
+ * 获取当前组件实例
+ */
+declare function getCurrentInstance(): Component;
+
+declare function withMemo<T extends Props = Props>(canUseMemo: ComponentInstance<T>['$useMemo'], render: () => JSXNode): ComponentInstance<T>;
+
+declare const ElementNamespaceMap: Record<string, string>;
+declare function createRenderer(component: Component, nativeRenderer: NativeRenderer, namespace: ElementNamespace): (host: NativeNode) => void;
+
+/**
+ * Viewfly 根组件，用于实现组件状态更新事件通知
+ */
+declare class RootComponent extends Component {
+    private refresh;
+    constructor(parentInjector: Injector | null, factory: ComponentSetup, refresh: () => void);
+    markAsChanged(changedComponent?: Component): void;
+}
+
+/**
+ * 组件状态实例，直接调用可以获取最新的状态，通过 set 方法可以更新状态
+ */
 interface Signal<T> {
-    $isSignal: true;
     /**
      *  直接调用一个 Signal 实例，可以获取最新状态
      */
@@ -428,7 +514,6 @@ interface Signal<T> {
      * @param newState
      */
     set(newState: T): void;
-    [depsKey]: Set<LifeCycleCallback>;
 }
 /**
  * 组件状态管理器
@@ -456,14 +541,15 @@ interface Signal<T> {
 declare function createSignal<T>(state: T): Signal<T>;
 /**
  * 使用派生值，Viewfly 会收集回调函数内同步执行时访问的 Signal，
- * 并在你获取 useDerived 函数返回的 Signal 的值时，自动计算最新的值。
+ * 并在你获取 createDerived 函数返回的 Signal 的值时，自动计算最新的值。
  *
- * @param callback
+ * @param fn
  * @param isContinue 可选的停止函数，在每次值更新后调用，当返回值为 false 时，将不再监听依赖的变化
  */
-declare function createDerived<T>(callback: () => T, isContinue?: (data: T) => unknown): Signal<T>;
-interface WatchCallback<T, U> {
-    (newValue: T, oldValue: U): void | (() => void);
+declare function computed<T>(fn: () => T, isContinue?: (data: T) => unknown): Signal<T>;
+declare const createDerived: typeof computed;
+interface WatchCallback<T> {
+    (newValue: T, oldValue: T): void | (() => void);
 }
 /**
  * 监听状态变化，当任意一个状态发生变更时，触发回调。
@@ -472,102 +558,17 @@ interface WatchCallback<T, U> {
  * @param deps 依赖的状态 Signal，可以是一个 Signal，只可以一个数包含 Signal 的数组，或者是一个求值函数
  * @param callback 状态变更后的回调函数
  */
-declare function watch<T>(deps: Signal<T>, callback: WatchCallback<T, T>): () => void;
-declare function watch<T>(deps: [Signal<T>], callback: WatchCallback<[T], [T]>): () => void;
-declare function watch<T, T1>(deps: [Signal<T>, Signal<T1>], callback: WatchCallback<[T, T1], [T, T1]>): () => void;
-declare function watch<T, T1, T2>(deps: [Signal<T>, Signal<T1>, Signal<T2>], callback: WatchCallback<[T, T1, T2], [T, T1, T2]>): () => void;
-declare function watch<T, T1, T2, T3>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>], callback: WatchCallback<[T, T1, T2, T3], [T, T1, T2, T3]>): () => void;
-declare function watch<T, T1, T2, T3, T4>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>, Signal<T4>], callback: WatchCallback<[T, T1, T2, T3, T4], [T, T1, T2, T3, T4]>): () => void;
-declare function watch<T, T1, T2, T3, T4, T5>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>, Signal<T4>, Signal<T5>], callback: WatchCallback<[T, T1, T2, T3, T4, T5], [T, T1, T2, T3, T4, T5]>): () => void;
-declare function watch<T, T1, T2, T3, T4, T5, T6>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>, Signal<T4>, Signal<T5>, Signal<T6>], callback: WatchCallback<[T, T1, T2, T3, T4, T5, T6], [T, T1, T2, T3, T4, T5, T6]>): () => void;
-declare function watch<T, T1, T2, T3, T4, T5, T6, T7>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>, Signal<T4>, Signal<T5>, Signal<T6>, Signal<T7>], callback: WatchCallback<[T, T1, T2, T3, T4, T5, T6, T7], [T, T1, T2, T3, T4, T5, T6, T7]>): () => void;
-declare function watch<T>(deps: () => T, callback: WatchCallback<T, T>): () => void;
-declare function watch<T = any>(deps: Signal<any>[], callback: WatchCallback<T[], T[]>): () => void;
-/**
- * 给组件添加注解
- * @param annotation
- * @param componentSetup
- * @example
- * ```ts
- * export customScope = new Scope('scopeName')
- * export const App = withAnnotation({
- *   scope: customScope,
- *   providers: [
- *     ExampleService
- *   ]
- * }, function(props: Props) {
- *   return () => {
- *     return <div>...</div>
- *   }
- * })
- * ```
- */
-declare function withAnnotation<T extends ComponentSetup>(annotation: ComponentAnnotation, componentSetup: T): T;
-/**
- * 通过组件上下文获取 IoC 容器内数据的勾子方法
- */
-declare function inject<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = never>(token: T, notFoundValue?: U, flags?: InjectFlags): ExtractValueType<T> | U;
-/**
- * 获取当前组件实例
- */
-declare function getCurrentInstance(): Component;
-
-declare function withMemo<T extends Props = Props>(canUseMemo: ComponentInstance<T>['$useMemo'], render: () => JSXNode): ComponentInstance<T>;
-
-declare function createRenderer(component: Component, nativeRenderer: NativeRenderer): (host: NativeNode) => void;
-
-/**
- * Viewfly 根组件，用于实现组件状态更新事件通知
- */
-declare class RootComponent extends Component {
-    private refresh;
-    constructor(parentInjector: Injector | null, factory: ComponentSetup, refresh: () => void);
-    markAsChanged(changedComponent?: Component): void;
-}
-
-declare const TextAtomType: unique symbol;
-declare const ElementAtomType: unique symbol;
-declare const ComponentAtomType: unique symbol;
-interface TextAtom {
-    type: typeof TextAtomType;
-    index: number;
-    jsxNode: string;
-    nodeType: string;
-    key?: null;
-    nativeNode: NativeNode | null;
-    child: Atom | null;
-    sibling: Atom | null;
-    isSvg: boolean;
-}
-interface ElementAtom {
-    type: typeof ElementAtomType;
-    index: number;
-    nodeType: string;
-    key?: Key;
-    jsxNode: ViewFlyNode<string>;
-    nativeNode: NativeNode | null;
-    child: Atom | null;
-    sibling: Atom | null;
-    isSvg: boolean;
-}
-interface ComponentAtom {
-    type: typeof ComponentAtomType;
-    index: number;
-    nodeType: ComponentSetup;
-    key?: Key;
-    jsxNode: ViewFlyNode<ComponentSetup> | Component;
-    nativeNode: NativeNode | null;
-    child: Atom | null;
-    sibling: Atom | null;
-    isSvg: boolean;
-}
-type Atom = TextAtom | ElementAtom | ComponentAtom;
-interface ComponentView {
-    atom: ComponentAtom;
-    host: NativeNode;
-    isParent: boolean;
-    rootHost: NativeNode;
-}
+declare function watch<T>(deps: Signal<T>, callback: WatchCallback<T>): () => void;
+declare function watch<T>(deps: [Signal<T>], callback: WatchCallback<[T]>): () => void;
+declare function watch<T, T1>(deps: [Signal<T>, Signal<T1>], callback: WatchCallback<[T, T1]>): () => void;
+declare function watch<T, T1, T2>(deps: [Signal<T>, Signal<T1>, Signal<T2>], callback: WatchCallback<[T, T1, T2]>): () => void;
+declare function watch<T, T1, T2, T3>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>], callback: WatchCallback<[T, T1, T2, T3]>): () => void;
+declare function watch<T, T1, T2, T3, T4>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>, Signal<T4>], callback: WatchCallback<[T, T1, T2, T3, T4]>): () => void;
+declare function watch<T, T1, T2, T3, T4, T5>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>, Signal<T4>, Signal<T5>], callback: WatchCallback<[T, T1, T2, T3, T4, T5]>): () => void;
+declare function watch<T, T1, T2, T3, T4, T5, T6>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>, Signal<T4>, Signal<T5>, Signal<T6>], callback: WatchCallback<[T, T1, T2, T3, T4, T5, T6]>): () => void;
+declare function watch<T, T1, T2, T3, T4, T5, T6, T7>(deps: [Signal<T>, Signal<T1>, Signal<T2>, Signal<T3>, Signal<T4>, Signal<T5>, Signal<T6>, Signal<T7>], callback: WatchCallback<[T, T1, T2, T3, T4, T5, T6, T7]>): () => void;
+declare function watch<T>(deps: () => T, callback: WatchCallback<T>): () => void;
+declare function watch<T = any>(deps: Signal<any>[], callback: WatchCallback<T[]>): () => void;
 
 /**
  * Viewfly 配置项
@@ -581,6 +582,8 @@ interface Config {
     context?: Injector;
     /** 是否自动更新视图 */
     autoUpdate?: boolean;
+    /** 根节点命名空间 */
+    elementNamespace?: ElementNamespace;
 }
 interface Application<T extends NativeNode = NativeNode> {
     provide(providers: Provider | Provider[]): Application<T>;
@@ -596,4 +599,4 @@ interface Module {
 }
 declare function viewfly<T extends NativeNode>(config: Config): Application<T>;
 
-export { type AbstractInstanceType, type AbstractProvider, type AbstractType, type Application, type Atom, type ClassNames, type ClassProvider, Component, type ComponentAnnotation, type ComponentInstance, type ComponentSetup, type ComponentView, type Config, type ConstructorProvider, Context, type ContextProps, DynamicRef, 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, type Module, type NativeNode, NativeRenderer, type NormalizedProvider, NullInjector, Optional, type OptionalDecorator, Prop, type PropDecorator, type Props, type PropsChangedCallback, type ProvideScope, type Provider, type RefListener, type ReflectiveDependency, ReflectiveInjector, RootComponent, Scope, Self, type SelfDecorator, type Signal, SkipSelf, type SkipSelfDecorator, type StaticProvider, StaticRef, THROW_IF_NOT_FOUND, Type, type TypeProvider, type ValueProvider, type ViewFlyNode, type WatchCallback, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };
+export { type AbstractInstanceType, type AbstractProvider, type AbstractType, type Application, type Atom, type ClassNames, type ClassProvider, Component, type ComponentAnnotation, type ComponentInstance, type ComponentSetup, type ComponentView, type Config, type ConstructorProvider, Context, type ContextProps, DynamicRef, 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, type Module, type NativeNode, NativeRenderer, type NormalizedProvider, NullInjector, Optional, type OptionalDecorator, Prop, type PropDecorator, type Props, type PropsChangedCallback, type ProvideScope, type Provider, type RefListener, type ReflectiveDependency, ReflectiveInjector, RootComponent, Scope, Self, type SelfDecorator, type Signal, SkipSelf, type SkipSelfDecorator, type StaticProvider, StaticRef, THROW_IF_NOT_FOUND, Type, type TypeProvider, type ValueProvider, type ViewFlyNode, type WatchCallback, computed, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, getSetupContext, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };