@expressots/cli 1.11.1 → 3.0.0-beta.1

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

@@ -9,11 +9,12 @@ const glob_1 = require("glob");
 const node_fs_1 = __importDefault(require("node:fs"));
 const cli_ui_1 = require("./cli-ui");
 const compiler_1 = __importDefault(require("./compiler"));
-const APP_CONTAINER = "app.container.ts";
+const APP_CONTAINER = "app.ts";
 async function validateAppContainer() {
     const { sourceRoot } = await compiler_1.default.loadConfig();
     const imports = [];
     const notImports = [];
+    // Locate the container file
     const path = (0, glob_1.globSync)(`./${sourceRoot}/${APP_CONTAINER}`, {
         absolute: true,
         ignore: "**/node_modules/**",
@@ -22,7 +23,9 @@ async function validateAppContainer() {
         (0, cli_ui_1.printError)("Module not added to Container. Container file not found!", APP_CONTAINER);
         process.exit(1);
     }
+    // Read the container file
     const fileContent = await node_fs_1.default.promises.readFile(path[0], "utf8");
+    // Collect imports and other lines
     fileContent.split("\n").forEach((line) => {
         if (line.startsWith("import")) {
             imports.push(line);
@@ -31,28 +34,30 @@ async function validateAppContainer() {
             notImports.push(line);
         }
     });
-    // Validate the file content
-    const moduleDeclarationRegex = /.create\(\s*\[([\s\S]*?)]/;
-    const moduleDeclarationMatch = fileContent.match(moduleDeclarationRegex);
-    if (!moduleDeclarationMatch) {
-        (0, cli_ui_1.printError)("Container format incorrect!", APP_CONTAINER);
+    // Regex to detect and extract modules from configContainer
+    const moduleRegex = /this\.configContainer\(\s*\[\s*([\s\S]*?)\s*]\s*\)/;
+    const moduleMatch = fileContent.match(moduleRegex);
+    if (!moduleMatch) {
+        (0, cli_ui_1.printError)("The App class does not contain a valid configContainer([]) declaration!", APP_CONTAINER);
         process.exit(1);
     }
-    const modules = moduleDeclarationMatch[1]
+    // Extract modules if present
+    const modules = moduleMatch[1]
         .trim()
         .split(",")
         .filter((m) => m.trim() !== "")
         .map((m) => m.trim());
     return {
-        regex: moduleDeclarationRegex,
+        regex: moduleRegex,
         path: path[0],
-        content: moduleDeclarationMatch,
+        content: fileContent,
         modules,
         imports,
         notImports,
     };
 }
 async function addModuleToContainer(name, modulePath, path) {
+    console.log("To chamando esse cara");
     const containerData = await validateAppContainer();
     const moduleName = (name[0].toUpperCase() + name.slice(1)).trimStart();
     const { opinionated } = await compiler_1.default.loadConfig();
@@ -83,7 +88,7 @@ async function addModuleToContainer(name, modulePath, path) {
     containerData.imports.push(newImport);
     containerData.modules.push(`${moduleName}Module`);
     const newModule = containerData.modules.join(", ");
-    const newModuleDeclaration = `.create([${newModule}]`;
+    const newModuleDeclaration = `this.configContainer([${newModule}])`;
     const newFileContent = [
         ...containerData.imports,
         ...containerData.notImports,
@@ -116,7 +121,7 @@ async function addModuleToContainerNestedPath(name, path) {
     containerData.imports.push(newImport);
     containerData.modules.push(`${moduleName}Module`);
     const newModule = containerData.modules.join(", ");
-    const newModuleDeclaration = `.create([${newModule}]`;
+    const newModuleDeclaration = `this.configContainer([${newModule}])`;
     const newFileContent = [
         ...containerData.imports,
         ...containerData.notImports,

package/bin/utils/compiler.d.ts

@@ -1,5 +1,5 @@
 import { Service } from "ts-node";
-import { ExpressoConfig } from "../types";
+import { ExpressoConfig } from "@expressots/shared";
 /**
  * Singleton compiler class
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@expressots/cli",
-	"version": "1.11.1",
+	"version": "3.0.0-beta.1",
 	"description": "Expressots CLI - modern, fast, lightweight nodejs web framework (@cli)",
 	"author": "Richard Zampieri",
 	"license": "MIT",
@@ -8,10 +8,11 @@
 		"url": "https://github.com/expressots/expressots-cli/issues"
 	},
 	"bin": {
-		"expressots": "bin/cli.js"
+		"expressots": "bin/cli.js",
+		"ex": "bin/cli.js"
 	},
 	"engines": {
-		"node": ">=18.0.0"
+		"node": ">=20.18.0"
 	},
 	"funding": {
 		"type": "github",
@@ -34,23 +35,22 @@
 		"prepare": "husky",
 		"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",
+		"start:dev": "tsx ./src/cli.ts",
+		"build": "npm run clean && tsc -p tsconfig.json && npm run cp:templates && node scripts/chmod.js ./bin/cli.js",
+		"cp:templates": "node scripts/cp.js ./src/generate/templates ./bin/generate/",
+		"clean": "node scripts/rm.js bin",
 		"prepublish": "npm run build && npm pack",
 		"publish": "npm publish --tag latest",
 		"format": "prettier --write \"./src/**/*.ts\" --cache",
 		"lint": "eslint \"./src/**/*.ts\"",
 		"lint:fix": "eslint \"./src/**/*.ts\" --fix",
 		"release": "release-it",
-		"test": "vitest run --reporter default",
-		"test:watch": "vitest",
-		"coverage": "vitest run --coverage"
+		"test": "jest",
+		"coverage": "jest --coverage",
+		"test:watch": "jest --watch"
 	},
 	"dependencies": {
-		"@expressots/boost-ts": "1.3.0",
-		"axios": "^1.7.3",
+		"axios": "1.7.7",
 		"chalk-animation": "2.0.3",
 		"cli-progress": "3.12.0",
 		"cli-table3": "0.6.5",
@@ -58,7 +58,7 @@
 		"glob": "10.4.5",
 		"inquirer": "8.2.6",
 		"mustache": "4.2.0",
-		"semver": "7.6.2",
+		"semver": "7.6.3",
 		"ts-node": "10.9.2",
 		"yargs": "17.7.2"
 	},
@@ -66,31 +66,30 @@
 		"@codecov/vite-plugin": "^0.0.1-beta.9",
 		"@commitlint/cli": "19.2.1",
 		"@commitlint/config-conventional": "19.1.0",
+		"@expressots/shared": "0.1.0",
 		"@release-it/conventional-changelog": "7.0.2",
 		"@types/chalk-animation": "1.6.1",
 		"@types/cli-progress": "3.11.0",
 		"@types/degit": "2.8.3",
 		"@types/inquirer": "9.0.3",
+		"@types/jest": "^29.5.14",
 		"@types/mustache": "4.2.2",
 		"@types/node": "20.12.7",
 		"@types/yargs": "17.0.22",
 		"@typescript-eslint/eslint-plugin": "7.6.0",
 		"@typescript-eslint/parser": "7.6.0",
-		"@vitest/coverage-v8": "1.4.0",
 		"chalk": "4.1.2",
 		"eslint": "8.57.0",
 		"eslint-config-prettier": "9.1.0",
 		"husky": "9.0.11",
+		"jest": "^29.7.0",
 		"prettier": "3.2.5",
 		"reflect-metadata": "0.2.2",
 		"release-it": "16.3.0",
-		"rimraf": "5.0.5",
 		"shx": "0.3.4",
-		"ts-node-dev": "2.0.0",
-		"typescript": "5.2.2",
-		"vite": "5.2.8",
-		"vite-tsconfig-paths": "4.3.2",
-		"vitest": "1.4.0"
+		"ts-jest": "^29.2.5",
+		"tsx": "^4.19.2",
+		"typescript": "5.2.2"
 	},
 	"release-it": {
 		"git": {

package/bin/@types/config.d.ts

@@ -1,39 +0,0 @@
-export declare const enum Pattern {
-    LOWER_CASE = "lowercase",
-    KEBAB_CASE = "kebab-case",
-    PASCAL_CASE = "PascalCase",
-    CAMEL_CASE = "camelCase"
-}
-interface IProviders {
-    prisma?: {
-        schemaName: string;
-        schemaPath: string;
-        entitiesPath: string;
-        entityNamePattern: string;
-    };
-}
-/**
- * The configuration object for the Expresso CLI.
- *
- * @property {Pattern} scaffoldPattern - The pattern to use when scaffolding files.
- * @property {string} sourceRoot - The root directory for the source files.
- * @property {boolean} opinionated - Whether or not to use the opinionated configuration.
- *
- * @see [ExpressoConfig](https://expresso-ts.com/docs)
- */
-export interface ExpressoConfig {
-    scaffoldPattern: Pattern;
-    sourceRoot: string;
-    opinionated: boolean;
-    providers?: IProviders;
-    scaffoldSchematics?: {
-        entity?: string;
-        controller?: string;
-        usecase?: string;
-        dto?: string;
-        module?: string;
-        provider?: string;
-        middleware?: string;
-    };
-}
-export {};

package/bin/@types/config.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/bin/@types/index.d.ts

@@ -1 +0,0 @@
-export * from "./config";

package/bin/app.container.d.ts

@@ -1 +0,0 @@
-export {};

package/bin/app.container.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/* import { AppContainer } from "@expressots/core";
-
-export const appContainer = new AppContainer();
-
-export const container = appContainer.create([]);
- */

package/bin/commands/__tests__/project.commands.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/bin/commands/__tests__/project.commands.spec.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const vitest_1 = require("vitest");
-(0, vitest_1.describe)("project.commands", () => {
-    (0, vitest_1.it)("should return a list of commands", () => {
-        (0, vitest_1.expect)(true).toBe(true);
-    });
-});

package/bin/types.d.ts

@@ -1 +0,0 @@
-export * from "./@types";

package/bin/types.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./@types"), exports);