@rvoh/dream 2.2.3 → 2.3.0-alpha.2

package/dist/cjs/src/Dream.js

@@ -44,14 +44,14 @@ import DreamMissingRequiredOverride from './errors/DreamMissingRequiredOverride.
 import NonExistentScopeProvidedToResort from './errors/NonExistentScopeProvidedToResort.js';
 import RecordNotFound from './errors/RecordNotFound.js';
 import MissingSerializersDefinition from './errors/serializers/MissingSerializersDefinition.js';
-import CalendarDate from './helpers/CalendarDate.js';
 import cloneDeepSafe from './helpers/cloneDeepSafe.js';
 import compact from './helpers/compact.js';
-import { DateTime } from './helpers/DateTime.js';
 import cachedTypeForAttribute from './helpers/db/cachedTypeForAttribute.js';
 import isJsonColumn from './helpers/db/types/isJsonColumn.js';
 import notEqual from './helpers/notEqual.js';
 import { inferSerializersFromDreamClassOrViewModelClass } from './serializer/helpers/inferSerializerFromDreamOrViewModel.js';
+import CalendarDate from './utils/datetime/CalendarDate.js';
+import { DateTime } from './utils/datetime/DateTime.js';
 const RECURSIVE_SERIALIZATION_MAX_REPEATS = 4;
 export default class Dream {
     DB;
@@ -2907,7 +2907,7 @@ export default class Dream {
         if (this.isNewRecord)
             return true;
         if (frozenValue instanceof DateTime) {
-            return frozenValue.toMillis() !== this.unknownValueToMillis(currentValue);
+            return frozenValue.toMicroseconds() !== this.unknownValueToMicroseconds(currentValue);
         }
         else if (frozenValue instanceof CalendarDate) {
             return frozenValue.toISO() !== this.unknownValueToDateString(currentValue);
@@ -2919,7 +2919,7 @@ export default class Dream {
     /**
      * @internal
      */
-    unknownValueToMillis(currentValue) {
+    unknownValueToMicroseconds(currentValue) {
         if (!currentValue)
             return;
         if (typeof currentValue === 'string')
@@ -2927,7 +2927,7 @@ export default class Dream {
         if (currentValue instanceof CalendarDate)
             currentValue = currentValue.toDateTime();
         if (currentValue instanceof DateTime)
-            return currentValue.toMillis();
+            return currentValue.toMicroseconds();
     }
     /**
      * @internal

package/dist/cjs/src/db/dataTypes.js

@@ -42,6 +42,7 @@ export const postgresDatatypes = [
     'text',
     'time',
     'time with time zone',
+    'time without time zone',
     'timestamp',
     'timestamp with time zone',
     'timestamp without time zone',

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

@@ -1,7 +1,7 @@
-import { Settings } from '../helpers/DateTime.js';
+import PostgresQueryDriver from '../dream/QueryDriver/Postgres.js';
 import EnvInternal from '../helpers/EnvInternal.js';
+import { Settings } from '../utils/datetime/DateTime.js';
 import DreamDbConnection from './DreamDbConnection.js';
-import PostgresQueryDriver from '../dream/QueryDriver/Postgres.js';
 if (EnvInternal.string('TZ', { optional: true }))
     Settings.defaultZone = EnvInternal.string('TZ');
 export default function db(connectionName = 'default', connectionType = 'primary', dialectProvider = PostgresQueryDriver.dialectProvider(connectionName, connectionType)) {

package/dist/cjs/src/dream/QueryDriver/Base.js

@@ -1,5 +1,5 @@
-import CalendarDate from '../../helpers/CalendarDate.js';
-import { DateTime } from '../../helpers/DateTime.js';
+import CalendarDate from '../../utils/datetime/CalendarDate.js';
+import { DateTime } from '../../utils/datetime/DateTime.js';
 export default class QueryDriverBase {
     query;
     dreamClass;

package/dist/cjs/src/dream/QueryDriver/Kysely.js

@@ -32,13 +32,11 @@ import ColumnOverflow from '../../errors/db/ColumnOverflow.js';
 import DataTypeColumnTypeMismatch from '../../errors/db/DataTypeColumnTypeMismatch.js';
 import NotNullViolation from '../../errors/db/NotNullViolation.js';
 import UnexpectedUndefined from '../../errors/UnexpectedUndefined.js';
-import CalendarDate from '../../helpers/CalendarDate.js';
 import camelize from '../../helpers/camelize.js';
 import ASTGlobalSchemaBuilder from '../../helpers/cli/ASTGlobalSchemaBuilder.js';
 import ASTSchemaBuilder from '../../helpers/cli/ASTSchemaBuilder.js';
 import generateMigration from '../../helpers/cli/generateMigration.js';
 import compact from '../../helpers/compact.js';
-import { DateTime } from '../../helpers/DateTime.js';
 import EnvInternal from '../../helpers/EnvInternal.js';
 import groupBy from '../../helpers/groupBy.js';
 import isEmpty from '../../helpers/isEmpty.js';
@@ -54,6 +52,8 @@ import sqlAttributes from '../../helpers/sqlAttributes.js';
 import uniq from '../../helpers/uniq.js';
 import CurriedOpsStatement from '../../ops/curried-ops-statement.js';
 import OpsStatement from '../../ops/ops-statement.js';
+import CalendarDate from '../../utils/datetime/CalendarDate.js';
+import { DateTime } from '../../utils/datetime/DateTime.js';
 import { DreamConst, primaryKeyTypes } from '../constants.js';
 import DreamTransaction from '../DreamTransaction.js';
 import throughAssociationHasOptionsBesidesThroughAndSource from '../internal/associations/throughAssociationHasOptionsBesidesThroughAndSource.js';

package/dist/cjs/src/dream/QueryDriver/helpers/kysely/checkForNeedToBeRunMigrations.js

@@ -1,8 +1,8 @@
 import { FileMigrationProvider, Migrator } from 'kysely';
 import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
 import { closeAllConnectionsForConnectionName } from '../../../../db/DreamDbConnection.js';
 import db from '../../../../db/index.js';
+import windowsSafePath from '../../../../helpers/path/windowsSafePath.js';
 import migrationFolderPath from './migrationFolderPath.js';
 export default async function checkForNeedToBeRunMigrations({ connectionName, dialectProvider, }) {
     const migrationFolder = migrationFolderPath(connectionName);
@@ -14,7 +14,7 @@ export default async function checkForNeedToBeRunMigrations({ connectionName, di
         allowUnorderedMigrations: true,
         provider: new FileMigrationProvider({
             fs,
-            path,
+            path: windowsSafePath,
             migrationFolder,
         }),
     });

package/dist/cjs/src/dream/QueryDriver/helpers/kysely/migrationFolderPath.js

@@ -1,8 +1,13 @@
 import * as path from 'node:path';
 import DreamApp from '../../../../dream-app/index.js';
+import normalizeFilePath from '../../../../dream-app/helpers/normalizeFilePath.js';
 export default function migrationFolderPath(connectionName) {
     const dreamApp = DreamApp.getOrFail();
-    return connectionName === 'default'
+    const migrationPath = connectionName === 'default'
         ? path.join(dreamApp.projectRoot, dreamApp.paths.db, 'migrations')
         : path.join(dreamApp.projectRoot, dreamApp.paths.db, 'migrations', connectionName);
+    // Normalize the path to use forward slashes on Windows to avoid ESM URL scheme issues
+    // This ensures kysely's FileMigrationProvider can properly construct import paths
+    // when it dynamically imports migration files
+    return normalizeFilePath(path.resolve(migrationPath));
 }

package/dist/cjs/src/dream/QueryDriver/helpers/kysely/runMigration.js

@@ -1,11 +1,11 @@
 import { FileMigrationProvider, Migrator } from 'kysely';
 import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
 import DreamCLI from '../../../../cli/index.js';
 import colorize from '../../../../cli/logger/loggable/colorize.js';
 import { closeAllConnectionsForConnectionName, closeAllDbConnections, } from '../../../../db/DreamDbConnection.js';
 import db from '../../../../db/index.js';
 import DreamApp from '../../../../dream-app/index.js';
+import windowsSafePath from '../../../../helpers/path/windowsSafePath.js';
 import migrationFolderPath from './migrationFolderPath.js';
 export default async function runMigration({ connectionName, mode = 'migrate', dialectProvider, }) {
     const migrationFolder = migrationFolderPath(connectionName);
@@ -17,7 +17,7 @@ export default async function runMigration({ connectionName, mode = 'migrate', d
         allowUnorderedMigrations: true,
         provider: new FileMigrationProvider({
             fs,
-            path,
+            path: windowsSafePath,
             migrationFolder,
         }),
     });

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

@@ -1,6 +1,6 @@
 import ValidationError from '../../errors/ValidationError.js';
-import { DateTime } from '../../helpers/DateTime.js';
 import sqlAttributes from '../../helpers/sqlAttributes.js';
+import { DateTime } from '../../utils/datetime/DateTime.js';
 import Query from '../Query.js';
 import runHooksFor from './runHooksFor.js';
 export default async function saveDream(dream, txn = null, { skipHooks = false } = {}) {

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

@@ -1,6 +1,6 @@
 import MissingDeletedAtFieldForSoftDelete from '../../errors/MissingDeletedAtFieldForSoftDelete.js';
-import { DateTime } from '../../helpers/DateTime.js';
 import isDatetimeOrDatetimeArrayColumn from '../../helpers/db/types/isDatetimeOrDatetimeArrayColumn.js';
+import { DateTime } from '../../utils/datetime/DateTime.js';
 export default async function softDeleteDream(dream, txn) {
     const deletedAtField = dream['_deletedAtField'];
     const dreamClass = dream.constructor;

package/dist/cjs/src/dream-app/helpers/globalModelKeyFromPath.js

@@ -1,6 +1,9 @@
+import normalizeFilePath from './normalizeFilePath.js';
 export default function (filepath, dirPath) {
-    const prefixPath = dirPath;
-    return filepath
+    const normalizedDirPath = normalizeFilePath(dirPath);
+    const normalizedFilepath = normalizeFilePath(filepath);
+    const prefixPath = normalizedDirPath;
+    return normalizedFilepath
         .replace(prefixPath, '')
         .replace(/\.[jt]s$/, '')
         .replace(/^\//, '');

package/dist/cjs/src/dream-app/helpers/globalSerializerKeyFromPath.js

@@ -1,6 +1,9 @@
+import normalizeFilePath from './normalizeFilePath.js';
 export default function globalSerializerKeyFromPath(filepath, dirPath, exportKey = 'default') {
-    const prefixPath = dirPath;
-    const defaultExport = filepath
+    const normalizedDirPath = normalizeFilePath(dirPath);
+    const normalizedFilepath = normalizeFilePath(filepath);
+    const prefixPath = normalizedDirPath;
+    const defaultExport = normalizedFilepath
         .replace(prefixPath, '')
         .replace(/\.[jt]s$/, '')
         .replace(/^\//, '');

package/dist/cjs/src/dream-app/helpers/normalizeFilePath.js

@@ -0,0 +1,3 @@
+export default function normalizeFilePath(filepath) {
+    return filepath.replace(/\\/g, '/');
+}

package/dist/cjs/src/dream-app/index.js

@@ -5,9 +5,8 @@ import PostgresQueryDriver from '../dream/QueryDriver/Postgres.js';
 import Encrypt from '../encrypt/index.js';
 import DreamAppInitMissingCallToLoadModels from '../errors/dream-app/DreamAppInitMissingCallToLoadModels.js';
 import DreamAppInitMissingMissingProjectRoot from '../errors/dream-app/DreamAppInitMissingMissingProjectRoot.js';
-import CalendarDate from '../helpers/CalendarDate.js';
+import DreamAppInitMissingPackageManager from '../errors/dream-app/DreamAppInitMissingPackageManager.js';
 import autogeneratedFileDisclaimer from '../helpers/cli/autoGeneratedFileDisclaimer.js';
-import { DateTime, Settings } from '../helpers/DateTime.js';
 import EnvInternal from '../helpers/EnvInternal.js';
 import globalClassNameFromFullyQualifiedModelName from '../helpers/globalClassNameFromFullyQualifiedModelName.js';
 import absoluteDreamPath from '../helpers/path/absoluteDreamPath.js';
@@ -17,11 +16,12 @@ import expandStiClasses from '../helpers/sti/expandStiClasses.js';
 import inferSerializerFromDreamOrViewModel, { inferSerializersFromDreamClassOrViewModelClass, } from '../serializer/helpers/inferSerializerFromDreamOrViewModel.js';
 import isDreamSerializer from '../serializer/helpers/isDreamSerializer.js';
 import serializerNameFromFullyQualifiedModelName from '../serializer/helpers/serializerNameFromFullyQualifiedModelName.js';
+import CalendarDate from '../utils/datetime/CalendarDate.js';
+import { DateTime, Settings } from '../utils/datetime/DateTime.js';
 import { cacheDreamApp, getCachedDreamAppOrFail } from './cache.js';
 import importModels, { getModelsOrFail } from './helpers/importers/importModels.js';
 import importSerializers, { getSerializersOrFail, setCachedSerializers, } from './helpers/importers/importSerializers.js';
 import lookupClassByGlobalName from './helpers/lookupClassByGlobalName.js';
-import DreamAppInitMissingPackageManager from '../errors/dream-app/DreamAppInitMissingPackageManager.js';
 // this needs to be done top-level to ensure proper configuration
 Settings.defaultZone = 'UTC';
 export default class DreamApp {

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

@@ -1,6 +1,6 @@
 import Dream from '../Dream.js';
-import CalendarDate from './CalendarDate.js';
-import { DateTime } from './DateTime.js';
+import CalendarDate from '../utils/datetime/CalendarDate.js';
+import { DateTime } from '../utils/datetime/DateTime.js';
 /**
  * Performs a deep equality check between two values, supporting primitives, arrays,
  * Dream instances, CalendarDate, DateTime, and objects.

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

@@ -220,7 +220,7 @@ export default class ASTBuilder {
     dateAndDateTimeImports() {
         if (EnvInternal.boolean('DREAM_CORE_DEVELOPMENT')) {
             const calendarImport = ts.factory.createImportClause(true, f.createIdentifier('CalendarDate'), undefined);
-            const calendarImportDeclaration = ts.factory.createImportDeclaration(undefined, calendarImport, ts.factory.createStringLiteral('../../src/helpers/CalendarDate.js'));
+            const calendarImportDeclaration = ts.factory.createImportDeclaration(undefined, calendarImport, ts.factory.createStringLiteral('../../src/utils/datetime/CalendarDate.js'));
             const dateTimeNamedImports = ts.factory.createNamedImports([
                 f.createImportSpecifier(true, undefined, ts.factory.createIdentifier('DateTime')),
             ]);
@@ -228,7 +228,7 @@ export default class ASTBuilder {
             undefined, // name: undefined for default import
             dateTimeNamedImports // namedBindings
             );
-            const dateTimeImportDeclaration = ts.factory.createImportDeclaration(undefined, dateTimeImportClause, ts.factory.createStringLiteral('../../src/helpers/DateTime.js'));
+            const dateTimeImportDeclaration = ts.factory.createImportDeclaration(undefined, dateTimeImportClause, ts.factory.createStringLiteral('../../src/utils/datetime/DateTime.js'));
             return [calendarImportDeclaration, dateTimeImportDeclaration];
         }
         else {

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

@@ -1,7 +1,7 @@
 import Dream from '../Dream.js';
 import OpsStatement from '../ops/ops-statement.js';
-import CalendarDate from './CalendarDate.js';
-import { DateTime } from './DateTime.js';
+import CalendarDate from '../utils/datetime/CalendarDate.js';
+import { DateTime } from '../utils/datetime/DateTime.js';
 import isObject from './isObject.js';
 import { Range } from './range.js';
 /**

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

@@ -1,5 +1,5 @@
-import CalendarDate from './CalendarDate.js';
-import { DateTime } from './DateTime.js';
+import CalendarDate from '../utils/datetime/CalendarDate.js';
+import { DateTime } from '../utils/datetime/DateTime.js';
 export async function findEnumArrayOids(kyselyDb) {
     const result = await kyselyDb.selectFrom('pg_type').select('typarray').where('typtype', '=', 'e').execute();
     return result.map(values => values.typarray);

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

@@ -1,11 +1,11 @@
 import DreamApp from '../dream-app/index.js';
 import Encrypt from '../encrypt/index.js';
 import ops from '../ops/index.js';
-import CalendarDate from './CalendarDate.js';
+import CalendarDate from '../utils/datetime/CalendarDate.js';
+import { DateTime } from '../utils/datetime/DateTime.js';
 import camelize from './camelize.js';
 import capitalize from './capitalize.js';
 import compact from './compact.js';
-import { DateTime } from './DateTime.js';
 import hyphenize from './hyphenize.js';
 import pascalize from './pascalize.js';
 import pascalizePath from './pascalizePath.js';

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

@@ -0,0 +1,27 @@
+import normalizeFilePath from '../../dream-app/helpers/normalizeFilePath.js';
+import convertToFileURL from './convertToFileURL.js';
+export default class PathHelpers {
+    /**
+     * converts a filepath with windows path delimiters into a path with linux/unix path delimiters
+     *
+     * ```ts
+     * PathHelpers.normalize("\My\Path\To\File.ts")
+     * // "/My/Path/To/File.ts"
+     * ```
+     *
+     * @param filepath - string
+     * @returns the same filepath, with any windows path delimiters replaced to their linux/unix counterparts
+     */
+    static normalize(filepath) {
+        return normalizeFilePath(filepath);
+    }
+    /**
+     * uses node's pathToFileURL to convert filepaths
+     *
+     * @param filepath - string
+     * @returns the filepath, converted using pathToFileURL, returning the href property
+     */
+    static fileUrl(filepath) {
+        return convertToFileURL(filepath);
+    }
+}

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

@@ -0,0 +1,7 @@
+import { pathToFileURL } from 'node:url';
+export default function convertToFileURL(filepath) {
+    if (filepath.startsWith('/') || /^[A-Za-z]:/.test(filepath)) {
+        return pathToFileURL(filepath).href;
+    }
+    return filepath;
+}

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

@@ -0,0 +1,22 @@
+// Create a path wrapper that converts absolute Windows paths to file:// URLs
+// This is needed because kysely's FileMigrationProvider uses dynamic imports,
+import * as path from 'node:path';
+import convertToFileURL from './convertToFileURL.js';
+import normalizeFilePath from '../../dream-app/helpers/normalizeFilePath.js';
+// and on Windows, absolute paths must be file:// URLs for dynamic imports to work
+const windowsSafePath = {
+    ...path,
+    join: (...paths) => {
+        const joined = normalizeFilePath(path.join(...paths));
+        return convertToFileURL(joined);
+    },
+    resolve: (...paths) => {
+        const resolved = normalizeFilePath(path.resolve(...paths));
+        return convertToFileURL(resolved);
+    },
+    normalize: (p) => {
+        const normalized = normalizeFilePath(path.normalize(p));
+        return convertToFileURL(normalized);
+    },
+};
+export default windowsSafePath;

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

@@ -1,5 +1,5 @@
-import CalendarDate from './CalendarDate.js';
-import { DateTime } from './DateTime.js';
+import CalendarDate from '../utils/datetime/CalendarDate.js';
+import { DateTime } from '../utils/datetime/DateTime.js';
 /**
  * Returns a copy of the array, sorted by the value returned by calling the function in the second argument on each element in the array.
  *

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

@@ -1,7 +1,7 @@
 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 CalendarDate from '../utils/datetime/CalendarDate.js';
+import { DateTime } from '../utils/datetime/DateTime.js';
 import isDatetimeOrDatetimeArrayColumn from './db/types/isDatetimeOrDatetimeArrayColumn.js';
 import isTextOrTextArrayColumn from './db/types/isTextOrTextArrayColumn.js';
 import normalizeUnicode from './normalizeUnicode.js';

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

@@ -1,6 +1,6 @@
 import Dream from '../Dream.js';
-import CalendarDate from './CalendarDate.js';
-import { DateTime } from './DateTime.js';
+import CalendarDate from '../utils/datetime/CalendarDate.js';
+import { DateTime } from '../utils/datetime/DateTime.js';
 import isObject from './isObject.js';
 export default function stringCase(target, stringCaser) {
     if (typeof target === 'string')

package/dist/cjs/src/package-exports/errors.js

@@ -10,4 +10,5 @@ export { default as GlobalNameNotSet } from '../errors/dream-app/GlobalNameNotSe
 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 { InvalidCalendarDate } from '../helpers/CalendarDate.js';
+export { InvalidCalendarDate } from '../utils/datetime/CalendarDate.js';
+export { InvalidDateTime } from '../utils/datetime/DateTime.js';

package/dist/cjs/src/package-exports/index.js

@@ -7,9 +7,9 @@ export { default as Dream } from '../Dream.js';
 export { DreamConst } from '../dream/constants.js';
 export { default as DreamTransaction } from '../dream/DreamTransaction.js';
 export { default as Query } from '../dream/Query.js';
-export { default as CalendarDate } from '../helpers/CalendarDate.js';
-export { DateTime } from '../helpers/DateTime.js';
 export { default as Env } from '../helpers/Env.js';
 export { default as ops } from '../ops/index.js';
 export { default as DreamSerializer } from '../serializer/DreamSerializer.js';
 export { default as ObjectSerializer } from '../serializer/ObjectSerializer.js';
+export { default as CalendarDate } from '../utils/datetime/CalendarDate.js';
+export { DateTime } from '../utils/datetime/DateTime.js';

package/dist/cjs/src/package-exports/system.js

@@ -5,5 +5,6 @@ export { default as DreamImporter } from '../dream-app/helpers/DreamImporter.js'
 export { DreamAppAllowedPackageManagersEnumValues, } from '../dream-app/index.js';
 export { primaryKeyTypes } from '../dream/constants.js';
 export { default as DreamLogos } from '../helpers/DreamLogos/DreamLogos.js';
+export { default as PathHelpers } from '../helpers/path/PathHelpers.js';
 export { default as DreamSerializerBuilder } from '../serializer/builders/DreamSerializerBuilder.js';
 export { default as ObjectSerializerBuilder } from '../serializer/builders/ObjectSerializerBuilder.js';

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

@@ -1,9 +1,9 @@
 import RendersManyMustReceiveArray from '../errors/serializers/RendersManyMustReceiveArray.js';
-import CalendarDate from '../helpers/CalendarDate.js';
 import compact from '../helpers/compact.js';
-import { DateTime } from '../helpers/DateTime.js';
 import round from '../helpers/round.js';
 import snakeify from '../helpers/snakeify.js';
+import CalendarDate from '../utils/datetime/CalendarDate.js';
+import { DateTime } from '../utils/datetime/DateTime.js';
 import DreamSerializerBuilder from './builders/DreamSerializerBuilder.js';
 import ObjectSerializerBuilder from './builders/ObjectSerializerBuilder.js';
 import inferSerializerFromDreamOrViewModel from './helpers/inferSerializerFromDreamOrViewModel.js';

package/dist/cjs/src/types/calendardate.js

@@ -0,0 +1 @@
+export {};

package/dist/cjs/src/types/datetime.js

@@ -0,0 +1 @@
+export {};