slicejs-cli 1.0.25 → 1.0.27

package/commands/Validations.js

@@ -0,0 +1,30 @@
+export default class Validations{
+    constructor(){}
+
+    static isValidComponentName(componentName) {
+        // Expresión regular para verificar si el nombre contiene caracteres especiales
+        const regex = /^[a-zA-Z][a-zA-Z0-9]*$/;
+        return regex.test(componentName);
+    }
+
+    static isValidCategory(category){
+        const categoryVariations = {
+            'Service': ['service', 'servicio', 'serv'],
+            'Visual': ['visual', 'vis'],
+            'Provider': ['provider', 'proveedor', 'prov'],
+            'Structural': ['structural', 'estructural', 'est']
+        };
+ 
+        let categoryIsValid = false;
+        Object.keys(categoryVariations).forEach(validCategory => {
+            if (categoryVariations[validCategory].includes(category.toLowerCase())) {
+                category = validCategory
+                categoryIsValid = true;
+            }
+        });
+
+        return ({isValid: categoryIsValid, category: category})
+    }
+
+    
+}

package/commands/modifyComponent/modifyComponent.js

@@ -1,49 +1,38 @@
 import fs from 'fs';
 import path from 'path';
+import Validations from '../Validations.js';
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 
+
 function modifyComponent(componentName, category, addProperties, removeProperties) {
     if (!componentName) {
         console.error('Component name is required');
         return;
     }
 
-    if (!isValidComponentName(componentName)) {
+    if (!Validations.isValidComponentName(componentName)) {
         console.error('Invalid component name. Please use only alphanumeric characters and start with a letter.');
         return;
     }
 
+    
+    
+    let flagCategory = Validations.isValidCategory(category);
 
-    const categoryVariations = {
-        'Service': ['service', 'servicio', 'serv'],
-        'Visual': ['visual', 'vis'],
-        'Provider': ['provider', 'proveedor', 'prov'],
-        'Structural': ['structural', 'estructural', 'est']
-    };
-
-
-
-    // Verificar si la categoría es válida
-    let categoryIsValid = false;
-    Object.keys(categoryVariations).forEach(validCategory => {
-        if (categoryVariations[validCategory].includes(category.toLowerCase())) {
-            category = validCategory
-            categoryIsValid = true;
-        }
-    });
-
-    if (!categoryIsValid) {
+    if (!flagCategory.isValid) {
         console.error('Invalid category. Please use one of the following categories: Service, Visual, Provider, Structural');
         return;
     }
 
+    category = flagCategory.category;
+
     const componentDir = path.join(__dirname, '../../../../Slice/Components', category, componentName);
     const fileName = `${componentName}.js`;
+
     let componentPath = path.join(componentDir, fileName);
     componentPath=componentPath.slice(1);
 
-    console.log(componentPath);
     if (!fs.existsSync(componentPath)) {
         console.error(`Component '${componentName}' does not exist.`);
         return;
@@ -79,10 +68,6 @@ function modifyComponent(componentName, category, addProperties, removePropertie
     console.log(`Component '${componentName}' modified successfully.`);
 }
 
-function isValidComponentName(componentName) {
-    const regex = /^[a-zA-Z][a-zA-Z0-9]*$/;
-    return regex.test(componentName);
-}
 
 function extractProperties(componentContent) {
     const propRegex = /this\.debuggerProps\s*=\s*\[(.*?)\];/s;
@@ -104,14 +89,23 @@ function addGetterSetterIfNeeded(componentContent, property) {
 }
 
 function removePropertyIfNeeded(componentContent, property) {
-    // Verificar si no está en debuggerProps pero tiene getters y setters
-    const propInDebuggerProps = componentContent.includes(`'${property}'`);
-    const hasGetterSetter = hasGetterSetterForProperty(componentContent, property);
-    if (!propInDebuggerProps && hasGetterSetter) {
-        // Eliminar los getters y setters del componente
-        componentContent = removeGetterSetter(componentContent, property);
-    }
-    return componentContent;
+    let updatedComponentContent = componentContent;
+
+    // Eliminar la propiedad de debuggerProps si está presente
+    const debuggerPropsRegex = /this\.debuggerProps\s*=\s*\[(.*?)\];/s;
+    updatedComponentContent = updatedComponentContent.replace(debuggerPropsRegex, (match, propsList) => {
+        const props = propsList.split(',').map(prop => prop.trim().replace(/['"]/g, ''));
+        const propIndex = props.indexOf(property);
+        if (propIndex !== -1) {
+            props.splice(propIndex, 1);
+        }
+        return `this.debuggerProps = [${props.map(prop => `'${prop}'`).join(', ')}];`;
+    });
+
+    // Eliminar los getters y setters de la propiedad
+    updatedComponentContent = removeGetterSetter(updatedComponentContent, property);
+
+    return updatedComponentContent;
 }
 
 function hasGetterSetterForProperty(componentContent, property) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slicejs-cli",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "Command client for developing web applications with Slice.js",
   "main": "client.js",
   "scripts": {