pangea-server 3.3.99 → 3.3.101

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

@@ -11,7 +11,7 @@ declare global {
     type ColHidden<T> = T & {
         __brand: 'hidden';
     };
-    type ColVirtual<T> = CreationOptional<T>;
+    type ColComputed<T> = CreationOptional<T>;
     type ModelInstance<BM extends BaseModel> = InferAttributes<BM> & {
         id: ModelId;
     };
@@ -47,12 +47,6 @@ export type ColGeneralOptions = {
     unique?: boolean;
     hideByDefault?: boolean;
 };
-export type ColVirtualGet = (this: any) => unknown;
-export type ColVirtualSet = (this: any, val: any) => void;
-export type ColVirtualOptions = {
-    get?: ColVirtualGet;
-    set?: ColVirtualSet;
-};
 export type GetModelFn = () => BaseModelCtor;
 export type OptionalIfNullish<T> = {
     [K in keyof T as null extends T[K] ? never : undefined extends T[K] ? never : K]: T[K];

package/dist/database/decorators/columns/column.d.ts

@@ -1,10 +1,12 @@
 import type { ModelValidateOptions } from 'sequelize';
-import type { ColumnType, ColGeneralOptions, ColVirtualOptions } from '../../../database/database.types';
+import type { ColumnType, ColGeneralOptions } from '../../../database/database.types';
 type ForeignKeyAction = 'RESTRICT' | 'CASCADE' | 'SET NULL';
-type ColumnOptions = ColGeneralOptions & ColVirtualOptions & {
+type ColumnOptions = ColGeneralOptions & {
     validate?: ModelValidateOptions;
     onUpdate?: ForeignKeyAction;
     onDelete?: ForeignKeyAction;
+    get?: (this: any) => unknown;
+    set?: (this: any, val: any) => void;
 };
 export declare function Column(type: ColumnType, options?: ColumnOptions): (target: any, propertyName: string) => void;
 export {};

package/dist/database/decorators/columns/column.js

@@ -36,14 +36,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Column = Column;
 const seq = __importStar(require("sequelize-typescript"));
 function Column(type, options = {}) {
-    const { nullable = false, defaultValue, index, unique = false, hideByDefault, get, set, ...restOptions } = options;
+    const { nullable = false, defaultValue, index, unique = false, hideByDefault, ...restOptions } = options;
     return function (target, propertyName) {
         seq.Column({
             type: typeof type === 'string' ? seq.DataType[type] : type,
             allowNull: nullable,
             defaultValue,
-            ...(get && { get }),
-            ...(set && { set }),
             ...restOptions,
         })(target, propertyName);
         const model = target.constructor;

package/dist/database/decorators/columns/general.columns.d.ts

@@ -1,4 +1,3 @@
-import type { ColGeneralOptions, ColVirtualGet, ColVirtualOptions, GetModelFn } from '../../../database/database.types';
+import type { ColGeneralOptions, GetModelFn } from '../../../database/database.types';
 export declare function ColBool(options?: ColGeneralOptions): (target: any, propertyName: string) => void;
 export declare function ColForeignKey(getModelFn: GetModelFn, options?: Omit<ColGeneralOptions, 'index'>): (target: any, propertyName: string) => void;
-export declare function ColVirtual(options?: ColVirtualOptions | ColVirtualGet): Function;

package/dist/database/decorators/columns/general.columns.js

@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColBool = ColBool;
 exports.ColForeignKey = ColForeignKey;
-exports.ColVirtual = ColVirtual;
 const seq = __importStar(require("sequelize-typescript"));
 const column_1 = require("./column");
 function ColBool(options) {
@@ -47,17 +46,3 @@ function ColForeignKey(getModelFn, options) {
         seq.ForeignKey(getModelFn)(target, propertyName);
     };
 }
-function ColVirtual(options) {
-    let get;
-    let set;
-    if (options) {
-        if (typeof options === 'function') {
-            get = options;
-        }
-        else {
-            get = options.get;
-            set = options.set;
-        }
-    }
-    return seq.Column({ type: seq.DataType.VIRTUAL, ...(get && { get }), ...(set && { set }) });
-}

package/dist/database/decorators/index.d.ts

@@ -16,6 +16,5 @@ export declare const col: {
     StrArray: typeof json.ColStrArray;
     Bool: typeof general.ColBool;
     ForeignKey: typeof general.ColForeignKey;
-    Virtual: typeof general.ColVirtual;
 };
 export * as rel from './relations';

package/dist/database/decorators/index.js

@@ -53,6 +53,5 @@ exports.col = {
     StrArray: json.ColStrArray,
     Bool: general.ColBool,
     ForeignKey: general.ColForeignKey,
-    Virtual: general.ColVirtual,
 };
 exports.rel = __importStar(require("./relations"));

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

@@ -21,7 +21,7 @@ export declare abstract class BaseModel extends Model {
     private static __Relations?;
     id: ModelId;
     version: NonAttribute<number>;
-    init?: NonAttribute<() => string>;
+    init?: NonAttribute<() => void>;
     static get HiddenAttributes(): string[];
     static get Columns(): Columns;
     static get ColumnIndexes(): Index[];

package/package.json

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