fix: simplify strict project binding resolution

Author: luanvdw

packages/cli/src/controllers/app.ts

@@ -2232,6 +2232,7 @@ async function resolveProjectContext(
   explicitProject: string | undefined,
   options?: {
     branch?: ResolvedDeployBranch;
+    commandName?: string;
   },
 ): Promise<ResolvedAppProjectContext> {
   const authState = await requireAuthenticatedAuthState(context);
@@ -3237,12 +3238,12 @@ function localResolutionPinStaleError(): CliError {
     domain: "project",
     summary: "Local project binding is stale",
     why: `The target recorded in ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} is no longer available in the selected workspace.`,
-    fix: `Delete ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} and re-run to re-bootstrap.`,
+    fix: `Delete ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH}, then choose a Project explicitly.`,
     meta: {
       pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
     },
     exitCode: 1,
-    nextSteps: ["prisma-cli app deploy"],
+    nextSteps: ["prisma-cli project list", "prisma-cli project link <id-or-name>", "prisma-cli app deploy --project <id-or-name>"],
   });
 }
 

packages/cli/src/controllers/project.ts

@@ -1175,10 +1175,3 @@ function repoConnectionFixForStatus(status: number): string {
 
   return "Re-run with --trace for the underlying API response details.";
 }
-
-function toProjectSummary(project: ProjectCandidate) {
-  return {
-    id: project.id,
-    name: project.name,
-  };
-}

packages/cli/src/lib/project/resolution.ts

@@ -19,11 +19,8 @@ export interface ProjectCandidate extends ProjectSummary {
   workspace: AuthWorkspace;
 }
 
-export interface ResolvedProjectTarget {
-  workspace: AuthWorkspace;
-  project: ProjectSummary;
-  resolution: ProjectResolution;
-}
+export type ResolvedProjectTarget = BoundProjectShowResult;
+type BoundProjectSource = Exclude<ProjectSource, "unbound">;
 
 export type InferredTargetNameSource = "package-name" | "directory-name";
 
@@ -43,51 +40,10 @@ export interface ResolveProjectOptions {
 
 export async function resolveProjectTarget(options: ResolveProjectOptions): Promise<ResolvedProjectTarget> {
   const projects = await options.listProjects();
+  const target = await resolveBoundProjectTarget(options, projects, { allowEnvProjectId: true });
 
-  if (options.explicitProject) {
-    return resolvedTarget(options.workspace, resolveExplicitProject(options.explicitProject, projects, options.workspace), "explicit", {
-      targetName: options.explicitProject,
-      targetNameSource: "explicit",
-    });
-  }
-
-  if (options.envProjectId) {
-    const project = projects.find((candidate) => candidate.id === options.envProjectId);
-    if (!project) {
-      throw projectNotFoundError(options.envProjectId, options.workspace);
-    }
-    return resolvedTarget(options.workspace, project, "env", {
-      targetName: options.envProjectId,
-      targetNameSource: "env",
-    });
-  }
-
-  const localPin = await readLocalResolutionPin(options.context.runtime.cwd);
-  if (localPin.kind === "invalid") {
-    throw localStateStaleError();
-  }
-  if (localPin.kind === "present") {
-    if (localPin.pin.workspaceId !== options.workspace.id) {
-      throw localStateStaleError();
-    }
-
-    const project = projects.find((candidate) => candidate.id === localPin.pin.projectId);
-    if (!project) {
-      throw localStateStaleError();
-    }
-
-    return resolvedTarget(options.workspace, project, "local-pin", {
-      targetName: project.name,
-      targetNameSource: "local-pin",
-    });
-  }
-
-  const platformMapping = await resolveDurablePlatformMapping();
-  if (platformMapping && platformMapping.workspace.id === options.workspace.id) {
-    return resolvedTarget(options.workspace, platformMapping, "platform-mapping", {
-      targetName: platformMapping.name,
-      targetNameSource: "platform-mapping",
-    });
+  if (target) {
+    return target;
   }
 
   throw await projectSetupRequiredError({
@@ -99,40 +55,10 @@ export async function resolveProjectTarget(options: ResolveProjectOptions): Prom
 
 export async function inspectProjectBinding(options: ResolveProjectOptions): Promise<ProjectShowResult> {
   const projects = await options.listProjects();
+  const target = await resolveBoundProjectTarget(options, projects, { allowEnvProjectId: false });
 
-  if (options.explicitProject) {
-    return resolvedTarget(options.workspace, resolveExplicitProject(options.explicitProject, projects, options.workspace), "explicit", {
-      targetName: options.explicitProject,
-      targetNameSource: "explicit",
-    });
-  }
-
-  const localPin = await readLocalResolutionPin(options.context.runtime.cwd);
-  if (localPin.kind === "invalid") {
-    throw localStateStaleError();
-  }
-  if (localPin.kind === "present") {
-    if (localPin.pin.workspaceId !== options.workspace.id) {
-      throw localStateStaleError();
-    }
-
-    const project = projects.find((candidate) => candidate.id === localPin.pin.projectId);
-    if (!project) {
-      throw localStateStaleError();
-    }
-
-    return resolvedTarget(options.workspace, project, "local-pin", {
-      targetName: project.name,
-      targetNameSource: "local-pin",
-    });
-  }
-
-  const platformMapping = await resolveDurablePlatformMapping();
-  if (platformMapping && platformMapping.workspace.id === options.workspace.id) {
-    return resolvedTarget(options.workspace, platformMapping, "platform-mapping", {
-      targetName: platformMapping.name,
-      targetNameSource: "platform-mapping",
-    });
+  if (target) {
+    return target;
   }
 
   return {
@@ -233,7 +159,7 @@ export async function projectSetupRequiredError(options: {
     summary: "Choose a Project before running this command",
     why: `This directory is not linked to a Prisma Project, and ${commandLabel} will not choose one from package or directory names.`,
     fix: "Link the directory to an existing Project, or pass --project <id-or-name> for this command.",
-    meta: suggestion,
+    meta: { ...suggestion },
     exitCode: 1,
     nextSteps: ["prisma-cli project list", ...suggestion.recoveryCommands],
   });
@@ -307,10 +233,66 @@ export async function resolveDurablePlatformMapping(): Promise<ProjectCandidate
   return null;
 }
 
+async function resolveBoundProjectTarget(
+  options: ResolveProjectOptions,
+  projects: ProjectCandidate[],
+  settings: {
+    allowEnvProjectId: boolean;
+  },
+): Promise<BoundProjectShowResult | null> {
+  if (options.explicitProject) {
+    return resolvedTarget(options.workspace, resolveExplicitProject(options.explicitProject, projects, options.workspace), "explicit", {
+      targetName: options.explicitProject,
+      targetNameSource: "explicit",
+    });
+  }
+
+  if (settings.allowEnvProjectId && options.envProjectId) {
+    const project = projects.find((candidate) => candidate.id === options.envProjectId);
+    if (!project) {
+      throw projectNotFoundError(options.envProjectId, options.workspace);
+    }
+    return resolvedTarget(options.workspace, project, "env", {
+      targetName: options.envProjectId,
+      targetNameSource: "env",
+    });
+  }
+
+  const localPin = await readLocalResolutionPin(options.context.runtime.cwd);
+  if (localPin.kind === "invalid") {
+    throw localStateStaleError();
+  }
+  if (localPin.kind === "present") {
+    if (localPin.pin.workspaceId !== options.workspace.id) {
+      throw localStateStaleError();
+    }
+
+    const project = projects.find((candidate) => candidate.id === localPin.pin.projectId);
+    if (!project) {
+      throw localStateStaleError();
+    }
+
+    return resolvedTarget(options.workspace, project, "local-pin", {
+      targetName: project.name,
+      targetNameSource: "local-pin",
+    });
+  }
+
+  const platformMapping = await resolveDurablePlatformMapping();
+  if (platformMapping && platformMapping.workspace.id === options.workspace.id) {
+    return resolvedTarget(options.workspace, platformMapping, "platform-mapping", {
+      targetName: platformMapping.name,
+      targetNameSource: "platform-mapping",
+    });
+  }
+
+  return null;
+}
+
 function resolvedTarget(
   workspace: AuthWorkspace,
   project: ProjectCandidate,
-  projectSource: ProjectSource,
+  projectSource: BoundProjectSource,
   resolutionDetails?: Omit<ProjectResolution, "projectSource">,
 ): BoundProjectShowResult {
   return {

packages/cli/src/types/project.ts

@@ -86,5 +86,5 @@ export interface GitRepositoryConnection {
 }
 
 export interface ProjectRepositoryConnectionResult extends BoundProjectShowResult {
-  repositoryConnection: GitRepositoryConnection | null;
+  repositoryConnection: GitRepositoryConnection;
 }

packages/cli/tests/app-controller.test.ts

@@ -1753,7 +1753,7 @@ describe("app controller", () => {
       meta: {
         pinPath: ".prisma/local.json",
       },
-      fix: "Delete .prisma/local.json and re-run to re-bootstrap.",
+      fix: "Delete .prisma/local.json, then choose a Project explicitly.",
     });
     expect(listApps).not.toHaveBeenCalled();
     expect(deployApp).not.toHaveBeenCalled();