@prisma/orm-toolchain 8.0.0-rc.3-dev.7 → 8.0.0-rc.3-dev.8

package/dist/cli.mjs

@@ -1,10 +1,10 @@
-import { r as getEmittedArtifactPaths } from "./exports-BCLg4CiV-05kuwcb0.mjs";
+import { r as getEmittedArtifactPaths } from "./exports-Dw2WIX63-CQgI2e_L.mjs";
 import { t as EMPTY_CONTRACT_HASH } from "./constants-CM-w38DQ-Cz_EXbOc.mjs";
-import { c as spaceMigrationDirectory } from "./verify-contract-spaces-DhJTb0zM-B62maCfE.mjs";
-import { i as createScaffoldSpecifierResolver } from "./import-roots-CNFBPAT1.mjs";
-import { $ as loadContractRawSafely, A as errorMigrationPlanningFailed, At as statusForMigrationHash, C as errorDestructiveChanges, Ct as resolveRefAdvancementFields, D as errorLegendHumanOnly, Dt as runMigrationCheck, E as errorHashMismatch, F as errorTargetMigrationNotSupported, H as executeMigrateShowPlan, I as errorTargetMismatch, J as executeRefSetCommand, K as executeRefDeleteCommand, L as errorUnexpected, M as errorPathUnreachable, Mt as toDeclaredExtensionsFromRaw, N as errorRunnerFailed, O as errorMarkerMissing, Ot as runMigrationList, P as errorRuntime, Q as loadAggregateIntegrityViolations, R as executeContractEmit, S as errorDatabaseConnectionRequired, St as resolveMigrationRef, T as errorFileNotFound, Tt as runCommandAction, U as executeMigrationNewCommand, W as executeMigrationPlanCommand, X as hasMigrationPath, Y as findPackageByDirPath, Z as listRefsByContractHash, _ as enumerateCheckSpaces, _t as requireLiveDatabase, at as maskConnectionUrl, b as errorContractArgConflict, bt as resolveContractRefToSnapshot, ct as readContractEnvelope, d as closeQuietly, dt as refuseContractSpaceIntegrity, et as loadContractSpaceAggregateForCli, gt as refuseUnknownInvariants, ht as refusePackageCorruptionOnAggregate, i as appliedHashesFromLedger, j as errorNoMigrations, jt as targetSupportsMigrations, k as errorMigrationPackageNotFound, kt as sanitizeErrorMessage, l as checkSingleTarget, lt as readContractIR, m as deriveStatusEdgeAnnotations, mt as refuseMissingInvariantPath, n as advanceRefSafely, nt as mapCaughtMigrationError, o as buildMigrationSpaceGraphEntries, ot as migrationSpaceListEntriesFromAggregate, p as createControlClient, pt as refuseMarkerOutsideGraph, q as executeRefListCommand, rt as mapContractAtError, s as buildReadAggregate, st as originHashForStatus, t as CliStructuredError$1$1, tt as looksLikePath, u as chooseAction, ut as readMigrationRefs, v as errorConfigValidation$1, vt as resolveAppTargetPath, w as errorDriverRequired, x as errorContractValidationFailed, y as errorConsentPlanMismatch, yt as resolveContractRef$1 } from "./ref-BSRf-7Uh-JmET-ptm.mjs";
+import { c as spaceMigrationDirectory } from "./verify-contract-spaces-DomK5uP5-CyI3hD3Q.mjs";
+import { i as createScaffoldSpecifierResolver } from "./import-roots-D0H8HuRw.mjs";
+import { $ as loadContractRawSafely, A as errorMigrationPlanningFailed, At as statusForMigrationHash, C as errorDestructiveChanges, Ct as resolveRefAdvancementFields, D as errorLegendHumanOnly, Dt as runMigrationCheck, E as errorHashMismatch, F as errorTargetMigrationNotSupported, H as executeMigrateShowPlan, I as errorTargetMismatch, J as executeRefSetCommand, K as executeRefDeleteCommand, L as errorUnexpected, M as errorPathUnreachable, Mt as toDeclaredExtensionsFromRaw, N as errorRunnerFailed, O as errorMarkerMissing, Ot as runMigrationList, P as errorRuntime, Q as loadAggregateIntegrityViolations, R as executeContractEmit, S as errorDatabaseConnectionRequired, St as resolveMigrationRef, T as errorFileNotFound, Tt as runCommandAction, U as executeMigrationNewCommand, W as executeMigrationPlanCommand, X as hasMigrationPath, Y as findPackageByDirPath, Z as listRefsByContractHash, _ as enumerateCheckSpaces, _t as requireLiveDatabase, at as maskConnectionUrl, b as errorContractArgConflict, bt as resolveContractRefToSnapshot, ct as readContractEnvelope, d as closeQuietly, dt as refuseContractSpaceIntegrity, et as loadContractSpaceAggregateForCli, gt as refuseUnknownInvariants, ht as refusePackageCorruptionOnAggregate, i as appliedHashesFromLedger, j as errorNoMigrations, jt as targetSupportsMigrations, k as errorMigrationPackageNotFound, kt as sanitizeErrorMessage, l as checkSingleTarget, lt as readContractIR, m as deriveStatusEdgeAnnotations, mt as refuseMissingInvariantPath, n as advanceRefSafely, nt as mapCaughtMigrationError, o as buildMigrationSpaceGraphEntries, ot as migrationSpaceListEntriesFromAggregate, p as createControlClient, pt as refuseMarkerOutsideGraph, q as executeRefListCommand, rt as mapContractAtError, s as buildReadAggregate, st as originHashForStatus, t as CliStructuredError$1$1, tt as looksLikePath, u as chooseAction, ut as readMigrationRefs, v as errorConfigValidation$1, vt as resolveAppTargetPath, w as errorDriverRequired, x as errorContractValidationFailed, y as errorConsentPlanMismatch, yt as resolveContractRef$1 } from "./ref-dWFulULw-TMeX1ZM1.mjs";
 import { n as buildNextSteps, t as InitOutputSchema } from "./output-CovTDY14-CUoAqLML.mjs";
-import { r as loadConfig } from "./exports-UjssmDwy.mjs";
+import { r as loadConfig, t as finalizeConfig } from "./exports-Cv8nMmBT.mjs";
 import { createRequire } from "node:module";
 import { existsSync, mkdirSync, readFileSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import { ifDefined } from "@prisma/orm-framework/utils/defined";
@@ -21,19 +21,19 @@ import { type } from "arktype";
 import { defineCommand, defineCommandFamily, defineConfigSection, defineServerCommand, flag, positional } from "@prisma/cli-engine";
 import { CliStructuredError as CliStructuredError$1, notOk as notOk$1, ok as ok$1 } from "@prisma/cli-engine/protocol";
 import { collectConfigIssues } from "@prisma/orm-framework/config/config-validation";
+import { DEFAULT_CONTRACT_SOURCE_DIR } from "@prisma/orm-framework/config/config-types";
+import { pathToFileURL } from "node:url";
 import { printPsl } from "@prisma/orm-framework/psl-printer";
 import { EOL, tmpdir } from "node:os";
 import { format } from "@prisma/orm-framework/psl-parser/format";
-import { DEFAULT_CONTRACT_SOURCE_DIR } from "@prisma/orm-framework/config/config-types";
 import { spawn } from "node:child_process";
 import { detect } from "package-manager-detector/detect";
 import { applyEdits, modify, parse, printParseErrorCode } from "jsonc-parser";
 import stringWidth from "string-width";
 import { bold, createColors, cyan, cyanBright, dim, green, yellow } from "colorette";
-import { pathToFileURL } from "node:url";
 import { build } from "esbuild";
-//#region ../../../1-framework/3-tooling/cli/dist/load-config-Bdk10EKR.mjs
-var version = "8.0.0-rc.3-dev.7";
+//#region ../../../1-framework/3-tooling/cli/dist/load-config-CJf_3AeJ.mjs
+var version = "8.0.0-rc.3-dev.8";
 const MISSING_CONFIG_ACTION = {
 	kind: "run-command",
 	label: "Create a config file",
@@ -91,7 +91,7 @@ function unreadableDiagnostic(error) {
 		}]
 	};
 }
-function isRecord(value) {
+function isRecord$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 /**
@@ -101,10 +101,10 @@ function isRecord(value) {
 */
 function collectArtifactCollisionIssues(raw) {
 	const contract = raw["contract"];
-	if (!isRecord(contract)) return [];
+	if (!isRecord$1(contract)) return [];
 	const source = contract["source"];
 	const output = contract["output"];
-	if (!isRecord(source) || typeof output !== "string") return [];
+	if (!isRecord$1(source) || typeof output !== "string") return [];
 	const inputs = source["inputs"];
 	if (!Array.isArray(inputs)) return [];
 	let emitted;
@@ -130,7 +130,7 @@ function validate(raw) {
 		ok: false,
 		diagnostics: [sectionAbsentDiagnostic()]
 	};
-	if (!isRecord(raw)) return {
+	if (!isRecord$1(raw)) return {
 		ok: false,
 		diagnostics: [notAnObjectDiagnostic()]
 	};
@@ -249,12 +249,39 @@ function normalizeError(error) {
 * Prisma Next rather than something the user did. Re-throwing lets the engine settle it as a bug
 * at exit 1, where converting it would report the same number as a bad connection string.
 */
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/**
+* Hands the handler a config whose paths are absolute. The engine's own
+* loader evaluates `prisma.config.ts` without touching the paths inside it, so
+* a command mounted in the unified host receives `contract.output` and
+* `migrations.dir` exactly as authored — usually relative — while this repo's
+* bin finalizes them in its loader. Anchoring here, on the section every ORM
+* command reads, makes both hosts hand handlers the same absolute paths.
+*
+* The anchor is the working directory: the engine discovers the config in the
+* working directory only, so that is the file's own directory. (A `--config`
+* pointing into another directory is not visible from a command context; a
+* relative path inside such a file resolves against the invocation directory,
+* which is also what the file's author sees the command run from.)
+* Finalization is idempotent — an already-absolute path resolves to itself —
+* so a config that arrived finalized passes through unchanged.
+*/
+function finalizedConfigContext(ctx) {
+	if (!isRecord(ctx.config)) return ctx;
+	const config = blindCast(ctx.config);
+	return {
+		...ctx,
+		config: finalizeConfig(config, ctx.cwd)
+	};
+}
 function defineOrmCommand(def) {
 	return defineCommand({
 		...def,
 		handler: async (args, ctx) => {
 			try {
-				return await def.handler(args, ctx);
+				return await def.handler(args, finalizedConfigContext(ctx));
 			} catch (error) {
 				if (isInternalError(error)) throw error;
 				return notOk$1(normalizeError(error));
@@ -3283,40 +3310,40 @@ model Post {
 function starterSchemaTsPostgres(builder) {
 	return `import { defineContract } from '${builder}';
 
-export const contract = defineContract(
-  {},
-  ({ field, model, rel }) => ({
+export const contract = defineContract({}, ({ field, model, rel }) => {
+  const User = model('User', {
+    fields: {
+      id: field.id.uuidv7String(),
+      email: field.text().unique(),
+      username: field.text().optional(),
+      name: field.text().optional(),
+      createdAt: field.temporal.createdAt(),
+      updatedAt: field.temporal.updatedAt(),
+    },
+  });
+
+  const Post = model('Post', {
+    fields: {
+      id: field.id.uuidv7String(),
+      title: field.text(),
+      content: field.text().optional(),
+      authorId: field.uuidString(),
+      createdAt: field.temporal.createdAt(),
+      updatedAt: field.temporal.updatedAt(),
+    },
+  });
+
+  return {
     models: {
-      User: model('User', {
-        fields: {
-          id: field.id.uuidv7String(),
-          email: field.text().unique(),
-          username: field.text().optional(),
-          name: field.text().optional(),
-          createdAt: field.temporal.createdAt(),
-          updatedAt: field.temporal.updatedAt(),
-        },
-        relations: {
-          posts: rel.hasMany('Post', { by: 'authorId' }),
-        },
+      User: User.relations({
+        posts: rel.hasMany(Post, { by: 'authorId' }),
       }),
-
-      Post: model('Post', {
-        fields: {
-          id: field.id.uuidv7String(),
-          title: field.text(),
-          content: field.text().optional(),
-          authorId: field.uuidString(),
-          createdAt: field.temporal.createdAt(),
-          updatedAt: field.temporal.updatedAt(),
-        },
-        relations: {
-          author: rel.belongsTo('User', { from: 'authorId', to: 'id' }),
-        },
+      Post: Post.relations({
+        author: rel.belongsTo(User, { from: 'authorId', to: 'id' }),
       }),
     },
-  }),
-);
+  };
+});
 `;
 }
 function starterSchemaTsMongo(builder) {
@@ -3373,7 +3400,8 @@ export default definePrismaConfig({
 }
 function dbFile(target, resolveImportSpecifier = keepInternalSpecifiers) {
 	const runtime = targetEntrypoint(target, "runtime", resolveImportSpecifier);
-	if (target === "postgres") return `import postgres from '${runtime}';
+	if (target === "postgres") return `import 'dotenv/config';
+import postgres from '${runtime}';
 import type { Contract } from './contract.d';
 import contractJson from './contract.json' with { type: 'json' };
 
@@ -3382,7 +3410,8 @@ export const db = postgres<Contract>({
   url: process.env['DATABASE_URL']!,
 });
 `;
-	return `import mongo from '${runtime}';
+	return `import 'dotenv/config';
+import mongo from '${runtime}';
 import type { Contract } from './contract.d';
 import contractJson from './contract.json' with { type: 'json' };
 
@@ -4788,6 +4817,28 @@ function retriedWarning(failure) {
 * command, and this decides — from the stderr it returned — that another
 * manager is worth a try.
 */
+/**
+* The engine dependency spec a fresh scaffold installs. The scaffolded
+* `prisma.config.ts` imports `defineConfig` from `@prisma/cli-engine`, and the
+* installed `@prisma/cli` names the exact engine version it runs against — so
+* the spec is read from the manifest the install just placed, never guessed
+* from a dist-tag (whose `latest` has lagged that version before and broken
+* the very next command). A CLI without a readable engine entry falls back to
+* the `next` tag, the release train the CLI itself publishes under.
+*/
+function engineDevDependencySpec(cwd) {
+	try {
+		const manifest = JSON.parse(readFileSync(join(cwd, "node_modules", "@prisma", "cli", "package.json"), "utf-8"));
+		if (typeof manifest === "object" && manifest !== null) for (const field of ["dependencies", "peerDependencies"]) {
+			const block = Reflect.get(manifest, field);
+			if (typeof block === "object" && block !== null) {
+				const engine = Reflect.get(block, "@prisma/cli-engine");
+				if (typeof engine === "string" && engine.length > 0) return `@prisma/cli-engine@${engine}`;
+			}
+		}
+	} catch {}
+	return "@prisma/cli-engine@next";
+}
 async function installProjectDependencies(ctx) {
 	const pair = async (manager) => {
 		const runtimeDeps = await ctx.packages.install({
@@ -4950,7 +5001,7 @@ const createInitCommand = (injected) => defineOrmCommand({
 			text: note
 		});
 		const deps = [targetPackageName(inputs.target, scaffold.resolveImportSpecifier), "dotenv"];
-		const cliDevDeps = ["@prisma/cli@next", "@prisma/cli-engine"];
+		const cliDevDeps = ["@prisma/cli@next"];
 		const devDeps = scaffold.hasTypesNode ? cliDevDeps : [...cliDevDeps, "@types/node"];
 		const findings = [];
 		const extraActions = [];
@@ -5017,6 +5068,19 @@ const createInitCommand = (injected) => defineOrmCommand({
 				findings.push(installFailedFinding(outcome.failure, scaffold.filesWritten));
 				return settle(4);
 			}
+			const engineSpec = engineDevDependencySpec(ctx.cwd);
+			const engineInstall = await ctx.packages.install({
+				packages: [engineSpec],
+				dev: true,
+				cwd: ctx.cwd,
+				...ifDefined("manager", outcome.manager)
+			});
+			if (!engineInstall.ok) {
+				packagesInstalled = "failed";
+				findings.push(installFailedFinding(engineInstall.failure, scaffold.filesWritten));
+				return settle(4);
+			}
+			devDeps.push(engineSpec);
 			packagesInstalled = "installed";
 			installedManager = outcome.manager;
 			const emitStep = "Emit the contract";
@@ -5041,7 +5105,7 @@ const createInitCommand = (injected) => defineOrmCommand({
 				findings.push(emitFailedFinding(causeMessage(error), scaffold.filesWritten));
 				return settle(5);
 			}
-		} else extraActions.push(chooseAction(`Install the project dependencies with your package manager: ${deps.join(", ")} (and ${devDeps.join(", ")} as development dependencies)`));
+		} else extraActions.push(chooseAction(`Install the project dependencies with your package manager: ${deps.join(", ")} (and ${devDeps.join(", ")} plus @prisma/cli-engine at the version @prisma/cli declares as its peer, as development dependencies)`));
 		if (inputs.probeDb) {
 			const probe = probeWarning(await probeServerVersion({
 				baseDir: ctx.cwd,
@@ -5100,7 +5164,7 @@ const lspCommand = defineServerCommand({
 	} },
 	handler: async (args, io) => {
 		const exitCode = await withoutClientProcessIdInArgv(async () => {
-			const { startServer } = await import("./exports-DLDFkjNv.mjs");
+			const { startServer } = await import("./exports-CN1Qe98l.mjs");
 			return startServer({
 				stdin: io.stdin,
 				stdout: io.stdout,
@@ -9534,8 +9598,6 @@ const ormCommandFamily = defineCommandFamily({
 });
 /** The file the ORM's loader reads when `--config` names none. */
 const ORM_CONFIG_FILENAME = "prisma.config.ts";
-/** The pre-consolidation filename, still read as a deprecated fallback. */
-const DEPRECATED_ORM_CONFIG_FILENAME = "prisma-next.config.ts";
 /**
 * Builds the engine's `Runtime.config` from `prisma.config.ts`.
 *
@@ -9543,28 +9605,25 @@ const DEPRECATED_ORM_CONFIG_FILENAME = "prisma-next.config.ts";
 * ORM's c12 loader evaluates the module asynchronously and finalizes paths
 * against the config file's own directory. It reads the same shape the engine
 * does — defineConfig from `@prisma/cli-engine` with the whole Prisma Next
-* configuration nested as the single `orm` section — and keeps reading the
-* deprecated `prisma-next.config.ts` filename and flat shape, surfacing each
-* through `warn`.
+* configuration nested as the single `orm` section.
 *
 * Only failures that prevent evaluation entirely are diagnostics here, and
 * they carry `section: null` so they fail exactly the commands that read
 * config. Structural verdicts belong to the section validator.
 */
 async function loadOrmConfig(options) {
+	const path = resolve(options.cwd, options.configPath ?? ORM_CONFIG_FILENAME);
 	const loaded = await loadConfig(options.configPath, { cwd: options.cwd });
 	if (!loaded.ok) return {
-		path: resolve(options.cwd, options.configPath ?? ORM_CONFIG_FILENAME),
+		path,
 		sections: {},
 		diagnostics: [{
 			section: null,
 			diagnostic: toEngineDiagnostic(loaded.failure)
 		}]
 	};
-	for (const deprecation of loaded.value.deprecations) options.warn?.(deprecation.message);
-	const filename = loaded.value.deprecations.some((deprecation) => deprecation.code === "CONFIG.DEPRECATED_FILENAME") ? DEPRECATED_ORM_CONFIG_FILENAME : ORM_CONFIG_FILENAME;
 	return {
-		path: resolve(options.cwd, options.configPath ?? filename),
+		path,
 		sections: { ["orm"]: loaded.value.config },
 		diagnostics: []
 	};