jcc-express-mvc 1.2.6 → 1.2.7

package/{dist/index.js → index.js}

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Schema = exports.Model = exports.verifyHash = exports.jwtVerify = exports.jwtSign = exports.bcrypt = exports.FormRequest = exports.apiAuth = exports.auth = exports.Auth = exports.config = exports.HttpKernel = exports.server = exports.ApiRoute = exports.Route = void 0;
+exports.artisanCommand = exports.Schema = exports.Model = exports.verifyHash = exports.jwtVerify = exports.jwtSign = exports.bcrypt = exports.FormRequest = exports.apiAuth = exports.auth = exports.Auth = exports.config = exports.HttpKernel = exports.server = exports.ApiRoute = exports.Route = void 0;
 const Config_1 = __importDefault(require("./lib/Config/Config"));
 const App_1 = require("./lib/App");
 const HttpKernel_1 = __importDefault(require("./lib/HttpKernel/HttpKernel"));
@@ -11,8 +11,9 @@ const Auth_1 = __importDefault(require("./lib/Auth"));
 const AuthMiddleware_1 = require("./lib/Auth/AuthMiddleware");
 const FormRequest_1 = require("./lib/Request/FormRequest");
 const util_1 = require("./lib/util");
-const Schema_1 = require("./Database/src/Schema");
-const Model_1 = require("./Database/src/Model");
+const Schema_1 = require("./lib/Database/src/Schema");
+const Model_1 = require("./lib/Database/src/Model");
+const NodeArtisanCommand_1 = require("./lib/Command-Line/NodeArtisanCommand");
 exports.Route = App_1.app.webRoutes();
 exports.ApiRoute = App_1.app.apiRoutes();
 exports.server = App_1.app.httpServer();
@@ -28,3 +29,4 @@ exports.jwtVerify = util_1.jwtVerify;
 exports.verifyHash = util_1.verifyHash;
 exports.Model = Model_1.Model;
 exports.Schema = Schema_1.Schema;
+exports.artisanCommand = NodeArtisanCommand_1.NodeArtisanCommand;

package/lib/Command-Line/NodeArtisanCommand.js

@@ -0,0 +1,69 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeArtisanCommand = void 0;
+const command_1 = __importDefault(require("./command"));
+/**
+ Function to parse command line arguments and execute corresponding commands
+ @param {commandArg}  commandArg -string
+ @returns {any} -any
+ *  */
+const NodeArtisanCommand = (commandArg = []) => {
+    let index = commandArg.findIndex((arg, index) => arg.includes(":")); //commandArg[0].split(":")[1] || commandArg[1].split(":")[1]; // Extract the command type from the first argument
+    let command = commandArg[index].split(":")[1];
+    // If the command is for creating an API controller with resources
+    if (commandArg.length === index + 4 &&
+        (command === "apiController" || command === "ApiController") &&
+        (commandArg[index + 3] === "--resources" || commandArg[index + 3] === "-r")) {
+        command_1.default.addModel(commandArg[2]); // Add a model with the provided name
+        return command_1.default.addApi(commandArg[index + 1], commandArg[index + 2]); // Add an API controller with resources
+    }
+    // If the command is for creating a web controller with resources
+    if (commandArg.length === 4 &&
+        (command === "controller" || command === "Controller") &&
+        (commandArg[3] === "--resources" || commandArg[3] === "-r")) {
+        command_1.default.addModel(commandArg[2]); // Add a model with the provided name
+        return command_1.default.addWeb(commandArg[1], commandArg[2]); // Add a web controller with resources
+    }
+    // If the command is for creating an admin controller with resources
+    // If the command is for creating a web controller
+    if (commandArg.length === index + 3 &&
+        (command === "controller" || command === "Controller")) {
+        return command_1.default.addWeb(commandArg[index + 1], commandArg[index + 2]); // Add a web controller
+    }
+    // If the command is for creating an API controller
+    if (commandArg.length === index + 3 &&
+        (command === "apiController" || command === "ApiController")) {
+        return command_1.default.addApi(commandArg[index + 1], commandArg[index + 2]); // Add an API controller
+    }
+    // If the command is for creating a model
+    if (commandArg.length === index + 2 &&
+        (command === "model" || command === "Model")) {
+        return command_1.default.addModel(commandArg[index + 1]); // Add a model
+    }
+    // If the command is for creating a web controller without specifying a model
+    if (commandArg.length === index + 2 &&
+        (command === "controller" || command === "Controller")) {
+        return command_1.default.addWeb(commandArg[index + 1], false); // Add a web controller without a model
+    }
+    // If the command is for creating an API controller without specifying a model
+    if (commandArg.length === index + 2 &&
+        (command === "apiController" || command === "ApiController")) {
+        return command_1.default.addApi(commandArg[index + 1], false); // Add an API controller without a model
+    }
+    // If the command is for creating a request file
+    if (commandArg.length === index + 2 &&
+        (command === "Request" || command === "request")) {
+        return command_1.default.addRequest(commandArg[index + 1]); // Add a request file
+    }
+    // If the command is for creating a request file
+    if (commandArg.length === index + 2 &&
+        (command === "Migration" || command === "migration")) {
+        return command_1.default.addMigration(commandArg[index + 1]); // Add a request file
+    }
+    // If the command is not recognized, display "Command not found"
+    return command_1.default.notFound();
+};
+exports.NodeArtisanCommand = NodeArtisanCommand;

package/lib/Command-Line/command.js

@@ -0,0 +1,111 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const app_root_path_1 = __importDefault(require("app-root-path"));
+const Controller_1 = __importDefault(require("./files/Controller"));
+const Models_1 = __importDefault(require("./files/Models"));
+const ResourcesController_1 = __importDefault(require("./files/ResourcesController"));
+const Request_1 = __importDefault(require("./files/Request"));
+const Migration_1 = __importDefault(require("./files/Migration"));
+const utils_1 = require("./utils");
+const rootPath = app_root_path_1.default.path;
+class Command {
+    // Method to add a web controller
+    addWeb(controllerName, modelName = false) {
+        try {
+            let webControllerPath = path_1.default.resolve(`${rootPath}/app/Http/Controllers`); // Resolve path to web controllers directory
+            if (fs_1.default.existsSync(`${webControllerPath}/${controllerName}.ts`)) {
+                // Check if controller file already exists
+                return console.log(`${controllerName} already exist`.yellow); // Log a warning if controller already exists
+            }
+            if (modelName && typeof modelName === "string") {
+                // If model name is provided, create a resource controller
+                fs_1.default.writeFileSync(`${webControllerPath}/${controllerName}.ts`, (0, ResourcesController_1.default)(controllerName, modelName));
+                return console.log(`${controllerName} added successfully`.green); // Log success message
+            }
+            fs_1.default.writeFileSync(`${webControllerPath}/${controllerName}.ts`, (0, Controller_1.default)(controllerName));
+            return console.log(`${controllerName} added successfully`.green); // Log success message
+        }
+        catch (err) {
+            console.log(`${controllerName} admin controller not added`.red); // Log error if controller addition fails
+        }
+    }
+    // Method to add an API controller
+    addApi(controllerName, modelName = false) {
+        try {
+            let apiPath = path_1.default.resolve(`${rootPath}/app/Http/ApiControllers`); // Resolve path to API controllers directory
+            if (fs_1.default.existsSync(`${apiPath}/${controllerName}.ts`)) {
+                // Check if API controller file already exists
+                return console.log(`${controllerName} api controller already exist`.yellow); // Log a warning if API controller already exists
+            }
+            if (modelName && typeof modelName === "string") {
+                // If model name is provided, create a resource controller
+                fs_1.default.writeFileSync(`${apiPath}/${controllerName}.ts`, (0, ResourcesController_1.default)(controllerName, modelName));
+                return console.log(`${controllerName} added successfully`.green); // Log success message
+            }
+            fs_1.default.writeFileSync(`${apiPath}/${controllerName}.ts`, (0, Controller_1.default)(controllerName));
+            return console.log(`${controllerName} added successfully`.green); // Log success message
+        }
+        catch (err) {
+            console.log(err.message);
+            console.log(`${controllerName} api controller not added`.red); // Log error if controller addition fails
+        }
+    }
+    // Method to add a model
+    addModel(modelName) {
+        try {
+            let modelPath = path_1.default.resolve(`${rootPath}/app/Models`); // Resolve path to models directory
+            if (fs_1.default.existsSync(`${modelPath}/${modelName}.ts`)) {
+                // Check if model file already exists
+                return console.log(`${modelName} model already exist`.yellow); // Log a warning if model already exists
+            }
+            fs_1.default.writeFileSync(`${modelPath}/${modelName}.ts`, (0, Models_1.default)(modelName)); // Create a model file
+            return console.log(`${modelName} model added successfully`.green); // Log success message
+        }
+        catch (err) {
+            return console.log(`${modelName} model not added`.red); // Log error if model addition fails
+        }
+    }
+    // Method to add a request file
+    addRequest(requestName) {
+        try {
+            let requestPath = path_1.default.resolve(`${rootPath}/app/Http/Requests`); // Resolve path to request files directory
+            if (fs_1.default.existsSync(`${requestPath}/${requestName}.ts`)) {
+                // Check if request file already exists
+                return console.log(`${requestName} already exist`.yellow); // Log a warning if request file already exists
+            }
+            fs_1.default.writeFileSync(`${requestPath}/${requestName}.ts`, (0, Request_1.default)(requestName));
+            return console.log(`${requestName} added successfully`.green); // Log success message
+        }
+        catch (err) {
+            return console.log(`${requestName} request not added`.red, { err }); // Log error if request addition fails
+        }
+    }
+    // Method to add a request file
+    addMigration(migrationName) {
+        try {
+            const tableName = migrationName.replace(/(create_|_table)/g, "");
+            let migrationPath = path_1.default.resolve(`${rootPath}/database/migrations`);
+            // Resolve path to request files directory
+            const fullName = `${(0, utils_1.formatDate)()}_${migrationName}`;
+            if (fs_1.default.existsSync(`${migrationPath}/${fullName}.ts`)) {
+                // Check if request file already exists
+                return console.log(`${tableName} already exist`.yellow); // Log a warning if request file already exists
+            }
+            fs_1.default.writeFileSync(`${migrationPath}/${fullName}.ts`, (0, Migration_1.default)(tableName));
+            return console.log(`${fullName} added successfully`.green); // Log success message
+        }
+        catch (err) {
+            return console.log(`${migrationName} migration not added`.red, { err }); // Log error if request addition fails
+        }
+    }
+    // Method to handle a command not found
+    notFound() {
+        return console.log(`Command not found`.bgRed); // Log a message indicating the command was not found
+    }
+}
+exports.default = new Command(); // Export an instance of the Command class

package/{Command-Line → lib/Command-Line}/files/Controller.js

@@ -1,10 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  *  Function to create a controller file
  * @param name string
  * @returns string
  */
 const createController = (name) => {
-  return `
+    return `
     import {Request, Response,Next} from "jcc-express-mvc"
 
 
@@ -72,5 +74,4 @@ const createController = (name) => {
   }
      `;
 };
-
-module.exports = createController;
+exports.default = createController;

package/{Command-Line → lib/Command-Line}/files/Migration.js

@@ -1,6 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const inflection = require("inflection");
 const createMigration = (table) => {
-  return `
+    return `
 import {Schema} from "";
 class Migration {
   up() {
@@ -13,5 +15,4 @@ class Migration {
 }
 `;
 };
-
-module.exports = createMigration;
+exports.default = createMigration;

package/{Command-Line → lib/Command-Line}/files/Models.js

@@ -1,10 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Function to create a model file
  * @param name - string
  * @returns string
  */
 const createModel = (name) => {
-  return `
+    return `
     import {Model} from "jcc-express-mvc"
 
     export class ${name} extends Model{
@@ -16,5 +18,4 @@ const createModel = (name) => {
 
      `;
 };
-
-module.exports = createModel;
+exports.default = createModel;

package/{Command-Line → lib/Command-Line}/files/Request.js

@@ -1,10 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Function to create a request file
  * @param name - string
  * @returns string
  */
 const createRequest = (fileName) => {
-  return `
+    return `
   import { getModel, FormRequest,Request } = from "jcc-express-mvc";
   
  export class ${fileName} extends FormRequest {
@@ -28,5 +30,4 @@ const createRequest = (fileName) => {
   
   `;
 };
-
-module.exports = createRequest;
+exports.default = createRequest;

package/{Command-Line → lib/Command-Line}/files/ResourcesController.js

@@ -1,10 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Function to create a resources file
  * @param name - string
  * @returns string
  */
 const resourceController = (controller, model) => {
-  return `const {getModel }= require("jcc-express-mvc")
+    return `const {getModel }= require("jcc-express-mvc")
     const ${model} = getModel('${model}')
    export class ${controller} {
     
@@ -73,5 +75,4 @@ const resourceController = (controller, model) => {
   }
        `;
 };
-
-module.exports = resourceController;
+exports.default = resourceController;

package/lib/Command-Line/utils.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatDate = void 0;
+const formatDate = () => {
+    const date = new Date();
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
+    const hours = String(date.getHours()).padStart(2, "0");
+    const minutes = String(date.getMinutes()).padStart(2, "0");
+    const seconds = String(date.getSeconds()).padStart(2, "0");
+    return `${year}_${month}_${day}_${hours}_${minutes}_${seconds}`;
+};
+exports.formatDate = formatDate;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "jcc-express-mvc",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "express mvc structure",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "tsc"

package/Command-Line/NodeArtisanCommand.js

@@ -1,93 +0,0 @@
-const runCommand = require("./command");
-
-/**
- Function to parse command line arguments and execute corresponding commands
- @param {commandArg}  commandArg -string
- @returns {any} -any
- *  */
-const NodeArtisanCommand = (commandArg = []) => {
-  let index = commandArg.findIndex((arg, index) => arg.includes(":")); //commandArg[0].split(":")[1] || commandArg[1].split(":")[1]; // Extract the command type from the first argument
-  let command = commandArg[index].split(":")[1];
-  // If the command is for creating an API controller with resources
-  if (
-    commandArg.length === index + 4 &&
-    (command === "apiController" || command === "ApiController") &&
-    (commandArg[index + 3] === "--resources" || commandArg[index + 3] === "-r")
-  ) {
-    runCommand.addModel(commandArg[2]); // Add a model with the provided name
-    return runCommand.addApi(commandArg[index + 1], commandArg[index + 2]); // Add an API controller with resources
-  }
-
-  // If the command is for creating a web controller with resources
-  if (
-    commandArg.length === 4 &&
-    (command === "controller" || command === "Controller") &&
-    (commandArg[3] === "--resources" || commandArg[3] === "-r")
-  ) {
-    runCommand.addModel(commandArg[2]); // Add a model with the provided name
-    return runCommand.addWeb(commandArg[1], commandArg[2]); // Add a web controller with resources
-  }
-
-  // If the command is for creating an admin controller with resources
-
-  // If the command is for creating a web controller
-  if (
-    commandArg.length === index + 3 &&
-    (command === "controller" || command === "Controller")
-  ) {
-    return runCommand.addWeb(commandArg[index + 1], commandArg[index + 2]); // Add a web controller
-  }
-
-  // If the command is for creating an API controller
-  if (
-    commandArg.length === index + 3 &&
-    (command === "apiController" || command === "ApiController")
-  ) {
-    return runCommand.addApi(commandArg[index + 1], commandArg[index + 2]); // Add an API controller
-  }
-
-  // If the command is for creating a model
-  if (
-    commandArg.length === index + 2 &&
-    (command === "model" || command === "Model")
-  ) {
-    return runCommand.addModel(commandArg[index + 1]); // Add a model
-  }
-
-  // If the command is for creating a web controller without specifying a model
-  if (
-    commandArg.length === index + 2 &&
-    (command === "controller" || command === "Controller")
-  ) {
-    return runCommand.addWeb(commandArg[index + 1], false); // Add a web controller without a model
-  }
-
-  // If the command is for creating an API controller without specifying a model
-  if (
-    commandArg.length === index + 2 &&
-    (command === "apiController" || command === "ApiController")
-  ) {
-    return runCommand.addApi(commandArg[index + 1], false); // Add an API controller without a model
-  }
-
-  // If the command is for creating a request file
-  if (
-    commandArg.length === index + 2 &&
-    (command === "Request" || command === "request")
-  ) {
-    return runCommand.addRequest(commandArg[index + 1]); // Add a request file
-  }
-
-  // If the command is for creating a request file
-  if (
-    commandArg.length === index + 2 &&
-    (command === "Migration" || command === "migration")
-  ) {
-    return runCommand.addMigration(commandArg[index + 1]); // Add a request file
-  }
-
-  // If the command is not recognized, display "Command not found"
-  return runCommand.notFound();
-};
-
-module.exports = NodeArtisanCommand;

package/Command-Line/NodeTinker/db/index.js

@@ -1,17 +0,0 @@
-const mysql = require("mysql2/promise.js");
-class Database {
-  async connect() {
-    return await mysql.createConnection({
-      host: process.env.DB_HOST || "",
-      user: process.env.DB_USERNAME,
-      password: process.env.DB_PASSWORD,
-      database: process.env.DB_DATABASE,
-      port: Number(process.env.DB_PORT) || 0,
-    });
-  }
-
-  async runQuery(sqlQuery) {
-    const [results] = await (await this.connect()).query(sqlQuery);
-    return results;
-  }
-}

package/Command-Line/NodeTinker/getInput.js

@@ -1,7 +0,0 @@
-const TinkerNode = require("./");
-
-const getInput = async (input) => {
-  const cli = new TinkerNode();
-  return cli.extractCommand(input);
-};
-module.exports = getInput;

package/Command-Line/NodeTinker/index.js

@@ -1,53 +0,0 @@
-const appRootPath = require("app-root-path").path;
-
-class TinkerNode {
-  #allowedMethodsRegex = /[^\s{}()\[\]\(\)0-9a-zA-Z',_.:@]/g;
-
-  getModel(file) {
-    return require(`${appRootPath}/app/Models/${file}`);
-  }
-
-  sanitizedInput(input) {
-    return input.replace(this.#allowedMethodsRegex, "");
-  }
-
-  validatedInput(input) {
-    const sanitizedInputData = this.sanitizedInput(input);
-    if (sanitizedInputData !== input) {
-      // Input contains disallowed characters, reject it
-      throw new Error("Input contains disallowed characters.");
-    }
-
-    const data = input.split(".");
-    if (data.length <= 1) {
-      throw new Error("Invalid Mongoose query:", input);
-    }
-    const model = data[0];
-    data.splice(0, 1);
-    return { model, methods: data.join(".") };
-  }
-
-  async extractCommand(input) {
-    try {
-      const { model, methods } = this.validatedInput(input);
-
-      return console.log(this.getModel(`${model}.ts`));
-
-      const queryFunction = new Function(
-        "model",
-        "getModel",
-        `
-      const modelName = getModel(model)
-        return modelName.${methods}
-        `,
-      );
-
-      this.connect();
-      return queryFunction(model, this.getModel);
-    } catch (error) {
-      return console.error("Error " + error?.message);
-    }
-  }
-}
-
-module.exports = TinkerNode;

package/Command-Line/NodeTinker/repl.js

@@ -1,28 +0,0 @@
-const { REPL } = require("repl-cli");
-const getInput = require("./getInput");
-const repl = new REPL();
-
-const replPrompt = () => {
-  repl.use({
-    async evaluate(input) {
-      switch (input) {
-        case "exit()":
-          return process.exit(-1);
-
-        case "exit":
-          return process.exit(-1);
-        case "quit()":
-          return process.exit(-1);
-        case "quit":
-          return process.exit(-1);
-        default:
-          const result = await getInput(input);
-          console.log(result);
-          break;
-      }
-    },
-  });
-  repl.start();
-};
-
-module.exports = replPrompt;