feat: allow 'Methods' unknown type.

fibjs · Oct 26, 2023 · 40e6cfa · 40e6cfa
1 parent f3aae8e
commit 40e6cfa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Typo/app.ts b/src/Typo/app.ts
@@ -156,8 +156,8 @@ export namespace FibApp {
 
     export interface FibAppORMModel<
         PropertyTypes extends Record<string, FxOrmInstance.FieldRuntimeType> = Record<string, FxOrmInstance.FieldRuntimeType>,
-        Methods extends Record<string, (...args: any) => any> = Record<string, (...args: any) => any>
-    > extends FxOrmModel.Model<PropertyTypes, Methods> {
+        Methods extends Record<string, (...args: any) => any> | unknown = Record<string, (...args: any) => any>
+    > extends FxOrmModel.Model<PropertyTypes, Methods extends unknown ? any : Methods> {
         $webx: {
             // globally unique class id
             readonly cid: number

diff --git a/typings/Typo/app.d.ts b/typings/Typo/app.d.ts
@@ -117,7 +117,7 @@ export declare namespace FibApp {
             };
         };
     };
-    interface FibAppORMModel<PropertyTypes extends Record<string, FxOrmInstance.FieldRuntimeType> = Record<string, FxOrmInstance.FieldRuntimeType>, Methods extends Record<string, (...args: any) => any> = Record<string, (...args: any) => any>> extends FxOrmModel.Model<PropertyTypes, Methods> {
+    interface FibAppORMModel<PropertyTypes extends Record<string, FxOrmInstance.FieldRuntimeType> = Record<string, FxOrmInstance.FieldRuntimeType>, Methods extends Record<string, (...args: any) => any> | unknown = Record<string, (...args: any) => any>> extends FxOrmModel.Model<PropertyTypes, Methods extends unknown ? any : Methods> {
         $webx: {
             readonly cid: number;
             readonly model_name: string;
@@ -311,7 +311,7 @@ export declare namespace FibApp {
         app: FibAppClass;
         models: GlobalAppModels;
         graphql<T = any>(query: FibApp.GraphQLQueryString, req: FibApp.FibAppHttpRequest): T;
-        define: <T extends Record<string, FxOrmModel.ComplexModelPropertyDefinition>, U extends FibAppOrmModelDefOptions<FxOrmModel.GetPropertiesType<T>>>(name: string, properties: T, opts?: U) => FibAppORMModel<FxOrmModel.GetPropertiesType<T>, Exclude<U['methods'], void>>;
+        define: <T extends Record<string, FxOrmModel.ComplexModelPropertyDefinition>, U extends FibAppOrmModelDefOptions<FxOrmModel.GetPropertiesType<T>>>(name: string, properties: T, opts?: U) => FibAppORMModel<FxOrmModel.GetPropertiesType<T>, Exclude<U['methods'], void> & Record<string, (...args: any) => any>>;
     }
     export type FibAppDb = FibAppORM;
     export type FibAppFunctionToBeFilter = (FibAppFilterableApiFunction__WithModel | FibAppFilterableApiFunction__NullModel | FibAppOrmModelFunction | FibAppInternalApiFunction);