@brunoluizdesiqueira/bbuilder-cli 1.0.15 → 1.0.17

package/dist/build/compiler.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildCompilerFlags = buildCompilerFlags;
+exports.ensureDelphiEnvironment = ensureDelphiEnvironment;
 exports.runCgrc = runCgrc;
 exports.runDcc64 = runDcc64;
 exports.runBuiltExecutable = runBuiltExecutable;
@@ -103,6 +104,7 @@ async function getDelphiEnvironment(delphiDir) {
         const command = `call "${rsvarsPath}" >nul && set`;
         const result = await (0, execa_1.default)('cmd.exe', ['/d', '/c', command], {
             env: process.env,
+            windowsVerbatimArguments: true,
         });
         const resolved = {
             ...process.env,
@@ -116,6 +118,9 @@ async function getDelphiEnvironment(delphiDir) {
         (0, output_1.fatal)(`Falha ao carregar o ambiente do Delphi via rsvars.bat (${rsvarsPath}). Detalhe: ${message}`);
     }
 }
+async function ensureDelphiEnvironment(delphiDir) {
+    await getDelphiEnvironment(delphiDir);
+}
 async function runCgrc(opts, projectName) {
     const tempDir = path.join(os.tmpdir(), `BimerBuild_${projectName}`);
     const vrcFile = path.join(tempDir, `${projectName}.vrc`);

package/dist/build/execute.js

@@ -41,21 +41,22 @@ const compiler_1 = require("./compiler");
 const project_1 = require("./project");
 const resources_1 = require("./resources");
 async function executeBuild(opts) {
-    const totalStages = 4;
+    const totalStages = 5;
     (0, output_1.banner)();
     const { workspaceDir, projectName } = (0, project_1.resolveProject)(opts.project, opts.repoBase);
     (0, output_1.printBuildHeader)(opts, projectName, workspaceDir);
-    await (0, output_1.withProgress)(1, totalStages, 'Preparando versao, manifesto e recursos', () => {
+    await (0, output_1.withStep)(1, totalStages, 'Carregando ambiente do Delphi', () => (0, compiler_1.ensureDelphiEnvironment)(opts.delphiDir));
+    await (0, output_1.withStep)(2, totalStages, 'Preparando versao, manifesto e recursos', () => {
         (0, resources_1.prepareProjectResources)(opts, projectName, workspaceDir);
     });
     const oldRes = path.win32.join(workspaceDir, `${projectName}.res`);
     if (fs.existsSync(oldRes))
         fs.unlinkSync(oldRes);
-    const resFile = await (0, output_1.withProgress)(2, totalStages, 'Compilando recursos nativos', () => (0, compiler_1.runCgrc)(opts, projectName), { streamingOutput: true });
-    await (0, output_1.withProgress)(3, totalStages, 'Sincronizando recurso final no projeto', () => {
+    const resFile = await (0, output_1.withStep)(3, totalStages, 'Compilando recursos nativos', () => (0, compiler_1.runCgrc)(opts, projectName));
+    await (0, output_1.withStep)(4, totalStages, 'Sincronizando recurso final no projeto', () => {
         fs.copyFileSync(resFile, path.win32.join(workspaceDir, `${projectName}.res`));
     });
-    await (0, output_1.withProgress)(4, totalStages, `Compilando projeto Delphi (${opts.type})`, () => (0, compiler_1.runDcc64)(opts, projectName, workspaceDir), { streamingOutput: true });
+    await (0, output_1.withStep)(5, totalStages, `Compilando projeto Delphi (${opts.type})`, () => (0, compiler_1.runDcc64)(opts, projectName, workspaceDir));
     (0, output_1.printSuccess)(opts.type);
     const { runAfter } = (0, compiler_1.buildCompilerFlags)(opts.type);
     if (runAfter) {

package/dist/cli/program.js

@@ -98,7 +98,7 @@ async function runCli(argv) {
         .description('Compila um projeto Delphi (interativo se flags omitidas)')
         .option('-t, --type <FAST|DEBUG|RELEASE>', 'Modo de build')
         .option('-p, --project <path>', 'Caminho do projeto (ex: faturamento\\BimerFaturamento)')
-        .option('-v, --version <version>', 'Versão a injetar (ex: 11.2.4)'), HELP_EXAMPLES.build)
+        .option('-v, --version <version>', 'Versão a injetar (ex: 11.3.0)'), HELP_EXAMPLES.build)
         .action(async (opts) => {
         const buildType = opts.type?.toUpperCase();
         if (buildType && !['FAST', 'DEBUG', 'RELEASE'].includes(buildType)) {

package/dist/ui/output.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -40,13 +7,11 @@ exports.banner = banner;
 exports.printBuildHeader = printBuildHeader;
 exports.printSuccess = printSuccess;
 exports.step = step;
+exports.formatElapsedMs = formatElapsedMs;
+exports.withStep = withStep;
 exports.withProgress = withProgress;
 exports.fatal = fatal;
 const chalk_1 = __importDefault(require("chalk"));
-const readline = __importStar(require("readline"));
-const SPINNER_FRAMES = ['|', '/', '-', '\\'];
-const BAR_WIDTH = 18;
-const BAR_SEGMENT = 6;
 function banner() {
     console.log('');
     console.log(chalk_1.default.blue('  ══════════════════════════════════════════════════════════════'));
@@ -95,105 +60,31 @@ function printSuccess(buildType) {
 function step(msg) {
     console.log(chalk_1.default.cyan('  [*]') + ' ' + chalk_1.default.white(msg));
 }
-function formatElapsed(startTime) {
-    const totalSeconds = Math.max(0, Math.floor((Date.now() - startTime) / 1000));
+function formatElapsedMs(elapsedMs) {
+    const totalSeconds = Math.max(0, Math.floor(elapsedMs / 1000));
     const minutes = Math.floor(totalSeconds / 60)
         .toString()
         .padStart(2, '0');
     const seconds = (totalSeconds % 60).toString().padStart(2, '0');
     return `${minutes}:${seconds}`;
 }
-function buildIndeterminateBar(frameIndex) {
-    const chars = new Array(BAR_WIDTH).fill('░');
-    const start = frameIndex % (BAR_WIDTH + BAR_SEGMENT);
-    for (let offset = 0; offset < BAR_SEGMENT; offset++) {
-        const position = start - offset;
-        if (position >= 0 && position < BAR_WIDTH) {
-            chars[position] = '█';
-        }
-    }
-    return chars.join('');
-}
-function truncateLabel(label, maxLength) {
-    if (maxLength <= 0)
-        return '';
-    if (label.length <= maxLength)
-        return label;
-    if (maxLength <= 1)
-        return label.slice(0, maxLength);
-    return `${label.slice(0, maxLength - 1)}…`;
-}
-function renderProgressLine(stage, total, label, startTime, frameIndex) {
-    const spinner = SPINNER_FRAMES[frameIndex % SPINNER_FRAMES.length];
-    const bar = buildIndeterminateBar(frameIndex);
-    const elapsed = formatElapsed(startTime);
-    const columns = process.stdout.columns || 100;
-    const reservedLength = 2 + `[${stage}/${total}]`.length + 1 + 1 + 1 + 1 + 1 + (BAR_WIDTH + 2) + 1 + elapsed.length;
-    const maxLabelLength = Math.max(12, columns - reservedLength);
-    const safeLabel = truncateLabel(label, maxLabelLength);
-    return `  ${chalk_1.default.cyan(`[${stage}/${total}]`)} ${chalk_1.default.yellow(spinner)} ${chalk_1.default.white(safeLabel)} ${chalk_1.default.blue(`[${bar}]`)} ${chalk_1.default.gray(elapsed)}`;
-}
-function drawProgressLine(line) {
-    readline.clearLine(process.stdout, 0);
-    readline.cursorTo(process.stdout, 0);
-    process.stdout.write(line);
-}
-function clearProgressLine() {
-    readline.clearLine(process.stdout, 0);
-    readline.cursorTo(process.stdout, 0);
-}
-async function withProgress(stage, total, label, task, options) {
+async function withStep(stage, total, label, task, options) {
     const startTime = Date.now();
-    const streamingOutput = options?.streamingOutput ?? false;
-    if (!process.stdout.isTTY) {
-        step(`[${stage}/${total}] ${label}`);
-        const result = await task();
-        console.log(`  ${chalk_1.default.green('OK')} ${chalk_1.default.white(label)} ${chalk_1.default.gray(`(${formatElapsed(startTime)})`)}`);
-        return result;
-    }
-    if (streamingOutput) {
-        step(`[${stage}/${total}] ${label}`);
-        try {
-            const result = await task();
-            console.log(`  ${chalk_1.default.green('OK')} ${chalk_1.default.white(label)} ${chalk_1.default.gray(`(${formatElapsed(startTime)})`)}`);
-            return result;
-        }
-        catch (error) {
-            console.log(`  ${chalk_1.default.red('FAIL')} ${chalk_1.default.white(label)} ${chalk_1.default.gray(`(${formatElapsed(startTime)})`)}`);
-            throw error;
-        }
-    }
-    let frameIndex = 0;
-    let rendered = false;
-    let timer;
-    const render = () => {
-        clearProgressLine();
-        drawProgressLine(renderProgressLine(stage, total, label, startTime, frameIndex));
-        rendered = true;
-    };
-    render();
-    timer = setInterval(() => {
-        frameIndex += 1;
-        render();
-    }, 120);
+    const prefix = `[${stage}/${total}] ${label}`;
+    step(prefix);
     try {
         const result = await task();
-        if (timer)
-            clearInterval(timer);
-        if (rendered)
-            clearProgressLine();
-        console.log(`  ${chalk_1.default.green('OK')} ${chalk_1.default.white(label)} ${chalk_1.default.gray(`(${formatElapsed(startTime)})`)}`);
+        console.log(`  ${chalk_1.default.green('OK')} ${chalk_1.default.white(label)} ${chalk_1.default.gray(`(${formatElapsedMs(Date.now() - startTime)})`)}`);
         return result;
     }
     catch (error) {
-        if (timer)
-            clearInterval(timer);
-        if (rendered)
-            clearProgressLine();
-        console.log(`  ${chalk_1.default.red('FAIL')} ${chalk_1.default.white(label)} ${chalk_1.default.gray(`(${formatElapsed(startTime)})`)}`);
+        console.log(`  ${chalk_1.default.red('FAIL')} ${chalk_1.default.white(label)} ${chalk_1.default.gray(`(${formatElapsedMs(Date.now() - startTime)})`)}`);
         throw error;
     }
 }
+async function withProgress(stage, total, label, task, options) {
+    return withStep(stage, total, label, task, options);
+}
 function fatal(msg) {
     console.error('');
     console.error(chalk_1.default.red('  [ERRO FATAL] ') + msg);

package/dist/ui/prompts.js

@@ -43,7 +43,7 @@ async function promptBuild(config, cliType, cliProject, cliVersion) {
             type: 'input',
             name: 'version',
             message: 'Versão do EXE? (deixe em branco para manter atual):',
-            default: '',
+            default: '11.3.0',
         });
     }
     const answers = await inquirer_1.default.prompt(questions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brunoluizdesiqueira/bbuilder-cli",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "CLI de build local para projetos Delphi do Bimer",
   "license": "ISC",
   "repository": {
@@ -33,6 +33,7 @@
   "scripts": {
     "build": "tsc",
     "dev": "ts-node src/index.ts",
+    "test": "npm run build && node --test test/**/*.test.js",
     "prepack": "npm run build",
     "changeset": "changeset",
     "version-packages": "changeset version",