@rvoh/dream 0.40.7 → 0.42.0

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

@@ -11,6 +11,7 @@ const FailedToIdentifyAssociation_js_1 = require("../../errors/schema-builder/Fa
 const camelize_js_1 = require("../camelize.js");
 const compact_js_1 = require("../compact.js");
 const EnvInternal_js_1 = require("../EnvInternal.js");
+const intersection_js_1 = require("../intersection.js");
 const pascalize_js_1 = require("../pascalize.js");
 const sortBy_js_1 = require("../sortBy.js");
 const uniq_js_1 = require("../uniq.js");
@@ -164,37 +165,45 @@ ${tableName}: {
     }
     async tableData(tableName) {
         const dreamApp = index_js_2.default.getOrFail();
-        const models = Object.values(dreamApp.models);
-        const model = models.find(model => model.table === tableName);
-        if (!model)
+        const models = Object.values(dreamApp.models).filter(model => model.table === tableName);
+        const maybeModel = models[0];
+        if (!maybeModel)
             throw new Error(`
 Could not find a Dream model with table "${tableName}".
 
 If you recently changed the name of a table in a migration, you
 may need to update the table getter in the corresponding Dream.
 `);
+        const baseModel = maybeModel['stiBaseClassOrOwnClass'];
         const associationData = this.getAssociationData(tableName);
-        let serializers;
-        try {
-            serializers =
-                model?.prototype?.['serializers'] || {};
-        }
-        catch {
-            serializers = {};
-        }
+        const allStiChildren = models.filter(model => model['isSTIChild']);
+        const modelsToCheck = allStiChildren.length ? allStiChildren : [baseModel];
+        // If a table is STI, then we look only at the serializers attached to
+        // all STI children (not the STI base model because the base model may not have any serializers)
+        const eachModelSerializerKeys = modelsToCheck.map(model => {
+            let serializers = {};
+            try {
+                serializers = model?.prototype?.['serializers'] || {};
+            }
+            catch {
+                // no-op
+            }
+            return Object.keys(serializers);
+        });
+        const serializerKeys = (0, intersection_js_1.default)(...eachModelSerializerKeys);
         return {
-            primaryKey: model.prototype.primaryKey,
-            createdAtField: model.prototype.createdAtField,
-            updatedAtField: model.prototype.updatedAtField,
-            deletedAtField: model.prototype.deletedAtField,
+            primaryKey: baseModel.prototype.primaryKey,
+            createdAtField: baseModel.prototype.createdAtField,
+            updatedAtField: baseModel.prototype.updatedAtField,
+            deletedAtField: baseModel.prototype.deletedAtField,
             scopes: {
-                default: model['scopes'].default.map(scopeStatement => scopeStatement.method),
-                named: model['scopes'].named.map(scopeStatement => scopeStatement.method),
+                default: (0, uniq_js_1.default)(models.flatMap(model => model['scopes'].default.map(scopeStatement => scopeStatement.method))),
+                named: (0, uniq_js_1.default)(models.flatMap(model => model['scopes'].named.map(scopeStatement => scopeStatement.method))),
             },
             columns: await this.getColumnData(tableName, associationData),
-            virtualColumns: this.getVirtualColumns(tableName),
+            virtualColumns: (0, uniq_js_1.default)(models.flatMap(model => model['virtualAttributes'].map(prop => prop.property) || [])),
             associations: associationData,
-            serializerKeys: Object.keys(serializers),
+            serializerKeys,
         };
     }
     async getColumnData(tableName, associationData) {
@@ -229,12 +238,6 @@ may need to update the table getter in the corresponding Dream.
         const enumName = (0, pascalize_js_1.default)(row.udtName.replace(/\[\]$/, ''));
         return enumName;
     }
-    getVirtualColumns(tableName) {
-        const dreamApp = index_js_2.default.getOrFail();
-        const models = (0, sortBy_js_1.default)(Object.values(dreamApp.models), m => m.table);
-        const model = models.find(model => model.table === tableName);
-        return model?.['virtualAttributes']?.map(prop => prop.property) || [];
-    }
     async getSchemaData() {
         const tables = await this.getTables();
         const schemaData = {};

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

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = comparisonKey;
+function comparisonKey(val, toKey = undefined) {
+    return val?.isDreamInstance
+        ? val.comparisonKey
+        : toKey
+            ? toKey(val)
+            : val;
+}

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = intersection;
+const comparisonKey_js_1 = require("./comparisonKey.js");
+const uniq_js_1 = require("./uniq.js");
+function intersection(...arrs) {
+    if (!arrs.length)
+        return [];
+    return (0, uniq_js_1.default)(arrs.reduce((workingArray, arr) => _intersection(workingArray, arr), arrs[0]));
+}
+function _intersection(arr, arr2) {
+    const mappedArr2 = arr2.map(val => (0, comparisonKey_js_1.default)(val));
+    return arr.filter(val => mappedArr2.includes((0, comparisonKey_js_1.default)(val)));
+}

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

@@ -1,19 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = uniq;
+const comparisonKey_js_1 = require("./comparisonKey.js");
 function uniq(arr, toKey = undefined) {
-    if (toKey)
-        return uniqWith(arr, toKey);
-    return uniqWith(arr, a => String(a));
-}
-function uniqWith(arr, toKey) {
     const map = arr.reduce((acc, val) => {
-        // Prefix with underscore to ensure that the values cannot be interpreted as integers.
+        const baseKey = (0, comparisonKey_js_1.default)(val, toKey);
+        // Prefix with underscore to ensure that the values cannot be _interpreted_ as integers.
         // If they can be interpreted as integers, then the keys are ordered not by the
         // order in which they were added, but in ascending numerical order.
-        const key = val?.isDreamInstance
-            ? val.comparisonKey
-            : `_${toKey(val)}`;
+        const key = typeof baseKey === 'string' ? baseKey : `_${baseKey}`;
         acc[key] ||= val;
         return acc;
     }, {});

package/dist/cjs/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.round = exports.range = 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.DreamLogos = 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.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.DreamSerializer = exports.Attribute = exports.RendersOne = exports.RendersMany = exports.ops = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.sort = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = void 0;
+exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.intersection = exports.inferSerializerFromDreamOrViewModel = exports.inferSerializerFromDreamClassOrViewModelClass = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamLogos = 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.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.DreamSerializer = exports.Attribute = exports.RendersOne = exports.RendersMany = exports.ops = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.sort = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = exports.round = 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");
@@ -80,6 +80,8 @@ Object.defineProperty(exports, "hyphenize", { enumerable: true, get: function ()
 var inferSerializerFromDreamOrViewModel_js_1 = require("./helpers/inferSerializerFromDreamOrViewModel.js");
 Object.defineProperty(exports, "inferSerializerFromDreamClassOrViewModelClass", { enumerable: true, get: function () { return inferSerializerFromDreamOrViewModel_js_1.inferSerializerFromDreamClassOrViewModelClass; } });
 Object.defineProperty(exports, "inferSerializerFromDreamOrViewModel", { enumerable: true, get: function () { return inferSerializerFromDreamOrViewModel_js_1.default; } });
+var intersection_js_1 = require("./helpers/intersection.js");
+Object.defineProperty(exports, "intersection", { enumerable: true, get: function () { return intersection_js_1.default; } });
 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");

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

@@ -9,6 +9,7 @@ import FailedToIdentifyAssociation from '../../errors/schema-builder/FailedToIde
 import camelize from '../camelize.js';
 import compact from '../compact.js';
 import EnvInternal from '../EnvInternal.js';
+import intersection from '../intersection.js';
 import pascalize from '../pascalize.js';
 import sortBy from '../sortBy.js';
 import uniq from '../uniq.js';
@@ -162,37 +163,45 @@ ${tableName}: {
     }
     async tableData(tableName) {
         const dreamApp = DreamApp.getOrFail();
-        const models = Object.values(dreamApp.models);
-        const model = models.find(model => model.table === tableName);
-        if (!model)
+        const models = Object.values(dreamApp.models).filter(model => model.table === tableName);
+        const maybeModel = models[0];
+        if (!maybeModel)
             throw new Error(`
 Could not find a Dream model with table "${tableName}".
 
 If you recently changed the name of a table in a migration, you
 may need to update the table getter in the corresponding Dream.
 `);
+        const baseModel = maybeModel['stiBaseClassOrOwnClass'];
         const associationData = this.getAssociationData(tableName);
-        let serializers;
-        try {
-            serializers =
-                model?.prototype?.['serializers'] || {};
-        }
-        catch {
-            serializers = {};
-        }
+        const allStiChildren = models.filter(model => model['isSTIChild']);
+        const modelsToCheck = allStiChildren.length ? allStiChildren : [baseModel];
+        // If a table is STI, then we look only at the serializers attached to
+        // all STI children (not the STI base model because the base model may not have any serializers)
+        const eachModelSerializerKeys = modelsToCheck.map(model => {
+            let serializers = {};
+            try {
+                serializers = model?.prototype?.['serializers'] || {};
+            }
+            catch {
+                // no-op
+            }
+            return Object.keys(serializers);
+        });
+        const serializerKeys = intersection(...eachModelSerializerKeys);
         return {
-            primaryKey: model.prototype.primaryKey,
-            createdAtField: model.prototype.createdAtField,
-            updatedAtField: model.prototype.updatedAtField,
-            deletedAtField: model.prototype.deletedAtField,
+            primaryKey: baseModel.prototype.primaryKey,
+            createdAtField: baseModel.prototype.createdAtField,
+            updatedAtField: baseModel.prototype.updatedAtField,
+            deletedAtField: baseModel.prototype.deletedAtField,
             scopes: {
-                default: model['scopes'].default.map(scopeStatement => scopeStatement.method),
-                named: model['scopes'].named.map(scopeStatement => scopeStatement.method),
+                default: uniq(models.flatMap(model => model['scopes'].default.map(scopeStatement => scopeStatement.method))),
+                named: uniq(models.flatMap(model => model['scopes'].named.map(scopeStatement => scopeStatement.method))),
             },
             columns: await this.getColumnData(tableName, associationData),
-            virtualColumns: this.getVirtualColumns(tableName),
+            virtualColumns: uniq(models.flatMap(model => model['virtualAttributes'].map(prop => prop.property) || [])),
             associations: associationData,
-            serializerKeys: Object.keys(serializers),
+            serializerKeys,
         };
     }
     async getColumnData(tableName, associationData) {
@@ -227,12 +236,6 @@ may need to update the table getter in the corresponding Dream.
         const enumName = pascalize(row.udtName.replace(/\[\]$/, ''));
         return enumName;
     }
-    getVirtualColumns(tableName) {
-        const dreamApp = DreamApp.getOrFail();
-        const models = sortBy(Object.values(dreamApp.models), m => m.table);
-        const model = models.find(model => model.table === tableName);
-        return model?.['virtualAttributes']?.map(prop => prop.property) || [];
-    }
     async getSchemaData() {
         const tables = await this.getTables();
         const schemaData = {};

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

@@ -0,0 +1,7 @@
+export default function comparisonKey(val, toKey = undefined) {
+    return val?.isDreamInstance
+        ? val.comparisonKey
+        : toKey
+            ? toKey(val)
+            : val;
+}

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

@@ -0,0 +1,11 @@
+import comparisonKey from './comparisonKey.js';
+import uniq from './uniq.js';
+export default function intersection(...arrs) {
+    if (!arrs.length)
+        return [];
+    return uniq(arrs.reduce((workingArray, arr) => _intersection(workingArray, arr), arrs[0]));
+}
+function _intersection(arr, arr2) {
+    const mappedArr2 = arr2.map(val => comparisonKey(val));
+    return arr.filter(val => mappedArr2.includes(comparisonKey(val)));
+}

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

@@ -1,16 +1,11 @@
+import comparisonKey from './comparisonKey.js';
 export default function uniq(arr, toKey = undefined) {
-    if (toKey)
-        return uniqWith(arr, toKey);
-    return uniqWith(arr, a => String(a));
-}
-function uniqWith(arr, toKey) {
     const map = arr.reduce((acc, val) => {
-        // Prefix with underscore to ensure that the values cannot be interpreted as integers.
+        const baseKey = comparisonKey(val, toKey);
+        // Prefix with underscore to ensure that the values cannot be _interpreted_ as integers.
         // If they can be interpreted as integers, then the keys are ordered not by the
         // order in which they were added, but in ascending numerical order.
-        const key = val?.isDreamInstance
-            ? val.comparisonKey
-            : `_${toKey(val)}`;
+        const key = typeof baseKey === 'string' ? baseKey : `_${baseKey}`;
         acc[key] ||= val;
         return acc;
     }, {});

package/dist/esm/src/index.js

@@ -35,6 +35,7 @@ export { default as Env } from './helpers/Env.js';
 export { default as globalClassNameFromFullyQualifiedModelName } from './helpers/globalClassNameFromFullyQualifiedModelName.js';
 export { default as hyphenize } from './helpers/hyphenize.js';
 export { inferSerializerFromDreamClassOrViewModelClass, default as inferSerializerFromDreamOrViewModel, } from './helpers/inferSerializerFromDreamOrViewModel.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 pascalize } from './helpers/pascalize.js';

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

@@ -6,7 +6,6 @@ export default class SchemaBuilder {
     private tableData;
     private getColumnData;
     private enumType;
-    private getVirtualColumns;
     private getSchemaData;
     private getAssociationData;
     private getExportedModulesFromDbSync;

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

@@ -0,0 +1 @@
+export default function comparisonKey<ElementType>(val: ElementType, toKey?: ((a: ElementType) => string | number | bigint) | undefined): string | number | bigint | ElementType;

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

@@ -1,4 +1,4 @@
 import Dream from '../Dream.js';
-import { SerializableDreamClassOrViewModelClass, SerializableDreamOrViewModel } from '../types/dream.js';
-export default function inferSerializerFromDreamOrViewModel(obj: Dream | SerializableDreamOrViewModel, serializerKey?: string | undefined): typeof import("../index.js").DreamSerializer | null;
-export declare function inferSerializerFromDreamClassOrViewModelClass(classDef: SerializableDreamClassOrViewModelClass, serializerKey?: string | undefined): typeof import("../index.js").DreamSerializer | null;
+import { ViewModel, ViewModelClass } from '../types/dream.js';
+export default function inferSerializerFromDreamOrViewModel(obj: Dream | ViewModel, serializerKey?: string | undefined): typeof import("../index.js").DreamSerializer | null;
+export declare function inferSerializerFromDreamClassOrViewModelClass(classDef: ViewModelClass, serializerKey?: string | undefined): typeof import("../index.js").DreamSerializer | null;

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

@@ -0,0 +1 @@
+export default function intersection<ArrayType extends any[]>(...arrs: ArrayType[]): ArrayType;

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

@@ -36,6 +36,7 @@ export { default as Env } from './helpers/Env.js';
 export { default as globalClassNameFromFullyQualifiedModelName } from './helpers/globalClassNameFromFullyQualifiedModelName.js';
 export { default as hyphenize } from './helpers/hyphenize.js';
 export { inferSerializerFromDreamClassOrViewModelClass, default as inferSerializerFromDreamOrViewModel, } from './helpers/inferSerializerFromDreamOrViewModel.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 pascalize } from './helpers/pascalize.js';
@@ -60,6 +61,6 @@ export { default as Attribute, type AttributeStatement, type SerializableTypes,
 export { default as DreamSerializer } from './serializer/index.js';
 export { type WhereStatementForDream, type WhereStatementForDreamClass } from './types/associations/shared.js';
 export { type DbConnectionType } from './types/db.js';
-export { type DreamAssociationMetadata, type DreamAttributes, type DreamClassColumn, type DreamColumn, type DreamColumnNames, type DreamOrViewModelSerializerKey, type DreamParamSafeAttributes, type DreamParamSafeColumnNames, type DreamSerializerKey, type DreamSerializers, type DreamTableSchema, type DreamVirtualColumns, type IdType, type PrimaryKeyType, type SerializableClassOrSerializerCallback, type SerializableDreamClassOrViewModelClass, type SerializableDreamOrViewModel, type Timestamp, type UpdateableAssociationProperties, type UpdateableProperties, type ViewModelSerializerKey, } from './types/dream.js';
+export { type DreamAssociationMetadata, type DreamAttributes, type DreamClassColumn, type DreamColumn, type DreamColumnNames, type DreamOrViewModelClassSerializerArrayKeys, 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 SerializableClassOrSerializerCallback, type Timestamp, type UpdateableAssociationProperties, type UpdateableProperties, type ViewModel, type ViewModelClass, } from './types/dream.js';
 export { type CommonOpenapiSchemaObjectFields, type OpenapiAllTypes, type OpenapiFormats, type OpenapiNumberFormats, type OpenapiPrimitiveTypes, type OpenapiSchemaArray, type OpenapiSchemaArrayShorthand, type OpenapiSchemaBase, type OpenapiSchemaBody, type OpenapiSchemaBodyShorthand, type OpenapiSchemaCommonFields, type OpenapiSchemaExpressionAllOf, type OpenapiSchemaExpressionAnyOf, type OpenapiSchemaExpressionOneOf, type OpenapiSchemaExpressionRef, type OpenapiSchemaExpressionRefSchemaShorthand, type OpenapiSchemaInteger, type OpenapiSchemaNull, type OpenapiSchemaNumber, type OpenapiSchemaObject, type OpenapiSchemaObjectAllOf, type OpenapiSchemaObjectAllOfShorthand, type OpenapiSchemaObjectAnyOf, type OpenapiSchemaObjectAnyOfShorthand, type OpenapiSchemaObjectBase, type OpenapiSchemaObjectBaseShorthand, type OpenapiSchemaObjectOneOf, type OpenapiSchemaObjectOneOfShorthand, type OpenapiSchemaObjectShorthand, type OpenapiSchemaPrimitiveGeneric, type OpenapiSchemaProperties, type OpenapiSchemaPropertiesShorthand, type OpenapiSchemaShorthandExpressionAllOf, type OpenapiSchemaShorthandExpressionAnyOf, type OpenapiSchemaShorthandExpressionOneOf, type OpenapiSchemaShorthandExpressionSerializableRef, type OpenapiSchemaShorthandExpressionSerializerRef, type OpenapiSchemaShorthandPrimitiveGeneric, type OpenapiSchemaString, type OpenapiShorthandAllTypes, type OpenapiShorthandPrimitiveTypes, type OpenapiTypeField, type OpenapiTypeFieldObject, } from './types/openapi.js';
 export { type ValidationType } from './types/validation.js';

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

@@ -88,11 +88,9 @@ export type ViewModel = {
     serializers: Record<string, string>;
 };
 export type ViewModelClass = abstract new (...args: any) => ViewModel;
-export type SerializableDreamOrViewModel = ViewModel;
-export type SerializableDreamClassOrViewModelClass = abstract new (...args: any) => SerializableDreamOrViewModel;
 export type DreamSerializerCallback = () => typeof DreamSerializer;
-export type SerializableClassOrSerializerCallback = SerializableDreamClassOrViewModelClass | DreamSerializerCallback;
-export type SerializableClassOrClasses = DreamSerializerCallback | SerializableDreamClassOrViewModelClass | SerializableDreamClassOrViewModelClass[];
+export type SerializableClassOrSerializerCallback = ViewModelClass | DreamSerializerCallback;
+export type SerializableClassOrClasses = DreamSerializerCallback | ViewModelClass | ViewModelClass[];
 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)[];
 export type PreloadArgumentTypeAssociatedTableNames<Schema, PreviousTableNames, ArgumentType, PreviousSchemaAssociations = PreviousTableNames extends undefined ? undefined : Schema[PreviousTableNames & keyof Schema]> = ArgumentType extends string[] ? undefined : (PreviousSchemaAssociations[ArgumentType & (keyof PreviousSchemaAssociations & string)] & string[])[number];
 export type AssociationNameToDreamClassMap = Record<string, typeof Dream>;
@@ -118,9 +116,13 @@ export type DreamSerializeOptions<T> = {
     serializerKey?: DreamSerializerKey<T>;
     casing?: 'camel' | 'snake' | null;
 };
+export type DreamOrViewModelClassSerializerKey<T> = T extends typeof Dream ? DreamSerializerKey<InstanceType<T>> : T extends ViewModelClass ? ViewModelSerializerKey<InstanceType<T>> : never;
 export type DreamOrViewModelSerializerKey<T> = T extends Dream ? DreamSerializerKey<T> : ViewModelSerializerKey<T>;
-export type DreamSerializerKey<T, U = T extends (infer R)[] ? R : T, Table = U['table' & keyof U] extends string ? U['table' & keyof U] : never, Schema = U['schema' & keyof U] extends object ? U['schema' & keyof U] : never, TableSchema = Table extends never ? never : Schema extends never ? never : Schema[Table & keyof Schema], SerializerKeys = TableSchema extends never ? never : TableSchema['serializerKeys' & keyof TableSchema] & (string[] | Readonly<string[]>), SerializerKey = SerializerKeys extends string[] | Readonly<string[]> ? SerializerKeys[number] : never> = SerializerKey;
-export type ViewModelSerializerKey<T, U = T extends (infer R)[] ? R : T, SerializerType = U extends null ? never : U['serializers' & keyof U] extends object ? keyof U['serializers' & keyof U] : never> = SerializerType;
+export type DreamSerializable = typeof Dream | ViewModelClass | typeof DreamSerializer;
+export type DreamSerializableArray<StartingArray extends readonly DreamSerializable[] = [], Depth extends number = 0> = Depth extends 20 ? StartingArray : StartingArray | DreamSerializableArray<[DreamSerializable, ...StartingArray], Inc<Depth>>;
+export type DreamOrViewModelClassSerializerArrayKeys<T extends DreamSerializableArray> = T['length'] extends 0 ? string : T[0] extends typeof Dream | ViewModelClass ? DreamOrViewModelClassSerializerKey<T[0]> & DreamOrViewModelClassSerializerArrayKeys<T extends [any, ...infer Rest] ? Rest : never> : DreamOrViewModelClassSerializerArrayKeys<T extends [any, ...infer Rest] ? Rest : never>;
+export type DreamSerializerKey<T, Table = T['table' & keyof T] extends string ? T['table' & keyof T] : never, Schema = T['schema' & keyof T] extends object ? T['schema' & keyof T] : never, TableSchema = Table extends never ? never : Schema extends never ? never : Schema[Table & keyof Schema], SerializerKeys = TableSchema extends never ? never : TableSchema['serializerKeys' & keyof TableSchema] & (string[] | Readonly<string[]>), SerializerKey = SerializerKeys extends string[] | Readonly<string[]> ? SerializerKeys[number] : never> = SerializerKey;
+export type ViewModelSerializerKey<T, SerializerType = T extends null ? never : T['serializers' & keyof T] extends object ? keyof T['serializers' & keyof T] : never> = SerializerType;
 export interface SimilarityStatement {
     tableName: string;
     tableAlias: string;

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

@@ -356,20 +356,10 @@ export type DreamConstructorType<T extends Dream> = (new (...arguments_: any[])
 export type ViewModel = { serializers: Record<string, string> }
 export type ViewModelClass = abstract new (...args: any) => ViewModel
 
-export type SerializableDreamOrViewModel = ViewModel
-export type SerializableDreamClassOrViewModelClass = abstract new (
-  ...args: any
-) => SerializableDreamOrViewModel
-
 export type DreamSerializerCallback = () => typeof DreamSerializer
-export type SerializableClassOrSerializerCallback =
-  | SerializableDreamClassOrViewModelClass
-  | DreamSerializerCallback
+export type SerializableClassOrSerializerCallback = ViewModelClass | DreamSerializerCallback
 
-export type SerializableClassOrClasses =
-  | DreamSerializerCallback
-  | SerializableDreamClassOrViewModelClass
-  | SerializableDreamClassOrViewModelClass[]
+export type SerializableClassOrClasses = DreamSerializerCallback | ViewModelClass | ViewModelClass[]
 
 // preload
 export type NextPreloadArgumentType<
@@ -447,15 +437,36 @@ export type DreamSerializeOptions<T> = {
   casing?: 'camel' | 'snake' | null
 }
 
+export type DreamOrViewModelClassSerializerKey<T> = T extends typeof Dream
+  ? DreamSerializerKey<InstanceType<T>>
+  : T extends ViewModelClass
+    ? ViewModelSerializerKey<InstanceType<T>>
+    : never
+
 export type DreamOrViewModelSerializerKey<T> = T extends Dream
   ? DreamSerializerKey<T>
   : ViewModelSerializerKey<T>
 
+export type DreamSerializable = typeof Dream | ViewModelClass | typeof DreamSerializer
+
+export type DreamSerializableArray<
+  StartingArray extends readonly DreamSerializable[] = [],
+  Depth extends number = 0,
+> = Depth extends 20
+  ? StartingArray
+  : StartingArray | DreamSerializableArray<[DreamSerializable, ...StartingArray], Inc<Depth>>
+
+export type DreamOrViewModelClassSerializerArrayKeys<T extends DreamSerializableArray> = T['length'] extends 0
+  ? string
+  : T[0] extends typeof Dream | ViewModelClass
+    ? DreamOrViewModelClassSerializerKey<T[0]> &
+        DreamOrViewModelClassSerializerArrayKeys<T extends [any, ...infer Rest] ? Rest : never>
+    : DreamOrViewModelClassSerializerArrayKeys<T extends [any, ...infer Rest] ? Rest : never>
+
 export type DreamSerializerKey<
   T,
-  U = T extends (infer R)[] ? R : T,
-  Table = U['table' & keyof U] extends string ? U['table' & keyof U] : never,
-  Schema = U['schema' & keyof U] extends object ? U['schema' & keyof U] : never,
+  Table = T['table' & keyof T] extends string ? T['table' & keyof T] : never,
+  Schema = T['schema' & keyof T] extends object ? T['schema' & keyof T] : never,
   TableSchema = Table extends never ? never : Schema extends never ? never : Schema[Table & keyof Schema],
   SerializerKeys = TableSchema extends never
     ? never
@@ -465,11 +476,10 @@ export type DreamSerializerKey<
 
 export type ViewModelSerializerKey<
   T,
-  U = T extends (infer R)[] ? R : T,
-  SerializerType = U extends null
+  SerializerType = T extends null
     ? never
-    : U['serializers' & keyof U] extends object
-      ? keyof U['serializers' & keyof U]
+    : T['serializers' & keyof T] extends object
+      ? keyof T['serializers' & keyof T]
       : never,
 > = SerializerType
 

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

@@ -1,6 +1,6 @@
 import { openapiPrimitiveTypes, openapiShorthandPrimitiveTypes } from '../dream/constants.js';
 import DreamSerializer from '../serializer/index.js';
-import { SerializableDreamClassOrViewModelClass } from './dream.js';
+import { ViewModelClass } from './dream.js';
 export type OpenapiSchemaBody = OpenapiSchemaBase | OpenapiSchemaPrimitiveGeneric | OpenapiSchemaExpressionAnyOf | OpenapiSchemaExpressionOneOf | OpenapiSchemaExpressionAllOf | OpenapiSchemaObject | OpenapiSchemaArray;
 export type OpenapiSchemaBodyShorthand = OpenapiSchemaBase | OpenapiSchemaShorthandPrimitiveGeneric | OpenapiSchemaShorthandExpressionAnyOf | OpenapiSchemaShorthandExpressionOneOf | OpenapiSchemaShorthandExpressionAllOf | OpenapiSchemaObjectShorthand | OpenapiSchemaArrayShorthand | OpenapiSchemaNull | OpenapiSchemaExpressionRefSchemaShorthand | OpenapiSchemaShorthandExpressionSerializerRef | OpenapiSchemaShorthandExpressionSerializableRef;
 export type OpenapiSchemaBase = OpenapiSchemaString | OpenapiSchemaInteger | OpenapiSchemaNumber | OpenapiSchemaNull | OpenapiSchemaExpressionRef;
@@ -19,7 +19,7 @@ export type OpenapiSchemaShorthandExpressionSerializerRef = {
     maybeNull?: boolean;
 };
 export type OpenapiSchemaShorthandExpressionSerializableRef = {
-    $serializable: SerializableDreamClassOrViewModelClass;
+    $serializable: ViewModelClass;
     key?: string;
     many?: boolean;
     maybeNull?: boolean;

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

@@ -1,6 +1,6 @@
 import { openapiPrimitiveTypes, openapiShorthandPrimitiveTypes } from '../dream/constants.js'
 import DreamSerializer from '../serializer/index.js'
-import { SerializableDreamClassOrViewModelClass } from './dream.js'
+import { ViewModelClass } from './dream.js'
 
 export type OpenapiSchemaBody =
   | OpenapiSchemaBase
@@ -50,7 +50,7 @@ export type OpenapiSchemaShorthandExpressionSerializerRef = {
 }
 
 export type OpenapiSchemaShorthandExpressionSerializableRef = {
-  $serializable: SerializableDreamClassOrViewModelClass
+  $serializable: ViewModelClass
   key?: string
   many?: boolean
   maybeNull?: boolean

package/docs/assets/navigation.js

@@ -1 +1 @@
-window.navigationData = "data:application/octet-stream;base64,H4sIAAAAAAAAE62aUZPaNhSF/wvPadOkTdrmDdglYbK7EKDpQ6fTEfYF1JUlVxbbkE7/e0cGbNm6vpK9fcT3nO/IwpZky7/9MzLwxYzejSYgk0PG9OPoxShn5jB6N0oEKwooXlalbw8mE6MXo0cu09G7V69/+vdF5Z8yATJl+oYZ8BFulaRoYAYWesZlOjnNGBeQbtT56Fim9jACD5uozBtIlGZG6cJH1zWSoIFliNkeDvrGed5hHed50D3hssM94TLont7NO9zTu3nQPc9ypQ3oDsS1HOTcqb3C+r6qBQn3fK+Z4Up+AJED+kdisiB3DZozwb92nmMtCLI2msmCJTa+A+YoKNqtTPQpNz7kUqC9T5jvifK8F2rLxAPL4EGZNSDBbQVFe1DyTrEU0nFRqIQzvD8wFUX9dAR98jHlYcq3YnKPDFflYdJnx4X0QZmZOmJDUrNOkT4zwdPy/G61Vsh11hJQrLExmm+PBtaGGchAOv8Vlwb0jiVQvPRlTejrN2+x4XGqZHkIQ7ZFJPAyts0lN4vcnliBM31dDHaRG5pnBUFQfWM7VyDdrRE+KvZy91I90pRQsEUOkuV8nRwgY0utctCGA07t0A7Arw9KmwNzb4hwTmWKCNyccphxEOli+yck+N+ASyn4lGVg/zKn2eaUl6uWS6Hl/u7nH1+9ee0SVJYp2TjBc2zZgsLj0vJQml1EbXgGbez1eNC/nSopoZxobDd5nFY9yCtvrPpyvwfDUmaYx+3QxfGvg5bXm61yFG1qB9epEsdMojinHscjUH0pdh7FT9KpR/Hu1P4OnkCgsGsxlrR3F0FNzr69/OmgLPRnDn/fqxREPU5+hBPK7RJHJS2ZZtma7SBw2SC6fvzQX4YJoxLCHdS/V2oH3linHsXbsK2A8/iF8px6FO8z1+bIxLmr8CY2JSHqZcIci73S3ByyNrJdD/E+nPIDSGyqqCshxjzFxtzz0ZD3MmWMhbBqr4da5UjaTOmMmS7YpRrJejhmW9A0saGJ5C41z7jhT0Cdd1MUST5fnmOtmXeX+Yr+TGRJ1AXvWgjRKRNWeBeTJ+hHVCndFVbQmxjXEQ1lr4zzmgpfb3UKeyXcfsk1FAVXcizEYkeGtLRDc+QpPsdqB+YsJETnlNqBOSuITVnBMzLOh+IuOMrYqwVzaQBZImGaXtyHo/DWb56gJ9GOvwGmlfSitp/IECr6JBZDDd9vjm4oP+56wQxDEoN3tqMbyu91Rg3DgMTgPFTLBtL7nE5DPyAvPCI6uqH8PifUNAxI7BM2LKdafr0HCZonZFBb3Cupal+fKbnL9Ozk4K3cZXpucvgi7TI9N/n6oGif70KTetj+f7UG9DPaUpqHtaTXhd/p6pdtNJd7OqiUxFKvrQo8Wnq6vvyoB7kOdWRW9ea3g17VQ7wlKxKGvhiuK0GG5hnTp49wwp76m9UQa2X3krjcLzUkvGjsm51xniBEdG/E8pXnQtf3w5QJsWXJYzslytQnuX7j6rzzK39T0d2u3tkOIJjoaPvkoJe7JwgSJXsEvuP+FVlXQgy7Q1AYluVtRFUIEX7JU2bANtp5mY9tMp25AXl8WkxEPLfeV8XuzGY1yIp6rT3sffavB9D1Tu1M6dbXJmc2rhrGRm89Qtp/v+qJaW7/rXrP6ptXTcr33svhqZKFQRFVlUBsVvP3q/H9H4vl7Wq8WazWGMkTEUBFv5isoaiQPF0VOWd6GR2OQFgHsSBMeWPeQgEtCQGrtl5qzO4oy91H51uFJuDtD42PMWQKurhn8oQhnHIYspBoM+oqicgFT5jd7cEZVZmArDdzzLzezCmT2pkbEID3YV0lEMllrxsDXGukPeeGdQOuVQohVAFjIdzt5wKlYUIKrLKcue+mHNS5RJhTO7oEm+SrQsilRXSRbJEA7O0TAzPQmglqSENAgcoPt8pB3O5MzrTKZkchTp+OTJSLiXK6siU0JdpNNOFw3TjDEqoiAeByB84C1LYiZkFZh/QCDGgIuroMx3cuNJuhxW2WG3Tcu5QIs1AstaMS5r7WSLt6POZlt0xO9TeAOA2VEvD8+oiF4aoiBdiX38s1F3cOoi4TEN38PrC2l4X2xNq0gmB2Cr6h7nZPRAGbnxo6EP8bw4axqC6uATd5tJlqwIFpSO3pLTXs+Bc0p6WhcOdnHfSiv9You9LoXGCPB2wTPLOsUFbD7MfvKf8KfXo+6CIij5Kekd06ieF/4Xb+F2mzDw3pzRb3XooE4On8+AXt76pqSlMRgSo/RqFIpcAD/f4fMNSsLyMxAAA="
+window.navigationData = "data:application/octet-stream;base64,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"