jcc-express-mvc 1.3.2 → 1.3.4

package/lib/Command-Line/NodeArtisanCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeArtisanCommand.d.ts","sourceRoot":"","sources":["../../../framework/lib/Command-Line/NodeArtisanCommand.ts"],"names":[],"mappings":"AAEA;;;;MAIM;AACN,eAAO,MAAM,kBAAkB,gBAAgB,KAAK,CAAC,GAAG,CAAC,KAAQ,GAmFhE,CAAC"}
+{"version":3,"file":"NodeArtisanCommand.d.ts","sourceRoot":"","sources":["../../../framework/lib/Command-Line/NodeArtisanCommand.ts"],"names":[],"mappings":"AACA;;;;MAIM;AACN,eAAO,MAAM,kBAAkB,gBAAgB,KAAK,CAAC,GAAG,CAAC,KAAQ,GA6FhE,CAAC"}

package/lib/Command-Line/NodeArtisanCommand.js

@@ -11,59 +11,68 @@ const command_1 = __importDefault(require("./command"));
  @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
+    try {
+        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 (command === "migrate") {
+            return command_1.default.runMigration();
+        }
+        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();
     }
-    // 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
+    catch (error) {
+        console.log("Sorry an error occur, Please try again");
     }
-    // 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.d.ts

@@ -4,6 +4,7 @@ declare class Command {
     addModel(modelName: string): any;
     addRequest(requestName: string): any;
     addMigration(migrationName: string): any;
+    runMigration(): void;
     notFound(): any;
 }
 declare const _default: Command;

package/lib/Command-Line/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../framework/lib/Command-Line/command.ts"],"names":[],"mappings":"AAaA,cAAM,OAAO;IAEX,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,GAAG;IA2BtD,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,GAAG;IA6BtD,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG;IAehC,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG;IAmBpC,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG;IAuBxC,QAAQ,IAAI,GAAG;CAGhB;;AAED,wBAA6B"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../framework/lib/Command-Line/command.ts"],"names":[],"mappings":"AAcA,cAAM,OAAO;IAGX,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,GAAG;IA2BtD,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,GAAG;IA+BtD,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG;IAehC,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG;IAqBpC,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG;IAwBxC,YAAY;IAqBZ,QAAQ,IAAI,GAAG;CAGhB;;AAED,wBAA6B"}

package/lib/Command-Line/command.js

@@ -11,8 +11,11 @@ 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 colors_1 = __importDefault(require("colors")); // Module for adding color to console output
 const utils_1 = require("./utils");
+const jcc_eloquent_1 = require("jcc-eloquent");
 const rootPath = app_root_path_1.default.path;
+colors_1.default.enable();
 class Command {
     // Method to add a web controller
     addWeb(controllerName, modelName = false) {
@@ -20,7 +23,7 @@ class Command {
             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
+                return console.log(colors_1.default.yellow(`${controllerName} already exist`)); // Log a warning if controller already exists
             }
             if (modelName && typeof modelName === "string") {
                 // If model name is provided, create a resource controller
@@ -28,10 +31,10 @@ class Command {
                 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
+            return console.log(colors_1.default.green(`${controllerName} added successfully`)); // Log success message
         }
         catch (err) {
-            console.log(`${controllerName} admin controller not added`.red); // Log error if controller addition fails
+            console.log(colors_1.default.red(`${controllerName} admin controller not added`)); // Log error if controller addition fails
         }
     }
     // Method to add an API controller
@@ -40,19 +43,19 @@ class Command {
             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
+                return console.log(colors_1.default.yellow(`${controllerName} api controller already exist`)); // 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
+                return console.log(colors_1.default.green(`${controllerName} added successfully`)); // 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
+            return console.log(colors_1.default.green(`${controllerName} added successfully`)); // Log success message
         }
         catch (err) {
             console.log(err.message);
-            console.log(`${controllerName} api controller not added`.red); // Log error if controller addition fails
+            console.log(colors_1.default.red(`${controllerName} api controller not added`)); // Log error if controller addition fails
         }
     }
     // Method to add a model
@@ -61,13 +64,13 @@ class Command {
             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
+                return console.log(colors_1.default.yellow(`${modelName} model already exist`)); // 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
+            return console.log(colors_1.default.green(`${modelName} model added successfully`)); // Log success message
         }
         catch (err) {
-            return console.log(`${modelName} model not added`.red); // Log error if model addition fails
+            return console.log(colors_1.default.red(`${modelName} model not added`)); // Log error if model addition fails
         }
     }
     // Method to add a request file
@@ -76,13 +79,15 @@ class Command {
             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
+                return console.log(colors_1.default.yellow(`${requestName} already exist`)); // 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
+            return console.log(colors_1.default.green(`${requestName} added successfully`)); // Log success message
         }
         catch (err) {
-            return console.log(`${requestName} request not added`.red, { err }); // Log error if request addition fails
+            return console.log(colors_1.default.red(`${requestName} request not added`), {
+                err,
+            }); // Log error if request addition fails
         }
     }
     // Method to add a request file
@@ -92,20 +97,41 @@ class Command {
             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`)) {
+            if (fs_1.default.existsSync(`${migrationPath}/${fullName}.js`)) {
                 // Check if request file already exists
-                return console.log(`${tableName} already exist`.yellow); // Log a warning if request file already exists
+                return console.log(colors_1.default.yellow(`${tableName} already exist`)); // 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
+            fs_1.default.writeFileSync(`${migrationPath}/${fullName}.js`, (0, Migration_1.default)(tableName));
+            return console.log(colors_1.default.green(`${fullName} added successfully`)); // Log success message
         }
         catch (err) {
-            return console.log(`${migrationName} migration not added`.red, { err }); // Log error if request addition fails
+            return console.log(colors_1.default.red(`${migrationName} migration not added`), {
+                err,
+            }); // Log error if request addition fails
+        }
+    }
+    runMigration() {
+        try {
+            const migrationPath = `${rootPath}/database/migrations`;
+            const files = fs_1.default.readdirSync(migrationPath);
+            for (const file of files) {
+                const migrationFile = require(`${migrationPath}/${file}.ts`);
+                const sql = migrationFile.up();
+                jcc_eloquent_1.DB.runQuery(sql)
+                    .then((res) => {
+                    console.log(res);
+                    process.exit();
+                })
+                    .catch((err) => console.log(err));
+            }
+        }
+        catch (error) {
+            console.log(error.message);
         }
     }
     // Method to handle a command not found
     notFound() {
-        return console.log(`Command not found`.bgRed); // Log a message indicating the command was not found
+        return console.log(colors_1.default.bgRed(`Command not found`)); // Log a message indicating the command was not found
     }
 }
 exports.default = new Command(); // Export an instance of the Command class

package/lib/Command-Line/files/Migration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Migration.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/files/Migration.ts"],"names":[],"mappings":"AACA,QAAA,MAAM,eAAe,UAAW,MAAM,KAAG,MAaxC,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"Migration.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/files/Migration.ts"],"names":[],"mappings":"AACA,QAAA,MAAM,eAAe,UAAW,MAAM,KAAG,MAexC,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/lib/Command-Line/files/Migration.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const inflection = require("inflection");
 const createMigration = (table) => {
     return `
-import {Schema} from "jcc-express-mvc";
+import {Schema} from "jcc-eloquent";
 class Migration {
   up() {
     return Schema.create("${inflection.pluralize(table)}", (table) => {
@@ -13,6 +13,8 @@ class Migration {
     });
   }
 }
+
+module.exports = new Migration()
 `;
 };
 exports.default = createMigration;

package/lib/Command-Line/files/Models.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const createModel = (name) => {
     return `
-    import {Model} from "jcc-express-mvc"
+    import {Model} from "jcc-eloquent"
 
     export class ${name} extends Model{
     //

package/lib/Command-Line/files/ResourcesController.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @returns string
  */
 const resourceController = (controller, model) => {
-    return `import  {Model}= from "jcc-express-mvc"
+    return `import  {Model}= from "jcc-eloquent"
    export class ${controller} extends Model {
     
       /**

package/lib/Validation/rules.js

@@ -10,7 +10,7 @@ class Rules extends validate_1.Validate {
             switch (validation) {
                 case "required":
                     return this.required(fieldName, fieldValue);
-                case "min" || "min:":
+                case "min":
                     return this.min(fieldName, fieldValue, Number(secondValue));
                 case "max":
                     return this.max(fieldName, fieldValue, Number(secondValue));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jcc-express-mvc",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "express mvc structure",
   "main": "index.js",
   "types": "index.d.ts",