@samebase/alchemy-convex 0.27.3 → 0.28.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { A as PushTargetMismatch, B as DEPLOY_KEY_ENV, C as DeploymentProvider, D as ConvexAppNotFound, E as CodePushFailed, F as ManagementApi, H as fromValues, I as ManagementApiLive, L as ACCESS_TOKEN_ENV, N as parseDeployOutput, O as ConvexCliNotFound, P as ConvexApiError, R as Credentials, S as DeploymentIdentityChange, T as ProductionDeploymentNotFound, V as fromConfig, _ as ProjectProvider, b as AmbiguousDeployment, c as RUN_RECORD_KEY, d as withRunRecord, f as AmbiguousProject, g as ProjectNotFound, h as ProjectDeploymentChange, i as HubClientProvider, j as VariablesOwnedBySomeoneElse, k as EnvironmentNeedsDeployKey, l as RunRecordError, m as Project, n as HubClient, o as STORE_PROJECT_NAME, p as CreatedProjectNotFound, r as HubClientFailed, s as state, t as HUB_PROJECT_NAME, u as runRecord, v as ProjectTeamChange, w as DeploymentResource, x as Deployment, y as AbsoluteRootDir, z as CredentialsError } from "./HubClient-Bs5_j18U.js";
+import { A as PushTargetMismatch, B as DEPLOY_KEY_ENV, C as DeploymentProvider, D as ConvexAppNotFound, E as CodePushFailed, F as ManagementApi, H as fromValues, I as ManagementApiLive, L as ACCESS_TOKEN_ENV, N as parseDeployOutput, O as ConvexCliNotFound, P as ConvexApiError, R as Credentials, S as DeploymentIdentityChange, T as ProductionDeploymentNotFound, V as fromConfig, _ as ProjectProvider, b as AmbiguousDeployment, c as RUN_RECORD_KEY, d as withRunRecord, f as AmbiguousProject, g as ProjectNotFound, h as ProjectDeploymentChange, i as HubClientProvider, j as VariablesOwnedBySomeoneElse, k as EnvironmentNeedsDeployKey, l as RunRecordError, m as Project, n as HubClient, o as STORE_PROJECT_NAME, p as CreatedProjectNotFound, r as HubClientFailed, s as state, t as HUB_PROJECT_NAME, u as runRecord, v as ProjectTeamChange, w as DeploymentResource, x as Deployment, y as AbsoluteRootDir, z as CredentialsError } from "./HubClient-BcegkjaP.js";
 import { toPath } from "alchemy/FQN";
 import { Stack } from "alchemy/Stack";
 import * as Effect from "effect/Effect";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samebase/alchemy-convex",
-  "version": "0.27.3",
+  "version": "0.28.0",
   "description": "The Convex plane for Alchemy v2: projects, deployments, environment variables, and the push of the functions",
   "keywords": [
     "alchemy",

package/src/Deployment.ts

@@ -113,8 +113,11 @@ export type DeploymentProps =
       /** A dev deployment or a preview deployment that this resource creates. Cannot change. */
       readonly type: "dev" | "preview";
       /**
-       * The dev reference, such as `staging`, or the preview name, such as
-       * the stage name. Unique in the project. Cannot change.
+       * The dev reference, such as `staging`, or the Convex name of a dev
+       * deployment that exists, such as `happy-animal-123` from `.env.local`,
+       * which `adopt` takes over; a name that matches nothing creates a dev
+       * deployment with that reference. Or the preview name, such as the
+       * stage name. Unique in the project. Cannot change.
        */
       readonly name: string;
     });
@@ -334,7 +337,9 @@ const checkIdentity = (current: DeploymentTarget, news: DeploymentProps) => {
   }
   if (current.type !== news.type) return change("type", current.type, news.type);
   const currentName = nameOf(current);
-  if (news.type !== "prod" && currentName !== news.name) {
+  // A dev deployment is also named by its Convex name, as `findByName` finds it.
+  const named = news.type === "dev" && current.name === news.name;
+  if (news.type !== "prod" && currentName !== news.name && !named) {
     return change("name", currentName ?? "(none)", news.name);
   }
   return Effect.void;
@@ -454,8 +459,10 @@ export const DeploymentProvider = () =>
         );
 
       /**
-       * The one dev deployment with this reference, or the one preview
-       * deployment with this preview name, or undefined.
+       * The one dev deployment with this reference or this Convex name, or the
+       * one preview deployment with this preview name, or undefined. The name
+       * form takes the dev deployment that `npx convex dev` made, such as the
+       * one `.env.local` selects, which has a reference the stack never chose.
        */
       const findByName = (
         management: ManagementApiService,
@@ -467,7 +474,9 @@ export const DeploymentProvider = () =>
           const matches = (yield* listDeployments(management, projectId, type)).filter(
             (row) =>
               row.deploymentType === type &&
-              (type === "dev" ? row.reference === name : row.previewIdentifier === name),
+              (type === "dev"
+                ? row.reference === name || row.name === name
+                : row.previewIdentifier === name),
           );
           if (matches.length > 1) {
             return yield* new AmbiguousDeployment({
@@ -503,10 +512,11 @@ export const DeploymentProvider = () =>
             ),
           );
           const reference = info.reference ?? "";
+          // A dev address names the reference or the Convex name, as `findByName` finds it.
           if (
             info.projectId !== address.projectId ||
             info.deploymentType !== address.type ||
-            (address.type === "dev" && reference !== address.name)
+            (address.type === "dev" && reference !== address.name && deployment !== address.name)
           ) {
             return undefined;
           }