npm - generate-ui-cli - Versions diffs - 2.1.7 → 2.3.0 - Mend

generate-ui-cli 2.1.7 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/README.md +216 -27
package/dist/commands/angular.js +535 -40
package/dist/commands/generate.js +350 -20
package/dist/commands/login.js +131 -42
package/dist/commands/merge.js +201 -0
package/dist/generate-ui/routes.gen.js +4 -0
package/dist/generators/angular/feature.generator.js +3183 -583
package/dist/generators/angular/menu.generator.js +165 -0
package/dist/generators/angular/routes.generator.js +8 -3
package/dist/generators/screen.generator.js +100 -5
package/dist/generators/screen.merge.js +70 -15
package/dist/index.js +88 -12
package/dist/license/guard.js +2 -1
package/dist/license/permissions.js +63 -9
package/dist/license/token.js +38 -3
package/dist/postinstall.js +47 -0
package/dist/runtime/config.js +4 -0
package/dist/runtime/logger.js +29 -0
package/dist/runtime/project-config.js +64 -0
package/package.json +1 -1

package/dist/commands/login.js CHANGED Viewed

@@ -6,25 +6,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.login = login;
 const http_1 = __importDefault(require("http"));
 const url_1 = require("url");
-const promises_1 = require("readline/promises");
+const child_process_1 = require("child_process");
 const config_1 = require("../runtime/config");
 const user_config_1 = require("../runtime/user-config");
 const open_browser_1 = require("../runtime/open-browser");
 const token_1 = require("../license/token");
 const permissions_1 = require("../license/permissions");
 const telemetry_1 = require("../telemetry");
+const logger_1 = require("../runtime/logger");
 const LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
 async function login(options) {
     void (0, telemetry_1.trackCommand)('login', options.telemetryEnabled);
+    (0, logger_1.logStep)('Starting login flow');
     const token = await waitForLogin();
     (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 {
-        // Cached permissions will be refreshed on next online command.
+        console.warn('⚠ Não foi possível validar a licença agora. Verifique sua conexão e rode o comando novamente se necessário.');
     }
-    const email = await promptEmail();
+    const email = resolveLoginEmail();
     if (email) {
         (0, user_config_1.updateUserConfig)((config) => ({
             ...config,
@@ -32,27 +39,36 @@ async function login(options) {
         }));
     }
     await (0, telemetry_1.trackLogin)(email, options.telemetryEnabled);
-    console.log('✔ Login completo');
+    console.log(permissionsLoaded
+        ? '✔ Login completo'
+        : '✔ Login completo (verificação pendente)');
+    if (permissionsLoaded && subscriptionReason) {
+        console.log(`ℹ Subscription: ${subscriptionReason}`);
+    }
 }
-async function promptEmail() {
-    if (!process.stdin.isTTY)
-        return null;
-    const rl = (0, promises_1.createInterface)({
-        input: process.stdin,
-        output: process.stdout
-    });
+function resolveLoginEmail() {
+    const envEmail = process.env.GIT_AUTHOR_EMAIL ||
+        process.env.GIT_COMMITTER_EMAIL ||
+        process.env.EMAIL;
+    if (envEmail && envEmail.trim().length) {
+        return envEmail.trim();
+    }
     try {
-        const value = await rl.question('Email (optional): ');
-        const trimmed = value.trim();
-        return trimmed.length ? trimmed : null;
+        const output = (0, child_process_1.execSync)('git config --get user.email', {
+            stdio: ['ignore', 'pipe', 'ignore']
+        })
+            .toString()
+            .trim();
+        return output.length ? output : null;
     }
-    finally {
-        rl.close();
+    catch {
+        return null;
     }
 }
 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')) {
@@ -68,7 +84,7 @@ async function waitForLogin() {
                 res.end('Missing access token');
                 return;
             }
-            const expiresAt = expiresAtParam ||
+            const expiresAt = normalizeExpiresAt(expiresAtParam) ||
                 new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString();
             res.writeHead(200, { 'Content-Type': 'text/html' });
             res.end(`<!doctype html>
@@ -79,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') {
@@ -158,7 +230,24 @@ async function waitForLogin() {
             url.searchParams.set('api_base', (0, config_1.getApiBaseUrl)());
             loginUrl = url.toString();
             console.log(`Open this URL to finish login: ${loginUrl}`);
+            (0, logger_1.logDebug)(`Login callback listening on ${redirectUri}`);
             (0, open_browser_1.openBrowser)(loginUrl);
         });
     });
 }
+function normalizeExpiresAt(value) {
+    if (!value)
+        return null;
+    const trimmed = value.trim();
+    if (!trimmed.length)
+        return null;
+    const asNumber = Number(trimmed);
+    if (Number.isFinite(asNumber)) {
+        const ms = asNumber < 1e12 ? asNumber * 1000 : asNumber;
+        return new Date(ms).toISOString();
+    }
+    const parsed = new Date(trimmed);
+    if (Number.isNaN(parsed.getTime()))
+        return null;
+    return parsed.toISOString();
+}

package/dist/commands/merge.js ADDED Viewed

@@ -0,0 +1,201 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.merge = merge;
+const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const child_process_1 = require("child_process");
+const logger_1 = require("../runtime/logger");
+const project_config_1 = require("../runtime/project-config");
+async function merge(options) {
+    const projectConfig = (0, project_config_1.findProjectConfig)(process.cwd());
+    const configuredFeatures = (0, project_config_1.pickConfiguredPath)(projectConfig.config, 'features');
+    const featuresRoot = resolveFeaturesRoot(options.featuresPath, configuredFeatures, projectConfig.configPath);
+    const generatedRoot = path_1.default.join(featuresRoot, 'generated');
+    const overridesRoot = path_1.default.join(featuresRoot, 'overrides');
+    if (!options.feature) {
+        throw new Error('Missing --feature. Example: generate-ui merge --feature ProductsAdmin');
+    }
+    const folder = resolveFeatureFolder(options.feature, generatedRoot, overridesRoot);
+    const files = resolveFiles(folder, options.file);
+    if (files.length === 0) {
+        throw new Error('No files selected to compare.');
+    }
+    const selectedTool = options.tool || 'code';
+    (0, logger_1.logStep)(`Generated: ${generatedRoot}`);
+    (0, logger_1.logStep)(`Overrides: ${overridesRoot}`);
+    (0, logger_1.logStep)(`Merge tool: ${selectedTool}${selectedTool === 'code'
+        ? ' (merge editor, recommended)'
+        : selectedTool === 'code-diff'
+            ? ' (red/green diff)'
+            : ''}`);
+    let compared = 0;
+    for (const fileName of files) {
+        const generatedPath = path_1.default.join(generatedRoot, folder, fileName);
+        const overridePath = path_1.default.join(overridesRoot, folder, fileName);
+        if (!fs_1.default.existsSync(generatedPath)) {
+            console.warn(`⚠ Missing generated file: ${generatedPath}`);
+            continue;
+        }
+        if (!fs_1.default.existsSync(overridePath)) {
+            fs_1.default.mkdirSync(path_1.default.dirname(overridePath), { recursive: true });
+            fs_1.default.copyFileSync(generatedPath, overridePath);
+            console.log(`ℹ Created override file: ${overridePath}`);
+        }
+        openMergeTool(selectedTool, generatedPath, overridePath);
+        compared += 1;
+    }
+    if (compared === 0) {
+        throw new Error(`No comparable files found for feature "${folder}".`);
+    }
+    (0, logger_1.logTip)('Save changes in the overrides file (right side) to keep custom edits.');
+}
+function resolveFeaturesRoot(value, configured, configPath) {
+    const fromConfig = (0, project_config_1.resolveOptionalPath)(value, configured, configPath);
+    if (fromConfig) {
+        return normalizeFeaturesRoot(fromConfig);
+    }
+    const srcAppRoot = path_1.default.resolve(process.cwd(), 'src', 'app');
+    if (fs_1.default.existsSync(srcAppRoot)) {
+        return path_1.default.join(srcAppRoot, 'features');
+    }
+    throw new Error('Default features path not found.\n' +
+        'Use --features <path> or set "features" (or "paths.features") in generateui-config.json.');
+}
+function normalizeFeaturesRoot(value) {
+    const isSrcApp = path_1.default.basename(value) === 'app' &&
+        path_1.default.basename(path_1.default.dirname(value)) === 'src';
+    if (isSrcApp)
+        return path_1.default.join(value, 'features');
+    return value;
+}
+function resolveFeatureFolder(value, generatedRoot, overridesRoot) {
+    const folders = listFeatureFolders(generatedRoot, overridesRoot);
+    if (folders.length === 0) {
+        throw new Error(`No feature folders found under ${generatedRoot} or ${overridesRoot}.`);
+    }
+    const direct = normalizeFeatureKey(value);
+    const matches = folders.filter(folder => normalizeFeatureKey(folder) === direct);
+    if (matches.length === 1)
+        return matches[0];
+    const contains = folders.filter(folder => normalizeFeatureKey(folder).includes(direct));
+    if (contains.length === 1)
+        return contains[0];
+    if (contains.length > 1) {
+        throw new Error(`Feature "${value}" is ambiguous. Matches: ${contains.join(', ')}`);
+    }
+    const sample = folders.slice(0, 12).join(', ');
+    throw new Error(`Feature not found: ${value}.\n` +
+        `Available features: ${sample}${folders.length > 12 ? ', ...' : ''}`);
+}
+function listFeatureFolders(generatedRoot, overridesRoot) {
+    const set = new Set();
+    for (const root of [generatedRoot, overridesRoot]) {
+        if (!fs_1.default.existsSync(root))
+            continue;
+        for (const entry of fs_1.default.readdirSync(root, { withFileTypes: true })) {
+            if (!entry.isDirectory())
+                continue;
+            set.add(entry.name);
+        }
+    }
+    return [...set].sort((a, b) => a.localeCompare(b));
+}
+function normalizeFeatureKey(value) {
+    return String(value)
+        .trim()
+        .replace(/Component$/i, '')
+        .replace(/[^a-zA-Z0-9]/g, '')
+        .toLowerCase();
+}
+function resolveFiles(folder, raw) {
+    const key = String(raw || 'component.ts').trim();
+    if (key === 'all') {
+        return [
+            `${folder}.component.ts`,
+            `${folder}.component.html`,
+            `${folder}.component.scss`
+        ];
+    }
+    const normalized = key.startsWith('.')
+        ? key.slice(1)
+        : key;
+    const suffix = normalized.startsWith('component')
+        ? normalized
+        : `component.${normalized}`;
+    return [`${folder}.${suffix}`];
+}
+function openMergeTool(tool, generatedPath, overridePath) {
+    const run = (cmd, args) => {
+        try {
+            (0, child_process_1.execFileSync)(cmd, args, { stdio: 'inherit' });
+        }
+        catch (error) {
+            const message = String(error?.message || '');
+            if (error?.code === 'ENOENT') {
+                throw new Error(`Merge tool "${cmd}" not found in PATH.\n` +
+                    'Recommended: install VS Code command in PATH and use --tool code.\n' +
+                    "In VS Code run: 'Shell Command: Install code command in PATH'.\n" +
+                    'Or try one of these:\n' +
+                    '  --tool code\n' +
+                    '  --tool code-diff\n' +
+                    '  --tool vimdiff\n' +
+                    '  --tool diff');
+            }
+            if (cmd === 'opendiff' &&
+                message.includes('requires Xcode')) {
+                throw new Error('Tool "opendiff" requires full Xcode.\n' +
+                    'Use --tool vimdiff or --tool diff, or install full Xcode.');
+            }
+            throw error;
+        }
+    };
+    if (tool === 'code') {
+        openCodeMerge(run, generatedPath, overridePath);
+        return;
+    }
+    if (tool === 'code-diff') {
+        // Diff view: left = incoming generated, right = current overrides.
+        run('code', ['--wait', '--diff', generatedPath, overridePath]);
+        return;
+    }
+    if (tool === 'meld' || tool === 'kdiff3' || tool === 'bc') {
+        run('git', ['difftool', '--no-index', `--tool=${tool}`, generatedPath, overridePath]);
+        return;
+    }
+    run(tool, [generatedPath, overridePath]);
+}
+function openCodeMerge(run, generatedPath, overridePath) {
+    const ext = path_1.default.extname(overridePath) || '.txt';
+    const tempDir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'generate-ui-merge-'));
+    const currentPath = path_1.default.join(tempDir, `current${ext}`);
+    const incomingPath = path_1.default.join(tempDir, `incoming${ext}`);
+    const basePath = path_1.default.join(tempDir, `base${ext}`);
+    const resultPath = path_1.default.join(tempDir, `result${ext}`);
+    try {
+        fs_1.default.copyFileSync(overridePath, currentPath);
+        fs_1.default.copyFileSync(generatedPath, incomingPath);
+        fs_1.default.copyFileSync(generatedPath, basePath);
+        fs_1.default.copyFileSync(overridePath, resultPath);
+        // VS Code merge editor:
+        // - current: user's override
+        // - incoming: regenerated output
+        // - base: fallback ancestor (best effort, regenerated)
+        // - result: file that will be saved back to overrides
+        run('code', [
+            '--wait',
+            '--merge',
+            currentPath,
+            incomingPath,
+            basePath,
+            resultPath
+        ]);
+        fs_1.default.copyFileSync(resultPath, overridePath);
+    }
+    finally {
+        fs_1.default.rmSync(tempDir, { recursive: true, force: true });
+    }
+}

package/dist/generate-ui/routes.gen.js ADDED Viewed

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generatedRoutes = void 0;
+exports.generatedRoutes = [];