@rvoh/dream 2.7.0 → 2.8.0

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

@@ -49,7 +49,12 @@ export default function generateMigrationContent({ connectionName = 'default', t
         if (attributeType === 'citext')
             requireCitextExtension = true;
         const arrayAttribute = /\[\]$/.test(attributeType);
-        const omitInlineNonNull = userWantsThisOptional || (!!stiChildClassName && !arrayAttribute);
+        // Booleans always have a sensible non-null default (`false`), so in an
+        // STI child migration we keep the straightforward `.notNull().defaultTo(false)`
+        // column definition and skip the per-type check constraint — same as
+        // arrays, which already default to `'{}'`.
+        const isBooleanColumn = processedAttrType === 'boolean';
+        const omitInlineNonNull = userWantsThisOptional || (!!stiChildClassName && !arrayAttribute && !isBooleanColumn);
         if (nonStandardAttributeName === undefined)
             return acc;
         let attributeName = snakeify(nonStandardAttributeName);
@@ -115,7 +120,7 @@ export default function generateMigrationContent({ connectionName = 'default', t
     .execute()`);
             indexDrops.push(`await db.schema.dropIndex('${indexName}').execute()`);
         }
-        if (stiChildClassName && !userWantsThisOptional && !arrayAttribute) {
+        if (stiChildClassName && !userWantsThisOptional && !arrayAttribute && !isBooleanColumn) {
             checkConstraints.push(`
 
   await db.schema

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

@@ -1,4 +1,3 @@
-import serializerNameFromFullyQualifiedModelName from '../../serializer/helpers/serializerNameFromFullyQualifiedModelName.js';
 import camelize from '../camelize.js';
 import globalClassNameFromFullyQualifiedModelName from '../globalClassNameFromFullyQualifiedModelName.js';
 import absoluteDreamPath from '../path/absoluteDreamPath.js';
@@ -9,9 +8,18 @@ export default function generateSerializerContent({ fullyQualifiedModelName, col
     const additionalImports = [];
     const dreamImports = [];
     const isSTI = !!fullyQualifiedParentName;
+    // Variants that should be emitted in this file. Each variant generates a
+    // matching summary + default serializer pair; STI children import the
+    // corresponding variant from the parent module so the inheritance chain
+    // stays within the same variant (admin → admin, internal → internal).
+    const variantSuffixes = [''];
+    if (includeAdminSerializers)
+        variantSuffixes.push('Admin');
+    if (includeInternalSerializers)
+        variantSuffixes.push('Internal');
     if (isSTI) {
         fullyQualifiedParentName = standardizeFullyQualifiedModelName(fullyQualifiedParentName);
-        additionalImports.push(importStatementForSerializer(fullyQualifiedModelName, fullyQualifiedParentName));
+        additionalImports.push(importStatementForSerializer(fullyQualifiedModelName, fullyQualifiedParentName, variantSuffixes));
     }
     else {
         dreamImports.push('DreamSerializer');
@@ -23,58 +31,50 @@ export default function generateSerializerContent({ fullyQualifiedModelName, col
         : `(${modelInstanceName}: ${modelClassName})`;
     const modelSerializerArgs = `${modelInstanceName}`;
     const dreamSerializerArgs = `${stiBaseSerializer ? `StiChildClass ?? ${modelClassName}` : modelClassName}, ${modelInstanceName}`;
-    const serializerClassName = serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName));
-    const summarySerializerClassName = serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName), 'summary');
-    const defaultSerializerExtends = isSTI
-        ? `${serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedParentName))}(${modelClassName}, ${modelSerializerArgs})`
-        : `${summarySerializerClassName}(${stiBaseSerializer ? 'StiChildClass, ' : ''}${modelSerializerArgs})`;
-    const summarySerializerExtends = isSTI
-        ? `${serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedParentName), 'summary')}(${modelClassName}, ${modelSerializerArgs})`
-        : `DreamSerializer(${dreamSerializerArgs})`;
-    // Admin variants
-    const adminSerializerClassName = serializerClassName.replace(/Serializer$/, 'AdminSerializer');
-    const adminSummarySerializerClassName = summarySerializerClassName.replace(/SummarySerializer$/, 'AdminSummarySerializer');
-    // end:Admin variants
-    // Internal variants
-    const internalSerializerClassName = serializerClassName.replace(/Serializer$/, 'InternalSerializer');
-    const internalSummarySerializerClassName = summarySerializerClassName.replace(/SummarySerializer$/, 'InternalSummarySerializer');
-    // end:Internal variants
+    const localSerializerBase = fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName);
+    const parentSerializerBase = isSTI
+        ? fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedParentName)
+        : '';
     const additionalModelImports = [];
     const dreamImport = dreamImports.length
         ? `import { ${uniq(dreamImports).join(', ')} } from '@rvoh/dream'\n`
         : '';
     const additionalImportsStr = uniq(additionalImports).join('');
-    const summarySerializer = `export const ${summarySerializerClassName} = ${modelSerializerSignature} =>
-  ${summarySerializerExtends}${isSTI ? '' : `\n    .attribute('id')`}`;
-    const defaultSerializer = `export const ${serializerClassName} = ${modelSerializerSignature} =>
-  ${defaultSerializerExtends}${columnsWithTypes
-        .map(attr => {
-        const [name, type] = attr.split(':');
-        if (name === undefined)
-            return '';
-        if (['belongsto', 'hasone', 'hasmany'].includes(camelize(type)?.toLowerCase()))
-            return '';
-        return `\n    ${attribute(modelClassName, name, type, attr, stiBaseSerializer)}`;
-    })
-        .join('')}`;
+    const buildSerializerPair = (variantSuffix) => {
+        const summaryName = variantSerializerClassName(localSerializerBase, variantSuffix, 'summary');
+        const defaultName = variantSerializerClassName(localSerializerBase, variantSuffix, 'default');
+        const summaryExtends = isSTI
+            ? `${variantSerializerClassName(parentSerializerBase, variantSuffix, 'summary')}(${modelClassName}, ${modelSerializerArgs})`
+            : `DreamSerializer(${dreamSerializerArgs})`;
+        const defaultExtends = isSTI
+            ? `${variantSerializerClassName(parentSerializerBase, variantSuffix, 'default')}(${modelClassName}, ${modelSerializerArgs})`
+            : `${summaryName}(${stiBaseSerializer ? 'StiChildClass, ' : ''}${modelSerializerArgs})`;
+        const summary = `export const ${summaryName} = ${modelSerializerSignature} =>
+  ${summaryExtends}${isSTI ? '' : `\n    .attribute('id')`}`;
+        const defaultBody = columnsWithTypes
+            .map(attr => {
+            const [name, type] = attr.split(':');
+            if (name === undefined)
+                return '';
+            if (['belongsto', 'hasone', 'hasmany'].includes(camelize(type)?.toLowerCase()))
+                return '';
+            return `\n    ${attribute(modelClassName, name, type, attr, stiBaseSerializer)}`;
+        })
+            .join('');
+        const def = `export const ${defaultName} = ${modelSerializerSignature} =>
+  ${defaultExtends}${defaultBody}`;
+        return `${summary}\n\n${def}`;
+    };
+    const serializerBlocks = variantSuffixes.map(buildSerializerPair).join('\n\n');
     return `${dreamImport}${additionalImportsStr}${relatedModelImport}${additionalModelImports.join('')}
-${summarySerializer}
-
-${defaultSerializer}${!includeAdminSerializers
-        ? ''
-        : `
-
-${summarySerializer.replace(summarySerializerClassName, adminSummarySerializerClassName)}
-
-${defaultSerializer.replace(serializerClassName, adminSerializerClassName).replace(summarySerializerClassName, adminSummarySerializerClassName)}`}${!includeInternalSerializers
-        ? ''
-        : `
-
-${summarySerializer.replace(summarySerializerClassName, internalSummarySerializerClassName)}
-
-${defaultSerializer.replace(serializerClassName, internalSerializerClassName).replace(summarySerializerClassName, internalSummarySerializerClassName)}`}
+${serializerBlocks}
 `;
 }
+function variantSerializerClassName(serializerBase, variantSuffix, kind) {
+    return kind === 'summary'
+        ? `${serializerBase}${variantSuffix}SummarySerializer`
+        : `${serializerBase}${variantSuffix}Serializer`;
+}
 function attribute(modelClassName, name, type, attr, stiBaseSerializer) {
     if (name === 'type' && stiBaseSerializer) {
         return `.attribute('type', { openapi: { type: 'string', enum: [(StiChildClass ?? ${modelClassName}).sanitizedName] } })`;
@@ -97,11 +97,14 @@ function attributeOptionsSpecifier(type, attr) {
             return '';
     }
 }
-function importStatementForSerializer(originModelName, destinationModelName) {
-    const defaultSerializer = globalClassNameFromFullyQualifiedModelName(serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(destinationModelName)));
-    const summarySerializer = globalClassNameFromFullyQualifiedModelName(serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(destinationModelName), 'summary'));
+function importStatementForSerializer(originModelName, destinationModelName, variantSuffixes) {
+    const base = fullyQualifiedModelNameToSerializerBaseName(destinationModelName);
+    const names = variantSuffixes.flatMap(suffix => [
+        globalClassNameFromFullyQualifiedModelName(variantSerializerClassName(base, suffix, 'default')),
+        globalClassNameFromFullyQualifiedModelName(variantSerializerClassName(base, suffix, 'summary')),
+    ]);
     const importFrom = absoluteDreamPath('serializers', destinationModelName);
-    return `import { ${defaultSerializer}, ${summarySerializer} } from '${importFrom}'\n`;
+    return `import { ${names.join(', ')} } from '${importFrom}'\n`;
 }
 function importStatementForModel(modelClassName, fullyQualifiedModelName) {
     const importFrom = absoluteDreamPath('models', fullyQualifiedModelName);

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

@@ -49,7 +49,12 @@ export default function generateMigrationContent({ connectionName = 'default', t
         if (attributeType === 'citext')
             requireCitextExtension = true;
         const arrayAttribute = /\[\]$/.test(attributeType);
-        const omitInlineNonNull = userWantsThisOptional || (!!stiChildClassName && !arrayAttribute);
+        // Booleans always have a sensible non-null default (`false`), so in an
+        // STI child migration we keep the straightforward `.notNull().defaultTo(false)`
+        // column definition and skip the per-type check constraint — same as
+        // arrays, which already default to `'{}'`.
+        const isBooleanColumn = processedAttrType === 'boolean';
+        const omitInlineNonNull = userWantsThisOptional || (!!stiChildClassName && !arrayAttribute && !isBooleanColumn);
         if (nonStandardAttributeName === undefined)
             return acc;
         let attributeName = snakeify(nonStandardAttributeName);
@@ -115,7 +120,7 @@ export default function generateMigrationContent({ connectionName = 'default', t
     .execute()`);
             indexDrops.push(`await db.schema.dropIndex('${indexName}').execute()`);
         }
-        if (stiChildClassName && !userWantsThisOptional && !arrayAttribute) {
+        if (stiChildClassName && !userWantsThisOptional && !arrayAttribute && !isBooleanColumn) {
             checkConstraints.push(`
 
   await db.schema

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

@@ -1,4 +1,3 @@
-import serializerNameFromFullyQualifiedModelName from '../../serializer/helpers/serializerNameFromFullyQualifiedModelName.js';
 import camelize from '../camelize.js';
 import globalClassNameFromFullyQualifiedModelName from '../globalClassNameFromFullyQualifiedModelName.js';
 import absoluteDreamPath from '../path/absoluteDreamPath.js';
@@ -9,9 +8,18 @@ export default function generateSerializerContent({ fullyQualifiedModelName, col
     const additionalImports = [];
     const dreamImports = [];
     const isSTI = !!fullyQualifiedParentName;
+    // Variants that should be emitted in this file. Each variant generates a
+    // matching summary + default serializer pair; STI children import the
+    // corresponding variant from the parent module so the inheritance chain
+    // stays within the same variant (admin → admin, internal → internal).
+    const variantSuffixes = [''];
+    if (includeAdminSerializers)
+        variantSuffixes.push('Admin');
+    if (includeInternalSerializers)
+        variantSuffixes.push('Internal');
     if (isSTI) {
         fullyQualifiedParentName = standardizeFullyQualifiedModelName(fullyQualifiedParentName);
-        additionalImports.push(importStatementForSerializer(fullyQualifiedModelName, fullyQualifiedParentName));
+        additionalImports.push(importStatementForSerializer(fullyQualifiedModelName, fullyQualifiedParentName, variantSuffixes));
     }
     else {
         dreamImports.push('DreamSerializer');
@@ -23,58 +31,50 @@ export default function generateSerializerContent({ fullyQualifiedModelName, col
         : `(${modelInstanceName}: ${modelClassName})`;
     const modelSerializerArgs = `${modelInstanceName}`;
     const dreamSerializerArgs = `${stiBaseSerializer ? `StiChildClass ?? ${modelClassName}` : modelClassName}, ${modelInstanceName}`;
-    const serializerClassName = serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName));
-    const summarySerializerClassName = serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName), 'summary');
-    const defaultSerializerExtends = isSTI
-        ? `${serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedParentName))}(${modelClassName}, ${modelSerializerArgs})`
-        : `${summarySerializerClassName}(${stiBaseSerializer ? 'StiChildClass, ' : ''}${modelSerializerArgs})`;
-    const summarySerializerExtends = isSTI
-        ? `${serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedParentName), 'summary')}(${modelClassName}, ${modelSerializerArgs})`
-        : `DreamSerializer(${dreamSerializerArgs})`;
-    // Admin variants
-    const adminSerializerClassName = serializerClassName.replace(/Serializer$/, 'AdminSerializer');
-    const adminSummarySerializerClassName = summarySerializerClassName.replace(/SummarySerializer$/, 'AdminSummarySerializer');
-    // end:Admin variants
-    // Internal variants
-    const internalSerializerClassName = serializerClassName.replace(/Serializer$/, 'InternalSerializer');
-    const internalSummarySerializerClassName = summarySerializerClassName.replace(/SummarySerializer$/, 'InternalSummarySerializer');
-    // end:Internal variants
+    const localSerializerBase = fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName);
+    const parentSerializerBase = isSTI
+        ? fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedParentName)
+        : '';
     const additionalModelImports = [];
     const dreamImport = dreamImports.length
         ? `import { ${uniq(dreamImports).join(', ')} } from '@rvoh/dream'\n`
         : '';
     const additionalImportsStr = uniq(additionalImports).join('');
-    const summarySerializer = `export const ${summarySerializerClassName} = ${modelSerializerSignature} =>
-  ${summarySerializerExtends}${isSTI ? '' : `\n    .attribute('id')`}`;
-    const defaultSerializer = `export const ${serializerClassName} = ${modelSerializerSignature} =>
-  ${defaultSerializerExtends}${columnsWithTypes
-        .map(attr => {
-        const [name, type] = attr.split(':');
-        if (name === undefined)
-            return '';
-        if (['belongsto', 'hasone', 'hasmany'].includes(camelize(type)?.toLowerCase()))
-            return '';
-        return `\n    ${attribute(modelClassName, name, type, attr, stiBaseSerializer)}`;
-    })
-        .join('')}`;
+    const buildSerializerPair = (variantSuffix) => {
+        const summaryName = variantSerializerClassName(localSerializerBase, variantSuffix, 'summary');
+        const defaultName = variantSerializerClassName(localSerializerBase, variantSuffix, 'default');
+        const summaryExtends = isSTI
+            ? `${variantSerializerClassName(parentSerializerBase, variantSuffix, 'summary')}(${modelClassName}, ${modelSerializerArgs})`
+            : `DreamSerializer(${dreamSerializerArgs})`;
+        const defaultExtends = isSTI
+            ? `${variantSerializerClassName(parentSerializerBase, variantSuffix, 'default')}(${modelClassName}, ${modelSerializerArgs})`
+            : `${summaryName}(${stiBaseSerializer ? 'StiChildClass, ' : ''}${modelSerializerArgs})`;
+        const summary = `export const ${summaryName} = ${modelSerializerSignature} =>
+  ${summaryExtends}${isSTI ? '' : `\n    .attribute('id')`}`;
+        const defaultBody = columnsWithTypes
+            .map(attr => {
+            const [name, type] = attr.split(':');
+            if (name === undefined)
+                return '';
+            if (['belongsto', 'hasone', 'hasmany'].includes(camelize(type)?.toLowerCase()))
+                return '';
+            return `\n    ${attribute(modelClassName, name, type, attr, stiBaseSerializer)}`;
+        })
+            .join('');
+        const def = `export const ${defaultName} = ${modelSerializerSignature} =>
+  ${defaultExtends}${defaultBody}`;
+        return `${summary}\n\n${def}`;
+    };
+    const serializerBlocks = variantSuffixes.map(buildSerializerPair).join('\n\n');
     return `${dreamImport}${additionalImportsStr}${relatedModelImport}${additionalModelImports.join('')}
-${summarySerializer}
-
-${defaultSerializer}${!includeAdminSerializers
-        ? ''
-        : `
-
-${summarySerializer.replace(summarySerializerClassName, adminSummarySerializerClassName)}
-
-${defaultSerializer.replace(serializerClassName, adminSerializerClassName).replace(summarySerializerClassName, adminSummarySerializerClassName)}`}${!includeInternalSerializers
-        ? ''
-        : `
-
-${summarySerializer.replace(summarySerializerClassName, internalSummarySerializerClassName)}
-
-${defaultSerializer.replace(serializerClassName, internalSerializerClassName).replace(summarySerializerClassName, internalSummarySerializerClassName)}`}
+${serializerBlocks}
 `;
 }
+function variantSerializerClassName(serializerBase, variantSuffix, kind) {
+    return kind === 'summary'
+        ? `${serializerBase}${variantSuffix}SummarySerializer`
+        : `${serializerBase}${variantSuffix}Serializer`;
+}
 function attribute(modelClassName, name, type, attr, stiBaseSerializer) {
     if (name === 'type' && stiBaseSerializer) {
         return `.attribute('type', { openapi: { type: 'string', enum: [(StiChildClass ?? ${modelClassName}).sanitizedName] } })`;
@@ -97,11 +97,14 @@ function attributeOptionsSpecifier(type, attr) {
             return '';
     }
 }
-function importStatementForSerializer(originModelName, destinationModelName) {
-    const defaultSerializer = globalClassNameFromFullyQualifiedModelName(serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(destinationModelName)));
-    const summarySerializer = globalClassNameFromFullyQualifiedModelName(serializerNameFromFullyQualifiedModelName(fullyQualifiedModelNameToSerializerBaseName(destinationModelName), 'summary'));
+function importStatementForSerializer(originModelName, destinationModelName, variantSuffixes) {
+    const base = fullyQualifiedModelNameToSerializerBaseName(destinationModelName);
+    const names = variantSuffixes.flatMap(suffix => [
+        globalClassNameFromFullyQualifiedModelName(variantSerializerClassName(base, suffix, 'default')),
+        globalClassNameFromFullyQualifiedModelName(variantSerializerClassName(base, suffix, 'summary')),
+    ]);
     const importFrom = absoluteDreamPath('serializers', destinationModelName);
-    return `import { ${defaultSerializer}, ${summarySerializer} } from '${importFrom}'\n`;
+    return `import { ${names.join(', ')} } from '${importFrom}'\n`;
 }
 function importStatementForModel(modelClassName, fullyQualifiedModelName) {
     const importFrom = absoluteDreamPath('models', fullyQualifiedModelName);