pangea-server 3.3.83 → 3.3.84

package/dist/auth/access-token.class.d.ts

@@ -8,8 +8,6 @@ export declare class AccessToken {
     verifyToken(token: string): Record<string, ModelId>;
     getTokenData(userCtor: UserCtor, user: ModelInstance<User>): {
         accessToken: string;
-        user: import("sequelize").InferAttributes<User, {
-            omit: never;
-        }>;
+        user: ModelInstance<User>;
     };
 }

package/dist/auth/auth.helpers.d.ts

@@ -4,22 +4,14 @@ import type { UserCtor, AuthMap } from './auth.types';
 type AuthHeader = string | undefined;
 export declare function login<U extends User>(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: BaseModelCtor<U>, extraWhere?: Where<U>): Promise<{
     accessToken: string;
-    user: import("sequelize").InferAttributes<User, {
-        omit: never;
-    }>;
+    user: ModelInstance<User>;
 }>;
 export declare function validateAccessToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: UserCtor): Promise<{
     accessToken: string;
-    user: import("sequelize").InferAttributes<User, {
-        omit: never;
-    }>;
+    user: ModelInstance<User>;
 }>;
-export declare function getUserFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: UserCtor): Promise<import("sequelize").InferAttributes<User, {
-    omit: never;
-}> | null> | null;
+export declare function getUserFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: UserCtor): Promise<ModelInstance<User> | null> | null;
 export declare function getUsersFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, authMap: AuthMap): Promise<{
-    [k: string]: import("sequelize").InferAttributes<User, {
-        omit: never;
-    }> | null;
+    [k: string]: ModelInstance<User> | null;
 }>;
 export {};

package/dist/auth/base-auth.class.d.ts

@@ -7,7 +7,5 @@ export declare abstract class BaseAuth<AM extends AuthMap> {
     notAllowed(): never;
     isUserAuth<T extends UserType<AM>>(type: T): boolean;
     getUserAuth<T extends UserType<AM>>(type: T): NonNullable<AuthUsers<AM>[T]>;
-    getUsersAuth<const T extends readonly UserType<AM>[]>(types: T): { [I in keyof T]: import("sequelize").InferAttributes<InstanceType<AM[T[I]]>, {
-        omit: never;
-    }> | null; };
+    getUsersAuth<const T extends readonly UserType<AM>[]>(types: T): { [I in keyof T]: ModelInstance<InstanceType<AM[T[I]]>> | null; };
 }

package/dist/database/database.types.d.ts

@@ -2,7 +2,7 @@ import * as seq from 'sequelize-typescript';
 import { BaseModel } from './models';
 import { Db as _Db } from './db.class';
 import type { OptionalFields, OptionalIfNullish } from 'pangea-helpers';
-import type { InferAttributes, InferCreationAttributes, CreationOptional, NonAttribute, AbstractDataTypeConstructor, AbstractDataType, Transaction, WhereOptions } from 'sequelize';
+import type { InferAttributes, InferCreationAttributes, CreationOptional, AbstractDataTypeConstructor, AbstractDataType, Transaction, WhereOptions } from 'sequelize';
 import type { ModelCtor } from 'sequelize-typescript';
 declare global {
     type ModelId = number;
@@ -12,14 +12,15 @@ declare global {
     type ColHidden<T> = T & {
         __brand: 'hidden';
     };
-    type ColVirtual<T> = NonAttribute<T>;
+    type ColVirtual<T> = CreationOptional<T>;
+    type FieldsToExclude = '__brand' | 'version';
+    type ModelInstance<BM extends BaseModel> = Omit<InferAttributes<BM>, FieldsToExclude>;
     type Where<BM extends BaseModel> = WhereOptions<BM> & Record<symbol, any>;
-    type InsertParams<BM extends BaseModel> = OptionalIfNullish<OptionalIfOptional<StripRelations<OptionalFields<IncludeHidden<Omit<InferCreationAttributes<BM>, '__brand'>>, Exclude<keyof InferCreationAttributes<BM>, '__brand'> & 'id'>>>>;
+    type InsertParams<BM extends BaseModel> = OptionalIfNullish<OptionalIfOptional<StripRelations<OptionalFields<IncludeHidden<Omit<InferCreationAttributes<BM>, FieldsToExclude>>, Exclude<keyof InferCreationAttributes<BM>, FieldsToExclude> & 'id'>>>>;
     type UpdateParams<BM extends BaseModel> = Partial<InsertParams<BM>>;
     type UpdateParamsWithId<BM extends BaseModel> = UpdateParams<BM> & {
         id: ModelId;
     };
-    type ModelInstance<BM extends BaseModel> = InferAttributes<BM>;
     type Tx = Transaction;
     type Db = _Db;
 }

package/dist/database/db.class.d.ts

@@ -36,47 +36,31 @@ type AggregateManyOptions<BM extends BaseModel> = Omit<FindManyOptions<BM>, 'ord
 export declare class Db {
     private __tx?;
     constructor(tx: Tx);
-    findOneOrNull<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<import("sequelize").InferAttributes<BM, {
-        omit: never;
-    }> | null>;
-    findOne<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<import("sequelize").InferAttributes<BM, {
-        omit: never;
-    }>>;
+    findOneOrNull<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<ModelInstance<BM> | null>;
+    findOne<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<ModelInstance<BM>>;
     aggregateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, attributes: Attributes, options?: AggregateOneOptions<BM>): Promise<unknown>;
     private __getFindOneBaseOptions;
-    findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<import("sequelize").InferAttributes<BM, {
-        omit: never;
-    }>[]>;
+    findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<ModelInstance<BM>[]>;
     count<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyOptions<BM>): Promise<number>;
     findManyWithCount<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<{
-        instances: import("sequelize").InferAttributes<BM, {
-            omit: never;
-        }>[];
+        instances: ModelInstance<BM>[];
         totalCount: number;
     }>;
     aggregateMany<BM extends BaseModel>(model: BaseModelCtor<BM>, config: AggregateManyConfig, options?: AggregateManyOptions<BM>): Promise<unknown[]>;
     private __getFindManyBaseOptions;
-    insertOne<BM extends BaseModel>(model: BaseModelCtor<BM>, params: InsertParams<BM>): Promise<import("sequelize").InferAttributes<BM, {
-        omit: never;
-    }>>;
+    insertOne<BM extends BaseModel>(model: BaseModelCtor<BM>, params: InsertParams<BM>): Promise<ModelInstance<BM>>;
     insertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, data: InsertParams<BM>[]): Promise<number>;
     upsertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, fieldsToUpdate: (keyof BM)[], data: InsertParams<BM>[]): Promise<number>;
     updateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, params: UpdateParamsWithId<BM>): Promise<ModelInstance<BM>>;
     updateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId, params: UpdateParams<BM>): Promise<ModelInstance<BM>>;
     updateMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>, params: UpdateParams<BM>): Promise<number>;
-    deleteOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<import("sequelize").InferAttributes<BM, {
-        omit: never;
-    }> | null>;
+    deleteOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<ModelInstance<BM> | null>;
     deleteMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<number>;
-    destroyOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<import("sequelize").InferAttributes<BM, {
-        omit: never;
-    }> | null>;
+    destroyOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<ModelInstance<BM> | null>;
     destroyMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<number>;
     private __deleteOne;
     private __deleteMany;
-    restoreOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<import("sequelize").InferAttributes<BM, {
-        omit: never;
-    }>>;
+    restoreOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<ModelInstance<BM>>;
     restoreMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<void>;
     query(sql: string | {
         query: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "3.3.83",
+  "version": "3.3.84",
   "files": [
     "dist"
   ],