@prisma-next/cli 0.14.0-dev.3 → 0.14.0-dev.30

package/src/commands/init/detect-package-manager.ts

@@ -6,6 +6,10 @@ export type PackageManager = 'pnpm' | 'npm' | 'yarn' | 'bun' | 'deno';
 
 const KNOWN: ReadonlySet<string> = new Set<PackageManager>(['pnpm', 'npm', 'yarn', 'bun', 'deno']);
 
+function isPackageManager(name: string): name is PackageManager {
+  return KNOWN.has(name);
+}
+
 /**
  * Resolves the package manager `init` should drive for `add` / `install`
  * commands. Tries, in order:
@@ -28,12 +32,12 @@ const KNOWN: ReadonlySet<string> = new Set<PackageManager>(['pnpm', 'npm', 'yarn
  */
 export async function detectPackageManager(cwd: string): Promise<PackageManager> {
   const detected = await detect({ cwd });
-  if (detected && KNOWN.has(detected.name)) {
-    return detected.name as PackageManager;
+  if (detected && isPackageManager(detected.name)) {
+    return detected.name;
   }
   const userAgent = getUserAgent();
-  if (userAgent !== null && KNOWN.has(userAgent)) {
-    return userAgent as PackageManager;
+  if (userAgent !== null && isPackageManager(userAgent)) {
+    return userAgent;
   }
   return 'npm';
 }

package/src/commands/init/hygiene-package-scripts.ts

@@ -1,3 +1,5 @@
+import { blindCast } from '@prisma-next/utils/casts';
+
 /**
  * The package.json `scripts` entries `init` adds idempotently (FR3.5).
  * The script *name* mirrors the CLI subcommand path (`contract:emit` →
@@ -58,10 +60,18 @@ export function mergePackageScripts(
   existing: string,
   required: readonly RequiredScript[] = REQUIRED_SCRIPTS,
 ): PackageScriptsMergeResult {
-  const parsed = JSON.parse(existing) as Record<string, unknown>;
+  const parsed = blindCast<
+    Record<string, unknown>,
+    'JSON.parse returns `unknown`; package.json is a JSON object so its top level is a string-keyed record'
+  >(JSON.parse(existing));
   const scripts: Record<string, string> =
     typeof parsed['scripts'] === 'object' && parsed['scripts'] !== null
-      ? { ...(parsed['scripts'] as Record<string, string>) }
+      ? {
+          ...blindCast<
+            Record<string, string>,
+            'guarded above: parsed.scripts is a non-null object; package.json `scripts` values are command strings'
+          >(parsed['scripts']),
+        }
       : {};
 
   const warnings: string[] = [];
@@ -131,7 +141,10 @@ export interface EsmModuleTypeResult {
  *   ESM and we don't silently overwrite that.
  */
 export function ensureEsmModuleType(existing: string): EsmModuleTypeResult {
-  const parsed = JSON.parse(existing) as Record<string, unknown>;
+  const parsed = blindCast<
+    Record<string, unknown>,
+    'JSON.parse returns `unknown`; package.json is a JSON object so its top level is a string-keyed record'
+  >(JSON.parse(existing));
   const currentType = parsed['type'];
 
   if (currentType === 'module') {

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

@@ -1,9 +1,9 @@
+import { loadConfig } from '@prisma-next/config-loader';
 import type { AuthoringPslBlockDescriptorNamespace } from '@prisma-next/framework-components/authoring';
 import type { CoreSchemaView } from '@prisma-next/framework-components/control';
 import type { PslDocumentAst } from '@prisma-next/framework-components/psl-ast';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { relative, resolve } from 'pathe';
-import { loadConfig } from '../config-loader';
 import { createControlClient } from '../control-api/client';
 import {
   CliStructuredError,

package/src/commands/lsp.ts

@@ -0,0 +1,32 @@
+import { Command } from 'commander';
+import {
+  addGlobalOptions,
+  setCommandDescriptions,
+  setCommandExamples,
+} from '../utils/command-helpers';
+
+export function createLspCommand(): Command {
+  const command = new Command('lsp');
+  setCommandDescriptions(
+    command,
+    'Start the Prisma Next language server',
+    'Launches a Language Server Protocol server that publishes PSL parse diagnostics\n' +
+      'and handles whole-document PSL formatting for the schema inputs declared in\n' +
+      'your config (contract.source.inputs). Formatting uses the Prisma Next PSL\n' +
+      'formatter and the formatter block from the project config.\n' +
+      'Communicates over stdio; intended to be spawned by an\n' +
+      'editor, not run interactively. The server keeps running until the editor client\n' +
+      'disconnects.',
+  );
+  setCommandExamples(command, ['prisma-next lsp --stdio']);
+  addGlobalOptions(command)
+    .option('--stdio', 'Communicate with the editor over stdio (the default and only transport)')
+    .action(async () => {
+      // Lazy import so `vscode-languageserver` stays off every other command's
+      // startup path — only `prisma-next lsp` pays its load cost.
+      const { startServer } = await import('@prisma-next/language-server');
+      startServer();
+    });
+
+  return command;
+}

package/src/commands/migrate.ts

@@ -1,4 +1,5 @@
 import { readFile } from 'node:fs/promises';
+import { loadConfig } from '@prisma-next/config-loader';
 import type { Contract } from '@prisma-next/contract/types';
 import { createControlStack } from '@prisma-next/framework-components/control';
 import { type ContractSpaceMember, requireHeadRef } from '@prisma-next/migration-tools/aggregate';
@@ -11,7 +12,6 @@ import { readRefs } from '@prisma-next/migration-tools/refs';
 import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
-import { loadConfig } from '../config-loader';
 import { createControlClient } from '../control-api/client';
 import { planMemberPath } from '../control-api/operations/migrate';
 import type {

package/src/commands/migration-check.ts

@@ -1,5 +1,6 @@
 import { existsSync, readdirSync, readFileSync, 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';
 import type {
   ContractSpaceAggregate,
@@ -25,7 +26,6 @@ import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
 import { join, relative } from 'pathe';
-import { loadConfig } from '../config-loader';
 import {
   type CliStructuredError,
   errorAmbiguousMigrationRef,

package/src/commands/migration-graph.ts

@@ -1,9 +1,9 @@
+import { loadConfig } from '@prisma-next/config-loader';
 import { EMPTY_CONTRACT_HASH } from '@prisma-next/migration-tools/constants';
 import type { MigrationGraph } from '@prisma-next/migration-tools/graph';
 import { ifDefined } from '@prisma-next/utils/defined';
 import { ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
-import { loadConfig } from '../config-loader';
 import type { CliStructuredError } from '../utils/cli-errors';
 import {
   addGlobalOptions,

package/src/commands/migration-list.ts

@@ -1,3 +1,4 @@
+import { loadConfig } from '@prisma-next/config-loader';
 import type {
   ContractSpaceAggregate,
   ContractSpaceMember,
@@ -13,7 +14,6 @@ import {
 import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
-import { loadConfig } from '../config-loader';
 import {
   type CliStructuredError,
   errorInvalidSpaceId,

package/src/commands/migration-log.ts

@@ -1,9 +1,9 @@
+import { loadConfig } from '@prisma-next/config-loader';
 import type { LedgerEntryRecord } from '@prisma-next/contract/types';
 import { MigrationToolsError } from '@prisma-next/migration-tools/errors';
 import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
-import { loadConfig } from '../config-loader';
 import { createControlClient } from '../control-api/client';
 import {
   CliStructuredError,

package/src/commands/migration-new.ts

@@ -9,6 +9,7 @@
  */
 
 import { readFile } from 'node:fs/promises';
+import { loadConfig } from '@prisma-next/config-loader';
 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';
@@ -25,7 +26,6 @@ import { writeMigrationTs } from '@prisma-next/migration-tools/migration-ts';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
 import { join, relative } from 'pathe';
-import { loadConfig } from '../config-loader';
 import {
   CliStructuredError,
   errorFileNotFound,

package/src/commands/migration-plan.ts

@@ -1,4 +1,5 @@
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { loadConfig } from '@prisma-next/config-loader';
 import type { Contract } from '@prisma-next/contract/types';
 import { getEmittedArtifactPaths } from '@prisma-next/emitter';
 import {
@@ -21,7 +22,6 @@ import { writeMigrationTs } from '@prisma-next/migration-tools/migration-ts';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
 import { join, relative } from 'pathe';
-import { loadConfig } from '../config-loader';
 import {
   type CliErrorConflict,
   CliStructuredError,

package/src/commands/migration-show.ts

@@ -1,4 +1,5 @@
 import { readFile } from 'node:fs/promises';
+import { loadConfig } from '@prisma-next/config-loader';
 import type { Contract } from '@prisma-next/contract/types';
 import {
   APP_SPACE_ID,
@@ -13,7 +14,6 @@ import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
 import { relative } from 'pathe';
-import { loadConfig } from '../config-loader';
 import { createControlClient } from '../control-api/client';
 import {
   type CliStructuredError,

package/src/commands/migration-status.ts

@@ -1,3 +1,4 @@
+import { loadConfig } from '@prisma-next/config-loader';
 import type { LedgerEntryRecord } from '@prisma-next/contract/types';
 import type {
   ContractMarkerRecordLike,
@@ -17,7 +18,6 @@ import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { dim, yellow } from 'colorette';
 import { Command } from 'commander';
-import { loadConfig } from '../config-loader';
 import { createControlClient } from '../control-api/client';
 import {
   CliStructuredError,

package/src/commands/ref.ts

@@ -1,4 +1,5 @@
 import { readFile } from 'node:fs/promises';
+import { loadConfig } from '@prisma-next/config-loader';
 import { EMPTY_CONTRACT_HASH } from '@prisma-next/migration-tools/constants';
 import { MigrationToolsError } from '@prisma-next/migration-tools/errors';
 import { findLatestMigration, isGraphNode } from '@prisma-next/migration-tools/migration-graph';
@@ -14,7 +15,6 @@ import {
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
 import { join } from 'pathe';
-import { loadConfig } from '../config-loader';
 import {
   CliStructuredError,
   errorFileNotFound,

package/src/control-api/client.ts

@@ -696,17 +696,18 @@ class ControlClientImpl implements ControlClient {
       // payload — `enrichContract` only adds capability + extension
       // metadata onto whatever shape it receives. The structural
       // check happens immediately afterwards via
-      // `familyInstance.deserializeContract(enrichedIR)`, which is
-      // the seam-of-record and the only thing that may surface
+      // `familyInstance.deserializeContract`, which is the
+      // seam-of-record and the only thing that may surface
       // structural errors to the caller.
       const enrichedIR = enrichContract(
         contractRaw as unknown as Contract,
         this.frameworkComponents ?? [],
       );
+      const rawContractJson = this.options.target.contractSerializer.serializeContract(enrichedIR);
 
       let deserializedContract: Contract;
       try {
-        deserializedContract = this.familyInstance.deserializeContract(enrichedIR);
+        deserializedContract = this.familyInstance.deserializeContract(rawContractJson);
       } catch (error) {
         onProgress?.({
           action: 'emit',

package/src/control-api/operations/contract-emit.ts

@@ -1,4 +1,5 @@
 import { mkdir } from 'node:fs/promises';
+import { loadConfig } from '@prisma-next/config-loader';
 import type { Contract } from '@prisma-next/contract/types';
 import { emit, getEmittedArtifactPaths } from '@prisma-next/emitter';
 import { createControlStack } from '@prisma-next/framework-components/control';
@@ -7,7 +8,6 @@ import { blindCast } from '@prisma-next/utils/casts';
 import { ifDefined } from '@prisma-next/utils/defined';
 import type { JsonObject } from '@prisma-next/utils/json';
 import { dirname, join } from 'pathe';
-import { loadConfig } from '../../config-loader';
 import { errorContractConfigMissing, errorRuntime } from '../../utils/cli-errors';
 import { queueEmitByOutput } from '../../utils/emit-queue';
 import { toExtensionInputs } from '../../utils/extension-pack-inputs';
@@ -258,16 +258,16 @@ export async function executeContractEmit(
       // Blind cast: `validateProviderResult` upstream has already
       // pinned `validatedContract.value` to the provider's loose
       // `Contract` envelope, but the local `Contract` type at this
-      // call site is the precise structural interface. Re-narrowing
-      // the envelope into the precise type is exactly what the
-      // `familyInstance.deserializeContract(enrichedIR)` call on the
-      // next line does — the cast just defers the structural check
-      // by one statement so `enrichContract` can decorate first.
+      // call site is the precise structural interface. The cast just
+      // defers the structural check by one statement so `enrichContract`
+      // can decorate first; the subsequent serialize→deserialize round-trip
+      // re-narrows the envelope into the precise type.
       const enrichedIR = enrichContract(
         validatedContract.value as unknown as Contract,
         frameworkComponents,
       );
-      const deserializedContract = familyInstance.deserializeContract(enrichedIR);
+      const rawContractJson = config.target.contractSerializer.serializeContract(enrichedIR);
+      const deserializedContract = familyInstance.deserializeContract(rawContractJson);
       // Each target's descriptor ships a `contractSerializer` SPI; the
       // framework canonicalizer threads its `serializeContract` so the
       // on-disk JSON envelope is constructed by target-owned code

package/src/control-api/operations/db-verify.ts

@@ -272,6 +272,7 @@ function buildSkippedSchemaResult(member: ContractSpaceMember): VerifyDatabaseSc
     target: { expected: contract.target },
     schema: {
       issues: [],
+      schemaDiffIssues: [],
       root: {
         status: 'pass',
         kind: 'skipped',

package/src/control-api/operations/format.ts

@@ -0,0 +1,98 @@
+import { readFile, writeFile } from 'node:fs/promises';
+import { EOL } from 'node:os';
+import { loadConfig } from '@prisma-next/config-loader';
+import { type FormatOptions, format, PslFormatError } from '@prisma-next/psl-parser/format';
+import { notOk, ok, type Result } from '@prisma-next/utils/result';
+import { CliStructuredError, errorRuntime, errorUnexpected } from '../../utils/cli-errors';
+
+export interface FormatOperationOptions {
+  readonly configPath?: string;
+  readonly eol?: string;
+}
+
+export interface FormatOperationResult {
+  readonly formatted: boolean;
+  readonly path?: string;
+}
+
+export function resolveNewline(
+  formatterNewline: 'LF' | 'CRLF' | undefined,
+  eol: string,
+): 'LF' | 'CRLF' {
+  if (formatterNewline !== undefined) {
+    return formatterNewline;
+  }
+  return eol === '\r\n' ? 'CRLF' : 'LF';
+}
+
+export async function executeFormat(
+  options: FormatOperationOptions,
+): Promise<Result<FormatOperationResult, CliStructuredError>> {
+  const eol = options.eol ?? EOL;
+
+  let config: Awaited<ReturnType<typeof loadConfig>>;
+  try {
+    config = await loadConfig(options.configPath);
+  } catch (error) {
+    if (CliStructuredError.is(error)) {
+      return notOk(error);
+    }
+    return notOk(errorUnexpected(error instanceof Error ? error.message : String(error)));
+  }
+
+  const source = config.contract?.source;
+  if (source?.sourceFormat !== 'psl') {
+    return ok({ formatted: false });
+  }
+
+  const inputPath = source.inputs?.[0];
+  if (inputPath === undefined) {
+    return ok({ formatted: false });
+  }
+
+  let contents: string;
+  try {
+    contents = await readFile(inputPath, 'utf-8');
+  } catch (error) {
+    return notOk(
+      errorRuntime('Failed to read contract source file', {
+        why: error instanceof Error ? error.message : String(error),
+        fix: `Check that ${inputPath} exists and is readable.`,
+      }),
+    );
+  }
+
+  const formatOptions: FormatOptions = {
+    indent: config.formatter?.indent ?? 2,
+    newline: resolveNewline(config.formatter?.newline, eol),
+  };
+
+  let formatted: string;
+  try {
+    formatted = format(contents, formatOptions);
+  } catch (error) {
+    if (error instanceof PslFormatError) {
+      return notOk(
+        errorRuntime('Cannot format PSL with parse errors', {
+          why: error.message,
+          fix: 'Fix the parse errors in your schema and try again.',
+          meta: { diagnostics: error.diagnostics },
+        }),
+      );
+    }
+    return notOk(errorUnexpected(error instanceof Error ? error.message : String(error)));
+  }
+
+  try {
+    await writeFile(inputPath, formatted, 'utf-8');
+  } catch (error) {
+    return notOk(
+      errorRuntime('Failed to write formatted contract source file', {
+        why: error instanceof Error ? error.message : String(error),
+        fix: `Check that ${inputPath} is writable.`,
+      }),
+    );
+  }
+
+  return ok({ formatted: true, path: inputPath });
+}

package/src/exports/index.ts

@@ -1,4 +1,5 @@
 // CLI-specific exports
 export { createContractEmitCommand } from '../commands/contract-emit';
+export { createFormatCommand } from '../commands/format';
 export type { LoadTsContractOptions } from '../load-ts-contract';
 export { loadContractFromTs } from '../load-ts-contract';

package/src/migration-cli.ts

@@ -45,6 +45,7 @@
 import { readFileSync, realpathSync, writeFileSync } from 'node:fs';
 import type { Writable } from 'node:stream';
 import { fileURLToPath } from 'node:url';
+import { loadConfig } from '@prisma-next/config-loader';
 import {
   CliStructuredError,
   errorMigrationCliInvalidConfigArg,
@@ -57,7 +58,6 @@ import type { MigrationMetadata } from '@prisma-next/migration-tools/metadata';
 import { buildMigrationArtifacts, type Migration } from '@prisma-next/migration-tools/migration';
 import { Cli, Command, Option, UsageError } from 'clipanion';
 import { dirname, join } from 'pathe';
-import { loadConfig } from './config-loader';
 
 /**
  * Constructor shape accepted by `MigrationCLI.run`. `Migration` subclasses

package/src/utils/combine-schema-results.ts

@@ -30,6 +30,7 @@ export function combineSchemaResults(
   let okAll = true;
   let firstFailure: VerifyDatabaseSchemaResult | undefined;
   let issues: VerifyDatabaseSchemaResult['schema']['issues'] = [];
+  let schemaDiffIssues: VerifyDatabaseSchemaResult['schema']['schemaDiffIssues'] = [];
   const counts = { pass: 0, warn: 0, fail: 0, totalNodes: 0 };
   const childRoots: Array<VerifyDatabaseSchemaResult['schema']['root']> = [];
   for (const [, result] of perSpace) {
@@ -38,6 +39,7 @@ export function combineSchemaResults(
       if (firstFailure === undefined) firstFailure = result;
     }
     issues = [...issues, ...result.schema.issues];
+    schemaDiffIssues = [...schemaDiffIssues, ...result.schema.schemaDiffIssues];
     counts.pass += result.schema.counts.pass;
     counts.warn += result.schema.counts.warn;
     counts.fail += result.schema.counts.fail;
@@ -65,6 +67,7 @@ export function combineSchemaResults(
     target: appResult.target,
     schema: {
       issues,
+      schemaDiffIssues,
       root: {
         status: okAll ? 'pass' : 'fail',
         kind: 'aggregate',

package/src/utils/formatters/verify.ts

@@ -539,6 +539,14 @@ export function formatSchemaVerifyOutput(
   });
   lines.push(...treeLines);
 
+  if (result.schema.schemaDiffIssues.length > 0) {
+    lines.push('');
+    lines.push(formatRed('Schema drift:'));
+    for (const issue of result.schema.schemaDiffIssues) {
+      lines.push(`  ${formatRed('✖')} ${issue.message}`);
+    }
+  }
+
   // Add counts and timings in verbose mode
   if (isVerbose(flags, 1)) {
     lines.push(`${formatDimText(`  Total time: ${result.timings.total}ms`)}`);

package/src/utils/migration-command-scaffold.ts

@@ -1,9 +1,9 @@
 import { readFile } from 'node:fs/promises';
 import { relative, resolve } from 'node:path';
+import { loadConfig } from '@prisma-next/config-loader';
 import { hasMigrations } from '@prisma-next/framework-components/control';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import type { Command } from 'commander';
-import { loadConfig } from '../config-loader';
 import { createControlClient } from '../control-api/client';
 import type { ControlClient } from '../control-api/types';
 import {