pangea-server 1.0.76 → 1.0.78

package/dist/database/db.class.js

@@ -270,6 +270,8 @@ function getInclude(model, config = {}, relDepth = new Map()) {
         const maxDepth = rel.joinDepth;
         if (currentDepth >= maxDepth)
             continue;
+        if (rel.exclude)
+            continue;
         const relWhere = cleanWhere[relName];
         delete cleanWhere[relName];
         const newRelDepth = new Map(relDepth);

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

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

@@ -32,7 +32,7 @@ function ColBool(options) {
 exports.ColBool = ColBool;
 function ColForeignKey(getModelFn, options) {
     return function (target, propertyName) {
-        (0, column_1.Column)('INTEGER', { ...options, onUpdate: 'RESTRICT', onDelete: 'RESTRICT' })(target, propertyName);
+        (0, column_1.Column)('INTEGER', { ...options, index: true, onUpdate: 'RESTRICT', onDelete: 'RESTRICT' })(target, propertyName);
         seq.ForeignKey(getModelFn)(target, propertyName);
     };
 }

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

@@ -1,9 +1,10 @@
 import type { GetModelFn } from '../database.types';
 type RelationOptions = {
+    foreignKey?: string;
+    exclude?: boolean;
     required?: boolean;
     paranoid?: boolean;
     joinDepth?: number;
-    foreignKey?: string;
 };
 export declare const BelongsTo: (getModelFn: GetModelFn, options?: RelationOptions) => (target: any, propertyName: string) => void;
 export declare const HasOne: (getModelFn: GetModelFn, options?: RelationOptions) => (target: any, propertyName: string) => void;

package/dist/database/decorators/relations.js

@@ -35,8 +35,8 @@ function getRelation(relationFn) {
             const { foreignKey, ...relOptions } = options;
             relationFn(getModelFn, { as: propertyName, ...(foreignKey && { foreignKey }) })(target, propertyName);
             const model = target.constructor;
-            const { required = relationFn === seq.BelongsTo ? !model.Columns[`${propertyName}Id`].allowNull : false, paranoid = relationFn !== seq.BelongsTo, joinDepth = 1, ...restOptions } = relOptions;
-            model.AddRelation(propertyName, { getModelFn, required, paranoid, joinDepth, ...restOptions });
+            const { exclude = false, required = relationFn === seq.BelongsTo ? !model.Columns[`${propertyName}Id`].allowNull : false, paranoid = relationFn !== seq.BelongsTo, joinDepth = 1, ...restOptions } = relOptions;
+            model.AddRelation(propertyName, { getModelFn, exclude, required, paranoid, joinDepth, ...restOptions });
         };
     };
 }

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

@@ -7,6 +7,7 @@ type Column = {
 type Columns = Record<string, Column>;
 type Relation = {
     getModelFn: GetModelFn;
+    exclude: boolean;
     required: boolean;
     paranoid: boolean;
     joinDepth: number;

package/dist/validator/validators.helpers.d.ts

@@ -10,23 +10,23 @@ export declare namespace Val {
     type Regex<T extends string> = string & tags.Pattern<T>;
     type Num = number;
     type Int = Val.Num & tags.Type<'int32'>;
-    type Greater<T extends number = 0> = Val.Num & tags.Minimum<T>;
+    type GreaterEqual<T extends number = 0> = Val.Num & tags.Minimum<T>;
     type GreaterThan<T extends number = 0> = Val.Num & tags.ExclusiveMinimum<T>;
-    type Less<T extends number = 0> = Val.Num & tags.Maximum<T>;
+    type LessEqual<T extends number = 0> = Val.Num & tags.Maximum<T>;
     type LessThan<T extends number = 0> = Val.Num & tags.ExclusiveMaximum<T>;
     type Bool = boolean;
     type Datetime = globalThis.Date;
     type Date = string & tags.Format<'date'>;
     type Time = string & tags.Format<'time'>;
-    type Id = Val.Int & Val.Greater<1>;
+    type Id = Val.Int & Val.GreaterEqual<1>;
     type IdOptional = Val.Id | 0;
     type Ids = Val.Id[];
     interface IdParams {
         id: Val.Id;
     }
     interface GetManyQueryBase {
-        page?: (Val.Int & Val.Greater<0>) | null;
-        pageSize?: (Val.Int & Val.Greater<0>) | null;
+        page?: (Val.Int & Val.GreaterEqual<0>) | null;
+        pageSize?: (Val.Int & Val.GreaterEqual<0>) | null;
         search?: Val.Str | '' | null;
     }
 }

package/package.json

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