@viewfly/core 0.2.0 → 0.2.1

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

@@ -25,7 +25,6 @@ export declare class ReflectiveInjector extends Injector {
     /**
      * 解决并获取依赖参数
      * @param deps 依赖规则
-     * @param notFoundValue 未查找到时的返回值
      * @private
      */
     private resolveDeps;

package/bundles/foundation/component.d.ts

@@ -11,20 +11,20 @@ export declare class Component extends ReflectiveInjector implements JSXTypeof<J
     props: Props;
     key?: Key | undefined;
     $$typeOf: JSXInternal.ComponentSetup<any>;
-    unmountedCallbacks: LifeCycleCallback[];
-    mountCallbacks: LifeCycleCallback[];
-    propsChangedCallbacks: PropsChangedCallback<any>[];
-    updatedCallbacks: LifeCycleCallback[];
     instance: JSXInternal.ComponentInstance<Props>;
     template: JSXInternal.JSXNode;
     changedSubComponents: Set<Component>;
     get dirty(): boolean;
     get changed(): boolean;
     $$view: ComponentView;
-    protected _dirty: boolean;
-    protected _changed: boolean;
+    unmountedCallbacks: LifeCycleCallback[];
+    mountCallbacks: LifeCycleCallback[];
+    propsChangedCallbacks: PropsChangedCallback<any>[];
+    updatedCallbacks: LifeCycleCallback[];
     private updatedDestroyCallbacks;
     private propsChangedDestroyCallbacks;
+    protected _dirty: boolean;
+    protected _changed: boolean;
     private unWatch?;
     private isFirstRending;
     private refs;

package/bundles/foundation/renderer.d.ts

@@ -1,3 +1,3 @@
 import { NativeNode, NativeRenderer } from './injection-tokens';
 import { Component } from './component';
-export declare function createRenderer(component: Component, nativeRenderer: NativeRenderer): (host: NativeNode) => void;
+export declare function createRenderer(component: Component, nativeRenderer: NativeRenderer, version: string): (host: NativeNode) => void;

package/bundles/index.esm.js

@@ -129,6 +129,7 @@ const Injectable = function InjectableDecorator(options) {
 /**
  * 生成自定义依赖注入 token 的类
  */
+/* eslint-disable-next-line */
 class InjectionToken {
     constructor(description) {
         this.description = description;
@@ -391,8 +392,8 @@ function normalizeDeps(provide, deps) {
             }
         }
         if (typeof r.injectKey === 'undefined') {
-            throw new Error(`The ${index} th dependent parameter type of \`${stringify(provide)}\` was not obtained,
-if the dependency is declared later, you can refer to it using \`constructor(@Inject(forwardRef(() => [Type|InjectionToken])) paramName: [Type]) {}\``);
+            /* eslint-disable max-len */
+            throw new Error(`The ${index} th dependent parameter type of \`${stringify(provide)}\` was not obtained, if the dependency is declared later, you can refer to it using \`constructor(@Inject(forwardRef(() => [Type|InjectionToken])) paramName: [Type]) {}\``);
         }
         return r;
     });
@@ -442,7 +443,7 @@ class ReflectiveInjector extends Injector {
         for (let i = 0; i < this.normalizedProviders.length; i++) {
             const normalizedProvider = this.normalizedProviders[i];
             if (normalizedProvider.provide === token) {
-                return this.getValue(token, THROW_IF_NOT_FOUND, normalizedProvider);
+                return this.getValue(token, normalizedProvider);
             }
         }
         if (!(token instanceof InjectionToken)) {
@@ -451,13 +452,13 @@ class ReflectiveInjector extends Injector {
                 const normalizedProvider = normalizeProvider(token);
                 if (this.scope === scope) {
                     this.normalizedProviders.push(normalizedProvider);
-                    return this.getValue(token, THROW_IF_NOT_FOUND, normalizedProvider);
+                    return this.getValue(token, normalizedProvider);
                 }
                 const parentInjector = this.parentInjector;
                 if (!parentInjector || parentInjector instanceof NullInjector) {
                     if (normalizedProvider.scope === 'root') {
                         this.normalizedProviders.push(normalizedProvider);
-                        return this.getValue(token, THROW_IF_NOT_FOUND, normalizedProvider);
+                        return this.getValue(token, normalizedProvider);
                     }
                     if (notFoundValue !== THROW_IF_NOT_FOUND) {
                         return notFoundValue;
@@ -480,9 +481,9 @@ class ReflectiveInjector extends Injector {
         }
         return notFoundValue;
     }
-    getValue(token, notFoundValue, normalizedProvider) {
+    getValue(token, normalizedProvider) {
         const { generateFactory, deps } = normalizedProvider;
-        const params = this.resolveDeps(deps, notFoundValue);
+        const params = this.resolveDeps(deps);
         let value = this.recordValues.get(token);
         if (value) {
             return value;
@@ -497,10 +498,9 @@ class ReflectiveInjector extends Injector {
     /**
      * 解决并获取依赖参数
      * @param deps 依赖规则
-     * @param notFoundValue 未查找到时的返回值
      * @private
      */
-    resolveDeps(deps, notFoundValue) {
+    resolveDeps(deps) {
         return deps.map(dep => {
             let reflectiveValue;
             const tryValue = {};
@@ -663,15 +663,15 @@ class Component extends ReflectiveInjector {
         this.props = props;
         this.key = key;
         this.$$typeOf = this.type;
+        this.changedSubComponents = new Set();
         this.unmountedCallbacks = [];
         this.mountCallbacks = [];
         this.propsChangedCallbacks = [];
         this.updatedCallbacks = [];
-        this.changedSubComponents = new Set();
-        this._dirty = true;
-        this._changed = true;
         this.updatedDestroyCallbacks = [];
         this.propsChangedDestroyCallbacks = [];
+        this._dirty = true;
+        this._changed = true;
         this.isFirstRending = true;
     }
     markAsDirtied() {
@@ -724,7 +724,7 @@ class Component extends ReflectiveInjector {
         isSetup = false;
         componentSetupStack.pop();
         signalDepsStack.push([]);
-        let template = this.instance.$render();
+        const template = this.instance.$render();
         const deps = signalDepsStack.pop();
         this.unWatch = useEffect(Array.from(new Set(deps)), () => {
             this.markAsDirtied();
@@ -797,9 +797,10 @@ class Component extends ReflectiveInjector {
         for (const fn of this.unmountedCallbacks) {
             fn();
         }
-        this.updatedCallbacks = [];
         this.mountCallbacks = [];
         this.updatedCallbacks = [];
+        this.propsChangedCallbacks = [];
+        this.unmountedCallbacks = [];
     }
     invokePropsChangedHooks(newProps) {
         const oldProps = this.props;
@@ -1082,7 +1083,7 @@ function listen(model, deps, callback, isContinue) {
  * @param isContinue 可选的停止函数，在每次值更新后调用，当返回值为 false 时，将不再监听依赖的变化
  */
 function useDerived(callback, isContinue) {
-    let { data, deps } = invokeDepFn(callback);
+    const { data, deps } = invokeDepFn(callback);
     const signal = useSignal(data);
     const component = getSetupContext(false);
     const unListen = listen(signal, deps, callback, isContinue);
@@ -1207,10 +1208,11 @@ function withMemo(canUseMemo, render) {
     };
 }
 
-function createRenderer(component, nativeRenderer) {
+function createRenderer(component, nativeRenderer, version) {
     let isInit = true;
     return function render(host) {
         if (isInit) {
+            nativeRenderer.setProperty(host, 'viewfly-version', version);
             isInit = false;
             const atom = {
                 jsxNode: component,
@@ -1800,6 +1802,7 @@ class RootComponent extends Component {
 }
 
 const viewflyErrorFn = makeError('Viewfly');
+const VERSION = "0.2.1";
 function viewfly(config) {
     const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
     const appProviders = [];
@@ -1811,7 +1814,7 @@ function viewfly(config) {
             return destroyed ? null : root;
         };
     });
-    const render = createRenderer(rootComponent, nativeRenderer);
+    const render = createRenderer(rootComponent, nativeRenderer, VERSION);
     let isStarted = false;
     let task = null;
     function microTask(callback) {
@@ -1889,4 +1892,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, 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, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, provide, useDerived, useEffect, useRef, useSignal, viewfly, withMemo };

package/bundles/index.js

@@ -131,6 +131,7 @@ const Injectable = function InjectableDecorator(options) {
 /**
  * 生成自定义依赖注入 token 的类
  */
+/* eslint-disable-next-line */
 class InjectionToken {
     constructor(description) {
         this.description = description;
@@ -393,8 +394,8 @@ function normalizeDeps(provide, deps) {
             }
         }
         if (typeof r.injectKey === 'undefined') {
-            throw new Error(`The ${index} th dependent parameter type of \`${stringify(provide)}\` was not obtained,
-if the dependency is declared later, you can refer to it using \`constructor(@Inject(forwardRef(() => [Type|InjectionToken])) paramName: [Type]) {}\``);
+            /* eslint-disable max-len */
+            throw new Error(`The ${index} th dependent parameter type of \`${stringify(provide)}\` was not obtained, if the dependency is declared later, you can refer to it using \`constructor(@Inject(forwardRef(() => [Type|InjectionToken])) paramName: [Type]) {}\``);
         }
         return r;
     });
@@ -444,7 +445,7 @@ class ReflectiveInjector extends Injector {
         for (let i = 0; i < this.normalizedProviders.length; i++) {
             const normalizedProvider = this.normalizedProviders[i];
             if (normalizedProvider.provide === token) {
-                return this.getValue(token, THROW_IF_NOT_FOUND, normalizedProvider);
+                return this.getValue(token, normalizedProvider);
             }
         }
         if (!(token instanceof InjectionToken)) {
@@ -453,13 +454,13 @@ class ReflectiveInjector extends Injector {
                 const normalizedProvider = normalizeProvider(token);
                 if (this.scope === scope) {
                     this.normalizedProviders.push(normalizedProvider);
-                    return this.getValue(token, THROW_IF_NOT_FOUND, normalizedProvider);
+                    return this.getValue(token, normalizedProvider);
                 }
                 const parentInjector = this.parentInjector;
                 if (!parentInjector || parentInjector instanceof NullInjector) {
                     if (normalizedProvider.scope === 'root') {
                         this.normalizedProviders.push(normalizedProvider);
-                        return this.getValue(token, THROW_IF_NOT_FOUND, normalizedProvider);
+                        return this.getValue(token, normalizedProvider);
                     }
                     if (notFoundValue !== THROW_IF_NOT_FOUND) {
                         return notFoundValue;
@@ -482,9 +483,9 @@ class ReflectiveInjector extends Injector {
         }
         return notFoundValue;
     }
-    getValue(token, notFoundValue, normalizedProvider) {
+    getValue(token, normalizedProvider) {
         const { generateFactory, deps } = normalizedProvider;
-        const params = this.resolveDeps(deps, notFoundValue);
+        const params = this.resolveDeps(deps);
         let value = this.recordValues.get(token);
         if (value) {
             return value;
@@ -499,10 +500,9 @@ class ReflectiveInjector extends Injector {
     /**
      * 解决并获取依赖参数
      * @param deps 依赖规则
-     * @param notFoundValue 未查找到时的返回值
      * @private
      */
-    resolveDeps(deps, notFoundValue) {
+    resolveDeps(deps) {
         return deps.map(dep => {
             let reflectiveValue;
             const tryValue = {};
@@ -665,15 +665,15 @@ class Component extends ReflectiveInjector {
         this.props = props;
         this.key = key;
         this.$$typeOf = this.type;
+        this.changedSubComponents = new Set();
         this.unmountedCallbacks = [];
         this.mountCallbacks = [];
         this.propsChangedCallbacks = [];
         this.updatedCallbacks = [];
-        this.changedSubComponents = new Set();
-        this._dirty = true;
-        this._changed = true;
         this.updatedDestroyCallbacks = [];
         this.propsChangedDestroyCallbacks = [];
+        this._dirty = true;
+        this._changed = true;
         this.isFirstRending = true;
     }
     markAsDirtied() {
@@ -726,7 +726,7 @@ class Component extends ReflectiveInjector {
         isSetup = false;
         componentSetupStack.pop();
         signalDepsStack.push([]);
-        let template = this.instance.$render();
+        const template = this.instance.$render();
         const deps = signalDepsStack.pop();
         this.unWatch = useEffect(Array.from(new Set(deps)), () => {
             this.markAsDirtied();
@@ -799,9 +799,10 @@ class Component extends ReflectiveInjector {
         for (const fn of this.unmountedCallbacks) {
             fn();
         }
-        this.updatedCallbacks = [];
         this.mountCallbacks = [];
         this.updatedCallbacks = [];
+        this.propsChangedCallbacks = [];
+        this.unmountedCallbacks = [];
     }
     invokePropsChangedHooks(newProps) {
         const oldProps = this.props;
@@ -1084,7 +1085,7 @@ function listen(model, deps, callback, isContinue) {
  * @param isContinue 可选的停止函数，在每次值更新后调用，当返回值为 false 时，将不再监听依赖的变化
  */
 function useDerived(callback, isContinue) {
-    let { data, deps } = invokeDepFn(callback);
+    const { data, deps } = invokeDepFn(callback);
     const signal = useSignal(data);
     const component = getSetupContext(false);
     const unListen = listen(signal, deps, callback, isContinue);
@@ -1209,10 +1210,11 @@ function withMemo(canUseMemo, render) {
     };
 }
 
-function createRenderer(component, nativeRenderer) {
+function createRenderer(component, nativeRenderer, version) {
     let isInit = true;
     return function render(host) {
         if (isInit) {
+            nativeRenderer.setProperty(host, 'viewfly-version', version);
             isInit = false;
             const atom = {
                 jsxNode: component,
@@ -1802,6 +1804,7 @@ class RootComponent extends Component {
 }
 
 const viewflyErrorFn = makeError('Viewfly');
+const VERSION = "0.2.1";
 function viewfly(config) {
     const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
     const appProviders = [];
@@ -1813,7 +1816,7 @@ function viewfly(config) {
             return destroyed ? null : root;
         };
     });
-    const render = createRenderer(rootComponent, nativeRenderer);
+    const render = createRenderer(rootComponent, nativeRenderer, VERSION);
     let isStarted = false;
     let task = null;
     function microTask(callback) {
@@ -1913,6 +1916,7 @@ exports.Self = Self;
 exports.SkipSelf = SkipSelf;
 exports.THROW_IF_NOT_FOUND = THROW_IF_NOT_FOUND;
 exports.Type = Type;
+exports.VERSION = VERSION;
 exports.createRenderer = createRenderer;
 exports.forwardRef = forwardRef;
 exports.inject = inject;

package/bundles/viewfly.d.ts

@@ -1,6 +1,7 @@
 import type { Provider } from './di/_api';
 import { JSXInternal, NativeNode, NativeRenderer } from './foundation/_api';
 import { Injector } from './di/_api';
+export declare const VERSION: string;
 /**
  * Viewfly 配置项
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "0.2.0",
+  "version": "0.2.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",
@@ -30,6 +30,7 @@
   "keywords": [],
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.3",
+    "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-typescript": "^11.1.2",
     "rimraf": "^3.0.2",
     "rollup": "^3.26.3",
@@ -46,5 +47,5 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "2c9ebe27f560cbb7ccdd35adb4ba812084ebaed8"
+  "gitHead": "b66ca589f7662cd518fc2e5955b3e3ff9de83f94"
 }