@rvoh/dream 0.43.1 → 0.44.0

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

@@ -931,7 +931,7 @@ class Query extends ConnectedToDB_js_1.default {
      * @returns A cloned Query with the limit clause applied
      */
     limit(limit) {
-        return this.clone({ limit });
+        return this.clone({ limit: limit });
     }
     /**
      * Returns a new Query instance, specifying an offset
@@ -944,7 +944,7 @@ class Query extends ConnectedToDB_js_1.default {
      * @returns A cloned Query with the offset clause applied
      */
     offset(offset) {
-        return this.clone({ offset });
+        return this.clone({ offset: offset });
     }
     /**
      * Returns the sql that would be executed by this Query
@@ -1457,7 +1457,8 @@ class Query extends ConnectedToDB_js_1.default {
         const recordCount = await this.count();
         const pageSize = opts.pageSize || index_js_1.default.getOrFail().paginationPageSize;
         const pageCount = Math.ceil(recordCount / pageSize);
-        const results = await this.limit(pageSize)
+        const results = await this
+            .limit(pageSize)
             .offset((page - 1) * pageSize)
             .all();
         return {

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const pascalize_js_1 = require("../../helpers/pascalize.js");
 class MissingSerializersDefinitionForKey extends Error {
     viewModel;
     serializerKey;
@@ -17,10 +16,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() {
+  public get serializers(): DreamSerializers<${className}> {
     return {
-      default: ${className}Serializer
-      ${this.serializerKey}: ${className}${(0, pascalize_js_1.default)(this.serializerKey)}Serializer
+      default: '${className}Serializer'
+      ${this.serializerKey}: '<the_global_name_of_a_serializer>'
     }
   }
   ...

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

@@ -2,34 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateDreamContent;
 const pluralize_esm_1 = require("pluralize-esm");
-const serializerNameFromFullyQualifiedModelName_js_1 = require("../../serializer/helpers/serializerNameFromFullyQualifiedModelName.js");
+const serializerGlobalNameFromFullyQualifiedModelName_js_1 = require("../../serializer/helpers/serializerGlobalNameFromFullyQualifiedModelName.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)
@@ -80,7 +76,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('')}${serializerImportStatement}
+import { ${(0, uniq_js_1.default)(dreamImports).join(', ')} } from '@rvoh/dream'${(0, uniq_js_1.default)(modelImportStatements).join('')}
 
 const deco = new Decorators<typeof ${modelClassName}>()
 
@@ -93,10 +89,10 @@ ${isSTI
   }
 
 `}${serializer
-        ? `  public ${isSTI ? 'override ' : ''}get serializers() {
+        ? `  public ${isSTI ? 'override ' : ''}get serializers(): DreamSerializers<${modelClassName}> {
     return {
-      default: ${serialzerClassName},
-      summary: ${summarySerialzerClassName},
+      default: '${(0, serializerGlobalNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName)}',
+      summary: '${(0, serializerGlobalNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName, 'summary')}',
     }
   }
 
@@ -111,6 +107,3 @@ 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,7 +1,6 @@
 "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");
@@ -64,7 +63,7 @@ function attribute(name, type, attr) {
         case 'jsonb':
         case 'json[]':
         case 'jsonb[]':
-            return `.jsonAttribute('${(0, camelize_js_1.default)(name)}', { openapi: { type: 'object', properties: { } } })`;
+            return `.attribute('${(0, camelize_js_1.default)(name)}', { openapi: { type: 'object', properties: { } } })`;
         default:
             return `.attribute('${(0, camelize_js_1.default)(name)}'${attributeOptionsSpecifier(type, attr)})`;
     }

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

@@ -6,6 +6,8 @@ const compact_js_1 = require("../helpers/compact.js");
 const DateTime_js_1 = require("../helpers/DateTime.js");
 const round_js_1 = require("../helpers/round.js");
 const snakeify_js_1 = require("../helpers/snakeify.js");
+const DreamSerializerBuilder_js_1 = require("./builders/DreamSerializerBuilder.js");
+const ObjectSerializerBuilder_js_1 = require("./builders/ObjectSerializerBuilder.js");
 const inferSerializerFromDreamOrViewModel_js_1 = require("./helpers/inferSerializerFromDreamOrViewModel.js");
 class SerializerRenderer {
     serializerBuilder;
@@ -38,8 +40,8 @@ class SerializerRenderer {
                 ////////////////
                 case 'attribute': {
                     const outputAttributeName = this.setCase(attribute.options?.as ?? attribute.name);
-                    const value = data[attribute.name];
-                    accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(value, attribute.options);
+                    const value = data[attribute.name] ?? attribute.options?.default;
+                    accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(value, attribute.options, this.passthroughData, this.renderOpts);
                     return accumulator;
                 }
                 /////////////////////
@@ -51,8 +53,8 @@ class SerializerRenderer {
                 case 'delegatedAttribute': {
                     const outputAttributeName = this.setCase(attribute.options?.as ?? attribute.name);
                     const target = data[attribute.targetName];
-                    const value = target[attribute.name];
-                    accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(value, attribute.options);
+                    const value = target[attribute.name] ?? attribute.options?.default;
+                    accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(value, attribute.options, this.passthroughData, this.renderOpts);
                     return accumulator;
                 }
                 //////////////////////////////
@@ -69,11 +71,11 @@ class SerializerRenderer {
                     if (attribute.options.flatten) {
                         return {
                             ...accumulator,
-                            ...applyRenderingOptionsToAttribute(attribute.fn(), {}),
+                            ...applyRenderingOptionsToAttribute(attribute.fn(), {}, this.passthroughData, this.renderOpts),
                         };
                     }
                     else {
-                        accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(attribute.fn(), {});
+                        accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(attribute.fn(), {}, this.passthroughData, this.renderOpts);
                         return accumulator;
                     }
                 }
@@ -180,12 +182,14 @@ class SerializerRenderer {
     }
 }
 exports.default = SerializerRenderer;
-function applyRenderingOptionsToAttribute(value, options) {
+function applyRenderingOptionsToAttribute(value, options, passthroughData, renderOptions) {
     if (Array.isArray(value))
-        return value.map(val => _applyRenderingOptionsToAttribute(val, options));
-    return _applyRenderingOptionsToAttribute(value, options);
+        return value.map(val => _applyRenderingOptionsToAttribute(val, options, passthroughData, renderOptions));
+    return _applyRenderingOptionsToAttribute(value, options, passthroughData, renderOptions);
 }
-function _applyRenderingOptionsToAttribute(value, options) {
+function _applyRenderingOptionsToAttribute(value, options, passthroughData, renderOptions) {
+    if (value instanceof DreamSerializerBuilder_js_1.default || value instanceof ObjectSerializerBuilder_js_1.default)
+        return value.render(passthroughData, renderOptions);
     if (value instanceof DateTime_js_1.DateTime)
         return value.toISO();
     if (value instanceof CalendarDate_js_1.default)

package/dist/cjs/src/serializer/builders/DreamSerializerBuilder.js

@@ -31,14 +31,6 @@ class DreamSerializerBuilder {
         });
         return this;
     }
-    jsonAttribute(name, options) {
-        this.attributes.push({
-            type: 'attribute',
-            name,
-            options,
-        });
-        return this;
-    }
     customAttribute(name, fn, options) {
         this.attributes.push({
             type: 'customAttribute',

package/dist/cjs/src/serializer/builders/ObjectSerializerBuilder.js

@@ -29,14 +29,6 @@ class ObjectSerializerBuilder {
         });
         return this;
     }
-    jsonAttribute(name, options) {
-        this.attributes.push({
-            type: 'attribute',
-            name,
-            options,
-        });
-        return this;
-    }
     customAttribute(name, fn, options) {
         this.attributes.push({
             type: 'customAttribute',

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

@@ -929,7 +929,7 @@ export default class Query extends ConnectedToDB {
      * @returns A cloned Query with the limit clause applied
      */
     limit(limit) {
-        return this.clone({ limit });
+        return this.clone({ limit: limit });
     }
     /**
      * Returns a new Query instance, specifying an offset
@@ -942,7 +942,7 @@ export default class Query extends ConnectedToDB {
      * @returns A cloned Query with the offset clause applied
      */
     offset(offset) {
-        return this.clone({ offset });
+        return this.clone({ offset: offset });
     }
     /**
      * Returns the sql that would be executed by this Query
@@ -1455,7 +1455,8 @@ export default class Query extends ConnectedToDB {
         const recordCount = await this.count();
         const pageSize = opts.pageSize || DreamApp.getOrFail().paginationPageSize;
         const pageCount = Math.ceil(recordCount / pageSize);
-        const results = await this.limit(pageSize)
+        const results = await this
+            .limit(pageSize)
             .offset((page - 1) * pageSize)
             .all();
         return {

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

@@ -1,4 +1,3 @@
-import pascalize from '../../helpers/pascalize.js';
 export default class MissingSerializersDefinitionForKey extends Error {
     viewModel;
     serializerKey;
@@ -15,10 +14,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() {
+  public get serializers(): DreamSerializers<${className}> {
     return {
-      default: ${className}Serializer
-      ${this.serializerKey}: ${className}${pascalize(this.serializerKey)}Serializer
+      default: '${className}Serializer'
+      ${this.serializerKey}: '<the_global_name_of_a_serializer>'
     }
   }
   ...

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

@@ -1,32 +1,28 @@
 import pluralize from 'pluralize-esm';
-import serializerNameFromFullyQualifiedModelName from '../../serializer/helpers/serializerNameFromFullyQualifiedModelName.js';
+import serializerGlobalNameFromFullyQualifiedModelName from '../../serializer/helpers/serializerGlobalNameFromFullyQualifiedModelName.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)
@@ -77,7 +73,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('')}${serializerImportStatement}
+import { ${uniq(dreamImports).join(', ')} } from '@rvoh/dream'${uniq(modelImportStatements).join('')}
 
 const deco = new Decorators<typeof ${modelClassName}>()
 
@@ -90,10 +86,10 @@ ${isSTI
   }
 
 `}${serializer
-        ? `  public ${isSTI ? 'override ' : ''}get serializers() {
+        ? `  public ${isSTI ? 'override ' : ''}get serializers(): DreamSerializers<${modelClassName}> {
     return {
-      default: ${serialzerClassName},
-      summary: ${summarySerialzerClassName},
+      default: '${serializerGlobalNameFromFullyQualifiedModelName(fullyQualifiedModelName)}',
+      summary: '${serializerGlobalNameFromFullyQualifiedModelName(fullyQualifiedModelName, 'summary')}',
     }
   }
 
@@ -108,6 +104,3 @@ 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

@@ -60,7 +60,7 @@ function attribute(name, type, attr) {
         case 'jsonb':
         case 'json[]':
         case 'jsonb[]':
-            return `.jsonAttribute('${camelize(name)}', { openapi: { type: 'object', properties: { } } })`;
+            return `.attribute('${camelize(name)}', { openapi: { type: 'object', properties: { } } })`;
         default:
             return `.attribute('${camelize(name)}'${attributeOptionsSpecifier(type, attr)})`;
     }
@@ -84,6 +84,6 @@ function importStatementForModel(originModelName, destinationModelName = originM
     const importFrom = relativeDreamPath('serializers', 'models', originModelName, destinationModelName);
     return `import ${modelName} from '${importFrom}'\n`;
 }
-export function fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName) {
+function fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName) {
     return fullyQualifiedModelName.replace(/\//g, '');
 }

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

@@ -4,6 +4,8 @@ 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 DreamSerializerBuilder from './builders/DreamSerializerBuilder.js';
+import ObjectSerializerBuilder from './builders/ObjectSerializerBuilder.js';
 import inferSerializerFromDreamOrViewModel, { inferSerializersFromDreamClassOrViewModelClass, } from './helpers/inferSerializerFromDreamOrViewModel.js';
 export default class SerializerRenderer {
     serializerBuilder;
@@ -36,8 +38,8 @@ export default class SerializerRenderer {
                 ////////////////
                 case 'attribute': {
                     const outputAttributeName = this.setCase(attribute.options?.as ?? attribute.name);
-                    const value = data[attribute.name];
-                    accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(value, attribute.options);
+                    const value = data[attribute.name] ?? attribute.options?.default;
+                    accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(value, attribute.options, this.passthroughData, this.renderOpts);
                     return accumulator;
                 }
                 /////////////////////
@@ -49,8 +51,8 @@ export default class SerializerRenderer {
                 case 'delegatedAttribute': {
                     const outputAttributeName = this.setCase(attribute.options?.as ?? attribute.name);
                     const target = data[attribute.targetName];
-                    const value = target[attribute.name];
-                    accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(value, attribute.options);
+                    const value = target[attribute.name] ?? attribute.options?.default;
+                    accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(value, attribute.options, this.passthroughData, this.renderOpts);
                     return accumulator;
                 }
                 //////////////////////////////
@@ -67,11 +69,11 @@ export default class SerializerRenderer {
                     if (attribute.options.flatten) {
                         return {
                             ...accumulator,
-                            ...applyRenderingOptionsToAttribute(attribute.fn(), {}),
+                            ...applyRenderingOptionsToAttribute(attribute.fn(), {}, this.passthroughData, this.renderOpts),
                         };
                     }
                     else {
-                        accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(attribute.fn(), {});
+                        accumulator[outputAttributeName] = applyRenderingOptionsToAttribute(attribute.fn(), {}, this.passthroughData, this.renderOpts);
                         return accumulator;
                     }
                 }
@@ -177,12 +179,14 @@ export default class SerializerRenderer {
         }
     }
 }
-function applyRenderingOptionsToAttribute(value, options) {
+function applyRenderingOptionsToAttribute(value, options, passthroughData, renderOptions) {
     if (Array.isArray(value))
-        return value.map(val => _applyRenderingOptionsToAttribute(val, options));
-    return _applyRenderingOptionsToAttribute(value, options);
+        return value.map(val => _applyRenderingOptionsToAttribute(val, options, passthroughData, renderOptions));
+    return _applyRenderingOptionsToAttribute(value, options, passthroughData, renderOptions);
 }
-function _applyRenderingOptionsToAttribute(value, options) {
+function _applyRenderingOptionsToAttribute(value, options, passthroughData, renderOptions) {
+    if (value instanceof DreamSerializerBuilder || value instanceof ObjectSerializerBuilder)
+        return value.render(passthroughData, renderOptions);
     if (value instanceof DateTime)
         return value.toISO();
     if (value instanceof CalendarDate)

package/dist/esm/src/serializer/builders/DreamSerializerBuilder.js

@@ -29,14 +29,6 @@ export default class DreamSerializerBuilder {
         });
         return this;
     }
-    jsonAttribute(name, options) {
-        this.attributes.push({
-            type: 'attribute',
-            name,
-            options,
-        });
-        return this;
-    }
     customAttribute(name, fn, options) {
         this.attributes.push({
             type: 'customAttribute',

package/dist/esm/src/serializer/builders/ObjectSerializerBuilder.js

@@ -27,14 +27,6 @@ export default class ObjectSerializerBuilder {
         });
         return this;
     }
-    jsonAttribute(name, options) {
-        this.attributes.push({
-            type: 'attribute',
-            name,
-            options,
-        });
-        return this;
-    }
     customAttribute(name, fn, options) {
         this.attributes.push({
             type: 'customAttribute',

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

@@ -601,6 +601,9 @@ export default class Dream {
         rootTableAlias: InstanceType<T> extends infer T_1 ? T_1 extends InstanceType<T> ? T_1 extends Dream ? T_1["table"] : T_1 : never : never;
         allowPreload: true;
         allowLeftJoinPreload: true;
+        allowLimit: true;
+        allowOffset: true;
+        allowPaginate: true;
     }>>;
     /**
      * Finds a record for the corresponding model with the
@@ -790,6 +793,9 @@ export default class Dream {
         rootTableAlias: InstanceType<T> extends infer T_1 ? T_1 extends InstanceType<T> ? T_1 extends Dream ? T_1["table"] : T_1 : never : never;
         allowPreload: true;
         allowLeftJoinPreload: false;
+        allowLimit: true;
+        allowOffset: true;
+        allowPaginate: true;
     }>>;
     /**
      * Returns a new Query instance with the provided
@@ -912,11 +918,14 @@ export default class Dream {
      * @returns A Query for this model with the limit clause applied
      */
     static limit<T extends typeof Dream>(this: T, count: number | null): Query<InstanceType<T>, Readonly<{
-        joinedAssociations: Readonly<[]>;
+        joinedAssociations: readonly [];
         rootTableName: InstanceType<T>["table"];
         rootTableAlias: InstanceType<T> extends infer T_1 ? T_1 extends InstanceType<T> ? T_1 extends Dream ? T_1["table"] : T_1 : never : never;
         allowPreload: true;
-        allowLeftJoinPreload: true;
+        allowLeftJoinPreload: false;
+        allowLimit: true;
+        allowOffset: true;
+        allowPaginate: false;
     }>>;
     /**
      * Returns a new Query instance, specifying an offset
@@ -929,11 +938,14 @@ export default class Dream {
      * @returns A Query for this model with the offset clause applied
      */
     static offset<T extends typeof Dream>(this: T, offset: number | null): Query<InstanceType<T>, Readonly<{
-        joinedAssociations: Readonly<[]>;
+        joinedAssociations: readonly [];
         rootTableName: InstanceType<T>["table"];
         rootTableAlias: InstanceType<T> extends infer T_1 ? T_1 extends InstanceType<T> ? T_1 extends Dream ? T_1["table"] : T_1 : never : never;
         allowPreload: true;
-        allowLeftJoinPreload: true;
+        allowLeftJoinPreload: false;
+        allowLimit: true;
+        allowOffset: true;
+        allowPaginate: false;
     }>>;
     /**
      * Returns a new Query instance, attaching the provided

package/dist/types/src/decorators/field/sortable/helpers/applySortableScopeToQuery.d.ts

@@ -6,4 +6,7 @@ export default function applySortableScopeToQuery(query: Query<Dream>, dream: Dr
     rootTableAlias: string;
     allowPreload: true;
     allowLeftJoinPreload: true;
+    allowLimit: true;
+    allowOffset: true;
+    allowPaginate: true;
 }>>;

package/dist/types/src/decorators/field/sortable/helpers/sortableQueryExcludingDream.d.ts

@@ -6,4 +6,7 @@ export default function sortableQueryExcludingDream(dream: Dream, query: Query<D
     rootTableAlias: string;
     allowPreload: true;
     allowLeftJoinPreload: true;
+    allowLimit: true;
+    allowOffset: true;
+    allowPaginate: true;
 }>>;

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

@@ -364,6 +364,9 @@ export default class DreamClassTransactionBuilder<DreamClass extends typeof Drea
         rootTableAlias: DreamInstance extends Dream ? DreamInstance["table"] : DreamInstance;
         allowPreload: true;
         allowLeftJoinPreload: false;
+        allowLimit: true;
+        allowOffset: true;
+        allowPaginate: true;
     }>>;
     /**
      * Returns a new Query instance with the provided
@@ -498,6 +501,9 @@ export default class DreamClassTransactionBuilder<DreamClass extends typeof Drea
         rootTableAlias: DreamInstance extends Dream ? DreamInstance["table"] : DreamInstance;
         allowPreload: true;
         allowLeftJoinPreload: true;
+        allowLimit: true;
+        allowOffset: true;
+        allowPaginate: true;
     }>>;
     /**
      * Plucks the provided fields from the corresponding model.

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

@@ -317,7 +317,10 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
     }> ? true : false, const JoinedAssociationsCandidate = JoinedAssociationsTypeFromAssociations<DB, Schema, TableName, Incompatible extends true ? [] : [...Arr, LastArg]>, const JoinedAssociations extends readonly JoinedAssociation[] = JoinedAssociationsCandidate extends readonly JoinedAssociation[] ? JoinedAssociationsCandidate : never, RetQuery = Query<DreamInstance, ExtendQueryType<QueryTypeOpts, Readonly<{
         joinedAssociations: JoinedAssociations;
         allowPreload: false;
-    }>>>>(this: Q, ...args: Incompatible extends true ? 'leftJoinPreload is incompatible with preload'[] : [...Arr, LastArg]): RetQuery;
+        allowLimit: false;
+        allowOffset: false;
+        allowPaginate: false;
+    }>>>>(this: Q, ...args: Incompatible extends true ? 'leftJoinPreload is incompatible with preload, limit, offset, and paginate'[] : [...Arr, LastArg]): RetQuery;
     /**
      * Load each specified association using a separate SQL query.
      * See {@link #leftJoinPreload} for preloading in a single query.
@@ -577,7 +580,12 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      *
      * @returns A cloned Query with the limit clause applied
      */
-    limit(limit: number | null): Query<DreamInstance, QueryTypeOpts>;
+    limit<Q extends Query<DreamInstance, any>, Incompatible extends Q['queryTypeOpts'] extends Readonly<{
+        allowLimit: false;
+    }> ? true : false, RetQuery = Query<DreamInstance, ExtendQueryType<QueryTypeOpts, Readonly<{
+        allowPaginate: false;
+        allowLeftJoinPreload: false;
+    }>>>>(this: Q, limit: Incompatible extends true ? 'limit is incompatible with paginate and leftJoinPreload'[] : number | null): RetQuery;
     /**
      * Returns a new Query instance, specifying an offset
      *
@@ -588,7 +596,12 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      *
      * @returns A cloned Query with the offset clause applied
      */
-    offset(offset: number | null): Query<DreamInstance, QueryTypeOpts>;
+    offset<Q extends Query<DreamInstance, any>, Incompatible extends Q['queryTypeOpts'] extends Readonly<{
+        allowOffset: false;
+    }> ? true : false, RetQuery = Query<DreamInstance, ExtendQueryType<QueryTypeOpts, Readonly<{
+        allowPaginate: false;
+        allowLeftJoinPreload: false;
+    }>>>>(this: Q, offset: Incompatible extends true ? 'offset is incompatible with paginate and leftJoinPreload'[] : number | null): RetQuery;
     /**
      * Returns the sql that would be executed by this Query
      *
@@ -801,7 +814,9 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @returns results.currentPage - The current page (same as what is provided in the paginate args)
      * @returns results.results - An array of records matching the current record
      */
-    paginate(opts: PaginatedDreamQueryOptions): Promise<PaginatedDreamQueryResult<DreamInstance>>;
+    paginate<Q extends Query<DreamInstance, any>, Incompatible extends Q['queryTypeOpts'] extends Readonly<{
+        allowPaginate: false;
+    }> ? true : false>(this: Q, opts: Incompatible extends true ? 'paginate is incompatible with limit, offset, and leftJoinPreload'[] : PaginatedDreamQueryOptions): Promise<PaginatedDreamQueryResult<DreamInstance>>;
     /**
      * Forces use of a database connection (e.g. 'primary') during the query.
      *

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

@@ -10,4 +10,7 @@ export default function applyScopeBypassingSettingsToQuery<DreamInstance extends
     rootTableAlias: DreamInstance extends Dream ? DreamInstance["table"] : DreamInstance;
     allowPreload: true;
     allowLeftJoinPreload: true;
+    allowLimit: true;
+    allowOffset: true;
+    allowPaginate: true;
 }>>;

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

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