@barcidev/ngx-autogen 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barcidev/ngx-autogen",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "A collection of Angular schematics for essential functionalities.",
   "main": "dist/index.js",
   "scripts": {
@@ -53,6 +53,7 @@
     "typescript": "~5.9.2"
   },
   "devDependencies": {
+    "@angular-devkit/schematics-cli": "^21.1.2",
     "@types/jasmine": "~5.1.0",
     "@types/node": "^20.17.19",
     "copyfiles": "^2.4.1",

package/src/ng-add/index.js

@@ -11,26 +11,20 @@ function ngAdd(options) {
             throw new schematics_1.SchematicsException("Could not find package.json. Make sure you are in the root of an Angular project.");
         }
         const packageJson = JSON.parse(buffer.toString());
-        // 1. Obtener la versión de Angular Core
         const angularCoreVer = packageJson.dependencies["@angular/core"] ||
             packageJson.devDependencies["@angular/core"];
         if (!angularCoreVer) {
             throw new schematics_1.SchematicsException("The version of @angular/core could not be determined. Please ensure that Angular is installed in your project.");
         }
         const mainVersion = parseInt(angularCoreVer.replace(/[^\d.]/g, "").split(".")[0], 10);
-        // 2. Validación: NgRx Signals requiere Angular 16+ (v17+ recomendado)
-        if (mainVersion < 16) {
-            _context.logger.error(`❌ Error: ngx-essentials requires Angular v16 or higher. Detected: v${mainVersion}`);
+        if (mainVersion < 20) {
+            _context.logger.error(`❌ Error: ngx-essentials requires Angular v20 or higher. Detected: v${mainVersion}`);
             return tree; // Stop execution
         }
-        // 3. Mapear versión de NgRx (NgRx suele ir a la par con Angular)
         const ngrxVersion = `^${mainVersion}.0.0`;
         _context.logger.info(`📦 Configuring dependencies for Angular v${mainVersion}...`);
-        // 4. Modificar package.json
         const packageName = "ngx-autogen";
-        // Inyectar dependencias compatibles
         packageJson.dependencies = Object.assign(Object.assign({}, packageJson.dependencies), { "@ngrx/signals": ngrxVersion });
-        // Mover a devDependencies si es necesario
         if (packageJson.dependencies[packageName]) {
             const currentVer = packageJson.dependencies[packageName];
             delete packageJson.dependencies[packageName];
@@ -39,9 +33,8 @@ function ngAdd(options) {
         packageJson.dependencies = sortObjectKeys(packageJson.dependencies);
         packageJson.devDependencies = sortObjectKeys(packageJson.devDependencies);
         tree.overwrite(packagePath, JSON.stringify(packageJson, null, 2));
-        // 5. Configurar angular.json (Collections y Primary Key)
         updateAngularJson(tree, options);
-        // 6. Tarea de instalación
+        updateTsConfig(tree);
         _context.addTask(new tasks_1.NodePackageInstallTask());
         return tree;
     };
@@ -63,15 +56,51 @@ function updateAngularJson(tree, options) {
     if (!workspace.cli)
         workspace.cli = {};
     const collections = workspace.cli.schematicCollections || [];
-    if (!collections.includes("ngx-autogen")) {
-        collections.push("ngx-autogen");
+    if (!collections.includes("@barcidev/ngx-autogen")) {
+        collections.push("@barcidev/ngx-autogen");
         workspace.cli.schematicCollections = collections;
     }
     if (!workspace.schematics)
         workspace.schematics = {};
-    workspace.schematics["ngx-autogen:all"] = {
+    workspace.schematics["@barcidev/ngx-autogen:all"] = {
         pk: options.pk,
+        lang: options.lang,
     };
     tree.overwrite(path, JSON.stringify(workspace, null, 2));
 }
+/**
+ * Configura los Paths en el tsconfig.json para permitir el uso de @shared/*
+ */
+function updateTsConfig(tree) {
+    const tsConfigPath = "/tsconfig.json";
+    const path = tree.exists(tsConfigPath) ? tsConfigPath : "/tsconfig.app.json";
+    const buffer = tree.read(path);
+    if (!buffer)
+        return;
+    let contentText = buffer.toString();
+    // Limpieza manual de comentarios para evitar que JSON.parse falle
+    const cleanJson = contentText.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, "$1");
+    let tsconfig;
+    try {
+        tsconfig = JSON.parse(cleanJson);
+    }
+    catch (e) {
+        // Si falla, intentamos parsearlo tal cual por si no tiene comentarios
+        try {
+            tsconfig = JSON.parse(contentText);
+        }
+        catch (innerError) {
+            throw new schematics_1.SchematicsException(`No se pudo parsear ${path}. Asegúrate de que es un JSON válido.`);
+        }
+    }
+    // Configurar los paths
+    tsconfig.compilerOptions = tsconfig.compilerOptions || {};
+    tsconfig.compilerOptions.paths = tsconfig.compilerOptions.paths || {};
+    const sharedAlias = "@shared-state/*";
+    const sharedPath = ["src/app/shared/state/*"];
+    if (!tsconfig.compilerOptions.paths[sharedAlias]) {
+        tsconfig.compilerOptions.paths[sharedAlias] = sharedPath;
+        tree.overwrite(path, JSON.stringify(tsconfig, null, 2));
+    }
+}
 //# sourceMappingURL=index.js.map

package/src/ng-add/schema.d.ts

@@ -1,3 +1,4 @@
 export interface NgAddSchemaOptions {
   pk: string;
+  lang: string;
 }

package/src/ng-add/schema.json

@@ -8,6 +8,12 @@
       "description": "The name of the default Primary Key (e.g., id, cod, uuid); default is 'id'.",
       "x-prompt": "What is the name of the default Primary Key (e.g., id, cod, uuid)?",
       "default": "id"
+    },
+    "lang":{
+      "type": "string",
+      "description": "The default language for the application (en, es); default is 'en'.",
+      "x-prompt": "What is the default language for the application (en, es)?",
+      "default": "en"
     }
   },
   "required": ["pk"]

package/src/ngrx/store/files/state/models/__name@dasherize__.model.ts.template

@@ -1,4 +1,4 @@
-import { FormGroupType } from 'src/app/shared/state/entity.model';
+import { FormGroupType } from '@shared-state/entity.model';
 
 export interface Add<%= classify(name) %> {
 }

package/src/ngrx/store/files/state/services/__name@dasherize__.service.ts.template

@@ -4,7 +4,7 @@ import {
   Add<%= classify(name) %>,
   <%= classify(name) %>Dto,
   Update<%= classify(name) %>
-} from '<%= grouped ? "../models/<%= dasherize(name) %>.model" : "./<%= dasherize(name) %>.model"';
+} from '<%= grouped ? "../models/" + dasherize(name) + ".model" : "./" + dasherize(name) + ".model" %>';
 
 @Injectable({
   providedIn: 'root'

package/src/ngrx/store/files/state/store/__name@dasherize__.store.ts.template

@@ -9,17 +9,17 @@ import {
   withEntities
 } from '@ngrx/signals/entities';
 import { rxMethod } from '@ngrx/signals/rxjs-interop';
-import { catchError, of, pipe, switchMap, tap } from 'rxjs';
+import { catchError, EMPTY, pipe, switchMap, tap } from 'rxjs';
 
-import { RequestConfig } from 'src/app/shared/state/entity.model';
-import { withPagination } from 'src/app/shared/state/with-entity-pagination';
-import { withEntityStatus } from 'src/app/shared/state/with-entity-status';
-iimport {
+import { RequestConfig } from '@shared-state/entity.model';
+import { withPagination } from '@shared-state/with-entity-pagination';
+import { withEntityStatus } from '@shared-state/with-entity-status';
+import {
   Add<%= classify(name) %>,
   <%= classify(name) %>Dto,
   Update<%= classify(name) %>
-} from '<%= grouped ? "./models/<%= dasherize(name) %>.model" : "./<%= dasherize(name) %>.model"';
-import { <%= classify(name) %>Service } from '<%= grouped ? "./services/./<%= dasherize(name) %>.service" : "./<%= dasherize(name) %>.service"';
+} from '<%= grouped ? "./models/" + dasherize(name) + ".model" : "./" + dasherize(name) + ".model" %>';
+import { <%= classify(name) %>Service } from '<%= grouped ? "./services/" + dasherize(name) + ".service" : "./" + dasherize(name) + ".service" %>';;
 
 const config = entityConfig({
   entity: type<<%= classify(name) %>Dto>(),
@@ -43,16 +43,16 @@ export const <%= classify(name) %>Store = signalStore(
         tap(() => {
           patchState(store, (state) => ({ status: { ...state.status, addLoading: true } }));
         }),
-        switchMap(({ onError, onSuccess, payload: { request } }) => {
-          return <%= camelize(name) %>Service.add<%= classify(name) %>$(request).pipe(
+        switchMap(({ onError, onSuccess, payload }) => {
+          return <%= camelize(name) %>Service.add<%= classify(name) %>$(payload).pipe(
             tap((<%= pk %>) => {
-              const new<%= classify(name) %>: <%= classify(name) %>Dto = { ...request, <%= pk %>};
+              const new<%= classify(name) %>: <%= classify(name) %>Dto = { ...payload, <%= pk %>};
               patchState(store, addEntity(new<%= classify(name) %>, config), (state) => ({
                     ...state,
                     status: { ...state.status, addError: null, addLoading: false }
                   }));
               if (onSuccess) {
-                onSuccess(newHorario);
+                onSuccess(new<%= classify(name) %>);
               }
             }),
             catchError(() => {
@@ -148,21 +148,21 @@ export const <%= classify(name) %>Store = signalStore(
             status: {
               ...state.status,
               _updateLoading: true,
-              idsUpdating: [...(state.status.idsUpdating || []), payload.cod]
+              idsUpdating: [...(state.status.idsUpdating || []), payload.<%= pk %>]
             }
           }));
         }),
         switchMap(({ onError, onSuccess, payload }) => {
-          return <%= camelize(name) %>Service.update<%= classify(name) %>$(entity).pipe(
+          return <%= camelize(name) %>Service.update<%= classify(name) %>$(payload).pipe(
             tap((response) => {
               if (response) {
                 const idsUpdating = store.status.idsUpdating() || [];
-                patchState(store, updateEntity({ changes: payload, id: payload.cod }, config), (state) => ({
+                patchState(store, updateEntity({ changes: payload, id: payload.<%= pk %> }, config), (state) => ({
                   status: {
                     ...state.status,
                     _updateLoading: false,
                     error: null,
-                    idsUpdating: idsUpdating.filter((idUpdating) => idUpdating !== payload.cod)
+                    idsUpdating: idsUpdating.filter((idUpdating) => idUpdating !== payload.<%= pk %>)
                   }
                 }));
                 if (onSuccess) {
@@ -179,7 +179,7 @@ export const <%= classify(name) %>Store = signalStore(
                   ...state.status,
                   _updateLoading: false,
                   error: new Error('Error al actualizar horario-acceso'),
-                  idsUpdating: idsUpdating.filter((idUpdating) => idUpdating !== payload.cod)
+                  idsUpdating: idsUpdating.filter((idUpdating) => idUpdating !== payload.<%= pk %>)
                 }
               }));
               if (onError) {

package/src/ngrx/store/index.js

@@ -37,29 +37,21 @@ const pluralizeEn = (name) => {
     }
     return name + "s";
 };
-function mergeFilesSmart(urlPath, destPath, options) {
+function mergeFilesSmart(urlPath, destPath, options, tree) {
     return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(urlPath), [
         (0, schematics_1.applyTemplates)(Object.assign(Object.assign({}, core_1.strings), options)),
         (0, schematics_1.move)(destPath),
         (0, schematics_1.forEach)((fileEntry) => {
-            // Si el archivo ya existe en el árbol
-            if (treeRef.exists(fileEntry.path)) {
-                const existingContent = treeRef.read(fileEntry.path).toString();
-                const newContent = fileEntry.content.toString();
-                // Solo escribimos si el contenido nuevo no está ya incluido (basado en una cadena clave o firma)
-                // Puedes ajustar esta condición según lo que necesites verificar
-                if (existingContent.includes(newContent.trim())) {
-                    return null; // Descarta el archivo del proceso de merge (no hace nada)
+            if (tree.exists(fileEntry.path)) {
+                const existingContent = tree.read(fileEntry.path).toString();
+                if (existingContent.includes(fileEntry.content.toString().trim())) {
+                    return null;
                 }
-                // Si el archivo existe pero queremos añadir contenido al final (opcional)
-                // treeRef.overwrite(fileEntry.path, existingContent + '\n' + newContent);
-                return null;
             }
             return fileEntry;
         }),
     ]));
 }
-let treeRef;
 function signalStore(options) {
     return (tree) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -68,16 +60,26 @@ function signalStore(options) {
         if (globalConfig && globalConfig.pk && !options.pk) {
             options.pk = globalConfig.pk;
         }
-        if (!options.path) {
-            options.path = process.cwd();
+        // En tu función signalStore
+        // 1. Obtener la ruta absoluta del sistema donde se ejecuta el comando
+        const fullPath = process.cwd();
+        // 2. Buscar la posición de 'src' para limpiar la ruta
+        const srcIndex = fullPath.lastIndexOf("src");
+        let relativePath = "";
+        if (srcIndex !== -1) {
+            // Extraemos de 'src' en adelante (ej: src/app/features/billing)
+            relativePath = fullPath.substring(srcIndex);
         }
-        // Si la carpeta final no se llama 'state', agregarla
-        let movePath = (0, core_1.normalize)(options.path);
-        const pathParts = movePath.split(/[\\/]/).filter(Boolean);
-        if (pathParts[pathParts.length - 1] !== "state") {
+        else {
+            // Si no encuentra 'src' (estás en la raíz), usamos el path por defecto
+            relativePath = (0, core_1.join)((0, core_1.normalize)("src"), "app");
+        }
+        // 3. Normalizar y asegurar que termine en 'state'
+        let movePath = (0, core_1.normalize)(relativePath);
+        if (!movePath.endsWith("state")) {
             movePath = (0, core_1.join)(movePath, "state");
         }
-        treeRef = tree;
+        options.path = movePath;
         const indexPath = (0, core_1.join)(movePath, "index.ts");
         const nameDash = core_1.strings.dasherize(options.name);
         const entityName = core_1.strings.classify(options.name);
@@ -124,7 +126,7 @@ function signalStore(options) {
                             return pluralizeEn(word);
                     }
                 }, pk: options.pk || "id" })),
-            (0, schematics_1.move)("store"),
+            (0, schematics_1.move)(namePath),
         ])));
         // services
         rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)("./files/state/services"), [
@@ -151,7 +153,7 @@ function signalStore(options) {
             (0, schematics_1.move)((0, core_1.join)(namePath, options.grouped ? "models" : "")),
         ])));
         // common entity
-        rules.push(mergeFilesSmart("./files/entity", "src/app/shared/state", options));
+        rules.push(mergeFilesSmart("./files/entity", "src/app/shared/state", options, tree));
         return (0, schematics_1.chain)(rules);
     });
 }