From 70f597abbf48d76aa23f022ba7a4ab8e71294318 Mon Sep 17 00:00:00 2001
From: Tim Leung <tleung@palantir.com>
Date: Fri, 16 Feb 2024 10:58:29 +0000
Subject: [PATCH] Accept template id without prefix as template name (#77)

---
 packages/create-app/README.md                       | 10 +++++-----
 .../create-app/changelog/@unreleased/pr-77.v2.yml   |  5 +++++
 .../create-app/src/prompts/promptTemplate.test.ts   | 13 ++++++++++++-
 packages/create-app/src/prompts/promptTemplate.ts   |  4 +++-
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 packages/create-app/changelog/@unreleased/pr-77.v2.yml

diff --git a/packages/create-app/README.md b/packages/create-app/README.md
index 94b140405..2723eee88 100644
--- a/packages/create-app/README.md
+++ b/packages/create-app/README.md
@@ -44,8 +44,8 @@ npx @osdk/create-app [project] [--<option>]
 
 ## Templates
 
-| Template ID                 | Description                                                                                                                           |
-| --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
-| template-react              | [React](https://react.dev/) with [Vite](https://vitejs.dev/guide/why.html)                                                            |
-| template-vue                | [Vue](https://vuejs.org/) with [Vite](https://vitejs.dev/guide/why.html)                                                              |
-| template-next-static-export | [Next.js](https://nextjs.org/) with [static export](https://nextjs.org/docs/pages/building-your-application/deploying/static-exports) |
+| Template name      | Description                                                                                                                           |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------- |
+| react              | [React](https://react.dev/) with [Vite](https://vitejs.dev/guide/why.html)                                                            |
+| vue                | [Vue](https://vuejs.org/) with [Vite](https://vitejs.dev/guide/why.html)                                                              |
+| next-static-export | [Next.js](https://nextjs.org/) with [static export](https://nextjs.org/docs/pages/building-your-application/deploying/static-exports) |
diff --git a/packages/create-app/changelog/@unreleased/pr-77.v2.yml b/packages/create-app/changelog/@unreleased/pr-77.v2.yml
new file mode 100644
index 000000000..f8cb5b800
--- /dev/null
+++ b/packages/create-app/changelog/@unreleased/pr-77.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Accept template id without prefix as template name
+  links:
+  - https://github.com/palantir/osdk-ts/pull/77
diff --git a/packages/create-app/src/prompts/promptTemplate.test.ts b/packages/create-app/src/prompts/promptTemplate.test.ts
index 8c321aef1..5b5d86acd 100644
--- a/packages/create-app/src/prompts/promptTemplate.test.ts
+++ b/packages/create-app/src/prompts/promptTemplate.test.ts
@@ -31,13 +31,24 @@ test("it accepts valid template from prompt", async () => {
   expect(vi.mocked(consola).prompt).toHaveBeenCalledTimes(1);
 });
 
-test("it accepts valid initial value without prompt", async () => {
+test("it accepts valid initial template id value without prompt", async () => {
   expect(await promptTemplate({ template: TEMPLATES[0].id })).toEqual(
     TEMPLATES[0],
   );
   expect(vi.mocked(consola).prompt).not.toHaveBeenCalled();
 });
 
+test("it accepts valid initial template id value without 'template-' prefix without prompt", async () => {
+  expect(
+    await promptTemplate({
+      template: TEMPLATES[0].id.substring("template-".length),
+    }),
+  ).toEqual(
+    TEMPLATES[0],
+  );
+  expect(vi.mocked(consola).prompt).not.toHaveBeenCalled();
+});
+
 test("it prompts if initial value is invalid", async () => {
   vi.mocked(consola).prompt.mockResolvedValueOnce(TEMPLATES[0].id);
   expect(await promptTemplate({ template: "missing" })).toEqual(
diff --git a/packages/create-app/src/prompts/promptTemplate.ts b/packages/create-app/src/prompts/promptTemplate.ts
index fb7e5fe9e..700bf96c6 100644
--- a/packages/create-app/src/prompts/promptTemplate.ts
+++ b/packages/create-app/src/prompts/promptTemplate.ts
@@ -21,7 +21,9 @@ import { type Template, TEMPLATES } from "../templates.js";
 export async function promptTemplate(
   parsed: { template?: string },
 ): Promise<Template> {
-  let template = TEMPLATES.find((t) => t.id === parsed.template);
+  let template = TEMPLATES.find((t) =>
+    t.id === parsed.template || t.id === `template-${parsed.template}`
+  );
   if (template == null) {
     const templateId = (await consola.prompt(
       parsed.template != null