pangea-server 3.3.91 → 3.3.93

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

@@ -10,7 +10,7 @@ export declare function validateAccessToken(authHeader: AuthHeader, db: Db, acce
     accessToken: string;
     user: ModelInstance<User>;
 }>;
-export declare function getUserFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: UserCtor): Promise<ModelInstance<User> | null> | null;
+export declare function getUserFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: UserCtor): Promise<User | null> | null;
 export declare function getUsersFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, authMap: AuthMap): Promise<{
     [k: string]: ModelInstance<User> | null;
 }>;

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

@@ -16,7 +16,9 @@ declare global {
         id: ModelId;
     };
     type Where<BM extends BaseModel> = WhereOptions<BM> & Record<symbol, any>;
-    type InsertParams<BM extends BaseModel> = OptionalIfNullish<IncludeHidden<StripRelations<InferCreationAttributes<BM>>>>;
+    type InsertParams<BM extends BaseModel> = OptionalIfNullish<IncludeHidden<StripRelations<Omit<InferCreationAttributes<BM>, 'id'>>>> & {
+        id?: ModelId;
+    };
     type UpdateParams<BM extends BaseModel> = Partial<InsertParams<BM>>;
     type UpdateParamsWithId<BM extends BaseModel> = UpdateParams<BM> & {
         id: ModelId;

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

@@ -36,31 +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<ModelInstance<BM> | null>;
-    findOne<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<ModelInstance<BM>>;
+    findOneOrNull<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<BM | null>;
+    findOne<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<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<ModelInstance<BM>[]>;
+    findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<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: ModelInstance<BM>[];
+        instances: 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<ModelInstance<BM>>;
+    insertOne<BM extends BaseModel>(model: BaseModelCtor<BM>, params: InsertParams<BM>): Promise<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<ModelInstance<BM> | null>;
+    deleteOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<BM | null>;
     deleteMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<number>;
-    destroyOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<ModelInstance<BM> | null>;
+    destroyOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<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<ModelInstance<BM>>;
+    restoreOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<BM>;
     restoreMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<void>;
     query(sql: string | {
         query: string;

package/dist/database/db.class.js

@@ -317,7 +317,7 @@ function processInstance(model, instance) {
             processInstance(relModel, relInstance);
         }
     }
-    return instance.toJSON();
+    return instance;
 }
 function processInstances(model, instances) {
     return instances.map((instance) => processInstance(model, instance));

package/dist/database/models/base-model.class.d.ts

@@ -1,5 +1,5 @@
 import { Model, Column } from 'sequelize-typescript';
-import type { NonAttribute, CreationOptional } from 'sequelize';
+import type { NonAttribute } from 'sequelize';
 import type { Index, DefaultValue, GetModelFn } from '../database.types';
 type Column = {
     allowNull: boolean;
@@ -19,7 +19,7 @@ export declare abstract class BaseModel extends Model {
     private static __Columns?;
     private static __ColumnIndexes?;
     private static __Relations?;
-    id: CreationOptional<ModelId>;
+    id: ModelId;
     version: NonAttribute<number>;
     static get HiddenAttributes(): string[];
     static get Columns(): Columns;

package/dist/database/models/base-model.class.js

@@ -72,5 +72,5 @@ __decorate([
     sequelize_typescript_1.PrimaryKey,
     sequelize_typescript_1.AutoIncrement,
     sequelize_typescript_1.Column,
-    __metadata("design:type", Object)
+    __metadata("design:type", Number)
 ], BaseModel.prototype, "id", void 0);

package/package.json

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