create-svc 0.1.36 → 0.1.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "description": "Local microservice bootstrap CLI for Cloud Run and Workers services with Neon-backed data.",
   "module": "index.ts",
   "type": "module",

package/src/cli.ts

@@ -1131,7 +1131,7 @@ async function promptForExistingProject(projects: GcpProject[], options: { allow
         : []),
       ...projects.map((project) => ({
         value: project.projectId,
-        label: project.name,
+        label: project.name ?? project.projectId,
         hint: project.projectId,
       })),
     ],
@@ -1151,7 +1151,7 @@ async function promptForExistingProject(projects: GcpProject[], options: { allow
     return {
       mode: "use_existing" as const,
       projectId: project.projectId,
-      projectName: project.name,
+      projectName: project.name ?? project.projectId,
     };
   }
 

package/src/gcp.test.ts

@@ -23,6 +23,42 @@ test("listAccessibleProjects filters deleted projects and sorts by name", async
   ]);
 });
 
+test("listAccessibleProjects tolerates projects without a display name", async () => {
+  const api: GcpApi = {
+    async listProjects() {
+      return [{ projectId: "b" }, { projectId: "a", name: "alpha" }];
+    },
+    async listBillingAccounts() {
+      return [];
+    },
+    async createProject() {},
+    async attachBillingAccount() {},
+  };
+
+  await expect(listAccessibleProjects(api)).resolves.toEqual([{ projectId: "a", name: "alpha" }, { projectId: "b" }]);
+});
+
+test("listOpenBillingAccounts tolerates accounts without a display name", async () => {
+  const api: GcpApi = {
+    async listProjects() {
+      return [];
+    },
+    async listBillingAccounts() {
+      return [
+        { name: "billingAccounts/2", displayName: "", open: true },
+        { name: "billingAccounts/1", displayName: "A", open: true },
+      ];
+    },
+    async createProject() {},
+    async attachBillingAccount() {},
+  };
+
+  await expect(listOpenBillingAccounts(api)).resolves.toEqual([
+    { name: "billingAccounts/1", displayName: "A", open: true },
+    { name: "billingAccounts/2", displayName: "", open: true },
+  ]);
+});
+
 test("listOpenBillingAccounts keeps only open accounts", async () => {
   const api: GcpApi = {
     async listProjects() {

package/src/gcp.ts

@@ -1,6 +1,6 @@
 export type GcpProject = {
   projectId: string;
-  name: string;
+  name?: string;
   lifecycleState?: string;
 };
 
@@ -47,13 +47,13 @@ export function createGcpApi(): GcpApi {
 export async function listAccessibleProjects(api = createGcpApi()): Promise<GcpProject[]> {
   return (await api.listProjects())
     .filter((project) => project.projectId && project.lifecycleState !== "DELETE_REQUESTED")
-    .sort((left, right) => left.name.localeCompare(right.name));
+    .sort((left, right) => projectSortName(left).localeCompare(projectSortName(right)));
 }
 
 export async function listOpenBillingAccounts(api = createGcpApi()): Promise<BillingAccount[]> {
   return (await api.listBillingAccounts())
     .filter((account) => account.name && account.open)
-    .sort((left, right) => left.displayName.localeCompare(right.displayName));
+    .sort((left, right) => accountSortName(left).localeCompare(accountSortName(right)));
 }
 
 export async function createProject(projectId: string, name: string, api = createGcpApi()) {
@@ -79,6 +79,14 @@ function runGcloud(args: string[]) {
   };
 }
 
+function projectSortName(project: GcpProject) {
+  return project.name || project.projectId;
+}
+
+function accountSortName(account: BillingAccount) {
+  return account.displayName || account.name;
+}
+
 function parseJson<T>(value: string, label: string): T {
   try {
     return JSON.parse(value) as T;

package/src/naming.ts

@@ -108,7 +108,7 @@ export function buildGcpProjectOptions(
   serviceName: string,
   projectId: string,
   projectName: string,
-  projects: Array<{ projectId: string; name: string }>
+  projects: Array<{ projectId: string; name?: string }>
 ) {
   const servicesProject = projects.find((project) => project.projectId === SERVICES_PROJECT_DEFAULT);
   const remainingProjects = projects.filter((project) => project.projectId !== SERVICES_PROJECT_DEFAULT);
@@ -120,10 +120,10 @@ export function buildGcpProjectOptions(
       projectName: servicesProject?.name ?? SERVICES_PROJECT_NAME_DEFAULT,
     },
     ...remainingProjects.map((project) => ({
-      label: `Use existing project: ${project.name} (${project.projectId})`,
+      label: `Use existing project: ${project.name ?? project.projectId} (${project.projectId})`,
       mode: "use_existing" as const,
       projectId: project.projectId,
-      projectName: project.name,
+      projectName: project.name ?? project.projectId,
     })),
     {
       label: buildCreateProjectLabel(serviceName, projectId),