pangea-server 3.3.87 → 3.3.89

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

@@ -1,21 +1,20 @@
 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, AbstractDataTypeConstructor, AbstractDataType, Transaction, WhereOptions } from 'sequelize';
 import type { ModelCtor } from 'sequelize-typescript';
 declare global {
     type ModelId = number;
     type ModelName = string;
     type BaseModelCtor<BM extends BaseModel = BaseModel> = typeof BaseModel & ModelCtor<BM>;
-    type ColOptional<T> = CreationOptional<T>;
+    type ColDefault<T> = CreationOptional<T>;
     type ColHidden<T> = T & {
         __brand: 'hidden';
     };
     type ColVirtual<T> = CreationOptional<T>;
     type ModelInstance<BM extends BaseModel> = InferAttributes<BM>;
     type Where<BM extends BaseModel> = WhereOptions<BM> & Record<symbol, any>;
-    type InsertParams<BM extends BaseModel> = OptionalIfNullish<OptionalIfOptional<StripRelations<OptionalFields<IncludeHidden<InferCreationAttributes<BM>>, keyof InferCreationAttributes<BM> & 'id'>>>>;
+    type InsertParams<BM extends BaseModel> = OptionalIfNullish<IncludeHidden<StripRelations<InferCreationAttributes<BM>>>>;
     type UpdateParams<BM extends BaseModel> = Partial<InsertParams<BM>>;
     type UpdateParamsWithId<BM extends BaseModel> = UpdateParams<BM> & {
         id: ModelId;
@@ -51,20 +50,19 @@ export type ColVirtualOptions = {
     set?: ColVirtualSet;
 };
 export type GetModelFn = () => BaseModelCtor;
-type OptionalIfOptional<T> = {
-    [K in keyof T as undefined extends T[K] ? K : never]?: Exclude<T[K], undefined>;
+export type OptionalIfNullish<T> = {
+    [K in keyof T as null extends T[K] ? never : undefined extends T[K] ? never : K]: T[K];
 } & {
-    [K in keyof T as undefined extends T[K] ? never : K]: T[K];
+    [K in keyof T as null extends T[K] ? K : undefined extends T[K] ? K : never]?: Exclude<T[K], undefined>;
 };
 type IncludeHidden<T> = {
     [K in keyof T]-?: Exclude<T[K], undefined> extends ColHidden<infer U> ? U : T[K];
 };
-type IsRelation<T> = NonNullable<T> extends {
-    id: ModelId;
-} ? true : NonNullable<T> extends Array<infer U> ? NonNullable<U> extends {
-    id: ModelId;
-} ? true : false : false;
 type StripRelations<T> = {
-    [K in keyof T as IsRelation<T[K]> extends true ? never : K]: T[K];
+    [K in keyof T as NonNullable<T[K]> extends {
+        id: ModelId;
+    } | Array<{
+        id: ModelId;
+    }> ? never : K]: T[K];
 };
 export {};

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

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

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", Number)
+    __metadata("design:type", Object)
 ], BaseModel.prototype, "id", void 0);

package/package.json

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