@viewfly/core 2.0.0-alpha.0 → 2.0.0-alpha.1

package/bundles/index.d.ts

@@ -460,6 +460,11 @@ declare function createContext(providers: Provider[], scope?: Scope, parentInjec
  * 通过组件上下文获取 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[];
+}
+declare function withAnnotation<T extends ComponentSetup>(annotation: ComponentAnnotation, component: T): T;
 
 declare function withMemo<T extends Props = Props>(canUseMemo: ComponentInstance<T>['$useMemo'], render: () => JSXNode): ComponentInstance<T>;
 
@@ -573,4 +578,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 ComponentInstance, type ComponentSetup, type ComponentView, type Config, type ConstructorProvider, 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, 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, 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

@@ -1231,8 +1231,7 @@ function getCurrentInstance() {
 }
 
 const injectMap = new WeakMap();
-function getParentInjector(component) {
-    let start = component.parentComponent;
+function getInjector(start) {
     while (start) {
         const injector = injectMap.get(start);
         if (injector) {
@@ -1245,7 +1244,7 @@ function getParentInjector(component) {
 function createContext(providers, scope, parentInjector) {
     return function context(props) {
         const instance = getCurrentInstance();
-        const injector = new ReflectiveInjector(parentInjector || getParentInjector(instance), providers, scope);
+        const injector = new ReflectiveInjector(parentInjector || getInjector(instance), providers, scope);
         injectMap.set(instance, injector);
         return () => {
             return props.children;
@@ -1257,9 +1256,18 @@ function createContext(providers, scope, parentInjector) {
  */
 function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
     const component = getCurrentInstance();
-    const injector = getParentInjector(component);
+    const injector = getInjector(component);
     return injector.get(token, notFoundValue, flags);
 }
+function withAnnotation(annotation, component) {
+    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 component(props);
+    };
+}
 
 class NativeRenderer {
 }
@@ -2077,4 +2085,4 @@ function viewfly(config) {
     return app;
 }
 
-export { Component, 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, withMemo };
+export { Component, 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

@@ -1233,8 +1233,7 @@ function getCurrentInstance() {
 }
 
 const injectMap = new WeakMap();
-function getParentInjector(component) {
-    let start = component.parentComponent;
+function getInjector(start) {
     while (start) {
         const injector = injectMap.get(start);
         if (injector) {
@@ -1247,7 +1246,7 @@ function getParentInjector(component) {
 function createContext(providers, scope, parentInjector) {
     return function context(props) {
         const instance = getCurrentInstance();
-        const injector = new ReflectiveInjector(parentInjector || getParentInjector(instance), providers, scope);
+        const injector = new ReflectiveInjector(parentInjector || getInjector(instance), providers, scope);
         injectMap.set(instance, injector);
         return () => {
             return props.children;
@@ -1259,9 +1258,18 @@ function createContext(providers, scope, parentInjector) {
  */
 function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
     const component = getCurrentInstance();
-    const injector = getParentInjector(component);
+    const injector = getInjector(component);
     return injector.get(token, notFoundValue, flags);
 }
+function withAnnotation(annotation, component) {
+    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 component(props);
+    };
+}
 
 class NativeRenderer {
 }
@@ -2122,4 +2130,5 @@ exports.onUnmounted = onUnmounted;
 exports.onUpdated = onUpdated;
 exports.viewfly = viewfly;
 exports.watch = watch;
+exports.withAnnotation = withAnnotation;
 exports.withMemo = withMemo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "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": "5fdcdcdca224d1eecdfd6a68abb1c3fb9c01d88a",
+  "gitHead": "7a4f48b8c21d4450ff837485c191e3d9bf88f5fb",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }