feat: review typescript question (#106)

Author: peterpeterparker

src/constants/templates.ts

@@ -10,7 +10,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'astro-starter',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Starter',
@@ -22,7 +22,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'nextjs-starter',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Starter',
@@ -34,7 +34,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'nextjs-example',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Example',
@@ -46,11 +46,11 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'react-starter',
-        language: 'JavaScript'
+        typeChecking: false
       },
       {
         key: 'react-ts-starter',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Starter',
@@ -62,11 +62,11 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'react-example',
-        language: 'JavaScript'
+        typeChecking: false
       },
       {
         key: 'react-ts-example',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Example',
@@ -78,7 +78,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'react-workshop',
-        language: 'JavaScript'
+        typeChecking: false
       }
     ],
     type: 'Workshop',
@@ -90,7 +90,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'sveltekit-starter',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Starter',
@@ -102,7 +102,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'sveltekit-example',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Example',
@@ -114,7 +114,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'vue-starter',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Starter',
@@ -126,7 +126,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'vue-example',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Example',
@@ -138,7 +138,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'angular-starter',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Starter',
@@ -150,7 +150,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'angular-example',
-        language: 'TypeScript'
+        typeChecking: true
       }
     ],
     type: 'Example',
@@ -162,7 +162,7 @@ export const TEMPLATES: Template[] = [
     keys: [
       {
         key: 'vanilla-js-example',
-        language: 'JavaScript'
+        typeChecking: false
       }
     ],
     type: 'Example',

src/services/generate.services.ts

@@ -161,7 +161,7 @@ const removeLocalConfig = async ({where, template}: PopulateInputFn) => {
       : template.framework === 'Next.js'
         ? 'next.config.mjs'
         : template.framework === 'React'
-          ? template.language === 'TypeScript'
+          ? template.typeChecking
             ? 'vite.config.ts'
             : 'vite.config.js'
           : template.framework === 'Vanilla JavaScript'

src/services/prompt.services.ts

@@ -75,14 +75,23 @@ export const promptLanguage = async ({
     };
   }
 
+  const keyJavaScript = keys[0].typeChecking ? keys[1] : keys[0];
+  const keyTypeScript = keys[0].typeChecking ? keys[0] : keys[1];
+
   const {key}: {key: TemplateKeyOption | undefined} = await prompts({
     type: 'select',
     name: 'key',
-    message: 'Which language do you prefer?',
-    choices: keys.map((key) => ({
-      title: key.language,
-      value: key
-    }))
+    message: 'Add type checking?',
+    choices: [
+      {
+        title: 'Yes, using TypeScript syntax',
+        value: keyTypeScript
+      },
+      {
+        title: 'No',
+        value: keyJavaScript
+      }
+    ]
   });
 
   if (isNullish(key)) {

src/types/template.ts

@@ -4,10 +4,22 @@ export type TemplateKey = string;
 
 export interface TemplateKeyOption {
   key: TemplateKey;
-  language: TemplateLanguage;
+  typeChecking: boolean;
 }
 
-export type TemplateKeys = TemplateKeyOption[];
+export interface TemplateKeyJavaScript extends Omit<TemplateKeyOption, 'typeChecking'> {
+  typeChecking: false;
+}
+
+export interface TemplateKeyTypeScript extends Omit<TemplateKeyOption, 'typeChecking'> {
+  typeChecking: true;
+}
+
+export type TemplateKeys =
+  | [TemplateKeyJavaScript]
+  | [TemplateKeyTypeScript]
+  | [TemplateKeyTypeScript, TemplateKeyJavaScript]
+  | [TemplateKeyJavaScript, TemplateKeyTypeScript];
 
 export interface Template {
   keys: TemplateKeys;
@@ -27,5 +39,3 @@ export type TemplateFramework =
   | 'Vanilla JavaScript';
 
 export type TemplateType = 'Starter' | 'Example' | 'Workshop';
-
-export type TemplateLanguage = 'JavaScript' | 'TypeScript';