@expressots/cli 3.0.0-beta.1 → 3.0.0-beta.3

package/bin/commands/project.commands.js

@@ -59,13 +59,26 @@ function getOutDir() {
  * @param compiler The compiler to load the configuration from
  * @returns The configuration
  */
-const opinionatedConfig = [
-    "--watch",
-    "-r",
-    "tsconfig-paths/register",
-    "./src/main.ts",
-];
-const nonOpinionatedConfig = ["--watch", "./src/main.ts"];
+async function opinionatedConfig() {
+    const { entryPoint } = await compiler_1.default.loadConfig();
+    const config = [
+        "--watch",
+        "-r",
+        "tsconfig-paths/register",
+        `./src/${entryPoint}.ts`,
+    ];
+    return config;
+}
+/**
+ * Load the configuration from the compiler
+ * @param compiler The compiler to load the configuration from
+ * @returns The configuration
+ */
+async function nonOpinionatedConfig() {
+    const { entryPoint } = await compiler_1.default.loadConfig();
+    const config = ["--watch", `./src/${entryPoint}.ts`];
+    return config;
+}
 /**
  * Dev command module
  * @type {CommandModule<object, object>}
@@ -173,12 +186,14 @@ const clearScreen = () => {
  * @param command The command to run
  */
 const runCommand = async ({ command, }) => {
-    const { opinionated } = await compiler_1.default.loadConfig();
+    const { opinionated, entryPoint } = await compiler_1.default.loadConfig();
     const outDir = getOutDir();
     try {
         switch (command) {
             case "dev":
-                execCmd("tsx", opinionated ? opinionatedConfig : nonOpinionatedConfig);
+                execCmd("tsx", opinionated
+                    ? await opinionatedConfig()
+                    : await nonOpinionatedConfig());
                 break;
             case "build":
                 if (!outDir) {
@@ -199,11 +214,11 @@ const runCommand = async ({ command, }) => {
                     config = [
                         "-r",
                         `./${outDir}/register-path.js`,
-                        `./${outDir}/src/main.js`,
+                        `./${outDir}/src/${entryPoint}.js`,
                     ];
                 }
                 else {
-                    config = [`./${outDir}/main.js`];
+                    config = [`./${outDir}/${entryPoint}.js`];
                 }
                 clearScreen();
                 execCmd("node", config);

package/bin/new/cli.js

@@ -23,7 +23,7 @@ const commandOptions = (yargs) => {
         .option("template", {
         describe: "The project template to use",
         type: "string",
-        choices: ["opinionated", "non-opinionated"],
+        choices: ["opinionated", "non-opinionated", "micro"],
         alias: "t",
     })
         .option("package-manager", {

package/bin/new/form.d.ts

@@ -1,6 +1,7 @@
 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)"
+    nonopinionated = "Non-Opinionated :: Start with a clean slate and build your project from scratch.",
+    opinionated = "Opinionated :: Automatically scaffolds resources into a preset project structure. (Recommended)",
+    micro = "Micro :: A minimalistic template for building micro api's."
 }
 declare const enum PackageManager {
     npm = "npm",

package/bin/new/form.js

@@ -5,19 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectForm = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const node_child_process_1 = require("node:child_process");
 const cli_progress_1 = require("cli-progress");
 const degit_1 = __importDefault(require("degit"));
 const inquirer_1 = __importDefault(require("inquirer"));
+const node_child_process_1 = require("node:child_process");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const cli_1 = require("../cli");
 const center_text_1 = require("../utils/center-text");
-const cli_ui_1 = require("../utils/cli-ui");
 const change_package_info_1 = require("../utils/change-package-info");
-const cli_1 = require("../cli");
+const cli_ui_1 = require("../utils/cli-ui");
 async function packageManagerInstall({ packageManager, directory, progressBar, }) {
     const command = process.platform === "win32" ? `${packageManager}.cmd` : packageManager;
-    const args = ["install", "--prefer-offline", "--silent"];
+    const args = ["install", "--silent"];
     if (packageManager === "yarn") {
         args.push("--ignore-engines");
         args.splice(args.indexOf("--prefer-offline"), 1);
@@ -100,8 +100,9 @@ function renameEnvFile(directory) {
 }
 var Template;
 (function (Template) {
-    Template["non-opinionated"] = "Non-Opinionated :: Allows users to choose where to scaffold resources, offering flexible project organization.";
+    Template["nonopinionated"] = "Non-Opinionated :: Start with a clean slate and build your project from scratch.";
     Template["opinionated"] = "Opinionated :: Automatically scaffolds resources into a preset project structure. (Recommended)";
+    Template["micro"] = "Micro :: A minimalistic template for building micro api's.";
 })(Template || (Template = {}));
 const projectForm = async (projectName, args) => {
     let answer;
@@ -137,7 +138,8 @@ const projectForm = async (projectName, args) => {
                 message: "Select a template",
                 choices: [
                     `Opinionated :: Automatically scaffolds resources into a preset project structure. (${chalk_1.default.yellow("Recommended")})`,
-                    "Non-Opinionated :: Allows users to choose where to scaffold resources, offering flexible project organization.",
+                    "NonOpinionated :: Allows users to choose where to scaffold resources, offering flexible project organization.",
+                    "Micro :: A minimalistic template for building micro api's.",
                 ],
             },
             {
@@ -159,8 +161,9 @@ const projectForm = async (projectName, args) => {
     }
     // Hashmap of templates and their directories
     const templates = {
-        "Non-Opinionated": "non_opinionated",
+        NonOpinionated: "non_opinionated",
         Opinionated: "opinionated",
+        Micro: "micro",
     };
     if (answer.confirm) {
         // Check if package manager is bun and OS is Windows

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@expressots/cli",
-	"version": "3.0.0-beta.1",
+	"version": "3.0.0-beta.3",
 	"description": "Expressots CLI - modern, fast, lightweight nodejs web framework (@cli)",
 	"author": "Richard Zampieri",
 	"license": "MIT",
@@ -40,7 +40,6 @@
 		"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",
@@ -66,7 +65,7 @@
 		"@codecov/vite-plugin": "^0.0.1-beta.9",
 		"@commitlint/cli": "19.2.1",
 		"@commitlint/config-conventional": "19.1.0",
-		"@expressots/shared": "0.1.0",
+		"@expressots/shared": "0.3.0",
 		"@release-it/conventional-changelog": "7.0.2",
 		"@types/chalk-animation": "1.6.1",
 		"@types/cli-progress": "3.11.0",