@rvoh/dream 2.16.0 → 2.17.0

package/dist/cjs/src/db/migration-helpers/DreamMigrationHelpers.js

@@ -7,9 +7,12 @@ export default class DreamMigrationHelpers {
      * This method renames the table, its primary key index (`{tablename}_pkey`),
      * and its primary key sequence (`{tablename}_id_seq`) to keep them in sync.
      *
-     * The sequence rename is skipped for tables with UUID primary keys (which have
-     * no associated sequence). The primary key index is always renamed since
-     * PostgreSQL does not automatically rename it when the table is renamed.
+     * The sequence rename applies to both legacy `serial`/`bigserial` columns and
+     * modern `GENERATED ... AS IDENTITY` columns: identity columns are also backed
+     * by a `{tablename}_id_seq` sequence, so they need the same rename. It is
+     * skipped only for tables with UUID primary keys (which have no associated
+     * sequence). The primary key index is always renamed since PostgreSQL does not
+     * automatically rename it when the table is renamed.
      *
      * @param db - The Kysely database object passed into the migration up/down function
      * @param from - The current name of the table to rename

package/dist/cjs/src/decorators/class/STI.js

@@ -1,11 +1,14 @@
 import StiChildCannotDefineNewAssociations from '../../errors/sti/StiChildCannotDefineNewAssociations.js';
 import StiChildIncompatibleWithReplicaSafeDecorator from '../../errors/sti/StiChildIncompatibleWithReplicaSafeDecorator.js';
 import StiChildIncompatibleWithSoftDeleteDecorator from '../../errors/sti/StiChildIncompatibleWithSoftDeleteDecorator.js';
+import { associationDeclarationNamesFromMetadata } from '../field/association/shared.js';
 import { scopeImplementation } from '../static-method/Scope.js';
 export const STI_SCOPE_NAME = 'dream:STI';
 export default function STI(dreamClass) {
-    return function (stiChildClass) {
+    return function (stiChildClass, context) {
         const baseClass = dreamClass['sti'].baseClass || dreamClass;
+        if (associationDeclarationNamesFromMetadata(context?.metadata).length)
+            throw new StiChildCannotDefineNewAssociations(baseClass, stiChildClass);
         if (Object.getOwnPropertyDescriptor(stiChildClass, 'replicaSafe'))
             throw new StiChildIncompatibleWithReplicaSafeDecorator(stiChildClass);
         if (Object.getOwnPropertyDescriptor(stiChildClass, 'softDelete'))
@@ -26,34 +29,3 @@ export default function STI(dreamClass) {
         scopeImplementation(stiChildClass, STI_SCOPE_NAME, { default: true });
     };
 }
-export function validateStiChildAssociations(dreamClasses) {
-    dreamClasses.forEach(dreamClass => {
-        if (!dreamClass?.isDream)
-            return;
-        if (!dreamClass['sti'].active)
-            return;
-        const baseClass = dreamClass['sti'].baseClass;
-        if (!baseClass)
-            return;
-        if (hasAssociationsUnavailableOnBase(baseClass, dreamClass))
-            throw new StiChildCannotDefineNewAssociations(baseClass, dreamClass);
-    });
-}
-function hasAssociationsUnavailableOnBase(baseClass, stiChildClass) {
-    const baseAssociationKeys = associationKeysByTypeAndName(baseClass['associationMetadataByType']);
-    const childAssociationKeys = associationKeysByTypeAndName(stiChildClass['associationMetadataByType']);
-    for (const associationKey of childAssociationKeys) {
-        if (!baseAssociationKeys.has(associationKey))
-            return true;
-    }
-    return false;
-}
-function associationKeysByTypeAndName(associationMetadataByType) {
-    const res = new Set();
-    Object.entries(associationMetadataByType).forEach(([associationType, associations]) => {
-        associations.forEach((association) => {
-            res.add(`${associationType}:${association.as}`);
-        });
-    });
-    return res;
-}

package/dist/cjs/src/decorators/class/SoftDelete.js

@@ -14,7 +14,7 @@ export const SOFT_DELETE_SCOPE_NAME = 'dream:SoftDelete';
  * export async function up(db: Kysely<any>): Promise<void> {
  *   await db.schema
  *     .createTable('posts')
- *     .addColumn('id', 'bigserial', col => col.primaryKey())
+ *     .addColumn('id', 'bigint', col => col.primaryKey().generatedByDefaultAsIdentity())
  *     .addColumn('deleted_at', 'timestamp', col => col.defaultTo(null))
  *     .addColumn('created_at', 'timestamp', col => col.notNull())
  *     .addColumn('updated_at', 'timestamp', col => col.notNull())

package/dist/cjs/src/decorators/field/association/BelongsTo.js

@@ -1,7 +1,7 @@
 import lookupModelByGlobalNameOrNames from '../../../dream-app/helpers/lookupModelByGlobalNameOrNames.js';
 import ArrayTargetOnlyOnPolymorphicBelongsTo from '../../../errors/associations/ArrayTargetOnlyOnPolymorphicBelongsTo.js';
 import { validatesImplementation } from '../validation/Validates.js';
-import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, } from './shared.js';
+import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, markAssociationDeclaration, } from './shared.js';
 /**
  * Establishes a "BelongsTo" association between the base dream
  * and the child dream, where the base dream has a foreign key
@@ -56,6 +56,7 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
 export default function BelongsTo(globalAssociationNameOrNames, opts = {}) {
     const { on: foreignKey, optional = false, polymorphic = false, primaryKeyOverride = null, withoutDefaultScopes, } = opts;
     return function (_, context) {
+        markAssociationDeclaration(context);
         const key = context.name;
         context.addInitializer(function () {
             const target = this;
@@ -93,6 +94,10 @@ export default function BelongsTo(globalAssociationNameOrNames, opts = {}) {
                     return foreignKeyTypeField(foreignKey, dreamClass, partialAssociation);
                 },
             };
+            if (dreamClass['isSTIChild']) {
+                applyGetterAndSetter(target, association, { isBelongsTo: true, foreignKeyBase: foreignKey });
+                return;
+            }
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'associationMetadataByType'))
                 dreamClass['associationMetadataByType'] = blankAssociationsFactory(dreamClass);
             dreamClass['associationMetadataByType']['belongsTo'].push(association);

package/dist/cjs/src/decorators/field/association/HasMany.js

@@ -1,5 +1,5 @@
 import lookupModelByGlobalNameOrNames from '../../../dream-app/helpers/lookupModelByGlobalNameOrNames.js';
-import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, validateHasStatementArgs, } from './shared.js';
+import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, markAssociationDeclaration, validateHasStatementArgs, } from './shared.js';
 /**
  * Establishes a "HasMany" association between the base dream
  * and the child dream, where the child dream has a foreign key
@@ -36,6 +36,7 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
 export default function HasMany(globalAssociationNameOrNames, opts = {}) {
     const { dependent, distinct, on: foreignKey, and, andNot, andAny, order, polymorphic = false, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
     return function (_, context) {
+        markAssociationDeclaration(context);
         const key = context.name;
         context.addInitializer(function () {
             const target = this;
@@ -86,6 +87,10 @@ export default function HasMany(globalAssociationNameOrNames, opts = {}) {
                     return foreignKeyTypeField(foreignKey, dreamClass, partialAssociation);
                 },
             };
+            if (dreamClass['isSTIChild']) {
+                applyGetterAndSetter(target, association);
+                return;
+            }
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'associationMetadataByType'))
                 dreamClass['associationMetadataByType'] = blankAssociationsFactory(dreamClass);
             dreamClass['associationMetadataByType']['hasMany'].push(association);

package/dist/cjs/src/decorators/field/association/HasOne.js

@@ -1,5 +1,5 @@
 import lookupModelByGlobalNameOrNames from '../../../dream-app/helpers/lookupModelByGlobalNameOrNames.js';
-import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, validateHasStatementArgs, } from './shared.js';
+import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, markAssociationDeclaration, validateHasStatementArgs, } from './shared.js';
 /**
  * Establishes a "HasOne" association between the base dream
  * and the child dream, where the child dream has a foreign key
@@ -34,6 +34,7 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
 export default function HasOne(globalAssociationNameOrNames, opts = {}) {
     const { dependent, on: foreignKey, and, andNot, andAny, polymorphic = false, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
     return function (_, context) {
+        markAssociationDeclaration(context);
         const key = context.name;
         context.addInitializer(function () {
             const target = this;
@@ -82,6 +83,10 @@ export default function HasOne(globalAssociationNameOrNames, opts = {}) {
                     return foreignKeyTypeField(foreignKey, dreamClass, partialAssociation);
                 },
             };
+            if (dreamClass['isSTIChild']) {
+                applyGetterAndSetter(target, association);
+                return;
+            }
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'associationMetadataByType'))
                 dreamClass['associationMetadataByType'] = blankAssociationsFactory(dreamClass);
             dreamClass['associationMetadataByType']['hasOne'].push(association);

package/dist/cjs/src/decorators/field/association/shared.js

@@ -8,6 +8,22 @@ import CannotDefineAssociationWithBothDependentAndRequiredAndClause from '../../
 import camelize from '../../../helpers/camelize.js';
 import freezeBaseClassArrayMap from '../../helpers/freezeBaseClassArrayMap.js';
 import associationToGetterSetterProp from './associationToGetterSetterProp.js';
+export const ASSOCIATION_DECLARATION_METADATA_KEY = Symbol('dream:associationDeclarationNames');
+export function markAssociationDeclaration(context) {
+    const metadata = context.metadata;
+    if (!metadata)
+        return;
+    const existingDeclarationNames = Object.getOwnPropertyDescriptor(metadata, ASSOCIATION_DECLARATION_METADATA_KEY)?.value || [];
+    Object.defineProperty(metadata, ASSOCIATION_DECLARATION_METADATA_KEY, {
+        configurable: true,
+        value: [...existingDeclarationNames, context.name],
+    });
+}
+export function associationDeclarationNamesFromMetadata(metadata) {
+    if (!metadata)
+        return [];
+    return (Object.getOwnPropertyDescriptor(metadata, ASSOCIATION_DECLARATION_METADATA_KEY)?.value || []);
+}
 export function blankAssociationsFactory(dreamClass, { freeze = false, } = {}) {
     // This pattern allows associations to be defined on a base STI class and on
     // child STI classes. The new `associationsMap` property will be created

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

@@ -1,4 +1,4 @@
-export const primaryKeyTypes = ['uuid7', 'uuid4', 'bigserial', 'bigint', 'integer'];
+export const primaryKeyTypes = ['uuid7', 'uuid4', 'bigint', 'integer'];
 export const TRIGRAM_OPERATORS = ['%', '<%', '<<%'];
 export const RECURSIVE_SERIALIZATION_MAX_REPEATS = 4;
 export const RECURSIVE_DESTROY_PRELOAD_MAX_REPEATS = RECURSIVE_SERIALIZATION_MAX_REPEATS;

package/dist/cjs/src/dream-app/helpers/importers/importModels.js

@@ -1,5 +1,4 @@
 import Dream from '../../../Dream.js';
-import { validateStiChildAssociations } from '../../../decorators/class/STI.js';
 import DreamMissingRequiredOverride from '../../../errors/DreamMissingRequiredOverride.js';
 import DreamImporter from '../DreamImporter.js';
 import globalModelKeyFromPath from '../globalModelKeyFromPath.js';
@@ -67,7 +66,6 @@ async function importModelsUncached(modelsPath, modelImportCb) {
                 }
             }
         }
-        validateStiChildAssociations(modelClasses.map(([, modelClass]) => modelClass));
         _models = models;
         return _models;
     }

package/dist/cjs/src/dream-app/index.js

@@ -218,7 +218,7 @@ A new key can also be generated from the CLI:
     get paginationPageSize() {
         return this._paginationPageSize;
     }
-    _primaryKeyType = 'bigserial';
+    _primaryKeyType = 'bigint';
     get primaryKeyType() {
         return this._primaryKeyType;
     }

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

@@ -361,8 +361,12 @@ function generateIdStr({ primaryKeyType }) {
         .primaryKey()
         .defaultTo(sql\`uuid_generate_v4()\`),
     )`;
+        case 'integer':
+            return `.addColumn('id', 'integer', col => col.primaryKey().generatedByDefaultAsIdentity())`;
+        case 'bigint':
+        case 'bigserial':
         default:
-            return `.addColumn('id', '${primaryKeyType}', col => col.primaryKey())`;
+            return `.addColumn('id', 'bigint', col => col.primaryKey().generatedByDefaultAsIdentity())`;
     }
 }
 /**

package/dist/esm/src/db/migration-helpers/DreamMigrationHelpers.js

@@ -7,9 +7,12 @@ export default class DreamMigrationHelpers {
      * This method renames the table, its primary key index (`{tablename}_pkey`),
      * and its primary key sequence (`{tablename}_id_seq`) to keep them in sync.
      *
-     * The sequence rename is skipped for tables with UUID primary keys (which have
-     * no associated sequence). The primary key index is always renamed since
-     * PostgreSQL does not automatically rename it when the table is renamed.
+     * The sequence rename applies to both legacy `serial`/`bigserial` columns and
+     * modern `GENERATED ... AS IDENTITY` columns: identity columns are also backed
+     * by a `{tablename}_id_seq` sequence, so they need the same rename. It is
+     * skipped only for tables with UUID primary keys (which have no associated
+     * sequence). The primary key index is always renamed since PostgreSQL does not
+     * automatically rename it when the table is renamed.
      *
      * @param db - The Kysely database object passed into the migration up/down function
      * @param from - The current name of the table to rename

package/dist/esm/src/decorators/class/STI.js

@@ -1,11 +1,14 @@
 import StiChildCannotDefineNewAssociations from '../../errors/sti/StiChildCannotDefineNewAssociations.js';
 import StiChildIncompatibleWithReplicaSafeDecorator from '../../errors/sti/StiChildIncompatibleWithReplicaSafeDecorator.js';
 import StiChildIncompatibleWithSoftDeleteDecorator from '../../errors/sti/StiChildIncompatibleWithSoftDeleteDecorator.js';
+import { associationDeclarationNamesFromMetadata } from '../field/association/shared.js';
 import { scopeImplementation } from '../static-method/Scope.js';
 export const STI_SCOPE_NAME = 'dream:STI';
 export default function STI(dreamClass) {
-    return function (stiChildClass) {
+    return function (stiChildClass, context) {
         const baseClass = dreamClass['sti'].baseClass || dreamClass;
+        if (associationDeclarationNamesFromMetadata(context?.metadata).length)
+            throw new StiChildCannotDefineNewAssociations(baseClass, stiChildClass);
         if (Object.getOwnPropertyDescriptor(stiChildClass, 'replicaSafe'))
             throw new StiChildIncompatibleWithReplicaSafeDecorator(stiChildClass);
         if (Object.getOwnPropertyDescriptor(stiChildClass, 'softDelete'))
@@ -26,34 +29,3 @@ export default function STI(dreamClass) {
         scopeImplementation(stiChildClass, STI_SCOPE_NAME, { default: true });
     };
 }
-export function validateStiChildAssociations(dreamClasses) {
-    dreamClasses.forEach(dreamClass => {
-        if (!dreamClass?.isDream)
-            return;
-        if (!dreamClass['sti'].active)
-            return;
-        const baseClass = dreamClass['sti'].baseClass;
-        if (!baseClass)
-            return;
-        if (hasAssociationsUnavailableOnBase(baseClass, dreamClass))
-            throw new StiChildCannotDefineNewAssociations(baseClass, dreamClass);
-    });
-}
-function hasAssociationsUnavailableOnBase(baseClass, stiChildClass) {
-    const baseAssociationKeys = associationKeysByTypeAndName(baseClass['associationMetadataByType']);
-    const childAssociationKeys = associationKeysByTypeAndName(stiChildClass['associationMetadataByType']);
-    for (const associationKey of childAssociationKeys) {
-        if (!baseAssociationKeys.has(associationKey))
-            return true;
-    }
-    return false;
-}
-function associationKeysByTypeAndName(associationMetadataByType) {
-    const res = new Set();
-    Object.entries(associationMetadataByType).forEach(([associationType, associations]) => {
-        associations.forEach((association) => {
-            res.add(`${associationType}:${association.as}`);
-        });
-    });
-    return res;
-}

package/dist/esm/src/decorators/class/SoftDelete.js

@@ -14,7 +14,7 @@ export const SOFT_DELETE_SCOPE_NAME = 'dream:SoftDelete';
  * export async function up(db: Kysely<any>): Promise<void> {
  *   await db.schema
  *     .createTable('posts')
- *     .addColumn('id', 'bigserial', col => col.primaryKey())
+ *     .addColumn('id', 'bigint', col => col.primaryKey().generatedByDefaultAsIdentity())
  *     .addColumn('deleted_at', 'timestamp', col => col.defaultTo(null))
  *     .addColumn('created_at', 'timestamp', col => col.notNull())
  *     .addColumn('updated_at', 'timestamp', col => col.notNull())

package/dist/esm/src/decorators/field/association/BelongsTo.js

@@ -1,7 +1,7 @@
 import lookupModelByGlobalNameOrNames from '../../../dream-app/helpers/lookupModelByGlobalNameOrNames.js';
 import ArrayTargetOnlyOnPolymorphicBelongsTo from '../../../errors/associations/ArrayTargetOnlyOnPolymorphicBelongsTo.js';
 import { validatesImplementation } from '../validation/Validates.js';
-import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, } from './shared.js';
+import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, markAssociationDeclaration, } from './shared.js';
 /**
  * Establishes a "BelongsTo" association between the base dream
  * and the child dream, where the base dream has a foreign key
@@ -56,6 +56,7 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
 export default function BelongsTo(globalAssociationNameOrNames, opts = {}) {
     const { on: foreignKey, optional = false, polymorphic = false, primaryKeyOverride = null, withoutDefaultScopes, } = opts;
     return function (_, context) {
+        markAssociationDeclaration(context);
         const key = context.name;
         context.addInitializer(function () {
             const target = this;
@@ -93,6 +94,10 @@ export default function BelongsTo(globalAssociationNameOrNames, opts = {}) {
                     return foreignKeyTypeField(foreignKey, dreamClass, partialAssociation);
                 },
             };
+            if (dreamClass['isSTIChild']) {
+                applyGetterAndSetter(target, association, { isBelongsTo: true, foreignKeyBase: foreignKey });
+                return;
+            }
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'associationMetadataByType'))
                 dreamClass['associationMetadataByType'] = blankAssociationsFactory(dreamClass);
             dreamClass['associationMetadataByType']['belongsTo'].push(association);

package/dist/esm/src/decorators/field/association/HasMany.js

@@ -1,5 +1,5 @@
 import lookupModelByGlobalNameOrNames from '../../../dream-app/helpers/lookupModelByGlobalNameOrNames.js';
-import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, validateHasStatementArgs, } from './shared.js';
+import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, markAssociationDeclaration, validateHasStatementArgs, } from './shared.js';
 /**
  * Establishes a "HasMany" association between the base dream
  * and the child dream, where the child dream has a foreign key
@@ -36,6 +36,7 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
 export default function HasMany(globalAssociationNameOrNames, opts = {}) {
     const { dependent, distinct, on: foreignKey, and, andNot, andAny, order, polymorphic = false, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
     return function (_, context) {
+        markAssociationDeclaration(context);
         const key = context.name;
         context.addInitializer(function () {
             const target = this;
@@ -86,6 +87,10 @@ export default function HasMany(globalAssociationNameOrNames, opts = {}) {
                     return foreignKeyTypeField(foreignKey, dreamClass, partialAssociation);
                 },
             };
+            if (dreamClass['isSTIChild']) {
+                applyGetterAndSetter(target, association);
+                return;
+            }
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'associationMetadataByType'))
                 dreamClass['associationMetadataByType'] = blankAssociationsFactory(dreamClass);
             dreamClass['associationMetadataByType']['hasMany'].push(association);

package/dist/esm/src/decorators/field/association/HasOne.js

@@ -1,5 +1,5 @@
 import lookupModelByGlobalNameOrNames from '../../../dream-app/helpers/lookupModelByGlobalNameOrNames.js';
-import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, validateHasStatementArgs, } from './shared.js';
+import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, markAssociationDeclaration, validateHasStatementArgs, } from './shared.js';
 /**
  * Establishes a "HasOne" association between the base dream
  * and the child dream, where the child dream has a foreign key
@@ -34,6 +34,7 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
 export default function HasOne(globalAssociationNameOrNames, opts = {}) {
     const { dependent, on: foreignKey, and, andNot, andAny, polymorphic = false, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
     return function (_, context) {
+        markAssociationDeclaration(context);
         const key = context.name;
         context.addInitializer(function () {
             const target = this;
@@ -82,6 +83,10 @@ export default function HasOne(globalAssociationNameOrNames, opts = {}) {
                     return foreignKeyTypeField(foreignKey, dreamClass, partialAssociation);
                 },
             };
+            if (dreamClass['isSTIChild']) {
+                applyGetterAndSetter(target, association);
+                return;
+            }
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'associationMetadataByType'))
                 dreamClass['associationMetadataByType'] = blankAssociationsFactory(dreamClass);
             dreamClass['associationMetadataByType']['hasOne'].push(association);

package/dist/esm/src/decorators/field/association/shared.js

@@ -8,6 +8,22 @@ import CannotDefineAssociationWithBothDependentAndRequiredAndClause from '../../
 import camelize from '../../../helpers/camelize.js';
 import freezeBaseClassArrayMap from '../../helpers/freezeBaseClassArrayMap.js';
 import associationToGetterSetterProp from './associationToGetterSetterProp.js';
+export const ASSOCIATION_DECLARATION_METADATA_KEY = Symbol('dream:associationDeclarationNames');
+export function markAssociationDeclaration(context) {
+    const metadata = context.metadata;
+    if (!metadata)
+        return;
+    const existingDeclarationNames = Object.getOwnPropertyDescriptor(metadata, ASSOCIATION_DECLARATION_METADATA_KEY)?.value || [];
+    Object.defineProperty(metadata, ASSOCIATION_DECLARATION_METADATA_KEY, {
+        configurable: true,
+        value: [...existingDeclarationNames, context.name],
+    });
+}
+export function associationDeclarationNamesFromMetadata(metadata) {
+    if (!metadata)
+        return [];
+    return (Object.getOwnPropertyDescriptor(metadata, ASSOCIATION_DECLARATION_METADATA_KEY)?.value || []);
+}
 export function blankAssociationsFactory(dreamClass, { freeze = false, } = {}) {
     // This pattern allows associations to be defined on a base STI class and on
     // child STI classes. The new `associationsMap` property will be created

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

@@ -1,4 +1,4 @@
-export const primaryKeyTypes = ['uuid7', 'uuid4', 'bigserial', 'bigint', 'integer'];
+export const primaryKeyTypes = ['uuid7', 'uuid4', 'bigint', 'integer'];
 export const TRIGRAM_OPERATORS = ['%', '<%', '<<%'];
 export const RECURSIVE_SERIALIZATION_MAX_REPEATS = 4;
 export const RECURSIVE_DESTROY_PRELOAD_MAX_REPEATS = RECURSIVE_SERIALIZATION_MAX_REPEATS;

package/dist/esm/src/dream-app/helpers/importers/importModels.js

@@ -1,5 +1,4 @@
 import Dream from '../../../Dream.js';
-import { validateStiChildAssociations } from '../../../decorators/class/STI.js';
 import DreamMissingRequiredOverride from '../../../errors/DreamMissingRequiredOverride.js';
 import DreamImporter from '../DreamImporter.js';
 import globalModelKeyFromPath from '../globalModelKeyFromPath.js';
@@ -67,7 +66,6 @@ async function importModelsUncached(modelsPath, modelImportCb) {
                 }
             }
         }
-        validateStiChildAssociations(modelClasses.map(([, modelClass]) => modelClass));
         _models = models;
         return _models;
     }

package/dist/esm/src/dream-app/index.js

@@ -218,7 +218,7 @@ A new key can also be generated from the CLI:
     get paginationPageSize() {
         return this._paginationPageSize;
     }
-    _primaryKeyType = 'bigserial';
+    _primaryKeyType = 'bigint';
     get primaryKeyType() {
         return this._primaryKeyType;
     }

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

@@ -361,8 +361,12 @@ function generateIdStr({ primaryKeyType }) {
         .primaryKey()
         .defaultTo(sql\`uuid_generate_v4()\`),
     )`;
+        case 'integer':
+            return `.addColumn('id', 'integer', col => col.primaryKey().generatedByDefaultAsIdentity())`;
+        case 'bigint':
+        case 'bigserial':
         default:
-            return `.addColumn('id', '${primaryKeyType}', col => col.primaryKey())`;
+            return `.addColumn('id', 'bigint', col => col.primaryKey().generatedByDefaultAsIdentity())`;
     }
 }
 /**

package/dist/types/src/db/migration-helpers/DreamMigrationHelpers.d.ts

@@ -6,9 +6,12 @@ export default class DreamMigrationHelpers {
      * This method renames the table, its primary key index (`{tablename}_pkey`),
      * and its primary key sequence (`{tablename}_id_seq`) to keep them in sync.
      *
-     * The sequence rename is skipped for tables with UUID primary keys (which have
-     * no associated sequence). The primary key index is always renamed since
-     * PostgreSQL does not automatically rename it when the table is renamed.
+     * The sequence rename applies to both legacy `serial`/`bigserial` columns and
+     * modern `GENERATED ... AS IDENTITY` columns: identity columns are also backed
+     * by a `{tablename}_id_seq` sequence, so they need the same rename. It is
+     * skipped only for tables with UUID primary keys (which have no associated
+     * sequence). The primary key index is always renamed since PostgreSQL does not
+     * automatically rename it when the table is renamed.
      *
      * @param db - The Kysely database object passed into the migration up/down function
      * @param from - The current name of the table to rename

package/dist/types/src/decorators/class/STI.d.ts

@@ -1,4 +1,3 @@
 import Dream from '../../Dream.js';
 export declare const STI_SCOPE_NAME = "dream:STI";
-export default function STI(dreamClass: typeof Dream): (stiChildClass: typeof Dream) => void;
-export declare function validateStiChildAssociations(dreamClasses: (typeof Dream)[]): void;
+export default function STI(dreamClass: typeof Dream): (stiChildClass: typeof Dream, context?: ClassDecoratorContext) => void;

package/dist/types/src/decorators/class/SoftDelete.d.ts

@@ -13,7 +13,7 @@ export declare const SOFT_DELETE_SCOPE_NAME = "dream:SoftDelete";
  * export async function up(db: Kysely<any>): Promise<void> {
  *   await db.schema
  *     .createTable('posts')
- *     .addColumn('id', 'bigserial', col => col.primaryKey())
+ *     .addColumn('id', 'bigint', col => col.primaryKey().generatedByDefaultAsIdentity())
  *     .addColumn('deleted_at', 'timestamp', col => col.defaultTo(null))
  *     .addColumn('created_at', 'timestamp', col => col.notNull())
  *     .addColumn('updated_at', 'timestamp', col => col.notNull())

package/dist/types/src/decorators/field/association/shared.d.ts

@@ -1,5 +1,9 @@
 import Dream from '../../../Dream.js';
 import { AssociationStatementsMap, DependentOptions, PartialAssociationStatement } from '../../../types/associations/shared.js';
+import { DecoratorContext } from '../../DecoratorContextType.js';
+export declare const ASSOCIATION_DECLARATION_METADATA_KEY: unique symbol;
+export declare function markAssociationDeclaration(context: DecoratorContext): void;
+export declare function associationDeclarationNamesFromMetadata(metadata: unknown): any;
 export declare function blankAssociationsFactory(dreamClass: typeof Dream, { freeze, }?: {
     freeze?: boolean;
 }): AssociationStatementsMap;

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

@@ -1,4 +1,4 @@
-export declare const primaryKeyTypes: readonly ["uuid7", "uuid4", "bigserial", "bigint", "integer"];
+export declare const primaryKeyTypes: readonly ["uuid7", "uuid4", "bigint", "integer"];
 export declare const TRIGRAM_OPERATORS: readonly ["%", "<%", "<<%"];
 export declare const RECURSIVE_SERIALIZATION_MAX_REPEATS = 4;
 export declare const RECURSIVE_DESTROY_PRELOAD_MAX_REPEATS = 4;

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

@@ -8,5 +8,5 @@ type valueof<T> = T[keyof T];
 export type NonArrayDbTypes = (typeof postgresDatatypes)[number];
 export type DbTypes = NonArrayDbTypes | `${NonArrayDbTypes}[]`;
 export type PrimaryKeyType = (typeof primaryKeyTypes)[number];
-export type LegacyCompatiblePrimaryKeyType = PrimaryKeyType | 'uuid';
+export type LegacyCompatiblePrimaryKeyType = PrimaryKeyType | 'uuid' | 'bigserial';
 export {};

package/dist/types/src/types/types/db.ts

@@ -14,4 +14,4 @@ type valueof<T> = T[keyof T]
 export type NonArrayDbTypes = (typeof postgresDatatypes)[number]
 export type DbTypes = NonArrayDbTypes | `${NonArrayDbTypes}[]`
 export type PrimaryKeyType = (typeof primaryKeyTypes)[number]
-export type LegacyCompatiblePrimaryKeyType = PrimaryKeyType | 'uuid'
+export type LegacyCompatiblePrimaryKeyType = PrimaryKeyType | 'uuid' | 'bigserial'