@expressots/cli 1.3.4 → 1.4.0

package/bin/app.container.js

@@ -6,4 +6,4 @@ const appContainer = new AppContainer();
 
 const container = appContainer.create([// Add your modules here, UserModule, UserModule, UserModule]);
 
-export { container };*/ 
+export { container };*/

package/bin/generate/cli.js

@@ -16,6 +16,8 @@ const coerceSchematicAliases = (arg) => {
             return "provider";
         case "e":
             return "entity";
+        case "m":
+            return "module";
         default:
             return arg;
     }
@@ -34,6 +36,7 @@ const generateProject = () => {
                     "service",
                     "provider",
                     "entity",
+                    "module",
                 ],
                 describe: "The schematic to generate",
                 type: "string",
@@ -45,13 +48,7 @@ const generateProject = () => {
                 alias: "d",
             });
             yargs.positional("method", {
-                choices: [
-                    "get",
-                    "post",
-                    "put",
-                    "patch",
-                    "delete",
-                ],
+                choices: ["get", "post", "put", "patch", "delete"],
                 describe: "HTTP method",
                 type: "string",
                 alias: "m",

package/bin/generate/form.js

@@ -77,12 +77,17 @@ const createTemplate = async ({ schematic, path: target, method, }) => {
         else {
             routeSchema = path.replace(/\/$/, "");
         }
+        let templateBasedSchematic = schematic;
+        if (schematic === "module") {
+            templateBasedSchematic = "module-default";
+        }
         writeTemplate({
             outputPath: `${usecaseDir}/${path}/${file}`,
             template: {
-                path: `./templates/${schematic}.tpl`,
+                path: `./templates/${templateBasedSchematic}.tpl`,
                 data: {
                     className,
+                    moduleName: className,
                     route: routeSchema,
                     construct: (0, boost_ts_1.anyCaseToKebabCase)(className),
                     method: getHttpMethod(method),

package/bin/generate/templates/module-default.tpl

@@ -0,0 +1,3 @@
+import { CreateModule } from "@expressots/core";
+
+export const {{moduleName}}Module = CreateModule([]);

package/bin/new/cli.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProject = void 0;
 const form_1 = require("./form");
 const createProject = () => {
+    const packageManagers = ["npm", "yarn", "pnpm"];
+    if (process.platform !== "win32") {
+        packageManagers.push("bun");
+    }
     return {
         command: "new <project-name> [package-manager] [template] [directory]",
         describe: "Create a new project",
@@ -21,7 +25,7 @@ const createProject = () => {
                 .option("package-manager", {
                 describe: "The package manager to use",
                 type: "string",
-                choices: ["npm", "yarn", "pnpm"],
+                choices: packageManagers,
                 alias: "p",
             })
                 .option("directory", {
@@ -33,8 +37,12 @@ const createProject = () => {
                 .implies("template", "package-manager");
             return yargs;
         },
-        handler: async ({ projectName, packageManager, template, directory }) => {
-            return await (0, form_1.projectForm)(projectName, [packageManager, template, directory]);
+        handler: async ({ projectName, packageManager, template, directory, }) => {
+            return await (0, form_1.projectForm)(projectName, [
+                packageManager,
+                template,
+                directory,
+            ]);
         },
     };
 };

package/bin/new/form.js

@@ -73,7 +73,10 @@ const projectForm = async (projectName, args) => {
     // Resolving the argument order problem
     for (const arg of args) {
         if (args.length >= 3) {
-            if (arg === "npm" || arg === "yarn" || arg === "pnpm") {
+            if (arg === "npm" ||
+                arg === "yarn" ||
+                arg === "pnpm" ||
+                arg === "bun") {
                 packageManager = arg;
             }
             else if (arg === "non-opinionated" || arg === "opinionated") {
@@ -107,7 +110,7 @@ const projectForm = async (projectName, args) => {
                 type: "list",
                 name: "packageManager",
                 message: "Package manager",
-                choices: ["npm", "yarn", "pnpm"],
+                choices: ["npm", "yarn", "pnpm", "bun"],
             },
             {
                 type: "list",
@@ -141,10 +144,17 @@ const projectForm = async (projectName, args) => {
         Opinionated: "opinionated",
     };
     if (answer.confirm) {
+        // Check if package manager is bun and OS is Windows
+        if (answer.packageManager === "bun" && process.platform === "win32") {
+            (0, cli_ui_1.printError)("bun is not supported on Windows. Please use", "npm, yarn or pnpm");
+            process.exit(1);
+        }
         await checkIfPackageManagerExists(answer.packageManager);
         console.log("\n");
         const progressBar = new cli_progress_1.SingleBar({
-            format: "Progress |" + chalk_1.default.green("{bar}") + "| {percentage}% || {doing}",
+            format: "Progress |" +
+                chalk_1.default.green("{bar}") +
+                "| {percentage}% || {doing}",
             hideCursor: true,
         }, cli_progress_1.Presets.shades_classic);
         progressBar.start(100, 0, {
@@ -188,6 +198,9 @@ const projectForm = async (projectName, args) => {
             case "pnpm":
                 console.log(chalk_1.default.bold.gray("$ pnpm run dev"));
                 break;
+            case "bun":
+                console.log(chalk_1.default.bold.gray("$ bun dev"));
+                break;
         }
         console.log("\n");
         console.log(chalk_1.default.bold.green((0, center_text_1.centerText)("Happy coding!")));

package/bin/utils/add-controller-to-module.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addControllerToModule = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 async function addControllerToModule(filePath, controllerName, controllerPath) {
-    const fileContent = await node_fs_1.default.promises.readFile(filePath, 'utf8');
+    const fileContent = await node_fs_1.default.promises.readFile(filePath, "utf8");
     const imports = [];
     const notImports = [];
-    fileContent.split('\n').forEach((line) => {
-        if (line.startsWith('import')) {
+    fileContent.split("\n").forEach((line) => {
+        if (line.startsWith("import")) {
             imports.push(line);
         }
         else {
@@ -27,14 +27,20 @@ async function addControllerToModule(filePath, controllerName, controllerPath) {
     if (!moduleDeclarationMatch) {
         return;
     }
-    const controllers = moduleDeclarationMatch[1].trim().split(',').map((c) => c.trim()).filter((c) => c);
+    const controllers = moduleDeclarationMatch[1]
+        .trim()
+        .split(",")
+        .map((c) => c.trim())
+        .filter((c) => c);
     if (controllers.includes(controllerName)) {
         return;
     }
     controllers.push(controllerName);
-    const newControllers = controllers.join(', ');
+    const newControllers = controllers.join(", ");
     const newModuleDeclaration = `CreateModule([${newControllers}]`;
-    const newFileContent = [...imports, ...notImports].join('\n').replace(moduleDeclarationRegex, newModuleDeclaration);
-    await node_fs_1.default.promises.writeFile(filePath, newFileContent, 'utf8');
+    const newFileContent = [...imports, ...notImports]
+        .join("\n")
+        .replace(moduleDeclarationRegex, newModuleDeclaration);
+    await node_fs_1.default.promises.writeFile(filePath, newFileContent, "utf8");
 }
 exports.addControllerToModule = addControllerToModule;

package/bin/utils/add-module-to-container.js

@@ -14,14 +14,17 @@ async function validateAppContainer() {
     const { sourceRoot } = await compiler_1.default.loadConfig();
     const imports = [];
     const notImports = [];
-    const path = (0, glob_1.globSync)(`./${sourceRoot}/${APP_CONTAINER}`, { absolute: true, ignore: '**/node_modules/**' });
+    const path = (0, glob_1.globSync)(`./${sourceRoot}/${APP_CONTAINER}`, {
+        absolute: true,
+        ignore: "**/node_modules/**",
+    });
     if (!path.length) {
-        (0, cli_ui_1.printError)('Module not added to Container. Container file not found!', APP_CONTAINER);
+        (0, cli_ui_1.printError)("Module not added to Container. Container file not found!", APP_CONTAINER);
         process.exit(1);
     }
-    const fileContent = await node_fs_1.default.promises.readFile(path[0], 'utf8');
-    fileContent.split('\n').forEach((line) => {
-        if (line.startsWith('import')) {
+    const fileContent = await node_fs_1.default.promises.readFile(path[0], "utf8");
+    fileContent.split("\n").forEach((line) => {
+        if (line.startsWith("import")) {
             imports.push(line);
         }
         else {
@@ -32,17 +35,21 @@ async function validateAppContainer() {
     const moduleDeclarationRegex = /.create\(\s*\[([\s\S]*?)]/;
     const moduleDeclarationMatch = fileContent.match(moduleDeclarationRegex);
     if (!moduleDeclarationMatch) {
-        (0, cli_ui_1.printError)('Container format incorrect!', APP_CONTAINER);
+        (0, cli_ui_1.printError)("Container format incorrect!", APP_CONTAINER);
         process.exit(1);
     }
-    const modules = moduleDeclarationMatch[1].trim().split(',').filter((m) => m.trim() !== "").map((m) => m.trim());
+    const modules = moduleDeclarationMatch[1]
+        .trim()
+        .split(",")
+        .filter((m) => m.trim() !== "")
+        .map((m) => m.trim());
     return {
         regex: moduleDeclarationRegex,
         path: path[0],
         content: moduleDeclarationMatch,
         modules,
         imports,
-        notImports
+        notImports,
     };
 }
 async function addModuleToContainer(name, modulePath, path) {
@@ -59,7 +66,7 @@ async function addModuleToContainer(name, modulePath, path) {
     let newImport = "";
     const modulePathRegex = /^[^/]=$/;
     if (!modulePathRegex.test(modulePath)) {
-        if (path.split('/').length > 1) {
+        if (path.split("/").length > 1) {
             newImport = `import { ${moduleName}Module } from "${usecaseDir}${modulePath}/${name}.module";`;
         }
         else {
@@ -69,16 +76,21 @@ async function addModuleToContainer(name, modulePath, path) {
     else {
         newImport = `import { ${moduleName}Module } from "${usecaseDir}${name}/${name}.module";`;
     }
-    if (containerData.imports.includes(newImport) && containerData.modules.includes(`${moduleName}Module`)) {
+    if (containerData.imports.includes(newImport) &&
+        containerData.modules.includes(`${moduleName}Module`)) {
         return;
     }
     containerData.imports.push(newImport);
     containerData.modules.push(`${moduleName}Module`);
-    const newModule = containerData.modules.join(', ');
+    const newModule = containerData.modules.join(", ");
     const newModuleDeclaration = `.create([${newModule}]`;
-    const newFileContent = [...containerData.imports, ...containerData.notImports]
-        .join('\n').replace(containerData.regex, newModuleDeclaration);
+    const newFileContent = [
+        ...containerData.imports,
+        ...containerData.notImports,
+    ]
+        .join("\n")
+        .replace(containerData.regex, newModuleDeclaration);
     console.log(" ", chalk_1.default.greenBright(`[container]`.padEnd(14)), chalk_1.default.bold.white(`${moduleName}Module added to ${APP_CONTAINER}! ✔️`));
-    await node_fs_1.default.promises.writeFile(containerData.path, newFileContent, 'utf8');
+    await node_fs_1.default.promises.writeFile(containerData.path, newFileContent, "utf8");
 }
 exports.addModuleToContainer = addModuleToContainer;

package/bin/utils/center-text.js

@@ -4,7 +4,7 @@ exports.centerText = void 0;
 function centerText(text) {
     const terminalWidth = process.stdout.columns;
     const padding = Math.floor((terminalWidth - text.length) / 2);
-    const centeredText = ' '.repeat(padding) + text;
+    const centeredText = " ".repeat(padding) + text;
     return centeredText;
 }
 exports.centerText = centerText;

package/bin/utils/verify-file-exists.js

@@ -18,9 +18,9 @@ async function verifyIfFileExists(path) {
                 default: true,
             },
         ]);
-        const fileName = path.split('/').pop();
+        const fileName = path.split("/").pop();
         if (!answer.confirm) {
-            (0, cli_ui_1.printError)('File not created!', fileName);
+            (0, cli_ui_1.printError)("File not created!", fileName);
             process.exit(1);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@expressots/cli",
-	"version": "1.3.4",
+	"version": "1.4.0",
 	"description": "Expressots CLI - modern, fast, lightweight nodejs web framework (@cli)",
 	"author": "Richard Zampieri",
 	"license": "MIT",
@@ -31,26 +31,31 @@
 		"Scaffolding"
 	],
 	"scripts": {
+		"prepare": "husky install",
 		"start:build": "npm run build && npm run start",
 		"start": "node ./bin/cli.js",
 		"start:dev": "tsnd ./src/cli.ts",
 		"build": "npm run clean && tsc -p tsconfig.json && yarn cp:templates && chmod +x ./bin/cli.js",
 		"cp:templates": "cp -r ./src/generate/templates ./bin/generate/templates",
 		"clean": "rimraf ./bin",
-		"lint": "eslint .eslintrc.js --ext .ts,.tsx,.js,.jsx .",
+		"format": "prettier --write \"./src/**/*.ts\" --cache",
+		"lint": "eslint \"./src/**/*.ts\"",
+		"lint:fix": "eslint \"./src/**/*.ts\" --fix",
 		"release": "release-it",
-		"prepare": "husky install"
+		"test": "vitest run",
+		"test:watch": "vitest",
+		"test:coverage": "vitest run --coverage"
 	},
 	"dependencies": {
-		"@expressots/boost-ts": "^1.1.1",
-		"chalk-animation": "^1",
-		"cli-progress": "^3.11.2",
-		"degit": "^2.8.4",
-		"glob": "^10.2.6",
-		"inquirer": "^8.0.0",
-		"mustache": "^4.2.0",
-		"ts-node": "^10.9.1",
-		"yargs": "^17.6.2"
+		"@expressots/boost-ts": "1.1.1",
+		"chalk-animation": "2.0.3",
+		"cli-progress": "3.11.2",
+		"degit": "2.8.4",
+		"glob": "10.2.6",
+		"inquirer": "8.0.0",
+		"mustache": "4.2.0",
+		"ts-node": "10.9.1",
+		"yargs": "17.6.2"
 	},
 	"devDependencies": {
 		"@commitlint/cli": "^17.7.1",
@@ -74,7 +79,9 @@
 		"release-it": "^16.1.5",
 		"rimraf": "^4.1.2",
 		"ts-node-dev": "^2.0.0",
-		"typescript": "^4.9.5"
+		"typescript": "^4.9.5",
+		"vite": "^4.4.9",
+		"vitest": "^0.34.4"
 	},
 	"release-it": {
 		"git": {