mythix-orm 1.6.2 → 1.7.0

package/lib/connection/connection-base.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import { Moment } from 'moment';
+import { DateTime } from 'luxon';
 import { Literals } from '.';
 import Field from '../field';
 import { GenericObject } from '../interfaces/common';
@@ -120,7 +120,7 @@ declare class ConnectionBase extends EventEmitter {
   public _uuidV5TypeToString(type: UUIDV5Type): string;
   public _xidTypeToString(type: XIDType): string;
   public typeToString(type: Type, options?: GenericObject): string;
-  public convertDateToDBTime(value: Date | Moment): Date;
+  public convertDateToDBTime(value: Date | DateTime, type: Type): Date;
   public ensureAllModelsAreInstances(Model: ModelClass, models: Array<Model | GenericObject> | PreparedModels, options?: GenericObject): Array<Model>;
   public prepareAllModelsForOperation(Model: ModelClass, models: Array<Model | GenericObject> | PreparedModels, options?: GenericObject): PreparedModels;
   public splitModelAndSubModels(Model: ModelClass, primaryModel: Model, relationMap?: Map<string, Set<Model>>): Map<string, Set<Model>>;
@@ -141,20 +141,24 @@ declare class ConnectionBase extends EventEmitter {
   public stop(): Promise<void>;
 
   public runSaveHooks(Model: ModelClass, models: Array<Model>, operationHookName: string, saveHookName: string, options: GenericObject): Promise<Array<any>>;
+
+  public defineTable(): Promise<any>;
+  public defineConstraints(): Promise<any>;
+  public defineIndexes(): Promise<any>;
+
   public dropTable(Model: ModelClass, options?: GenericObject): Promise<any>;
   public dropTables(Models: Models, options?: GenericObject): Promise<Array<any>>;
   public createTable(Model: ModelClass, options?: GenericObject): Promise<any>;
   public createTables(Models: Models, options?: GenericObject): Promise<Array<any>>;
-  public defineTable(): Promise<any>;
-  public defineConstraints(): Promise<any>;
-  public defineIndexes(): Promise<any>;
-  public renameTable(): Promise<any>;
-  public renameColumn(): Promise<any>;
-  public dropColumn(): Promise<any>;
-  public alterColumn(): Promise<any>;
-  public addColumn(): Promise<any>;
-  public addConstraint(): Promise<any>;
-  public addIndex(): Promise<any>;
+  public alterTable(Model: ModelClass, newModelAttributes: GenericObject, options?: GenericObject): Promise<void>;
+
+  public dropColumn(Field: Field, options?: GenericObject): Promise<void>;
+  public alterColumn(Field: Field, newFieldAttributes: GenericObject, options?: GenericObject): Promise<void>;
+  public addColumn(Field: Field, options?: GenericObject): Promise<void>;
+
+  public addIndex(Model: ModelClass, indexFieldNames?: Array<string>, options?: GenericObject): Promise<void>;
+  public dropIndex(Model: ModelClass, indexFieldNames?: Array<string>, options?: GenericObject): Promise<void>;
+
   public insert(Model: ModelClass, models: Array<Model | GenericObject> | Model | GenericObject, options?: GenericObject): Promise<Array<Models> | undefined>;
   public upsert(Model: ModelClass, models: Array<Model | GenericObject> | Model | GenericObject, options?: GenericObject): Promise<Array<Models> | undefined>;
   public update(Model: ModelClass, models: Array<Model | GenericObject> | Model | GenericObject, options?: GenericObject): Promise<Array<Models> | undefined>;
@@ -171,6 +175,7 @@ declare class ConnectionBase extends EventEmitter {
   public pluck(queryEngine: QueryEngine, fields: Array<Field> | Array<string> | Field | string, options?: GenericObject): Promise<Array<any> | Array<Array<any>>>;
   public exists(queryEngine: QueryEngine, options?: GenericObject): Promise<boolean>;
   public truncate(Model: ModelClass, options?: GenericObject): Promise<void>;
+
   public query(sql: string | GenericObject, options?: GenericObject): Promise<any>;
   public transaction(callback: (connection: ConnectionBase) => any, options?: GenericObject): Promise<any>;
   public getDefaultFieldValue(type: string | LiteralBase, context: DefaultValueContext): Promise<any>;

package/lib/connection/connection-base.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const moment                = require('moment');
+const { DateTime }          = require('luxon');
 const EventEmitter          = require('events');
 const Nife                  = require('nife');
 const SqlString             = require('sqlstring');
@@ -479,12 +479,12 @@ class ConnectionBase extends EventEmitter {
 
   // eslint-disable-next-line no-unused-vars
   _dateTypeToString(type) {
-    return 'DATE';
+    return 'TIMESTAMP';
   }
 
   // eslint-disable-next-line no-unused-vars
   _datetimeTypeToString(type) {
-    return 'DATETIME';
+    return 'TIMESTAMP';
   }
 
   // eslint-disable-next-line no-unused-vars
@@ -574,11 +574,17 @@ class ConnectionBase extends EventEmitter {
     throw new Error(`${this.constructor.name}::typeToString: Unsupported type ${type}.`);
   }
 
-  convertDateToDBTime(value) {
-    if (value instanceof Date || (value && value.constructor && value.constructor.name === 'Date'))
+  convertDateToDBTime(value, type) {
+    if (Nife.instanceOf(value, 'number'))
       return value;
-    else if (moment.isMoment(value))
-      return value.toDate();
+    else if (Nife.instanceOf(value, 'bigint'))
+      return Number(value).valueOf();
+    else if (DateTime.isDateTime(value))
+      return value.toMillis();
+    else if (value instanceof Date || (value && value.constructor && value.constructor.name === 'Date'))
+      return value.valueOf();
+    else if (Nife.instanceOf(value, 'string'))
+      return DateTime.fromISO(value).toMillis();
 
     return value;
   }
@@ -1112,31 +1118,27 @@ class ConnectionBase extends EventEmitter {
 
   // Alter operations
 
-  async renameTable() {
+  async alterTable(Model, newModelAttributes, options) {
     throw new Error(`${this.constructor.name}::renameTable: This operation is not supported for this connection type.`);
   }
 
-  async renameColumn() {
-    throw new Error(`${this.constructor.name}::renameColumn: This operation is not supported for this connection type.`);
-  }
-
-  async dropColumn() {
+  async dropColumn(Field, options) {
     throw new Error(`${this.constructor.name}::dropColumn: This operation is not supported for this connection type.`);
   }
 
-  async alterColumn() {
+  async alterColumn(Field, newFieldAttributes, options) {
     throw new Error(`${this.constructor.name}::alterColumn: This operation is not supported for this connection type.`);
   }
 
-  async addColumn() {
+  async addColumn(Field, options) {
     throw new Error(`${this.constructor.name}::addColumn: This operation is not supported for this connection type.`);
   }
 
-  async addConstraint() {
-    throw new Error(`${this.constructor.name}::addConstraint: This operation is not supported for this connection type.`);
+  async addIndex(Model, indexFields, options) {
+    throw new Error(`${this.constructor.name}::addIndex: This operation is not supported for this connection type.`);
   }
 
-  async addIndex() {
+  async dropIndex(Model, indexFields, options) {
     throw new Error(`${this.constructor.name}::addIndex: This operation is not supported for this connection type.`);
   }
 

package/lib/connection/query-generator-base.js

@@ -734,7 +734,7 @@ class QueryGeneratorBase {
         order = queryPart.value;
     }
 
-    if (Nife.isEmpty(order)) {
+    if (order === undefined) {
       if (options && options.selectStatement === true)
         order = this.connection.getDefaultOrder(rootModel, options);
     }

package/lib/field.js

@@ -243,6 +243,7 @@ class Field {
     this.allowNull = true;
     this.index = false;
     this.unique = false;
+    this.columnName = (fieldDefinition && fieldDefinition.fieldName);
 
     Object.assign(this, fieldDefinition || {});
   }

package/lib/model.d.ts

@@ -146,16 +146,18 @@ export declare class Model {
   public static getWhereWithConnection(options?: { connection: ConnectionBase }): QueryEngine;
   public getWhereWithConnection(options?: { connection: ConnectionBase }): QueryEngine;
 
-  public static create(models: Array<Model | GenericObject>, options?: GenericObject): Promise<Array<Model>>;
-  public static create(models: Model | GenericObject, options?: GenericObject): Promise<Model>;
+  public static create<T extends Model = Model>(models: Array<T>, options?: GenericObject): Promise<Array<T>>;
+  public static create<T extends Model = Model>(models: T, options?: GenericObject): Promise<T>;
+  public static create<T extends Model = Model>(models: Array<GenericObject>, options?: GenericObject): Promise<Array<T>>;
+  public static create<T extends Model = Model>(models: GenericObject, options?: GenericObject): Promise<T>;
   public static count(options?: GenericObject): Promise<number>;
-  public static all(options?: GenericObject): Promise<Array<Model>>;
-  public static fetchAll(options?: GenericObject): AsyncGenerator<Model>;
-  public static first(limit?: number, options?: GenericObject): Promise<Model | undefined>;
-  public static last(limit?: number, options?: GenericObject): Promise<Model | undefined>;
+  public static all<T extends Model = Model>(options?: GenericObject): Promise<Array<T>>;
+  public static fetchAll<T extends Model = Model>(options?: GenericObject): AsyncGenerator<T>;
+  public static first<T extends Model = Model>(limit?: number, options?: GenericObject): Promise<T | undefined>;
+  public static last<T extends Model = Model>(limit?: number, options?: GenericObject): Promise<T | undefined>;
   public static pluck(fields: string | Array<string>, options?: GenericObject): Promise<Array<any>>;
 
-  public constructor(data: GenericObject, _options?: ModelOptions);
+  public constructor(data?: GenericObject, _options?: ModelOptions);
   public getOptions(): ModelOptions;
   public _constructor(data?: GenericObject): void;
   public _constructFields(): void;
@@ -183,7 +185,7 @@ export declare class Model {
   public onAfterCreate(context: HookContext): Promise<any>;
   public onAfterUpdate(context: HookContext): Promise<any>;
   public onAfterSave(context: HookContext): Promise<any>;
-  public save(options?: GenericObject): Promise<Model | boolean>;
+  public save(options?: GenericObject): Promise<this | boolean>;
   public reload(options?: GenericObject): Promise<void>;
   public destroy(options?: GenericObject): Promise<number>;
   public toString(): string;

package/lib/model.js

@@ -5,6 +5,7 @@ const Inflection      = require('inflection');
 const Type            = require('./types/type');
 const DefaultHelpers  = require('./types/helpers/default-helpers');
 const Field           = require('./field');
+const ModelUtils      = require('./utils/model-utils');
 
 /// Used as a unique key for cache.
 /// Caches will generally be stored in
@@ -1319,13 +1320,22 @@ class Model {
   /// Arguments:
   ///   fieldName: string
   ///     The specified field name to find. This **is not** the `columnName` of the field.
-  static getField(findFieldName) {
+  static getField(_findFieldName) {
     let fields = this.getFields();
-    if (!fields || !findFieldName)
+    if (!fields || !_findFieldName)
       return;
 
     let foundField;
+    let def = ModelUtils.parseQualifiedName(_findFieldName);
+    if (def.modelName && Nife.isEmpty(def.fieldNames)) {
+      def.fieldNames = [ def.modelName ];
+      def.modelName = undefined;
+    }
+
+    if (def.modelName && def.modelName !== this.getModelName())
+      throw new Error(`Model::getField: Can't find a field from another model. Field requested: "${_findFieldName}".`);
 
+    let findFieldName = def.fieldNames[0];
     this.iterateFields(({ field, fieldName, stop }) => {
       if (fieldName === findFieldName) {
         foundField = field;

package/lib/query-engine/query-engine.d.ts

@@ -53,11 +53,11 @@ export declare class QueryEngine<T = ConnectionBase> {
   public unscoped(context?: GenericObject): QueryEngine;
   public toString(options?: GenericObject): string;
   public MERGE(queryEngine: QueryEngine): QueryEngine;
-  public all(options?: GenericObject): Promise<Array<Model>>;
-  public fetchAll(options?: GenericObject): AsyncGenerator<Model>;
-  public first(limit?: number | null | undefined, options?: GenericObject): Promise<Model | undefined>;
-  public last(limit?: number | null | undefined, options?: GenericObject): Promise<Model | undefined>;
-  public update(attributes: Model | GenericObject, options?: GenericObject): Promise<number>;
+  public all<T extends Model = Model>(options?: GenericObject): Promise<Array<T>>;
+  public fetchAll<T extends Model = Model>(options?: GenericObject): AsyncGenerator<T>;
+  public first<T extends Model = Model>(limit?: number | null | undefined, options?: GenericObject): Promise<T | undefined>;
+  public last<T extends Model = Model>(limit?: number | null | undefined, options?: GenericObject): Promise<T | undefined>;
+  public update<T extends Model = Model>(attributes: T | GenericObject, options?: GenericObject): Promise<number>;
   public destroy(options?: GenericObject): Promise<number>;
   public average(field: Field | string, options?: GenericObject): Promise<number>;
   public count(field: Field | string, options?: GenericObject): Promise<number>;
@@ -78,51 +78,71 @@ export declare class QueryEngine<T = ConnectionBase> {
 
   declare public NOT: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public AND: {
     (query: QueryEngine): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public OR: {
     (query: QueryEngine): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public DISTINCT: {
     (fullyQualifiedName: string | Field): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public INNER_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public LEFT_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public RIGHT_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public FULL_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public CROSS_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public JOIN: {
     (type: string | LiteralBase): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
@@ -137,6 +157,7 @@ export declare class QueryEngine<T = ConnectionBase> {
   public LIKE(value: string, options?: { caseSensitive: boolean }): QueryEngine;
   public NOT_LIKE(value: string, options?: { caseSensitive: boolean }): QueryEngine;
 
+  name: QueryEngine;
   [ key: string ]: any;
 }
 

package/lib/types/concrete/date-type.js

@@ -1,11 +1,10 @@
 'use strict';
 
 const Nife          = require('nife');
-const moment        = require('moment');
+const { DateTime }  = require('luxon');
 const Type          = require('../type');
 const { DATE_NOW }  = require('../helpers/default-helpers');
-
-moment.suppressDeprecationWarnings = true;
+const MiscUtils     = require('../../utils/misc-utils');
 
 /// `DATE` type.
 ///
@@ -13,7 +12,7 @@ moment.suppressDeprecationWarnings = true;
 /// in the underlying database.
 ///
 /// Client-side storage for this field will be backed by
-/// a [moment](https://momentjs.com/docs/) instance.
+/// a Luxon [DateTime](https://moment.github.io/luxon/#/) instance.
 ///
 /// You can optionally provide a `format` argument when constructing
 /// this type. **This is a client-side format only**. It doesn't
@@ -24,7 +23,7 @@ moment.suppressDeprecationWarnings = true;
 /// Example:
 ///   class Dates extends Model {
 ///     static fields = {
-///       date1: Types.DATE('YYYY-MM-DD'),
+///       date1: Types.DATE('yyyy-MM-dd'),
 ///       date2: new Types.DateType(),
 ///     };
 ///   }
@@ -66,8 +65,8 @@ class DateType extends Type {
   /// Construct a new `DATE` type.
   ///
   /// The `format` argument will specify the
-  /// date format for this field. See the
-  /// [moment](https://momentjs.com/docs/#/displaying/format/) docs
+  /// date format for this field. See the Luxon
+  /// [DateTime](https://moment.github.io/luxon/#/formatting?id=table-of-tokens) docs
   /// for a reference on this format.
   ///
   /// This format **is not** the format that will be used
@@ -86,16 +85,16 @@ class DateType extends Type {
   constructor(format) {
     super(format);
 
-    this.format = format || 'YYYY-MM-DD';
+    this.format = format || 'yyyy-MM-dd';
   }
 
   /// Cast provided value to underlying type.
   ///
   /// This will cast the incoming value to the
-  /// underlying type of this field, a [moment](https://momentjs.com/docs/)
+  /// underlying type of this field, a Luxon [DateTime](https://moment.github.io/luxon/#/)
   /// instance. If the provided value results in
   /// an invalid date, then an exception will be thrown.
-  /// Once a valid [moment](https://momentjs.com/docs/) instance
+  /// Once a valid Luxon [DateTime](https://moment.github.io/luxon/#/) instance
   /// is constructed from the value provided,
   /// `dateTime.startOf('day')` is returned, forcing
   /// this `DATE` type to zero its time (start at the
@@ -104,7 +103,7 @@ class DateType extends Type {
   /// See <see>Type.castToType</see> for a more
   /// detailed description.
   ///
-  /// Return: moment | null | undefined
+  /// Return: DateTime | null | undefined
   ///   Return the incoming `value`, cast to this
   ///   type. `null` and `undefined` are simply
   ///   returned without casting.
@@ -116,7 +115,7 @@ class DateType extends Type {
       return value;
 
     let dateTime = this.deserialize(value, connection);
-    if (!dateTime.isValid())
+    if (!dateTime || !dateTime.isValid)
       throw new TypeError(`DateType::castToType: Value provided ("${value}") can not be cast into a date.`);
 
     return dateTime.startOf('day');
@@ -126,11 +125,11 @@ class DateType extends Type {
   ///
   /// This will check if the provided value is
   /// a valid date. It does so by calling
-  /// `moment(value).isValid()`. If this check
+  /// `DateTime.isValid`. If this check
   /// results in `true`, then this method will
   /// return `true`, otherwise it will return `false`.
   ///
-  /// See the [moment](https://momentjs.com/docs/) library documentation for more information.
+  /// See the Luxon [DateTime](https://moment.github.io/luxon/#/) library documentation for more information.
   ///
   /// Return: boolean
   ///
@@ -138,7 +137,11 @@ class DateType extends Type {
   ///   value: any
   ///     The value to check.
   isValidValue(value) {
-    return moment(value).isValid();
+    try {
+      return (MiscUtils.valueToDateTime(value)).isValid;
+    } catch (error) {
+      return false;
+    }
   }
 
   /// Stringify the type itself.
@@ -148,7 +151,7 @@ class DateType extends Type {
   /// for the underlying database. If no connection is
   /// provided, then a "standard" SQL type will be returned
   /// for this type instead. The "standard" type returned
-  /// when no `connection` is provided is `'DATE'`.
+  /// when no `connection` is provided is `'TIMESTAMP'`.
   ///
   /// Return: string
   ///
@@ -163,7 +166,7 @@ class DateType extends Type {
   toString(connection) {
     return (connection)
       ? this.toConnectionType(connection)
-      : 'DATE';
+      : 'TIMESTAMP';
   }
 
   /// Serialize the field value.
@@ -184,31 +187,35 @@ class DateType extends Type {
   /// Return: string | null | undefined
   ///
   /// Arguments:
-  ///   value: moment
+  ///   value: DateTime
   ///     The date value to serialize.
   ///   connection?: <see>Connection</see>
   ///     A connection instance, which if provided, will
   ///     proxy serialization to the underlying database connection
   ///     via the <see>connection.convertDateToDBTime</see> method.
-  serialize(value, connection) {
+  serialize(_value, connection) {
+    let value = _value;
     if (value == null)
       return (connection) ? null : value;
 
+    if (!DateTime.isDateTime(value))
+      value = this.deserialize(value);
+
     if (connection)
-      return connection.convertDateToDBTime(value);
+      return connection.convertDateToDBTime(value, this);
 
     if (this.format)
-      return value.format(this.format);
+      return value.toFormat(this.format || 'yyyy-MM-dd');
 
-    return value.toISOString();
+    return value.toISO();
   }
 
   /// Deserialize the field value.
   ///
   /// This method is used to deserialize a provided
-  /// field value. If the value provided is a `moment`
+  /// field value. If the value provided is a `DateTime`
   /// instance, then simply return it. Otherwise,
-  /// if a string is provided, convert it to a `moment`
+  /// if a string is provided, convert it to a `DateTime`
   /// instance, using the `format` provided (if any).
   ///
   /// The `connection` argument is not used by this
@@ -220,12 +227,12 @@ class DateType extends Type {
   ///
   /// Note:
   ///   This method is called by `castToType` to cast
-  ///   incoming values into `moment` instances.
+  ///   incoming values into `DateTime` instances.
   ///
-  /// Return: moment
+  /// Return: DateTime
   ///
   /// Arguments:
-  ///   value: string | moment | null | undefined
+  ///   value: DateTime | Date | string | number | BigInt | null | undefined
   ///     The value to deserialize.
   ///   connection?: <see>Connection</see>
   ///     An optional connection that might be provided
@@ -240,15 +247,15 @@ class DateType extends Type {
       return value;
 
     if (Nife.instanceOf(value, 'string') && this.format) {
-      value = moment(_value, this.format);
+      value = MiscUtils.valueToDateTime(_value, this.format);
 
-      if (!value.isValid())
-        value = moment(_value);
+      if (!value.isValid)
+        value = MiscUtils.valueToDateTime(_value);
     } else {
-      value = moment(value);
+      value = MiscUtils.valueToDateTime(_value);
     }
 
-    if (!value.isValid())
+    if (!value.isValid)
       throw new TypeError(`DateType::deserialize: Value provided ("${_value}") can not be cast into a date.`);
 
     return value;

package/lib/types/concrete/datetime-type.js

@@ -1,11 +1,10 @@
 'use strict';
 
 const Nife              = require('nife');
-const moment            = require('moment');
+const { DateTime }      = require('luxon');
 const Type              = require('../type');
 const { DATETIME_NOW }  = require('../helpers/default-helpers');
-
-moment.suppressDeprecationWarnings = true;
+const MiscUtils         = require('../../utils/misc-utils');
 
 /// `DATETIME` type.
 ///
@@ -13,7 +12,7 @@ moment.suppressDeprecationWarnings = true;
 /// in the underlying database.
 ///
 /// Client-side storage for this field will be backed by
-/// a [moment](https://momentjs.com/docs/) instance.
+/// a Luxon [DateTime](https://moment.github.io/luxon/#/) instance.
 ///
 /// You can optionally provide a `format` argument when constructing
 /// this type. **This is a client-side format only**. It doesn't
@@ -24,7 +23,7 @@ moment.suppressDeprecationWarnings = true;
 /// Example:
 ///   class DatesWithTimes extends Model {
 ///     static fields = {
-///       dateTime1: Types.DATETIME('YYYY-MM-DD HH:mm:ss'),
+///       dateTime1: Types.DATETIME('yyyy-MM-dd HH:mm:ss'),
 ///       dateTime2: new Types.DateTimeType(),
 ///     };
 ///   }
@@ -66,8 +65,8 @@ class DateTimeType extends Type {
   /// Construct a new `DATETIME` type.
   ///
   /// The `format` argument will specify the
-  /// date format for this field. See the
-  /// [moment](https://momentjs.com/docs/#/displaying/format/) docs
+  /// date format for this field. See the Luxon
+  /// [DateTime](https://moment.github.io/luxon/#/formatting?id=table-of-tokens) docs
   /// for a reference on this format.
   ///
   /// This format **is not** the format that will be used
@@ -99,14 +98,14 @@ class DateTimeType extends Type {
   /// Cast provided value to underlying type.
   ///
   /// This will cast the incoming value to the
-  /// underlying type of this field, a [moment](https://momentjs.com/docs/)
+  /// underlying type of this field, a Luxon [DateTime](https://moment.github.io/luxon/#/)
   /// instance. If the provided value results in
   /// an invalid date, then an exception will be thrown.
   ///
   /// See <see>Type.castToType</see> for a more
   /// detailed description.
   ///
-  /// Return: moment | null | undefined
+  /// Return: DateTime | null | undefined
   ///   Return the incoming `value`, cast to this
   ///   type. `null` and `undefined` are simply
   ///   returned without casting.
@@ -118,7 +117,7 @@ class DateTimeType extends Type {
       return value;
 
     let dateTime = this.deserialize(value, connection);
-    if (!dateTime.isValid())
+    if (!dateTime || !dateTime.isValid)
       throw new TypeError(`DateTimeType::castToType: Value provided ("${value}") can not be cast into a date.`);
 
     return dateTime;
@@ -128,11 +127,11 @@ class DateTimeType extends Type {
   ///
   /// This will check if the provided value is
   /// a valid date. It does so by calling
-  /// `moment(value).isValid()`. If this check
+  /// `DateTime.isValid`. If this check
   /// results in `true`, then this method will
   /// return `true`, otherwise it will return `false`.
   ///
-  /// See the [moment](https://momentjs.com/docs/) library documentation for more information.
+  /// See the Luxon [DateTime](https://moment.github.io/luxon/#/) library documentation for more information.
   ///
   /// Return: boolean
   ///
@@ -140,7 +139,11 @@ class DateTimeType extends Type {
   ///   value: any
   ///     The value to check.
   isValidValue(value) {
-    return moment(value).isValid();
+    try {
+      return (MiscUtils.valueToDateTime(value)).isValid;
+    } catch (error) {
+      return false;
+    }
   }
 
   /// Stringify the type itself.
@@ -150,7 +153,7 @@ class DateTimeType extends Type {
   /// for the underlying database. If no connection is
   /// provided, then a "standard" SQL type will be returned
   /// for this type instead. The "standard" type returned
-  /// when no `connection` is provided is `'DATETIME'`.
+  /// when no `connection` is provided is `'TIMESTAMP'`.
   ///
   /// Return: string
   ///
@@ -165,7 +168,7 @@ class DateTimeType extends Type {
   toString(connection) {
     return (connection)
       ? this.toConnectionType(connection)
-      : 'DATETIME';
+      : 'TIMESTAMP';
   }
 
   /// Serialize the field value.
@@ -186,7 +189,7 @@ class DateTimeType extends Type {
   /// Return: string | null | undefined
   ///
   /// Arguments:
-  ///   value: moment
+  ///   value: DateTime
   ///     The date value to serialize.
   ///   connection?: <see>Connection</see>
   ///     A connection instance, which if provided, will
@@ -197,24 +200,24 @@ class DateTimeType extends Type {
     if (value == null)
       return (connection) ? null : value;
 
-    if (!moment.isMoment(value))
+    if (!DateTime.isDateTime(value))
       value = this.deserialize(value);
 
     if (connection)
-      return connection.convertDateToDBTime(value);
+      return connection.convertDateToDBTime(value, this);
 
     if (this.format)
-      return value.format(this.format);
+      return value.toFormat(this.format);
 
-    return value.toISOString();
+    return value.toISO();
   }
 
   /// Deserialize the field value.
   ///
   /// This method is used to deserialize a provided
-  /// field value. If the value provided is a `moment`
+  /// field value. If the value provided is a `DateTime`
   /// instance, then simply return it. Otherwise,
-  /// if a string is provided, convert it to a `moment`
+  /// if a string is provided, convert it to a `DateTime`
   /// instance, using the `format` provided (if any).
   ///
   /// The `connection` argument is not used by this
@@ -226,12 +229,12 @@ class DateTimeType extends Type {
   ///
   /// Note:
   ///   This method is called by `castToType` to cast
-  ///   incoming values into `moment` instances.
+  ///   incoming values into `DateTime` instances.
   ///
-  /// Return: moment
+  /// Return: DateTime
   ///
   /// Arguments:
-  ///   value: string | moment | null | undefined
+  ///   value: DateTime | Date | string | number | BigInt | null | undefined
   ///     The value to deserialize.
   ///   connection?: <see>Connection</see>
   ///     An optional connection that might be provided
@@ -246,15 +249,15 @@ class DateTimeType extends Type {
       return value;
 
     if (Nife.instanceOf(value, 'string') && this.format) {
-      value = moment(_value, this.format);
+      value = MiscUtils.valueToDateTime(_value, this.format);
 
-      if (!value.isValid())
-        value = moment(_value);
+      if (!value.isValid)
+        value = MiscUtils.valueToDateTime(_value);
     } else {
-      value = moment(_value);
+      value = MiscUtils.valueToDateTime(_value);
     }
 
-    if (!value.isValid())
+    if (!value.isValid)
       throw new TypeError(`DateType::deserialize: Value provided ("${_value}") can not be cast into a date.`);
 
     return value;

package/lib/types/helpers/default-helpers.d.ts

@@ -11,7 +11,8 @@ export const FLAG_LITERAL: number;
 export const FLAG_REMOTE: number;
 
 export declare interface DefaultValueContext {
-  _initial: boolean;
+  _initial?: boolean;
+  _static?: boolean;
   connection: ConnectionBase;
   data: GenericObject | undefined;
   field: Field;

package/lib/utils/index.js

@@ -7,6 +7,7 @@ const QueryUtils  = require('./query-utils');
 const {
   collect,
   objectAssignSpecial,
+  valueToDateTime,
 } = MiscUtils;
 
 const {
@@ -39,6 +40,7 @@ module.exports = {
   // MiscUtils
   collect,
   objectAssignSpecial,
+  valueToDateTime,
 
   // ModelUtils
   assignRelatedModels,

package/lib/utils/misc-utils.d.ts

@@ -1,4 +1,6 @@
+import { DateTime } from 'luxon';
 import { GenericObject } from '../interfaces/common';
 
 declare function collect(iterator: AsyncIterator<any>): Promise<Array<any>>;
 declare function objectAssignSpecial(obj: GenericObject, proto?: GenericObject | null, skipKeys?: Array<string> | GenericObject): GenericObject;
+declare function valueToDateTime(value: DateTime | Date | number | BigInt | string, format?: string): DateTime;

package/lib/utils/misc-utils.js

@@ -1,5 +1,8 @@
 'use strict';
 
+const Nife          = require('nife');
+const { DateTime }  = require('luxon');
+
 async function collect(iterator) {
   let items = [];
 
@@ -32,7 +35,30 @@ function objectAssignSpecial(obj, proto, skipKeys) {
   return newObj;
 }
 
+function valueToDateTime(value, format) {
+  if (DateTime.isDateTime(value)) {
+    return value;
+  } else if (Nife.instanceOf(value, 'number')) {
+    return DateTime.fromMillis(value);
+  } else if (Nife.instanceOf(value, 'bigint')) {
+    return DateTime.fromMillis(Number(value).valueOf());
+  } else if (value instanceof Date || (value && value.constructor && value.constructor.name === 'Date')) {
+    return DateTime.fromJSDate(value);
+  } else if (Nife.instanceOf(value, 'string')) {
+    if ((/^\d+$/).test(value))
+      return DateTime.fromMillis(parseInt(value, 10));
+
+    if (Nife.isNotEmpty(format))
+      return DateTime.fromFormat(value, format);
+
+    return DateTime.fromISO(value);
+  } else {
+    throw new Error(`MiscUtils::valueToDateTime: Invalid value provided: "${value}"`);
+  }
+}
+
 module.exports = {
   collect,
   objectAssignSpecial,
+  valueToDateTime,
 };

package/lib/utils/model-utils.d.ts

@@ -64,7 +64,7 @@ export declare function createAndSaveAllRelatedModels(
   options?: GenericObject,
 ): Promise<Array<Model> | undefined>;
 
-export declare function setRelationalValues<T = Model>(
+export declare function setRelationalValues<T extends Model = Model>(
   connection: ConnectionBase,
   TargetModel: ModelClass,
   targetModelInstance: T,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "ORM for Mythix framework",
   "main": "lib/index",
   "type": "commonjs",
@@ -45,7 +45,7 @@
   "dependencies": {
     "events": "^3.3.0",
     "inflection": "^1.13.2",
-    "moment": "^2.29.4",
+    "luxon": "^3.0.4",
     "nife": "^1.12.1",
     "sqlstring": "^2.3.3",
     "uuid": "^9.0.0",