Refactoring 🔧

Author: 1cedrus

packages/create-typink/src/tasks/copyTemplateFiles.ts

@@ -15,33 +15,32 @@ export async function copyTemplateFiles(options: Options, templatesDir: string,
     throw new Error(`Preset directory not found: ${templateDir}`);
   }
 
-  fs.cpSync(templateDir, targetDir, { recursive: true });
+  await fs.promises.cp(templateDir, targetDir, { recursive: true });
 
   const packageJsonPath = `${targetDir}/package.json`;
   const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
 
   packageJson.name = projectName;
+  await fs.promises.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
 
-  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
-
-  processTemplate(options, targetDir);
+  processTemplateFiles(options, targetDir);
 
   if (!noGit) {
     await execa('git', ['init'], { cwd: targetDir });
     await execa('git', ['checkout', '-b', 'main'], { cwd: targetDir });
   }
 }
 
-export async function processTemplate(rawOptions: Options, targetDir: string) {
+export async function processTemplateFiles(rawOptions: Options, targetDir: string) {
   const options = {
     ...rawOptions,
     networks: rawOptions.networks?.map(stringCamelCase),
   };
 
-  await _processTemplate(options, targetDir);
+  await processTemplateFilesRecursive(options, targetDir);
 }
 
-export async function _processTemplate(options: any, dir: string) {
+async function processTemplateFilesRecursive(options: any, dir: string) {
   if (IS_IGNORE_FILES.test(dir)) {
     return;
   }
@@ -52,7 +51,7 @@ export async function _processTemplate(options: any, dir: string) {
     const filePath = path.join(dir, file.name);
 
     if (file.isDirectory()) {
-      await _processTemplate(options, filePath);
+      await processTemplateFilesRecursive(options, filePath);
     } else {
       if (IS_TEMPLATE_FILE.test(filePath)) {
         const content = fs.readFileSync(filePath, 'utf-8');

packages/create-typink/src/tasks/createProject.ts

@@ -1,6 +1,51 @@
-export * from './createFirstCommit.js';
-export * from './copyTemplateFiles.js';
-export * from './createProjectDirectory.js';
-export * from './installPackages.js';
-export * from './prettierFormat.js';
-export * from './createProject.js';
+import { Options } from '../types.js';
+import { Listr } from 'listr2';
+import { fileURLToPath } from 'url';
+import * as path from 'path';
+import chalk from 'chalk';
+import { prettierFormat } from './prettierFormat.js';
+import { createFirstCommit } from './createFirstCommit.js';
+import { installPackages } from './installPackages.js';
+import { createProjectDirectory } from './createProjectDirectory.js';
+import { copyTemplateFiles } from './copyTemplateFiles.js';
+
+export async function createProject(options: Options) {
+  const { projectName, skipInstall, noGit } = options;
+
+  const __filename = fileURLToPath(import.meta.url);
+  const __dirname = path.dirname(__filename);
+
+  const rootDirectory = path.resolve(__dirname, '../../');
+  const templateDirectory = path.resolve(__dirname, '../../templates');
+  const targetDirectory = path.resolve(process.cwd(), projectName!);
+
+  const tasks = new Listr(
+    [
+      {
+        title: `📁 Create project directory ${targetDirectory}`,
+        task: () => createProjectDirectory(projectName!),
+      },
+      {
+        title: `🚀 Creating a new Typink app in ${chalk.green.bold(projectName)}`,
+        task: () => copyTemplateFiles(options, templateDirectory, targetDirectory),
+      },
+      {
+        title: '📦 Installing dependencies with yarn, this could take a while',
+        task: () => installPackages(targetDirectory),
+        skip: skipInstall,
+      },
+      {
+        title: '🧹 Formatting the code with Prettier',
+        task: () => prettierFormat(rootDirectory, targetDirectory, options),
+      },
+      {
+        title: `🚨 Create the very first Git commit`,
+        task: () => createFirstCommit(targetDirectory),
+        skip: noGit,
+      },
+    ],
+    { rendererOptions: { suffixSkips: true }, exitOnError: true },
+  );
+
+  await tasks.run();
+}

packages/create-typink/src/tasks/index.ts

@@ -10,18 +10,18 @@ export async function prettierFormat(rootDir: string, targetDir: string, options
   } else {
     const prettierConfig = await prettier.resolveConfig(path.resolve(rootDir, './.prettierrc.js'));
 
-    await prettierFormatWithConfig(targetDir, prettierConfig);
+    await prettierFormatRecursive(targetDir, prettierConfig);
   }
 }
 
-export async function prettierFormatWithConfig(dir: string, config: prettier.Options | null) {
+async function prettierFormatRecursive(dir: string, config: prettier.Options | null) {
   const files = await fs.readdir(dir, { withFileTypes: true });
 
   for (const file of files) {
     const filePath = path.join(dir, file.name);
 
     if (file.isDirectory()) {
-      await prettierFormatWithConfig(filePath, config);
+      await prettierFormatRecursive(filePath, config);
     } else {
       const fileInfo = await prettier.getFileInfo(filePath);