@expressots/cli 1.8.1 → 1.9.0

package/bin/generate/templates/nonopinionated/entity.tpl

@@ -1,4 +1,4 @@
-import { provide } from "inversify-binding-decorators";
+import { provide } from "@expressots/core";
 
 @provide({{className}}{{schematic}})
 export class {{className}}{{schematic}} {}

package/bin/generate/templates/nonopinionated/middleware.tpl

@@ -1,6 +1,5 @@
-import { ExpressoMiddleware } from "@expressots/core";
+import { ExpressoMiddleware, provide } from "@expressots/core";
 import { NextFunction, Request, Response } from "express";
-import { provide } from "inversify-binding-decorators";
 
 @provide({{className}}{{schematic}})
 export class {{className}}{{schematic}} extends ExpressoMiddleware {

package/bin/generate/templates/nonopinionated/provider.tpl

@@ -1,4 +1,4 @@
-import { provide } from "inversify-binding-decorators";
+import { provide } from "@expressots/core";
 
 @provide({{className}}{{schematic}})
 export class {{className}}{{schematic}} {}

package/bin/generate/templates/nonopinionated/usecase.tpl

@@ -1,4 +1,4 @@
-import { provide } from "inversify-binding-decorators";
+import { provide } from "@expressots/core";
 
 @provide({{className}}{{schematic}})
 export class {{className}}{{schematic}} {}

package/bin/generate/templates/opinionated/entity.tpl

@@ -1,4 +1,4 @@
-import { provide } from "inversify-binding-decorators";
+import { provide } from "@expressots/core";
 import { randomUUID } from "node:crypto";
 
 @provide({{className}}Entity)

package/bin/generate/templates/opinionated/middleware.tpl

@@ -1,6 +1,5 @@
-import { ExpressoMiddleware } from "@expressots/core";
+import { ExpressoMiddleware, provide } from "@expressots/core";
 import { NextFunction, Request, Response } from "express";
-import { provide } from "inversify-binding-decorators";
 
 @provide({{className}}Middleware)
 export class {{className}}Middleware extends ExpressoMiddleware {

package/bin/generate/templates/opinionated/provider.tpl

@@ -1,4 +1,4 @@
-import { provide } from "inversify-binding-decorators";
+import { provide } from "@expressots/core";
 
 @provide({{className}}Provider)
 export class {{className}}Provider {}

package/bin/generate/templates/opinionated/usecase-service-delete.tpl

@@ -1,4 +1,4 @@
-import { provide } from "inversify-binding-decorators";
+import { provide } from "@expressots/core";
 
 @provide({{className}}UseCase)
 export class {{className}}UseCase {

package/bin/generate/templates/opinionated/usecase-service.tpl

@@ -1,4 +1,4 @@
-import { provide } from "inversify-binding-decorators";
+import { provide } from "@expressots/core";
 import { I{{className}}RequestDTO, I{{className}}ResponseDTO } from "./{{fileName}}.dto";
 
 @provide({{className}}UseCase)

package/bin/generate/templates/opinionated/usecase.tpl

@@ -1,4 +1,4 @@
-import { provide } from "inversify-binding-decorators";
+import { provide } from "@expressots/core";
 
 @provide({{className}}UseCase)
 export class {{className}}UseCase {

package/bin/generate/utils/nonopininated-cmd.js

@@ -106,7 +106,9 @@ async function generateUseCase(outputPath, className, moduleName, path, fileName
                 moduleName,
                 path,
                 fileName,
-                schematic: (0, boost_ts_1.anyCaseToPascalCase)(schematic),
+                schematic: schematic === "usecase"
+                    ? "UseCase"
+                    : (0, boost_ts_1.anyCaseToPascalCase)(schematic),
             },
         },
     });

package/bin/new/cli.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProject = void 0;
 const form_1 = require("./form");
 const semver_1 = __importDefault(require("semver"));
+const cli_ui_1 = require("../utils/cli-ui");
+const chalk_1 = __importDefault(require("chalk"));
 const packageManagers = [
     "npm",
     "yarn",
@@ -40,11 +42,11 @@ const commandOptions = (yargs) => {
 };
 const checkNodeVersion = () => {
     const minVersion = "18.0.0";
-    const maxVersion = "20.7.0";
+    const maxVersion = "22.5.1";
     const currentVersion = process.version;
     if (!semver_1.default.satisfies(currentVersion, `>=${minVersion} <=${maxVersion}`)) {
-        console.error(`Node.js version ${currentVersion} is not supported. Please use a version between ${minVersion} and ${maxVersion}.`);
-        process.exit(1);
+        const msg = `Node.js version [${chalk_1.default.bold(chalk_1.default.white(currentVersion))}] is not tested. Please use a version between ${minVersion} and ${maxVersion}.`;
+        (0, cli_ui_1.printWarning)(msg);
     }
 };
 const createProject = () => {

package/bin/new/form.d.ts

@@ -1,2 +1,14 @@
-declare const projectForm: (projectName: string, args: any[]) => Promise<void>;
+declare enum Template {
+    "non-opinionated" = "Non-Opinionated :: Allows users to choose where to scaffold resources, offering flexible project organization.",
+    opinionated = "Opinionated :: Automatically scaffolds resources into a preset project structure. (Recommended)"
+}
+declare const enum PackageManager {
+    npm = "npm",
+    yarn = "yarn",
+    pnpm = "pnpm",
+    bun = "bun"
+}
+type TemplateKeys = keyof typeof Template;
+type ProjectFormArgs = [PackageManager, TemplateKeys, string];
+declare const projectForm: (projectName: string, args: ProjectFormArgs) => Promise<void>;
 export { projectForm };

package/bin/new/form.js

@@ -19,10 +19,15 @@ async function packageManagerInstall({ packageManager, directory, progressBar, }
         const command = isWindows
             ? `${packageManager}.cmd`
             : packageManager;
-        const installProcess = (0, node_child_process_1.spawn)(command, ["install"], {
+        const installProcess = (0, node_child_process_1.spawn)(command, ["install", "--prefer-offline"], {
             cwd: directory,
+            shell: true,
+            timeout: 600000,
         });
+        // eslint-disable-next-line prefer-const
+        let installTimeout;
         installProcess.on("error", (error) => {
+            clearTimeout(installTimeout);
             reject(new Error(`Failed to start subprocess: ${error.message}`));
         });
         installProcess.stdout?.on("data", (data) => {
@@ -38,6 +43,7 @@ async function packageManagerInstall({ packageManager, directory, progressBar, }
             }
         });
         installProcess.on("close", (code) => {
+            clearTimeout(installTimeout);
             if (code === 0) {
                 resolve("Installation Done!");
             }
@@ -45,6 +51,10 @@ async function packageManagerInstall({ packageManager, directory, progressBar, }
                 reject(new Error(`${packageManager} install exited with code ${code}`));
             }
         });
+        installTimeout = setTimeout(() => {
+            installProcess.kill("SIGKILL");
+            reject(new Error("Installation took too long. Aborted!"));
+        }, 600000);
     });
 }
 async function checkIfPackageManagerExists(packageManager) {
@@ -58,15 +68,11 @@ async function checkIfPackageManagerExists(packageManager) {
     }
 }
 function changePackageName({ directory, name, }) {
-    // Get the absolute path of the input directory parameter
     const absDirPath = node_path_1.default.resolve(directory);
-    // Load the package.json file
     const packageJsonPath = node_path_1.default.join(absDirPath, "package.json");
     const fileContents = node_fs_1.default.readFileSync(packageJsonPath, "utf-8");
     const packageJson = JSON.parse(fileContents);
-    // Change the name
     packageJson.name = name;
-    // Save the package.json file
     node_fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 }
 function renameEnvFile(directory) {
@@ -90,27 +96,7 @@ var Template;
 })(Template || (Template = {}));
 const projectForm = async (projectName, args) => {
     let answer;
-    const projName = projectName;
-    let packageManager;
-    let template;
-    let directory;
-    // Resolving the argument order problem
-    for (const arg of args) {
-        if (args.length >= 3) {
-            if (arg === "npm" ||
-                arg === "yarn" ||
-                arg === "pnpm" ||
-                arg === "bun") {
-                packageManager = arg;
-            }
-            else if (arg === "non-opinionated" || arg === "opinionated") {
-                template = arg;
-            }
-            else {
-                directory = arg;
-            }
-        }
-    }
+    const [packageManager, template, directory] = args;
     if (packageManager && template) {
         answer = {
             name: projectName,
@@ -205,7 +191,7 @@ const projectForm = async (projectName, args) => {
         progressBar.update(90);
         changePackageName({
             directory: answer.name,
-            name: projName,
+            name: projectName,
         });
         renameEnvFile(answer.name);
         progressBar.update(100);

package/bin/utils/cli-ui.d.ts

@@ -1,3 +1,4 @@
 export declare function printError(message: string, component: string): void;
+export declare function printWarning(message: string, component?: string): void;
 export declare function printGenerateError(schematic: string, file: string): Promise<void>;
 export declare function printGenerateSuccess(schematic: string, file: string): Promise<void>;

package/bin/utils/cli-ui.js

@@ -3,12 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printGenerateSuccess = exports.printGenerateError = exports.printError = void 0;
+exports.printGenerateSuccess = exports.printGenerateError = exports.printWarning = exports.printError = void 0;
 const chalk_1 = __importDefault(require("chalk"));
+const process_1 = require("process");
 function printError(message, component) {
     console.error(chalk_1.default.red(`${message}:`, chalk_1.default.bold(chalk_1.default.white(`[${component}] ❌`))));
 }
 exports.printError = printError;
+function printWarning(message, component) {
+    if (component === undefined) {
+        process_1.stdout.write(chalk_1.default.yellow(`${message} ⚠️\n`));
+        return;
+    }
+    process_1.stdout.write(chalk_1.default.yellow(`${message}:`, chalk_1.default.bold(chalk_1.default.white(`[${component}] ⚠️\n`))));
+}
+exports.printWarning = printWarning;
 async function printGenerateError(schematic, file) {
     console.error(" ", chalk_1.default.redBright(`[${schematic}]`.padEnd(14)), chalk_1.default.bold.white(`${file.split(".")[0]} not created! ❌`));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@expressots/cli",
-	"version": "1.8.1",
+	"version": "1.9.0",
 	"description": "Expressots CLI - modern, fast, lightweight nodejs web framework (@cli)",
 	"author": "Richard Zampieri",
 	"license": "MIT",
@@ -11,7 +11,7 @@
 		"expressots": "bin/cli.js"
 	},
 	"engines": {
-		"node": ">=18.18.0"
+		"node": ">=18.0.0"
 	},
 	"funding": {
 		"type": "github",
@@ -31,7 +31,7 @@
 		"Scaffolding"
 	],
 	"scripts": {
-		"prepare": "husky install",
+		"prepare": "husky",
 		"start:build": "npm run build && npm run start",
 		"start": "node ./bin/cli.js",
 		"start:dev": "tsnd ./src/cli.ts",
@@ -49,17 +49,17 @@
 		"coverage": "vitest run --coverage"
 	},
 	"dependencies": {
-		"@expressots/boost-ts": "1.1.1",
+		"@expressots/boost-ts": "1.3.0",
 		"chalk-animation": "2.0.3",
-		"cli-progress": "3.11.2",
-		"cli-table3": "0.6.4",
+		"cli-progress": "3.12.0",
+		"cli-table3": "0.6.5",
 		"degit": "2.8.4",
 		"glob": "10.4.1",
-		"inquirer": "8.0.0",
+		"inquirer": "8.2.6",
 		"mustache": "4.2.0",
 		"semver": "7.6.2",
-		"ts-node": "10.9.1",
-		"yargs": "17.6.2"
+		"ts-node": "10.9.2",
+		"yargs": "17.7.2"
 	},
 	"devDependencies": {
 		"@codecov/vite-plugin": "^0.0.1-beta.9",