@viewfly/core 0.0.27 → 0.0.29

package/bundles/foundation/_api.d.ts

@@ -1,7 +1,7 @@
 export * from './component';
+export * from './injection-tokens';
 export * from './jsx-element';
 export * from './memo';
+export * from './renderer';
 export * from './root.component';
 export * from './types';
-export * from './injection-tokens';
-export * from './renderer';

package/bundles/foundation/_utils.d.ts

@@ -1,6 +1,4 @@
-import { Component } from './component';
-import { JSXElement, JSXText, Props } from './jsx-element';
-import { JSXInternal } from './types';
+import { JSXComponent, JSXElement, JSXText } from './jsx-element';
 import { NativeNode } from './injection-tokens';
 export interface ListenDelegate {
     delegate: () => any;
@@ -16,7 +14,7 @@ export declare function getObjectChanges(newProps: Record<string, any>, oldProps
 export declare function classToString(config: unknown): string;
 export declare function styleToObject(style: string | Record<string, any>): Record<string, any>;
 export interface Atom {
-    jsxNode: JSXElement | JSXText | Component;
+    jsxNode: JSXElement | JSXText | JSXComponent;
     parent: Atom | null;
     nativeNode: NativeNode | null;
     child: Atom | null;
@@ -24,8 +22,6 @@ export interface Atom {
 }
 export interface ComponentView {
     atom: Atom;
-    template: JSXInternal.JSXNode;
     host: NativeNode;
     isParent: boolean;
-    render(newProps: Props, oldProps: Props): JSXInternal.JSXNode;
 }

package/bundles/foundation/component.d.ts

@@ -1,45 +1,28 @@
 import { AbstractType, InjectFlags, InjectionToken, Injector, Provider, ReflectiveInjector, Type } from '../di/_api';
-import { JSXTypeof, Key, Props } from './jsx-element';
-import { ComponentView } from './_utils';
+import { JSXComponent, Key, Props } from './jsx-element';
 import { JSXInternal } from './types';
-export declare class JSXComponent {
-    props: Props;
-    private factory;
-    constructor(props: Props, factory: (injector: Component, props: Props) => Component);
-    createInstance(injector: Component): Component;
-}
 /**
  * Viewfly 组件管理类，用于管理组件的生命周期，上下文等
  */
-export declare class Component extends ReflectiveInjector implements JSXTypeof {
-    type: JSXInternal.ComponentConstructor;
+export declare class Component extends ReflectiveInjector {
+    jsxNode: JSXComponent;
     props: Props;
     key?: Key | undefined;
-    $$typeOf: JSXInternal.ComponentConstructor<any>;
-    $$view: ComponentView;
     destroyCallbacks: LifeCycleCallback[];
     mountCallbacks: LifeCycleCallback[];
     propsChangedCallbacks: PropsChangedCallback<any>[];
     updatedCallbacks: LifeCycleCallback[];
-    changedSubComponents: Set<Component>;
-    get dirty(): boolean;
-    get changed(): boolean;
-    protected _dirty: boolean;
-    protected _changed: boolean;
-    private parentComponent;
+    instance: JSXInternal.ComponentInstance<Props>;
+    template: JSXInternal.JSXNode;
     private updatedDestroyCallbacks;
     private propsChangedDestroyCallbacks;
     private unWatch?;
     private isFirstRending;
-    constructor(context: Injector, type: JSXInternal.ComponentConstructor, props: Props, key?: Key | undefined);
-    is(target: JSXTypeof): boolean;
+    private refs;
+    constructor(context: Injector, jsxNode: JSXComponent, props: Props, key?: Key | undefined);
+    render(): any;
+    update(newProps: Props, forceUpdate?: boolean): any;
     provide<T>(providers: Provider<T> | Provider<T>[]): void;
-    setup(): {
-        template: any;
-        render: (newProps: Props, oldProps: Props) => any;
-    };
-    markAsDirtied(): void;
-    markAsChanged(changedComponent?: Component): void;
     rendered(): void;
     destroy(): void;
     private invokePropsChangedHooks;

package/bundles/foundation/jsx-element.d.ts

@@ -1,6 +1,6 @@
-import { JSXComponent } from './component';
+import { Component } from './component';
 import { JSXInternal } from './types';
-import { ListenDelegate } from './_utils';
+import { ComponentView, ListenDelegate } from './_utils';
 export interface Props {
     children?: JSXInternal.JSXNode | JSXInternal.JSXNode[];
     [key: string]: any;
@@ -9,10 +9,10 @@ export interface Props {
 export declare function Fragment(props: Props): () => any;
 export type Key = number | string;
 export declare function jsx(name: string, props: Props, key?: Key): JSXElement;
-export declare function jsx(setup: JSXInternal.ComponentConstructor, props: Props, key?: Key): JSXComponent;
+export declare function jsx(setup: JSXInternal.ComponentSetup, props: Props, key?: Key): JSXComponent;
 export declare const jsxs: typeof jsx;
 export interface JSXTypeof {
-    $$typeOf: string | JSXInternal.ComponentConstructor;
+    $$typeOf: string | JSXInternal.ComponentSetup;
     is(target: JSXTypeof): boolean;
 }
 export declare class JSXText implements JSXTypeof {
@@ -31,3 +31,24 @@ export declare class JSXElement implements JSXTypeof {
     constructor(type: string, props: Props, key?: Key | undefined);
     is(target: JSXTypeof): boolean;
 }
+export declare class JSXComponent implements JSXTypeof {
+    type: JSXInternal.ComponentSetup;
+    readonly props: Props;
+    private factory;
+    readonly key?: Key | undefined;
+    $$typeOf: JSXInternal.ComponentSetup<any>;
+    $$view: ComponentView;
+    parentComponent: JSXComponent | null;
+    instance: Component;
+    changedSubComponents: Set<JSXComponent>;
+    get dirty(): boolean;
+    get changed(): boolean;
+    protected _dirty: boolean;
+    protected _changed: boolean;
+    constructor(type: JSXInternal.ComponentSetup, props: Props, factory: (parentComponent: Component, jsxNode: JSXComponent) => Component, key?: Key | undefined);
+    markAsDirtied(): void;
+    markAsChanged(changedComponent?: JSXComponent): void;
+    reset(): void;
+    is(target: JSXTypeof): boolean;
+    createInstance(injector: Component): Component;
+}

package/bundles/foundation/memo.d.ts

@@ -1,3 +1,3 @@
 import { Props } from './jsx-element';
 import { JSXInternal } from './types';
-export declare function withMemo<T extends Props = Props>(shouldUpdate: JSXInternal.ComponentInstance<T>['$shouldUpdate'], render: () => JSXInternal.JSXNode): JSXInternal.ComponentInstance<T>;
+export declare function withMemo<T extends Props = Props>(canUseMemo: JSXInternal.ComponentInstance<T>['$useMemo'], render: () => JSXInternal.JSXNode): JSXInternal.ComponentInstance<T>;

package/bundles/foundation/renderer.d.ts

@@ -1,3 +1,4 @@
 import { NativeNode, NativeRenderer } from './injection-tokens';
+import { JSXComponent } from './jsx-element';
 import { Component } from './component';
-export declare function createRenderer(component: Component, nativeRenderer: NativeRenderer): (host: NativeNode) => void;
+export declare function createRenderer(jsxComponent: JSXComponent, nativeRenderer: NativeRenderer, parentComponent: Component): (host: NativeNode) => void;

package/bundles/foundation/root.component.d.ts

@@ -1,11 +1,10 @@
-import { Component } from './component';
 import { JSXInternal } from './types';
-import { Injector } from '../di/_api';
+import { JSXComponent } from './jsx-element';
 /**
  * Viewfly 根组件，用于实现组件状态更新事件通知
  */
-export declare class RootComponent extends Component {
+export declare class RootComponent extends JSXComponent {
     onChange: (() => void) | null;
-    constructor(parentInjector: Injector, factory: JSXInternal.ComponentConstructor);
-    markAsChanged(changedComponent?: Component): void;
+    constructor(factory: JSXInternal.ComponentSetup, {}: {});
+    markAsChanged(changedComponent?: JSXComponent): void;
 }

package/bundles/foundation/types.d.ts

@@ -2,14 +2,14 @@ import { Key } from './jsx-element';
 import { ExtractInstanceType, Ref } from './component';
 export type JSXNode = JSXInternal.JSXNode;
 export declare namespace JSXInternal {
-    type ClassNames = string | Record<string, unknown> | ClassNames[];
+    type ClassNames = string | Record<string, unknown> | false | null | undefined | ClassNames[];
     interface ComponentInstance<P> {
         $render(): JSXNode;
-        $shouldUpdate?(currentProps: P, prevProps: P): boolean;
+        $useMemo?(currentProps: P, prevProps: P): boolean;
     }
     type JSXNode = Element | JSXInternal.ElementClass | string | number | boolean | null | undefined | JSXNode[];
-    type ComponentConstructor<P = any> = (props: P) => (() => Element) | ComponentInstance<P>;
-    type Element<P = any, C extends string | ComponentConstructor<P> = string | ComponentConstructor<P>> = C extends string ? IntrinsicElements[C] : (() => Element) | ComponentInstance<P>;
+    type ComponentSetup<P = any> = (props: P) => (() => Element) | ComponentInstance<P>;
+    type Element<P = any, C extends string | ComponentSetup<P> = string | ComponentSetup<P>> = C extends string ? IntrinsicElements[C] : (() => Element) | ComponentInstance<P>;
     interface IntrinsicAttributes {
         key?: Key;
         ref?: any;