@snowtop/ent 0.1.0-alpha96 → 0.1.0-alpha97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha96",
+  "version": "0.1.0-alpha97",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/schema/field.d.ts

@@ -25,31 +25,36 @@ export declare class UUIDField extends BaseField implements Field {
     valid(val: any): Promise<boolean>;
 }
 export declare function UUIDType(options?: FieldOptions): UUIDField;
-export interface IntegerOptions extends FieldOptions {
-    min?: number;
-    max?: number;
+export interface IntegerOptions extends NumberOptions<number> {
 }
-export declare class IntegerField extends BaseField implements Field {
+export interface NumberOptions<T> extends FieldOptions {
+    min?: T;
+    max?: T;
+}
+export declare class NumberField<T> extends BaseField {
     type: Type;
     private validators;
     private options;
-    constructor(options?: IntegerOptions);
-    getOptions(): IntegerOptions;
+    constructor(options?: NumberOptions<T>);
+    getOptions(): NumberOptions<T>;
     private handleOptions;
-    min(l: number): this;
-    max(l: number): this;
+    min(l: T): this;
+    max(l: T): this;
     valid(val: any): boolean;
     validate(validator: (str: number) => boolean): this;
 }
+export declare class IntegerField extends NumberField<number> implements Field {
+    type: Type;
+}
 export declare function IntegerType(options?: IntegerOptions): IntegerField;
-export declare class BigIntegerField extends BaseField implements Field {
+export declare class BigIntegerField extends NumberField<BigInt> implements Field {
     type: Type;
 }
-export declare function BigIntegerType(options?: FieldOptions): BigIntegerField;
-export declare class FloatField extends BaseField implements Field {
+export declare function BigIntegerType(options?: NumberOptions<BigInt>): BigIntegerField;
+export declare class FloatField extends NumberField<number> implements Field {
     type: Type;
 }
-export declare function FloatType(options?: FieldOptions): FloatField;
+export declare function FloatType(options?: NumberOptions<number>): FloatField;
 export declare class BooleanField extends BaseField implements Field {
     type: Type;
 }

package/schema/field.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.PolymorphicStringField = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
+exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.PolymorphicStringField = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.NumberField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
 const luxon_1 = require("luxon");
 const camel_case_1 = require("camel-case");
 const util_1 = require("util");
@@ -119,9 +119,10 @@ function UUIDType(options) {
     return Object.assign(result, options);
 }
 exports.UUIDType = UUIDType;
-class IntegerField extends BaseField {
+class NumberField extends BaseField {
     constructor(options) {
         super();
+        // to be overriden as needed
         this.type = { dbType: schema_1.DBType.Int };
         this.validators = [];
         this.options = {};
@@ -145,9 +146,11 @@ class IntegerField extends BaseField {
         this.options = options;
     }
     min(l) {
+        // @ts-ignore Operator '>=' cannot be applied to types 'number' and 'T'.
         return this.validate((val) => val >= l);
     }
     max(l) {
+        // @ts-ignore Operator '<=' cannot be applied to types 'number' and 'T'.
         return this.validate((val) => val <= l);
     }
     valid(val) {
@@ -163,13 +166,20 @@ class IntegerField extends BaseField {
         return this;
     }
 }
+exports.NumberField = NumberField;
+class IntegerField extends NumberField {
+    constructor() {
+        super(...arguments);
+        this.type = { dbType: schema_1.DBType.Int };
+    }
+}
 exports.IntegerField = IntegerField;
 function IntegerType(options) {
     let result = new IntegerField(options);
     return Object.assign(result, options);
 }
 exports.IntegerType = IntegerType;
-class BigIntegerField extends BaseField {
+class BigIntegerField extends NumberField {
     constructor() {
         super(...arguments);
         this.type = { dbType: schema_1.DBType.BigInt };
@@ -177,11 +187,11 @@ class BigIntegerField extends BaseField {
 }
 exports.BigIntegerField = BigIntegerField;
 function BigIntegerType(options) {
-    let result = new BigIntegerField();
+    let result = new BigIntegerField(options);
     return Object.assign(result, options);
 }
 exports.BigIntegerType = BigIntegerType;
-class FloatField extends BaseField {
+class FloatField extends NumberField {
     constructor() {
         super(...arguments);
         this.type = { dbType: schema_1.DBType.Float };
@@ -189,7 +199,7 @@ class FloatField extends BaseField {
 }
 exports.FloatField = FloatField;
 function FloatType(options) {
-    let result = new FloatField();
+    let result = new FloatField(options);
     return Object.assign(result, options);
 }
 exports.FloatType = FloatType;