@rvoh/dream 0.31.5 → 0.32.1

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

@@ -10,6 +10,7 @@ const constants_js_1 = require("../../dream/constants.js");
 const FailedToIdentifyAssociation_js_1 = require("../../errors/schema-builder/FailedToIdentifyAssociation.js");
 const autogeneratedFileMessage_js_1 = require("../../global-cli/helpers/autogeneratedFileMessage.js");
 const camelize_js_1 = require("../camelize.js");
+const compact_js_1 = require("../compact.js");
 const EnvInternal_js_1 = require("../EnvInternal.js");
 const pascalize_js_1 = require("../pascalize.js");
 const sortBy_js_1 = require("../sortBy.js");
@@ -52,9 +53,10 @@ export const globalSchema = {
     }
     globalModelNames() {
         const dreamApp = index_js_2.default.getOrFail();
+        const models = dreamApp.models;
         return `{
-      ${Object.keys(dreamApp.models)
-            .map(key => `'${key}': '${dreamApp.models[key].prototype.table}'`)
+      ${Object.keys(models)
+            .map(key => `'${key}': '${models[key]?.prototype?.table}'`)
             .join(',\n      ')}
     }`;
     }
@@ -68,9 +70,14 @@ export const schema = {
   ${Object.keys(schemaData)
             .map(tableName => {
             const tableData = schemaData[tableName];
+            if (tableData === undefined)
+                return '';
             const defaultScopeNames = tableData.scopes.default;
             const namedScopeNames = tableData.scopes.named;
             allDefaultScopeNames = [...allDefaultScopeNames, ...defaultScopeNames];
+            const schemaDatum = schemaData[tableName];
+            if (schemaDatum === undefined)
+                return '';
             return `\
 ${tableName}: {
     primaryKey: '${tableData.primaryKey}',
@@ -83,11 +90,15 @@ ${tableName}: {
       named: ${stringifyArray(namedScopeNames)},
     },
     columns: {
-      ${Object.keys(schemaData[tableName].columns)
+      ${Object.keys(schemaDatum.columns)
                 .sort()
                 .map(columnName => {
                 const columnData = tableData.columns[columnName];
+                if (columnData === undefined)
+                    return '';
                 const kyselyType = this.kyselyType(tableName, columnName, fileContents);
+                if (kyselyType === undefined)
+                    return '';
                 return `${columnName}: {
         coercedType: {} as ${this.coercedType(kyselyType, columnData.dbType)},
         enumType: ${columnData.enumType ? `{} as ${columnData.enumType}` : 'null'},
@@ -100,12 +111,14 @@ ${tableName}: {
             })
                 .join('\n      ')}
     },
-    virtualColumns: ${stringifyArray(schemaData[tableName].virtualColumns)},
+    virtualColumns: ${stringifyArray(schemaDatum.virtualColumns)},
     associations: {
-      ${Object.keys(schemaData[tableName].associations)
+      ${Object.keys(schemaDatum.associations)
                 .sort()
                 .map(associationName => {
                 const associationMetadata = tableData.associations[associationName];
+                if (associationMetadata === undefined)
+                    return '';
                 const whereStatement = associationMetadata.where;
                 const requiredOnClauses = whereStatement === null
                     ? []
@@ -206,6 +219,8 @@ may need to update the table getter in the corresponding Dream.
         return Object.keys(columnData)
             .sort()
             .reduce((acc, key) => {
+            if (columnData[key] === undefined)
+                return acc;
             acc[key] = columnData[key];
             return acc;
         }, {});
@@ -235,6 +250,8 @@ may need to update the table getter in the corresponding Dream.
         for (const model of models.filter(model => model.table === tableName)) {
             for (const associationName of model.associationNames) {
                 const associationMetaData = model['associationMetadataMap']()[associationName];
+                if (associationMetaData === undefined)
+                    continue;
                 if (targetAssociationType && associationMetaData.type !== targetAssociationType)
                     continue;
                 const dreamClassOrClasses = associationMetaData.modelCB();
@@ -286,6 +303,8 @@ may need to update the table getter in the corresponding Dream.
         return Object.keys(tableAssociationData)
             .sort()
             .reduce((acc, key) => {
+            if (tableAssociationData[key] === undefined)
+                return acc;
             acc[key] = tableAssociationData[key];
             return acc;
         }, {});
@@ -295,33 +314,49 @@ may need to update the table getter in the corresponding Dream.
         const exportedConsts = [...fileContents.matchAll(/export\s+const\s+([a-zA-Z0-9_]+)/g)].map(res => res[1]);
         const exportedTypes = [...fileContents.matchAll(/export\s+type\s+([a-zA-Z0-9_]+)/g)].map(res => res[1]);
         const exportedInterfaces = [...fileContents.matchAll(/export\s+interface\s+([a-zA-Z0-9_]+)/g)].map(res => res[1]);
-        const allExports = [...exportedConsts, ...exportedTypes, ...exportedInterfaces];
+        const allExports = (0, compact_js_1.default)([...exportedConsts, ...exportedTypes, ...exportedInterfaces]);
         return allExports;
     }
     async getTables() {
         const fileContents = await this.loadDbSyncFile();
         const tableLines = /export interface DB {([^}]*)}/.exec(fileContents)[1];
+        if (tableLines === undefined)
+            return [];
         const tables = tableLines
             .split('\n')
-            .map(line => line.split(':')[0].replace(/\s*/, ''))
+            .map(line => {
+            const stingArray = line.split(':');
+            const substring = stingArray[0];
+            if (substring === undefined)
+                return '';
+            return substring.replace(/\s*/, '');
+        })
             .filter(line => !!line);
         return tables;
     }
     kyselyType(tableName, columnName, fileContents) {
-        const tableLines = /export interface DB {([^}]*)}/.exec(fileContents)[1];
-        const interfaceName = tableLines
+        const tableLinesString = /export interface DB {([^}]*)}/.exec(fileContents)[1];
+        if (tableLinesString === undefined)
+            return '';
+        const tableLines = tableLinesString
             .split('\n')
             .filter(line => !!line)
-            .filter(line => new RegExp(`^  ${tableName}:`).test(line))[0]
-            .split(':')[1]
-            ?.replace(/[\s;]*/g, '');
-        const interfaceLines = new RegExp(`export interface ${interfaceName} {([^}]*)}`).exec(fileContents)[1];
-        const kyselyType = interfaceLines
+            .filter(line => new RegExp(`^  ${tableName}:`).test(line));
+        const tableLine = tableLines[0];
+        if (tableLine === undefined)
+            return '';
+        const interfaceName = tableLine.split(':')[1]?.replace(/[\s;]*/g, '');
+        const interfaceLinesString = new RegExp(`export interface ${interfaceName} {([^}]*)}`).exec(fileContents)[1];
+        if (interfaceLinesString === undefined)
+            return '';
+        const interfaceLines = interfaceLinesString
             .split('\n')
             .filter(line => !!line)
-            .filter(line => new RegExp(`  ${columnName}:`).test(line))[0]
-            .split(':')[1]
-            ?.replace(/[\s;]*/g, '');
+            .filter(line => new RegExp(`  ${columnName}:`).test(line));
+        const interfaceLine = interfaceLines[0];
+        if (interfaceLine === undefined)
+            return '';
+        const kyselyType = interfaceLine.split(':')[1]?.replace(/[\s;]*/g, '');
         return kyselyType;
     }
     coercedType(kyselyType, dbType) {

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

@@ -28,6 +28,8 @@ function generateDreamContent({ fullyQualifiedModelName, columnsWithTypes, fully
         : [importStatementForModel(fullyQualifiedModelName, 'ApplicationModel')];
     const attributeStatements = columnsWithTypes.map(attribute => {
         const [attributeName, attributeType, ...descriptors] = attribute.split(':');
+        if (attributeName === undefined)
+            return '';
         const fullyQualifiedAssociatedModelName = (0, standardizeFullyQualifiedModelName_js_1.default)(attributeName);
         const associationModelName = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedAssociatedModelName);
         const associationImportStatement = importStatementForModel(fullyQualifiedModelName, fullyQualifiedAssociatedModelName);
@@ -82,7 +84,7 @@ ${isSTI ? `\n@STI(${parentModelClassName})` : ''}
 export default class ${modelClassName} extends ${isSTI ? parentModelClassName : 'ApplicationModel'} {
 ${isSTI
         ? ''
-        : `  public get table() {
+        : `  public override get table() {
     return '${tableName}' as const
   }
 

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

@@ -17,10 +17,14 @@ function generateFactoryContent({ fullyQualifiedModelName, columnsWithTypes, })
     let firstStringAttr = true;
     for (const attribute of columnsWithTypes) {
         const [attributeName, attributeType, ...descriptors] = attribute.split(':');
+        if (attributeName === undefined)
+            continue;
         const fullyQualifiedAssociatedModelName = (0, standardizeFullyQualifiedModelName_js_1.default)(attributeName);
         const associationModelName = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedAssociatedModelName);
         const associationFactoryImportStatement = `import create${associationModelName} from '${(0, relativeDreamPath_js_1.default)('factories', 'factories', fullyQualifiedModelName, fullyQualifiedAssociatedModelName)}'`;
         const associationName = (0, camelize_js_1.default)(associationModelName);
+        if (attributeName === undefined)
+            continue;
         if (/_type$/.test(attributeName))
             continue;
         if (!attributeType)
@@ -30,16 +34,16 @@ function generateFactoryContent({ fullyQualifiedModelName, columnsWithTypes, })
                 belongsToNames.push(associationName);
                 belongsToTypedNames.push(`${associationName}: ${associationModelName}`);
                 additionalImports.push(associationFactoryImportStatement);
-                associationCreationStatements.push(`attrs.${associationName} ||= await create${associationModelName}()`);
+                associationCreationStatements.push(`attrs.${associationName} ??= await create${associationModelName}()`);
                 break;
             case 'string':
             case 'text':
             case 'citext':
-                stringAttributes.push(`attrs.${(0, camelize_js_1.default)(attributeName)} ||= \`${fullyQualifiedModelName} ${(0, camelize_js_1.default)(attributeName)} ${firstStringAttr ? '${++counter}' : '${counter}'}\``);
+                stringAttributes.push(`attrs.${(0, camelize_js_1.default)(attributeName)} ??= \`${fullyQualifiedModelName} ${(0, camelize_js_1.default)(attributeName)} ${firstStringAttr ? '${++counter}' : '${counter}'}\``);
                 firstStringAttr = false;
                 break;
             case 'enum':
-                stringAttributes.push(`attrs.${(0, camelize_js_1.default)(attributeName)} ||= '${(descriptors[descriptors.length - 1] || '<tbd>').split(',')[0]}'`);
+                stringAttributes.push(`attrs.${(0, camelize_js_1.default)(attributeName)} ??= '${(descriptors[descriptors.length - 1] || '<tbd>').split(',')[0]}'`);
                 break;
             default:
             // noop

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

@@ -5,14 +5,19 @@ const pluralize_esm_1 = require("pluralize-esm");
 const InvalidDecimalFieldPassedToGenerator_js_1 = require("../../errors/InvalidDecimalFieldPassedToGenerator.js");
 const foreignKeyTypeFromPrimaryKey_js_1 = require("../db/foreignKeyTypeFromPrimaryKey.js");
 const snakeify_js_1 = require("../snakeify.js");
+const STI_TYPE_COLUMN_NAME = 'type';
+const COLUMNS_TO_INDEX = [STI_TYPE_COLUMN_NAME];
+const NOT_NULL_COLUMNS = [STI_TYPE_COLUMN_NAME];
 function generateMigrationContent({ table, columnsWithTypes = [], primaryKeyType = 'bigserial', createOrAlter = 'create', } = {}) {
     const altering = createOrAlter === 'alter';
     let requireCitextExtension = false;
-    const { columnDefs, columnDrops } = columnsWithTypes.reduce((acc, attribute) => {
-        const { columnDefs, columnDrops } = acc;
+    const { columnDefs, columnDrops, indexDefs, indexDrops } = columnsWithTypes.reduce((acc, attribute) => {
+        const { columnDefs, columnDrops, indexDefs, indexDrops } = acc;
         const [nonStandardAttributeName, attributeType, ...descriptors] = attribute.split(':');
         let attributeName = (0, snakeify_js_1.default)(nonStandardAttributeName);
-        if (['has_one', 'has_many'].includes(attributeType))
+        if (attributeName === undefined)
+            return acc;
+        if (attributeType !== undefined && ['has_one', 'has_many'].includes(attributeType))
             return acc;
         if (attributeType === 'citext')
             requireCitextExtension = true;
@@ -38,12 +43,23 @@ function generateMigrationContent({ table, columnsWithTypes = [], primaryKeyType
                 columnDefs.push(generateColumnStr(`encrypted_${attributeName}`, 'text', descriptors));
                 break;
             default:
-                columnDefs.push(generateColumnStr(attributeName, coercedAttributeType, descriptors));
+                if (coercedAttributeType !== undefined) {
+                    columnDefs.push(generateColumnStr(attributeName, coercedAttributeType, descriptors));
+                }
                 break;
         }
         columnDrops.push(`.dropColumn('${attributeName}')`);
+        if (COLUMNS_TO_INDEX.includes(attributeName)) {
+            const indexName = `${table}_${attributeName}`;
+            indexDefs.push(`await db.schema
+    .createIndex('${indexName}')
+    .on('${table}')
+    .column('${attributeName}')
+    .execute()`);
+            indexDrops.push(`await db.schema.dropIndex('${indexName}').execute()`);
+        }
         return acc;
-    }, { columnDefs: [], columnDrops: [] });
+    }, { columnDefs: [], columnDrops: [], indexDefs: [], indexDrops: [] });
     if (!table) {
         return `\
 import { Kysely, sql } from 'kysely'
@@ -64,28 +80,31 @@ export async function down(db: Kysely<any>): Promise<void> {
     const dreamImports = [];
     if (requireCitextExtension)
         dreamImports.push('DreamMigrationHelpers');
-    const newline = '\n    ';
-    const columnDefLines = columnDefs.length ? newline + columnDefs.join(newline) : '';
-    const columnDropLines = columnDrops.length ? newline + columnDrops.join(newline) + newline : '';
+    const newlineIndent = '\n  ';
+    const newlineDoubleIndent = '\n    ';
+    const columnDefLines = columnDefs.length ? newlineDoubleIndent + columnDefs.join(newlineDoubleIndent) : '';
+    const columnDropLines = columnDrops.length
+        ? newlineDoubleIndent + columnDrops.join(newlineDoubleIndent) + newlineDoubleIndent
+        : '';
     return `\
 ${dreamImports.length ? `import { ${dreamImports.join(', ')} } from '@rvoh/dream'\n` : ''}import { ${kyselyImports.join(', ')} } from 'kysely'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function up(db: Kysely<any>): Promise<void> {
 ${citextExtension}${generateEnumStatements(columnsWithTypes)}  await db.schema
-    .${altering ? 'alterTable' : 'createTable'}('${table}')${altering ? '' : newline + generateIdStr({ primaryKeyType })}${columnDefLines}${altering
+    .${altering ? 'alterTable' : 'createTable'}('${table}')${altering ? '' : newlineDoubleIndent + generateIdStr({ primaryKeyType })}${columnDefLines}${altering
         ? ''
-        : newline +
+        : newlineDoubleIndent +
             ".addColumn('created_at', 'timestamp', col => col.notNull())" +
-            newline +
+            newlineDoubleIndent +
             ".addColumn('updated_at', 'timestamp', col => col.notNull())"}
-    .execute()
+    .execute()${indexDefs.length ? `\n${newlineIndent}` : ''}${indexDefs.join(newlineDoubleIndent)}
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function down(db: Kysely<any>): Promise<void> {
-  ${altering
-        ? `await db.schema${newline}.alterTable('${table}')${columnDropLines}.execute()`
+  ${indexDrops.join(newlineIndent)}${indexDrops.length ? newlineIndent : ''}${altering
+        ? `await db.schema${newlineDoubleIndent}.alterTable('${table}')${columnDropLines}.execute()`
         : `await db.schema.dropTable('${table}').execute()`}${generateEnumDropStatements(columnsWithTypes)}
 }\
 `;
@@ -112,7 +131,10 @@ function generateEnumStatements(columnsWithTypes) {
     const enumStatements = columnsWithTypes.filter(attribute => /:enum:.*:/.test(attribute));
     const finalStatements = enumStatements.map(statement => {
         const enumName = statement.split(':')[2];
-        const columnsWithTypes = statement.split(':')[3].split(/,\s{0,}/);
+        const columnsWithTypesString = statement.split(':')[3];
+        if (columnsWithTypesString === undefined)
+            return '';
+        const columnsWithTypes = columnsWithTypesString.split(/,\s{0,}/);
         return `  await db.schema
     .createType('${enumName}_enum')
     .asEnum([
@@ -135,7 +157,11 @@ function generateBooleanStr(attributeName) {
 }
 function generateEnumStr(attribute) {
     const computedAttributeType = enumAttributeType(attribute);
-    return `.addColumn('${attribute.split(':')[0]}', ${computedAttributeType})`;
+    const attributeName = attribute.split(':')[0];
+    if (attributeName === undefined)
+        return '';
+    const notNull = NOT_NULL_COLUMNS.includes(attributeName);
+    return `.addColumn('${attributeName}', ${computedAttributeType}${notNull ? ', col => col.notNull()' : ''})`;
 }
 function generateDecimalStr(attribute) {
     const [, , ...descriptors] = attribute.split(':');
@@ -148,15 +174,21 @@ function generateColumnStr(attributeName, attributeType, descriptors) {
     let returnStr = `.addColumn('${attributeName}', ${attributeTypeString(attributeType)}`;
     const providedDefaultArg = descriptors.find(d => /^default\(/.test(d));
     const providedDefault = providedDefaultArg?.replace(/^default\(/, '')?.replace(/\)$/, '');
-    const hasExtraValues = descriptors.includes('primary') || providedDefault;
+    const notNull = NOT_NULL_COLUMNS.includes(attributeName);
+    const hasExtraValues = providedDefault || notNull;
     if (hasExtraValues)
         returnStr += ', col => col';
-    if (descriptors.includes('primary'))
-        returnStr += `.defaultTo('${providedDefault}')`;
+    if (notNull)
+        returnStr += '.notNull()';
     if (providedDefault)
         returnStr += `.defaultTo('${providedDefault}')`;
-    // TODO: handle index
-    return `${returnStr}${hasExtraValues ? '))' : ')'}`;
+    returnStr = `${returnStr})`;
+    if (attributeName === STI_TYPE_COLUMN_NAME)
+        returnStr = `// CONSIDER: when using type for STI, always use an enum
+    // Try using the enum syntax in your generator, e.g.:
+    // yarn psy g:model Balloon type:enum:balloon_type:latex,mylar
+    ${returnStr}`;
+    return returnStr;
 }
 function attributeTypeString(attributeType) {
     const attributeTypesRequiringSql = ['citext'];

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateSerializerContent;
 const camelize_js_1 = require("../camelize.js");
 const globalClassNameFromFullyQualifiedModelName_js_1 = require("../globalClassNameFromFullyQualifiedModelName.js");
-const pascalize_js_1 = require("../pascalize.js");
 const relativeDreamPath_js_1 = require("../path/relativeDreamPath.js");
 const serializerNameFromFullyQualifiedModelName_js_1 = require("../serializerNameFromFullyQualifiedModelName.js");
 const standardizeFullyQualifiedModelName_js_1 = require("../standardizeFullyQualifiedModelName.js");
@@ -74,6 +73,8 @@ export default class ${defaultSerialzerClassName}${dataTypeCapture} extends ${de
 ${columnsWithTypes
         .map(attr => {
         const [name, type] = attr.split(':');
+        if (name === undefined)
+            return '';
         const fullyQualifiedAssociatedModelName = (0, standardizeFullyQualifiedModelName_js_1.default)(name);
         const associatedModelName = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedAssociatedModelName);
         const propertyName = (0, camelize_js_1.default)(associatedModelName);
@@ -84,7 +85,7 @@ ${columnsWithTypes
                 return '';
             default:
                 return `  @Attribute(${modelClassName}${attributeOptionsSpecifier(type, attr)})
-  public ${propertyName}: ${jsType(type, attr, propertyName, modelClassName)}`;
+  public ${propertyName}: ${`DreamColumn<${modelClassName}, '${propertyName}'>`}`;
         }
     })
         .join('\n\n  ')}
@@ -99,29 +100,6 @@ function attributeOptionsSpecifier(type, attr) {
             return '';
     }
 }
-function jsType(type, originalAttribute, propertyName, modelClass = null) {
-    if (modelClass)
-        return `DreamColumn<${modelClass}, '${propertyName}'>`;
-    switch (type) {
-        case 'date':
-            return 'CalendarDate';
-        case 'datetime':
-            return 'DateTime';
-        case 'decimal':
-        case 'integer':
-        case 'number':
-            return 'number';
-        case 'string':
-        case 'text':
-        case 'bigint':
-        case 'uuid':
-            return 'string';
-        case 'enum':
-            return (0, pascalize_js_1.default)(originalAttribute.split(':')[2]) + 'Enum';
-        default:
-            return 'any';
-    }
-}
 function importStatementForSerializer(originModelName, destinationModelName) {
     return `\nimport ${(0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(destinationModelName))}, { ${(0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(destinationModelName, 'summary'))} } from '${(0, relativeDreamPath_js_1.default)('serializers', 'serializers', originModelName, destinationModelName)}'`;
 }

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

@@ -9,7 +9,8 @@ function objectPathsToArrays(obj) {
 }
 function depthFirstSearch(obj, workingPath, completePaths) {
     return Object.keys(obj).forEach(key => {
-        if (Object.keys(obj[key]).length) {
+        const subObj = obj[key];
+        if (subObj && Object.keys(subObj).length) {
             depthFirstSearch(obj[key], [...workingPath, key], completePaths);
         }
         else {

package/dist/esm/src/Dream.js

@@ -1406,7 +1406,7 @@ export default class Dream {
      */
     static belongsToAssociationForeignKeys() {
         const associationMap = this.associationMetadataMap();
-        return this.belongsToAssociationNames().map(belongsToKey => associationMap[belongsToKey].foreignKey());
+        return this.belongsToAssociationNames().map(belongsToKey => associationMap[belongsToKey]?.foreignKey());
     }
     /**
      * @internal
@@ -1423,8 +1423,8 @@ export default class Dream {
     static polymorphicTypeColumns() {
         const associationMap = this.associationMetadataMap();
         return this.belongsToAssociationNames()
-            .filter(key => associationMap[key].polymorphic)
-            .map(belongsToKey => associationMap[belongsToKey].foreignKeyTypeField());
+            .filter(key => associationMap[key]?.polymorphic)
+            .map(belongsToKey => associationMap[belongsToKey]?.foreignKeyTypeField());
     }
     /**
      * @internal
@@ -1442,7 +1442,7 @@ export default class Dream {
      */
     static belongsToAssociationNames() {
         const associationMap = this.associationMetadataMap();
-        return Object.keys(associationMap).filter(key => associationMap[key].type === 'BelongsTo');
+        return Object.keys(associationMap).filter(key => associationMap[key]?.type === 'BelongsTo');
     }
     /**
      * @internal
@@ -1695,7 +1695,7 @@ export default class Dream {
     get isValid() {
         this._errors = {};
         runValidations(this);
-        return !Object.keys(this.errors).filter(key => !!this.errors[key].length).length;
+        return !Object.keys(this.errors).filter(key => !!this.errors[key]?.length).length;
     }
     /**
      * The name of the primary key column on this model.
@@ -1732,7 +1732,7 @@ export default class Dream {
      *
      * ```ts
      * class User extends ApplicationModel {
-     *   public get table() {
+     *   public override get table() {
      *     return 'users' as const
      *   }
      * }
@@ -2917,7 +2917,7 @@ export default class Dream {
      * @returns void
      */
     async save({ skipHooks } = {}) {
-        await saveDream(this, null, { skipHooks });
+        await saveDream(this, null, skipHooks ? { skipHooks } : undefined);
     }
     /**
      * Applies transaction to a new Query instance
@@ -2959,7 +2959,7 @@ export default class Dream {
     async update(attributes, { skipHooks } = {}) {
         // use #assignAttributes to leverage any custom-defined setters
         this.assignAttributes(attributes);
-        await this.save({ skipHooks });
+        await this.save(skipHooks ? { skipHooks } : undefined);
     }
     /**
      * Applies all attribute changes passed to the dream,
@@ -2986,7 +2986,7 @@ export default class Dream {
     async updateAttributes(attributes, { skipHooks } = {}) {
         // use #setAttributes to bypass any custom-defined setters
         this.setAttributes(attributes);
-        await this.save({ skipHooks });
+        await this.save(skipHooks ? { skipHooks } : undefined);
     }
     /**
      * Flags a dream model so that it does not

package/dist/esm/src/bin/helpers/sync.js

@@ -1,6 +1,8 @@
 import '../../helpers/loadEnv.js';
 import * as fs from 'fs/promises';
 import * as path from 'path';
+import DreamCLI from '../../cli/index.js';
+import colorize from '../../cli/logger/loggable/colorize.js';
 import ConnectionConfRetriever from '../../db/ConnectionConfRetriever.js';
 import DreamApplication from '../../dream-application/index.js';
 import autogeneratedFileDisclaimer from '../../global-cli/helpers/autogeneratedFileMessage.js';
@@ -9,8 +11,6 @@ import EnvInternal from '../../helpers/EnvInternal.js';
 import dreamPath from '../../helpers/path/dreamPath.js';
 import snakeify from '../../helpers/snakeify.js';
 import sspawn from '../../helpers/sspawn.js';
-import DreamCLI from '../../cli/index.js';
-import colorize from '../../cli/logger/loggable/colorize.js';
 export default async function writeSyncFile() {
     const dbConf = new ConnectionConfRetriever().getConnectionConf('primary');
     const dreamApp = DreamApplication.getOrFail();
@@ -104,8 +104,8 @@ export const ${typeDeclaration}Values = [
     });
 }
 function transformName(str) {
-    const name = str.split(' {')[0].replace(/\s/g, '');
-    if (name === 'DB')
+    const name = str.split(' {')[0]?.replace(/\s/g, '');
+    if (name === undefined || name === 'DB')
         return null;
     return name;
 }

package/dist/esm/src/cli/logger/loggable/colorize.js

@@ -1,5 +1,5 @@
 import c from 'yoctocolors';
-export default function colorize(text, { color, bgColor }) {
+export default function colorize(text, { color, bgColor, }) {
     const foregroundApplied = color ? c[color](text) : text;
     return bgColor ? c[bgColor](foregroundApplied) : foregroundApplied;
 }

package/dist/esm/src/db/DreamDbConnection.js

@@ -43,7 +43,7 @@ export default class DreamDbConnection {
     }
     static async dropAllConnections() {
         for (const key of Object.keys(connections)) {
-            await connections[key].destroy();
+            await connections[key]?.destroy();
             delete connections[key];
         }
     }

package/dist/esm/src/decorators/field/sortable/hooks/beforeSortableSave.js

@@ -6,9 +6,12 @@ export default async function beforeSortableSave({ positionField, dream, query,
     const cacheKey = sortableCacheKeyName(positionField);
     const cachedValuesName = sortableCacheValuesName(positionField);
     const dreamAsAny = dream;
-    const changingScope = scopeArray(scope).filter(scopeField => dream['getAssociationMetadata'](scopeField)
-        ? dream.willSaveChangeToAttribute(dream['getAssociationMetadata'](scopeField).foreignKey())
-        : dream.willSaveChangeToAttribute(scopeField)).length;
+    const changingScope = scopeArray(scope).filter(scopeField => {
+        const association = dream['getAssociationMetadata'](scopeField);
+        return association
+            ? dream.willSaveChangeToAttribute(association.foreignKey())
+            : dream.willSaveChangeToAttribute(scopeField);
+    }).length;
     if (!dream.willSaveChangeToAttribute(positionField) && !changingScope)
         return;
     const onlyChangingScope = !dream.willSaveChangeToAttribute(positionField) && changingScope;

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

@@ -209,7 +209,7 @@ export default class DreamInstanceTransactionBuilder {
      */
     async update(attributes, { skipHooks } = {}) {
         this.dreamInstance.assignAttributes(attributes);
-        await saveDream(this.dreamInstance, this.dreamTransaction, { skipHooks });
+        await saveDream(this.dreamInstance, this.dreamTransaction, skipHooks ? { skipHooks } : undefined);
     }
     /**
      * Applies all attribute changes passed to the dream,
@@ -237,7 +237,7 @@ export default class DreamInstanceTransactionBuilder {
      */
     async updateAttributes(attributes, { skipHooks } = {}) {
         this.dreamInstance.setAttributes(attributes);
-        await saveDream(this.dreamInstance, this.dreamTransaction, { skipHooks });
+        await saveDream(this.dreamInstance, this.dreamTransaction, skipHooks ? { skipHooks } : undefined);
     }
     /**
      * Reloads an instance, refreshing all it's attribute values
@@ -292,7 +292,7 @@ export default class DreamInstanceTransactionBuilder {
      * @returns void
      */
     async save({ skipHooks } = {}) {
-        await saveDream(this.dreamInstance, this.dreamTransaction, { skipHooks });
+        await saveDream(this.dreamInstance, this.dreamTransaction, skipHooks ? { skipHooks } : undefined);
     }
     /**
      * Returns a Query instance for the specified

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

@@ -1,3 +1,4 @@
+import UnexpectedUndefined from '../errors/UnexpectedUndefined.js';
 export default class LeftJoinLoadBuilder {
     dream;
     dreamTransaction;
@@ -61,7 +62,10 @@ export default class LeftJoinLoadBuilder {
         }
         const dreamWithLoadedAssociations = await this.query.firstOrFail();
         Object.keys(this.query['leftJoinStatements']).forEach(associationName => {
-            this.query['hydrateAssociation']([this.dream], this.dream['getAssociationMetadata'](associationName), this.associationToPreloadedDreamsAndWhatTheyPointTo({
+            const associationMetadata = this.dream['getAssociationMetadata'](associationName);
+            if (associationMetadata === undefined)
+                throw new UnexpectedUndefined();
+            this.query['hydrateAssociation']([this.dream], associationMetadata, this.associationToPreloadedDreamsAndWhatTheyPointTo({
                 pointsToPrimaryKey: this.dream.primaryKeyValue,
                 associatedModels: dreamWithLoadedAssociations[associationName],
             }));