@galacean/engine-loader 1.4.0-alpha.3 → 1.4.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-loader",
-  "version": "1.4.0-alpha.3",
+  "version": "1.4.0-beta.1",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -18,9 +18,9 @@
     "types/**/*"
   ],
   "dependencies": {
-    "@galacean/engine-core": "1.4.0-alpha.3",
-    "@galacean/engine-math": "1.4.0-alpha.3",
-    "@galacean/engine-rhi-webgl": "1.4.0-alpha.3"
+    "@galacean/engine-core": "1.4.0-beta.1",
+    "@galacean/engine-rhi-webgl": "1.4.0-beta.1",
+    "@galacean/engine-math": "1.4.0-beta.1"
   },
   "scripts": {
     "b:types": "tsc"

package/types/resource-deserialize/resources/parser/ReflectionParser.d.ts

@@ -1,5 +1,5 @@
 import { EngineObject, Entity } from "@galacean/engine-core";
-import type { IBasicType, IClassObject, IEntity, IHierarchyFile } from "../schema";
+import type { IBasicType, IClass, IEntity, IHierarchyFile, IMethodParams } from "../schema";
 import { ParserContext } from "./ParserContext";
 export declare class ReflectionParser {
     private readonly _context;
@@ -7,13 +7,15 @@ export declare class ReflectionParser {
     static registerCustomParseComponent(componentType: string, handle: Function): void;
     constructor(_context: ParserContext<IHierarchyFile, EngineObject>);
     parseEntity(entityConfig: IEntity): Promise<Entity>;
-    parseClassObject(item: IClassObject): Promise<any>;
-    parsePropsAndMethods(instance: any, item: Omit<IClassObject, "class">): Promise<any>;
-    parseMethod(instance: any, methodName: string, methodParams: Array<IBasicType>): Promise<any>;
+    parseClassObject(item: IClass): Promise<any>;
+    parsePropsAndMethods(instance: any, item: Omit<IClass, "class">): Promise<any>;
+    parseMethod(instance: any, methodName: string, methodParams: IMethodParams): Promise<any>;
     parseBasicType(value: IBasicType, originValue?: any): Promise<any>;
     private _getEntityByConfig;
     private static _isClass;
+    private static _isClassType;
     private static _isAssetRef;
     private static _isEntityRef;
     private static _isComponentRef;
+    private static _isMethodObject;
 }

package/types/resource-deserialize/resources/schema/BasicSchema.d.ts

@@ -23,7 +23,11 @@ export interface IColor {
 export interface IHierarchyFile {
     entities: Array<IEntity>;
 }
-export type IMethodParams = Array<IBasicType>;
+export type IMethod = {
+    params: Array<IBasicType>;
+    result?: IInstance;
+};
+export type IMethodParams = Array<IBasicType> | IMethod;
 export interface IBasicEntity {
     name?: string;
     id?: string;
@@ -41,15 +45,9 @@ export interface IRefEntity extends IBasicEntity {
     assetRefId: string;
     key?: string;
     isClone?: boolean;
-    modifications: {
+    modifications: (IInstance & {
         target: IPrefabModifyTarget;
-        methods?: {
-            [methodName: string]: Array<IMethodParams>;
-        };
-        props?: {
-            [key: string]: IBasicType | IMethodParams;
-        };
-    }[];
+    })[];
     removedEntities: IPrefabModifyTarget[];
     removedComponents: IPrefabModifyTarget[];
 }
@@ -68,18 +66,23 @@ export interface IStrippedEntity extends IBasicEntity {
 export type IComponent = {
     id: string;
     refId?: string;
-} & IClassObject;
-export type IClassObject = {
+} & IClass;
+export type IClass = {
     class: string;
-    constructParams?: IMethodParams;
+    constructParams?: Array<IBasicType>;
+} & IInstance;
+export interface IInstance {
     methods?: {
         [methodName: string]: Array<IMethodParams>;
     };
     props?: {
         [key: string]: IBasicType | IMethodParams;
     };
+}
+export type IClassType = {
+    classType: string;
 };
-export type IBasicType = string | number | boolean | null | undefined | IAssetRef | IClassObject | IMethodParams | IEntityRef;
+export type IBasicType = string | number | boolean | null | undefined | IAssetRef | IClass | IClassType | IMethodParams | IEntityRef;
 export type IAssetRef = {
     key?: string;
     refId: string;