@viewfly/core 0.0.30 → 0.1.0

package/bundles/foundation/component.d.ts

@@ -11,7 +11,7 @@ export declare class Component extends ReflectiveInjector implements JSXTypeof<J
     props: Props;
     key?: Key | undefined;
     $$typeOf: JSXInternal.ComponentSetup<any>;
-    destroyCallbacks: LifeCycleCallback[];
+    unmountedCallbacks: LifeCycleCallback[];
     mountCallbacks: LifeCycleCallback[];
     propsChangedCallbacks: PropsChangedCallback<any>[];
     updatedCallbacks: LifeCycleCallback[];
@@ -99,7 +99,7 @@ export declare function onPropsChanged<T extends Props>(callback: PropsChangedCa
  * 当组件销毁时调用回调函数
  * @param callback
  */
-export declare function onDestroy(callback: () => void): void;
+export declare function onUnmounted(callback: () => void): void;
 export interface RefListener<T> {
     (current: T): void | (() => void);
 }
@@ -143,6 +143,7 @@ declare const depsKey: unique symbol;
  * ```
  */
 export interface Signal<T> {
+    $isSignal: true;
     /**
      *  直接调用一个 Signal 实例，可以获取最新状态
      */

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

@@ -33,6 +33,7 @@ export declare class JSXComponent implements JSXTypeof<JSXInternal.ComponentSetu
     props: Props;
     factory: (parentComponent: Component) => Component;
     key?: Key | undefined;
+    static createInstance(type: JSXInternal.ComponentSetup, props: Props, factory: (parentComponent: Component) => Component, key?: Key): JSXComponent;
     $$typeOf: JSXInternal.ComponentSetup<any>;
     constructor(type: JSXInternal.ComponentSetup, props: Props, factory: (parentComponent: Component) => Component, key?: Key | undefined);
     createInstance(parentComponent: Component): Component;

package/bundles/index.esm.js

@@ -663,7 +663,7 @@ class Component extends ReflectiveInjector {
         this.props = props;
         this.key = key;
         this.$$typeOf = this.type;
-        this.destroyCallbacks = [];
+        this.unmountedCallbacks = [];
         this.mountCallbacks = [];
         this.propsChangedCallbacks = [];
         this.updatedCallbacks = [];
@@ -716,7 +716,7 @@ class Component extends ReflectiveInjector {
                 ref.bind(this.instance);
             }
         });
-        this.destroyCallbacks.push(() => {
+        this.unmountedCallbacks.push(() => {
             for (const ref of this.refs) {
                 ref.unBind(this.instance);
             }
@@ -791,7 +791,7 @@ class Component extends ReflectiveInjector {
             fn();
         });
         this.propsChangedDestroyCallbacks = [];
-        for (const fn of this.destroyCallbacks) {
+        for (const fn of this.unmountedCallbacks) {
             fn();
         }
         this.updatedCallbacks = [];
@@ -816,7 +816,7 @@ class Component extends ReflectiveInjector {
         for (const fn of this.mountCallbacks) {
             const destroyFn = fn();
             if (typeof destroyFn === 'function') {
-                this.destroyCallbacks.push(destroyFn);
+                this.unmountedCallbacks.push(destroyFn);
             }
         }
     }
@@ -912,9 +912,9 @@ function onPropsChanged(callback) {
  * 当组件销毁时调用回调函数
  * @param callback
  */
-function onDestroy(callback) {
+function onUnmounted(callback) {
     const component = getSetupContext();
-    component.destroyCallbacks.push(callback);
+    component.unmountedCallbacks.push(callback);
 }
 class Ref {
     constructor(callback) {
@@ -1000,6 +1000,7 @@ function useSignal(state) {
         }
         return state;
     }
+    signal.$isSignal = true;
     signal.set = function (newState) {
         if (newState === state) {
             return;
@@ -1011,6 +1012,14 @@ function useSignal(state) {
             fn();
         }
     };
+    //
+    // signal.toString = function () {
+    //   return String(state)
+    // }
+    //
+    // signal.valueOf = function () {
+    //   return state
+    // }
     signal[depsKey] = new Set();
     return signal;
 }
@@ -1075,7 +1084,7 @@ function useDerived(callback, isContinue) {
     const component = getSetupContext(false);
     const unListen = listen(signal, deps, callback, isContinue);
     if (component) {
-        component.destroyCallbacks.push(() => {
+        component.unmountedCallbacks.push(() => {
             unListen();
         });
     }
@@ -1083,9 +1092,7 @@ function useDerived(callback, isContinue) {
 }
 /* eslint-enable max-len*/
 function useEffect(deps, effect) {
-    if (typeof deps === 'function' &&
-        typeof deps.set === 'undefined' &&
-        typeof deps[depsKey] === 'undefined') {
+    if (typeof deps === 'function' && !deps.$isSignal) {
         deps = useDerived(deps);
     }
     const signals = Array.isArray(deps) ? deps : [deps];
@@ -1110,15 +1117,15 @@ function useEffect(deps, effect) {
         }
         isClean = true;
         if (component) {
-            const index = component.destroyCallbacks.indexOf(destroyFn);
-            component.destroyCallbacks.splice(index, 1);
+            const index = component.unmountedCallbacks.indexOf(destroyFn);
+            component.unmountedCallbacks.splice(index, 1);
         }
         for (const dep of signals) {
             dep[depsKey].delete(effectCallback);
         }
     };
     if (component) {
-        component.destroyCallbacks.push(destroyFn);
+        component.unmountedCallbacks.push(destroyFn);
     }
     return destroyFn;
 }
@@ -1151,7 +1158,7 @@ function jsx(setup, props, key) {
     if (typeof setup === 'string') {
         return JSXElement.createInstance(setup, props, key);
     }
-    return new JSXComponent(setup, props, function (context) {
+    return JSXComponent.createInstance(setup, props, function (context) {
         return new Component(context, setup, props, key);
     }, key);
 }
@@ -1175,6 +1182,9 @@ class JSXElement {
     }
 }
 class JSXComponent {
+    static createInstance(type, props, factory, key) {
+        return new JSXComponent(type, props, factory, key);
+    }
     constructor(type, props, factory, key) {
         this.type = type;
         this.props = props;
@@ -1786,8 +1796,10 @@ class RootComponent extends Component {
 }
 
 const viewflyErrorFn = makeError('Viewfly');
-function viewfly({ context, nativeRenderer, autoUpdate, root }) {
+function viewfly(config) {
+    const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
     const appProviders = [];
+    const modules = [];
     let destroyed = false;
     const rootComponent = new RootComponent(context || null, () => {
         provide(appProviders);
@@ -1817,13 +1829,29 @@ function viewfly({ context, nativeRenderer, autoUpdate, root }) {
             }
             return app;
         },
+        use(module) {
+            if (Array.isArray(module)) {
+                modules.push(...module);
+            }
+            else {
+                modules.push(module);
+            }
+            return app;
+        },
         mount(host) {
+            var _a, _b;
             if (isStarted) {
                 throw viewflyErrorFn('application has already started.');
             }
+            for (const module of modules) {
+                (_a = module.setup) === null || _a === void 0 ? void 0 : _a.call(module, app);
+            }
             isStarted = true;
             appHost = host;
             render(host);
+            for (const module of modules) {
+                (_b = module.onAfterStartup) === null || _b === void 0 ? void 0 : _b.call(module, app);
+            }
             if (!autoUpdate) {
                 return app;
             }
@@ -1845,12 +1873,16 @@ function viewfly({ context, nativeRenderer, autoUpdate, root }) {
             return app;
         },
         destroy() {
+            var _a;
             destroyed = true;
             rootComponent.markAsDirtied();
             app.render();
+            for (const module of modules) {
+                (_a = module.onDestroy) === null || _a === void 0 ? void 0 : _a.call(module);
+            }
         }
     };
     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, createRenderer, forwardRef, inject, jsx, jsxs, makeError, normalizeProvider, onDestroy, onMounted, onPropsChanged, 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, createRenderer, forwardRef, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, provide, useDerived, useEffect, useRef, useSignal, viewfly, withMemo };

package/bundles/index.js

@@ -665,7 +665,7 @@ class Component extends ReflectiveInjector {
         this.props = props;
         this.key = key;
         this.$$typeOf = this.type;
-        this.destroyCallbacks = [];
+        this.unmountedCallbacks = [];
         this.mountCallbacks = [];
         this.propsChangedCallbacks = [];
         this.updatedCallbacks = [];
@@ -718,7 +718,7 @@ class Component extends ReflectiveInjector {
                 ref.bind(this.instance);
             }
         });
-        this.destroyCallbacks.push(() => {
+        this.unmountedCallbacks.push(() => {
             for (const ref of this.refs) {
                 ref.unBind(this.instance);
             }
@@ -793,7 +793,7 @@ class Component extends ReflectiveInjector {
             fn();
         });
         this.propsChangedDestroyCallbacks = [];
-        for (const fn of this.destroyCallbacks) {
+        for (const fn of this.unmountedCallbacks) {
             fn();
         }
         this.updatedCallbacks = [];
@@ -818,7 +818,7 @@ class Component extends ReflectiveInjector {
         for (const fn of this.mountCallbacks) {
             const destroyFn = fn();
             if (typeof destroyFn === 'function') {
-                this.destroyCallbacks.push(destroyFn);
+                this.unmountedCallbacks.push(destroyFn);
             }
         }
     }
@@ -914,9 +914,9 @@ function onPropsChanged(callback) {
  * 当组件销毁时调用回调函数
  * @param callback
  */
-function onDestroy(callback) {
+function onUnmounted(callback) {
     const component = getSetupContext();
-    component.destroyCallbacks.push(callback);
+    component.unmountedCallbacks.push(callback);
 }
 class Ref {
     constructor(callback) {
@@ -1002,6 +1002,7 @@ function useSignal(state) {
         }
         return state;
     }
+    signal.$isSignal = true;
     signal.set = function (newState) {
         if (newState === state) {
             return;
@@ -1013,6 +1014,14 @@ function useSignal(state) {
             fn();
         }
     };
+    //
+    // signal.toString = function () {
+    //   return String(state)
+    // }
+    //
+    // signal.valueOf = function () {
+    //   return state
+    // }
     signal[depsKey] = new Set();
     return signal;
 }
@@ -1077,7 +1086,7 @@ function useDerived(callback, isContinue) {
     const component = getSetupContext(false);
     const unListen = listen(signal, deps, callback, isContinue);
     if (component) {
-        component.destroyCallbacks.push(() => {
+        component.unmountedCallbacks.push(() => {
             unListen();
         });
     }
@@ -1085,9 +1094,7 @@ function useDerived(callback, isContinue) {
 }
 /* eslint-enable max-len*/
 function useEffect(deps, effect) {
-    if (typeof deps === 'function' &&
-        typeof deps.set === 'undefined' &&
-        typeof deps[depsKey] === 'undefined') {
+    if (typeof deps === 'function' && !deps.$isSignal) {
         deps = useDerived(deps);
     }
     const signals = Array.isArray(deps) ? deps : [deps];
@@ -1112,15 +1119,15 @@ function useEffect(deps, effect) {
         }
         isClean = true;
         if (component) {
-            const index = component.destroyCallbacks.indexOf(destroyFn);
-            component.destroyCallbacks.splice(index, 1);
+            const index = component.unmountedCallbacks.indexOf(destroyFn);
+            component.unmountedCallbacks.splice(index, 1);
         }
         for (const dep of signals) {
             dep[depsKey].delete(effectCallback);
         }
     };
     if (component) {
-        component.destroyCallbacks.push(destroyFn);
+        component.unmountedCallbacks.push(destroyFn);
     }
     return destroyFn;
 }
@@ -1153,7 +1160,7 @@ function jsx(setup, props, key) {
     if (typeof setup === 'string') {
         return JSXElement.createInstance(setup, props, key);
     }
-    return new JSXComponent(setup, props, function (context) {
+    return JSXComponent.createInstance(setup, props, function (context) {
         return new Component(context, setup, props, key);
     }, key);
 }
@@ -1177,6 +1184,9 @@ class JSXElement {
     }
 }
 class JSXComponent {
+    static createInstance(type, props, factory, key) {
+        return new JSXComponent(type, props, factory, key);
+    }
     constructor(type, props, factory, key) {
         this.type = type;
         this.props = props;
@@ -1788,8 +1798,10 @@ class RootComponent extends Component {
 }
 
 const viewflyErrorFn = makeError('Viewfly');
-function viewfly({ context, nativeRenderer, autoUpdate, root }) {
+function viewfly(config) {
+    const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
     const appProviders = [];
+    const modules = [];
     let destroyed = false;
     const rootComponent = new RootComponent(context || null, () => {
         provide(appProviders);
@@ -1819,13 +1831,29 @@ function viewfly({ context, nativeRenderer, autoUpdate, root }) {
             }
             return app;
         },
+        use(module) {
+            if (Array.isArray(module)) {
+                modules.push(...module);
+            }
+            else {
+                modules.push(module);
+            }
+            return app;
+        },
         mount(host) {
+            var _a, _b;
             if (isStarted) {
                 throw viewflyErrorFn('application has already started.');
             }
+            for (const module of modules) {
+                (_a = module.setup) === null || _a === void 0 ? void 0 : _a.call(module, app);
+            }
             isStarted = true;
             appHost = host;
             render(host);
+            for (const module of modules) {
+                (_b = module.onAfterStartup) === null || _b === void 0 ? void 0 : _b.call(module, app);
+            }
             if (!autoUpdate) {
                 return app;
             }
@@ -1847,9 +1875,13 @@ function viewfly({ context, nativeRenderer, autoUpdate, root }) {
             return app;
         },
         destroy() {
+            var _a;
             destroyed = true;
             rootComponent.markAsDirtied();
             app.render();
+            for (const module of modules) {
+                (_a = module.onDestroy) === null || _a === void 0 ? void 0 : _a.call(module);
+            }
         }
     };
     return app;
@@ -1884,9 +1916,9 @@ exports.jsx = jsx;
 exports.jsxs = jsxs;
 exports.makeError = makeError;
 exports.normalizeProvider = normalizeProvider;
-exports.onDestroy = onDestroy;
 exports.onMounted = onMounted;
 exports.onPropsChanged = onPropsChanged;
+exports.onUnmounted = onUnmounted;
 exports.onUpdated = onUpdated;
 exports.provide = provide;
 exports.useDerived = useDerived;

package/bundles/viewfly.d.ts

@@ -17,7 +17,13 @@ export interface Config {
 export interface Application<T extends NativeNode = NativeNode> {
     provide(providers: Provider | Provider[]): Application<T>;
     mount(host: T, autoUpdate?: boolean): Application<T>;
+    use(module: Module | Module[]): Application<T>;
     render(): Application<T>;
     destroy(): void;
 }
-export declare function viewfly<T extends NativeNode>({ context, nativeRenderer, autoUpdate, root }: Config): Application<T>;
+export interface Module {
+    setup?(app: Application): void;
+    onAfterStartup?(app: Application): void;
+    onDestroy?(): void;
+}
+export declare function viewfly<T extends NativeNode>(config: Config): Application<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "0.0.30",
+  "version": "0.1.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",
@@ -46,5 +46,5 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "57f845762f1e40ca48ff9328d73358035d293aba"
+  "gitHead": "790bb591abb02c500f54c579c7783da66a999b87"
 }