@viewfly/core 0.2.5 → 0.3.0

package/bundles/foundation/component.d.ts

@@ -212,9 +212,13 @@ export declare function useEffect<T = any>(deps: Signal<any>[], effect: EffectCa
  * 通过 IoC 容器当前组件提供上下文共享数据的方法
  * @param provider
  */
-export declare function provide(provider: Provider | Provider[]): Component;
+export declare function provide(provider: Provider | Provider[]): void;
 /**
  * 通过组件上下文获取 IoC 容器内数据的勾子方法
  */
 export declare function inject<T>(token: Type<T> | AbstractType<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
+/**
+ * 获取当前组件实例
+ */
+export declare function getCurrentInstance(): Component;
 export {};

package/bundles/foundation/types.d.ts

@@ -1,5 +1,6 @@
 import { Key } from './jsx-element';
 import { ExtractInstanceType, Ref } from './component';
+import { Scope } from '../di/injectable';
 export type JSXNode = JSXInternal.JSXNode;
 export declare namespace JSXInternal {
     type ClassNames = string | Record<string, unknown> | false | null | undefined | ClassNames[];
@@ -8,7 +9,10 @@ export declare namespace JSXInternal {
         $useMemo?(currentProps: P, prevProps: P): boolean;
     }
     type JSXNode = Element | JSXInternal.ElementClass | string | number | boolean | null | undefined | JSXNode[];
-    type ComponentSetup<P = any> = (props: P) => (() => Element) | ComponentInstance<P>;
+    interface ComponentSetup<P = any> {
+        (props: P): (() => Element) | ComponentInstance<P>;
+        scope?: Scope;
+    }
     type Element<P = any, C extends string | ComponentSetup<P> = string | ComponentSetup<P>> = C extends string ? IntrinsicElements[C] : (() => Element) | ComponentInstance<P>;
     interface IntrinsicAttributes {
         key?: Key;

package/bundles/index.esm.js

@@ -657,7 +657,7 @@ class Component extends ReflectiveInjector {
         super(parentComponent, [{
                 provide: Injector,
                 useFactory: () => this
-            }]);
+            }], type.scope);
         this.parentComponent = parentComponent;
         this.type = type;
         this.props = props;
@@ -1140,7 +1140,6 @@ function useEffect(deps, effect) {
 function provide(provider) {
     const component = getSetupContext();
     component.provide(provider);
-    return component;
 }
 /**
  * 通过组件上下文获取 IoC 容器内数据的勾子方法
@@ -1149,6 +1148,12 @@ function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags = InjectFlags.S
     const component = getSetupContext();
     return component.get(token, notFoundValue, flags);
 }
+/**
+ * 获取当前组件实例
+ */
+function getCurrentInstance() {
+    return getSetupContext();
+}
 
 class NativeRenderer {
 }
@@ -1808,7 +1813,7 @@ class RootComponent extends Component {
 }
 
 const viewflyErrorFn = makeError('Viewfly');
-const VERSION = "0.2.5";
+const VERSION = "0.3.0";
 function viewfly(config) {
     const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
     const appProviders = [];
@@ -1899,4 +1904,4 @@ function viewfly(config) {
     return app;
 }
 
-export { Component, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXComponent, JSXElement, JSXText, NativeRenderer, NullInjector, Optional, Prop, Ref, ReflectiveInjector, RootComponent, Scope, Self, SkipSelf, THROW_IF_NOT_FOUND, Type, VERSION, createRenderer, forwardRef, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, provide, useDerived, useEffect, useRef, useSignal, viewfly, withMemo };
+export { Component, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXComponent, JSXElement, JSXText, NativeRenderer, NullInjector, Optional, Prop, Ref, ReflectiveInjector, RootComponent, Scope, Self, SkipSelf, THROW_IF_NOT_FOUND, Type, VERSION, createRenderer, forwardRef, getCurrentInstance, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, provide, useDerived, useEffect, useRef, useSignal, viewfly, withMemo };

package/bundles/index.js

@@ -659,7 +659,7 @@ class Component extends ReflectiveInjector {
         super(parentComponent, [{
                 provide: Injector,
                 useFactory: () => this
-            }]);
+            }], type.scope);
         this.parentComponent = parentComponent;
         this.type = type;
         this.props = props;
@@ -1142,7 +1142,6 @@ function useEffect(deps, effect) {
 function provide(provider) {
     const component = getSetupContext();
     component.provide(provider);
-    return component;
 }
 /**
  * 通过组件上下文获取 IoC 容器内数据的勾子方法
@@ -1151,6 +1150,12 @@ function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags = exports.Injec
     const component = getSetupContext();
     return component.get(token, notFoundValue, flags);
 }
+/**
+ * 获取当前组件实例
+ */
+function getCurrentInstance() {
+    return getSetupContext();
+}
 
 class NativeRenderer {
 }
@@ -1810,7 +1815,7 @@ class RootComponent extends Component {
 }
 
 const viewflyErrorFn = makeError('Viewfly');
-const VERSION = "0.2.5";
+const VERSION = "0.3.0";
 function viewfly(config) {
     const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
     const appProviders = [];
@@ -1926,6 +1931,7 @@ exports.Type = Type;
 exports.VERSION = VERSION;
 exports.createRenderer = createRenderer;
 exports.forwardRef = forwardRef;
+exports.getCurrentInstance = getCurrentInstance;
 exports.inject = inject;
 exports.jsx = jsx;
 exports.jsxs = jsxs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "0.2.5",
+  "version": "0.3.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",