Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support parse method result #2485

Merged
merged 8 commits into from
Jan 6, 2025
Merged

Support parse method result #2485

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
95c31f3
feat: support callback props in parser
zhuxudong Jan 2, 2025
45fe351
chore: add some comments
zhuxudong Jan 2, 2025
8813081
chore: format code
zhuxudong Jan 3, 2025
4397241
refactor: use new method struct
zhuxudong Jan 3, 2025
68bc369
chore: rename
zhuxudong Jan 3, 2025
bf1733e
refactor: rename
zhuxudong Jan 6, 2025
3c2c29f
refactor: rename
zhuxudong Jan 6, 2025
ff700c5
chore: prettier code
zhuxudong Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions packages/loader/src/resource-deserialize/resources/parser/ReflectionParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
import type {
IAssetRef,
IBasicType,
ICanParseResultObject,
IClassObject,
IClassTypeObject,
IComponentRef,
IEntity,
IEntityRef,
IComponentRef,
IHierarchyFile,
IMethodParams,
IRefEntity
} from "../schema";
import { ParserContext, ParserType } from "./ParserContext";
Expand Down Expand Up @@ -70,17 +73,27 @@
});
}

parseMethod(instance: any, methodName: string, methodParams: Array<IBasicType>) {
return Promise.all(methodParams.map((param) => this.parseBasicType(param))).then((result) => {
return instance[methodName](...result);
parseMethod(instance: any, methodName: string, methodParams: IMethodParams) {
const isCanParseResultObject = ReflectionParser._isCanParseResultObject(methodParams);
const params = isCanParseResultObject ? methodParams.params : methodParams;

return Promise.all(params.map((param) => this.parseBasicType(param))).then((result) => {
const methodResult = instance[methodName](...result);
if (isCanParseResultObject && methodParams.result) {
return this.parsePropsAndMethods(methodResult, methodParams.result);
} else {

Check warning on line 84 in packages/loader/src/resource-deserialize/resources/parser/ReflectionParser.ts

View check run for this annotation

Codecov / codecov/patch

packages/loader/src/resource-deserialize/resources/parser/ReflectionParser.ts#L83-L84 

Added lines #L83 - L84 were not covered by tests
return methodResult;
}
});
}

parseBasicType(value: IBasicType, originValue?: any): Promise<any> {
if (Array.isArray(value)) {
return Promise.all(value.map((item) => this.parseBasicType(item)));
} else if (typeof value === "object" && value != null) {
if (ReflectionParser._isClass(value)) {
if (ReflectionParser._isClassType(value)) {
return Promise.resolve(Loader.getClass(value["classType"]));

Check warning on line 95 in packages/loader/src/resource-deserialize/resources/parser/ReflectionParser.ts

View check run for this annotation

Codecov / codecov/patch

packages/loader/src/resource-deserialize/resources/parser/ReflectionParser.ts#L95 

Added line #L95 was not covered by tests
} else if (ReflectionParser._isClass(value)) {
// class object
return this.parseClassObject(value);
} else if (ReflectionParser._isAssetRef(value)) {
Expand Down Expand Up @@ -158,6 +171,10 @@
return value["class"] !== undefined;
}

private static _isClassType(value: any): value is IClassTypeObject {
return value["classType"] !== undefined;
}

private static _isAssetRef(value: any): value is IAssetRef {
return value["refId"] !== undefined;
}
Expand All @@ -169,4 +186,8 @@
private static _isComponentRef(value: any): value is IComponentRef {
return value["ownerId"] !== undefined && value["componentId"] !== undefined;
}

private static _isCanParseResultObject(value: any): value is ICanParseResultObject {
return Array.isArray(value?.params);
}
}
17 changes: 15 additions & 2 deletions packages/loader/src/resource-deserialize/resources/schema/BasicSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,15 @@ export interface IHierarchyFile {
entities: Array<IEntity>;
}

export type IMethodParams = Array<IBasicType>;
export type ICanParseResultObject = {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a awful name 😂

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes i think so

Copy link
Contributor

@luzhuang luzhuang Jan 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about:

type IMethodParams = Array<IBasicType> ;

type INeedAssignInstance = {
  methods?: { [methodName: string]: Array<IMethodParams> };
  props?: { [key: string]: IBasicType | IMethodParams };
}

IMethodParamsAndRes = {
   params: IMethodParams;
   result?: INeedAssignInstance
}

type IMethodInfo = IMethodParams | IMethodParamsAndRes

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use markdown and pay attention to format of typescript code.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, opted after discuss

params: Array<IBasicType>;
result?: {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is the addEffect method. Using a result to invoke functions or assign properties is not appropriate. You should follow the design of addComponent, which @cptbtptpbcptdtptp can understand.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addComponents is handled specifically，addEffect can't follow it

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you give a specific example?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我说的是HierarcyParser里的parseComponent，如果你指的是引擎代码里的addComponent可以加参数的形式的话，是不满足我们这次的需求的。addComponent只能传构造参数，且不能调用方法。这次需要addEffect调用之后拿到实例再去赋值和调用方法。

methods?: { [methodName: string]: Array<IMethodParams> };
props?: { [key: string]: IBasicType | IMethodParams };
};
};

export type IMethodParams = Array<IBasicType> | ICanParseResultObject;

export interface IBasicEntity {
name?: string;
Expand Down Expand Up @@ -73,11 +81,15 @@ export type IComponent = { id: string; refId?: string } & IClassObject;

export type IClassObject = {
class: string;
constructParams?: IMethodParams;
constructParams?: Array<IBasicType>;
methods?: { [methodName: string]: Array<IMethodParams> };
props?: { [key: string]: IBasicType | IMethodParams };
};

export type IClassTypeObject = {
Copy link
Contributor

@luzhuang luzhuang Jan 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need discuss: merge to IClassObject use needInstance to distinguish?

classType: string;
};

export type IBasicType =
| string
| number
Expand All @@ -86,6 +98,7 @@ export type IBasicType =
| undefined
| IAssetRef
| IClassObject
| IClassTypeObject
| IMethodParams
| IEntityRef;

Expand Down
Loading