@rvoh/dream 0.43.0-beta.7 → 0.43.0-beta.9

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

@@ -34,7 +34,7 @@ const DateTime_js_1 = require("../helpers/DateTime.js");
 const isEmpty_js_1 = require("../helpers/isEmpty.js");
 const isObject_js_1 = require("../helpers/isObject.js");
 const namespaceColumn_js_1 = require("../helpers/namespaceColumn.js");
-const normalizeString_js_1 = require("../helpers/normalizeString.js");
+const normalizeUnicode_js_1 = require("../helpers/normalizeUnicode.js");
 const objectPathsToArrays_js_1 = require("../helpers/objectPathsToArrays.js");
 const protectAgainstPollutingAssignment_js_1 = require("../helpers/protectAgainstPollutingAssignment.js");
 const range_js_1 = require("../helpers/range.js");
@@ -2504,7 +2504,7 @@ class Query extends ConnectedToDB_js_1.default {
             c = val.map(v => v instanceof DateTime_js_1.DateTime || v instanceof CalendarDate_js_1.default
                 ? v.toSQL()
                 : typeof v === 'string'
-                    ? (0, normalizeString_js_1.default)(v)
+                    ? (0, normalizeUnicode_js_1.default)(v)
                     : v);
         }
         else if (val instanceof curried_ops_statement_js_1.default) {
@@ -2549,11 +2549,11 @@ class Query extends ConnectedToDB_js_1.default {
         if (c instanceof DateTime_js_1.DateTime || c instanceof CalendarDate_js_1.default)
             c = c.toSQL();
         else if (typeof c === 'string')
-            c = (0, normalizeString_js_1.default)(c);
+            c = (0, normalizeUnicode_js_1.default)(c);
         if (c2 instanceof DateTime_js_1.DateTime || c2 instanceof CalendarDate_js_1.default)
             c2 = c2.toSQL();
         else if (typeof c2 === 'string')
-            c2 = (0, normalizeString_js_1.default)(c2);
+            c2 = (0, normalizeUnicode_js_1.default)(c2);
         if (a && c === undefined)
             throw new CannotPassUndefinedAsAValueToAWhereClause_js_1.default(this.dreamClass, a);
         if (a2 && c2 === undefined)

package/dist/cjs/src/errors/serializers/MissingSerializersDefinitionForKey.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const pascalize_js_1 = require("../../helpers/pascalize.js");
 class MissingSerializersDefinitionForKey extends Error {
     viewModel;
     serializerKey;
@@ -16,10 +17,10 @@ Missing serializers definition for \`${this.serializerKey}\` on class \`${classN
 Try something like this in your ${className}'s serializer getter:
 
 class ${className} {
-  public get serializers(): DreamSerializers<${className}> {
+  public get serializers() {
     return {
-      default: '${className}Serializer'
-      ${this.serializerKey}: '<the_global_name_of_a_serializer>'
+      default: ${className}Serializer
+      ${this.serializerKey}: ${className}${(0, pascalize_js_1.default)(this.serializerKey)}Serializer
     }
   }
   ...

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

@@ -2,30 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateDreamContent;
 const pluralize_esm_1 = require("pluralize-esm");
-const serializerGlobalNameFromFullyQualifiedModelName_js_1 = require("../../serializer/helpers/serializerGlobalNameFromFullyQualifiedModelName.js");
+const serializerNameFromFullyQualifiedModelName_js_1 = require("../../serializer/helpers/serializerNameFromFullyQualifiedModelName.js");
 const camelize_js_1 = require("../camelize.js");
 const globalClassNameFromFullyQualifiedModelName_js_1 = require("../globalClassNameFromFullyQualifiedModelName.js");
 const relativeDreamPath_js_1 = require("../path/relativeDreamPath.js");
 const snakeify_js_1 = require("../snakeify.js");
 const standardizeFullyQualifiedModelName_js_1 = require("../standardizeFullyQualifiedModelName.js");
 const uniq_js_1 = require("../uniq.js");
+const generateSerializerContent_js_1 = require("./generateSerializerContent.js");
 function generateDreamContent({ fullyQualifiedModelName, columnsWithTypes, fullyQualifiedParentName, serializer, }) {
     fullyQualifiedModelName = (0, standardizeFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName);
     const modelClassName = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName);
     let parentModelClassName;
     const dreamImports = ['Decorators', 'DreamColumn'];
-    if (serializer)
-        dreamImports.push('DreamSerializers');
     const isSTI = !!fullyQualifiedParentName;
     if (isSTI) {
         fullyQualifiedParentName = (0, standardizeFullyQualifiedModelName_js_1.default)(fullyQualifiedParentName);
         parentModelClassName = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedParentName);
         dreamImports.push('STI');
     }
+    const serialzerClassName = (0, serializerNameFromFullyQualifiedModelName_js_1.default)((0, generateSerializerContent_js_1.fullyQualifiedModelNameToSerializerBaseName)(fullyQualifiedModelName));
+    const summarySerialzerClassName = (0, serializerNameFromFullyQualifiedModelName_js_1.default)((0, generateSerializerContent_js_1.fullyQualifiedModelNameToSerializerBaseName)(fullyQualifiedModelName), 'summary');
     const idTypescriptType = `DreamColumn<${modelClassName}, 'id'>`;
     const modelImportStatements = isSTI
         ? [importStatementForModel(fullyQualifiedModelName, fullyQualifiedParentName)]
         : [importStatementForModel(fullyQualifiedModelName, 'ApplicationModel')];
+    const serializerImportStatement = serializer
+        ? importStatementForSerializers(fullyQualifiedModelName, serialzerClassName, summarySerialzerClassName)
+        : '';
     const attributeStatements = columnsWithTypes.map(attribute => {
         const [attributeName, attributeType, ...descriptors] = attribute.split(':');
         if (attributeName === undefined)
@@ -76,7 +80,7 @@ public ${(0, camelize_js_1.default)(attributeName)}: ${getAttributeType(attribut
         timestamps = timestamps.replace(/\n$/, '');
     const tableName = (0, snakeify_js_1.default)((0, pluralize_esm_1.default)(fullyQualifiedModelName.replace(/\//g, '_')));
     return `\
-import { ${(0, uniq_js_1.default)(dreamImports).join(', ')} } from '@rvoh/dream'${(0, uniq_js_1.default)(modelImportStatements).join('')}
+import { ${(0, uniq_js_1.default)(dreamImports).join(', ')} } from '@rvoh/dream'${(0, uniq_js_1.default)(modelImportStatements).join('')}${serializerImportStatement}
 
 const deco = new Decorators<typeof ${modelClassName}>()
 
@@ -89,10 +93,10 @@ ${isSTI
   }
 
 `}${serializer
-        ? `  public ${isSTI ? 'override ' : ''}get serializers(): DreamSerializers<${modelClassName}> {
+        ? `  public ${isSTI ? 'override ' : ''}get serializers() {
     return {
-      default: '${(0, serializerGlobalNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName)}',
-      summary: '${(0, serializerGlobalNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName, 'summary')}',
+      default: ${serialzerClassName},
+      summary: ${summarySerialzerClassName},
     }
   }
 
@@ -107,3 +111,6 @@ function getAttributeType(attribute, modelClassName) {
 function importStatementForModel(originModelName, destinationModelName = originModelName) {
     return `\nimport ${(0, globalClassNameFromFullyQualifiedModelName_js_1.default)(destinationModelName)} from '${(0, relativeDreamPath_js_1.default)('models', 'models', originModelName, destinationModelName)}'`;
 }
+function importStatementForSerializers(originModelName, serialzerClassName, summarySerialzerClassName) {
+    return `\nimport { ${serialzerClassName}, ${summarySerialzerClassName} } from '${(0, relativeDreamPath_js_1.default)('models', 'serializers', originModelName)}'`;
+}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateSerializerContent;
+exports.fullyQualifiedModelNameToSerializerBaseName = fullyQualifiedModelNameToSerializerBaseName;
 const serializerNameFromFullyQualifiedModelName_js_1 = require("../../serializer/helpers/serializerNameFromFullyQualifiedModelName.js");
 const camelize_js_1 = require("../camelize.js");
 const globalClassNameFromFullyQualifiedModelName_js_1 = require("../globalClassNameFromFullyQualifiedModelName.js");

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

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = normalizeUnicode;
+const index_js_1 = require("../dream-app/index.js");
+/**
+ * Normalizes a Unicode string according to the application's configured normalization form.
+ *
+ * Unicode normalization ensures text consistency by converting characters to a canonical
+ * representation. This is crucial for text comparison, searching, and data integrity,
+ * as the same visual text can be represented differently in Unicode (e.g., é as a single
+ * character vs. e + combining accent).
+ *
+ * The normalization form is configured via `psy.set('unicodeNormalization', form)`
+ * in app/conf.ts. The default form is 'NFC'. All strings and string arrays passed
+ * into Dream models are automatically normalized before database storage (values
+ * in JSON/JSONB fields are not automatically normalized). String values in queries
+ * (e.g., `where`, `and`) are automatically normalized to ensure search consistency.
+ *
+ * @param val - The string to normalize
+ * @returns The normalized string, or the original string if normalization is disabled ('none')
+ *
+ * @see {@link https://unicode.org/reports/tr15/ | Unicode Normalization Forms (UAX #15)}
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize | String.prototype.normalize()}
+ *
+ * @example
+ * ```typescript
+ * // With NFC normalization (default)
+ * normalizeUnicode('café') // Returns normalized form of café
+ *
+ * // With normalization disabled
+ * psy.set('unicodeNormalization', 'none')
+ * normalizeUnicode('café') // Returns original string unchanged
+ * ```
+ */
+function normalizeUnicode(val) {
+    const normalizationForm = index_js_1.default.getOrFail().unicodeNormalization;
+    if (normalizationForm === 'none')
+        return val;
+    return typeof val === 'string' ? val.normalize(normalizationForm) : val;
+}

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

@@ -5,7 +5,7 @@ const CalendarDate_js_1 = require("./CalendarDate.js");
 const DateTime_js_1 = require("./DateTime.js");
 const isDatetimeOrDatetimeArrayColumn_js_1 = require("./db/types/isDatetimeOrDatetimeArrayColumn.js");
 const isTextOrTextArrayColumn_js_1 = require("./db/types/isTextOrTextArrayColumn.js");
-const normalizeString_js_1 = require("./normalizeString.js");
+const normalizeUnicode_js_1 = require("./normalizeUnicode.js");
 function sqlAttributes(dream) {
     const attributes = dream.dirtyAttributes();
     const dreamClass = dream.constructor;
@@ -17,13 +17,13 @@ function sqlAttributes(dream) {
             if ((0, isDatetimeOrDatetimeArrayColumn_js_1.default)(dreamClass, key))
                 val = val.map(valueToDatetime);
             else if ((0, isTextOrTextArrayColumn_js_1.default)(dreamClass, key))
-                val = val.map(normalizeString_js_1.default);
+                val = val.map(normalizeUnicode_js_1.default);
         }
         else {
             if ((0, isDatetimeOrDatetimeArrayColumn_js_1.default)(dreamClass, key))
                 val = valueToDatetime(val);
             else if ((0, isTextOrTextArrayColumn_js_1.default)(dreamClass, key))
-                val = (0, normalizeString_js_1.default)(val);
+                val = (0, normalizeUnicode_js_1.default)(val);
         }
         if (val instanceof DateTime_js_1.DateTime || val instanceof CalendarDate_js_1.default) {
             // Converting toJSDate resulted in the correct timezone, but even with process.env.TZ=UTC,

package/dist/cjs/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.intersection = exports.hyphenize = exports.groupBy = 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.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = 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.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 = void 0;
+exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.normalizeUnicode = exports.loadRepl = exports.isEmpty = exports.intersection = exports.hyphenize = exports.groupBy = 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.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = 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.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 = 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");
@@ -87,6 +87,8 @@ var isEmpty_js_1 = require("./helpers/isEmpty.js");
 Object.defineProperty(exports, "isEmpty", { enumerable: true, get: function () { return isEmpty_js_1.default; } });
 var loadRepl_js_1 = require("./helpers/loadRepl.js");
 Object.defineProperty(exports, "loadRepl", { enumerable: true, get: function () { return loadRepl_js_1.default; } });
+var normalizeUnicode_js_1 = require("./helpers/normalizeUnicode.js");
+Object.defineProperty(exports, "normalizeUnicode", { enumerable: true, get: function () { return normalizeUnicode_js_1.default; } });
 var pascalize_js_1 = require("./helpers/pascalize.js");
 Object.defineProperty(exports, "pascalize", { enumerable: true, get: function () { return pascalize_js_1.default; } });
 var dreamPath_js_1 = require("./helpers/path/dreamPath.js");

package/dist/cjs/src/serializer/helpers/inferSerializerFromDreamOrViewModel.js

@@ -18,9 +18,12 @@ function inferSerializerFromDreamOrViewModel(obj, serializerKey = exports.DEFAUL
     const serializers = obj.serializers;
     if (!serializers)
         throw new MissingSerializersDefinition_js_1.default(obj);
-    const globalName = serializers[serializerKey];
-    if (!globalName)
+    const serializerOrGlobalName = serializers[serializerKey];
+    if (!serializerOrGlobalName)
         throw new MissingSerializersDefinitionForKey_js_1.default(obj, serializerKey);
+    if ((0, isDreamSerializer_js_1.default)(serializerOrGlobalName))
+        return serializerOrGlobalName;
+    const globalName = serializerOrGlobalName;
     const dreamApp = index_js_1.default.getOrFail();
     const serializer = dreamApp.serializers[globalName];
     if (!serializer)

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

@@ -32,7 +32,7 @@ import { DateTime } from '../helpers/DateTime.js';
 import isEmpty from '../helpers/isEmpty.js';
 import isObject from '../helpers/isObject.js';
 import namespaceColumn from '../helpers/namespaceColumn.js';
-import normalizeString from '../helpers/normalizeString.js';
+import normalizeUnicode from '../helpers/normalizeUnicode.js';
 import objectPathsToArrays from '../helpers/objectPathsToArrays.js';
 import protectAgainstPollutingAssignment from '../helpers/protectAgainstPollutingAssignment.js';
 import { Range } from '../helpers/range.js';
@@ -2502,7 +2502,7 @@ export default class Query extends ConnectedToDB {
             c = val.map(v => v instanceof DateTime || v instanceof CalendarDate
                 ? v.toSQL()
                 : typeof v === 'string'
-                    ? normalizeString(v)
+                    ? normalizeUnicode(v)
                     : v);
         }
         else if (val instanceof CurriedOpsStatement) {
@@ -2547,11 +2547,11 @@ export default class Query extends ConnectedToDB {
         if (c instanceof DateTime || c instanceof CalendarDate)
             c = c.toSQL();
         else if (typeof c === 'string')
-            c = normalizeString(c);
+            c = normalizeUnicode(c);
         if (c2 instanceof DateTime || c2 instanceof CalendarDate)
             c2 = c2.toSQL();
         else if (typeof c2 === 'string')
-            c2 = normalizeString(c2);
+            c2 = normalizeUnicode(c2);
         if (a && c === undefined)
             throw new CannotPassUndefinedAsAValueToAWhereClause(this.dreamClass, a);
         if (a2 && c2 === undefined)

package/dist/esm/src/errors/serializers/MissingSerializersDefinitionForKey.js

@@ -1,3 +1,4 @@
+import pascalize from '../../helpers/pascalize.js';
 export default class MissingSerializersDefinitionForKey extends Error {
     viewModel;
     serializerKey;
@@ -14,10 +15,10 @@ Missing serializers definition for \`${this.serializerKey}\` on class \`${classN
 Try something like this in your ${className}'s serializer getter:
 
 class ${className} {
-  public get serializers(): DreamSerializers<${className}> {
+  public get serializers() {
     return {
-      default: '${className}Serializer'
-      ${this.serializerKey}: '<the_global_name_of_a_serializer>'
+      default: ${className}Serializer
+      ${this.serializerKey}: ${className}${pascalize(this.serializerKey)}Serializer
     }
   }
   ...

package/dist/esm/src/helpers/cli/generateDreamContent.js

@@ -1,28 +1,32 @@
 import pluralize from 'pluralize-esm';
-import serializerGlobalNameFromFullyQualifiedModelName from '../../serializer/helpers/serializerGlobalNameFromFullyQualifiedModelName.js';
+import serializerNameFromFullyQualifiedModelName from '../../serializer/helpers/serializerNameFromFullyQualifiedModelName.js';
 import camelize from '../camelize.js';
 import globalClassNameFromFullyQualifiedModelName from '../globalClassNameFromFullyQualifiedModelName.js';
 import relativeDreamPath from '../path/relativeDreamPath.js';
 import snakeify from '../snakeify.js';
 import standardizeFullyQualifiedModelName from '../standardizeFullyQualifiedModelName.js';
 import uniq from '../uniq.js';
+import { fullyQualifiedModelNameToSerializerBaseName } from './generateSerializerContent.js';
 export default function generateDreamContent({ fullyQualifiedModelName, columnsWithTypes, fullyQualifiedParentName, serializer, }) {
     fullyQualifiedModelName = standardizeFullyQualifiedModelName(fullyQualifiedModelName);
     const modelClassName = globalClassNameFromFullyQualifiedModelName(fullyQualifiedModelName);
     let parentModelClassName;
     const dreamImports = ['Decorators', 'DreamColumn'];
-    if (serializer)
-        dreamImports.push('DreamSerializers');
     const isSTI = !!fullyQualifiedParentName;
     if (isSTI) {
         fullyQualifiedParentName = standardizeFullyQualifiedModelName(fullyQualifiedParentName);
         parentModelClassName = globalClassNameFromFullyQualifiedModelName(fullyQualifiedParentName);
         dreamImports.push('STI');
     }
+    const serialzerClassName = serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName));
+    const summarySerialzerClassName = serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName), 'summary');
     const idTypescriptType = `DreamColumn<${modelClassName}, 'id'>`;
     const modelImportStatements = isSTI
         ? [importStatementForModel(fullyQualifiedModelName, fullyQualifiedParentName)]
         : [importStatementForModel(fullyQualifiedModelName, 'ApplicationModel')];
+    const serializerImportStatement = serializer
+        ? importStatementForSerializers(fullyQualifiedModelName, serialzerClassName, summarySerialzerClassName)
+        : '';
     const attributeStatements = columnsWithTypes.map(attribute => {
         const [attributeName, attributeType, ...descriptors] = attribute.split(':');
         if (attributeName === undefined)
@@ -73,7 +77,7 @@ public ${camelize(attributeName)}: ${getAttributeType(attribute, modelClassName)
         timestamps = timestamps.replace(/\n$/, '');
     const tableName = snakeify(pluralize(fullyQualifiedModelName.replace(/\//g, '_')));
     return `\
-import { ${uniq(dreamImports).join(', ')} } from '@rvoh/dream'${uniq(modelImportStatements).join('')}
+import { ${uniq(dreamImports).join(', ')} } from '@rvoh/dream'${uniq(modelImportStatements).join('')}${serializerImportStatement}
 
 const deco = new Decorators<typeof ${modelClassName}>()
 
@@ -86,10 +90,10 @@ ${isSTI
   }
 
 `}${serializer
-        ? `  public ${isSTI ? 'override ' : ''}get serializers(): DreamSerializers<${modelClassName}> {
+        ? `  public ${isSTI ? 'override ' : ''}get serializers() {
     return {
-      default: '${serializerGlobalNameFromFullyQualifiedModelName(fullyQualifiedModelName)}',
-      summary: '${serializerGlobalNameFromFullyQualifiedModelName(fullyQualifiedModelName, 'summary')}',
+      default: ${serialzerClassName},
+      summary: ${summarySerialzerClassName},
     }
   }
 
@@ -104,3 +108,6 @@ function getAttributeType(attribute, modelClassName) {
 function importStatementForModel(originModelName, destinationModelName = originModelName) {
     return `\nimport ${globalClassNameFromFullyQualifiedModelName(destinationModelName)} from '${relativeDreamPath('models', 'models', originModelName, destinationModelName)}'`;
 }
+function importStatementForSerializers(originModelName, serialzerClassName, summarySerialzerClassName) {
+    return `\nimport { ${serialzerClassName}, ${summarySerialzerClassName} } from '${relativeDreamPath('models', 'serializers', originModelName)}'`;
+}

package/dist/esm/src/helpers/cli/generateSerializerContent.js

@@ -84,6 +84,6 @@ function importStatementForModel(originModelName, destinationModelName = originM
     const importFrom = relativeDreamPath('serializers', 'models', originModelName, destinationModelName);
     return `import ${modelName} from '${importFrom}'\n`;
 }
-function fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName) {
+export function fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName) {
     return fullyQualifiedModelName.replace(/\//g, '');
 }

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

@@ -0,0 +1,37 @@
+import DreamApp from '../dream-app/index.js';
+/**
+ * Normalizes a Unicode string according to the application's configured normalization form.
+ *
+ * Unicode normalization ensures text consistency by converting characters to a canonical
+ * representation. This is crucial for text comparison, searching, and data integrity,
+ * as the same visual text can be represented differently in Unicode (e.g., é as a single
+ * character vs. e + combining accent).
+ *
+ * The normalization form is configured via `psy.set('unicodeNormalization', form)`
+ * in app/conf.ts. The default form is 'NFC'. All strings and string arrays passed
+ * into Dream models are automatically normalized before database storage (values
+ * in JSON/JSONB fields are not automatically normalized). String values in queries
+ * (e.g., `where`, `and`) are automatically normalized to ensure search consistency.
+ *
+ * @param val - The string to normalize
+ * @returns The normalized string, or the original string if normalization is disabled ('none')
+ *
+ * @see {@link https://unicode.org/reports/tr15/ | Unicode Normalization Forms (UAX #15)}
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize | String.prototype.normalize()}
+ *
+ * @example
+ * ```typescript
+ * // With NFC normalization (default)
+ * normalizeUnicode('café') // Returns normalized form of café
+ *
+ * // With normalization disabled
+ * psy.set('unicodeNormalization', 'none')
+ * normalizeUnicode('café') // Returns original string unchanged
+ * ```
+ */
+export default function normalizeUnicode(val) {
+    const normalizationForm = DreamApp.getOrFail().unicodeNormalization;
+    if (normalizationForm === 'none')
+        return val;
+    return typeof val === 'string' ? val.normalize(normalizationForm) : val;
+}

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

@@ -2,7 +2,7 @@ import CalendarDate from './CalendarDate.js';
 import { DateTime } from './DateTime.js';
 import isDatetimeOrDatetimeArrayColumn from './db/types/isDatetimeOrDatetimeArrayColumn.js';
 import isTextOrTextArrayColumn from './db/types/isTextOrTextArrayColumn.js';
-import normalizeString from './normalizeString.js';
+import normalizeUnicode from './normalizeUnicode.js';
 export default function sqlAttributes(dream) {
     const attributes = dream.dirtyAttributes();
     const dreamClass = dream.constructor;
@@ -14,13 +14,13 @@ export default function sqlAttributes(dream) {
             if (isDatetimeOrDatetimeArrayColumn(dreamClass, key))
                 val = val.map(valueToDatetime);
             else if (isTextOrTextArrayColumn(dreamClass, key))
-                val = val.map(normalizeString);
+                val = val.map(normalizeUnicode);
         }
         else {
             if (isDatetimeOrDatetimeArrayColumn(dreamClass, key))
                 val = valueToDatetime(val);
             else if (isTextOrTextArrayColumn(dreamClass, key))
-                val = normalizeString(val);
+                val = normalizeUnicode(val);
         }
         if (val instanceof DateTime || val instanceof CalendarDate) {
             // Converting toJSDate resulted in the correct timezone, but even with process.env.TZ=UTC,

package/dist/esm/src/index.js

@@ -39,6 +39,7 @@ export { default as hyphenize } from './helpers/hyphenize.js';
 export { default as intersection } from './helpers/intersection.js';
 export { default as isEmpty } from './helpers/isEmpty.js';
 export { default as loadRepl } from './helpers/loadRepl.js';
+export { default as normalizeUnicode } from './helpers/normalizeUnicode.js';
 export { default as pascalize } from './helpers/pascalize.js';
 export { default as dreamPath } from './helpers/path/dreamPath.js';
 export { default as relativeDreamPath } from './helpers/path/relativeDreamPath.js';

package/dist/esm/src/serializer/helpers/inferSerializerFromDreamOrViewModel.js

@@ -13,9 +13,12 @@ export default function inferSerializerFromDreamOrViewModel(obj, serializerKey =
     const serializers = obj.serializers;
     if (!serializers)
         throw new MissingSerializersDefinition(obj);
-    const globalName = serializers[serializerKey];
-    if (!globalName)
+    const serializerOrGlobalName = serializers[serializerKey];
+    if (!serializerOrGlobalName)
         throw new MissingSerializersDefinitionForKey(obj, serializerKey);
+    if (isDreamSerializer(serializerOrGlobalName))
+        return serializerOrGlobalName;
+    const globalName = serializerOrGlobalName;
     const dreamApp = DreamApp.getOrFail();
     const serializer = dreamApp.serializers[globalName];
     if (!serializer)

package/dist/types/src/helpers/cli/generateSerializerContent.d.ts

@@ -4,3 +4,4 @@ export default function generateSerializerContent({ fullyQualifiedModelName, col
     fullyQualifiedParentName?: string | undefined;
     stiBaseSerializer?: boolean;
 }): string;
+export declare function fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName: string): string;

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

@@ -0,0 +1,31 @@
+/**
+ * Normalizes a Unicode string according to the application's configured normalization form.
+ *
+ * Unicode normalization ensures text consistency by converting characters to a canonical
+ * representation. This is crucial for text comparison, searching, and data integrity,
+ * as the same visual text can be represented differently in Unicode (e.g., é as a single
+ * character vs. e + combining accent).
+ *
+ * The normalization form is configured via `psy.set('unicodeNormalization', form)`
+ * in app/conf.ts. The default form is 'NFC'. All strings and string arrays passed
+ * into Dream models are automatically normalized before database storage (values
+ * in JSON/JSONB fields are not automatically normalized). String values in queries
+ * (e.g., `where`, `and`) are automatically normalized to ensure search consistency.
+ *
+ * @param val - The string to normalize
+ * @returns The normalized string, or the original string if normalization is disabled ('none')
+ *
+ * @see {@link https://unicode.org/reports/tr15/ | Unicode Normalization Forms (UAX #15)}
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize | String.prototype.normalize()}
+ *
+ * @example
+ * ```typescript
+ * // With NFC normalization (default)
+ * normalizeUnicode('café') // Returns normalized form of café
+ *
+ * // With normalization disabled
+ * psy.set('unicodeNormalization', 'none')
+ * normalizeUnicode('café') // Returns original string unchanged
+ * ```
+ */
+export default function normalizeUnicode(val: string): string;

package/dist/types/src/index.d.ts

@@ -40,6 +40,7 @@ export { default as hyphenize } from './helpers/hyphenize.js';
 export { default as intersection } from './helpers/intersection.js';
 export { default as isEmpty } from './helpers/isEmpty.js';
 export { default as loadRepl } from './helpers/loadRepl.js';
+export { default as normalizeUnicode } from './helpers/normalizeUnicode.js';
 export { default as pascalize } from './helpers/pascalize.js';
 export { default as dreamPath } from './helpers/path/dreamPath.js';
 export { default as relativeDreamPath } from './helpers/path/relativeDreamPath.js';
@@ -65,6 +66,9 @@ export { default as DreamSerializer } from './serializer/DreamSerializer.js';
 export { default as ObjectSerializer } from './serializer/ObjectSerializer.js';
 export { default as DreamSerializerBuilder } from './serializer/builders/DreamSerializerBuilder.js';
 export { default as ObjectSerializerBuilder } from './serializer/builders/ObjectSerializerBuilder.js';
+export { type BelongsToStatement } from './types/associations/belongsTo.js';
+export { type HasManyStatement } from './types/associations/hasMany.js';
+export { type HasOneStatement } from './types/associations/hasOne.js';
 export { type WhereStatementForDream, type WhereStatementForDreamClass } from './types/associations/shared.js';
 export { type DbConnectionType, type DbTypes } from './types/db.js';
 export { type DreamAssociationMetadata, type DreamAttributes, type DreamClassColumn, type DreamColumn, type DreamColumnNames, type DreamOrViewModelClassSerializerKey, type DreamOrViewModelSerializerKey, type DreamParamSafeAttributes, type DreamParamSafeColumnNames, type DreamSerializable, type DreamSerializableArray, type DreamSerializerKey, type DreamSerializers, type DreamTableSchema, type DreamVirtualColumns, type IdType, type PrimaryKeyType, type Timestamp, type UpdateableAssociationProperties, type UpdateableProperties, type ViewModel, type ViewModelClass, } from './types/dream.js';

package/dist/types/src/types/dream.d.ts

@@ -84,7 +84,7 @@ type GlobalSerializerNames<I extends Dream, GlobalSchema = I['globalSchema'], Gl
 export type DreamSerializers<I extends Dream> = Record<'default', GlobalSerializerName<I>> & Record<string, GlobalSerializerName<I>>;
 export type DreamConstructorType<T extends Dream> = (new (...arguments_: any[]) => T) & typeof Dream;
 export type ViewModel = {
-    serializers: Record<string, string>;
+    serializers: Record<string, DreamModelSerializerType | SimpleObjectSerializerType | string>;
 };
 export type ViewModelClass = abstract new (...args: any) => ViewModel;
 export type NextPreloadArgumentType<Schema, PreviousTableNames, PreviousSchemaAssociations = PreviousTableNames extends undefined ? undefined : Schema[PreviousTableNames & keyof Schema]['associations' & keyof Schema[PreviousTableNames & keyof Schema]]> = PreviousTableNames extends undefined ? undefined : (keyof PreviousSchemaAssociations & string) | (keyof PreviousSchemaAssociations & string)[];

package/dist/types/src/types/dream.ts

@@ -345,7 +345,9 @@ export type DreamSerializers<I extends Dream> = Record<'default', GlobalSerializ
 
 export type DreamConstructorType<T extends Dream> = (new (...arguments_: any[]) => T) & typeof Dream
 
-export type ViewModel = { serializers: Record<string, string> }
+export type ViewModel = {
+  serializers: Record<string, DreamModelSerializerType | SimpleObjectSerializerType | string>
+}
 export type ViewModelClass = abstract new (...args: any) => ViewModel
 
 // preload

package/dist/types/src/types/openapi.d.ts

@@ -21,6 +21,7 @@ export type OpenapiSchemaShorthandExpressionSerializerRef = {
 };
 export type OpenapiSchemaShorthandExpressionSerializableRef = {
     $serializable: typeof Dream | ViewModelClass;
+    $serializableSerializerKey?: string;
     key?: string;
     many?: boolean;
     maybeNull?: boolean;

package/dist/types/src/types/openapi.ts

@@ -50,10 +50,9 @@ export type OpenapiSchemaShorthandExpressionSerializerRef = {
   maybeNull?: boolean
 }
 
-// TODO: remove $serializable or else add support for it (keeping in mind that STI
-// base Dream models get expanded into an array of Dream models)
 export type OpenapiSchemaShorthandExpressionSerializableRef = {
   $serializable: typeof Dream | ViewModelClass
+  $serializableSerializerKey?: string
   key?: string
   many?: boolean
   maybeNull?: boolean

package/docs/assets/navigation.js

@@ -1 +1 @@
-window.navigationData = "data:application/octet-stream;base64,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"
+window.navigationData = "data:application/octet-stream;base64,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"