@prisma-next/cli 0.5.0-dev.9 → 0.6.0-dev.1

package/src/commands/migration-new.ts

@@ -11,32 +11,36 @@
 import { readFileSync } from 'node:fs';
 import type { Contract } from '@prisma-next/contract/types';
 import { getEmittedArtifactPaths } from '@prisma-next/emitter';
-import { createControlStack } from '@prisma-next/framework-components/control';
-import { computeMigrationId } from '@prisma-next/migration-tools/attestation';
-import { EMPTY_CONTRACT_HASH } from '@prisma-next/migration-tools/constants';
-import { findLatestMigration, reconstructGraph } from '@prisma-next/migration-tools/dag';
+import { APP_SPACE_ID, createControlStack } from '@prisma-next/framework-components/control';
+import { MigrationToolsError } from '@prisma-next/migration-tools/errors';
+import { computeMigrationHash } from '@prisma-next/migration-tools/hash';
 import {
   copyFilesWithRename,
   formatMigrationDirName,
   readMigrationsDir,
   writeMigrationPackage,
 } from '@prisma-next/migration-tools/io';
+import type { MigrationMetadata } from '@prisma-next/migration-tools/metadata';
+import {
+  findLatestMigration,
+  reconstructGraph,
+} from '@prisma-next/migration-tools/migration-graph';
 import { writeMigrationTs } from '@prisma-next/migration-tools/migration-ts';
-import type { MigrationManifest } from '@prisma-next/migration-tools/types';
-import { MigrationToolsError } from '@prisma-next/migration-tools/types';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
-import { join, relative, resolve } from 'pathe';
+import { join, relative } from 'pathe';
 import { loadConfig } from '../config-loader';
 import {
   CliStructuredError,
   errorRuntime,
   errorTargetMigrationNotSupported,
   errorUnexpected,
+  mapMigrationToolsError,
 } from '../utils/cli-errors';
 import {
   addGlobalOptions,
   getTargetMigrations,
+  resolveContractPath,
   resolveMigrationPaths,
   setCommandDescriptions,
   setCommandExamples,
@@ -57,7 +61,7 @@ interface MigrationNewOptions extends CommonCommandOptions {
 interface MigrationNewResult {
   readonly ok: true;
   readonly dir: string;
-  readonly from: string;
+  readonly from: string | null;
   readonly to: string;
   readonly summary: string;
 }
@@ -66,13 +70,9 @@ async function executeMigrationNewCommand(
   options: MigrationNewOptions,
 ): Promise<Result<MigrationNewResult, CliStructuredError>> {
   const config = await loadConfig(options.config);
-  const { migrationsDir, migrationsRelative } = resolveMigrationPaths(options.config, config);
+  const { appMigrationsDir, appMigrationsRelative } = resolveMigrationPaths(options.config, config);
 
-  const contractPath = config.contract?.output ?? 'contract.json';
-  const contractPathAbsolute = resolve(
-    options.config ? resolve(options.config, '..') : process.cwd(),
-    contractPath,
-  );
+  const contractPathAbsolute = resolveContractPath(config);
 
   let contractJsonContent: string;
   try {
@@ -116,37 +116,37 @@ async function executeMigrationNewCommand(
   }
 
   let fromContract: Contract | null = null;
-  let fromHash: string = EMPTY_CONTRACT_HASH;
+  let fromHash: string | null = null;
   let fromContractSourceDir: string | null = null;
 
   try {
-    const packages = await readMigrationsDir(migrationsDir);
+    const packages = await readMigrationsDir(appMigrationsDir);
 
     if (packages.length > 0) {
       const graph = reconstructGraph(packages);
 
       if (options.from) {
-        const match = packages.find((p) => p.manifest.to.startsWith(options.from!));
+        const match = packages.find((p) => p.metadata.to.startsWith(options.from!));
         if (!match) {
           return notOk(
             errorRuntime('Starting contract not found', {
-              why: `No migration with to hash matching "${options.from}" exists in ${migrationsRelative}`,
+              why: `No migration with to hash matching "${options.from}" exists in ${appMigrationsRelative}`,
               fix: 'Check that the --from hash matches a known migration target hash.',
             }),
           );
         }
-        fromHash = match.manifest.to;
-        fromContract = match.manifest.toContract;
+        fromHash = match.metadata.to;
+        fromContract = match.metadata.toContract;
         fromContractSourceDir = match.dirPath;
       } else {
         const latestMigration = findLatestMigration(graph);
         if (latestMigration) {
           fromHash = latestMigration.to;
           const leafPkg = packages.find(
-            (p) => p.manifest.migrationId === latestMigration.migrationId,
+            (p) => p.metadata.migrationHash === latestMigration.migrationHash,
           );
           if (leafPkg) {
-            fromContract = leafPkg.manifest.toContract;
+            fromContract = leafPkg.metadata.toContract;
             fromContractSourceDir = leafPkg.dirPath;
           }
         }
@@ -154,22 +154,16 @@ async function executeMigrationNewCommand(
     }
   } catch (error) {
     if (MigrationToolsError.is(error)) {
-      return notOk(
-        errorRuntime(error.message, {
-          why: error.why,
-          fix: error.fix,
-          meta: { code: error.code },
-        }),
-      );
+      return notOk(mapMigrationToolsError(error));
     }
     throw error;
   }
 
-  if (fromHash === toStorageHash) {
+  if (fromHash === toStorageHash && !options.from) {
     return notOk(
       errorRuntime('No changes detected', {
         why: 'The from and to contract hashes are identical — there is nothing to migrate.',
-        fix: 'Change the contract and run `prisma-next contract emit` before creating a new migration.',
+        fix: 'Change the contract and run `prisma-next contract emit` before creating a new migration. To author a data-only migration on the current contract hash, pass `--from <hash>` explicitly.',
       }),
     );
   }
@@ -177,16 +171,15 @@ async function executeMigrationNewCommand(
   const timestamp = new Date();
   const slug = options.name ?? 'migration';
   const dirName = formatMigrationDirName(timestamp, slug);
-  const packageDir = join(migrationsDir, dirName);
+  const packageDir = join(appMigrationsDir, dirName);
 
   // `migration new` scaffolds an empty `migration.ts` for the user to
   // fill, so we attest over `ops: []`. Re-running self-emit after the
-  // user adds operations will produce a different `migrationId` (over
+  // user adds operations will produce a different `migrationHash` (over
   // the real ops). This is intentional — there is no on-disk draft.
-  const baseManifest: Omit<MigrationManifest, 'migrationId'> = {
+  const baseMetadata: Omit<MigrationMetadata, 'migrationHash'> = {
     from: fromHash,
     to: toStorageHash,
-    kind: 'regular',
     fromContract,
     toContract: toContractJson,
     hints: {
@@ -195,11 +188,12 @@ async function executeMigrationNewCommand(
       plannerVersion: '1.0.0',
     },
     labels: [],
+    providedInvariants: [],
     createdAt: timestamp.toISOString(),
   };
-  const manifest: MigrationManifest = {
-    ...baseManifest,
-    migrationId: computeMigrationId(baseManifest, []),
+  const metadata: MigrationMetadata = {
+    ...baseMetadata,
+    migrationHash: computeMigrationHash(baseMetadata, []),
   };
 
   const migrations = getTargetMigrations(config.target);
@@ -218,7 +212,7 @@ async function executeMigrationNewCommand(
       ...(config.extensionPacks ?? []),
     ]);
 
-    await writeMigrationPackage(packageDir, manifest, []);
+    await writeMigrationPackage(packageDir, metadata, []);
     const destinationArtifacts = getEmittedArtifactPaths(contractPathAbsolute);
     await copyFilesWithRename(packageDir, [
       { sourcePath: destinationArtifacts.jsonPath, destName: 'end-contract.json' },
@@ -237,12 +231,15 @@ async function executeMigrationNewCommand(
     const stack = createControlStack(config);
     const familyInstance = config.family.create(stack);
     const planner = migrations.createPlanner(familyInstance);
-    const emptyPlan = planner.emptyMigration({
-      packageDir,
-      contractJsonPath: join(packageDir, 'end-contract.json'),
-      fromHash,
-      toHash: toStorageHash,
-    });
+    const emptyPlan = planner.emptyMigration(
+      {
+        packageDir,
+        contractJsonPath: join(packageDir, 'end-contract.json'),
+        fromHash,
+        toHash: toStorageHash,
+      },
+      APP_SPACE_ID,
+    );
     await writeMigrationTs(packageDir, emptyPlan.renderTypeScript());
 
     return ok({