更新在初始化生命周期里的报错机制

es/page.common.js

@@ -498,42 +498,47 @@ export function reRender(option, extra) {
         catch (err) {
             rollback();
             console.error(err);
-            assert(false);
+            // assert(false);
         }
     }
     else {
-        const data = formData
+        try {
-            ? formData.call(this, {
+            const data = formData
-                features,
+                ? formData.call(this, {
-                props: this.props,
+                    features,
-            })
+                    props: this.props,
-            : {};
+                })
-        if (extra) {
+                : {};
-            Object.assign(data, extra);
+            if (extra) {
-        }
+                Object.assign(data, extra);
-        if (this.state.oakFullpath) {
+            }
-            /**
+            if (this.state.oakFullpath) {
-             * loadingMore和pullLoading设计上有问题，暂不处理
+                /**
-             */
+                 * loadingMore和pullLoading设计上有问题，暂不处理
-            const oakDirty = this.features.runningTree.isDirty(this.state.oakFullpath);
+                 */
-            const oakExecuting = this.features.runningTree.isExecuting(this.state.oakFullpath);
+                const oakDirty = this.features.runningTree.isDirty(this.state.oakFullpath);
-            const oakExecutable = !oakExecuting && this.tryExecute();
+                const oakExecuting = this.features.runningTree.isExecuting(this.state.oakFullpath);
-            const oakLoading = this.features.runningTree.isLoading(this.state.oakFullpath);
+                const oakExecutable = !oakExecuting && this.tryExecute();
+                const oakLoading = this.features.runningTree.isLoading(this.state.oakFullpath);
+                Object.assign(data, {
+                    oakDirty,
+                    oakExecutable,
+                    oakExecuting,
+                    oakLoading,
+                });
+            }
             Object.assign(data, {
-                oakDirty,
+                oakLocales: localeState.dataset,
-                oakExecutable,
+                oakLocalesVersion: localeState.version,
-                oakExecuting,
+                oakLng: localeState.lng,
-                oakLoading,
+                oakDefaultLng: localeState.defaultLng,
-            });
+                __time: Date.now(),
+            }); // 有些环境下如果传空值不触发判断
+            this.setState(data);
+        }
+        catch (err) {
+            console.error(err);
         }
-        Object.assign(data, {
-            oakLocales: localeState.dataset,
-            oakLocalesVersion: localeState.version,
-            oakLng: localeState.lng,
-            oakDefaultLng: localeState.defaultLng,
-            __time: Date.now(),
-        }); // 有些环境下如果传空值不触发判断
-        this.setState(data);
     }
 }
 export async function refresh() {

es/page.mp.js

@@ -1,5 +1,6 @@
 /// <reference path="../node_modules/@types/wechat-miniprogram/index.d.ts" />
 import { assert } from 'oak-domain/lib/utils/assert';
+import { OakException } from 'oak-domain/lib/types';
 import { onPathSet, reRender, refresh, loadMore, execute, destroyNode, getFreshValue, } from './page.common';
 import { cloneDeep, pull } from 'oak-domain/lib/utils/lodash';
 const OakProperties = {
@@ -720,7 +721,8 @@ export function createComponent(option, features) {
                 this.features = features;
                 this.featuresSubscribed = [];
                 created && created.call(this);
-                this.lifetime = 'created';
+                this._readyCalled = false;
+                this.oakLifetime = 'created';
             },
             attached() {
                 if (typeof data === 'function') {
@@ -785,27 +787,55 @@ export function createComponent(option, features) {
                         }
                     });
                 }
+                attached && attached.call(this);
                 if (this.props.oakPath ||
                     (this.iAmThePage() && this.oakOption.path)) {
                     const pathState = onPathSet.call(this, this.oakOption, this.iAmThePage());
-                    this.setState(pathState, () => {
+                    this.setState(pathState, async () => {
-                        if (this.lifetime === 'detached') {
+                        if (this.oakLifetime === 'detached') {
                             return;
                         }
                         const { oakFullpath } = this.state;
                         if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
-                            this.refresh();
+                            try {
+                                await this.refresh();
+                            }
+                            catch (err) {
+                                if (err instanceof OakException) {
+                                    err.tag2 = true;
+                                }
+                                throw err;
+                            }
                         }
                         else {
                             this.reRender();
                         }
+                        if (this.oakLifetime === 'detached') {
+                            return;
+                        }
+                        this.oakLifetime = 'attached';
+                        if (this._readyCalled) {
+                            // 小程序生命周期里的ready已经调用过了，在这里调用ready
+                            try {
+                                ready && await ready.call(this);
+                            }
+                            catch (err) {
+                                if (err instanceof OakException) {
+                                    err.tag2 = true;
+                                }
+                                throw err;
+                            }
+                            if (this.oakLifetime === 'detached') {
+                                return;
+                            }
+                            this.oakLifetime = 'ready';
+                        }
                     });
                 }
                 else if (!this.oakOption.entity) {
                     this.reRender();
+                    this.oakLifetime = 'attached';
                 }
-                attached && attached.call(this);
-                this.lifetime = 'attached';
             },
             detached() {
                 this.unsubscribeAll();
@@ -813,20 +843,37 @@ export function createComponent(option, features) {
                     (this.iAmThePage() || !this.props.oakZombie) &&
                     destroyNode.call(this, this.iAmThePage());
                 detached && detached.call(this);
-                this.lifetime = 'detached';
+                this.oakLifetime = 'detached';
             },
-            ready() {
+            async ready() {
-                // 等oakFullpath构建完成后再ready
+                /* // 等oakFullpath构建完成后再ready
+                // 这代码已经看不懂，感觉没用。 by Xc 20240701
                 if (this.state.oakFullpath) {
                     if (this.props.oakId) {
-                        this.features.runningTree.setId(this.state.oakFullpath, this.props.oakId);
+                        this.features.runningTree.setId(
+                            this.state.oakFullpath,
+                            this.props.oakId
+                        );
                     }
                     ready && ready.call(this);
                 }
                 else if (!this.oakOption.entity) {
                     ready && ready.call(this);
+                    this.oakLifetime = 'ready';
+                } */
+                if (this.oakLifetime === 'attached') {
+                    try {
+                        ready && await ready.call(this);
+                    }
+                    catch (err) {
+                        if (err instanceof OakException) {
+                            err.tag2 = true;
+                        }
+                        throw err;
+                    }
+                    this.oakLifetime = 'ready';
                 }
-                this.lifetime = 'ready';
+                this._readyCalled = true;
             },
             moved() {
                 moved && moved.call(this);

es/page.react.d.ts

@@ -13,10 +13,10 @@ export declare function createComponent<IsList extends boolean, ED extends Entit
     new (props: ComponentProps<ED, T, TProperty>): {
         features: BasicFeatures<ED> & FD;
         oakOption: OakComponentOption<IsList, ED, T, Cxt, FrontCxt, AD, FD, FormedData, TData, TProperty, TMethod>;
+        oakLifetime: string;
         isReachBottom: boolean;
         methodProps: Record<string, Function>;
         defaultProperties: Record<string, any>;
-        unmounted: boolean;
         iAmThePage(): boolean;
         isMobile(): boolean;
         supportPullDownRefresh(): boolean;

es/page.react.js

@@ -1,6 +1,7 @@
 import { assert } from 'oak-domain/lib/utils/assert';
 import React from 'react';
 import { get, pull } from 'oak-domain/lib/utils/lodash';
+import { OakException } from 'oak-domain/lib/types';
 import { onPathSet, reRender, refresh, loadMore, execute, destroyNode, getFreshValue, } from './page.common';
 class OakComponentBase extends React.PureComponent {
     featuresSubscribed = [];
@@ -408,10 +409,10 @@ export function createComponent(option, features) {
     class OakComponentWrapper extends OakComponentBase {
         features = features;
         oakOption = option;
+        oakLifetime = 'born';
         isReachBottom = false;
         methodProps;
         defaultProperties;
-        unmounted = false;
         constructor(props) {
             super(props);
             const methodProps = {
@@ -567,7 +568,9 @@ export function createComponent(option, features) {
                     this.defaultProperties[property] = properties[property];
                 }
             }
-            lifetimes?.created && lifetimes.created.call(this);
+            const createResult = lifetimes?.created && lifetimes.created.call(this);
+            assert(!(createResult instanceof Promise), 'created方法不能是异步');
+            this.oakLifetime = 'created';
         }
         // 编译器只会在page层注入path，component依赖父亲设置的oakPath
         iAmThePage() {
@@ -589,30 +592,6 @@ export function createComponent(option, features) {
                 this.addFeatureSub('cache', () => this.reRender());
             }
             lifetimes?.attached && lifetimes.attached.call(this);
-            const { oakPath } = this.props;
-            if (oakPath || path) {
-                const pathState = onPathSet.call(this, this.oakOption, this.iAmThePage());
-                if (this.unmounted) {
-                    return;
-                }
-                this.setState(pathState, () => {
-                    lifetimes?.ready && lifetimes.ready.call(this);
-                    lifetimes?.show && lifetimes.show.call(this);
-                    const { oakFullpath } = this.state;
-                    if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
-                        this.refresh();
-                    }
-                    else {
-                        this.reRender();
-                    }
-                });
-            }
-            else if (!this.oakOption.entity) {
-                // 如果没有entity，也不需要onPathSet，直接走ready
-                lifetimes?.ready && lifetimes.ready.call(this);
-                lifetimes?.show && lifetimes.show.call(this);
-                this.reRender();
-            }
             if (option.features) {
                 option.features.forEach(ele => {
                     if (typeof ele === 'string') {
@@ -645,22 +624,63 @@ export function createComponent(option, features) {
                     }
                 });
             }
+            this.oakLifetime = 'attached';
+            const { oakPath } = this.props;
+            if (oakPath || path) {
+                const pathState = onPathSet.call(this, this.oakOption, this.iAmThePage());
+                this.setState(pathState, async () => {
+                    if (this.oakLifetime === 'detached') {
+                        return;
+                    }
+                    try {
+                        const { oakFullpath } = this.state;
+                        if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
+                            await this.refresh();
+                        }
+                        else {
+                            this.reRender();
+                        }
+                        if (this.oakLifetime === 'detached') {
+                            return;
+                        }
+                        lifetimes?.ready && await lifetimes.ready.call(this);
+                    }
+                    catch (err) {
+                        if (err instanceof OakException) {
+                            err.tag2 = true;
+                        }
+                        throw err;
+                    }
+                    if (this.oakLifetime === 'detached') {
+                        return;
+                    }
+                    lifetimes?.show && lifetimes.show.call(this);
+                    this.oakLifetime = 'ready';
+                });
+            }
+            else if (!this.oakOption.entity) {
+                // 如果没有entity，也不需要onPathSet，直接走ready
+                lifetimes?.ready && await lifetimes.ready.call(this);
+                lifetimes?.show && lifetimes.show.call(this);
+                this.reRender();
+                this.oakLifetime = 'ready';
+            }
         }
         componentWillUnmount() {
             this.unsubscribeAll();
             this.state.oakFullpath && (this.iAmThePage() || !this.props.oakZombie) && destroyNode.call(this, this.iAmThePage());
             lifetimes?.detached && lifetimes.detached.call(this);
-            this.unmounted = true;
+            this.oakLifetime = 'detached';
         }
         async componentDidUpdate(prevProps, prevState) {
             if (prevProps.oakPath !== this.props.oakPath) {
                 // oakPath如果是用变量初始化，在这里再执行onPathSet，如果有entity的结点在此执行ready
                 assert(this.props.oakPath && this.oakOption.entity);
                 const pathState = onPathSet.call(this, this.oakOption, this.iAmThePage());
-                if (this.unmounted) {
-                    return;
-                }
                 this.setState(pathState, async () => {
+                    if (this.oakLifetime === 'detached') {
+                        return;
+                    }
                     if (prevProps.oakPath === undefined) {
                         // 如果每个页面都在oakFullpath形成后再渲染子结点，这个if感觉是不应该命中的
                         console.warn('发生了结点先形成再配置oakPath的情况，请检查代码修正');

es/types/Page.d.ts

@@ -95,18 +95,20 @@ export type ComponentPublicThisType<ED extends EntityDict & BaseEntityDict, T ex
     setState: (data: Partial<ComponentData<ED, T, FormedData, TData>>, callback?: () => void) => void;
     triggerEvent: <DetailType = any>(name: string, detail?: DetailType, options?: WechatMiniprogram.Component.TriggerEventOption) => void;
 } & TMethod & EMethod & OakCommonComponentMethods<ED, T> & OakListComponentMethods<ED, T> & OakSingleComponentMethods<ED, T>;
+export type OakLifetime = 'born' | 'created' | 'attached' | 'ready' | 'detached';
 export type ComponentFullThisType<ED extends EntityDict & BaseEntityDict, T extends keyof ED> = {
     features: BasicFeatures<ED>;
     state: OakComponentData<ED, T>;
     props: ComponentProps<ED, T, {}>;
     setState: (data: Partial<OakComponentData<ED, T>>, callback?: () => void) => void;
     triggerEvent: <DetailType = any>(name: string, detail?: DetailType, options?: WechatMiniprogram.Component.TriggerEventOption) => void;
+    oakLifetime: OakLifetime;
 } & OakCommonComponentMethods<ED, T> & OakListComponentMethods<ED, T> & OakSingleComponentMethods<ED, T>;
 export type OakComponentOption<IsList extends boolean, ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, FrontCxt extends SyncContext<ED>, AD extends Record<string, Aspect<ED, AsyncContext<ED>>>, FD extends Record<string, Feature>, FormedData extends Record<string, any>, TData extends Record<string, any>, TProperty extends DataOption, TMethod extends Record<string, Function>, EMethod extends Record<string, Function> = {}> = ComponentOption<IsList, ED, T, Cxt, FrontCxt, AD, FD, FormedData, TData, TProperty, TMethod, EMethod> & Partial<{
     lifetimes: {
         created?(): void;
         attached?(): void;
-        ready?(): void;
+        ready?(): any;
         moved?(): void;
         detached?(): void;
         error?(err: Error): void;

lib/page.common.js

@@ -502,42 +502,47 @@ function reRender(option, extra) {
         catch (err) {
             rollback();
             console.error(err);
-            (0, assert_1.assert)(false);
+            // assert(false);
         }
     }
     else {
-        const data = formData
+        try {
-            ? formData.call(this, {
+            const data = formData
-                features,
+                ? formData.call(this, {
-                props: this.props,
+                    features,
-            })
+                    props: this.props,
-            : {};
+                })
-        if (extra) {
+                : {};
-            Object.assign(data, extra);
+            if (extra) {
-        }
+                Object.assign(data, extra);
-        if (this.state.oakFullpath) {
+            }
-            /**
+            if (this.state.oakFullpath) {
-             * loadingMore和pullLoading设计上有问题，暂不处理
+                /**
-             */
+                 * loadingMore和pullLoading设计上有问题，暂不处理
-            const oakDirty = this.features.runningTree.isDirty(this.state.oakFullpath);
+                 */
-            const oakExecuting = this.features.runningTree.isExecuting(this.state.oakFullpath);
+                const oakDirty = this.features.runningTree.isDirty(this.state.oakFullpath);
-            const oakExecutable = !oakExecuting && this.tryExecute();
+                const oakExecuting = this.features.runningTree.isExecuting(this.state.oakFullpath);
-            const oakLoading = this.features.runningTree.isLoading(this.state.oakFullpath);
+                const oakExecutable = !oakExecuting && this.tryExecute();
+                const oakLoading = this.features.runningTree.isLoading(this.state.oakFullpath);
+                Object.assign(data, {
+                    oakDirty,
+                    oakExecutable,
+                    oakExecuting,
+                    oakLoading,
+                });
+            }
             Object.assign(data, {
-                oakDirty,
+                oakLocales: localeState.dataset,
-                oakExecutable,
+                oakLocalesVersion: localeState.version,
-                oakExecuting,
+                oakLng: localeState.lng,
-                oakLoading,
+                oakDefaultLng: localeState.defaultLng,
-            });
+                __time: Date.now(),
+            }); // 有些环境下如果传空值不触发判断
+            this.setState(data);
+        }
+        catch (err) {
+            console.error(err);
         }
-        Object.assign(data, {
-            oakLocales: localeState.dataset,
-            oakLocalesVersion: localeState.version,
-            oakLng: localeState.lng,
-            oakDefaultLng: localeState.defaultLng,
-            __time: Date.now(),
-        }); // 有些环境下如果传空值不触发判断
-        this.setState(data);
     }
 }
 exports.reRender = reRender;

lib/page.mp.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createComponent = void 0;
 /// <reference path="../node_modules/@types/wechat-miniprogram/index.d.ts" />
 const assert_1 = require("oak-domain/lib/utils/assert");
+const types_1 = require("oak-domain/lib/types");
 const page_common_1 = require("./page.common");
 const lodash_1 = require("oak-domain/lib/utils/lodash");
 const OakProperties = {
@@ -723,7 +724,8 @@ function createComponent(option, features) {
                 this.features = features;
                 this.featuresSubscribed = [];
                 created && created.call(this);
-                this.lifetime = 'created';
+                this._readyCalled = false;
+                this.oakLifetime = 'created';
             },
             attached() {
                 if (typeof data === 'function') {
@@ -788,27 +790,55 @@ function createComponent(option, features) {
                         }
                     });
                 }
+                attached && attached.call(this);
                 if (this.props.oakPath ||
                     (this.iAmThePage() && this.oakOption.path)) {
                     const pathState = page_common_1.onPathSet.call(this, this.oakOption, this.iAmThePage());
-                    this.setState(pathState, () => {
+                    this.setState(pathState, async () => {
-                        if (this.lifetime === 'detached') {
+                        if (this.oakLifetime === 'detached') {
                             return;
                         }
                         const { oakFullpath } = this.state;
                         if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
-                            this.refresh();
+                            try {
+                                await this.refresh();
+                            }
+                            catch (err) {
+                                if (err instanceof types_1.OakException) {
+                                    err.tag2 = true;
+                                }
+                                throw err;
+                            }
                         }
                         else {
                             this.reRender();
                         }
+                        if (this.oakLifetime === 'detached') {
+                            return;
+                        }
+                        this.oakLifetime = 'attached';
+                        if (this._readyCalled) {
+                            // 小程序生命周期里的ready已经调用过了，在这里调用ready
+                            try {
+                                ready && await ready.call(this);
+                            }
+                            catch (err) {
+                                if (err instanceof types_1.OakException) {
+                                    err.tag2 = true;
+                                }
+                                throw err;
+                            }
+                            if (this.oakLifetime === 'detached') {
+                                return;
+                            }
+                            this.oakLifetime = 'ready';
+                        }
                     });
                 }
                 else if (!this.oakOption.entity) {
                     this.reRender();
+                    this.oakLifetime = 'attached';
                 }
-                attached && attached.call(this);
-                this.lifetime = 'attached';
             },
             detached() {
                 this.unsubscribeAll();
@@ -816,20 +846,37 @@ function createComponent(option, features) {
                     (this.iAmThePage() || !this.props.oakZombie) &&
                     page_common_1.destroyNode.call(this, this.iAmThePage());
                 detached && detached.call(this);
-                this.lifetime = 'detached';
+                this.oakLifetime = 'detached';
             },
-            ready() {
+            async ready() {
-                // 等oakFullpath构建完成后再ready
+                /* // 等oakFullpath构建完成后再ready
+                // 这代码已经看不懂，感觉没用。 by Xc 20240701
                 if (this.state.oakFullpath) {
                     if (this.props.oakId) {
-                        this.features.runningTree.setId(this.state.oakFullpath, this.props.oakId);
+                        this.features.runningTree.setId(
+                            this.state.oakFullpath,
+                            this.props.oakId
+                        );
                     }
                     ready && ready.call(this);
                 }
                 else if (!this.oakOption.entity) {
                     ready && ready.call(this);
+                    this.oakLifetime = 'ready';
+                } */
+                if (this.oakLifetime === 'attached') {
+                    try {
+                        ready && await ready.call(this);
+                    }
+                    catch (err) {
+                        if (err instanceof types_1.OakException) {
+                            err.tag2 = true;
+                        }
+                        throw err;
+                    }
+                    this.oakLifetime = 'ready';
                 }
-                this.lifetime = 'ready';
+                this._readyCalled = true;
             },
             moved() {
                 moved && moved.call(this);

lib/page.react.d.ts

@@ -13,10 +13,10 @@ export declare function createComponent<IsList extends boolean, ED extends Entit
     new (props: ComponentProps<ED, T, TProperty>): {
         features: BasicFeatures<ED> & FD;
         oakOption: OakComponentOption<IsList, ED, T, Cxt, FrontCxt, AD, FD, FormedData, TData, TProperty, TMethod>;
+        oakLifetime: string;
         isReachBottom: boolean;
         methodProps: Record<string, Function>;
         defaultProperties: Record<string, any>;
-        unmounted: boolean;
         iAmThePage(): boolean;
         isMobile(): boolean;
         supportPullDownRefresh(): boolean;

lib/page.react.js

@@ -6,6 +6,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const assert_1 = require("oak-domain/lib/utils/assert");
 const react_1 = tslib_1.__importDefault(require("react"));
 const lodash_1 = require("oak-domain/lib/utils/lodash");
+const types_1 = require("oak-domain/lib/types");
 const page_common_1 = require("./page.common");
 class OakComponentBase extends react_1.default.PureComponent {
     featuresSubscribed = [];
@@ -413,10 +414,10 @@ function createComponent(option, features) {
     class OakComponentWrapper extends OakComponentBase {
         features = features;
         oakOption = option;
+        oakLifetime = 'born';
         isReachBottom = false;
         methodProps;
         defaultProperties;
-        unmounted = false;
         constructor(props) {
             super(props);
             const methodProps = {
@@ -572,7 +573,9 @@ function createComponent(option, features) {
                     this.defaultProperties[property] = properties[property];
                 }
             }
-            lifetimes?.created && lifetimes.created.call(this);
+            const createResult = lifetimes?.created && lifetimes.created.call(this);
+            (0, assert_1.assert)(!(createResult instanceof Promise), 'created方法不能是异步');
+            this.oakLifetime = 'created';
         }
         // 编译器只会在page层注入path，component依赖父亲设置的oakPath
         iAmThePage() {
@@ -594,30 +597,6 @@ function createComponent(option, features) {
                 this.addFeatureSub('cache', () => this.reRender());
             }
             lifetimes?.attached && lifetimes.attached.call(this);
-            const { oakPath } = this.props;
-            if (oakPath || path) {
-                const pathState = page_common_1.onPathSet.call(this, this.oakOption, this.iAmThePage());
-                if (this.unmounted) {
-                    return;
-                }
-                this.setState(pathState, () => {
-                    lifetimes?.ready && lifetimes.ready.call(this);
-                    lifetimes?.show && lifetimes.show.call(this);
-                    const { oakFullpath } = this.state;
-                    if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
-                        this.refresh();
-                    }
-                    else {
-                        this.reRender();
-                    }
-                });
-            }
-            else if (!this.oakOption.entity) {
-                // 如果没有entity，也不需要onPathSet，直接走ready
-                lifetimes?.ready && lifetimes.ready.call(this);
-                lifetimes?.show && lifetimes.show.call(this);
-                this.reRender();
-            }
             if (option.features) {
                 option.features.forEach(ele => {
                     if (typeof ele === 'string') {
@@ -650,22 +629,63 @@ function createComponent(option, features) {
                     }
                 });
             }
+            this.oakLifetime = 'attached';
+            const { oakPath } = this.props;
+            if (oakPath || path) {
+                const pathState = page_common_1.onPathSet.call(this, this.oakOption, this.iAmThePage());
+                this.setState(pathState, async () => {
+                    if (this.oakLifetime === 'detached') {
+                        return;
+                    }
+                    try {
+                        const { oakFullpath } = this.state;
+                        if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
+                            await this.refresh();
+                        }
+                        else {
+                            this.reRender();
+                        }
+                        if (this.oakLifetime === 'detached') {
+                            return;
+                        }
+                        lifetimes?.ready && await lifetimes.ready.call(this);
+                    }
+                    catch (err) {
+                        if (err instanceof types_1.OakException) {
+                            err.tag2 = true;
+                        }
+                        throw err;
+                    }
+                    if (this.oakLifetime === 'detached') {
+                        return;
+                    }
+                    lifetimes?.show && lifetimes.show.call(this);
+                    this.oakLifetime = 'ready';
+                });
+            }
+            else if (!this.oakOption.entity) {
+                // 如果没有entity，也不需要onPathSet，直接走ready
+                lifetimes?.ready && await lifetimes.ready.call(this);
+                lifetimes?.show && lifetimes.show.call(this);
+                this.reRender();
+                this.oakLifetime = 'ready';
+            }
         }
         componentWillUnmount() {
             this.unsubscribeAll();
             this.state.oakFullpath && (this.iAmThePage() || !this.props.oakZombie) && page_common_1.destroyNode.call(this, this.iAmThePage());
             lifetimes?.detached && lifetimes.detached.call(this);
-            this.unmounted = true;
+            this.oakLifetime = 'detached';
         }
         async componentDidUpdate(prevProps, prevState) {
             if (prevProps.oakPath !== this.props.oakPath) {
                 // oakPath如果是用变量初始化，在这里再执行onPathSet，如果有entity的结点在此执行ready
                 (0, assert_1.assert)(this.props.oakPath && this.oakOption.entity);
                 const pathState = page_common_1.onPathSet.call(this, this.oakOption, this.iAmThePage());
-                if (this.unmounted) {
-                    return;
-                }
                 this.setState(pathState, async () => {
+                    if (this.oakLifetime === 'detached') {
+                        return;
+                    }
                     if (prevProps.oakPath === undefined) {
                         // 如果每个页面都在oakFullpath形成后再渲染子结点，这个if感觉是不应该命中的
                         console.warn('发生了结点先形成再配置oakPath的情况，请检查代码修正');

lib/types/Page.d.ts

@@ -95,18 +95,20 @@ export type ComponentPublicThisType<ED extends EntityDict & BaseEntityDict, T ex
     setState: (data: Partial<ComponentData<ED, T, FormedData, TData>>, callback?: () => void) => void;
     triggerEvent: <DetailType = any>(name: string, detail?: DetailType, options?: WechatMiniprogram.Component.TriggerEventOption) => void;
 } & TMethod & EMethod & OakCommonComponentMethods<ED, T> & OakListComponentMethods<ED, T> & OakSingleComponentMethods<ED, T>;
+export type OakLifetime = 'born' | 'created' | 'attached' | 'ready' | 'detached';
 export type ComponentFullThisType<ED extends EntityDict & BaseEntityDict, T extends keyof ED> = {
     features: BasicFeatures<ED>;
     state: OakComponentData<ED, T>;
     props: ComponentProps<ED, T, {}>;
     setState: (data: Partial<OakComponentData<ED, T>>, callback?: () => void) => void;
     triggerEvent: <DetailType = any>(name: string, detail?: DetailType, options?: WechatMiniprogram.Component.TriggerEventOption) => void;
+    oakLifetime: OakLifetime;
 } & OakCommonComponentMethods<ED, T> & OakListComponentMethods<ED, T> & OakSingleComponentMethods<ED, T>;
 export type OakComponentOption<IsList extends boolean, ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, FrontCxt extends SyncContext<ED>, AD extends Record<string, Aspect<ED, AsyncContext<ED>>>, FD extends Record<string, Feature>, FormedData extends Record<string, any>, TData extends Record<string, any>, TProperty extends DataOption, TMethod extends Record<string, Function>, EMethod extends Record<string, Function> = {}> = ComponentOption<IsList, ED, T, Cxt, FrontCxt, AD, FD, FormedData, TData, TProperty, TMethod, EMethod> & Partial<{
     lifetimes: {
         created?(): void;
         attached?(): void;
-        ready?(): void;
+        ready?(): any;
         moved?(): void;
         detached?(): void;
         error?(err: Error): void;

src/page.common.ts

@@ -610,43 +610,48 @@ export function reRender<
         catch (err) {
             rollback();
             console.error(err);
-            assert(false);
+            // assert(false);
         }
     } else {
-        const data: Record<string, any> = formData
+        try {
-            ? formData.call(this, {
+            const data: Record<string, any> = formData
-                features,
+                ? formData.call(this, {
-                props: this.props,
+                    features,
-            } as any)
+                    props: this.props,
-            : {};
+                } as any)
-        if (extra) {
+                : {};
-            Object.assign(data, extra);
+            if (extra) {
-        }
+                Object.assign(data, extra);
-
+            }
-        if (this.state.oakFullpath) {
+    
-            /**
+            if (this.state.oakFullpath) {
-             * loadingMore和pullLoading设计上有问题，暂不处理
+                /**
-             */
+                 * loadingMore和pullLoading设计上有问题，暂不处理
-            const oakDirty = this.features.runningTree.isDirty(this.state.oakFullpath);
+                 */
-            const oakExecuting = this.features.runningTree.isExecuting(this.state.oakFullpath);
+                const oakDirty = this.features.runningTree.isDirty(this.state.oakFullpath);
-            const oakExecutable = !oakExecuting && this.tryExecute();
+                const oakExecuting = this.features.runningTree.isExecuting(this.state.oakFullpath);
-            const oakLoading = this.features.runningTree.isLoading(this.state.oakFullpath);
+                const oakExecutable = !oakExecuting && this.tryExecute();
+                const oakLoading = this.features.runningTree.isLoading(this.state.oakFullpath);
+                Object.assign(data, {
+                    oakDirty,
+                    oakExecutable,
+                    oakExecuting,
+                    oakLoading,
+                });
+            }
+    
             Object.assign(data, {
-                oakDirty,
+                oakLocales: localeState.dataset,
-                oakExecutable,
+                oakLocalesVersion: localeState.version,
-                oakExecuting,
+                oakLng: localeState.lng,
-                oakLoading,
+                oakDefaultLng: localeState.defaultLng,
-            });
+                __time: Date.now(),
+            });         // 有些环境下如果传空值不触发判断
+            this.setState(data);
+        }
+        catch (err) {
+            console.error(err);
         }
-
-        Object.assign(data, {
-            oakLocales: localeState.dataset,
-            oakLocalesVersion: localeState.version,
-            oakLng: localeState.lng,
-            oakDefaultLng: localeState.defaultLng,
-            __time: Date.now(),
-        });         // 有些环境下如果传空值不触发判断
-        this.setState(data);
     }
 }
 

src/page.mp.ts

@@ -1,6 +1,6 @@
 /// <reference path="../node_modules/@types/wechat-miniprogram/index.d.ts" />
 import { assert } from 'oak-domain/lib/utils/assert';
-import { Aspect, CheckerType, EntityDict } from 'oak-domain/lib/types';
+import { Aspect, CheckerType, EntityDict, OakException } from 'oak-domain/lib/types';
 import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
 import { BasicFeatures } from './features';
 import { Feature } from './types/Feature';
@@ -910,7 +910,8 @@ export function createComponent<
         WechatMiniprogram.Component.PropertyOption,
         MethodOption,
         {
-            lifetime: 'created' | 'attached' | 'ready' | 'detached';
+            oakLifetime: 'created' | 'attached' | 'ready' | 'detached';
+            _readyCalled: boolean;
             prevState: Record<string, any>;
             state: Record<string, any>;
             featuresSubscribed: Array<{
@@ -1046,7 +1047,8 @@ export function createComponent<
                 this.features = features;
                 this.featuresSubscribed = [];
                 created && created.call(this);
-                this.lifetime = 'created';
+                this._readyCalled = false;
+                this.oakLifetime = 'created';
             },
             attached() {
                 if (typeof data === 'function') {
@@ -1111,6 +1113,7 @@ export function createComponent<
                     });
                 }
 
+                attached && attached.call(this);
                 if (this.props.oakPath ||
                     (this.iAmThePage() && this.oakOption.path)) {
                     const pathState = onPathSet.call(
@@ -1118,22 +1121,49 @@ export function createComponent<
                         this.oakOption as any,
                         this.iAmThePage()
                     );
-                    this.setState(pathState as any, () => {
+                    this.setState(pathState as any, async () => {
-                        if (this.lifetime === 'detached') {
+                        if (this.oakLifetime === 'detached') {
                             return;
                         }
                         const { oakFullpath } = this.state;
                         if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
-                            this.refresh();
+                            try {
+                                await this.refresh();
+                            }
+                            catch (err) {
+                                if (err instanceof OakException) {
+                                    err.tag2 = true;
+                                }
+                                throw err;
+                            }
                         } else {
                             this.reRender();
                         }
+                        if (this.oakLifetime as any === 'detached') {
+                            return;
+                        }
+                        this.oakLifetime = 'attached';
+                        if (this._readyCalled) {
+                            // 小程序生命周期里的ready已经调用过了，在这里调用ready
+                            try {
+                                ready && await ready.call(this);                                
+                            }
+                            catch (err) {
+                                if (err instanceof OakException) {
+                                    err.tag2 = true;
+                                }
+                                throw err;
+                            }
+                            if (this.oakLifetime as any === 'detached') {
+                                return;
+                            }
+                            this.oakLifetime = 'ready';
+                        }
                     });
                 } else if (!this.oakOption.entity) {
                     this.reRender();
+                    this.oakLifetime = 'attached';
                 }
-                attached && attached.call(this);
-                this.lifetime = 'attached';
             },
             detached() {
                 this.unsubscribeAll();
@@ -1141,11 +1171,12 @@ export function createComponent<
                     (this.iAmThePage() || !this.props.oakZombie) &&
                     destroyNode.call(this as any, this.iAmThePage());
 
-                detached && detached.call(this);
+                detached && detached.call(this);                
-                this.lifetime = 'detached';
+                this.oakLifetime = 'detached';
             },
-            ready() {
+            async ready() {
-                // 等oakFullpath构建完成后再ready
+                /* // 等oakFullpath构建完成后再ready
+                // 这代码已经看不懂，感觉没用。 by Xc 20240701
                 if (this.state.oakFullpath) {
                     if (this.props.oakId) {
                         this.features.runningTree.setId(
@@ -1157,8 +1188,21 @@ export function createComponent<
                 }
                 else if (!this.oakOption.entity) {
                     ready && ready.call(this);
+                    this.oakLifetime = 'ready';
+                } */
+                if (this.oakLifetime === 'attached') {
+                    try {
+                        ready && await ready.call(this);
+                    }
+                    catch (err) {
+                        if (err instanceof OakException) {
+                            err.tag2 = true;
+                        }
+                        throw err;
+                    }
+                    this.oakLifetime = 'ready';
                 }
-                this.lifetime = 'ready';
+                this._readyCalled = true;
             },
             moved() {
                 moved && moved.call(this);

src/page.react.tsx

@@ -1,7 +1,7 @@
 import { assert } from 'oak-domain/lib/utils/assert';
 import React from 'react';
 import { get, pull } from 'oak-domain/lib/utils/lodash';
-import { Aspect, CheckerType, EntityDict, OpRecord } from 'oak-domain/lib/types';
+import { Aspect, CheckerType, EntityDict, OakException, OpRecord } from 'oak-domain/lib/types';
 import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
 import { BasicFeatures } from './features';
 import { NamedFilterItem, NamedSorterItem } from './types/NamedCondition';
@@ -691,10 +691,10 @@ export function createComponent<
     class OakComponentWrapper extends OakComponentBase<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod> {
         features = features;
         oakOption = option;
+        oakLifetime = 'born';
         isReachBottom = false;
         methodProps: Record<string, Function>;
         defaultProperties: Record<string, any>;
-        unmounted: boolean = false;
 
         constructor(props: ComponentProps<ED, T, TProperty>) {
             super(props);
@@ -885,7 +885,9 @@ export function createComponent<
                 }
             }
 
-            lifetimes?.created && lifetimes.created.call(this);
+            const createResult = lifetimes?.created && lifetimes.created.call(this);
+            assert(!(createResult as any instanceof Promise), 'created方法不能是异步');
+            this.oakLifetime = 'created';
         }
 
         // 编译器只会在page层注入path，component依赖父亲设置的oakPath
@@ -914,32 +916,6 @@ export function createComponent<
                 this.addFeatureSub('cache', () => this.reRender());
             }
             lifetimes?.attached && lifetimes.attached.call(this);
-            const { oakPath } = this.props;
-            if (oakPath || path) {
-                const pathState = onPathSet.call(this as any, this.oakOption as any, this.iAmThePage());
-                if (this.unmounted) {
-                    return;
-                }
-                this.setState(pathState as any, () => {
-                    lifetimes?.ready && lifetimes.ready.call(this);
-                    lifetimes?.show && lifetimes.show.call(this);
-
-                    const { oakFullpath } = this.state;
-                    if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
-                        this.refresh();
-                    }
-                    else {
-                        this.reRender();
-                    }
-                });
-            }
-            else if (!this.oakOption.entity) {
-                // 如果没有entity，也不需要onPathSet，直接走ready
-                lifetimes?.ready && lifetimes.ready.call(this);
-                lifetimes?.show && lifetimes.show.call(this);
-
-                this.reRender();
-            }
             if (option.features) {
                 option.features.forEach(
                     ele => {
@@ -974,6 +950,53 @@ export function createComponent<
                     }
                 );
             }
+
+            this.oakLifetime = 'attached';
+            const { oakPath } = this.props;
+            if (oakPath || path) {
+                const pathState = onPathSet.call(this as any, this.oakOption as any, this.iAmThePage());
+                this.setState(pathState as any, async () => {
+                    if (this.oakLifetime === 'detached') {
+                        return;
+                    }
+
+                    try {
+                        const { oakFullpath } = this.state;
+                        if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
+                            await this.refresh();
+                        }
+                        else {
+                            this.reRender();
+                        }
+                        if (this.oakLifetime === 'detached') {
+                            return;
+                        }
+    
+                        lifetimes?.ready && await lifetimes.ready.call(this);                        
+                    }
+                    catch (err) {
+                        if (err instanceof OakException) {
+                            err.tag2 = true;
+                        }
+                        throw err;
+                    }
+                    
+                    if (this.oakLifetime === 'detached') {
+                        return;
+                    }
+
+                    lifetimes?.show && lifetimes.show.call(this);
+                    this.oakLifetime = 'ready';
+                });
+            }
+            else if (!this.oakOption.entity) {
+                // 如果没有entity，也不需要onPathSet，直接走ready
+                lifetimes?.ready && await lifetimes.ready.call(this);
+                lifetimes?.show && lifetimes.show.call(this);
+
+                this.reRender();
+                this.oakLifetime = 'ready';
+            }
         }
 
         componentWillUnmount() {
@@ -983,7 +1006,7 @@ export function createComponent<
                 this.iAmThePage()
             );
             lifetimes?.detached && lifetimes.detached.call(this);
-            this.unmounted = true;
+            this.oakLifetime = 'detached';
         }
 
         async componentDidUpdate(prevProps: Record<string, any>, prevState: Record<string, any>) {
@@ -991,10 +1014,10 @@ export function createComponent<
                 // oakPath如果是用变量初始化，在这里再执行onPathSet，如果有entity的结点在此执行ready
                 assert(this.props.oakPath && this.oakOption.entity);
                 const pathState = onPathSet.call(this as any, this.oakOption as any, this.iAmThePage());
-                if (this.unmounted) {
-                    return;
-                }
                 this.setState(pathState as any, async () => {
+                    if (this.oakLifetime === 'detached') {
+                        return;
+                    }
                     if (prevProps.oakPath === undefined) {
                         // 如果每个页面都在oakFullpath形成后再渲染子结点，这个if感觉是不应该命中的
                         console.warn('发生了结点先形成再配置oakPath的情况，请检查代码修正');

src/types/Page.ts

@@ -245,6 +245,7 @@ export type ComponentPublicThisType<
         ) => void;
     } & TMethod & EMethod & OakCommonComponentMethods<ED, T> & OakListComponentMethods<ED, T> & OakSingleComponentMethods<ED, T>;
 
+export type OakLifetime = 'born' | 'created' | 'attached' | 'ready' | 'detached';
 export type ComponentFullThisType<
     ED extends EntityDict & BaseEntityDict,
     T extends keyof ED
@@ -261,6 +262,7 @@ export type ComponentFullThisType<
             detail?: DetailType,
             options?: WechatMiniprogram.Component.TriggerEventOption
         ) => void;
+        oakLifetime: OakLifetime;
     } & OakCommonComponentMethods<ED, T> & OakListComponentMethods<ED, T> & OakSingleComponentMethods<ED, T>;
 
 export type OakComponentOption<
@@ -281,7 +283,7 @@ export type OakComponentOption<
         lifetimes: {
             created?(): void;
             attached?(): void;
-            ready?(): void;
+            ready?(): any;
             moved?(): void;
             detached?(): void;
             error?(err: Error): void;