@viewfly/core 1.1.9 → 1.2.0

package/bundles/index.d.ts

@@ -413,19 +413,14 @@ interface ComponentInstance<P> {
     $useMemo?(currentProps: P, prevProps: P): boolean;
 }
 type JSXNode = JSX.Element | JSX.ElementClass | string | number | boolean | null | undefined | Iterable<JSXNode>;
-interface ComponentAnnotation {
-    scope?: Scope;
-    providers?: Provider[];
-}
 interface ComponentSetup<P = any> {
     (props: P): (() => JSXNode) | ComponentInstance<P>;
-    annotation?: ComponentAnnotation;
 }
 /**
  * Viewfly 组件管理类，用于管理组件的生命周期，上下文等
  */
-declare class Component extends ReflectiveInjector {
-    private readonly parentComponent;
+declare class Component {
+    readonly parentComponent: Component | null;
     readonly type: ComponentSetup;
     props: Props;
     readonly key?: Key | undefined;
@@ -444,18 +439,31 @@ declare class Component extends ReflectiveInjector {
     private isFirstRendering;
     private refs;
     private listener;
-    constructor(parentComponent: Injector | null, type: ComponentSetup, props: Props, key?: Key | undefined);
+    constructor(parentComponent: Component | null, type: ComponentSetup, props: Props, key?: Key | undefined);
     markAsDirtied(): void;
     markAsChanged(changedComponent?: Component): void;
     render(update: (template: JSXNode, portalHost?: NativeNode) => void): void;
     update(newProps: Record<string, any>, updateChildren: (jsxNode: JSXNode) => void, reuseChildren: (skipSubComponentDiff: boolean) => void): void;
-    provide<T>(providers: Provider<T> | Provider<T>[]): void;
     destroy(): void;
     rendered(): void;
     private invokePropsChangedHooks;
     private invokeMountHooks;
     private invokeUpdatedHooks;
 }
+/**
+ * 获取当前组件实例
+ */
+declare function getCurrentInstance(): Component;
+
+declare function createContext(providers: Provider[], scope?: Scope, parentInjector?: Injector): (props: Props) => () => JSXNode | JSXNode[];
+/**
+ * 通过组件上下文获取 IoC 容器内数据的勾子方法
+ */
+declare function inject<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = never>(token: T, notFoundValue?: U, flags?: InjectFlags): ExtractValueType<T> | U;
+interface ComponentAnnotation {
+    scope?: Scope;
+    providers?: Provider[];
+}
 /**
  * 给组件添加注解
  * @param annotation
@@ -476,15 +484,6 @@ declare class Component extends ReflectiveInjector {
  * ```
  */
 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;
-
 interface ContextProps extends Props {
     providers: Provider[];
 }
@@ -500,7 +499,7 @@ declare function createRenderer(component: Component, nativeRenderer: NativeRend
  */
 declare class RootComponent extends Component {
     private refresh;
-    constructor(parentInjector: Injector | null, factory: ComponentSetup, refresh: () => void);
+    constructor(factory: ComponentSetup, refresh: () => void);
     markAsChanged(changedComponent?: Component): void;
 }
 
@@ -602,4 +601,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 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 };
+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, createContext, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, getSetupContext, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };

package/bundles/index.esm.js

@@ -2,7 +2,12 @@ import 'reflect-metadata';
 
 class ForwardRef {
     constructor(forwardRefFn) {
-        this.forwardRefFn = forwardRefFn;
+        Object.defineProperty(this, "forwardRefFn", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: forwardRefFn
+        });
     }
     getRef() {
         return this.forwardRefFn();
@@ -21,9 +26,24 @@ function forwardRef(fn) {
  */
 class Annotations {
     constructor() {
-        this.classes = new Map();
-        this.props = new Map();
-        this.params = new Map();
+        Object.defineProperty(this, "classes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "props", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "params", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
     }
     setClassMetadata(token, params) {
         this.classes.set(token, params);
@@ -110,7 +130,12 @@ function getAnnotations(target) {
 
 class Scope {
     constructor(name) {
-        this.name = name;
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: name
+        });
     }
     toString() {
         return this.name || '[anonymous provide scope]';
@@ -134,7 +159,12 @@ const Injectable = function InjectableDecorator(options) {
 /* eslint-disable-next-line */
 class InjectionToken {
     constructor(description) {
-        this.description = description;
+        Object.defineProperty(this, "description", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: description
+        });
     }
     toString() {
         return this.description || '[anonymous injection token]';
@@ -236,7 +266,12 @@ const nullInjectorErrorFn = (token) => {
 };
 class NullInjector {
     constructor() {
-        this.parentInjector = null;
+        Object.defineProperty(this, "parentInjector", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
     }
     /* eslint-disable-next-line */
     get(token, notFoundValue = THROW_IF_NOT_FOUND, _) {
@@ -412,9 +447,30 @@ const provideScopeError = (token) => {
  */
 class ReflectiveInjector {
     constructor(parentInjector, staticProviders, scope) {
-        this.parentInjector = parentInjector;
-        this.scope = scope;
-        this.recordValues = new Map();
+        Object.defineProperty(this, "parentInjector", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: parentInjector
+        });
+        Object.defineProperty(this, "scope", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: scope
+        });
+        Object.defineProperty(this, "normalizedProviders", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "recordValues", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
         this.normalizedProviders = staticProviders.map(provide => {
             return normalizeProvider(provide);
         });
@@ -620,8 +676,18 @@ const ComponentAtomType = Symbol('Component');
 
 class Listener {
     constructor(effect) {
-        this.effect = effect;
-        this.destroyCallbacks = [];
+        Object.defineProperty(this, "effect", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: effect
+        });
+        Object.defineProperty(this, "destroyCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
     }
     destroy() {
         this.destroyCallbacks.forEach(fn => fn());
@@ -732,9 +798,24 @@ function onUnmounted(callback) {
 
 class DynamicRef {
     constructor(callback) {
-        this.callback = callback;
-        this.unBindMap = new Map();
-        this.targetCaches = new Set();
+        Object.defineProperty(this, "callback", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: callback
+        });
+        Object.defineProperty(this, "unBindMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "targetCaches", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set()
+        });
     }
     bind(value) {
         if (typeof value !== 'object' || value === null) {
@@ -793,6 +874,12 @@ class StaticRef extends DynamicRef {
                 isInit = true;
             }
         });
+        Object.defineProperty(this, "current", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, 'current', {
             get() {
                 if (value === initValue) {
@@ -825,7 +912,7 @@ function toRefs(ref) {
 /**
  * Viewfly 组件管理类，用于管理组件的生命周期，上下文等
  */
-class Component extends ReflectiveInjector {
+class Component {
     get dirty() {
         return this._dirty;
     }
@@ -833,23 +920,109 @@ class Component extends ReflectiveInjector {
         return this._changed;
     }
     constructor(parentComponent, type, props, key) {
-        const annotation = type.annotation || {};
-        const providers = annotation.providers || [];
-        super(parentComponent, [...providers, {
-                provide: Injector,
-                useFactory: () => this
-            }], annotation.scope);
-        this.parentComponent = parentComponent;
-        this.type = type;
-        this.props = props;
-        this.key = key;
-        this.changedSubComponents = new Set();
-        this._dirty = true;
-        this._changed = true;
-        this.isFirstRendering = true;
-        this.refs = null;
-        this.listener = new Listener(() => {
-            this.markAsDirtied();
+        Object.defineProperty(this, "parentComponent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: parentComponent
+        });
+        Object.defineProperty(this, "type", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: type
+        });
+        Object.defineProperty(this, "props", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: props
+        });
+        Object.defineProperty(this, "key", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: key
+        });
+        Object.defineProperty(this, "instance", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "changedSubComponents", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set()
+        });
+        Object.defineProperty(this, "unmountedCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "mountCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "propsChangedCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "updatedCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "updatedDestroyCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "propsChangedDestroyCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_dirty", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+        Object.defineProperty(this, "_changed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+        Object.defineProperty(this, "isFirstRendering", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+        Object.defineProperty(this, "refs", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.defineProperty(this, "listener", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Listener(() => {
+                this.markAsDirtied();
+            })
         });
     }
     markAsDirtied() {
@@ -952,10 +1125,6 @@ class Component extends ReflectiveInjector {
         updateChildren(template);
         this.rendered();
     }
-    provide(providers) {
-        providers = Array.isArray(providers) ? providers : [providers];
-        this.normalizedProviders.unshift(...providers.map(i => normalizeProvider(i)));
-    }
     destroy() {
         var _a, _b, _c;
         this.listener.destroy();
@@ -972,13 +1141,12 @@ class Component extends ReflectiveInjector {
             this.parentComponent.changedSubComponents.delete(this);
         }
         this.parentComponent =
-            this.parentInjector =
-                this.propsChangedDestroyCallbacks =
-                    this.updatedDestroyCallbacks =
-                        this.mountCallbacks =
-                            this.updatedCallbacks =
-                                this.propsChangedCallbacks =
-                                    this.unmountedCallbacks = null;
+            this.propsChangedDestroyCallbacks =
+                this.updatedDestroyCallbacks =
+                    this.mountCallbacks =
+                        this.updatedCallbacks =
+                            this.propsChangedCallbacks =
+                                this.unmountedCallbacks = null;
         this.changedSubComponents.clear();
     }
     rendered() {
@@ -1055,39 +1223,6 @@ class Component extends ReflectiveInjector {
         }
     }
 }
-/**
- * 给组件添加注解
- * @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>
- *   }
- * })
- * ```
- */
-function withAnnotation(annotation, componentSetup) {
-    const setup = function setup(props) {
-        return componentSetup(props);
-    };
-    setup.annotation = annotation;
-    return setup;
-}
-/**
- * 通过组件上下文获取 IoC 容器内数据的勾子方法
- */
-function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
-    const component = getSetupContext();
-    return component.get(token, notFoundValue, flags);
-}
 /**
  * 获取当前组件实例
  */
@@ -1114,6 +1249,63 @@ const JSXNodeFactory = {
     }
 };
 
+const injectMap = new WeakMap();
+function getInjector(start) {
+    while (start) {
+        const injector = injectMap.get(start);
+        if (injector) {
+            return injector;
+        }
+        start = start.parentComponent;
+    }
+    return new NullInjector();
+}
+function createContext(providers, scope, parentInjector) {
+    return function context(props) {
+        const instance = getCurrentInstance();
+        const injector = new ReflectiveInjector(parentInjector || getInjector(instance), providers, scope);
+        injectMap.set(instance, injector);
+        return () => {
+            return props.children;
+        };
+    };
+}
+/**
+ * 通过组件上下文获取 IoC 容器内数据的勾子方法
+ */
+function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
+    const component = getCurrentInstance();
+    const injector = getInjector(component);
+    return injector.get(token, notFoundValue, flags);
+}
+/**
+ * 给组件添加注解
+ * @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>
+ *   }
+ * })
+ * ```
+ */
+function withAnnotation(annotation, componentSetup) {
+    return function (props) {
+        const instance = getCurrentInstance();
+        const parentInjector = injectMap.get(instance) || getInjector(instance.parentComponent);
+        const injector = new ReflectiveInjector(parentInjector, annotation.providers || [], annotation.scope);
+        injectMap.set(instance, injector);
+        return componentSetup(props);
+    };
+}
 function Context(props) {
     function createContextComponent(providers) {
         return withAnnotation({
@@ -1228,9 +1420,8 @@ function applyChanges(nativeRenderer, component, atom, context, needMove) {
             view.host = context.host;
             view.isParent = context.isParent;
         }
-    }, () => {
-        // console.log(skipSubComponentDiff, '----')
-        //
+    }, (skipSubComponentDiff) => {
+        reuseComponentView(nativeRenderer, atom, context, needMove, skipSubComponentDiff);
     });
 }
 function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMove) {
@@ -1400,27 +1591,31 @@ function cleanElementChildren(atom, nativeRenderer) {
     }
 }
 function cleanView(nativeRenderer, atom, needClean) {
-    if (atom.nativeNode) {
-        if (needClean) {
-            nativeRenderer.remove(atom.nativeNode, atom.namespace);
-            needClean = false;
-        }
-        if (atom.type === ElementAtomType) {
-            const ref = atom.jsxNode.props[refKey];
-            applyRefs(ref, atom.nativeNode, false);
+    if (atom.type === ComponentAtomType) {
+        const jsxNode = atom.jsxNode;
+        if (jsxNode.instance.$portalHost) {
+            needClean = true;
         }
+        cleanChildren(atom, nativeRenderer, needClean);
+        jsxNode.destroy();
+        return;
+    }
+    if (needClean) {
+        nativeRenderer.remove(atom.nativeNode, atom.namespace);
+        needClean = false;
+    }
+    if (atom.type === ElementAtomType) {
+        const ref = atom.jsxNode.props[refKey];
+        applyRefs(ref, atom.nativeNode, false);
     }
+    cleanChildren(atom, nativeRenderer, needClean);
+}
+function cleanChildren(atom, nativeRenderer, needClean) {
     let child = atom.child;
     while (child) {
-        if (child.jsxNode instanceof Component && child.jsxNode.instance.$portalHost) {
-            needClean = true;
-        }
         cleanView(nativeRenderer, child, needClean);
         child = child.sibling;
     }
-    if (atom.jsxNode instanceof Component) {
-        atom.jsxNode.destroy();
-    }
 }
 function componentRender(nativeRenderer, component, from, context) {
     component.render((template, portalHost) => {
@@ -1473,7 +1668,9 @@ function createChainByNode(jsxNode, prevAtom, elementNamespace) {
     return prevAtom;
 }
 function createChainByChildren(children, prevAtom, elementNamespace) {
-    for (const item of children) {
+    const len = children.length;
+    for (let i = 0; i < len; i++) {
+        const item = children[i];
         prevAtom = createChainByNode(item, prevAtom, elementNamespace);
     }
     return prevAtom;
@@ -1565,7 +1762,9 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     let unBindRefs;
     let bindRefs;
     let updatedChildren = false;
-    for (const [key, value] of changes.remove) {
+    let len = changes.remove.length;
+    for (let i = 0; i < len; i++) {
+        const [key, value] = changes.remove[i];
         if (key === 'children') {
             updatedChildren = true;
             cleanElementChildren(oldAtom, nativeRenderer);
@@ -1593,7 +1792,9 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         nativeRenderer.removeProperty(nativeNode, key, isSvg);
     }
-    for (const [key, newValue, oldValue] of changes.replace) {
+    len = changes.replace.length;
+    for (let i = 0; i < len; i++) {
+        const [key, newValue, oldValue] = changes.replace[i];
         if (key === 'children') {
             updatedChildren = true;
             newAtom.child = createChildChain(newValue, isSvg);
@@ -1638,7 +1839,9 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         nativeRenderer.setProperty(nativeNode, key, newValue, isSvg);
     }
-    for (const [key, value] of changes.add) {
+    len = changes.add.length;
+    for (let i = 0; i < len; i++) {
+        const [key, value] = changes.add[i];
         if (key === 'children') {
             updatedChildren = true;
             newAtom.child = createChildChain(value, isSvg);
@@ -1678,7 +1881,9 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
 function applyRefs(refs, nativeNode, binding) {
     if (refs) {
         const refList = Array.isArray(refs) ? refs : [refs];
-        for (const item of refList) {
+        const len = refList.length;
+        for (let i = 0; i < len; i++) {
+            const item = refList[i];
             if (item instanceof DynamicRef) {
                 binding ? item.bind(nativeNode) : item.unBind(nativeNode);
             }
@@ -1690,9 +1895,14 @@ function applyRefs(refs, nativeNode, binding) {
  * Viewfly 根组件，用于实现组件状态更新事件通知
  */
 class RootComponent extends Component {
-    constructor(parentInjector, factory, refresh) {
-        super(parentInjector, factory, {});
-        this.refresh = refresh;
+    constructor(factory, refresh) {
+        super(null, factory, {});
+        Object.defineProperty(this, "refresh", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: refresh
+        });
     }
     markAsChanged(changedComponent) {
         this._changed = true;
@@ -1836,16 +2046,15 @@ function viewfly(config) {
     const modules = [];
     let destroyed = false;
     let appHost = null;
-    const rootComponent = new RootComponent(context || null, withAnnotation({
-        providers: [{
-                provide: NativeRenderer,
-                useValue: nativeRenderer
-            }]
-    }, () => {
+    const rootProviders = [];
+    const rootComponent = new RootComponent(() => {
+        const rootContext = createContext(rootProviders, void 0, context);
         return () => {
-            return destroyed ? null : root;
+            return jsx(rootContext, {
+                children: destroyed ? null : root
+            });
         };
-    }), function () {
+    }, function () {
         if (destroyed || !autoUpdate) {
             return;
         }
@@ -1867,7 +2076,8 @@ function viewfly(config) {
     }
     const app = {
         provide(providers) {
-            rootComponent.provide(providers);
+            providers = Array.isArray(providers) ? providers : [providers];
+            rootProviders.push(...providers);
             return app;
         },
         use(module) {
@@ -1917,4 +2127,4 @@ function viewfly(config) {
     return app;
 }
 
-export { Component, Context, DynamicRef, ElementNamespaceMap, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXNodeFactory, NativeRenderer, NullInjector, Optional, Prop, ReflectiveInjector, RootComponent, Scope, Self, SkipSelf, StaticRef, THROW_IF_NOT_FOUND, Type, computed, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, getSetupContext, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };
+export { Component, Context, DynamicRef, ElementNamespaceMap, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXNodeFactory, NativeRenderer, NullInjector, Optional, Prop, ReflectiveInjector, RootComponent, Scope, Self, SkipSelf, StaticRef, THROW_IF_NOT_FOUND, Type, computed, createContext, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, getSetupContext, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };

package/bundles/index.js

@@ -4,7 +4,12 @@ require('reflect-metadata');
 
 class ForwardRef {
     constructor(forwardRefFn) {
-        this.forwardRefFn = forwardRefFn;
+        Object.defineProperty(this, "forwardRefFn", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: forwardRefFn
+        });
     }
     getRef() {
         return this.forwardRefFn();
@@ -23,9 +28,24 @@ function forwardRef(fn) {
  */
 class Annotations {
     constructor() {
-        this.classes = new Map();
-        this.props = new Map();
-        this.params = new Map();
+        Object.defineProperty(this, "classes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "props", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "params", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
     }
     setClassMetadata(token, params) {
         this.classes.set(token, params);
@@ -112,7 +132,12 @@ function getAnnotations(target) {
 
 class Scope {
     constructor(name) {
-        this.name = name;
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: name
+        });
     }
     toString() {
         return this.name || '[anonymous provide scope]';
@@ -136,7 +161,12 @@ const Injectable = function InjectableDecorator(options) {
 /* eslint-disable-next-line */
 class InjectionToken {
     constructor(description) {
-        this.description = description;
+        Object.defineProperty(this, "description", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: description
+        });
     }
     toString() {
         return this.description || '[anonymous injection token]';
@@ -238,7 +268,12 @@ const nullInjectorErrorFn = (token) => {
 };
 class NullInjector {
     constructor() {
-        this.parentInjector = null;
+        Object.defineProperty(this, "parentInjector", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
     }
     /* eslint-disable-next-line */
     get(token, notFoundValue = THROW_IF_NOT_FOUND, _) {
@@ -414,9 +449,30 @@ const provideScopeError = (token) => {
  */
 class ReflectiveInjector {
     constructor(parentInjector, staticProviders, scope) {
-        this.parentInjector = parentInjector;
-        this.scope = scope;
-        this.recordValues = new Map();
+        Object.defineProperty(this, "parentInjector", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: parentInjector
+        });
+        Object.defineProperty(this, "scope", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: scope
+        });
+        Object.defineProperty(this, "normalizedProviders", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "recordValues", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
         this.normalizedProviders = staticProviders.map(provide => {
             return normalizeProvider(provide);
         });
@@ -622,8 +678,18 @@ const ComponentAtomType = Symbol('Component');
 
 class Listener {
     constructor(effect) {
-        this.effect = effect;
-        this.destroyCallbacks = [];
+        Object.defineProperty(this, "effect", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: effect
+        });
+        Object.defineProperty(this, "destroyCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
     }
     destroy() {
         this.destroyCallbacks.forEach(fn => fn());
@@ -734,9 +800,24 @@ function onUnmounted(callback) {
 
 class DynamicRef {
     constructor(callback) {
-        this.callback = callback;
-        this.unBindMap = new Map();
-        this.targetCaches = new Set();
+        Object.defineProperty(this, "callback", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: callback
+        });
+        Object.defineProperty(this, "unBindMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "targetCaches", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set()
+        });
     }
     bind(value) {
         if (typeof value !== 'object' || value === null) {
@@ -795,6 +876,12 @@ class StaticRef extends DynamicRef {
                 isInit = true;
             }
         });
+        Object.defineProperty(this, "current", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, 'current', {
             get() {
                 if (value === initValue) {
@@ -827,7 +914,7 @@ function toRefs(ref) {
 /**
  * Viewfly 组件管理类，用于管理组件的生命周期，上下文等
  */
-class Component extends ReflectiveInjector {
+class Component {
     get dirty() {
         return this._dirty;
     }
@@ -835,23 +922,109 @@ class Component extends ReflectiveInjector {
         return this._changed;
     }
     constructor(parentComponent, type, props, key) {
-        const annotation = type.annotation || {};
-        const providers = annotation.providers || [];
-        super(parentComponent, [...providers, {
-                provide: Injector,
-                useFactory: () => this
-            }], annotation.scope);
-        this.parentComponent = parentComponent;
-        this.type = type;
-        this.props = props;
-        this.key = key;
-        this.changedSubComponents = new Set();
-        this._dirty = true;
-        this._changed = true;
-        this.isFirstRendering = true;
-        this.refs = null;
-        this.listener = new Listener(() => {
-            this.markAsDirtied();
+        Object.defineProperty(this, "parentComponent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: parentComponent
+        });
+        Object.defineProperty(this, "type", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: type
+        });
+        Object.defineProperty(this, "props", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: props
+        });
+        Object.defineProperty(this, "key", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: key
+        });
+        Object.defineProperty(this, "instance", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "changedSubComponents", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set()
+        });
+        Object.defineProperty(this, "unmountedCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "mountCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "propsChangedCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "updatedCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "updatedDestroyCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "propsChangedDestroyCallbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_dirty", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+        Object.defineProperty(this, "_changed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+        Object.defineProperty(this, "isFirstRendering", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+        Object.defineProperty(this, "refs", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.defineProperty(this, "listener", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Listener(() => {
+                this.markAsDirtied();
+            })
         });
     }
     markAsDirtied() {
@@ -954,10 +1127,6 @@ class Component extends ReflectiveInjector {
         updateChildren(template);
         this.rendered();
     }
-    provide(providers) {
-        providers = Array.isArray(providers) ? providers : [providers];
-        this.normalizedProviders.unshift(...providers.map(i => normalizeProvider(i)));
-    }
     destroy() {
         var _a, _b, _c;
         this.listener.destroy();
@@ -974,13 +1143,12 @@ class Component extends ReflectiveInjector {
             this.parentComponent.changedSubComponents.delete(this);
         }
         this.parentComponent =
-            this.parentInjector =
-                this.propsChangedDestroyCallbacks =
-                    this.updatedDestroyCallbacks =
-                        this.mountCallbacks =
-                            this.updatedCallbacks =
-                                this.propsChangedCallbacks =
-                                    this.unmountedCallbacks = null;
+            this.propsChangedDestroyCallbacks =
+                this.updatedDestroyCallbacks =
+                    this.mountCallbacks =
+                        this.updatedCallbacks =
+                            this.propsChangedCallbacks =
+                                this.unmountedCallbacks = null;
         this.changedSubComponents.clear();
     }
     rendered() {
@@ -1057,39 +1225,6 @@ class Component extends ReflectiveInjector {
         }
     }
 }
-/**
- * 给组件添加注解
- * @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>
- *   }
- * })
- * ```
- */
-function withAnnotation(annotation, componentSetup) {
-    const setup = function setup(props) {
-        return componentSetup(props);
-    };
-    setup.annotation = annotation;
-    return setup;
-}
-/**
- * 通过组件上下文获取 IoC 容器内数据的勾子方法
- */
-function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
-    const component = getSetupContext();
-    return component.get(token, notFoundValue, flags);
-}
 /**
  * 获取当前组件实例
  */
@@ -1116,6 +1251,63 @@ const JSXNodeFactory = {
     }
 };
 
+const injectMap = new WeakMap();
+function getInjector(start) {
+    while (start) {
+        const injector = injectMap.get(start);
+        if (injector) {
+            return injector;
+        }
+        start = start.parentComponent;
+    }
+    return new NullInjector();
+}
+function createContext(providers, scope, parentInjector) {
+    return function context(props) {
+        const instance = getCurrentInstance();
+        const injector = new ReflectiveInjector(parentInjector || getInjector(instance), providers, scope);
+        injectMap.set(instance, injector);
+        return () => {
+            return props.children;
+        };
+    };
+}
+/**
+ * 通过组件上下文获取 IoC 容器内数据的勾子方法
+ */
+function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
+    const component = getCurrentInstance();
+    const injector = getInjector(component);
+    return injector.get(token, notFoundValue, flags);
+}
+/**
+ * 给组件添加注解
+ * @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>
+ *   }
+ * })
+ * ```
+ */
+function withAnnotation(annotation, componentSetup) {
+    return function (props) {
+        const instance = getCurrentInstance();
+        const parentInjector = injectMap.get(instance) || getInjector(instance.parentComponent);
+        const injector = new ReflectiveInjector(parentInjector, annotation.providers || [], annotation.scope);
+        injectMap.set(instance, injector);
+        return componentSetup(props);
+    };
+}
 function Context(props) {
     function createContextComponent(providers) {
         return withAnnotation({
@@ -1230,9 +1422,8 @@ function applyChanges(nativeRenderer, component, atom, context, needMove) {
             view.host = context.host;
             view.isParent = context.isParent;
         }
-    }, () => {
-        // console.log(skipSubComponentDiff, '----')
-        //
+    }, (skipSubComponentDiff) => {
+        reuseComponentView(nativeRenderer, atom, context, needMove, skipSubComponentDiff);
     });
 }
 function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMove) {
@@ -1402,27 +1593,31 @@ function cleanElementChildren(atom, nativeRenderer) {
     }
 }
 function cleanView(nativeRenderer, atom, needClean) {
-    if (atom.nativeNode) {
-        if (needClean) {
-            nativeRenderer.remove(atom.nativeNode, atom.namespace);
-            needClean = false;
-        }
-        if (atom.type === ElementAtomType) {
-            const ref = atom.jsxNode.props[refKey];
-            applyRefs(ref, atom.nativeNode, false);
+    if (atom.type === ComponentAtomType) {
+        const jsxNode = atom.jsxNode;
+        if (jsxNode.instance.$portalHost) {
+            needClean = true;
         }
+        cleanChildren(atom, nativeRenderer, needClean);
+        jsxNode.destroy();
+        return;
+    }
+    if (needClean) {
+        nativeRenderer.remove(atom.nativeNode, atom.namespace);
+        needClean = false;
+    }
+    if (atom.type === ElementAtomType) {
+        const ref = atom.jsxNode.props[refKey];
+        applyRefs(ref, atom.nativeNode, false);
     }
+    cleanChildren(atom, nativeRenderer, needClean);
+}
+function cleanChildren(atom, nativeRenderer, needClean) {
     let child = atom.child;
     while (child) {
-        if (child.jsxNode instanceof Component && child.jsxNode.instance.$portalHost) {
-            needClean = true;
-        }
         cleanView(nativeRenderer, child, needClean);
         child = child.sibling;
     }
-    if (atom.jsxNode instanceof Component) {
-        atom.jsxNode.destroy();
-    }
 }
 function componentRender(nativeRenderer, component, from, context) {
     component.render((template, portalHost) => {
@@ -1475,7 +1670,9 @@ function createChainByNode(jsxNode, prevAtom, elementNamespace) {
     return prevAtom;
 }
 function createChainByChildren(children, prevAtom, elementNamespace) {
-    for (const item of children) {
+    const len = children.length;
+    for (let i = 0; i < len; i++) {
+        const item = children[i];
         prevAtom = createChainByNode(item, prevAtom, elementNamespace);
     }
     return prevAtom;
@@ -1567,7 +1764,9 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
     let unBindRefs;
     let bindRefs;
     let updatedChildren = false;
-    for (const [key, value] of changes.remove) {
+    let len = changes.remove.length;
+    for (let i = 0; i < len; i++) {
+        const [key, value] = changes.remove[i];
         if (key === 'children') {
             updatedChildren = true;
             cleanElementChildren(oldAtom, nativeRenderer);
@@ -1595,7 +1794,9 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         nativeRenderer.removeProperty(nativeNode, key, isSvg);
     }
-    for (const [key, newValue, oldValue] of changes.replace) {
+    len = changes.replace.length;
+    for (let i = 0; i < len; i++) {
+        const [key, newValue, oldValue] = changes.replace[i];
         if (key === 'children') {
             updatedChildren = true;
             newAtom.child = createChildChain(newValue, isSvg);
@@ -1640,7 +1841,9 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         }
         nativeRenderer.setProperty(nativeNode, key, newValue, isSvg);
     }
-    for (const [key, value] of changes.add) {
+    len = changes.add.length;
+    for (let i = 0; i < len; i++) {
+        const [key, value] = changes.add[i];
         if (key === 'children') {
             updatedChildren = true;
             newAtom.child = createChildChain(value, isSvg);
@@ -1680,7 +1883,9 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
 function applyRefs(refs, nativeNode, binding) {
     if (refs) {
         const refList = Array.isArray(refs) ? refs : [refs];
-        for (const item of refList) {
+        const len = refList.length;
+        for (let i = 0; i < len; i++) {
+            const item = refList[i];
             if (item instanceof DynamicRef) {
                 binding ? item.bind(nativeNode) : item.unBind(nativeNode);
             }
@@ -1692,9 +1897,14 @@ function applyRefs(refs, nativeNode, binding) {
  * Viewfly 根组件，用于实现组件状态更新事件通知
  */
 class RootComponent extends Component {
-    constructor(parentInjector, factory, refresh) {
-        super(parentInjector, factory, {});
-        this.refresh = refresh;
+    constructor(factory, refresh) {
+        super(null, factory, {});
+        Object.defineProperty(this, "refresh", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: refresh
+        });
     }
     markAsChanged(changedComponent) {
         this._changed = true;
@@ -1838,16 +2048,15 @@ function viewfly(config) {
     const modules = [];
     let destroyed = false;
     let appHost = null;
-    const rootComponent = new RootComponent(context || null, withAnnotation({
-        providers: [{
-                provide: NativeRenderer,
-                useValue: nativeRenderer
-            }]
-    }, () => {
+    const rootProviders = [];
+    const rootComponent = new RootComponent(() => {
+        const rootContext = createContext(rootProviders, void 0, context);
         return () => {
-            return destroyed ? null : root;
+            return jsx(rootContext, {
+                children: destroyed ? null : root
+            });
         };
-    }), function () {
+    }, function () {
         if (destroyed || !autoUpdate) {
             return;
         }
@@ -1869,7 +2078,8 @@ function viewfly(config) {
     }
     const app = {
         provide(providers) {
-            rootComponent.provide(providers);
+            providers = Array.isArray(providers) ? providers : [providers];
+            rootProviders.push(...providers);
             return app;
         },
         use(module) {
@@ -1943,6 +2153,7 @@ exports.StaticRef = StaticRef;
 exports.THROW_IF_NOT_FOUND = THROW_IF_NOT_FOUND;
 exports.Type = Type;
 exports.computed = computed;
+exports.createContext = createContext;
 exports.createDerived = createDerived;
 exports.createDynamicRef = createDynamicRef;
 exports.createRef = createRef;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "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": "eb5d5ce380467cb05637ef42fdb539c327b19feb",
+  "gitHead": "8d13d8667f8875f24bc5218e9e4136d9efd9565a",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }