generate-ui-cli 2.2.0 → 2.3.0

package/dist/commands/generate.js

@@ -10,17 +10,25 @@ const load_openapi_1 = require("../openapi/load-openapi");
 const screen_generator_1 = require("../generators/screen.generator");
 const screen_merge_1 = require("../generators/screen.merge");
 const permissions_1 = require("../license/permissions");
-const device_1 = require("../license/device");
 const telemetry_1 = require("../telemetry");
 const user_config_1 = require("../runtime/user-config");
 const logger_1 = require("../runtime/logger");
+const project_config_1 = require("../runtime/project-config");
 async function generate(options) {
     void (0, telemetry_1.trackCommand)('generate', options.telemetryEnabled);
+    const projectConfig = (0, project_config_1.findProjectConfig)(process.cwd());
+    const configuredOpenApi = (0, project_config_1.pickConfiguredPath)(projectConfig.config, 'openapi');
+    const configuredOutput = (0, project_config_1.pickConfiguredPath)(projectConfig.config, 'output') ??
+        (0, project_config_1.pickConfiguredPath)(projectConfig.config, 'schemas');
+    const openApiPath = (0, project_config_1.resolveOptionalPath)(options.openapi, configuredOpenApi, projectConfig.configPath);
+    if (!openApiPath) {
+        throw new Error('Missing OpenAPI file.\n' +
+            'Use --openapi <path> or set "openapi" (or "paths.openapi") in generateui-config.json.');
+    }
     /**
      * Caminho absoluto do OpenAPI (YAML)
      * Ex: /Users/.../generateui-playground/realWorldOpenApi.yaml
      */
-    const openApiPath = path_1.default.resolve(process.cwd(), options.openapi);
     (0, logger_1.logStep)(`OpenAPI: ${openApiPath}`);
     /**
      * Raiz do playground (onde está o YAML)
@@ -30,7 +38,7 @@ async function generate(options) {
     /**
      * Onde o Angular consome os arquivos
      */
-    const generateUiRoot = resolveGenerateUiRoot(projectRoot, options.output);
+    const generateUiRoot = resolveGenerateUiRoot(projectRoot, (0, project_config_1.resolveOptionalPath)(options.output, configuredOutput, projectConfig.configPath) ?? undefined);
     (0, logger_1.logStep)(`Schemas output: ${generateUiRoot}`);
     const generatedDir = path_1.default.join(generateUiRoot, 'generated');
     const overlaysDir = path_1.default.join(generateUiRoot, 'overlays');
@@ -47,15 +55,14 @@ async function generate(options) {
      */
     const routes = [];
     const usedOperationIds = new Set();
+    const resourceMap = new Map();
+    const screenByOpId = new Map();
+    const viewDefaults = [];
     const permissions = await (0, permissions_1.getPermissions)();
-    const device = (0, device_1.loadDeviceIdentity)();
-    (0, logger_1.logDebug)(`License: maxGenerations=${permissions.features.maxGenerations}, overrides=${permissions.features.uiOverrides}, safeRegen=${permissions.features.safeRegeneration}`);
-    if (permissions.features.maxGenerations > -1 &&
-        device.freeGenerationsUsed >= permissions.features.maxGenerations) {
-        throw new Error('🔒 Você já utilizou sua geração gratuita.\n' +
-            'O plano Dev libera gerações ilimitadas, regeneração segura e UI inteligente.\n' +
-            '👉 Execute `generate-ui login` para continuar.\n' +
-            'Se você já fez login e ainda vê esta mensagem, tente novamente com a mesma versão do CLI e verifique a conexão com a API.');
+    const subscriptionReason = normalizeSubscriptionReason(permissions.subscription.reason);
+    (0, logger_1.logDebug)(`License: status=${permissions.subscription.status}, overrides=${permissions.features.uiOverrides}, safeRegen=${permissions.features.safeRegeneration}, intelligent=${permissions.features.intelligentGeneration}`);
+    if (subscriptionReason) {
+        console.log(`ℹ Subscription: ${subscriptionReason}`);
     }
     /**
      * Parse do OpenAPI (já com $refs resolvidos)
@@ -67,6 +74,7 @@ async function generate(options) {
      * Itera por todos os endpoints
      */
     const operationIds = new Set();
+    const operationFileNames = new Set();
     for (const [pathKey, pathItem] of Object.entries(paths)) {
         for (const [method, rawOp] of Object.entries(pathItem)) {
             const op = rawOp;
@@ -75,6 +83,8 @@ async function generate(options) {
             const operationId = op.operationId ||
                 buildOperationId(method.toLowerCase(), pathKey, usedOperationIds);
             operationIds.add(operationId);
+            operationFileNames.add(toSafeFileName(operationId));
+            recordResourceOp(resourceMap, pathKey, method.toLowerCase(), operationId, op);
             const endpoint = {
                 operationId,
                 path: pathKey,
@@ -86,7 +96,8 @@ async function generate(options) {
              * Gera o ScreenSchema completo
              */
             const screenSchema = (0, screen_generator_1.generateScreen)(endpoint, api);
-            const fileName = `${operationId}.screen.json`;
+            screenByOpId.set(operationId, screenSchema);
+            const fileName = `${toSafeFileName(operationId)}.screen.json`;
             /**
              * 1️⃣ generated → SEMPRE sobrescrito (base técnica)
              */
@@ -132,9 +143,57 @@ async function generate(options) {
                     : operationId),
                 group: inferRouteGroup(op, pathKey)
             });
+            viewDefaults.push({
+                key: operationId,
+                view: 'list'
+            });
             console.log(`✔ Generated ${operationId}`);
         }
     }
+    const canOverride = permissions.features.uiOverrides;
+    const canRegenerateSafely = permissions.features.safeRegeneration;
+    const intelligentEnabled = Boolean(permissions.features.intelligentGeneration);
+    if (intelligentEnabled) {
+        const adminSchemas = buildAdminSchemas(resourceMap, usedOperationIds, screenByOpId);
+        for (const admin of adminSchemas) {
+            const fileName = `${toSafeFileName(admin.api.operationId)}.screen.json`;
+            const generatedPath = path_1.default.join(generatedDir, fileName);
+            fs_1.default.writeFileSync(generatedPath, JSON.stringify(admin, null, 2));
+            const overlayPath = path_1.default.join(overlaysDir, fileName);
+            if (canOverride && canRegenerateSafely) {
+                const overlay = fs_1.default.existsSync(overlayPath)
+                    ? JSON.parse(fs_1.default.readFileSync(overlayPath, 'utf-8'))
+                    : null;
+                const merged = (0, screen_merge_1.mergeScreen)(admin, overlay, null, {
+                    openapiVersion: api?.info?.version || 'unknown',
+                    debug: options.debug
+                });
+                fs_1.default.writeFileSync(overlayPath, JSON.stringify(merged.screen, null, 2));
+            }
+            else if (!fs_1.default.existsSync(overlayPath)) {
+                fs_1.default.writeFileSync(overlayPath, JSON.stringify(admin, null, 2));
+            }
+            routes.push({
+                path: admin.api.operationId,
+                operationId: admin.api.operationId,
+                label: admin.meta?.intelligent?.label,
+                group: admin.meta?.intelligent?.group ?? null
+            });
+            viewDefaults.push({
+                key: admin.api.operationId,
+                view: 'cards'
+            });
+            if (admin.meta?.intelligent?.listOperationId) {
+                viewDefaults.push({
+                    key: admin.meta.intelligent.listOperationId,
+                    view: 'list'
+                });
+            }
+            operationIds.add(admin.api.operationId);
+            operationFileNames.add(toSafeFileName(admin.api.operationId));
+            console.log(`✨ Generated ${admin.api.operationId}`);
+        }
+    }
     (0, logger_1.logStep)(`Screens generated: ${routes.length}`);
     /**
      * 4️⃣ Gera arquivo de rotas
@@ -146,20 +205,38 @@ async function generate(options) {
      * 4.3️⃣ Gera generateui-config.json (não sobrescreve)
      */
     const configPath = path_1.default.join(generateUiRoot, '..', '..', 'generateui-config.json');
+    let configPayload = null;
     if (!fs_1.default.existsSync(configPath)) {
-        const defaultConfig = {
+        configPayload = {
             appTitle: 'Generate UI',
             defaultRoute: '',
             menu: {
                 autoInject: true
-            }
+            },
+            views: {}
         };
-        fs_1.default.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2));
+        fs_1.default.writeFileSync(configPath, JSON.stringify(configPayload, null, 2));
         (0, logger_1.logDebug)(`Config created: ${configPath}`);
     }
     else {
+        try {
+            configPayload = JSON.parse(fs_1.default.readFileSync(configPath, 'utf-8'));
+        }
+        catch {
+            configPayload = null;
+        }
         (0, logger_1.logDebug)(`Config found: ${configPath}`);
     }
+    if (configPayload && viewDefaults.length) {
+        configPayload.views = configPayload.views || {};
+        for (const entry of viewDefaults) {
+            if (!configPayload.views[entry.key]) {
+                configPayload.views[entry.key] = entry.view;
+            }
+        }
+        fs_1.default.writeFileSync(configPath, JSON.stringify(configPayload, null, 2));
+        (0, logger_1.logDebug)(`Config views updated: ${configPath}`);
+    }
     /**
      * 4.1️⃣ Gera menu inicial (override possível via menu.overrides.json)
      */
@@ -186,39 +263,44 @@ async function generate(options) {
         .filter(file => file.endsWith('.screen.json'));
     for (const file of overlayFiles) {
         const opId = file.replace(/\.screen\.json$/, '');
-        if (!operationIds.has(opId)) {
+        if (!operationFileNames.has(opId)) {
             fs_1.default.rmSync(path_1.default.join(overlaysDir, file));
             if (options.debug) {
                 console.log(`✖ Removed overlay ${opId}`);
             }
         }
     }
-    if (permissions.features.maxGenerations > -1) {
-        (0, device_1.incrementFreeGeneration)();
-    }
     console.log('✔ Routes generated');
     console.log('');
     console.log('🎉 Next steps');
-    console.log('  1) Generate Angular code:');
-    console.log('     generate-ui angular --schemas <your-generate-ui> --features <your-app>/src/app/features');
-    console.log('  2) Customize screens in generate-ui/overlays/');
-    console.log('  3) Customize menu in generate-ui/menu.overrides.json (created once, never overwritten)');
-    console.log('  4) Edit generateui-config.json to set appTitle/defaultRoute/menu.autoInject');
+    console.log('  1) Default full flow:');
+    console.log('     generate-ui generate');
+    console.log('  2) Advanced (schemas only):');
+    console.log('     generate-ui schema');
+    console.log('  3) Advanced (Angular only):');
+    console.log('     generate-ui angular');
+    console.log('  4) Customize screens in generate-ui/overlays/');
+    console.log('  5) Customize menu in generate-ui/menu.overrides.json (created once, never overwritten)');
+    console.log('  6) Edit generateui-config.json to set appTitle/defaultRoute/menu.autoInject/views');
     console.log('');
     (0, logger_1.logTip)('Run with --dev to see detailed logs and file paths.');
 }
+function normalizeSubscriptionReason(reason) {
+    if (typeof reason !== 'string')
+        return '';
+    const trimmed = reason.trim();
+    return trimmed;
+}
 function resolveGenerateUiRoot(projectRoot, output) {
     if (output) {
-        return path_1.default.resolve(process.cwd(), output);
+        return path_1.default.isAbsolute(output)
+            ? output
+            : path_1.default.resolve(process.cwd(), output);
     }
     const srcRoot = path_1.default.join(projectRoot, 'src');
     if (fs_1.default.existsSync(srcRoot)) {
         return path_1.default.join(srcRoot, 'generate-ui');
     }
-    const frontendSrcRoot = path_1.default.join(projectRoot, 'frontend', 'src');
-    if (fs_1.default.existsSync(frontendSrcRoot)) {
-        return path_1.default.join(frontendSrcRoot, 'generate-ui');
-    }
     return path_1.default.join(projectRoot, 'generate-ui');
 }
 function mergeParameters(pathParams, opParams) {
@@ -272,6 +354,119 @@ function inferRouteGroup(op, pathKey) {
         .find(part => !part.startsWith('{') && !part.endsWith('}'));
     return segment ? segment : null;
 }
+function recordResourceOp(map, pathKey, method, operationId, op) {
+    const isItemPath = /\/{[^}]+}$/.test(pathKey);
+    const basePath = isItemPath
+        ? pathKey.replace(/\/{[^}]+}$/, '')
+        : pathKey;
+    const paramMatch = isItemPath
+        ? pathKey.match(/\/{([^}]+)}$/)
+        : null;
+    const idParam = paramMatch ? paramMatch[1] : null;
+    const tag = Array.isArray(op?.tags) && op.tags.length
+        ? String(op.tags[0]).trim()
+        : undefined;
+    const entry = map.get(basePath) || {
+        basePath
+    };
+    if (tag && !entry.tag)
+        entry.tag = tag;
+    if (idParam && !entry.idParam)
+        entry.idParam = idParam;
+    const payload = {
+        operationId,
+        method,
+        path: pathKey,
+        tag
+    };
+    if (!isItemPath && method === 'get')
+        entry.list = payload;
+    if (isItemPath && method === 'get')
+        entry.detail = payload;
+    if (isItemPath && (method === 'put' || method === 'patch')) {
+        entry.update = payload;
+    }
+    if (isItemPath && method === 'delete')
+        entry.remove = payload;
+    map.set(basePath, entry);
+}
+function buildAdminSchemas(resources, usedOperationIds, screenByOpId) {
+    const adminSchemas = [];
+    for (const resource of resources.values()) {
+        if (!resource.list)
+            continue;
+        const entity = inferEntityName(resource.basePath);
+        const baseId = toPascalCase(entity);
+        const baseOpId = `${baseId}Admin`;
+        let operationId = baseOpId;
+        let index = 2;
+        while (usedOperationIds.has(operationId)) {
+            operationId = `${baseOpId}${index}`;
+            index += 1;
+        }
+        usedOperationIds.add(operationId);
+        const label = `${toLabel(entity)} Admin`;
+        const group = resource.tag ? resource.tag : inferGroup(resource.basePath);
+        const listSchema = screenByOpId.get(resource.list.operationId);
+        const columns = listSchema?.data?.table?.columns &&
+            Array.isArray(listSchema.data.table.columns)
+            ? listSchema.data.table.columns
+            : [];
+        const responseFormat = listSchema?.response?.format === 'cards' ||
+            listSchema?.response?.format === 'raw' ||
+            listSchema?.response?.format === 'table'
+            ? listSchema.response.format
+            : columns.length > 0
+                ? 'table'
+                : null;
+        adminSchemas.push({
+            meta: {
+                intelligent: {
+                    kind: 'adminList',
+                    label,
+                    group,
+                    listOperationId: resource.list.operationId,
+                    detailOperationId: resource.detail?.operationId ?? null,
+                    updateOperationId: resource.update?.operationId ?? null,
+                    deleteOperationId: resource.remove?.operationId ?? null,
+                    idParam: resource.idParam ?? null
+                }
+            },
+            entity: toLabel(entity),
+            description: 'Smart admin list generated from collection endpoints.',
+            data: {
+                table: {
+                    columns
+                }
+            },
+            response: responseFormat
+                ? { format: responseFormat }
+                : undefined,
+            api: {
+                operationId,
+                method: 'get',
+                endpoint: resource.list.path
+            }
+        });
+    }
+    return adminSchemas;
+}
+function inferEntityName(pathKey) {
+    const segments = String(pathKey || '')
+        .split('/')
+        .filter(Boolean);
+    if (!segments.length)
+        return 'Resource';
+    const last = segments[segments.length - 1];
+    return last.replace(/[^a-zA-Z0-9]+/g, ' ');
+}
+function inferGroup(pathKey) {
+    const segment = String(pathKey || '')
+        .split('/')
+        .map(part => part.trim())
+        .filter(Boolean)[0];
+    return segment ? segment : null;
+}
 function buildMenuFromRoutes(routes) {
     const groups = [];
     const ungrouped = [];
@@ -312,11 +507,28 @@ function toKebab(value) {
         .toLowerCase();
 }
 function toLabel(value) {
-    return String(value)
+    return stripDiacritics(String(value))
         .replace(/[_-]/g, ' ')
         .replace(/([a-z])([A-Z])/g, '$1 $2')
         .replace(/\b\w/g, char => char.toUpperCase());
 }
+function toSafeFileName(value) {
+    return String(value)
+        .replace(/[\\/]/g, '-')
+        .replace(/\s+/g, '-');
+}
+function stripDiacritics(value) {
+    return value
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '');
+}
+function toPascalCase(value) {
+    return String(value)
+        .split(/[^a-zA-Z0-9]+/)
+        .filter(Boolean)
+        .map(part => part[0].toUpperCase() + part.slice(1))
+        .join('');
+}
 function httpVerbToPrefix(verb) {
     switch (verb) {
         case 'get':

package/dist/commands/login.js

@@ -22,9 +22,11 @@ async function login(options) {
     (0, token_1.saveToken)(token);
     (0, logger_1.logDebug)('Token saved');
     let permissionsLoaded = false;
+    let subscriptionReason = '';
     try {
-        await (0, permissions_1.fetchPermissions)();
+        const permissions = await (0, permissions_1.fetchPermissions)();
         permissionsLoaded = true;
+        subscriptionReason = String(permissions.subscription.reason ?? '').trim();
     }
     catch {
         console.warn('⚠ Não foi possível validar a licença agora. Verifique sua conexão e rode o comando novamente se necessário.');
@@ -40,6 +42,9 @@ async function login(options) {
     console.log(permissionsLoaded
         ? '✔ Login completo'
         : '✔ Login completo (verificação pendente)');
+    if (permissionsLoaded && subscriptionReason) {
+        console.log(`ℹ Subscription: ${subscriptionReason}`);
+    }
 }
 function resolveLoginEmail() {
     const envEmail = process.env.GIT_AUTHOR_EMAIL ||
@@ -63,6 +68,7 @@ function resolveLoginEmail() {
 async function waitForLogin() {
     return new Promise((resolve, reject) => {
         let loginUrl = '';
+        let settled = false;
         const server = http_1.default.createServer((req, res) => {
             const requestUrl = req.url || '/';
             if (!requestUrl.startsWith('/callback')) {
@@ -89,72 +95,128 @@ async function waitForLogin() {
     <title>GenerateUI</title>
     <style>
       :root {
-        --bg: #f3e8ff;
+        --bg-1: #f9f5ea;
+        --bg-2: #eef7f4;
         --card: #ffffff;
-        --text: #2a1b3d;
-        --muted: #6b5b7a;
-        --primary: #7c3aed;
-        --glow: rgba(124, 58, 237, 0.22);
+        --text: #39455f;
+        --muted: #76819a;
+        --accent: #6fd3c0;
+        --accent-2: #9fd8ff;
+        --border: #e1e7f2;
+        --shadow: rgba(76, 88, 120, 0.14);
       }
       * {
         box-sizing: border-box;
-        font-family: "IBM Plex Serif", "Georgia", serif;
+        font-family: "Manrope", "Segoe UI", sans-serif;
       }
       body {
         margin: 0;
         min-height: 100vh;
         display: grid;
         place-items: center;
-        background: radial-gradient(circle at top, #f5ebff, #e9d5ff);
+        background:
+          radial-gradient(circle at 15% 0%, #fff3c8 0%, var(--bg-1) 36%, transparent 60%),
+          radial-gradient(circle at 85% 0%, #e6f7ff 0%, var(--bg-2) 40%, transparent 70%),
+          linear-gradient(135deg, #fdfbf6, #f3f7fb);
         color: var(--text);
       }
       main {
-        background: var(--card);
-        padding: 52px 48px;
-        border-radius: 24px;
-        box-shadow: 0 24px 70px var(--glow);
-        width: min(460px, 92vw);
-        text-align: center;
+        background: linear-gradient(180deg, rgba(255,255,255,0.94), rgba(255,255,255,0.98));
+        padding: 44px;
+        border-radius: 28px;
+        border: 1px solid var(--border);
+        box-shadow: 0 24px 60px var(--shadow);
+        width: min(520px, 92vw);
+        text-align: left;
+        position: relative;
+        overflow: hidden;
+      }
+      main::before {
+        content: "";
+        position: absolute;
+        inset: -40% 25% auto auto;
+        width: 280px;
+        height: 280px;
+        background: radial-gradient(circle, rgba(111,211,192,0.35), transparent 70%);
+        pointer-events: none;
+      }
+      .label {
+        letter-spacing: 0.22em;
+        font-size: 12px;
+        color: var(--muted);
+        text-transform: uppercase;
       }
       h1 {
-        margin: 0 0 12px;
+        margin: 10px 0 12px;
         font-size: 30px;
+        letter-spacing: 0.02em;
       }
       p {
         margin: 0 0 24px;
         color: var(--muted);
-        font-size: 16px;
+        line-height: 1.5;
       }
       .pill {
-        display: inline-block;
-        background: #f5e9ff;
-        color: var(--primary);
-        padding: 8px 14px;
+        padding: 4px 10px;
         border-radius: 999px;
-        font-weight: 600;
-        letter-spacing: 0.2px;
+        background: rgba(255,255,255,0.65);
+        border: 1px solid var(--border);
+        font-size: 12px;
+        color: var(--muted);
+      }
+      .footer {
+        margin-top: 12px;
+        font-size: 13px;
+        color: var(--muted);
+      }
+      @media (max-width: 520px) {
+        main {
+          padding: 32px 24px;
+          text-align: center;
+        }
       }
     </style>
   </head>
   <body>
     <main>
-      <h1>Let's Generate UI</h1>
-      <p>Login completed successfully.</p>
-      <span class="pill">You can close this window</span>
+      <div class="label">Generated UI</div>
+      <h1>Login completed</h1>
+      <p>You can now return to the terminal.</p>
+      <div class="footer">
+        <span class="pill">You can close this window</span>
+      </div>
     </main>
   </body>
 </html>`);
             clearTimeout(timeout);
             server.close();
+            settled = true;
+            process.off('SIGINT', handleSigint);
+            process.off('SIGTERM', handleSigint);
             resolve({ accessToken, expiresAt });
         });
+        const handleSigint = () => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timeout);
+            server.close();
+            reject(new Error('Login canceled by user (SIGINT).'));
+        };
         const timeout = setTimeout(() => {
+            if (settled)
+                return;
+            settled = true;
             server.close();
+            process.off('SIGINT', handleSigint);
+            process.off('SIGTERM', handleSigint);
             const help = loginUrl
                 ? ` Ensure the login page is reachable and try again: ${loginUrl}`
                 : ` Ensure ${(0, config_1.getWebAuthUrl)()} and ${(0, config_1.getApiBaseUrl)()} are reachable.`;
             reject(new Error(`Login timed out.${help}`));
         }, LOGIN_TIMEOUT_MS);
+        process.on('SIGINT', handleSigint);
+        process.on('SIGTERM', handleSigint);
         server.listen(0, () => {
             const address = server.address();
             if (!address || typeof address === 'string') {