diff --git a/src/Typo/app.ts b/src/Typo/app.ts index 8eeff37..6d7e56c 100644 --- a/src/Typo/app.ts +++ b/src/Typo/app.ts @@ -156,8 +156,8 @@ export namespace FibApp { export interface FibAppORMModel< PropertyTypes extends Record = Record, - Methods extends Record any> = Record any> - > extends FxOrmModel.Model { + Methods extends Record any> | unknown = Record any> + > extends FxOrmModel.Model { $webx: { // globally unique class id readonly cid: number @@ -393,7 +393,7 @@ export namespace FibApp { name: string, properties: T, opts?: U - ) => FibAppORMModel, Exclude>; + ) => FibAppORMModel, Exclude & Record any>>; } // compatible export type FibAppDb = FibAppORM diff --git a/typings/Typo/app.d.ts b/typings/Typo/app.d.ts index 2598e51..4d9586b 100644 --- a/typings/Typo/app.d.ts +++ b/typings/Typo/app.d.ts @@ -117,7 +117,7 @@ export declare namespace FibApp { }; }; }; - interface FibAppORMModel = Record, Methods extends Record any> = Record any>> extends FxOrmModel.Model { + interface FibAppORMModel = Record, Methods extends Record any> | unknown = Record any>> extends FxOrmModel.Model { $webx: { readonly cid: number; readonly model_name: string; @@ -311,7 +311,7 @@ export declare namespace FibApp { app: FibAppClass; models: GlobalAppModels; graphql(query: FibApp.GraphQLQueryString, req: FibApp.FibAppHttpRequest): T; - define: , U extends FibAppOrmModelDefOptions>>(name: string, properties: T, opts?: U) => FibAppORMModel, Exclude>; + define: , U extends FibAppOrmModelDefOptions>>(name: string, properties: T, opts?: U) => FibAppORMModel, Exclude & Record any>>; } export type FibAppDb = FibAppORM; export type FibAppFunctionToBeFilter = (FibAppFilterableApiFunction__WithModel | FibAppFilterableApiFunction__NullModel | FibAppOrmModelFunction | FibAppInternalApiFunction);