Oak-Team
/
oak-frontend-base
13
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 37 Wiki Activity

给两处assert添加错误信息

This commit is contained in:
pqcqaq 2024-12-06 22:20:09 +08:00
parent c7e8d113de
commit 61c7e39867
4 changed files with 206 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
es/types/Page.d.ts vendored
View File

@ -37,32 +37,63 @@ type FeatureDef<IsList extends boolean, ED extends EntityDict & BaseEntityDict,
type DevideWidth = 'pc' | 'mobile';
export type CreateDataDef<ED extends EntityDict & BaseEntityDict, T extends keyof ED> = ED[T]['CreateSingle']['data'] | (() => ED[T]['CreateSingle']['data']);
interface ComponentOption<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, Cxt>>, FD extends Record<string, Feature>, FormedData extends Record<string, any>, TData extends DataOption, TProperty extends DataOption, TMethod extends Record<string, Function>, EMethod extends Record<string, Function> = {}> {
/**
* 是否为列表组件
*/
isList?: IsList;
zombie?: true;
getTotal?: {
max: number;
deviceWidth?: DevideWidth | 'all';
} | number;
/**
* 组件所关联的实体
*/
entity?: T | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => T);
path?: string;
/**
* 需要监听的features
*/
features?: FeatureDef<IsList, ED, T, Cxt, FrontCxt, AD, FD, FormedData, TData, TProperty, TMethod, EMethod>[];
cascadeActions?: (this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => {
[K in keyof ED[T]['Schema']]?: ActionDef<ED, keyof ED>[];
};
/**
* 需要校验的actions
*/
actions?: ActionDef<ED, T>[] | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => ActionDef<ED, T>[]);
/**
* 需要获取的数据字段
* 若嵌套在list中，需要保证父list组件能够覆盖子组件的projection
*/
projection?: ED[T]['Selection']['data'] | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => ED[T]['Selection']['data'] | undefined);
append?: boolean;
/**
* 分页信息
*/
pagination?: Pick<Pagination, 'currentPage' | 'pageSize' | 'randomRange'> | Array<Pick<Pagination, 'currentPage' | 'pageSize' | 'randomRange'> & {
deviceWidth: DevideWidth;
}>;
/**
* 过滤器
*/
filters?: Array<{
filter: NonNullable<ED[T]['Selection']['filter']> | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => ED[T]['Selection']['filter'] | undefined);
'#name'?: string;
}>;
/**
* 排序器
*/
sorters?: Array<{
sorter: NonNullable<ED[T]['Selection']['sorter']>[number] | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => ED[T]['Selection']['sorter'] | NonNullable<ED[T]['Selection']['sorter']>[number]);
'#name'?: string;
}>;
/**
* 表单数据
* 在组件渲染前会调用此方法，将返回的数据放入组件的data中
* @param options 组件获取到的数据
* @returns 返回给页面的数据
*/
formData?: (options: {
data: IsList extends true ? RowWithActions<ED, T>[] : RowWithActions<ED, T>;
origin?: IsList extends true ? RowWithActions<ED, T>[] : RowWithActions<ED, T>;
@ -74,8 +105,17 @@ interface ComponentOption<IsList extends boolean, ED extends EntityDict & BaseEn
modified: boolean;
}) => FormedData;
ns?: T | T[];
/**
* 声明的State数据
*/
data?: ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => TData) | TData;
/**
* 需要参数传入的默认prop参数
*/
properties?: TProperty;
/**
* 自定义方法
*/
methods?: TMethod;
}
export type MiniprogramStyleMethods = {
@ -106,17 +146,63 @@ export type ComponentFullThisType<ED extends EntityDict & BaseEntityDict, T exte
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: {
/**
* 在组件实例刚刚被创建时执行
* sync only
*/
created?(): void;
/**
* 在组件实例进入页面节点树时执行
* sync only
*/
attached?(): void;
/**
* 在组件实例进入页面节点树时执行
* async or sync
*/
ready?(): any;
/**
* 小程序专用，在组件实例被移动到节点树另一个位置时执行
* sync only
*/
moved?(): void;
/**
* 在组件实例被从页面节点树移除时执行
* sync only
*/
detached?(): void;
/**
* 小程序专用，每当组件方法抛出错误时执行
* sync only
* @param err 错误信息
*/
error?(err: Error): void;
/**
* 组件所在的页面被展示时执行
* sync only
*/
show?(): void;
/**
* 组件所在的页面被隐藏时执行
* sync only
*/
hide?(): void;
/**
* 组件所在的页面尺寸变化时执行
* sync only
* @param size 页面尺寸信息
*/
resize?(size: WechatMiniprogram.Page.IResizeOption): void;
};
/**
* 监听器，监听State或者Props的变化
* 名称：监听的属性名
* 回调：监听的回调函数 (prev, next) => void
*/
listeners: Record<string, (this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>, prev: Record<string, any>, next: Record<string, any>) => void>;
}> & Partial<{
wechatMp: {

86
lib/types/Page.d.ts vendored
View File

@ -37,32 +37,63 @@ type FeatureDef<IsList extends boolean, ED extends EntityDict & BaseEntityDict,
type DevideWidth = 'pc' | 'mobile';
export type CreateDataDef<ED extends EntityDict & BaseEntityDict, T extends keyof ED> = ED[T]['CreateSingle']['data'] | (() => ED[T]['CreateSingle']['data']);
interface ComponentOption<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, Cxt>>, FD extends Record<string, Feature>, FormedData extends Record<string, any>, TData extends DataOption, TProperty extends DataOption, TMethod extends Record<string, Function>, EMethod extends Record<string, Function> = {}> {
/**
* 是否为列表组件
*/
isList?: IsList;
zombie?: true;
getTotal?: {
max: number;
deviceWidth?: DevideWidth | 'all';
} | number;
/**
* 组件所关联的实体
*/
entity?: T | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => T);
path?: string;
/**
* 需要监听的features
*/
features?: FeatureDef<IsList, ED, T, Cxt, FrontCxt, AD, FD, FormedData, TData, TProperty, TMethod, EMethod>[];
cascadeActions?: (this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => {
[K in keyof ED[T]['Schema']]?: ActionDef<ED, keyof ED>[];
};
/**
* 需要校验的actions
*/
actions?: ActionDef<ED, T>[] | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => ActionDef<ED, T>[]);
/**
* 需要获取的数据字段
* 若嵌套在list中，需要保证父list组件能够覆盖子组件的projection
*/
projection?: ED[T]['Selection']['data'] | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => ED[T]['Selection']['data'] | undefined);
append?: boolean;
/**
* 分页信息
*/
pagination?: Pick<Pagination, 'currentPage' | 'pageSize' | 'randomRange'> | Array<Pick<Pagination, 'currentPage' | 'pageSize' | 'randomRange'> & {
deviceWidth: DevideWidth;
}>;
/**
* 过滤器
*/
filters?: Array<{
filter: NonNullable<ED[T]['Selection']['filter']> | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => ED[T]['Selection']['filter'] | undefined);
'#name'?: string;
}>;
/**
* 排序器
*/
sorters?: Array<{
sorter: NonNullable<ED[T]['Selection']['sorter']>[number] | ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => ED[T]['Selection']['sorter'] | NonNullable<ED[T]['Selection']['sorter']>[number]);
'#name'?: string;
}>;
/**
* 表单数据
* 在组件渲染前会调用此方法，将返回的数据放入组件的data中
* @param options 组件获取到的数据
* @returns 返回给页面的数据
*/
formData?: (options: {
data: IsList extends true ? RowWithActions<ED, T>[] : RowWithActions<ED, T>;
origin?: IsList extends true ? RowWithActions<ED, T>[] : RowWithActions<ED, T>;
@ -74,8 +105,17 @@ interface ComponentOption<IsList extends boolean, ED extends EntityDict & BaseEn
modified: boolean;
}) => FormedData;
ns?: T | T[];
/**
* 声明的State数据
*/
data?: ((this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>) => TData) | TData;
/**
* 需要参数传入的默认prop参数
*/
properties?: TProperty;
/**
* 自定义方法
*/
methods?: TMethod;
}
export type MiniprogramStyleMethods = {
@ -106,17 +146,63 @@ export type ComponentFullThisType<ED extends EntityDict & BaseEntityDict, T exte
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: {
/**
* 在组件实例刚刚被创建时执行
* sync only
*/
created?(): void;
/**
* 在组件实例进入页面节点树时执行
* sync only
*/
attached?(): void;
/**
* 在组件实例进入页面节点树时执行
* async or sync
*/
ready?(): any;
/**
* 小程序专用，在组件实例被移动到节点树另一个位置时执行
* sync only
*/
moved?(): void;
/**
* 在组件实例被从页面节点树移除时执行
* sync only
*/
detached?(): void;
/**
* 小程序专用，每当组件方法抛出错误时执行
* sync only
* @param err 错误信息
*/
error?(err: Error): void;
/**
* 组件所在的页面被展示时执行
* sync only
*/
show?(): void;
/**
* 组件所在的页面被隐藏时执行
* sync only
*/
hide?(): void;
/**
* 组件所在的页面尺寸变化时执行
* sync only
* @param size 页面尺寸信息
*/
resize?(size: WechatMiniprogram.Page.IResizeOption): void;
};
/**
* 监听器，监听State或者Props的变化
* 名称：监听的属性名
* 回调：监听的回调函数 (prev, next) => void
*/
listeners: Record<string, (this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod, EMethod>, prev: Record<string, any>, next: Record<string, any>) => void>;
}> & Partial<{
wechatMp: {

58
src/features/runningTree.ts
View File

@ -250,6 +250,9 @@ class UpdateLogManager<ED extends EntityDict & BaseEntityDict, T extends keyof E
abstract class Node<ED extends EntityDict & BaseEntityDict> extends Feature {
private zombie: boolean = false;
/**
* 当前有几个组件正在使用这个结点
*/
private count: number = 0;
protected executing: boolean = false;
protected dirty?: boolean;
@ -2160,9 +2163,12 @@ export class RunningTree<ED extends EntityDict & BaseEntityDict> extends Feature
| VirtualNode<ED>
| undefined);
// 找到了之前的node，需要检查是否需要重用
if (node) {
if (node.getCount()) {
assert(!isPage || zombie, '暂时在路由上可能回归的页面必须设置为zombie');
if (node.getCount()) { // 有组件正在使用
// 页面组件已经被销毁，现在重新挂载，提示需要zombie
assert(!isPage || zombie, '暂时在路由上可能回归的页面必须设置为zombie'); // 是页面并且不是zombie
// 这次非virtualNode
if (entity) {
if (node instanceof ListNode) {
if (isList && node.getEntity() === entity) {
@ -2187,8 +2193,8 @@ export class RunningTree<ED extends EntityDict & BaseEntityDict> extends Feature
}
}
else {
assert(node instanceof SingleNode);
assert(!isList && node.getEntity() === entity);
assert(node instanceof SingleNode, `节点[${path}]应为Virtual节点，但现在是[${entity.toString()}]请检查oakPath是否重复`);
assert(!isList && node.getEntity() === entity, `节点${path}的entity为${node.getEntity().toString()}，但现在为${entity.toString()}，请检查oakPath是否重复`);
if (!node.getProjection() && projection) {
node.setProjection(projection);
if (id) {
@ -2202,8 +2208,10 @@ export class RunningTree<ED extends EntityDict & BaseEntityDict> extends Feature
}
}
}
// 上次不是virtualNode，这次变成virtual了
else {
assert(false, '这种情况暂时不考虑，跑出来再处理，by Xc 20240717');
assert(false, `创建Virtual节点时发现path[${fullPath}]已经存在有效的结点，请检查oakPath是否重复`);
// assert(false, '这种情况暂时不考虑，跑出来再处理，by Xc 20240717');
}
}
else {
@ -2321,26 +2329,28 @@ export class RunningTree<ED extends EntityDict & BaseEntityDict> extends Feature
destroyNode(path: string, isPage: boolean) {
const node = this.findNode(path);
if (node) {
// 如果node不存在，说明父结点已经析构掉了，无视即可
const cnt = node.decreaseCount();
if (cnt === 0) {
const zombie = node.isZombie();
if (!zombie) {
// 不是声明为zombie结点就析构
const childPath = path.slice(path.lastIndexOf('.') + 1);
const parent = node.getParent();
if (parent) {
parent.removeChild(childPath);
} else if (!parent) {
assert(this.root.hasOwnProperty(path));
unset(this.root, path);
}
node.destroy();
node.clearSubscribes();
}
}
// 如果node不存在，说明父结点已经析构掉了，无视即可
if (!node) {
return;
}
const cnt = node.decreaseCount();
if (cnt !== 0) {
return;
}
if (node.isZombie()) {
return;
}
// 不是声明为zombie结点就析构
const childPath = path.slice(path.lastIndexOf('.') + 1);
const parent = node.getParent();
if (parent) {
parent.removeChild(childPath);
} else if (!parent) {
assert(this.root.hasOwnProperty(path));
unset(this.root, path);
}
node.destroy();
node.clearSubscribes();
}
begin() {

2
src/page.common.ts
View File

@ -730,8 +730,6 @@ export function destroyNode<
unset(this.state, ['oakFullpath', 'oakEntity']);
}
export function getFreshValue<
ED extends EntityDict & BaseEntityDict,
T extends keyof ED