@payloadcms/drizzle 4.0.0-internal.77191e5 → 4.0.0-internal.7d5c665

package/dist/utilities/buildDynamicPredefinedSizesToVariantsMigration.js

@@ -0,0 +1,110 @@
+import { randomUUID } from 'crypto';
+import { readdirSync, readFileSync, writeFileSync } from 'fs';
+import { findSizesToVariantsFieldCollision, getSizesToVariantsRenames } from './getSizesToVariantsRenames.js';
+/**
+ * Builds the `sizes-to-variants` predefined migration for a SQL adapter. The migration renames
+ * columns rather than letting drizzle-kit diff the schema (which would drop and re-add them,
+ * losing every stored image size).
+ *
+ * It also writes a schema snapshot: the project's previous snapshot with only these renames
+ * applied. The next generated migration then diffs from the renamed columns instead of dropping
+ * them, and still picks up every other schema change the upgrade brings. Without a previous
+ * snapshot (a project that has only ever used `push`) there's nothing to update, so none is written.
+ */ export const buildDynamicPredefinedSizesToVariantsMigration = ({ packageName })=>{
+    return async ({ filePath, payload })=>{
+        const adapter = payload.db;
+        const previousSnapshot = await readLatestSnapshot({
+            adapter
+        });
+        if (previousSnapshot) {
+            const renamedSnapshot = applySizesToVariantsRenames({
+                plan: getSizesToVariantsRenames({
+                    adapter,
+                    direction: 'up'
+                }),
+                snapshot: previousSnapshot
+            });
+            writeFileSync(`${filePath}.json`, JSON.stringify(renamedSnapshot, null, 2));
+        }
+        return {
+            downSQL: `  await migrateSizesToVariants({ db, direction: 'down', payload })`,
+            imports: `import { migrateSizesToVariants } from '${packageName}/migration-utils'`,
+            upSQL: `  await migrateSizesToVariants({ db, payload })`
+        };
+    };
+};
+/** The latest snapshot in the migrations directory, upgraded to drizzle-kit's current format. */ async function readLatestSnapshot({ adapter }) {
+    const dir = adapter.migrationDir;
+    const latestSnapshotFile = readdirSync(dir).filter((file)=>file.endsWith('.json')).sort().reverse()[0];
+    if (!latestSnapshotFile) {
+        return undefined;
+    }
+    const { generateDrizzleJson, upSnapshot } = adapter.requireDrizzleKit();
+    const currentVersion = (await generateDrizzleJson(adapter.schema)).version;
+    const snapshot = JSON.parse(readFileSync(`${dir}/${latestSnapshotFile}`, 'utf8'));
+    return upSnapshot && snapshot.version < currentVersion ? upSnapshot(snapshot) : snapshot;
+}
+function applySizesToVariantsRenames({ plan, snapshot }) {
+    const renamed = structuredClone(snapshot);
+    for (const { columns, indexes, tableName } of plan){
+        const table = Object.values(renamed.tables).find(({ name })=>name === tableName);
+        if (!table) {
+            continue;
+        }
+        const existingColumns = new Set(Object.values(table.columns).map(({ name })=>name));
+        for (const { from, to } of columns){
+            if (existingColumns.has(from) && existingColumns.has(to)) {
+                throw new Error(`Cannot create the sizes-to-variants migration because snapshot table "${tableName}" contains both "${from}" and "${to}". Move or rename the existing destination data before creating this migration.`);
+            }
+        }
+        const fieldCollision = findSizesToVariantsFieldCollision({
+            columns,
+            existingColumns
+        });
+        if (fieldCollision) {
+            throw new Error(`Cannot create the sizes-to-variants migration because snapshot table "${tableName}" contains both the "${fieldCollision.from}" and "${fieldCollision.to}" fields. Move or rename the existing destination data before creating this migration.`);
+        }
+        for (const { from, to } of columns){
+            const column = table.columns[from];
+            if (column) {
+                if (table.columns[to]) {
+                    throw new Error(`Cannot create the sizes-to-variants migration because snapshot table "${tableName}" contains both "${from}" and "${to}". Move or rename the existing destination data before creating this migration.`);
+                }
+                delete table.columns[from];
+                table.columns[to] = {
+                    ...column,
+                    name: to
+                };
+            }
+        }
+        for (const [key, index] of Object.entries(table.indexes ?? {})){
+            const indexColumns = index.columns.map((column)=>{
+                const name = typeof column === 'string' ? column : column.expression;
+                const renamedName = columns.find(({ from })=>from === name)?.to ?? name;
+                return typeof column === 'string' ? renamedName : {
+                    ...column,
+                    expression: renamedName
+                };
+            });
+            const indexColumnNames = indexColumns.map((column)=>typeof column === 'string' ? column : column.expression);
+            const target = indexes.find((planned)=>planned.columns.join(',') === indexColumnNames.join(','));
+            if (!target) {
+                continue;
+            }
+            if (key !== target.to && table.indexes?.[target.to]) {
+                throw new Error(`Cannot create the sizes-to-variants migration because snapshot table "${tableName}" contains both indexes "${key}" and "${target.to}". Move or rename the existing destination index before creating this migration.`);
+            }
+            delete table.indexes[key];
+            table.indexes[target.to] = {
+                ...index,
+                name: target.to,
+                columns: indexColumns
+            };
+        }
+    }
+    renamed.prevId = snapshot.id;
+    renamed.id = randomUUID();
+    return renamed;
+}
+
+//# sourceMappingURL=buildDynamicPredefinedSizesToVariantsMigration.js.map

package/dist/utilities/buildDynamicPredefinedSizesToVariantsMigration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/buildDynamicPredefinedSizesToVariantsMigration.ts"],"sourcesContent":["import type { DynamicMigrationTemplate } from 'payload'\n\nimport { randomUUID } from 'crypto'\nimport { readdirSync, readFileSync, writeFileSync } from 'fs'\n\nimport type { DrizzleAdapter } from '../types.js'\nimport type { SizesToVariantsTableRenames } from './getSizesToVariantsRenames.js'\n\nimport {\n  findSizesToVariantsFieldCollision,\n  getSizesToVariantsRenames,\n} from './getSizesToVariantsRenames.js'\n\ntype SnapshotIndex = {\n  columns: ({ expression: string } | string)[]\n  name: string\n}\n\ntype SnapshotTable = {\n  columns: Record<string, { name: string }>\n  indexes?: Record<string, SnapshotIndex>\n  name: string\n}\n\ntype Snapshot = {\n  id?: string\n  prevId?: string\n  tables: Record<string, SnapshotTable>\n  version: string\n}\n\n/**\n * Builds the `sizes-to-variants` predefined migration for a SQL adapter. The migration renames\n * columns rather than letting drizzle-kit diff the schema (which would drop and re-add them,\n * losing every stored image size).\n *\n * It also writes a schema snapshot: the project's previous snapshot with only these renames\n * applied. The next generated migration then diffs from the renamed columns instead of dropping\n * them, and still picks up every other schema change the upgrade brings. Without a previous\n * snapshot (a project that has only ever used `push`) there's nothing to update, so none is written.\n */\nexport const buildDynamicPredefinedSizesToVariantsMigration = ({\n  packageName,\n}: {\n  packageName: string\n}): DynamicMigrationTemplate => {\n  return async ({ filePath, payload }) => {\n    const adapter = payload.db as unknown as DrizzleAdapter\n    const previousSnapshot = await readLatestSnapshot({ adapter })\n\n    if (previousSnapshot) {\n      const renamedSnapshot = applySizesToVariantsRenames({\n        plan: getSizesToVariantsRenames({ adapter, direction: 'up' }),\n        snapshot: previousSnapshot,\n      })\n\n      writeFileSync(`${filePath}.json`, JSON.stringify(renamedSnapshot, null, 2))\n    }\n\n    return {\n      downSQL: `  await migrateSizesToVariants({ db, direction: 'down', payload })`,\n      imports: `import { migrateSizesToVariants } from '${packageName}/migration-utils'`,\n      upSQL: `  await migrateSizesToVariants({ db, payload })`,\n    }\n  }\n}\n\n/** The latest snapshot in the migrations directory, upgraded to drizzle-kit's current format. */\nasync function readLatestSnapshot({\n  adapter,\n}: {\n  adapter: DrizzleAdapter\n}): Promise<Snapshot | undefined> {\n  const dir = adapter.migrationDir\n  const latestSnapshotFile = readdirSync(dir)\n    .filter((file) => file.endsWith('.json'))\n    .sort()\n    .reverse()[0]\n\n  if (!latestSnapshotFile) {\n    return undefined\n  }\n\n  const { generateDrizzleJson, upSnapshot } = adapter.requireDrizzleKit()\n  const currentVersion = (await generateDrizzleJson(adapter.schema)).version\n  const snapshot = JSON.parse(readFileSync(`${dir}/${latestSnapshotFile}`, 'utf8')) as Snapshot\n\n  return upSnapshot && snapshot.version < currentVersion ? upSnapshot(snapshot) : snapshot\n}\n\nfunction applySizesToVariantsRenames({\n  plan,\n  snapshot,\n}: {\n  plan: SizesToVariantsTableRenames[]\n  snapshot: Snapshot\n}): Snapshot {\n  const renamed: Snapshot = structuredClone(snapshot)\n\n  for (const { columns, indexes, tableName } of plan) {\n    const table = Object.values(renamed.tables).find(({ name }) => name === tableName)\n\n    if (!table) {\n      continue\n    }\n\n    const existingColumns = new Set(Object.values(table.columns).map(({ name }) => name))\n\n    for (const { from, to } of columns) {\n      if (existingColumns.has(from) && existingColumns.has(to)) {\n        throw new Error(\n          `Cannot create the sizes-to-variants migration because snapshot table \"${tableName}\" contains both \"${from}\" and \"${to}\". Move or rename the existing destination data before creating this migration.`,\n        )\n      }\n    }\n\n    const fieldCollision = findSizesToVariantsFieldCollision({ columns, existingColumns })\n\n    if (fieldCollision) {\n      throw new Error(\n        `Cannot create the sizes-to-variants migration because snapshot table \"${tableName}\" contains both the \"${fieldCollision.from}\" and \"${fieldCollision.to}\" fields. Move or rename the existing destination data before creating this migration.`,\n      )\n    }\n\n    for (const { from, to } of columns) {\n      const column = table.columns[from]\n\n      if (column) {\n        if (table.columns[to]) {\n          throw new Error(\n            `Cannot create the sizes-to-variants migration because snapshot table \"${tableName}\" contains both \"${from}\" and \"${to}\". Move or rename the existing destination data before creating this migration.`,\n          )\n        }\n\n        delete table.columns[from]\n        table.columns[to] = { ...column, name: to }\n      }\n    }\n\n    for (const [key, index] of Object.entries(table.indexes ?? {})) {\n      const indexColumns = index.columns.map((column) => {\n        const name = typeof column === 'string' ? column : column.expression\n        const renamedName = columns.find(({ from }) => from === name)?.to ?? name\n\n        return typeof column === 'string' ? renamedName : { ...column, expression: renamedName }\n      })\n      const indexColumnNames = indexColumns.map((column) =>\n        typeof column === 'string' ? column : column.expression,\n      )\n      const target = indexes.find(\n        (planned) => planned.columns.join(',') === indexColumnNames.join(','),\n      )\n\n      if (!target) {\n        continue\n      }\n\n      if (key !== target.to && table.indexes?.[target.to]) {\n        throw new Error(\n          `Cannot create the sizes-to-variants migration because snapshot table \"${tableName}\" contains both indexes \"${key}\" and \"${target.to}\". Move or rename the existing destination index before creating this migration.`,\n        )\n      }\n\n      delete table.indexes[key]\n      table.indexes[target.to] = { ...index, name: target.to, columns: indexColumns }\n    }\n  }\n\n  renamed.prevId = snapshot.id\n  renamed.id = randomUUID()\n\n  return renamed\n}\n"],"names":["randomUUID","readdirSync","readFileSync","writeFileSync","findSizesToVariantsFieldCollision","getSizesToVariantsRenames","buildDynamicPredefinedSizesToVariantsMigration","packageName","filePath","payload","adapter","db","previousSnapshot","readLatestSnapshot","renamedSnapshot","applySizesToVariantsRenames","plan","direction","snapshot","JSON","stringify","downSQL","imports","upSQL","dir","migrationDir","latestSnapshotFile","filter","file","endsWith","sort","reverse","undefined","generateDrizzleJson","upSnapshot","requireDrizzleKit","currentVersion","schema","version","parse","renamed","structuredClone","columns","indexes","tableName","table","Object","values","tables","find","name","existingColumns","Set","map","from","to","has","Error","fieldCollision","column","key","index","entries","indexColumns","expression","renamedName","indexColumnNames","target","planned","join","prevId","id"],"mappings":"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"}

package/dist/utilities/getSizesToVariantsRenames.d.ts

@@ -0,0 +1,54 @@
+import type { DrizzleAdapter } from '../types.js';
+export type SizesToVariantsDirection = 'down' | 'up';
+export type SizesToVariantsColumnRename = {
+    from: string;
+    to: string;
+};
+export type SizesToVariantsIndexRename = {
+    /** Columns the index covers, named as they are after the column renames. */
+    columns: string[];
+    /** The index name to rename from on `down`. The generated legacy name is resolved on `up`. */
+    from?: string;
+    /** Base used to verify a generated legacy index name, including a possible numeric suffix. */
+    legacyNameBase?: string;
+    to: string;
+    unique: boolean;
+};
+export type SizesToVariantsTableRenames = {
+    columns: SizesToVariantsColumnRename[];
+    indexes: SizesToVariantsIndexRename[];
+    tableName: string;
+};
+export declare function findSizesToVariantsFieldCollision({ columns, existingColumns, }: {
+    columns: SizesToVariantsColumnRename[];
+    existingColumns: Set<string>;
+}): {
+    from: string;
+    to: string;
+} | undefined;
+export declare function assertNoSizesToVariantsColumnCollisions({ columns, existingColumns, tableName, }: {
+    columns: SizesToVariantsColumnRename[];
+    existingColumns: Set<string>;
+    tableName: string;
+}): void;
+/**
+ * Plans the column and index renames that move every upload collection's stored image sizes
+ * between the legacy `sizes` group and `variants`. Reads the current (`variants`) schema the
+ * adapter built from the config, so it covers each collection's main and versions tables without
+ * re-deriving Payload's column naming.
+ *
+ * Index names come from the schema on `up`, and on `down` are rebuilt the way `buildIndexName`
+ * named them before the rename. The runner still has to locate the verified generated legacy name
+ * on `up`, since it may have a numeric suffix that keeps the name unique.
+ */
+export declare function getSizesToVariantsRenames({ adapter, direction, }: {
+    adapter: DrizzleAdapter;
+    direction: SizesToVariantsDirection;
+}): SizesToVariantsTableRenames[];
+/** Mirrors `buildIndexName` for an index that didn't collide, without registering the name. */
+export declare function isGeneratedLegacyIndexName({ indexName, legacyNameBase, }: {
+    indexName: string;
+    legacyNameBase: string;
+}): boolean;
+export declare function buildGeneratedLegacyIndexName(name: string, number?: number): string;
+//# sourceMappingURL=getSizesToVariantsRenames.d.ts.map

package/dist/utilities/getSizesToVariantsRenames.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSizesToVariantsRenames.d.ts","sourceRoot":"","sources":["../../src/utilities/getSizesToVariantsRenames.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,aAAa,CAAA;AAIrE,MAAM,MAAM,wBAAwB,GAAG,MAAM,GAAG,IAAI,CAAA;AAEpD,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,4EAA4E;IAC5E,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,8FAA8F;IAC9F,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,8FAA8F;IAC9F,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,2BAA2B,EAAE,CAAA;IACtC,OAAO,EAAE,0BAA0B,EAAE,CAAA;IACrC,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,iCAAiC,CAAC,EAChD,OAAO,EACP,eAAe,GAChB,EAAE;IACD,OAAO,EAAE,2BAA2B,EAAE,CAAA;IACtC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAC7B,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CA2B3C;AAED,wBAAgB,uCAAuC,CAAC,EACtD,OAAO,EACP,eAAe,EACf,SAAS,GACV,EAAE;IACD,OAAO,EAAE,2BAA2B,EAAE,CAAA;IACtC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,SAAS,EAAE,MAAM,CAAA;CAClB,GAAG,IAAI,CAgBP;AAiBD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,OAAO,EACP,SAAS,GACV,EAAE;IACD,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,wBAAwB,CAAA;CACpC,GAAG,2BAA2B,EAAE,CAwEhC;AA6ID,+FAA+F;AAC/F,wBAAgB,0BAA0B,CAAC,EACzC,SAAS,EACT,cAAc,GACf,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;CACvB,GAAG,OAAO,CAQV;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,CAO9E"}

package/dist/utilities/getSizesToVariantsRenames.js

@@ -0,0 +1,251 @@
+import toSnakeCase from 'to-snake-case';
+import { maxGeneratedIdentifierLength } from './validateIdentifierLength.js';
+export function findSizesToVariantsFieldCollision({ columns, existingColumns }) {
+    const firstRename = columns[0];
+    if (!firstRename) {
+        return undefined;
+    }
+    const fromField = getSizesToVariantsField({
+        columnName: firstRename.from
+    });
+    const toField = getSizesToVariantsField({
+        columnName: firstRename.to
+    });
+    if (!fromField || !toField) {
+        return undefined;
+    }
+    const hasSourceField = [
+        ...existingColumns
+    ].some((column)=>isSizesToVariantsFieldColumn({
+            column,
+            field: fromField
+        }));
+    const plannedDestinationColumns = new Set(columns.map(({ to })=>to));
+    const hasUnexpectedDestinationField = [
+        ...existingColumns
+    ].some((column)=>isSizesToVariantsFieldColumn({
+            column,
+            field: toField
+        }) && !plannedDestinationColumns.has(column));
+    return hasSourceField && hasUnexpectedDestinationField ? {
+        from: fromField.fieldPath,
+        to: toField.fieldPath
+    } : undefined;
+}
+export function assertNoSizesToVariantsColumnCollisions({ columns, existingColumns, tableName }) {
+    for (const { from, to } of columns){
+        if (existingColumns.has(from) && existingColumns.has(to)) {
+            throw new Error(`Cannot run the sizes-to-variants migration because table "${tableName}" contains both "${from}" and "${to}". Move or rename the existing destination data before running this migration.`);
+        }
+    }
+    const fieldCollision = findSizesToVariantsFieldCollision({
+        columns,
+        existingColumns
+    });
+    if (fieldCollision) {
+        throw new Error(`Cannot run the sizes-to-variants migration because table "${tableName}" contains both the "${fieldCollision.from}" and "${fieldCollision.to}" fields. Move or rename the existing destination data before running this migration.`);
+    }
+}
+const columnPrefixes = [
+    {
+        current: 'variants_',
+        legacy: 'sizes_'
+    },
+    {
+        current: 'version_variants_',
+        legacy: 'version_sizes_'
+    }
+];
+const generatedVariantMetadataFieldNames = [
+    '_objectKey',
+    'filename',
+    'filesize',
+    'height',
+    'mimeType',
+    'prefix',
+    'url',
+    'width'
+];
+/**
+ * Plans the column and index renames that move every upload collection's stored image sizes
+ * between the legacy `sizes` group and `variants`. Reads the current (`variants`) schema the
+ * adapter built from the config, so it covers each collection's main and versions tables without
+ * re-deriving Payload's column naming.
+ *
+ * Index names come from the schema on `up`, and on `down` are rebuilt the way `buildIndexName`
+ * named them before the rename. The runner still has to locate the verified generated legacy name
+ * on `up`, since it may have a numeric suffix that keeps the name unique.
+ */ export function getSizesToVariantsRenames({ adapter, direction }) {
+    const plan = [];
+    for (const collection of adapter.payload.config.collections){
+        if (!collection.upload) {
+            continue;
+        }
+        const upload = typeof collection.upload === 'object' ? collection.upload : undefined;
+        const generatedVariantColumnKeys = new Set((upload?.variants ?? []).flatMap(({ name })=>generatedVariantMetadataFieldNames.flatMap((metadataFieldName)=>[
+                    `variants_${name}_${metadataFieldName}`,
+                    `version_variants_${name}_${metadataFieldName}`
+                ])));
+        if (generatedVariantColumnKeys.size === 0) {
+            continue;
+        }
+        const tableNames = [
+            adapter.tableNameMap.get(toSnakeCase(collection.slug))
+        ];
+        if (collection.versions) {
+            tableNames.push(adapter.tableNameMap.get(`_${toSnakeCase(collection.slug)}${adapter.versionsSuffix}`));
+        }
+        for (const tableName of tableNames){
+            const rawTable = tableName ? adapter.rawTables[tableName] : undefined;
+            if (!tableName || !rawTable) {
+                continue;
+            }
+            const columns = [];
+            for (const [columnKey, { name }] of Object.entries(rawTable.columns)){
+                if (!generatedVariantColumnKeys.has(columnKey)) {
+                    continue;
+                }
+                const prefix = columnPrefixes.find(({ current })=>name.startsWith(current));
+                if (!prefix) {
+                    continue;
+                }
+                const legacyName = `${prefix.legacy}${name.slice(prefix.current.length)}`;
+                columns.push(direction === 'up' ? {
+                    from: legacyName,
+                    to: name
+                } : {
+                    from: name,
+                    to: legacyName
+                });
+            }
+            if (columns.length === 0) {
+                continue;
+            }
+            const indexes = Object.values(rawTable.indexes ?? {}).map((index)=>planIndexRename({
+                    columns,
+                    direction,
+                    index,
+                    rawColumns: rawTable.columns,
+                    tableName
+                })).filter((index)=>Boolean(index));
+            plan.push({
+                columns,
+                indexes,
+                tableName
+            });
+        }
+    }
+    return plan;
+}
+function getSizesToVariantsField({ columnName }) {
+    if (columnName === 'version_sizes' || columnName.startsWith('version_sizes_')) {
+        return {
+            columnName: 'version_sizes',
+            columnPrefix: 'version_sizes_',
+            fieldPath: 'version.sizes'
+        };
+    }
+    if (columnName === 'version_variants' || columnName.startsWith('version_variants_')) {
+        return {
+            columnName: 'version_variants',
+            columnPrefix: 'version_variants_',
+            fieldPath: 'version.variants'
+        };
+    }
+    if (columnName === 'sizes' || columnName.startsWith('sizes_')) {
+        return {
+            columnName: 'sizes',
+            columnPrefix: 'sizes_',
+            fieldPath: 'sizes'
+        };
+    }
+    if (columnName === 'variants' || columnName.startsWith('variants_')) {
+        return {
+            columnName: 'variants',
+            columnPrefix: 'variants_',
+            fieldPath: 'variants'
+        };
+    }
+    return undefined;
+}
+function isSizesToVariantsFieldColumn({ column, field }) {
+    return column === field.columnName || column.startsWith(field.columnPrefix);
+}
+function planIndexRename({ columns, direction, index, rawColumns, tableName }) {
+    // `on` holds the column's schema key (e.g. `variants_heroLarge_filename`), not its database name.
+    const currentColumns = [
+        index.on
+    ].flat().map((key)=>rawColumns[key]?.name ?? key);
+    const renamedColumns = currentColumns.map((column)=>columns.find((rename)=>(direction === 'up' ? rename.to : rename.from) === column));
+    if (renamedColumns.every((rename)=>!rename)) {
+        return undefined;
+    }
+    const unique = Boolean(index.unique);
+    if (direction === 'up') {
+        const legacyColumns = currentColumns.map((column, i)=>renamedColumns[i]?.from ?? column);
+        return {
+            columns: currentColumns,
+            legacyNameBase: getLegacyIndexNameBase({
+                currentColumns,
+                indexName: index.name,
+                legacyColumns,
+                tableName
+            }),
+            to: index.name,
+            unique
+        };
+    }
+    const legacyColumns = currentColumns.map((column, i)=>renamedColumns[i]?.to ?? column);
+    const legacyNameBase = getLegacyIndexNameBase({
+        currentColumns,
+        indexName: index.name,
+        legacyColumns,
+        tableName
+    });
+    return {
+        columns: legacyColumns,
+        from: index.name,
+        legacyNameBase,
+        to: buildGeneratedLegacyIndexName(legacyNameBase),
+        unique
+    };
+}
+function getLegacyIndexNameBase({ currentColumns, indexName, legacyColumns, tableName }) {
+    const currentColumn = currentColumns.length === 1 ? currentColumns[0] : undefined;
+    const legacyColumn = legacyColumns.length === 1 ? legacyColumns[0] : undefined;
+    const currentFieldPath = currentColumn ? getGeneratedVariantFieldPath(currentColumn) : undefined;
+    const legacyFieldPath = legacyColumn ? getGeneratedVariantFieldPath(legacyColumn) : undefined;
+    if (currentColumn && currentFieldPath && legacyColumn && legacyFieldPath) {
+        const currentFieldIndexNameBase = `${tableName}_${currentFieldPath}_${currentColumn}`;
+        if (isGeneratedLegacyIndexName({
+            indexName,
+            legacyNameBase: currentFieldIndexNameBase
+        })) {
+            return `${tableName}_${legacyFieldPath}_${legacyColumn}`;
+        }
+    }
+    return legacyColumns.join('_');
+}
+function getGeneratedVariantFieldPath(columnName) {
+    for (const metadataFieldName of generatedVariantMetadataFieldNames){
+        const metadataColumnSuffix = `_${toSnakeCase(metadataFieldName)}`;
+        if (columnName.endsWith(metadataColumnSuffix)) {
+            return columnName.slice(0, -metadataColumnSuffix.length);
+        }
+    }
+    return undefined;
+}
+/** Mirrors `buildIndexName` for an index that didn't collide, without registering the name. */ export function isGeneratedLegacyIndexName({ indexName, legacyNameBase }) {
+    const suffixMatch = indexName.match(/(?:_(\d+))?_idx$/);
+    if (!suffixMatch) {
+        return false;
+    }
+    return indexName === buildGeneratedLegacyIndexName(legacyNameBase, Number(suffixMatch[1] ?? 0));
+}
+export function buildGeneratedLegacyIndexName(name, number = 0) {
+    const suffix = `${number ? `_${number}` : ''}_idx`;
+    const indexName = `${name}${suffix}`;
+    return indexName.length > maxGeneratedIdentifierLength ? `${name.slice(0, maxGeneratedIdentifierLength - suffix.length)}${suffix}` : indexName;
+}
+
+//# sourceMappingURL=getSizesToVariantsRenames.js.map

package/dist/utilities/getSizesToVariantsRenames.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/getSizesToVariantsRenames.ts"],"sourcesContent":["import toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, RawIndex, RawTable } from '../types.js'\n\nimport { maxGeneratedIdentifierLength } from './validateIdentifierLength.js'\n\nexport type SizesToVariantsDirection = 'down' | 'up'\n\nexport type SizesToVariantsColumnRename = {\n  from: string\n  to: string\n}\n\nexport type SizesToVariantsIndexRename = {\n  /** Columns the index covers, named as they are after the column renames. */\n  columns: string[]\n  /** The index name to rename from on `down`. The generated legacy name is resolved on `up`. */\n  from?: string\n  /** Base used to verify a generated legacy index name, including a possible numeric suffix. */\n  legacyNameBase?: string\n  to: string\n  unique: boolean\n}\n\nexport type SizesToVariantsTableRenames = {\n  columns: SizesToVariantsColumnRename[]\n  indexes: SizesToVariantsIndexRename[]\n  tableName: string\n}\n\nexport function findSizesToVariantsFieldCollision({\n  columns,\n  existingColumns,\n}: {\n  columns: SizesToVariantsColumnRename[]\n  existingColumns: Set<string>\n}): { from: string; to: string } | undefined {\n  const firstRename = columns[0]\n\n  if (!firstRename) {\n    return undefined\n  }\n\n  const fromField = getSizesToVariantsField({ columnName: firstRename.from })\n  const toField = getSizesToVariantsField({ columnName: firstRename.to })\n\n  if (!fromField || !toField) {\n    return undefined\n  }\n\n  const hasSourceField = [...existingColumns].some((column) =>\n    isSizesToVariantsFieldColumn({ column, field: fromField }),\n  )\n  const plannedDestinationColumns = new Set(columns.map(({ to }) => to))\n  const hasUnexpectedDestinationField = [...existingColumns].some(\n    (column) =>\n      isSizesToVariantsFieldColumn({ column, field: toField }) &&\n      !plannedDestinationColumns.has(column),\n  )\n\n  return hasSourceField && hasUnexpectedDestinationField\n    ? { from: fromField.fieldPath, to: toField.fieldPath }\n    : undefined\n}\n\nexport function assertNoSizesToVariantsColumnCollisions({\n  columns,\n  existingColumns,\n  tableName,\n}: {\n  columns: SizesToVariantsColumnRename[]\n  existingColumns: Set<string>\n  tableName: string\n}): void {\n  for (const { from, to } of columns) {\n    if (existingColumns.has(from) && existingColumns.has(to)) {\n      throw new Error(\n        `Cannot run the sizes-to-variants migration because table \"${tableName}\" contains both \"${from}\" and \"${to}\". Move or rename the existing destination data before running this migration.`,\n      )\n    }\n  }\n\n  const fieldCollision = findSizesToVariantsFieldCollision({ columns, existingColumns })\n\n  if (fieldCollision) {\n    throw new Error(\n      `Cannot run the sizes-to-variants migration because table \"${tableName}\" contains both the \"${fieldCollision.from}\" and \"${fieldCollision.to}\" fields. Move or rename the existing destination data before running this migration.`,\n    )\n  }\n}\n\nconst columnPrefixes = [\n  { current: 'variants_', legacy: 'sizes_' },\n  { current: 'version_variants_', legacy: 'version_sizes_' },\n]\nconst generatedVariantMetadataFieldNames = [\n  '_objectKey',\n  'filename',\n  'filesize',\n  'height',\n  'mimeType',\n  'prefix',\n  'url',\n  'width',\n]\n\n/**\n * Plans the column and index renames that move every upload collection's stored image sizes\n * between the legacy `sizes` group and `variants`. Reads the current (`variants`) schema the\n * adapter built from the config, so it covers each collection's main and versions tables without\n * re-deriving Payload's column naming.\n *\n * Index names come from the schema on `up`, and on `down` are rebuilt the way `buildIndexName`\n * named them before the rename. The runner still has to locate the verified generated legacy name\n * on `up`, since it may have a numeric suffix that keeps the name unique.\n */\nexport function getSizesToVariantsRenames({\n  adapter,\n  direction,\n}: {\n  adapter: DrizzleAdapter\n  direction: SizesToVariantsDirection\n}): SizesToVariantsTableRenames[] {\n  const plan: SizesToVariantsTableRenames[] = []\n\n  for (const collection of adapter.payload.config.collections) {\n    if (!collection.upload) {\n      continue\n    }\n\n    const upload = typeof collection.upload === 'object' ? collection.upload : undefined\n    const generatedVariantColumnKeys = new Set(\n      (upload?.variants ?? []).flatMap(({ name }) =>\n        generatedVariantMetadataFieldNames.flatMap((metadataFieldName) => [\n          `variants_${name}_${metadataFieldName}`,\n          `version_variants_${name}_${metadataFieldName}`,\n        ]),\n      ),\n    )\n\n    if (generatedVariantColumnKeys.size === 0) {\n      continue\n    }\n\n    const tableNames = [adapter.tableNameMap.get(toSnakeCase(collection.slug))]\n\n    if (collection.versions) {\n      tableNames.push(\n        adapter.tableNameMap.get(`_${toSnakeCase(collection.slug)}${adapter.versionsSuffix}`),\n      )\n    }\n\n    for (const tableName of tableNames) {\n      const rawTable = tableName ? adapter.rawTables[tableName] : undefined\n\n      if (!tableName || !rawTable) {\n        continue\n      }\n\n      const columns: SizesToVariantsColumnRename[] = []\n\n      for (const [columnKey, { name }] of Object.entries(rawTable.columns)) {\n        if (!generatedVariantColumnKeys.has(columnKey)) {\n          continue\n        }\n\n        const prefix = columnPrefixes.find(({ current }) => name.startsWith(current))\n\n        if (!prefix) {\n          continue\n        }\n\n        const legacyName = `${prefix.legacy}${name.slice(prefix.current.length)}`\n\n        columns.push(\n          direction === 'up' ? { from: legacyName, to: name } : { from: name, to: legacyName },\n        )\n      }\n\n      if (columns.length === 0) {\n        continue\n      }\n\n      const indexes = Object.values(rawTable.indexes ?? {})\n        .map((index) =>\n          planIndexRename({ columns, direction, index, rawColumns: rawTable.columns, tableName }),\n        )\n        .filter((index): index is SizesToVariantsIndexRename => Boolean(index))\n\n      plan.push({ columns, indexes, tableName })\n    }\n  }\n\n  return plan\n}\n\nfunction getSizesToVariantsField({\n  columnName,\n}: {\n  columnName: string\n}): { columnName: string; columnPrefix: string; fieldPath: string } | undefined {\n  if (columnName === 'version_sizes' || columnName.startsWith('version_sizes_')) {\n    return {\n      columnName: 'version_sizes',\n      columnPrefix: 'version_sizes_',\n      fieldPath: 'version.sizes',\n    }\n  }\n\n  if (columnName === 'version_variants' || columnName.startsWith('version_variants_')) {\n    return {\n      columnName: 'version_variants',\n      columnPrefix: 'version_variants_',\n      fieldPath: 'version.variants',\n    }\n  }\n\n  if (columnName === 'sizes' || columnName.startsWith('sizes_')) {\n    return { columnName: 'sizes', columnPrefix: 'sizes_', fieldPath: 'sizes' }\n  }\n\n  if (columnName === 'variants' || columnName.startsWith('variants_')) {\n    return { columnName: 'variants', columnPrefix: 'variants_', fieldPath: 'variants' }\n  }\n\n  return undefined\n}\n\nfunction isSizesToVariantsFieldColumn({\n  column,\n  field,\n}: {\n  column: string\n  field: { columnName: string; columnPrefix: string }\n}): boolean {\n  return column === field.columnName || column.startsWith(field.columnPrefix)\n}\n\nfunction planIndexRename({\n  columns,\n  direction,\n  index,\n  rawColumns,\n  tableName,\n}: {\n  columns: SizesToVariantsColumnRename[]\n  direction: SizesToVariantsDirection\n  index: RawIndex\n  rawColumns: RawTable['columns']\n  tableName: string\n}): SizesToVariantsIndexRename | undefined {\n  // `on` holds the column's schema key (e.g. `variants_heroLarge_filename`), not its database name.\n  const currentColumns = [index.on].flat().map((key) => rawColumns[key]?.name ?? key)\n  const renamedColumns = currentColumns.map((column) =>\n    columns.find((rename) => (direction === 'up' ? rename.to : rename.from) === column),\n  )\n\n  if (renamedColumns.every((rename) => !rename)) {\n    return undefined\n  }\n\n  const unique = Boolean(index.unique)\n\n  if (direction === 'up') {\n    const legacyColumns = currentColumns.map((column, i) => renamedColumns[i]?.from ?? column)\n\n    return {\n      columns: currentColumns,\n      legacyNameBase: getLegacyIndexNameBase({\n        currentColumns,\n        indexName: index.name,\n        legacyColumns,\n        tableName,\n      }),\n      to: index.name,\n      unique,\n    }\n  }\n\n  const legacyColumns = currentColumns.map((column, i) => renamedColumns[i]?.to ?? column)\n  const legacyNameBase = getLegacyIndexNameBase({\n    currentColumns,\n    indexName: index.name,\n    legacyColumns,\n    tableName,\n  })\n\n  return {\n    columns: legacyColumns,\n    from: index.name,\n    legacyNameBase,\n    to: buildGeneratedLegacyIndexName(legacyNameBase),\n    unique,\n  }\n}\n\nfunction getLegacyIndexNameBase({\n  currentColumns,\n  indexName,\n  legacyColumns,\n  tableName,\n}: {\n  currentColumns: string[]\n  indexName: string\n  legacyColumns: string[]\n  tableName: string\n}): string {\n  const currentColumn = currentColumns.length === 1 ? currentColumns[0] : undefined\n  const legacyColumn = legacyColumns.length === 1 ? legacyColumns[0] : undefined\n  const currentFieldPath = currentColumn ? getGeneratedVariantFieldPath(currentColumn) : undefined\n  const legacyFieldPath = legacyColumn ? getGeneratedVariantFieldPath(legacyColumn) : undefined\n\n  if (currentColumn && currentFieldPath && legacyColumn && legacyFieldPath) {\n    const currentFieldIndexNameBase = `${tableName}_${currentFieldPath}_${currentColumn}`\n\n    if (isGeneratedLegacyIndexName({ indexName, legacyNameBase: currentFieldIndexNameBase })) {\n      return `${tableName}_${legacyFieldPath}_${legacyColumn}`\n    }\n  }\n\n  return legacyColumns.join('_')\n}\n\nfunction getGeneratedVariantFieldPath(columnName: string): string | undefined {\n  for (const metadataFieldName of generatedVariantMetadataFieldNames) {\n    const metadataColumnSuffix = `_${toSnakeCase(metadataFieldName)}`\n\n    if (columnName.endsWith(metadataColumnSuffix)) {\n      return columnName.slice(0, -metadataColumnSuffix.length)\n    }\n  }\n\n  return undefined\n}\n\n/** Mirrors `buildIndexName` for an index that didn't collide, without registering the name. */\nexport function isGeneratedLegacyIndexName({\n  indexName,\n  legacyNameBase,\n}: {\n  indexName: string\n  legacyNameBase: string\n}): boolean {\n  const suffixMatch = indexName.match(/(?:_(\\d+))?_idx$/)\n\n  if (!suffixMatch) {\n    return false\n  }\n\n  return indexName === buildGeneratedLegacyIndexName(legacyNameBase, Number(suffixMatch[1] ?? 0))\n}\n\nexport function buildGeneratedLegacyIndexName(name: string, number = 0): string {\n  const suffix = `${number ? `_${number}` : ''}_idx`\n  const indexName = `${name}${suffix}`\n\n  return indexName.length > maxGeneratedIdentifierLength\n    ? `${name.slice(0, maxGeneratedIdentifierLength - suffix.length)}${suffix}`\n    : indexName\n}\n"],"names":["toSnakeCase","maxGeneratedIdentifierLength","findSizesToVariantsFieldCollision","columns","existingColumns","firstRename","undefined","fromField","getSizesToVariantsField","columnName","from","toField","to","hasSourceField","some","column","isSizesToVariantsFieldColumn","field","plannedDestinationColumns","Set","map","hasUnexpectedDestinationField","has","fieldPath","assertNoSizesToVariantsColumnCollisions","tableName","Error","fieldCollision","columnPrefixes","current","legacy","generatedVariantMetadataFieldNames","getSizesToVariantsRenames","adapter","direction","plan","collection","payload","config","collections","upload","generatedVariantColumnKeys","variants","flatMap","name","metadataFieldName","size","tableNames","tableNameMap","get","slug","versions","push","versionsSuffix","rawTable","rawTables","columnKey","Object","entries","prefix","find","startsWith","legacyName","slice","length","indexes","values","index","planIndexRename","rawColumns","filter","Boolean","columnPrefix","currentColumns","on","flat","key","renamedColumns","rename","every","unique","legacyColumns","i","legacyNameBase","getLegacyIndexNameBase","indexName","buildGeneratedLegacyIndexName","currentColumn","legacyColumn","currentFieldPath","getGeneratedVariantFieldPath","legacyFieldPath","currentFieldIndexNameBase","isGeneratedLegacyIndexName","join","metadataColumnSuffix","endsWith","suffixMatch","match","Number","number","suffix"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "4.0.0-internal.77191e5",
+  "version": "4.0.0-internal.7d5c665",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -55,10 +55,10 @@
     "@types/pg": "8.20.0",
     "@types/to-snake-case": "1.0.0",
     "@payloadcms/eslint-config": "3.28.0",
-    "payload": "4.0.0-internal.77191e5"
+    "payload": "4.0.0-internal.7d5c665"
   },
   "peerDependencies": {
-    "payload": "4.0.0-internal.77191e5"
+    "payload": "4.0.0-internal.7d5c665"
   },
   "scripts": {
     "build": "pnpm build:swc && pnpm build:types",