@aponiajs/cli 0.3.19 → 0.3.21

package/dist/index.mjs

@@ -1,14 +1,11 @@
 import { camelCase, kebabCase, pascalCase } from "change-case";
 import parseCliArguments from "yargs-parser";
-import { mkdir, readdir } from "node:fs/promises";
+import { lstat, mkdir, readdir, rm } from "node:fs/promises";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import findFiles from "fast-glob";
 import { singularize } from "inflection";
 import { IndentationText, Node, Project, QuoteKind, SyntaxKind } from "ts-morph";
-//#region package.json
-var version = "0.3.19";
-//#endregion
 //#region src/arguments.ts
 const generateSchematics = [
 	"app",
@@ -185,6 +182,9 @@ function readStringOption(options, name) {
 	return value;
 }
 //#endregion
+//#region src/version.ts
+const aponiaVersion = "0.3.21";
+//#endregion
 //#region src/project-generator.ts
 const projectNamePattern = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
 async function generateProject(options) {
@@ -192,38 +192,48 @@ async function generateProject(options) {
 	const projectDirectory = join(options.cwd ?? process.cwd(), options.name);
 	const templateDirectory = fileURLToPath(new URL("../templates/application", import.meta.url));
 	const templateFiles = await listFiles(templateDirectory);
-	const relativeFiles = templateFiles.map((file) => outputPath(relative(templateDirectory, file)));
+	const relativeFiles = templateFiles.map((file) => outputPath(relative(templateDirectory, file))).toSorted();
 	if (options.dryRun) return {
 		projectDirectory,
 		files: relativeFiles,
 		installed: false,
 		dryRun: true
 	};
-	if (await Bun.file(projectDirectory).exists()) throw new Error(`Target directory "${basename(projectDirectory)}" already exists.`);
+	if (await pathExists(projectDirectory)) throw new Error(`Target directory "${basename(projectDirectory)}" already exists.`);
 	await mkdir(projectDirectory, { recursive: false });
-	for (const templateFile of templateFiles) {
-		const outputFile = join(projectDirectory, outputPath(relative(templateDirectory, templateFile)));
-		const output = (await Bun.file(templateFile).text()).replaceAll("{{PROJECT_NAME}}", options.name);
-		await mkdir(dirname(outputFile), { recursive: true });
-		await Bun.write(outputFile, output);
-	}
-	const shouldInstall = !options.skipInstall;
-	if (shouldInstall) {
-		const exitCode = await Bun.spawn(["bun", "install"], {
-			cwd: projectDirectory,
-			stdin: "inherit",
-			stdout: "inherit",
-			stderr: "inherit"
-		}).exited;
-		if (exitCode !== 0) throw new Error(`Bun install failed with exit code ${exitCode}.`);
+	try {
+		for (const templateFile of templateFiles) {
+			const outputFile = join(projectDirectory, outputPath(relative(templateDirectory, templateFile)));
+			const output = renderTemplate(await Bun.file(templateFile).text(), options.name);
+			await mkdir(dirname(outputFile), { recursive: true });
+			await Bun.write(outputFile, output);
+		}
+		if (!options.skipInstall) {
+			const exitCode = await Bun.spawn(["bun", "install"], {
+				cwd: projectDirectory,
+				stdin: "inherit",
+				stdout: "inherit",
+				stderr: "inherit"
+			}).exited;
+			if (exitCode !== 0) throw new Error(`Bun install failed with exit code ${exitCode}.`);
+		}
+	} catch (error) {
+		await rm(projectDirectory, {
+			recursive: true,
+			force: true
+		});
+		throw error;
 	}
 	return {
 		projectDirectory,
 		files: relativeFiles,
-		installed: shouldInstall,
+		installed: !options.skipInstall,
 		dryRun: false
 	};
 }
+function renderTemplate(template, projectName) {
+	return template.replaceAll("{{PROJECT_NAME}}", projectName).replaceAll("{{APONIA_VERSION}}", aponiaVersion);
+}
 function outputPath(templatePath) {
 	if (templatePath === "_gitignore") return ".gitignore";
 	return templatePath.endsWith(".tmpl") ? templatePath.slice(0, -5) : templatePath;
@@ -238,6 +248,15 @@ async function listFiles(directory) {
 		return entry.isDirectory() ? listFiles(path) : [path];
 	}))).flat();
 }
+async function pathExists(path) {
+	try {
+		await lstat(path);
+		return true;
+	} catch (error) {
+		if (error instanceof Error && "code" in error && error.code === "ENOENT") return false;
+		throw error;
+	}
+}
 //#endregion
 //#region src/component-names.ts
 function createComponentNames(input) {
@@ -487,7 +506,7 @@ async function generateLibrary(projectRoot, names, options) {
 				build: "bun build ./src/index.ts --outdir ./dist --target bun",
 				test: "bun test"
 			},
-			dependencies: { "@aponiajs/common": "latest" }
+			dependencies: { "@aponiajs/common": aponiaVersion }
 		}, void 0, 2)}\n`),
 		createFile(join(directory, "src"), `${names.fileName}.module.ts`, `import { Module } from "@aponiajs/common";\n\n@Module({})\nexport class ${names.className}Module {}\n`),
 		createFile(join(directory, "src"), `${names.fileName}.service.ts`, `import { Injectable } from "@aponiajs/common";\n\n@Injectable()\nexport class ${names.className}Service {}\n`),
@@ -672,7 +691,7 @@ async function runCli(arguments_) {
 			return 0;
 		}
 		if (command.command === "version") {
-			console.log(version);
+			console.log(aponiaVersion);
 			return 0;
 		}
 		if (command.command === "generate") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aponiajs/cli",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "description": "Bun-native project generator and command-line interface for Aponia.",
   "homepage": "https://github.com/aponiajs/aponiajs#readme",
   "bugs": {

package/src/index.ts

@@ -1,7 +1,7 @@
-import cliManifest from "../package.json" with { type: "json" };
 import { parseArguments } from "./arguments.ts";
 import { generateProject } from "./project-generator.ts";
 import { generateSchematic } from "./schematic-generator.ts";
+import { aponiaVersion } from "./version.ts";
 
 export {
   generateSchematics,
@@ -33,7 +33,7 @@ export async function runCli(arguments_: readonly string[]): Promise<number> {
     }
 
     if (command.command === "version") {
-      console.log(cliManifest.version);
+      console.log(aponiaVersion);
       return 0;
     }
 

package/src/project-generator.ts

@@ -1,6 +1,7 @@
-import { mkdir, readdir } from "node:fs/promises";
+import { lstat, mkdir, readdir, rm } from "node:fs/promises";
 import { basename, dirname, join, relative } from "node:path";
 import { fileURLToPath } from "node:url";
+import { aponiaVersion } from "./version.ts";
 
 export interface GenerateProjectOptions {
   readonly name: string;
@@ -27,7 +28,9 @@ export async function generateProject(
   const projectDirectory = join(workingDirectory, options.name);
   const templateDirectory = fileURLToPath(new URL("../templates/application", import.meta.url));
   const templateFiles = await listFiles(templateDirectory);
-  const relativeFiles = templateFiles.map((file) => outputPath(relative(templateDirectory, file)));
+  const relativeFiles = templateFiles
+    .map((file) => outputPath(relative(templateDirectory, file)))
+    .toSorted();
 
   if (options.dryRun) {
     return {
@@ -38,43 +41,54 @@ export async function generateProject(
     };
   }
 
-  if (await Bun.file(projectDirectory).exists()) {
+  if (await pathExists(projectDirectory)) {
     throw new Error(`Target directory "${basename(projectDirectory)}" already exists.`);
   }
 
   await mkdir(projectDirectory, { recursive: false });
-  for (const templateFile of templateFiles) {
-    const relativeFile = outputPath(relative(templateDirectory, templateFile));
-    const outputFile = join(projectDirectory, relativeFile);
-    const template = await Bun.file(templateFile).text();
-    const output = template.replaceAll("{{PROJECT_NAME}}", options.name);
-
-    await mkdir(dirname(outputFile), { recursive: true });
-    await Bun.write(outputFile, output);
-  }
+  try {
+    for (const templateFile of templateFiles) {
+      const relativeFile = outputPath(relative(templateDirectory, templateFile));
+      const outputFile = join(projectDirectory, relativeFile);
+      const template = await Bun.file(templateFile).text();
+      const output = renderTemplate(template, options.name);
+
+      await mkdir(dirname(outputFile), { recursive: true });
+      await Bun.write(outputFile, output);
+    }
 
-  const shouldInstall = !options.skipInstall;
-  if (shouldInstall) {
-    const process = Bun.spawn(["bun", "install"], {
-      cwd: projectDirectory,
-      stdin: "inherit",
-      stdout: "inherit",
-      stderr: "inherit",
-    });
-    const exitCode = await process.exited;
-    if (exitCode !== 0) {
-      throw new Error(`Bun install failed with exit code ${exitCode}.`);
+    if (!options.skipInstall) {
+      const process = Bun.spawn(["bun", "install"], {
+        cwd: projectDirectory,
+        stdin: "inherit",
+        stdout: "inherit",
+        stderr: "inherit",
+      });
+      const exitCode = await process.exited;
+      if (exitCode !== 0) {
+        throw new Error(`Bun install failed with exit code ${exitCode}.`);
+      }
     }
+  } catch (error) {
+    await rm(projectDirectory, { recursive: true, force: true });
+    throw error;
   }
 
+  const installed = !options.skipInstall;
   return {
     projectDirectory,
     files: relativeFiles,
-    installed: shouldInstall,
+    installed,
     dryRun: false,
   };
 }
 
+function renderTemplate(template: string, projectName: string): string {
+  return template
+    .replaceAll("{{PROJECT_NAME}}", projectName)
+    .replaceAll("{{APONIA_VERSION}}", aponiaVersion);
+}
+
 function outputPath(templatePath: string): string {
   if (templatePath === "_gitignore") {
     return ".gitignore";
@@ -102,3 +116,15 @@ async function listFiles(directory: string): Promise<string[]> {
 
   return files.flat();
 }
+
+async function pathExists(path: string): Promise<boolean> {
+  try {
+    await lstat(path);
+    return true;
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+      return false;
+    }
+    throw error;
+  }
+}

package/src/schematic-generator.ts

@@ -10,6 +10,7 @@ import {
 } from "./component-names.ts";
 import { registerInModule, type ModuleRegistrationKind } from "./module-registration.ts";
 import { generateProject } from "./project-generator.ts";
+import { aponiaVersion } from "./version.ts";
 
 export interface GenerateSchematicOptions extends GenerateCommandOptions {
   readonly cwd?: string;
@@ -310,7 +311,7 @@ async function generateLibrary(
             test: "bun test",
           },
           dependencies: {
-            "@aponiajs/common": "latest",
+            "@aponiajs/common": aponiaVersion,
           },
         },
         undefined,

package/src/version.ts

@@ -0,0 +1,3 @@
+import cliManifest from "../package.json" with { type: "json" };
+
+export const aponiaVersion = cliManifest.version;

package/templates/application/package.json

@@ -12,9 +12,8 @@
     "check": "vp check"
   },
   "dependencies": {
-    "@aponiajs/common": "latest",
-    "@aponiajs/core": "latest",
-    "@aponiajs/platform-elysia": "latest",
+    "@aponiajs/common": "{{APONIA_VERSION}}",
+    "@aponiajs/platform-elysia": "{{APONIA_VERSION}}",
     "elysia": "^1.4.29"
   },
   "devDependencies": {