@rvoh/dream 1.11.1 → 1.12.0

package/dist/cjs/src/Dream.js

@@ -2903,7 +2903,7 @@ class Dream {
             currentValue = DateTime_js_1.DateTime.fromISO(currentValue);
         if (currentValue instanceof CalendarDate_js_1.default)
             currentValue = currentValue.toDateTime();
-        if (currentValue instanceof DateTime_js_1.DateTime && currentValue.isValid)
+        if (currentValue instanceof DateTime_js_1.DateTime)
             return currentValue.toMillis();
     }
     /**
@@ -2916,7 +2916,7 @@ class Dream {
             currentValue = CalendarDate_js_1.default.fromISO(currentValue);
         if (currentValue instanceof DateTime_js_1.DateTime)
             currentValue = CalendarDate_js_1.default.fromDateTime(currentValue);
-        if (currentValue instanceof CalendarDate_js_1.default && currentValue.isValid)
+        if (currentValue instanceof CalendarDate_js_1.default)
             return currentValue.toISO();
     }
     /**

package/dist/cjs/src/helpers/CalendarDate.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InvalidCalendarDate = void 0;
 const DateTime_js_1 = require("./DateTime.js");
 class CalendarDate {
     luxonDateTime;
@@ -9,11 +10,17 @@ class CalendarDate {
             this.luxonDateTime = DateTime_js_1.DateTime.fromISO(isoDate, { zone: 'UTC' });
         }
         else if (typeof source === 'number') {
-            const dateTime = DateTime_js_1.DateTime.utc(source, month, day);
-            this.luxonDateTime = dateTime.isValid ? dateTime : null;
+            try {
+                this.luxonDateTime = DateTime_js_1.DateTime.utc(source, month, day);
+            }
+            catch (error) {
+                if (error instanceof Error)
+                    throw new InvalidCalendarDate(error);
+                throw error;
+            }
         }
         else {
-            this.luxonDateTime = null;
+            this.luxonDateTime = CalendarDate.today().toDateTime();
         }
     }
     static fromDateTime(dateTime) {
@@ -22,20 +29,41 @@ class CalendarDate {
     static fromJSDate(javascriptDate, { zone } = {}) {
         return new CalendarDate(DateTime_js_1.DateTime.fromJSDate(javascriptDate, zone ? { zone } : undefined));
     }
-    static newInvalidDate() {
-        return new CalendarDate(null);
-    }
     static fromISO(str, { zone } = {}) {
-        if (zone)
-            return new CalendarDate(DateTime_js_1.DateTime.fromISO(str, { zone }));
-        else
-            return new CalendarDate(DateTime_js_1.DateTime.fromISO(str, { setZone: true }));
+        let dateTime;
+        try {
+            dateTime = DateTime_js_1.DateTime.fromISO(str, zone ? { zone } : { setZone: true });
+        }
+        catch (error) {
+            if (error instanceof Error)
+                throw new InvalidCalendarDate(error);
+            throw error;
+        }
+        return new CalendarDate(dateTime);
     }
     static fromSQL(str) {
-        return new CalendarDate(DateTime_js_1.DateTime.fromSQL(str, { zone: 'UTC' }));
+        let dateTime;
+        try {
+            dateTime = DateTime_js_1.DateTime.fromSQL(str, { zone: 'UTC' });
+        }
+        catch (error) {
+            if (error instanceof Error)
+                throw new InvalidCalendarDate(error);
+            throw error;
+        }
+        return new CalendarDate(dateTime);
     }
     static fromObject(obj, opts) {
-        return new CalendarDate(DateTime_js_1.DateTime.fromObject(obj, opts));
+        let dateTime;
+        try {
+            dateTime = DateTime_js_1.DateTime.fromObject(obj, opts);
+        }
+        catch (error) {
+            if (error instanceof Error)
+                throw new InvalidCalendarDate(error);
+            throw error;
+        }
+        return new CalendarDate(dateTime);
     }
     static today({ zone = 'UTC' } = {}) {
         return new CalendarDate(DateTime_js_1.DateTime.now().setZone(zone));
@@ -46,33 +74,22 @@ class CalendarDate {
     static yesterday(options = {}) {
         return CalendarDate.today(options).minus({ day: 1 });
     }
-    get isValid() {
-        if (this.luxonDateTime === null)
-            return false;
-        return this.luxonDateTime.isValid;
-    }
     toISO() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.toISODate();
     }
     toSQL() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.toSQLDate();
     }
     toJSON() {
         return this.toISO();
     }
     valueOf() {
-        return this.toISO();
+        return this.luxonDateTime.toMillis();
     }
     toISODate() {
         return this.toISO();
     }
     toLocaleString(formatOpts, opts) {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.toLocaleString(formatOpts, opts);
     }
     toString() {
@@ -82,91 +99,58 @@ class CalendarDate {
         return this.luxonDateTime;
     }
     toJSDate() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.toJSDate();
     }
     get year() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.year;
     }
     get month() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.month;
     }
     get day() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.day;
     }
     startOf(period) {
-        if (this.luxonDateTime === null)
-            return CalendarDate.newInvalidDate();
         return new CalendarDate(this.luxonDateTime.startOf(period));
     }
     endOf(period) {
-        if (this.luxonDateTime === null)
-            return CalendarDate.newInvalidDate();
         return new CalendarDate(this.luxonDateTime.endOf(period));
     }
     plus(duration) {
-        if (this.luxonDateTime === null)
-            return CalendarDate.newInvalidDate();
         return new CalendarDate(this.luxonDateTime.plus(duration));
     }
     minus(duration) {
-        if (this.luxonDateTime === null)
-            return CalendarDate.newInvalidDate();
         return new CalendarDate(this.luxonDateTime.minus(duration));
     }
-    static max(calendarDate, otherCalendarDate) {
-        const dateTime = calendarDate.toDateTime();
-        if (dateTime === null)
-            return CalendarDate.newInvalidDate();
-        const otherDateTime = otherCalendarDate.toDateTime();
-        if (otherDateTime === null)
-            return CalendarDate.newInvalidDate();
-        return new CalendarDate(DateTime_js_1.DateTime.max(dateTime, otherDateTime));
+    static max(...calendarDates) {
+        const dateTimes = calendarDates.map(calendarDate => calendarDate.toDateTime());
+        return new CalendarDate(DateTime_js_1.DateTime.max(...dateTimes));
     }
-    static min(calendarDate, otherCalendarDate) {
-        const dateTime = calendarDate.toDateTime();
-        if (dateTime === null)
-            return CalendarDate.newInvalidDate();
-        const otherDateTime = otherCalendarDate.toDateTime();
-        if (otherDateTime === null)
-            return CalendarDate.newInvalidDate();
-        return new CalendarDate(DateTime_js_1.DateTime.min(dateTime, otherDateTime));
+    static min(...calendarDates) {
+        const dateTimes = calendarDates.map(calendarDate => calendarDate.toDateTime());
+        return new CalendarDate(DateTime_js_1.DateTime.min(...dateTimes));
     }
     hasSame(otherCalendarDate, period) {
-        if (this.luxonDateTime === null)
-            return false;
         const otherDateTime = otherCalendarDate.toDateTime();
         if (otherDateTime === null)
             return false;
         return this.luxonDateTime.hasSame(otherDateTime, period);
     }
     diff(otherCalendarDate, duration) {
-        if (this.luxonDateTime === null)
-            return null;
         const otherDateTime = otherCalendarDate.toDateTime();
-        if (otherDateTime === null)
-            return null;
         return this.luxonDateTime.diff(otherDateTime, duration)[duration];
     }
     diffNow(duration) {
-        if (this.luxonDateTime === null)
-            return null;
         return Math.ceil(this.luxonDateTime.diffNow(duration)[duration]);
     }
     equals(otherCalendarDate) {
-        if (this.luxonDateTime === null)
-            return otherCalendarDate.toDateTime() === null;
-        const otherDateTime = otherCalendarDate.toDateTime();
-        if (otherDateTime === null)
-            return this.luxonDateTime === null;
-        return this.luxonDateTime.equals(otherDateTime);
+        return this.luxonDateTime.equals(otherCalendarDate.toDateTime());
     }
 }
 exports.default = CalendarDate;
+class InvalidCalendarDate extends Error {
+    constructor(error) {
+        super((error.message ?? '').replace('DateTime', 'CalendarDate'));
+    }
+}
+exports.InvalidCalendarDate = InvalidCalendarDate;

package/dist/cjs/src/helpers/DateTime.js

@@ -4,3 +4,4 @@ exports.Settings = exports.DateTime = void 0;
 const luxon = require("luxon");
 exports.DateTime = luxon.DateTime;
 exports.Settings = luxon.Settings;
+exports.Settings.throwOnInvalid = true;

package/dist/cjs/src/helpers/sqlAttributes.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = sqlAttributes;
 const index_js_1 = require("../dream-app/index.js");
+const DataTypeColumnTypeMismatch_js_1 = require("../errors/db/DataTypeColumnTypeMismatch.js");
 const CalendarDate_js_1 = require("./CalendarDate.js");
 const DateTime_js_1 = require("./DateTime.js");
 const isDatetimeOrDatetimeArrayColumn_js_1 = require("./db/types/isDatetimeOrDatetimeArrayColumn.js");
@@ -17,13 +18,13 @@ function sqlAttributes(dream) {
             return result;
         if (Array.isArray(val)) {
             if ((0, isDatetimeOrDatetimeArrayColumn_js_1.default)(dreamClass, key))
-                val = val.map(valueToDatetime);
+                val = val.map(aVal => valueToDatetime(dream, aVal));
             else if ((0, isTextOrTextArrayColumn_js_1.default)(dreamClass, key))
                 val = val.map(normalizeUnicode_js_1.default);
         }
         else {
             if ((0, isDatetimeOrDatetimeArrayColumn_js_1.default)(dreamClass, key))
-                val = valueToDatetime(val);
+                val = valueToDatetime(dream, val);
             else if ((0, isTextOrTextArrayColumn_js_1.default)(dreamClass, key))
                 val = (0, normalizeUnicode_js_1.default)(val);
         }
@@ -46,9 +47,18 @@ function sqlAttributes(dream) {
 /**
  * Convert datetimes to UTC
  */
-function valueToDatetime(val) {
+function valueToDatetime(dream, val) {
     if (typeof val !== 'string')
         return val;
-    const datetime = DateTime_js_1.DateTime.fromISO(val, { zone: 'UTC' });
+    let datetime;
+    try {
+        datetime = DateTime_js_1.DateTime.fromISO(val, { zone: 'UTC' });
+    }
+    catch (error) {
+        throw new DataTypeColumnTypeMismatch_js_1.default({
+            dream,
+            error: error instanceof Error ? error : new Error('database column type error'),
+        });
+    }
     return datetime.isValid ? datetime : val;
 }

package/dist/cjs/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamLogos = exports.DateTime = exports.compact = exports.cloneDeepSafe = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.MissingSerializersDefinition = exports.RecordNotFound = exports.GlobalNameNotSet = exports.NotNullViolation = exports.DataTypeColumnTypeMismatch = exports.DataIncompatibleWithDatabaseField = exports.ColumnOverflow = exports.CheckConstraintViolation = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.PostgresQueryDriver = exports.KyselyQueryDriver = exports.QueryDriverBase = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = exports.DreamAppAllowedPackageManagersEnumValues = exports.DreamApp = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Decorators = exports.STI = exports.SoftDelete = exports.ReplicaSafe = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.untypedDb = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.CliFileWriter = exports.DreamBin = void 0;
-exports.ObjectSerializerBuilder = exports.DreamSerializerBuilder = exports.ObjectSerializer = exports.DreamSerializer = exports.serializerNameFromFullyQualifiedModelName = exports.isDreamSerializer = exports.inferSerializersFromDreamClassOrViewModelClass = exports.inferSerializerFromDreamOrViewModel = exports.ops = exports.uniq = exports.uncapitalize = exports.expandStiClasses = exports.standardizeFullyQualifiedModelName = exports.sortObjectByValue = exports.sortObjectByKey = exports.sortBy = exports.sort = exports.snakeify = exports.round = exports.range = exports.Range = exports.percent = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.normalizeUnicode = exports.loadRepl = exports.isEmpty = exports.intersection = exports.hyphenize = exports.groupBy = void 0;
+exports.Env = exports.DreamLogos = exports.DateTime = exports.compact = exports.cloneDeepSafe = exports.generateDream = exports.capitalize = exports.camelize = exports.InvalidCalendarDate = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.MissingSerializersDefinition = exports.RecordNotFound = exports.GlobalNameNotSet = exports.NotNullViolation = exports.DataTypeColumnTypeMismatch = exports.DataIncompatibleWithDatabaseField = exports.ColumnOverflow = exports.CheckConstraintViolation = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.PostgresQueryDriver = exports.KyselyQueryDriver = exports.QueryDriverBase = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = exports.DreamAppAllowedPackageManagersEnumValues = exports.DreamApp = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Decorators = exports.STI = exports.SoftDelete = exports.ReplicaSafe = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.untypedDb = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.CliFileWriter = exports.DreamBin = void 0;
+exports.ObjectSerializerBuilder = exports.DreamSerializerBuilder = exports.ObjectSerializer = exports.DreamSerializer = exports.serializerNameFromFullyQualifiedModelName = exports.isDreamSerializer = exports.inferSerializersFromDreamClassOrViewModelClass = exports.inferSerializerFromDreamOrViewModel = exports.ops = exports.uniq = exports.uncapitalize = exports.expandStiClasses = exports.standardizeFullyQualifiedModelName = exports.sortObjectByValue = exports.sortObjectByKey = exports.sortBy = exports.sort = exports.snakeify = exports.round = exports.range = exports.Range = exports.percent = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.normalizeUnicode = exports.loadRepl = exports.isEmpty = exports.intersection = exports.hyphenize = exports.groupBy = exports.globalClassNameFromFullyQualifiedModelName = void 0;
 var index_js_1 = require("./bin/index.js");
 Object.defineProperty(exports, "DreamBin", { enumerable: true, get: function () { return index_js_1.default; } });
 var CliFileWriter_js_1 = require("./cli/CliFileWriter.js");
@@ -80,6 +80,7 @@ var benchmark_js_1 = require("./helpers/benchmark.js");
 Object.defineProperty(exports, "Benchmark", { enumerable: true, get: function () { return benchmark_js_1.default; } });
 var CalendarDate_js_1 = require("./helpers/CalendarDate.js");
 Object.defineProperty(exports, "CalendarDate", { enumerable: true, get: function () { return CalendarDate_js_1.default; } });
+Object.defineProperty(exports, "InvalidCalendarDate", { enumerable: true, get: function () { return CalendarDate_js_1.InvalidCalendarDate; } });
 var camelize_js_1 = require("./helpers/camelize.js");
 Object.defineProperty(exports, "camelize", { enumerable: true, get: function () { return camelize_js_1.default; } });
 var capitalize_js_1 = require("./helpers/capitalize.js");

package/dist/esm/src/Dream.js

@@ -2901,7 +2901,7 @@ export default class Dream {
             currentValue = DateTime.fromISO(currentValue);
         if (currentValue instanceof CalendarDate)
             currentValue = currentValue.toDateTime();
-        if (currentValue instanceof DateTime && currentValue.isValid)
+        if (currentValue instanceof DateTime)
             return currentValue.toMillis();
     }
     /**
@@ -2914,7 +2914,7 @@ export default class Dream {
             currentValue = CalendarDate.fromISO(currentValue);
         if (currentValue instanceof DateTime)
             currentValue = CalendarDate.fromDateTime(currentValue);
-        if (currentValue instanceof CalendarDate && currentValue.isValid)
+        if (currentValue instanceof CalendarDate)
             return currentValue.toISO();
     }
     /**

package/dist/esm/src/helpers/CalendarDate.js

@@ -7,11 +7,17 @@ export default class CalendarDate {
             this.luxonDateTime = DateTime.fromISO(isoDate, { zone: 'UTC' });
         }
         else if (typeof source === 'number') {
-            const dateTime = DateTime.utc(source, month, day);
-            this.luxonDateTime = dateTime.isValid ? dateTime : null;
+            try {
+                this.luxonDateTime = DateTime.utc(source, month, day);
+            }
+            catch (error) {
+                if (error instanceof Error)
+                    throw new InvalidCalendarDate(error);
+                throw error;
+            }
         }
         else {
-            this.luxonDateTime = null;
+            this.luxonDateTime = CalendarDate.today().toDateTime();
         }
     }
     static fromDateTime(dateTime) {
@@ -20,20 +26,41 @@ export default class CalendarDate {
     static fromJSDate(javascriptDate, { zone } = {}) {
         return new CalendarDate(DateTime.fromJSDate(javascriptDate, zone ? { zone } : undefined));
     }
-    static newInvalidDate() {
-        return new CalendarDate(null);
-    }
     static fromISO(str, { zone } = {}) {
-        if (zone)
-            return new CalendarDate(DateTime.fromISO(str, { zone }));
-        else
-            return new CalendarDate(DateTime.fromISO(str, { setZone: true }));
+        let dateTime;
+        try {
+            dateTime = DateTime.fromISO(str, zone ? { zone } : { setZone: true });
+        }
+        catch (error) {
+            if (error instanceof Error)
+                throw new InvalidCalendarDate(error);
+            throw error;
+        }
+        return new CalendarDate(dateTime);
     }
     static fromSQL(str) {
-        return new CalendarDate(DateTime.fromSQL(str, { zone: 'UTC' }));
+        let dateTime;
+        try {
+            dateTime = DateTime.fromSQL(str, { zone: 'UTC' });
+        }
+        catch (error) {
+            if (error instanceof Error)
+                throw new InvalidCalendarDate(error);
+            throw error;
+        }
+        return new CalendarDate(dateTime);
     }
     static fromObject(obj, opts) {
-        return new CalendarDate(DateTime.fromObject(obj, opts));
+        let dateTime;
+        try {
+            dateTime = DateTime.fromObject(obj, opts);
+        }
+        catch (error) {
+            if (error instanceof Error)
+                throw new InvalidCalendarDate(error);
+            throw error;
+        }
+        return new CalendarDate(dateTime);
     }
     static today({ zone = 'UTC' } = {}) {
         return new CalendarDate(DateTime.now().setZone(zone));
@@ -44,33 +71,22 @@ export default class CalendarDate {
     static yesterday(options = {}) {
         return CalendarDate.today(options).minus({ day: 1 });
     }
-    get isValid() {
-        if (this.luxonDateTime === null)
-            return false;
-        return this.luxonDateTime.isValid;
-    }
     toISO() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.toISODate();
     }
     toSQL() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.toSQLDate();
     }
     toJSON() {
         return this.toISO();
     }
     valueOf() {
-        return this.toISO();
+        return this.luxonDateTime.toMillis();
     }
     toISODate() {
         return this.toISO();
     }
     toLocaleString(formatOpts, opts) {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.toLocaleString(formatOpts, opts);
     }
     toString() {
@@ -80,90 +96,56 @@ export default class CalendarDate {
         return this.luxonDateTime;
     }
     toJSDate() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.toJSDate();
     }
     get year() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.year;
     }
     get month() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.month;
     }
     get day() {
-        if (this.luxonDateTime === null)
-            return null;
         return this.luxonDateTime.day;
     }
     startOf(period) {
-        if (this.luxonDateTime === null)
-            return CalendarDate.newInvalidDate();
         return new CalendarDate(this.luxonDateTime.startOf(period));
     }
     endOf(period) {
-        if (this.luxonDateTime === null)
-            return CalendarDate.newInvalidDate();
         return new CalendarDate(this.luxonDateTime.endOf(period));
     }
     plus(duration) {
-        if (this.luxonDateTime === null)
-            return CalendarDate.newInvalidDate();
         return new CalendarDate(this.luxonDateTime.plus(duration));
     }
     minus(duration) {
-        if (this.luxonDateTime === null)
-            return CalendarDate.newInvalidDate();
         return new CalendarDate(this.luxonDateTime.minus(duration));
     }
-    static max(calendarDate, otherCalendarDate) {
-        const dateTime = calendarDate.toDateTime();
-        if (dateTime === null)
-            return CalendarDate.newInvalidDate();
-        const otherDateTime = otherCalendarDate.toDateTime();
-        if (otherDateTime === null)
-            return CalendarDate.newInvalidDate();
-        return new CalendarDate(DateTime.max(dateTime, otherDateTime));
+    static max(...calendarDates) {
+        const dateTimes = calendarDates.map(calendarDate => calendarDate.toDateTime());
+        return new CalendarDate(DateTime.max(...dateTimes));
     }
-    static min(calendarDate, otherCalendarDate) {
-        const dateTime = calendarDate.toDateTime();
-        if (dateTime === null)
-            return CalendarDate.newInvalidDate();
-        const otherDateTime = otherCalendarDate.toDateTime();
-        if (otherDateTime === null)
-            return CalendarDate.newInvalidDate();
-        return new CalendarDate(DateTime.min(dateTime, otherDateTime));
+    static min(...calendarDates) {
+        const dateTimes = calendarDates.map(calendarDate => calendarDate.toDateTime());
+        return new CalendarDate(DateTime.min(...dateTimes));
     }
     hasSame(otherCalendarDate, period) {
-        if (this.luxonDateTime === null)
-            return false;
         const otherDateTime = otherCalendarDate.toDateTime();
         if (otherDateTime === null)
             return false;
         return this.luxonDateTime.hasSame(otherDateTime, period);
     }
     diff(otherCalendarDate, duration) {
-        if (this.luxonDateTime === null)
-            return null;
         const otherDateTime = otherCalendarDate.toDateTime();
-        if (otherDateTime === null)
-            return null;
         return this.luxonDateTime.diff(otherDateTime, duration)[duration];
     }
     diffNow(duration) {
-        if (this.luxonDateTime === null)
-            return null;
         return Math.ceil(this.luxonDateTime.diffNow(duration)[duration]);
     }
     equals(otherCalendarDate) {
-        if (this.luxonDateTime === null)
-            return otherCalendarDate.toDateTime() === null;
-        const otherDateTime = otherCalendarDate.toDateTime();
-        if (otherDateTime === null)
-            return this.luxonDateTime === null;
-        return this.luxonDateTime.equals(otherDateTime);
+        return this.luxonDateTime.equals(otherCalendarDate.toDateTime());
+    }
+}
+export class InvalidCalendarDate extends Error {
+    constructor(error) {
+        super((error.message ?? '').replace('DateTime', 'CalendarDate'));
     }
 }

package/dist/esm/src/helpers/DateTime.js

@@ -1,3 +1,4 @@
 import * as luxon from 'luxon';
 export const DateTime = luxon.DateTime;
 export const Settings = luxon.Settings;
+Settings.throwOnInvalid = true;

package/dist/esm/src/helpers/sqlAttributes.js

@@ -1,4 +1,5 @@
 import DreamApp from '../dream-app/index.js';
+import DataTypeColumnTypeMismatch from '../errors/db/DataTypeColumnTypeMismatch.js';
 import CalendarDate from './CalendarDate.js';
 import { DateTime } from './DateTime.js';
 import isDatetimeOrDatetimeArrayColumn from './db/types/isDatetimeOrDatetimeArrayColumn.js';
@@ -14,13 +15,13 @@ export default function sqlAttributes(dream) {
             return result;
         if (Array.isArray(val)) {
             if (isDatetimeOrDatetimeArrayColumn(dreamClass, key))
-                val = val.map(valueToDatetime);
+                val = val.map(aVal => valueToDatetime(dream, aVal));
             else if (isTextOrTextArrayColumn(dreamClass, key))
                 val = val.map(normalizeUnicode);
         }
         else {
             if (isDatetimeOrDatetimeArrayColumn(dreamClass, key))
-                val = valueToDatetime(val);
+                val = valueToDatetime(dream, val);
             else if (isTextOrTextArrayColumn(dreamClass, key))
                 val = normalizeUnicode(val);
         }
@@ -43,9 +44,18 @@ export default function sqlAttributes(dream) {
 /**
  * Convert datetimes to UTC
  */
-function valueToDatetime(val) {
+function valueToDatetime(dream, val) {
     if (typeof val !== 'string')
         return val;
-    const datetime = DateTime.fromISO(val, { zone: 'UTC' });
+    let datetime;
+    try {
+        datetime = DateTime.fromISO(val, { zone: 'UTC' });
+    }
+    catch (error) {
+        throw new DataTypeColumnTypeMismatch({
+            dream,
+            error: error instanceof Error ? error : new Error('database column type error'),
+        });
+    }
     return datetime.isValid ? datetime : val;
 }

package/dist/esm/src/index.js

@@ -34,7 +34,7 @@ export { default as RecordNotFound } from './errors/RecordNotFound.js';
 export { default as MissingSerializersDefinition } from './errors/serializers/MissingSerializersDefinition.js';
 export { default as ValidationError } from './errors/ValidationError.js';
 export { default as Benchmark } from './helpers/benchmark.js';
-export { default as CalendarDate } from './helpers/CalendarDate.js';
+export { default as CalendarDate, InvalidCalendarDate } from './helpers/CalendarDate.js';
 export { default as camelize } from './helpers/camelize.js';
 export { default as capitalize } from './helpers/capitalize.js';
 export { default as generateDream } from './helpers/cli/generateDream.js';

package/dist/types/src/helpers/CalendarDate.d.ts

@@ -8,12 +8,11 @@ type CalendarDateDurationUnit = keyof Pick<DurationObjectUnits, 'years' | 'quart
 type CalendarDateUnit = Extract<DateTimeUnit, 'year' | 'quarter' | 'month' | 'week' | 'day'>;
 export default class CalendarDate {
     private readonly luxonDateTime;
-    constructor(source: DateTime | number | null, month?: number, day?: number);
+    constructor(source?: DateTime | number | null, month?: number, day?: number);
     static fromDateTime(dateTime: DateTime): CalendarDate;
     static fromJSDate(javascriptDate: Date, { zone }?: {
         zone?: string | Zone;
     }): CalendarDate;
-    static newInvalidDate(): CalendarDate;
     static fromISO(str: string, { zone }?: {
         zone?: string | Zone;
     }): CalendarDate;
@@ -28,28 +27,30 @@ export default class CalendarDate {
     static yesterday(options?: {
         zone?: string | Zone;
     }): CalendarDate;
-    get isValid(): boolean;
-    toISO(): string | null;
-    toSQL(): string | null;
-    toJSON(): string | null;
-    valueOf(): string | null;
-    toISODate(): string | null;
-    toLocaleString(formatOpts?: DateTimeFormatOptions, opts?: LocaleOptions): string | null;
-    toString(): string | null;
-    toDateTime(): DateTime | null;
-    toJSDate(): Date | null;
-    get year(): number | null;
-    get month(): number | null;
-    get day(): number | null;
+    toISO(): string;
+    toSQL(): string;
+    toJSON(): string;
+    valueOf(): number;
+    toISODate(): string;
+    toLocaleString(formatOpts?: DateTimeFormatOptions, opts?: LocaleOptions): string;
+    toString(): string;
+    toDateTime(): DateTime;
+    toJSDate(): Date;
+    get year(): number;
+    get month(): number;
+    get day(): number;
     startOf(period: CalendarDateUnit): CalendarDate;
     endOf(period: CalendarDateUnit): CalendarDate;
     plus(duration: CalendarDateDurationLike): CalendarDate;
     minus(duration: CalendarDateDurationLike): CalendarDate;
-    static max(calendarDate: CalendarDate, otherCalendarDate: CalendarDate): CalendarDate;
-    static min(calendarDate: CalendarDate, otherCalendarDate: CalendarDate): CalendarDate;
+    static max(...calendarDates: Array<CalendarDate>): CalendarDate;
+    static min(...calendarDates: Array<CalendarDate>): CalendarDate;
     hasSame(otherCalendarDate: CalendarDate, period: CalendarDateUnit): boolean;
-    diff(otherCalendarDate: CalendarDate, duration: CalendarDateDurationUnit): number | null;
-    diffNow(duration: CalendarDateDurationUnit): number | null;
+    diff(otherCalendarDate: CalendarDate, duration: CalendarDateDurationUnit): number;
+    diffNow(duration: CalendarDateDurationUnit): number;
     equals(otherCalendarDate: CalendarDate): boolean;
 }
+export declare class InvalidCalendarDate extends Error {
+    constructor(error: Error);
+}
 export {};