@barcidev/ngx-autogen 0.1.36 → 0.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barcidev/ngx-autogen",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "A collection of Angular schematics for essential functionalities.",
   "main": "dist/index.js",
   "scripts": {

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

@@ -1,3 +1,2 @@
 import { Rule } from "@angular-devkit/schematics";
-import { NgAddSchemaOptions } from "./schema";
-export declare function ngAdd(options: NgAddSchemaOptions): Rule;
+export declare function ngAdd(): Rule;

package/src/ng-add/index.js

@@ -2,105 +2,48 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = ngAdd;
 const schematics_1 = require("@angular-devkit/schematics");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
-function ngAdd(options) {
-    return (tree, _context) => {
-        const packagePath = "/package.json";
-        const buffer = tree.read(packagePath);
-        if (!buffer) {
-            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());
-        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);
-        if (mainVersion < 20) {
-            _context.logger.error(`❌ Error: @barcidev/ngx-autogen requires Angular v20 or higher. Detected: v${mainVersion}`);
-            return tree; // Stop execution
-        }
-        const ngrxVersion = `^${mainVersion}.0.0`;
-        _context.logger.info(`📦 Configuring dependencies for Angular v${mainVersion}...`);
-        const packageName = "@barcidev/ngx-autogen";
-        packageJson.dependencies = Object.assign(Object.assign({}, packageJson.dependencies), { "@ngrx/signals": ngrxVersion });
-        if (packageJson.dependencies[packageName]) {
-            const currentVer = packageJson.dependencies[packageName];
-            delete packageJson.dependencies[packageName];
-            packageJson.devDependencies = Object.assign(Object.assign({}, packageJson.devDependencies), { [packageName]: currentVer });
-        }
-        packageJson.dependencies = sortObjectKeys(packageJson.dependencies);
-        packageJson.devDependencies = sortObjectKeys(packageJson.devDependencies);
-        tree.overwrite(packagePath, JSON.stringify(packageJson, null, 2));
-        updateAngularJson(tree, options);
-        updateTsConfig(tree);
-        _context.addTask(new tasks_1.NodePackageInstallTask());
-        return tree;
+const LIBRARY_NAME = "@barcidev/ngx-autogen";
+function ngAdd() {
+    return () => {
+        return (0, schematics_1.chain)([cleanupPackageJson(), registerInAngularJson()]);
     };
 }
-function sortObjectKeys(obj) {
-    return Object.keys(obj)
-        .sort()
-        .reduce((result, key) => {
-        result[key] = obj[key];
-        return result;
-    }, {});
-}
-function updateAngularJson(tree, options) {
-    const path = "/angular.json";
-    const buffer = tree.read(path);
-    if (!buffer)
-        return;
-    const workspace = JSON.parse(buffer.toString());
-    if (!workspace.cli)
-        workspace.cli = {};
-    const collections = workspace.cli.schematicCollections || [];
-    if (!collections.includes("@barcidev/ngx-autogen")) {
-        collections.push("@barcidev/ngx-autogen");
-        workspace.cli.schematicCollections = collections;
-    }
-    if (!workspace.schematics)
-        workspace.schematics = {};
-    workspace.schematics["@barcidev/ngx-autogen:all"] = {
-        pk: options.pk,
-        lang: options.lang,
+/**
+ * Regla: Mueve la lib a devDependencies
+ */
+function cleanupPackageJson() {
+    return (tree) => {
+        var _a, _b;
+        const content = (_a = tree.read("package.json")) === null || _a === void 0 ? void 0 : _a.toString();
+        if (!content)
+            return tree;
+        const json = JSON.parse(content);
+        if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b[LIBRARY_NAME]) {
+            const ver = json.dependencies[LIBRARY_NAME];
+            delete json.dependencies[LIBRARY_NAME];
+            json.devDependencies = Object.assign(Object.assign({}, json.devDependencies), { [LIBRARY_NAME]: ver });
+            tree.overwrite("package.json", JSON.stringify(json, null, 2));
+        }
+        return tree;
     };
-    tree.overwrite(path, JSON.stringify(workspace, null, 2));
 }
 /**
- * Configura los Paths en el tsconfig.json para permitir el uso de @shared/*
+ * Regla: Configura la CLI de Angular
  */
-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);
+function registerInAngularJson() {
+    return (tree) => {
+        const buffer = tree.read("angular.json");
+        if (!buffer)
+            return tree;
+        const json = JSON.parse(buffer.toString());
+        json.cli = json.cli || {};
+        const collections = json.cli.schematicCollections || [];
+        if (!collections.includes(LIBRARY_NAME)) {
+            collections.push(LIBRARY_NAME);
+            json.cli.schematicCollections = collections;
+            tree.overwrite("angular.json", JSON.stringify(json, null, 2));
         }
-        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));
-    }
+        return tree;
+    };
 }
 //# sourceMappingURL=index.js.map

package/src/ng-add/schema.json

@@ -3,18 +3,6 @@
   "$id": "ng-add-schema",
   "type": "object",
   "properties": {
-    "pk": {
-      "type": "string",
-      "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/index.js

@@ -12,40 +12,98 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.signalStore = signalStore;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const workspace_1 = require("@schematics/angular/utility/workspace");
+const jsonc_parser_1 = require("jsonc-parser");
 const file_actions_1 = require("../../common/file-actions");
 const pluralize_1 = require("../../common/pluralize");
+const NGRX_SIGNALS = "@ngrx/signals";
 function signalStore(options) {
     return (tree) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const workspace = yield (0, workspace_1.getWorkspace)(tree);
-        const globalConfig = (_a = workspace.extensions.schematics) === null || _a === void 0 ? void 0 : _a["@barcidev/ngx-autogen:all"];
-        if (globalConfig && globalConfig.pk && !options.pk) {
-            options.pk = globalConfig.pk;
-        }
-        // 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);
-        }
-        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");
-        }
-        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);
+        // 1. Preparar contexto y opciones enriquecidas
+        const context = resolveStoreContext(workspace, options);
+        const project = workspace.projects.get(context.projectName);
+        const projectRoot = (project === null || project === void 0 ? void 0 : project.sourceRoot) || "src";
+        const { angularVersion } = getProjectMetadata(tree);
+        // 2. Orquestar la ejecución
+        return (0, schematics_1.chain)([
+            ensureNgrxSignals(angularVersion),
+            updateIndexFile(context),
+            generateStoreFiles(context),
+            (0, file_actions_1.mergeFilesSmart)("./files/entity", "src/app/shared/state", context.options, tree),
+            updateAngularJson(context.options),
+            updateTsConfigRule(projectRoot),
+            (host, context) => {
+                context.addTask(new tasks_1.NodePackageInstallTask());
+                context.logger.info("🚀 Entorno preparado con éxito.");
+                return host;
+            },
+        ]);
+    });
+}
+/**
+ * --- LÓGICA DE EXTRACCIÓN Y PREPARACIÓN ---
+ */
+function getProjectMetadata(tree) {
+    var _a, _b;
+    const buffer = tree.read("package.json");
+    if (!buffer)
+        throw new schematics_1.SchematicsException("No se encontró package.json");
+    const packageJson = JSON.parse(buffer.toString());
+    const angularCore = ((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a["@angular/core"]) ||
+        ((_b = packageJson.devDependencies) === null || _b === void 0 ? void 0 : _b["@angular/core"]);
+    const angularVersion = parseInt(angularCore.replace(/[^\d.]/g, "").split(".")[0], 10);
+    return { angularVersion };
+}
+function resolveStoreContext(workspace, options) {
+    var _a;
+    // Configuración Global de PK
+    const globalConfig = (_a = workspace.extensions.schematics) === null || _a === void 0 ? void 0 : _a["@barcidev/ngx-autogen:all"];
+    const pk = options.pk || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.pk) || "id";
+    // Resolución de Rutas (Lógica de Directorio Actual)
+    const fullPath = process.cwd();
+    const srcIndex = fullPath.lastIndexOf("src");
+    let relativePath = srcIndex !== -1
+        ? fullPath.substring(srcIndex)
+        : (0, core_1.join)((0, core_1.normalize)("src"), "app");
+    let movePath = (0, core_1.normalize)(relativePath);
+    if (!movePath.endsWith("state"))
+        movePath = (0, core_1.join)(movePath, "state");
+    // Resolución de Proyecto
+    const projectName = options.project ||
+        workspace.extensions.defaultProject ||
+        Array.from(workspace.projects.keys())[0];
+    return {
+        options: Object.assign(Object.assign({}, options), { pk, path: movePath, project: projectName }),
+        projectName,
+        movePath,
+        indexPath: (0, core_1.join)(movePath, "index.ts"),
+        nameDash: core_1.strings.dasherize(options.name),
+        entityName: core_1.strings.classify(options.name),
+    };
+}
+/**
+ * --- REGLAS DE TRANSFORMACIÓN ---
+ */
+/**
+ * Regla: Añade @ngrx/signals si no existe
+ */
+function ensureNgrxSignals(version) {
+    return (tree) => {
+        (0, dependencies_1.addPackageJsonDependency)(tree, {
+            type: dependencies_1.NodeDependencyType.Default,
+            name: NGRX_SIGNALS,
+            version: `^${version}.0.0`,
+            overwrite: false, // NO sobreescribe si ya está instalado
+        });
+        return tree;
+    };
+}
+function updateIndexFile(ctx) {
+    return (tree) => {
+        const { options, indexPath, nameDash, entityName } = ctx;
         const entityHeader = `/* ${entityName.toUpperCase()} */`;
         const exportBlock = [
             entityHeader,
@@ -54,70 +112,82 @@ function signalStore(options) {
             `export * from './${nameDash}/${nameDash}.store';`,
             "",
         ].join("\n");
-        let content = "";
-        if (tree.exists(indexPath)) {
-            content = tree.read(indexPath).toString();
-        }
+        let content = tree.exists(indexPath)
+            ? tree.read(indexPath).toString()
+            : "";
         if (content.includes(entityHeader)) {
-            const lines = exportBlock.split("\n");
-            lines.forEach((line) => {
-                if (line.trim() !== "" && !content.includes(line)) {
-                    content += line + "\n";
-                }
-            });
+            // Evitar duplicados línea por línea
+            const newLines = exportBlock
+                .split("\n")
+                .filter((line) => line.trim() !== "" && !content.includes(line));
+            if (newLines.length > 0)
+                content += newLines.join("\n") + "\n";
         }
         else {
             content =
                 content.trim() + (content.length > 0 ? "\n\n" : "") + exportBlock;
         }
-        if (tree.exists(indexPath)) {
-            tree.overwrite(indexPath, content);
+        tree.exists(indexPath)
+            ? tree.overwrite(indexPath, content)
+            : tree.create(indexPath, content);
+        return tree;
+    };
+}
+function generateStoreFiles(ctx) {
+    const { options, movePath, nameDash } = ctx;
+    const targetPath = (0, core_1.join)(movePath, nameDash);
+    const templateUtils = Object.assign(Object.assign(Object.assign({}, core_1.strings), options), { pluralize: (word) => options.lang === "es" ? (0, pluralize_1.pluralizeEs)(word) : (0, pluralize_1.pluralizeEn)(word) });
+    const createSource = (srcUrl, dest) => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(srcUrl), [(0, schematics_1.applyTemplates)(templateUtils), (0, schematics_1.move)(dest)]));
+    return (0, schematics_1.chain)([
+        createSource("./files/state/store", targetPath),
+        createSource("./files/state/services", (0, core_1.join)(targetPath, options.grouped ? "services" : "")),
+        createSource("./files/state/models", (0, core_1.join)(targetPath, options.grouped ? "models" : "")),
+    ]);
+}
+function updateTsConfigRule(root) {
+    return (tree, context) => {
+        var _a, _b;
+        const tsConfigPath = tree.exists("/tsconfig.app.json")
+            ? "/tsconfig.app.json"
+            : "/tsconfig.json";
+        const buffer = tree.read(tsConfigPath);
+        if (!buffer)
+            return;
+        let content = buffer.toString();
+        const modOptions = {
+            formattingOptions: { insertSpaces: true, tabSize: 2 },
+        };
+        // 1. Asegurar baseUrl
+        if (!((_a = (0, jsonc_parser_1.parse)(content).compilerOptions) === null || _a === void 0 ? void 0 : _a.baseUrl)) {
+            content = (0, jsonc_parser_1.applyEdits)(content, (0, jsonc_parser_1.modify)(content, ["compilerOptions", "baseUrl"], "./", modOptions));
         }
-        else {
-            tree.create(indexPath, content);
+        // 2. Calcular path relativo al baseUrl
+        const baseUrl = ((_b = (0, jsonc_parser_1.parse)(content).compilerOptions) === null || _b === void 0 ? void 0 : _b.baseUrl) || "./";
+        let i18nPath = `${root}/app/shared/state/*`;
+        const normalizedBase = baseUrl.replace(/^\.\/|\/$/g, "");
+        if (normalizedBase && i18nPath.startsWith(normalizedBase)) {
+            i18nPath = i18nPath.replace(normalizedBase, "").replace(/^\//, "");
         }
-        // Generar archivos en las carpetas store, services y models
-        const namePath = (0, core_1.join)(movePath, core_1.strings.dasherize(options.name));
-        const rules = [];
-        // store
-        rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)("./files/state/store"), [
-            (0, schematics_1.applyTemplates)(Object.assign(Object.assign(Object.assign({}, core_1.strings), options), { pluralize: (word) => {
-                    switch (options.lang) {
-                        case "es":
-                            return (0, pluralize_1.pluralizeEs)(word);
-                        default:
-                            return (0, pluralize_1.pluralizeEn)(word);
-                    }
-                }, pk: options.pk || "id" })),
-            (0, schematics_1.move)(namePath),
-        ])));
-        // services
-        rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)("./files/state/services"), [
-            (0, schematics_1.applyTemplates)(Object.assign(Object.assign(Object.assign({}, core_1.strings), options), { pluralize: (word) => {
-                    switch (options.lang) {
-                        case "es":
-                            return (0, pluralize_1.pluralizeEs)(word);
-                        default:
-                            return (0, pluralize_1.pluralizeEn)(word);
-                    }
-                }, pk: options.pk || "id" })),
-            (0, schematics_1.move)((0, core_1.join)(namePath, options.grouped ? "services" : "")),
-        ])));
-        // models
-        rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)("./files/state/models"), [
-            (0, schematics_1.applyTemplates)(Object.assign(Object.assign(Object.assign({}, core_1.strings), options), { pluralize: (word) => {
-                    switch (options.lang) {
-                        case "es":
-                            return (0, pluralize_1.pluralizeEs)(word);
-                        default:
-                            return (0, pluralize_1.pluralizeEn)(word);
-                    }
-                }, pk: options.pk || "id" })),
-            (0, schematics_1.move)((0, core_1.join)(namePath, options.grouped ? "models" : "")),
-        ])));
-        // common entity
-        rules.push((0, file_actions_1.mergeFilesSmart)("./files/entity", "src/app/shared/state", options, tree));
-        return (0, schematics_1.chain)(rules);
-    });
+        // 3. Aplicar alias
+        const finalContent = (0, jsonc_parser_1.applyEdits)(content, (0, jsonc_parser_1.modify)(content, ["compilerOptions", "paths", "@shared-state/*"], [i18nPath], modOptions));
+        tree.overwrite(tsConfigPath, finalContent);
+        context.logger.info(`✅ Alias @shared-state configurado.`);
+    };
+}
+function updateAngularJson(options) {
+    return (tree) => {
+        const path = "/angular.json";
+        const buffer = tree.read(path);
+        if (!buffer)
+            return;
+        const workspace = JSON.parse(buffer.toString());
+        if (!workspace.schematics)
+            workspace.schematics = {};
+        workspace.schematics["@barcidev/ngx-autogen:signal-state"] = {
+            pk: options.pk,
+            lang: options.lang,
+        };
+        tree.overwrite(path, JSON.stringify(workspace, null, 2));
+    };
 }
 //# sourceMappingURL=index.js.map

package/src/ngrx/store/schema.d.ts

@@ -1,6 +1,7 @@
 export interface StoreSchemaOptions {
   name: string;
   path?: string;
+  project?: string;
   grouped: boolean;
   pk?: string;
   lang: "en" | "es";

package/src/ngrx/store/schema.json

@@ -19,15 +19,17 @@
       "description": "Whether the files should be grouped in subfolders.",
       "default": false
     },
-    "lang": {
+    "pk": {
       "type": "string",
-      "description": "Language for pluralization ('en' for English, 'es' for Spanish).",
-      "enum": ["en", "es"],
-      "default": "en"
+      "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"
     },
-    "pk": {
+    "lang":{
       "type": "string",
-      "description": "Name of the primary key."
+      "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": ["name"]