@rvoh/dream 0.29.7 → 0.29.10

package/boilerplate/app/models/ApplicationModel.ts

@@ -1,6 +1,6 @@
 import { Dream } from '@rvoh/dream'
-import { globalSchema, schema } from '../../db/schema'
-import { DBClass } from '../../db/sync'
+import { globalSchema, schema } from '../../db/schema.js'
+import { DBClass } from '../../db/sync.js'
 
 export default class ApplicationModel extends Dream {
   public DB: DBClass

package/boilerplate/cli/helpers/initializeDreamApplication.ts

@@ -1,5 +1,5 @@
 import { DreamApplication } from '@rvoh/dream'
-import dreamConfCb from '../../app/conf/dream'
+import dreamConfCb from '../../app/conf/dream.js'
 
 export default async function initializeDreamApplication() {
   return await DreamApplication.init(dreamConfCb)

package/boilerplate/cli/index.ts

@@ -5,12 +5,12 @@
 // commanderjs docs:
 // https://github.com/tj/commander.js#quick-start
 
-import '../conf/loadEnv'
+import '../conf/loadEnv.js'
 
 import { DreamCLI } from '@rvoh/dream'
 import { Command } from 'commander'
-import seedDb from '../db/seed'
-import initializeDreamApplication from './helpers/initializeDreamApplication'
+import seedDb from '../db/seed.js'
+import initializeDreamApplication from './helpers/initializeDreamApplication.js'
 
 const program = new Command()
 

package/boilerplate/conf/repl.ts

@@ -2,7 +2,7 @@ import './loadEnv.js'
 
 import { loadRepl } from '@rvoh/dream'
 import * as repl from 'node:repl'
-import initializePsychicApplication from '../cli/helpers/initializePsychicApplication'
+import initializePsychicApplication from '../cli/helpers/initializePsychicApplication.js'
 
 const replServer = repl.start('> ')
 export default (async function () {

package/dist/cjs/src/Dream.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const luxon_1 = require("luxon");
 const errors_js_1 = require("./db/errors.js");
 const index_js_1 = require("./db/index.js");
 const associationToGetterSetterProp_js_1 = require("./decorators/associations/associationToGetterSetterProp.js");
@@ -39,6 +38,7 @@ const MissingTable_js_1 = require("./errors/MissingTable.js");
 const NonExistentScopeProvidedToResort_js_1 = require("./errors/NonExistentScopeProvidedToResort.js");
 const CalendarDate_js_1 = require("./helpers/CalendarDate.js");
 const cloneDeepSafe_js_1 = require("./helpers/cloneDeepSafe.js");
+const DateTime_js_1 = require("./helpers/DateTime.js");
 const cachedTypeForAttribute_js_1 = require("./helpers/db/cachedTypeForAttribute.js");
 const isJsonColumn_js_1 = require("./helpers/db/types/isJsonColumn.js");
 const inferSerializerFromDreamOrViewModel_js_1 = require("./helpers/inferSerializerFromDreamOrViewModel.js");
@@ -447,8 +447,12 @@ class Dream {
      * @returns A subset of columns for the given dream class
      */
     static paramSafeColumnsOrFallback() {
-        const defaultParams = this.defaultParamSafeColumns();
+        let defaultParams = this.defaultParamSafeColumns();
         const userDefinedParams = this.prototype.paramSafeColumns;
+        const userDefinedUnsafeParams = this.prototype.paramUnsafeColumns;
+        if (Array.isArray(userDefinedUnsafeParams)) {
+            defaultParams = defaultParams.filter(param => !userDefinedUnsafeParams.includes(param));
+        }
         if (Array.isArray(userDefinedParams)) {
             return userDefinedParams.filter(param => defaultParams.includes(param));
         }
@@ -2364,7 +2368,7 @@ class Dream {
         const currentValue = this.getAttributes()[attribute];
         if (this.isNewRecord)
             return true;
-        if (frozenValue instanceof luxon_1.DateTime) {
+        if (frozenValue instanceof DateTime_js_1.default) {
             return frozenValue.toMillis() !== this.unknownValueToMillis(currentValue);
         }
         else if (frozenValue instanceof CalendarDate_js_1.default) {
@@ -2381,10 +2385,10 @@ class Dream {
         if (!currentValue)
             return;
         if ((0, typechecks_js_1.isString)(currentValue))
-            currentValue = luxon_1.DateTime.fromISO(currentValue);
+            currentValue = DateTime_js_1.default.fromISO(currentValue);
         if (currentValue instanceof CalendarDate_js_1.default)
             currentValue = currentValue.toDateTime();
-        if (currentValue instanceof luxon_1.DateTime && currentValue.isValid)
+        if (currentValue instanceof DateTime_js_1.default && currentValue.isValid)
             return currentValue.toMillis();
     }
     /**
@@ -2395,7 +2399,7 @@ class Dream {
             return;
         if ((0, typechecks_js_1.isString)(currentValue))
             currentValue = CalendarDate_js_1.default.fromISO(currentValue);
-        if (currentValue instanceof luxon_1.DateTime)
+        if (currentValue instanceof DateTime_js_1.default)
             currentValue = CalendarDate_js_1.default.fromDateTime(currentValue);
         if (currentValue instanceof CalendarDate_js_1.default && currentValue.isValid)
             return currentValue.toISO();

package/dist/cjs/src/bin/helpers/sync.js

@@ -57,11 +57,9 @@ function removeUnwantedExports(file) {
 export type Timestamp = ColumnType<DateTime | CalendarDate>`);
 }
 function addCustomImports(file) {
-    const calendarDateImportStatement = EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT')
-        ? "import CalendarDate from '../../src/helpers/CalendarDate'"
-        : "import { CalendarDate } from '@rvoh/dream'";
-    const customImports = `${calendarDateImportStatement}
-import { DateTime } from 'luxon'`;
+    const customImports = EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT')
+        ? "import CalendarDate from '../../src/helpers/CalendarDate.js'\nimport DateTime from '../../src/helpers/DateTime.js'"
+        : "import { CalendarDate, DateTime } from '@rvoh/dream'";
     return `${(0, autogeneratedFileMessage_js_1.default)()}${customImports}
 ${file}`;
 }

package/dist/cjs/src/dream/Query.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const kysely_1 = require("kysely");
-const luxon_1 = require("luxon");
 const pluralize_esm_1 = require("pluralize-esm");
 const ConnectedToDB_js_1 = require("../db/ConnectedToDB.js");
 const associationToGetterSetterProp_js_1 = require("../decorators/associations/associationToGetterSetterProp.js");
@@ -26,6 +25,7 @@ const CalendarDate_js_1 = require("../helpers/CalendarDate.js");
 const camelize_js_1 = require("../helpers/camelize.js");
 const cloneDeepSafe_js_1 = require("../helpers/cloneDeepSafe.js");
 const compact_js_1 = require("../helpers/compact.js");
+const DateTime_js_1 = require("../helpers/DateTime.js");
 const isEmpty_js_1 = require("../helpers/isEmpty.js");
 const namespaceColumn_js_1 = require("../helpers/namespaceColumn.js");
 const objectPathsToArrays_js_1 = require("../helpers/objectPathsToArrays.js");
@@ -2420,9 +2420,9 @@ class Query extends ConnectedToDB_js_1.default {
             b = '=';
             c = val;
         }
-        if (c instanceof luxon_1.DateTime || c instanceof CalendarDate_js_1.default)
+        if (c instanceof DateTime_js_1.default || c instanceof CalendarDate_js_1.default)
             c = c.toJSDate();
-        if (c2 instanceof luxon_1.DateTime || c2 instanceof CalendarDate_js_1.default)
+        if (c2 instanceof DateTime_js_1.default || c2 instanceof CalendarDate_js_1.default)
             c2 = c2.toJSDate();
         if (a && c === undefined)
             throw new CannotPassUndefinedAsAValueToAWhereClause_js_1.default(this.dreamClass, a);

package/dist/cjs/src/dream/internal/saveDream.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = saveDream;
-const luxon_1 = require("luxon");
 const index_js_1 = require("../../db/index.js");
 const ValidationError_js_1 = require("../../errors/ValidationError.js");
+const DateTime_js_1 = require("../../helpers/DateTime.js");
 const namespaceColumn_js_1 = require("../../helpers/namespaceColumn.js");
 const sqlAttributes_js_1 = require("../../helpers/sqlAttributes.js");
 const executeDatabaseQuery_js_1 = require("./executeDatabaseQuery.js");
@@ -27,7 +27,7 @@ async function saveDream(dream, txn = null, { skipHooks = false } = {}) {
     if (alreadyPersisted && !dream.isDirty)
         return dream;
     let query;
-    const now = luxon_1.DateTime.now();
+    const now = DateTime_js_1.default.now();
     if (!alreadyPersisted && !dream.createdAt && dream.columns().has('createdAt'))
         dream.createdAt = now;
     if (!dream.dirtyAttributes().updatedAt && dream.columns().has('updatedAt'))

package/dist/cjs/src/dream/internal/softDeleteDream.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = softDeleteDream;
-const luxon_1 = require("luxon");
 const MissingDeletedAtFieldForSoftDelete_js_1 = require("../../errors/MissingDeletedAtFieldForSoftDelete.js");
+const DateTime_js_1 = require("../../helpers/DateTime.js");
 const isDateTimeColumn_js_1 = require("../../helpers/db/types/isDateTimeColumn.js");
 async function softDeleteDream(dream, txn) {
     const deletedAtField = dream.deletedAtField;
@@ -13,7 +13,7 @@ async function softDeleteDream(dream, txn) {
     let query = txn.kyselyTransaction
         .updateTable(dream.table)
         .where(dream.primaryKey, '=', dream.primaryKeyValue)
-        .set(dream.deletedAtField, luxon_1.DateTime.now());
+        .set(dream.deletedAtField, DateTime_js_1.default.now());
     dreamClass['sortableFields']?.forEach(sortableFieldMetadata => {
         const positionColumn = sortableFieldMetadata.positionField;
         query = query.set(positionColumn, null);

package/dist/cjs/src/dream-application/helpers/DreamImporter.js

@@ -9,8 +9,11 @@ class DreamImporter {
             const files = await Promise.all(dirents
                 .map(dirent => {
                 const res = path.resolve(dir, dirent.name);
-                const sanitizedPath = res.replace(/\.ts$/, '.js');
-                return dirent.isDirectory() ? this.ls(res) : /\.js$/.test(sanitizedPath) ? sanitizedPath : null;
+                return dirent.isDirectory()
+                    ? this.ls(res)
+                    : ['.js', '.ts'].includes(path.extname(res))
+                        ? res
+                        : null;
             })
                 .filter(ent => ent !== null));
             return Array.prototype.concat(...files);

package/dist/cjs/src/encrypt/InternalEncrypt.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_js_1 = require("./index.js");
-const index_js_2 = require("../dream-application/index.js");
+const index_js_1 = require("../dream-application/index.js");
 const MissingColumnEncryptionOpts_js_1 = require("../errors/encrypt/MissingColumnEncryptionOpts.js");
+const index_js_2 = require("./index.js");
 class InternalEncrypt {
     static encryptColumn(data) {
-        const dreamApp = index_js_2.default.getOrFail();
+        const dreamApp = index_js_1.default.getOrFail();
         const encryptOpts = dreamApp.encryption?.columns;
         if (!encryptOpts)
             throw new MissingColumnEncryptionOpts_js_1.default();
@@ -14,7 +14,7 @@ class InternalEncrypt {
         return this.doEncryption(data, encryptOpts.current);
     }
     static decryptColumn(data) {
-        const dreamApp = index_js_2.default.getOrFail();
+        const dreamApp = index_js_1.default.getOrFail();
         const encryptOpts = dreamApp.encryption?.columns;
         if (!encryptOpts)
             throw new MissingColumnEncryptionOpts_js_1.default();
@@ -23,10 +23,10 @@ class InternalEncrypt {
         return this.doDecryption(data, encryptOpts.current, encryptOpts.legacy);
     }
     static doEncryption(data, encryptionOpts) {
-        return index_js_1.default.encrypt(data, encryptionOpts);
+        return index_js_2.default.encrypt(data, encryptionOpts);
     }
     static doDecryption(data, encryptionOpts, legacyEncryptionOpts) {
-        return index_js_1.default.decrypt(data, encryptionOpts, legacyEncryptionOpts);
+        return index_js_2.default.decrypt(data, encryptionOpts, legacyEncryptionOpts);
     }
 }
 exports.default = InternalEncrypt;

package/dist/cjs/src/global-cli/file-builders/DreamtsBuilder.js

@@ -6,7 +6,7 @@ class DreamtsBuilder {
         return `\
 import * as path from 'path'
 import { DreamApplication } from '@rvoh/dream'
-import inflections from './inflections'
+import inflections from './inflections.js'
 
 export default async function (app: DreamApplication) {
   await app.load('models', path.join(__dirname, '..', 'models'))

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

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const luxon_1 = require("luxon");
+const DateTime_js_1 = require("./DateTime.js");
 class CalendarDate {
     luxonDateTime;
     constructor(source, month = 1, day = 1) {
-        if (source instanceof luxon_1.DateTime && source.isValid) {
+        if (source instanceof DateTime_js_1.default && source.isValid) {
             const isoDate = source.toISODate();
-            this.luxonDateTime = luxon_1.DateTime.fromISO(isoDate, { zone: 'UTC' });
+            this.luxonDateTime = DateTime_js_1.default.fromISO(isoDate, { zone: 'UTC' });
         }
         else if (typeof source === 'number') {
-            const dateTime = luxon_1.DateTime.utc(source, month, day);
+            const dateTime = DateTime_js_1.default.utc(source, month, day);
             this.luxonDateTime = dateTime.isValid ? dateTime : null;
         }
         else {
@@ -20,25 +20,25 @@ class CalendarDate {
         return new CalendarDate(dateTime);
     }
     static fromJSDate(javascriptDate, { zone } = {}) {
-        return new CalendarDate(luxon_1.DateTime.fromJSDate(javascriptDate, { zone }));
+        return new CalendarDate(DateTime_js_1.default.fromJSDate(javascriptDate, { zone }));
     }
     static newInvalidDate() {
         return new CalendarDate(null);
     }
     static fromISO(str, { zone } = {}) {
         if (zone)
-            return new CalendarDate(luxon_1.DateTime.fromISO(str, { zone }));
+            return new CalendarDate(DateTime_js_1.default.fromISO(str, { zone }));
         else
-            return new CalendarDate(luxon_1.DateTime.fromISO(str, { setZone: true }));
+            return new CalendarDate(DateTime_js_1.default.fromISO(str, { setZone: true }));
     }
     static fromSQL(str) {
-        return new CalendarDate(luxon_1.DateTime.fromSQL(str, { zone: 'UTC' }));
+        return new CalendarDate(DateTime_js_1.default.fromSQL(str, { zone: 'UTC' }));
     }
     static fromObject(obj, opts) {
-        return new CalendarDate(luxon_1.DateTime.fromObject(obj, opts));
+        return new CalendarDate(DateTime_js_1.default.fromObject(obj, opts));
     }
     static today({ zone = 'UTC' } = {}) {
-        return new CalendarDate(luxon_1.DateTime.now().setZone(zone));
+        return new CalendarDate(DateTime_js_1.default.now().setZone(zone));
     }
     static tomorrow(options = {}) {
         return CalendarDate.today(options).plus({ day: 1 });
@@ -128,7 +128,7 @@ class CalendarDate {
         const otherDateTime = otherCalendarDate.toDateTime();
         if (otherDateTime === null)
             return CalendarDate.newInvalidDate();
-        return new CalendarDate(luxon_1.DateTime.max(dateTime, otherDateTime));
+        return new CalendarDate(DateTime_js_1.default.max(dateTime, otherDateTime));
     }
     static min(calendarDate, otherCalendarDate) {
         const dateTime = calendarDate.toDateTime();
@@ -137,7 +137,7 @@ class CalendarDate {
         const otherDateTime = otherCalendarDate.toDateTime();
         if (otherDateTime === null)
             return CalendarDate.newInvalidDate();
-        return new CalendarDate(luxon_1.DateTime.min(dateTime, otherDateTime));
+        return new CalendarDate(DateTime_js_1.default.min(dateTime, otherDateTime));
     }
     hasSame(otherCalendarDate, period) {
         if (this.luxonDateTime === null)

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

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const luxon_1 = require("luxon");
+exports.default = luxon_1.DateTime;

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

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const luxon_1 = require("luxon");
+const DateTime_js_1 = require("./DateTime.js");
 const EnvInternal_js_1 = require("./EnvInternal.js");
 class Benchmark {
     _start;
     start() {
-        this._start = luxon_1.DateTime.now();
+        this._start = DateTime_js_1.default.now();
     }
     mark(message, level = 'log') {
         if (EnvInternal_js_1.default.isTest && !EnvInternal_js_1.default.boolean('ALLOW_BENCHMARKS'))
             return;
         if (!this._start)
             this.start();
-        console[level](message, luxon_1.DateTime.now().diff(this._start, 'milliseconds').milliseconds);
+        console[level](message, DateTime_js_1.default.now().diff(this._start, 'milliseconds').milliseconds);
     }
 }
 exports.default = Benchmark;

package/dist/cjs/src/helpers/cli/SchemaBuilder.js

@@ -22,16 +22,15 @@ class SchemaBuilder {
             ? `\
 import {
   ${imports.sort().join(',\n  ')}
-} from './db'`
+} from './db.js'`
             : '';
         const calendarDateImportStatement = EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT')
-            ? "import CalendarDate from '../../src/helpers/CalendarDate'"
-            : "import { CalendarDate } from '@rvoh/dream'";
+            ? "import CalendarDate from '../../src/helpers/CalendarDate.js'\nimport DateTime from '../../src/helpers/DateTime.js'"
+            : "import { CalendarDate, DateTime } from '@rvoh/dream'";
         const dreamApp = index_js_2.default.getOrFail();
         const newSchemaFileContents = `\
 ${(0, autogeneratedFileMessage_js_1.default)()}
 ${calendarDateImportStatement}
-import { DateTime } from 'luxon'
 ${importStr}
 
 ${schemaConstContent}

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeUnsupportedByClone = void 0;
 exports.default = cloneDeepSafe;
-const luxon_1 = require("luxon");
 const ops_statement_js_1 = require("../ops/ops-statement.js");
 const CalendarDate_js_1 = require("./CalendarDate.js");
+const DateTime_js_1 = require("./DateTime.js");
 const range_js_1 = require("./range.js");
 const typechecks_js_1 = require("./typechecks.js");
 /**
@@ -28,7 +28,7 @@ function cloneDeepSafe(original) {
         return original;
     if (['number', 'boolean', 'bigint', 'symbol'].includes(typeof original))
         return original;
-    if (original instanceof luxon_1.DateTime)
+    if (original instanceof DateTime_js_1.default)
         return original;
     if (original instanceof CalendarDate_js_1.default)
         return original;

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

@@ -6,8 +6,8 @@ exports.findCorrespondingArrayOid = findCorrespondingArrayOid;
 exports.parsePostgresDate = parsePostgresDate;
 exports.parsePostgresDatetime = parsePostgresDatetime;
 exports.parsePostgresDecimal = parsePostgresDecimal;
-const luxon_1 = require("luxon");
 const CalendarDate_js_1 = require("./CalendarDate.js");
+const DateTime_js_1 = require("./DateTime.js");
 async function findEnumArrayOids(kyselyDb) {
     const result = await kyselyDb.selectFrom('pg_type').select('typarray').where('typtype', '=', 'e').execute();
     return result.map(values => values.typarray);
@@ -32,7 +32,7 @@ function parsePostgresDate(dateString) {
     return dateString ? CalendarDate_js_1.default.fromSQL(dateString) : dateString;
 }
 function parsePostgresDatetime(datetimeString) {
-    return datetimeString ? luxon_1.DateTime.fromSQL(datetimeString, { zone: 'UTC' }) : datetimeString;
+    return datetimeString ? DateTime_js_1.default.fromSQL(datetimeString, { zone: 'UTC' }) : datetimeString;
 }
 function parsePostgresDecimal(numberString) {
     return numberString ? parseFloat(numberString) : numberString;

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = hyphenize;
-const stringCasing_js_1 = require("./stringCasing.js");
 const snakeify_js_1 = require("./snakeify.js");
+const stringCasing_js_1 = require("./stringCasing.js");
 function hyphenize(target) {
     return (0, stringCasing_js_1.default)(target, hyphenizeString);
 }

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const dotenv = require("dotenv");
 const EnvInternal_js_1 = require("./EnvInternal.js");
-const node_url_1 = require("node:url");
 const node_path_1 = require("node:path");
+const node_url_1 = require("node:url");
 let finalDirname;
 if (typeof importMeta !== 'undefined') {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment

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

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = loadRepl;
 require("./loadEnv.js");
-const luxon_1 = require("luxon");
 const index_js_1 = require("../dream-application/index.js");
 const index_js_2 = require("../encrypt/index.js");
 const index_js_3 = require("../ops/index.js");
 const CalendarDate_js_1 = require("./CalendarDate.js");
+const DateTime_js_1 = require("./DateTime.js");
 const pascalizePath_js_1 = require("./pascalizePath.js");
 function loadRepl(context) {
     const dreamApp = index_js_1.default.getOrFail();
-    context.DateTime = luxon_1.DateTime;
+    context.DateTime = DateTime_js_1.default;
     context.CalendarDate = CalendarDate_js_1.default;
     context.Encrypt = index_js_2.default;
     context.ops = index_js_3.default;

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = pascalize;
-const stringCasing_js_1 = require("./stringCasing.js");
 const camelize_js_1 = require("./camelize.js");
 const capitalize_js_1 = require("./capitalize.js");
+const stringCasing_js_1 = require("./stringCasing.js");
 function pascalize(target) {
     return (0, stringCasing_js_1.default)(target, pascalizeString);
 }

package/dist/cjs/src/helpers/path/relativeDreamPath.js

@@ -28,11 +28,11 @@ function default_1(originDreamPathType, destinationDreamPathType, fullyQualified
         case 'db':
             return destinationPath;
         case 'factories':
-            return `${destinationPath}${fullyQualifiedDestinationModelName}Factory`;
+            return `${destinationPath}${fullyQualifiedDestinationModelName}Factory.js`;
         case 'serializers':
-            return `${destinationPath}${fullyQualifiedDestinationModelName}Serializer`;
+            return `${destinationPath}${fullyQualifiedDestinationModelName}Serializer.js`;
         default:
-            return `${destinationPath}${fullyQualifiedDestinationModelName}`;
+            return `${destinationPath}${fullyQualifiedDestinationModelName}.js`;
     }
 }
 function dreamPathTypeRelativePath(originDreamPathType, destinationDreamPathType) {

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = snakeify;
 exports.snakeifyString = snakeifyString;
-const stringCasing_js_1 = require("./stringCasing.js");
 const camelize_js_1 = require("./camelize.js");
+const stringCasing_js_1 = require("./stringCasing.js");
 function snakeify(target) {
     return (0, stringCasing_js_1.default)(target, snakeifyString);
 }

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = sqlAttributes;
-const luxon_1 = require("luxon");
 const CalendarDate_js_1 = require("./CalendarDate.js");
+const DateTime_js_1 = require("./DateTime.js");
 const isDateTimeColumn_js_1 = require("./db/types/isDateTimeColumn.js");
 const typechecks_js_1 = require("./typechecks.js");
 function sqlAttributes(dream) {
@@ -10,8 +10,8 @@ function sqlAttributes(dream) {
     return Object.keys(attributes).reduce((result, key) => {
         let val = attributes[key];
         if ((0, typechecks_js_1.isString)(val) && (0, isDateTimeColumn_js_1.default)(dream.constructor, key))
-            val = luxon_1.DateTime.fromISO(val, { zone: 'UTC' });
-        if (val instanceof luxon_1.DateTime || val instanceof CalendarDate_js_1.default) {
+            val = DateTime_js_1.default.fromISO(val, { zone: 'UTC' });
+        if (val instanceof DateTime_js_1.default || val instanceof CalendarDate_js_1.default) {
             // Converting toJSDate resulted in the correct timezone, but even with process.env.TZ=UTC,
             // Kysely inserted into the database with the machine timezone, which can shift the date
             // (e.g., toJSDate resulted in a JS Date that formats as "1987-04-07T00:00:00.000Z", but

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = stringCase;
-const luxon_1 = require("luxon");
-const typechecks_js_1 = require("./typechecks.js");
 const CalendarDate_js_1 = require("./CalendarDate.js");
+const DateTime_js_1 = require("./DateTime.js");
+const typechecks_js_1 = require("./typechecks.js");
 function stringCase(target, stringCaser) {
     if ((0, typechecks_js_1.isString)(target))
         return stringCaser(target);
@@ -19,7 +19,7 @@ function recursiveStringCase(target, stringCaser) {
     if (Array.isArray(target))
         return target.map(s => recursiveStringCase(s, stringCaser));
     if ((0, typechecks_js_1.isObject)(target)) {
-        if (target instanceof luxon_1.DateTime)
+        if (target instanceof DateTime_js_1.default)
             return target;
         if (target instanceof CalendarDate_js_1.default)
             return target;

package/dist/cjs/src/index.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.inferSerializerFromDreamOrViewModel = exports.inferSerializerFromDreamClassOrViewModelClass = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.debug = exports.compact = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.DreamConst = exports.Query = exports.DreamTransaction = exports.Dream = exports.DreamApplication = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Virtual = exports.Validates = exports.Validate = exports.STI = exports.SoftDelete = exports.Scope = exports.ReplicaSafe = exports.Decorators = exports.DreamDbConnection = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.db = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.DreamBin = void 0;
-exports.DreamSerializer = exports.Attribute = exports.RendersOne = exports.RendersMany = exports.ops = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = exports.round = exports.range = void 0;
+exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.inferSerializerFromDreamOrViewModel = exports.inferSerializerFromDreamClassOrViewModelClass = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.debug = exports.DateTime = exports.compact = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.DreamConst = exports.Query = exports.DreamTransaction = exports.Dream = exports.DreamApplication = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Virtual = exports.Validates = exports.Validate = exports.STI = exports.SoftDelete = exports.Scope = exports.ReplicaSafe = exports.Decorators = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.db = exports.pgErrorType = exports.dreamDbConnections = exports.DreamDbConnection = exports.closeAllDbConnections = exports.DreamCLI = exports.DreamBin = void 0;
+exports.DreamSerializer = exports.Attribute = exports.RendersOne = exports.RendersMany = exports.ops = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = exports.round = exports.range = exports.Range = void 0;
 var index_js_1 = require("./bin/index.js");
 Object.defineProperty(exports, "DreamBin", { enumerable: true, get: function () { return index_js_1.default; } });
 var index_js_2 = require("./cli/index.js");
 Object.defineProperty(exports, "DreamCLI", { enumerable: true, get: function () { return index_js_2.default; } });
 var DreamDbConnection_js_1 = require("./db/DreamDbConnection.js");
 Object.defineProperty(exports, "closeAllDbConnections", { enumerable: true, get: function () { return DreamDbConnection_js_1.closeAllDbConnections; } });
+Object.defineProperty(exports, "DreamDbConnection", { enumerable: true, get: function () { return DreamDbConnection_js_1.default; } });
 Object.defineProperty(exports, "dreamDbConnections", { enumerable: true, get: function () { return DreamDbConnection_js_1.dreamDbConnections; } });
 var errors_js_1 = require("./db/errors.js");
 Object.defineProperty(exports, "pgErrorType", { enumerable: true, get: function () { return errors_js_1.pgErrorType; } });
@@ -19,8 +20,6 @@ var validateColumn_js_1 = require("./db/validators/validateColumn.js");
 Object.defineProperty(exports, "validateColumn", { enumerable: true, get: function () { return validateColumn_js_1.default; } });
 var validateTable_js_1 = require("./db/validators/validateTable.js");
 Object.defineProperty(exports, "validateTable", { enumerable: true, get: function () { return validateTable_js_1.default; } });
-var DreamDbConnection_js_2 = require("./db/DreamDbConnection.js");
-Object.defineProperty(exports, "DreamDbConnection", { enumerable: true, get: function () { return DreamDbConnection_js_2.default; } });
 var Decorators_js_1 = require("./decorators/Decorators.js");
 Object.defineProperty(exports, "Decorators", { enumerable: true, get: function () { return Decorators_js_1.default; } });
 var ReplicaSafe_js_1 = require("./decorators/ReplicaSafe.js");
@@ -75,6 +74,8 @@ var generateDream_js_1 = require("./helpers/cli/generateDream.js");
 Object.defineProperty(exports, "generateDream", { enumerable: true, get: function () { return generateDream_js_1.default; } });
 var compact_js_1 = require("./helpers/compact.js");
 Object.defineProperty(exports, "compact", { enumerable: true, get: function () { return compact_js_1.default; } });
+var DateTime_js_1 = require("./helpers/DateTime.js");
+Object.defineProperty(exports, "DateTime", { enumerable: true, get: function () { return DateTime_js_1.default; } });
 var debug_js_1 = require("./helpers/debug.js");
 Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return debug_js_1.default; } });
 var Env_js_1 = require("./helpers/Env.js");

package/dist/cjs/src/serializer/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const luxon_1 = require("luxon");
 const index_js_1 = require("../dream-application/index.js");
 const types_js_1 = require("../dream/types.js");
 const GlobalNameNotSet_js_1 = require("../errors/dream-application/GlobalNameNotSet.js");
@@ -8,6 +7,7 @@ const MissingSerializersDefinition_js_1 = require("../errors/MissingSerializersD
 const FailedToRenderThroughAssociationForSerializer_js_1 = require("../errors/serializers/FailedToRenderThroughAssociationForSerializer.js");
 const camelize_js_1 = require("../helpers/camelize.js");
 const compact_js_1 = require("../helpers/compact.js");
+const DateTime_js_1 = require("../helpers/DateTime.js");
 const inferSerializerFromDreamOrViewModel_js_1 = require("../helpers/inferSerializerFromDreamOrViewModel.js");
 const round_js_1 = require("../helpers/round.js");
 const snakeify_js_1 = require("../helpers/snakeify.js");
@@ -153,7 +153,7 @@ class DreamSerializer {
                     case 'date-time':
                         dateValue = this.getAttributeValue(attributeStatement);
                         returnObj[fieldWithCasing] = dateValue?.toISO()
-                            ? luxon_1.DateTime.fromISO(dateValue.toISO()).toISO()
+                            ? DateTime_js_1.default.fromISO(dateValue.toISO()).toISO()
                             : null;
                         break;
                     case 'decimal':

package/dist/esm/src/Dream.js

@@ -1,4 +1,3 @@
-import { DateTime } from 'luxon';
 import { pgErrorType } from './db/errors.js';
 import db from './db/index.js';
 import associationToGetterSetterProp from './decorators/associations/associationToGetterSetterProp.js';
@@ -37,6 +36,7 @@ import MissingTable from './errors/MissingTable.js';
 import NonExistentScopeProvidedToResort from './errors/NonExistentScopeProvidedToResort.js';
 import CalendarDate from './helpers/CalendarDate.js';
 import cloneDeepSafe from './helpers/cloneDeepSafe.js';
+import DateTime from './helpers/DateTime.js';
 import cachedTypeForAttribute from './helpers/db/cachedTypeForAttribute.js';
 import isJsonColumn from './helpers/db/types/isJsonColumn.js';
 import inferSerializerFromDreamOrViewModel from './helpers/inferSerializerFromDreamOrViewModel.js';
@@ -445,8 +445,12 @@ export default class Dream {
      * @returns A subset of columns for the given dream class
      */
     static paramSafeColumnsOrFallback() {
-        const defaultParams = this.defaultParamSafeColumns();
+        let defaultParams = this.defaultParamSafeColumns();
         const userDefinedParams = this.prototype.paramSafeColumns;
+        const userDefinedUnsafeParams = this.prototype.paramUnsafeColumns;
+        if (Array.isArray(userDefinedUnsafeParams)) {
+            defaultParams = defaultParams.filter(param => !userDefinedUnsafeParams.includes(param));
+        }
         if (Array.isArray(userDefinedParams)) {
             return userDefinedParams.filter(param => defaultParams.includes(param));
         }