@prisma-next/cli 0.16.0-dev.3 → 0.16.0-dev.31

package/src/commands/init/reinit-cleanup.ts

@@ -4,41 +4,40 @@ import { join } from 'pathe';
 /**
  * Filenames the contract pipeline emits next to the user's schema source
  * (`<schemaDir>/contract.json`, `<schemaDir>/contract.d.ts`, …). Mirrors
- * `ARTEFACT_FILENAMES` in `hygiene-gitattributes.ts`; kept as a separate
- * constant here because the cleanup contract is target-agnostic and we
- * deliberately do not want a stale `start-contract.json` from a previous
- * target lingering after a re-init.
+ * the schema-dir-relative `ARTIFACT_FILENAMES` in `hygiene-gitattributes.ts`
+ * (not that file's migrations-root-anchored store lines, which are outside
+ * this command's scope — reinit only ever touches `schemaDir`); kept as a
+ * separate constant here because the cleanup contract is target-agnostic
+ * and we deliberately do not want a stale artifact from a previous target
+ * lingering after a re-init.
  *
- * If a future emit pipeline produces an additional artefact, add it here
- * **and** to the gitattributes list — the two stay in lockstep so the
- * file `init` advertises as `linguist-generated` is exactly the file
- * `init` is willing to delete on re-init.
+ * If a future emit pipeline produces an additional schema-dir artifact,
+ * add it here **and** to `ARTIFACT_FILENAMES` in `hygiene-gitattributes.ts`
+ * — the two stay in lockstep so the file `init` advertises as
+ * `linguist-generated` is exactly the file `init` is willing to delete on
+ * re-init.
  */
-const ARTEFACT_FILENAMES: readonly string[] = [
+const ARTIFACT_FILENAMES: readonly string[] = [
   'contract.json',
   'contract.d.ts',
-  'end-contract.json',
-  'end-contract.d.ts',
-  'start-contract.json',
-  'start-contract.d.ts',
   'ops.json',
   'migration.json',
 ];
 
 /**
- * Returns the schema-relative paths of stale contract artefacts the
+ * Returns the schema-relative paths of stale contract artifacts the
  * previous `init` run (or a `contract emit`) left behind in `schemaDir`.
  * Paths are returned relative to `baseDir` so the caller can plumb them
  * into `filesWritten`-style logging without re-deriving the path.
  *
  * Pure function: no filesystem mutation. Used by `runInit`'s precondition
  * phase (FR6.2 / NFR3 atomicity) so a downstream parse failure leaves
- * the artefacts on disk and the project byte-identical to its pre-init
+ * the artifacts on disk and the project byte-identical to its pre-init
  * state.
  */
-export function findStaleArtefacts(baseDir: string, schemaDir: string): readonly string[] {
+export function findStaleArtifacts(baseDir: string, schemaDir: string): readonly string[] {
   const result: string[] = [];
-  for (const filename of ARTEFACT_FILENAMES) {
+  for (const filename of ARTIFACT_FILENAMES) {
     const rel = join(schemaDir, filename);
     if (existsSync(join(baseDir, rel))) {
       result.push(rel);

package/src/commands/init/templates/render.ts

@@ -1,4 +1,5 @@
 import { readFileSync } from 'node:fs';
+import { InternalError } from '@prisma-next/utils/internal-error';
 import { join } from 'pathe';
 
 export function renderTemplate(
@@ -12,7 +13,7 @@ export function renderTemplate(
   for (const key of variableNames) {
     const value = vars[key];
     if (value === undefined) {
-      throw new Error(`Template variable '${key}' is not defined`);
+      throw new InternalError(`Template variable '${key}' is not defined`);
     }
     result = result.replaceAll(`{{${key}}}`, value);
   }

package/src/commands/inspect-live-schema.ts

@@ -131,7 +131,7 @@ export async function inspectLiveSchema(
     target: config.target,
     adapter: config.adapter,
     driver: config.driver,
-    extensionPacks: config.extensionPacks ?? [],
+    extensions: config.extensions ?? [],
   });
   const onProgress = createProgressAdapter({ ui, flags });
 

package/src/commands/migrate.ts

@@ -330,7 +330,7 @@ async function executeMigrateShowCommand(
       target: config.target,
       adapter: config.adapter,
       driver: config.driver!,
-      extensionPacks: config.extensionPacks ?? [],
+      extensions: config.extensions ?? [],
     });
     try {
       await client.connect(dbConnection);
@@ -675,7 +675,7 @@ async function executeMigrateCommand(
     targetId: config.target.targetId,
     migrationsDir,
     appContract: contractRaw,
-    extensionPacks: config.extensionPacks ?? [],
+    extensions: config.extensions ?? [],
     deserializeContract: (json) => familyInstance.deserializeContract(json),
   });
   if (!loadedAggregate.ok) {
@@ -684,7 +684,7 @@ async function executeMigrateCommand(
   const aggregate = loadedAggregate.value;
   const integrityFailure = refuseContractSpaceIntegrity(aggregate, {
     declaredExtensions: toDeclaredExtensionsFromRaw(
-      (config.extensionPacks ?? []) as ReadonlyArray<unknown>,
+      (config.extensions ?? []) as ReadonlyArray<unknown>,
     ),
     checkContracts: true,
   });
@@ -740,7 +740,7 @@ async function executeMigrateCommand(
     target: config.target,
     adapter: config.adapter,
     driver: config.driver,
-    extensionPacks: config.extensionPacks ?? [],
+    extensions: config.extensions ?? [],
   });
 
   try {
@@ -831,6 +831,7 @@ async function executeMigrateCommand(
             : await readContractIR(snapshotContractJson, contractPathAbsolute);
         advancedRef = await executeRefAdvancement(
           refsDir,
+          migrationsDir,
           options.advanceRef,
           value.markerHash,
           contractIR,
@@ -886,7 +887,7 @@ export function createMigrateCommand(): Command {
   setCommandExamples(command, [
     'prisma-next migrate --db $DATABASE_URL',
     'prisma-next migrate --to production --db $DATABASE_URL',
-    'prisma-next migrate --to sha256:abc123 --db $DATABASE_URL',
+    'prisma-next migrate --to abc123 --db $DATABASE_URL',
     'prisma-next migrate --show --db $DATABASE_URL',
     'prisma-next migrate --show --from @contract --to production',
   ]);

package/src/commands/migration-check.ts

@@ -1,4 +1,4 @@
-import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
+import { existsSync, readdirSync, statSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { loadConfig } from '@prisma-next/config-loader';
 import { createControlStack } from '@prisma-next/framework-components/control';
@@ -7,6 +7,12 @@ import type {
   IntegrityViolation,
 } from '@prisma-next/migration-tools/aggregate';
 import { loadContractSpaceAggregate } from '@prisma-next/migration-tools/aggregate';
+import { EMPTY_CONTRACT_HASH } from '@prisma-next/migration-tools/constants';
+import {
+  contractSnapshotDir,
+  readContractSnapshotJson,
+} from '@prisma-next/migration-tools/contract-snapshot-store';
+import { MigrationToolsError } from '@prisma-next/migration-tools/errors';
 import type { MigrationGraph } from '@prisma-next/migration-tools/graph';
 import { verifyMigrationHash } from '@prisma-next/migration-tools/hash';
 import type { OnDiskMigrationPackage } from '@prisma-next/migration-tools/package';
@@ -18,7 +24,6 @@ import type { Refs } from '@prisma-next/migration-tools/refs';
 import {
   isValidSpaceId,
   listContractSpaceDirectories,
-  RESERVED_SPACE_SUBDIR_NAMES,
   spaceMigrationDirectory,
   spaceRefsDirectory,
 } from '@prisma-next/migration-tools/spaces';
@@ -92,32 +97,57 @@ function checkFileExists(
   return null;
 }
 
-function checkSnapshotConsistency(
+/**
+ * Snapshot-store consistency check for one migration package (D6.5):
+ * absent store entry is not an issue (runner independence, ADR 199 — a
+ * package dir with only `migration.json` + `ops.json` is legitimate); a
+ * present entry whose inner `storage.storageHash` disagrees with
+ * `pkg.metadata.to` is `MIGRATION.CHECK_SNAPSHOT_HASH_MISMATCH`; an unparseable store
+ * entry (or a malformed `to`) is `MIGRATION.CHECK_SNAPSHOT_UNPARSEABLE`.
+ */
+async function checkSnapshotConsistency(
   spaceId: string,
   pkg: OnDiskMigrationPackage,
-): CheckFailure | null {
-  const endContractPath = join(pkg.dirPath, 'end-contract.json');
-  if (!existsSync(endContractPath)) return null;
+  migrationsDir: string,
+): Promise<CheckFailure | null> {
+  let snapshotDir: string;
   try {
-    const raw = JSON.parse(readFileSync(endContractPath, 'utf-8')) as Record<string, unknown>;
-    const storage = raw['storage'] as Record<string, unknown> | undefined;
-    const snapshotHash = storage?.['storageHash'];
-    if (typeof snapshotHash === 'string' && snapshotHash !== pkg.metadata.to) {
-      return {
-        space: spaceId,
-        code: 'MIGRATION.CHECK_SNAPSHOT_HASH_MISMATCH',
-        where: migrationPathRelative(pkg.dirPath),
-        why: `Migration "${pkg.dirName}" declares to=${pkg.metadata.to} but end-contract.json has storageHash=${snapshotHash}`,
-        fix: 'Re-emit the migration package so migration.json and end-contract.json agree.',
-      };
-    }
+    snapshotDir = contractSnapshotDir(migrationsDir, pkg.metadata.to);
   } catch {
     return {
       space: spaceId,
       code: 'MIGRATION.CHECK_SNAPSHOT_UNPARSEABLE',
       where: migrationPathRelative(pkg.dirPath),
-      why: `Migration "${pkg.dirName}" has an unparseable end-contract.json.`,
-      fix: 'Re-emit the migration package to repair the snapshot file.',
+      why: `Migration "${pkg.dirName}" declares to="${pkg.metadata.to}", which is not a well-formed contract snapshot hash.`,
+      fix: 'Re-emit the migration package so migration.json declares a valid 64-hex to-hash.',
+    };
+  }
+
+  let raw: unknown;
+  try {
+    raw = await readContractSnapshotJson(migrationsDir, pkg.metadata.to);
+  } catch (error) {
+    if (MigrationToolsError.is(error) && error.code === 'MIGRATION.CONTRACT_SNAPSHOT_MISSING') {
+      return null;
+    }
+    return {
+      space: spaceId,
+      code: 'MIGRATION.CHECK_SNAPSHOT_UNPARSEABLE',
+      where: migrationPathRelative(pkg.dirPath),
+      why: `Migration "${pkg.dirName}" has an unparseable contract snapshot at ${snapshotDir}/contract.json.`,
+      fix: 'Restore migrations/snapshots/ from version control, or re-run the command that produced this migration to regenerate its snapshot.',
+    };
+  }
+  const record = raw !== null && typeof raw === 'object' ? (raw as Record<string, unknown>) : {};
+  const storage = record['storage'] as Record<string, unknown> | undefined;
+  const snapshotHash = storage?.['storageHash'];
+  if (typeof snapshotHash === 'string' && snapshotHash !== pkg.metadata.to) {
+    return {
+      space: spaceId,
+      code: 'MIGRATION.CHECK_SNAPSHOT_HASH_MISMATCH',
+      where: migrationPathRelative(pkg.dirPath),
+      why: `Migration "${pkg.dirName}" declares to=${pkg.metadata.to} but its contract snapshot has storageHash=${snapshotHash}`,
+      fix: 'Re-emit the migration package so migration.json and its contract snapshot agree.',
     };
   }
   return null;
@@ -137,6 +167,8 @@ export interface CheckSpace {
   readonly graph: MigrationGraph;
   readonly migrationsDir: string;
   readonly refsDir: string;
+  /** Migrations root the contract-snapshot store lives under — shared by every space. */
+  readonly projectMigrationsDir: string;
 }
 
 /**
@@ -152,9 +184,7 @@ export async function enumerateCheckSpaces(
   projectMigrationsDir: string,
 ): Promise<readonly CheckSpace[]> {
   const candidateDirs = await listContractSpaceDirectories(projectMigrationsDir);
-  const onDiskSpaceIds = new Set(
-    candidateDirs.filter((name) => !RESERVED_SPACE_SUBDIR_NAMES.has(name)).filter(isValidSpaceId),
-  );
+  const onDiskSpaceIds = new Set(candidateDirs.filter(isValidSpaceId));
   const spaces: CheckSpace[] = [];
   for (const space of aggregate.spaces()) {
     const spaceId = space.spaceId;
@@ -168,6 +198,7 @@ export async function enumerateCheckSpaces(
       graph: space.graph(),
       migrationsDir,
       refsDir: spaceRefsDirectory(migrationsDir),
+      projectMigrationsDir,
     });
   }
   return spaces;
@@ -208,7 +239,7 @@ function checkReachability(space: CheckSpace): readonly CheckFailure[] {
     const isReachable =
       pkg.metadata.from === null ||
       allToHashes.has(pkg.metadata.from) ||
-      pkg.metadata.from === 'sha256:empty';
+      pkg.metadata.from === EMPTY_CONTRACT_HASH;
     if (!isReachable) {
       failures.push({
         space: space.spaceId,
@@ -238,12 +269,15 @@ function checkDanglingRefs(space: CheckSpace): readonly CheckFailure[] {
   return failures;
 }
 
-function checkSpace(space: CheckSpace): readonly CheckFailure[] {
+async function checkSpace(space: CheckSpace): Promise<readonly CheckFailure[]> {
+  const snapshotFailures = await Promise.all(
+    space.packages.map((pkg) =>
+      checkSnapshotConsistency(space.spaceId, pkg, space.projectMigrationsDir),
+    ),
+  );
   return [
     ...checkManifestFilesPresent(space),
-    ...space.packages
-      .map((pkg) => checkSnapshotConsistency(space.spaceId, pkg))
-      .filter((f): f is CheckFailure => f !== null),
+    ...snapshotFailures.filter((f): f is CheckFailure => f !== null),
     ...checkReachability(space),
     ...checkDanglingRefs(space),
   ];
@@ -272,9 +306,9 @@ export interface RunMigrationCheckInputs {
  * Aggregate-integrity violations (which already span every space) are folded
  * in by the caller, not here.
  */
-export function runMigrationCheck(
+export async function runMigrationCheck(
   inputs: RunMigrationCheckInputs,
-): Result<MigrationCheckResult, CliStructuredError> {
+): Promise<Result<MigrationCheckResult, CliStructuredError>> {
   const { spaces, spaceFilter } = inputs;
 
   if (spaceFilter !== undefined && !isValidSpaceId(spaceFilter)) {
@@ -287,7 +321,7 @@ export function runMigrationCheck(
   const scopedSpaces =
     spaceFilter !== undefined ? spaces.filter((s) => s.spaceId === spaceFilter) : spaces;
 
-  const failures = scopedSpaces.flatMap(checkSpace);
+  const failures = (await Promise.all(scopedSpaces.map(checkSpace))).flat();
   if (failures.length === 0) {
     return ok({ ok: true, failures: [], summary: 'All checks passed' });
   }
@@ -301,7 +335,7 @@ async function loadAggregateIntegrityViolations(
   try {
     const contractJsonContent = await readFile(resolveContractPath(config), 'utf-8');
     const familyInstance = config.family.create(createControlStack(config));
-    const declaredExtensions = toDeclaredExtensionsFromRaw(config.extensionPacks ?? []);
+    const declaredExtensions = toDeclaredExtensionsFromRaw(config.extensions ?? []);
 
     const parsedAppContract: unknown = JSON.parse(contractJsonContent);
     const aggregate = await loadContractSpaceAggregate({
@@ -365,7 +399,7 @@ async function executeMigrationCheckCommand(
     });
   }
 
-  const checkResult = runMigrationCheck({
+  const checkResult = await runMigrationCheck({
     spaces,
     ...(options.space !== undefined ? { spaceFilter: options.space } : {}),
   });
@@ -558,7 +592,11 @@ async function checkSingleTarget(
     });
   }
 
-  const snapshotFailure = checkSnapshotConsistency(matchedSpace.spaceId, matchedPkg);
+  const snapshotFailure = await checkSnapshotConsistency(
+    matchedSpace.spaceId,
+    matchedPkg,
+    matchedSpace.projectMigrationsDir,
+  );
   if (snapshotFailure) failures.push(snapshotFailure);
 
   const resolvedSpaceId = matchedSpace.spaceId !== 'app' ? matchedSpace.spaceId : undefined;

package/src/commands/migration-list.ts

@@ -9,7 +9,6 @@ import {
   APP_SPACE_ID,
   isValidSpaceId,
   listContractSpaceDirectories,
-  RESERVED_SPACE_SUBDIR_NAMES,
 } from '@prisma-next/migration-tools/spaces';
 import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
@@ -81,10 +80,7 @@ export function listRefsByContractHash(
 
 async function orderedOnDiskSpaceIds(projectMigrationsDir: string): Promise<readonly string[]> {
   const candidateDirs = await listContractSpaceDirectories(projectMigrationsDir);
-  return candidateDirs
-    .filter((name) => !RESERVED_SPACE_SUBDIR_NAMES.has(name))
-    .filter(isValidSpaceId)
-    .sort(compareSpaceIds);
+  return candidateDirs.filter(isValidSpaceId).sort(compareSpaceIds);
 }
 
 /**

package/src/commands/migration-log.ts

@@ -84,7 +84,7 @@ export async function executeMigrationLogCommand(
     target: config.target,
     adapter: config.adapter,
     ...ifDefined('driver', config.driver),
-    extensionPacks: config.extensionPacks ?? [],
+    extensions: config.extensions ?? [],
   });
 
   try {

package/src/commands/migration-new.ts

@@ -14,12 +14,13 @@ import type { Contract } from '@prisma-next/contract/types';
 import { getEmittedArtifactPaths } from '@prisma-next/emitter';
 import { APP_SPACE_ID, createControlStack } from '@prisma-next/framework-components/control';
 import { loadContractSpaceAggregate } from '@prisma-next/migration-tools/aggregate';
-import { computeMigrationHash } from '@prisma-next/migration-tools/hash';
 import {
-  copyFilesWithRename,
-  formatMigrationDirName,
-  writeMigrationPackage,
-} from '@prisma-next/migration-tools/io';
+  contractSnapshotDir,
+  snapshotsImportPathFrom,
+  writeContractSnapshot,
+} from '@prisma-next/migration-tools/contract-snapshot-store';
+import { computeMigrationHash } from '@prisma-next/migration-tools/hash';
+import { formatMigrationDirName, writeMigrationPackage } from '@prisma-next/migration-tools/io';
 import type { MigrationMetadata } from '@prisma-next/migration-tools/metadata';
 import { findLatestMigration } from '@prisma-next/migration-tools/migration-graph';
 import { writeMigrationTs } from '@prisma-next/migration-tools/migration-ts';
@@ -28,7 +29,6 @@ import { Command } from 'commander';
 import { join, relative } from 'pathe';
 import {
   CliStructuredError,
-  errorFileNotFound,
   errorRuntime,
   errorTargetMigrationNotSupported,
   errorUnexpected,
@@ -133,7 +133,6 @@ async function executeMigrationNewCommand(
   const graph = aggregate.app.graph();
 
   let fromHash: string | null = null;
-  let fromContractSourceDir: string | null = null;
 
   if (packages.length > 0) {
     if (options.from) {
@@ -147,17 +146,10 @@ async function executeMigrationNewCommand(
         );
       }
       fromHash = match.metadata.to;
-      fromContractSourceDir = match.dirPath;
     } else {
       const latestMigration = findLatestMigration(graph);
       if (latestMigration) {
         fromHash = latestMigration.to;
-        const leafPkg = packages.find(
-          (p) => p.metadata.migrationHash === latestMigration.migrationHash,
-        );
-        if (leafPkg) {
-          fromContractSourceDir = leafPkg.dirPath;
-        }
       }
     }
   }
@@ -204,44 +196,28 @@ async function executeMigrationNewCommand(
     assertFrameworkComponentsCompatible(config.family.familyId, config.target.targetId, [
       config.target,
       config.adapter,
-      ...(config.extensionPacks ?? []),
+      ...(config.extensions ?? []),
     ]);
 
     await writeMigrationPackage(packageDir, metadata, []);
     const destinationArtifacts = getEmittedArtifactPaths(contractPathAbsolute);
-    await copyFilesWithRename(packageDir, [
-      { sourcePath: destinationArtifacts.jsonPath, destName: 'end-contract.json' },
-      { sourcePath: destinationArtifacts.dtsPath, destName: 'end-contract.d.ts' },
+    const [contractJsonRaw, contractDts] = await Promise.all([
+      readFile(destinationArtifacts.jsonPath, 'utf-8'),
+      readFile(destinationArtifacts.dtsPath, 'utf-8'),
     ]);
-    if (fromContractSourceDir !== null) {
-      const sourceArtifacts = getEmittedArtifactPaths(
-        join(fromContractSourceDir, 'end-contract.json'),
-      );
-      try {
-        await copyFilesWithRename(packageDir, [
-          { sourcePath: sourceArtifacts.jsonPath, destName: 'start-contract.json' },
-          { sourcePath: sourceArtifacts.dtsPath, destName: 'start-contract.d.ts' },
-        ]);
-      } catch (error) {
-        if (error instanceof Error && (error as { code?: string }).code === 'ENOENT') {
-          return notOk(
-            errorFileNotFound(sourceArtifacts.jsonPath, {
-              why: `Predecessor migration is missing its destination contract snapshot at ${sourceArtifacts.jsonPath}`,
-              fix: 'Re-emit the predecessor migration (`prisma-next migration plan` from its source) so its sibling `end-contract.json` is restored, then re-run this command.',
-            }),
-          );
-        }
-        throw error;
-      }
-    }
+    await writeContractSnapshot(migrationsDir, toStorageHash, {
+      contractJson: JSON.parse(contractJsonRaw) as unknown,
+      contractDts,
+    });
 
     const planner = migrations.createPlanner(controlAdapter);
     const emptyPlan = planner.emptyMigration(
       {
         packageDir,
-        contractJsonPath: join(packageDir, 'end-contract.json'),
+        contractJsonPath: join(contractSnapshotDir(migrationsDir, toStorageHash), 'contract.json'),
         fromHash,
         toHash: toStorageHash,
+        snapshotsImportPath: snapshotsImportPathFrom(packageDir, migrationsDir),
       },
       APP_SPACE_ID,
     );
@@ -277,7 +253,7 @@ export function createMigrationNewCommand(): Command {
   );
   setCommandExamples(command, [
     'prisma-next migration new --name split-name',
-    'prisma-next migration new --name custom-fk --from sha256:abc...',
+    'prisma-next migration new --name custom-fk --from abc123...',
   ]);
   addGlobalOptions(command)
     .option('--name <slug>', 'Migration name (used in directory name)')