@viewfly/core 0.6.3 → 1.0.0-alpha.1

package/bundles/di/injector.d.ts

@@ -22,5 +22,5 @@ export type ExtractValueType<T> = T extends Type<any> ? InstanceType<T> : T exte
  */
 export declare abstract class Injector {
     abstract parentInjector: Injector | null;
-    abstract get<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = never>(token: T, notFoundValue?: U, flags?: InjectFlags): ExtractValueType<T> | U;
+    abstract get<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = never>(token: T, flags?: InjectFlags, notFoundValue?: U): ExtractValueType<T> | U;
 }

package/bundles/di/metadata.d.ts

@@ -1,5 +1,5 @@
 import { AbstractType, Type } from './type';
-import { InjectFlags } from './injector';
+import { ExtractValueType, InjectFlags } from './injector';
 import { InjectionToken } from './injection-token';
 import { ForwardRef } from './forward-ref';
 export interface Inject {
@@ -37,7 +37,7 @@ export declare const Optional: OptionalDecorator;
 export interface Prop {
 }
 export interface PropDecorator {
-    <T>(token?: Type<T> | AbstractType<T> | InjectionToken<T> | ForwardRef<T>, notFoundValue?: T, flags?: InjectFlags): PropertyDecorator;
+    <T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = never>(token?: T | ForwardRef<ExtractValueType<T>>, flags?: InjectFlags, notFoundValue?: U): PropertyDecorator;
     new (token: any): Prop;
 }
 export declare const Prop: PropDecorator;

package/bundles/di/null-injector.d.ts

@@ -1,6 +1,6 @@
-import { Injector } from './injector';
+import { InjectFlags, Injector } from './injector';
 export declare const THROW_IF_NOT_FOUND: any;
 export declare class NullInjector extends Injector {
     parentInjector: null;
-    get(token: any, notFoundValue?: any): any;
+    get(token: any, flag?: InjectFlags, notFoundValue?: any): any;
 }

package/bundles/di/reflective-injector.d.ts

@@ -17,10 +17,10 @@ export declare class ReflectiveInjector extends Injector {
     /**
      * 用于获取当前注入器上下文内的实例、对象或数据
      * @param token 访问 token
-     * @param notFoundValue 如未查找到的返回值
      * @param flags 查询规则
+     * @param notFoundValue 如未查找到的返回值
      */
-    get<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = never>(token: T, notFoundValue?: U, flags?: InjectFlags): ExtractValueType<T> | U;
+    get<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = never>(token: T, flags?: InjectFlags, notFoundValue?: U): ExtractValueType<T> | U;
     private getValue;
     /**
      * 解决并获取依赖参数

package/bundles/foundation/component.d.ts

@@ -1,4 +1,4 @@
-import { AbstractType, InjectFlags, InjectionToken, Injector, Provider, ReflectiveInjector, Type } from '../di/_api';
+import { AbstractType, ExtractValueType, InjectFlags, InjectionToken, Injector, Provider, ReflectiveInjector, Type } from '../di/_api';
 import { Key, Props } from './jsx-element';
 import { ComponentView } from './_utils';
 /**
@@ -215,14 +215,29 @@ export declare function watch<T, T1, T2, T3, T4, T5, T6, T7>(deps: [Signal<T>, S
 export declare function watch<T>(deps: () => T, callback: WatchCallback<T, T>): () => void;
 export declare function watch<T = any>(deps: Signal<any>[], callback: WatchCallback<T[], T[]>): () => void;
 /**
- * 通过 IoC 容器当前组件提供上下文共享数据的方法
- * @param provider
+ * 给组件添加注解
+ * @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>
+ *   }
+ * })
+ * ```
  */
-export declare function provide(provider: Provider | Provider[]): void;
+export declare function withAnnotation<T extends JSXInternal.ComponentSetup>(annotation: JSXInternal.ComponentAnnotation, componentSetup: T): T;
 /**
  * 通过组件上下文获取 IoC 容器内数据的勾子方法
  */
-export declare function inject<T>(token: Type<T> | AbstractType<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
+export declare function inject<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = never>(token: T, flags?: InjectFlags, notFoundValue?: U): ExtractValueType<T> | U;
 /**
  * 获取当前组件实例
  */

package/bundles/foundation/types.d.ts

@@ -2,6 +2,7 @@ import { Key } from './jsx-element';
 import { ExtractInstanceType, DynamicRef } from './component';
 import { Scope } from '../di/injectable';
 import { NativeNode } from './injection-tokens';
+import { Provider } from '../di/provider';
 export type ViewNode = JSXInternal.ViewNode;
 declare global {
     namespace JSXInternal {
@@ -12,9 +13,13 @@ declare global {
             $useMemo?(currentProps: P, prevProps: P): boolean;
         }
         type ViewNode = Element | JSXInternal.ElementClass | string | number | boolean | null | undefined | Iterable<ViewNode>;
+        interface ComponentAnnotation {
+            scope?: Scope;
+            providers?: Provider[];
+        }
         interface ComponentSetup<P = any> {
             (props: P): (() => ViewNode) | ComponentInstance<P>;
-            scope?: Scope;
+            annotation?: ComponentAnnotation;
         }
         type Element<P = any, C extends string | ComponentSetup<P> = string | ComponentSetup<P>> = C extends string ? IntrinsicElements[C] : (() => Element) | ComponentInstance<P>;
         interface IntrinsicAttributes {

package/bundles/index.esm.js

@@ -205,7 +205,7 @@ class NullInjector extends Injector {
         super(...arguments);
         this.parentInjector = null;
     }
-    get(token, notFoundValue = THROW_IF_NOT_FOUND) {
+    get(token, flag, notFoundValue = THROW_IF_NOT_FOUND) {
         if (notFoundValue === THROW_IF_NOT_FOUND) {
             throw nullInjectorErrorFn(token);
         }
@@ -239,10 +239,10 @@ const Optional = function OptionalDecorator() {
         return makeParamDecorator(Optional, new Optional());
     }
 };
-const Prop = function PropDecorator(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
+const Prop = function PropDecorator(token, flags, notFoundValue = THROW_IF_NOT_FOUND) {
     if (!(this instanceof Prop)) {
         return makePropertyDecorator(Prop, token, function (instance, propertyName, token, injector) {
-            instance[propertyName] = injector.get(token instanceof ForwardRef ? token.getRef() : token, notFoundValue, flags);
+            instance[propertyName] = injector.get(token instanceof ForwardRef ? token.getRef() : token, flags, notFoundValue);
         });
     }
 };
@@ -424,15 +424,15 @@ class ReflectiveInjector extends Injector {
     /**
      * 用于获取当前注入器上下文内的实例、对象或数据
      * @param token 访问 token
-     * @param notFoundValue 如未查找到的返回值
      * @param flags 查询规则
+     * @param notFoundValue 如未查找到的返回值
      */
-    get(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
+    get(token, flags = InjectFlags.Default, notFoundValue = THROW_IF_NOT_FOUND) {
         var _a;
         flags = flags || InjectFlags.Default;
         if (flags === InjectFlags.SkipSelf) {
             if (this.parentInjector) {
-                return this.parentInjector.get(token, notFoundValue);
+                return this.parentInjector.get(token, InjectFlags.Default, notFoundValue);
             }
             if (notFoundValue !== THROW_IF_NOT_FOUND) {
                 return notFoundValue;
@@ -476,7 +476,7 @@ class ReflectiveInjector extends Injector {
             return notFoundValue;
         }
         if (this.parentInjector) {
-            return this.parentInjector.get(token, notFoundValue, flags === InjectFlags.Optional ? InjectFlags.Optional : InjectFlags.Default);
+            return this.parentInjector.get(token, flags === InjectFlags.Optional ? InjectFlags.Optional : InjectFlags.Default, notFoundValue);
         }
         if (notFoundValue === THROW_IF_NOT_FOUND) {
             throw reflectiveInjectorErrorFn(token);
@@ -508,11 +508,11 @@ class ReflectiveInjector extends Injector {
             const tryValue = {};
             const injectToken = dep.injectKey instanceof ForwardRef ? dep.injectKey.getRef() : dep.injectKey;
             if (dep.visibility instanceof Self) {
-                reflectiveValue = this.get(injectToken, tryValue, InjectFlags.Self);
+                reflectiveValue = this.get(injectToken, InjectFlags.Self, tryValue);
             }
             else if (dep.visibility instanceof SkipSelf) {
                 if (this.parentInjector) {
-                    reflectiveValue = this.parentInjector.get(injectToken, tryValue);
+                    reflectiveValue = this.parentInjector.get(injectToken, InjectFlags.Default, tryValue);
                 }
                 else {
                     if (dep.optional) {
@@ -525,7 +525,7 @@ class ReflectiveInjector extends Injector {
                 }
             }
             else {
-                reflectiveValue = this.get(injectToken, tryValue);
+                reflectiveValue = this.get(injectToken, InjectFlags.Default, tryValue);
             }
             if (reflectiveValue === tryValue) {
                 if (dep.optional) {
@@ -656,7 +656,12 @@ class Component extends ReflectiveInjector {
         return this._changed;
     }
     constructor(parentComponent, type, props, key) {
-        super(parentComponent, [], type.scope);
+        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;
@@ -1199,19 +1204,37 @@ function watch(deps, callback) {
     return destroyFn;
 }
 /**
- * 通过 IoC 容器当前组件提供上下文共享数据的方法
- * @param provider
+ * 给组件添加注解
+ * @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 provide(provider) {
-    const component = getSetupContext();
-    component.provide(provider);
+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 = InjectFlags.SkipSelf) {
+function inject(token, flags = InjectFlags.Default, notFoundValue = THROW_IF_NOT_FOUND) {
     const component = getSetupContext();
-    return component.get(token, notFoundValue, flags);
+    return component.get(token, flags, notFoundValue);
 }
 /**
  * 获取当前组件实例
@@ -1848,19 +1871,19 @@ class RootComponent extends Component {
 const viewflyErrorFn = makeError('Viewfly');
 function viewfly(config) {
     const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
-    const appProviders = [{
-            provide: NativeRenderer,
-            useValue: nativeRenderer
-        }];
     const modules = [];
     let destroyed = false;
     let appHost = null;
-    const rootComponent = new RootComponent(context || null, () => {
-        provide(appProviders);
+    const rootComponent = new RootComponent(context || null, withAnnotation({
+        providers: [{
+                provide: NativeRenderer,
+                useValue: nativeRenderer
+            }]
+    }, () => {
         return () => {
             return destroyed ? null : root;
         };
-    }, function () {
+    }), function () {
         if (destroyed) {
             return;
         }
@@ -1882,12 +1905,7 @@ function viewfly(config) {
     }
     const app = {
         provide(providers) {
-            if (Array.isArray(providers)) {
-                appProviders.unshift(...providers);
-            }
-            else {
-                appProviders.unshift(providers);
-            }
+            rootComponent.provide(providers);
             return app;
         },
         use(module) {
@@ -1937,4 +1955,4 @@ function viewfly(config) {
     return app;
 }
 
-export { Component, DynamicRef, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXNodeFactory, NativeRenderer, NullInjector, Optional, Prop, ReflectiveInjector, RootComponent, Scope, Self, SkipSelf, StaticRef, THROW_IF_NOT_FOUND, Type, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, provide, viewfly, watch, withMemo };
+export { Component, DynamicRef, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXNodeFactory, NativeRenderer, NullInjector, Optional, Prop, ReflectiveInjector, RootComponent, Scope, Self, SkipSelf, StaticRef, THROW_IF_NOT_FOUND, Type, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };

package/bundles/index.js

@@ -207,7 +207,7 @@ class NullInjector extends Injector {
         super(...arguments);
         this.parentInjector = null;
     }
-    get(token, notFoundValue = THROW_IF_NOT_FOUND) {
+    get(token, flag, notFoundValue = THROW_IF_NOT_FOUND) {
         if (notFoundValue === THROW_IF_NOT_FOUND) {
             throw nullInjectorErrorFn(token);
         }
@@ -241,10 +241,10 @@ const Optional = function OptionalDecorator() {
         return makeParamDecorator(Optional, new Optional());
     }
 };
-const Prop = function PropDecorator(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
+const Prop = function PropDecorator(token, flags, notFoundValue = THROW_IF_NOT_FOUND) {
     if (!(this instanceof Prop)) {
         return makePropertyDecorator(Prop, token, function (instance, propertyName, token, injector) {
-            instance[propertyName] = injector.get(token instanceof ForwardRef ? token.getRef() : token, notFoundValue, flags);
+            instance[propertyName] = injector.get(token instanceof ForwardRef ? token.getRef() : token, flags, notFoundValue);
         });
     }
 };
@@ -426,15 +426,15 @@ class ReflectiveInjector extends Injector {
     /**
      * 用于获取当前注入器上下文内的实例、对象或数据
      * @param token 访问 token
-     * @param notFoundValue 如未查找到的返回值
      * @param flags 查询规则
+     * @param notFoundValue 如未查找到的返回值
      */
-    get(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
+    get(token, flags = exports.InjectFlags.Default, notFoundValue = THROW_IF_NOT_FOUND) {
         var _a;
         flags = flags || exports.InjectFlags.Default;
         if (flags === exports.InjectFlags.SkipSelf) {
             if (this.parentInjector) {
-                return this.parentInjector.get(token, notFoundValue);
+                return this.parentInjector.get(token, exports.InjectFlags.Default, notFoundValue);
             }
             if (notFoundValue !== THROW_IF_NOT_FOUND) {
                 return notFoundValue;
@@ -478,7 +478,7 @@ class ReflectiveInjector extends Injector {
             return notFoundValue;
         }
         if (this.parentInjector) {
-            return this.parentInjector.get(token, notFoundValue, flags === exports.InjectFlags.Optional ? exports.InjectFlags.Optional : exports.InjectFlags.Default);
+            return this.parentInjector.get(token, flags === exports.InjectFlags.Optional ? exports.InjectFlags.Optional : exports.InjectFlags.Default, notFoundValue);
         }
         if (notFoundValue === THROW_IF_NOT_FOUND) {
             throw reflectiveInjectorErrorFn(token);
@@ -510,11 +510,11 @@ class ReflectiveInjector extends Injector {
             const tryValue = {};
             const injectToken = dep.injectKey instanceof ForwardRef ? dep.injectKey.getRef() : dep.injectKey;
             if (dep.visibility instanceof Self) {
-                reflectiveValue = this.get(injectToken, tryValue, exports.InjectFlags.Self);
+                reflectiveValue = this.get(injectToken, exports.InjectFlags.Self, tryValue);
             }
             else if (dep.visibility instanceof SkipSelf) {
                 if (this.parentInjector) {
-                    reflectiveValue = this.parentInjector.get(injectToken, tryValue);
+                    reflectiveValue = this.parentInjector.get(injectToken, exports.InjectFlags.Default, tryValue);
                 }
                 else {
                     if (dep.optional) {
@@ -527,7 +527,7 @@ class ReflectiveInjector extends Injector {
                 }
             }
             else {
-                reflectiveValue = this.get(injectToken, tryValue);
+                reflectiveValue = this.get(injectToken, exports.InjectFlags.Default, tryValue);
             }
             if (reflectiveValue === tryValue) {
                 if (dep.optional) {
@@ -658,7 +658,12 @@ class Component extends ReflectiveInjector {
         return this._changed;
     }
     constructor(parentComponent, type, props, key) {
-        super(parentComponent, [], type.scope);
+        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;
@@ -1201,19 +1206,37 @@ function watch(deps, callback) {
     return destroyFn;
 }
 /**
- * 通过 IoC 容器当前组件提供上下文共享数据的方法
- * @param provider
+ * 给组件添加注解
+ * @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 provide(provider) {
-    const component = getSetupContext();
-    component.provide(provider);
+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 = exports.InjectFlags.SkipSelf) {
+function inject(token, flags = exports.InjectFlags.Default, notFoundValue = THROW_IF_NOT_FOUND) {
     const component = getSetupContext();
-    return component.get(token, notFoundValue, flags);
+    return component.get(token, flags, notFoundValue);
 }
 /**
  * 获取当前组件实例
@@ -1850,19 +1873,19 @@ class RootComponent extends Component {
 const viewflyErrorFn = makeError('Viewfly');
 function viewfly(config) {
     const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
-    const appProviders = [{
-            provide: NativeRenderer,
-            useValue: nativeRenderer
-        }];
     const modules = [];
     let destroyed = false;
     let appHost = null;
-    const rootComponent = new RootComponent(context || null, () => {
-        provide(appProviders);
+    const rootComponent = new RootComponent(context || null, withAnnotation({
+        providers: [{
+                provide: NativeRenderer,
+                useValue: nativeRenderer
+            }]
+    }, () => {
         return () => {
             return destroyed ? null : root;
         };
-    }, function () {
+    }), function () {
         if (destroyed) {
             return;
         }
@@ -1884,12 +1907,7 @@ function viewfly(config) {
     }
     const app = {
         provide(providers) {
-            if (Array.isArray(providers)) {
-                appProviders.unshift(...providers);
-            }
-            else {
-                appProviders.unshift(providers);
-            }
+            rootComponent.provide(providers);
             return app;
         },
         use(module) {
@@ -1976,7 +1994,7 @@ exports.onMounted = onMounted;
 exports.onPropsChanged = onPropsChanged;
 exports.onUnmounted = onUnmounted;
 exports.onUpdated = onUpdated;
-exports.provide = provide;
 exports.viewfly = viewfly;
 exports.watch = watch;
+exports.withAnnotation = withAnnotation;
 exports.withMemo = withMemo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "0.6.3",
+  "version": "1.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",
@@ -47,7 +47,7 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "67d1ad7eff77c30dfafa3bc6a51a21ecde114aec",
+  "gitHead": "8a25e6e350ba9cade6036506e7fe2aba4e4396ac",
   "dependencies": {
     "reflect-metadata": "^0.1.13"
   }