@lark-apaas/miaoda-cli 0.1.3 → 0.1.4

package/dist/utils/output.js

@@ -6,6 +6,7 @@ exports.emit = emit;
 exports.emitError = emitError;
 exports.emitOk = emitOk;
 exports.emitPaged = emitPaged;
+exports.snakeCaseKeys = snakeCaseKeys;
 const config_1 = require("./config");
 const error_1 = require("./error");
 const colors_1 = require("./colors");
@@ -25,13 +26,13 @@ const SERVER_ERROR_HINTS = {
     // key 用 BIZ_ERR_MAP 映射后的语义 code（不是原始服务端 k_dl_xxx），保持
     // 与 help / 文档里宣传的 RESULT_SET_TOO_LARGE 一致。
     RESULT_SET_TOO_LARGE: [
-        "Add `LIMIT <n>` to your SQL to narrow the result.",
-        "For counts, use `SELECT count(*) FROM ...`; for aggregation, use GROUP BY with filters.",
+        'Add `LIMIT <n>` to your SQL to narrow the result.',
+        'For counts, use `SELECT count(*) FROM ...`; for aggregation, use GROUP BY with filters.',
     ],
 };
 function isJsonMode() {
     const cfg = (0, config_1.getConfig)();
-    return cfg.output === "json" || Boolean(cfg.json);
+    return cfg.output === 'json' || Boolean(cfg.json);
 }
 // ── 默认 cell 格式化 ────────────
 /**
@@ -44,24 +45,24 @@ function isJsonMode() {
  */
 function defaultFormat(v) {
     if (v === null || v === undefined)
-        return "";
-    if (typeof v === "string")
+        return '';
+    if (typeof v === 'string')
         return v;
-    if (typeof v === "boolean" || typeof v === "number" || typeof v === "bigint")
+    if (typeof v === 'boolean' || typeof v === 'number' || typeof v === 'bigint')
         return String(v);
     const s = JSON.stringify(v);
     if (process.stdout.isTTY && s.length > 60)
-        return s.slice(0, 57) + "...";
+        return s.slice(0, 57) + '...';
     return s;
 }
 // ── 时间戳 / 时长 formatter ────────────
 function toMs(v, divisor) {
     let n;
-    if (typeof v === "number")
+    if (typeof v === 'number')
         n = v;
-    else if (typeof v === "bigint")
+    else if (typeof v === 'bigint')
         n = Number(v);
-    else if (typeof v === "string") {
+    else if (typeof v === 'string') {
         n = Number(v);
         if (!Number.isFinite(n))
             return null;
@@ -73,7 +74,7 @@ function toMs(v, divisor) {
     return n / divisor;
 }
 /** renderDate 默认模板：本地时区、人读友好。业务层可在 fmt.{ns,us,ms,sec}() 里覆盖。 */
-const DEFAULT_DATE_TEMPLATE = "yyyy-MM-dd HH:mm:ss";
+const DEFAULT_DATE_TEMPLATE = 'yyyy-MM-dd HH:mm:ss';
 /**
  * 把 Date 渲染成模板字符串；time zone 走运行时 local。
  * 支持的占位符：yyyy / MM / dd / HH / mm / ss / SSS（毫秒）。
@@ -86,14 +87,14 @@ function renderDate(date, template = DEFAULT_DATE_TEMPLATE) {
     // if (diffMs < 3_600_000) return `${String(Math.floor(diffMs / 60_000))}m ago`;
     // if (diffMs < 86_400_000) return `${String(Math.floor(diffMs / 3_600_000))}h ago`;
     // if (diffMs < 7 * 86_400_000) return `${String(Math.floor(diffMs / 86_400_000))}d ago`;
-    const pad2 = (n) => String(n).padStart(2, "0");
+    const pad2 = (n) => String(n).padStart(2, '0');
     const Y = String(date.getFullYear());
     const Mo = pad2(date.getMonth() + 1);
     const D = pad2(date.getDate());
     const H = pad2(date.getHours());
     const Mi = pad2(date.getMinutes());
     const S = pad2(date.getSeconds());
-    const Ms = String(date.getMilliseconds()).padStart(3, "0");
+    const Ms = String(date.getMilliseconds()).padStart(3, '0');
     // 顺序：先把 SSS 这种长 token 处理掉，再处理短 token，避免子串误覆盖
     return template
         .replace(/yyyy/g, Y)
@@ -138,7 +139,7 @@ function makeTruncateFormatter(n) {
         // 仅 TTY 截断，非 TTY 保留完整值（pipe 下游可解析）
         if (!process.stdout.isTTY || s.length <= n)
             return s;
-        return s.slice(0, Math.max(0, n - 3)) + "...";
+        return s.slice(0, Math.max(0, n - 3)) + '...';
     };
 }
 /**
@@ -175,10 +176,10 @@ exports.fmt = {
 // ── 字段选择 (--json field1,field2) ────────────
 function getFieldSelection() {
     const cfg = (0, config_1.getConfig)();
-    if (typeof cfg.json !== "string")
+    if (typeof cfg.json !== 'string')
         return null;
     const fields = cfg.json
-        .split(",")
+        .split(',')
         .map((s) => s.trim())
         .filter(Boolean);
     return fields.length > 0 ? fields : null;
@@ -198,22 +199,22 @@ function pickFields(obj, fields) {
 }
 function applyFieldSelection(data, fields) {
     if (Array.isArray(data)) {
-        return data.map((item) => typeof item === "object" && item !== null && !Array.isArray(item)
+        return data.map((item) => typeof item === 'object' && item !== null && !Array.isArray(item)
             ? pickFields(item, fields)
             : item);
     }
-    if (typeof data === "object" && data !== null) {
+    if (typeof data === 'object' && data !== null) {
         return pickFields(data, fields);
     }
     return data;
 }
 // ── 信封识别 ────────────
-const ENVELOPE_KEYS = new Set(["data", "next_cursor", "has_more"]);
+const ENVELOPE_KEYS = new Set(['data', 'next_cursor', 'has_more']);
 function isEnvelope(v) {
-    if (typeof v !== "object" || v === null)
+    if (typeof v !== 'object' || v === null)
         return false;
     const keys = Object.keys(v);
-    if (!keys.includes("data"))
+    if (!keys.includes('data'))
         return false;
     return keys.every((k) => ENVELOPE_KEYS.has(k));
 }
@@ -234,38 +235,38 @@ function emit(data, schema) {
         payload = { ...payload, data: applyFieldSelection(payload.data, fields) };
     }
     if (isJsonMode()) {
-        process.stdout.write(JSON.stringify(payload) + "\n");
+        process.stdout.write(JSON.stringify(payload) + '\n');
         return;
     }
     if (isEnvelope(payload)) {
         emitPrettyEnvelope(payload, schema);
         return;
     }
-    if (typeof payload === "string") {
-        process.stdout.write(payload + "\n");
+    if (typeof payload === 'string') {
+        process.stdout.write(payload + '\n');
     }
     else {
-        process.stdout.write(JSON.stringify(payload, null, 2) + "\n");
+        process.stdout.write(JSON.stringify(payload, null, 2) + '\n');
     }
 }
 function emitPrettyEnvelope(env, schema) {
     const { data, next_cursor, has_more } = env;
     if (Array.isArray(data)) {
         if (data.length === 0) {
-            process.stdout.write("(no results)\n");
+            process.stdout.write('(no results)\n');
         }
         else {
             writeTable(data, schema);
         }
     }
-    else if (data !== null && typeof data === "object") {
+    else if (data !== null && typeof data === 'object') {
         writeKeyValue(data, schema);
     }
     else if (data === null || data === undefined) {
-        process.stdout.write("(empty)\n");
+        process.stdout.write('(empty)\n');
     }
     else {
-        process.stdout.write(defaultFormat(data) + "\n");
+        process.stdout.write(defaultFormat(data) + '\n');
     }
     if (has_more && next_cursor) {
         const count = Array.isArray(data) ? data.length : 1;
@@ -318,10 +319,10 @@ function resolveColumnsForRows(items, schema) {
     return cols;
 }
 function writeTable(rows, schema) {
-    const items = rows.filter((r) => typeof r === "object" && r !== null && !Array.isArray(r));
+    const items = rows.filter((r) => typeof r === 'object' && r !== null && !Array.isArray(r));
     if (items.length === 0) {
         for (const row of rows)
-            process.stdout.write(defaultFormat(row) + "\n");
+            process.stdout.write(defaultFormat(row) + '\n');
         return;
     }
     const cols = resolveColumnsForRows(items, schema);
@@ -334,14 +335,14 @@ function writeTable(rows, schema) {
         for (const row of matrix) {
             const line = row
                 .map((cell, i) => cell.padEnd(widths[i] ?? 0))
-                .join("  ")
+                .join('  ')
                 .trimEnd();
-            process.stdout.write(line + "\n");
+            process.stdout.write(line + '\n');
         }
     }
     else {
         for (const row of matrix)
-            process.stdout.write(row.join("\t") + "\n");
+            process.stdout.write(row.join('\t') + '\n');
     }
 }
 function resolveColumnsForObject(obj, schema) {
@@ -365,7 +366,7 @@ function resolveColumnsForObject(obj, schema) {
 function writeKeyValue(obj, schema) {
     const cols = resolveColumnsForObject(obj, schema);
     if (cols.length === 0) {
-        process.stdout.write("(empty)\n");
+        process.stdout.write('(empty)\n');
         return;
     }
     if (process.stdout.isTTY) {
@@ -399,34 +400,34 @@ function emitError(err) {
         };
         if (hints.length > 0) {
             // JSON 输出压平成单行，更便于机器消费（脚本 / agent 拼字符串）
-            errObj.hint = hints.join(" ");
+            errObj.hint = hints.join(' ');
         }
-        if (typeof info.statement_index === "number") {
+        if (typeof info.statement_index === 'number') {
             errObj.statement_index = info.statement_index;
         }
         // PRD 多语句失败 envelope 额外字段：completed / rolled_back
         if (Array.isArray(info.completed)) {
             errObj.completed = info.completed;
         }
-        if (typeof info.rolled_back === "boolean") {
+        if (typeof info.rolled_back === 'boolean') {
             errObj.rolled_back = info.rolled_back;
         }
-        process.stderr.write(JSON.stringify({ error: errObj }) + "\n");
+        process.stderr.write(JSON.stringify({ error: errObj }) + '\n');
     }
     else {
         // stderr 染色：picocolors 默认按 stdout.isTTY 判断；stderr 通常也是 tty，
         // 这里复用 stdout 探测保持简单（stderr only-pipe 的极端场景留作后续优化）
         // 多语句失败时 Error 行末尾追加 "(at statement K of N)"，与 PRD spec 对齐
-        let errorLine = `${colors_1.c.fail("Error:")} ${info.message}`;
-        if (typeof info.statement_index === "number") {
+        let errorLine = `${colors_1.c.fail('Error:')} ${info.message}`;
+        if (typeof info.statement_index === 'number') {
             const k = info.statement_index + 1;
             const n = info.total_statements;
             errorLine +=
-                typeof n === "number" && n > 0
+                typeof n === 'number' && n > 0
                     ? ` (at statement ${String(k)} of ${String(n)})`
                     : ` (at statement ${String(k)})`;
         }
-        process.stderr.write(errorLine + "\n");
+        process.stderr.write(errorLine + '\n');
         // 多行 hint：第一行带 "hint:" 标签，后续行用 8 空格缩进对齐 "  hint: " 之后的列。
         // 对应 spec 期望的格式：
         //   Error: ...
@@ -434,7 +435,7 @@ function emitError(err) {
         //           第二条建议
         if (hints.length > 0) {
             const [first, ...rest] = hints;
-            process.stderr.write(`  ${colors_1.c.muted("hint:")} ${first}\n`);
+            process.stderr.write(`  ${colors_1.c.muted('hint:')} ${first}\n`);
             for (const line of rest) {
                 process.stderr.write(`        ${line}\n`);
             }
@@ -449,9 +450,30 @@ function emitOk(data) {
 function emitPaged(items, nextCursor, hasMore) {
     emit({ data: items, next_cursor: nextCursor, has_more: hasMore });
 }
+/**
+ * 把对象 / 数组里所有字符串 key 从 camelCase 转成 snake_case，递归处理嵌套对象。
+ * 后端 IDL 返回的 JSON 字段是 camelCase（`storageUsedBytes`），CLI 对外（PRD）
+ * 统一 snake_case（`storage_used_bytes`）；emit JSON 前过一遍这个函数。
+ */
+function snakeCaseKeys(input) {
+    if (Array.isArray(input)) {
+        return input.map((item) => snakeCaseKeys(item));
+    }
+    if (input !== null && typeof input === 'object') {
+        const out = {};
+        for (const [k, v] of Object.entries(input)) {
+            out[camelToSnake(k)] = snakeCaseKeys(v);
+        }
+        return out;
+    }
+    return input;
+}
+function camelToSnake(s) {
+    return s.replace(/[A-Z]/g, (m) => '_' + m.toLowerCase());
+}
 function toErrorInfo(err) {
     if (err instanceof error_1.AppError)
         return err.toJSON();
     const message = err instanceof Error ? err.message : String(err);
-    return { code: "UNKNOWN", message, retryable: false, next_actions: [] };
+    return { code: 'UNKNOWN', message, retryable: false, next_actions: [] };
 }

package/dist/utils/poll.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pollUntilDone = pollUntilDone;
+const error_1 = require("../utils/error");
+const spinner_1 = require("../utils/spinner");
+async function pollUntilDone(opts) {
+    const interval = opts.intervalMs ?? 1000;
+    const timeout = opts.timeoutMs ?? 300_000;
+    const deadline = Date.now() + timeout;
+    // 仅当传 spinnerLabel 时启动 spinner；非 TTY / JSON 模式内部自动 noop
+    const stopSpinner = opts.spinnerLabel ? (0, spinner_1.startSpinner)(opts.spinnerLabel) : () => undefined;
+    try {
+        // 立即拉一次（绝大多数轻量任务在 dataloom 端已是同步语义，第一次 fetch 就能拿到 success）
+        for (;;) {
+            const cur = await opts.fetch();
+            const verdict = opts.isDone(cur);
+            if (verdict.done)
+                return verdict.value;
+            if (Date.now() + interval > deadline) {
+                throw new error_1.AppError('TASK_TIMEOUT', `${opts.label} did not complete within ${String(Math.round(timeout / 1000))}s`, {
+                    next_actions: [
+                        'The task may still be running server-side. Retry the command, or check `miaoda db migration diff` to verify final state.',
+                    ],
+                });
+            }
+            await sleep(interval);
+        }
+    }
+    finally {
+        stopSpinner();
+    }
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}

package/dist/utils/render.js

@@ -28,7 +28,7 @@ const colors_1 = require("./colors");
 /** 将字节数格式化为人类可读（`24 KB` / `2.1 MB` / `1.5 GB`）。 */
 function formatSize(bytes) {
     if (!Number.isFinite(bytes) || bytes < 0)
-        return "—";
+        return '—';
     if (bytes >= 1 << 30)
         return `${(bytes / (1 << 30)).toFixed(1)} GB`;
     if (bytes >= 1 << 20)
@@ -40,7 +40,7 @@ function formatSize(bytes) {
 /** 将 ISO 时间转为 TTY 下更友好的相对时间；non-TTY 保持 ISO 原值。 */
 function formatTime(iso, isTty) {
     if (!iso)
-        return "—";
+        return '—';
     if (!isTty)
         return iso;
     const ts = Date.parse(iso);
@@ -65,8 +65,8 @@ function formatTime(iso, isTty) {
     // 超过 7 天，用 YYYY-MM-DD
     const date = new Date(ts);
     const y = String(date.getFullYear());
-    const mo = String(date.getMonth() + 1).padStart(2, "0");
-    const da = String(date.getDate()).padStart(2, "0");
+    const mo = String(date.getMonth() + 1).padStart(2, '0');
+    const da = String(date.getDate()).padStart(2, '0');
     return `${y}-${mo}-${da}`;
 }
 /**
@@ -103,7 +103,7 @@ function charWidth(cp) {
 }
 /** cell 可见字符宽度：剥离 ANSI 转义后按终端列宽逐字符累加（CJK 算 2 列）。 */
 function visibleWidth(s) {
-    const stripped = s.replace(ANSI_SGR_RE, "");
+    const stripped = s.replace(ANSI_SGR_RE, '');
     let w = 0;
     for (const c of stripped) {
         w += charWidth(c.codePointAt(0) ?? 0);
@@ -112,7 +112,7 @@ function visibleWidth(s) {
 }
 function padVisibleEnd(s, targetWidth) {
     const w = visibleWidth(s);
-    return w >= targetWidth ? s : s + " ".repeat(targetWidth - w);
+    return w >= targetWidth ? s : s + ' '.repeat(targetWidth - w);
 }
 /** 渲染 TTY 对齐表格（多行，列宽按最长内容；ANSI 转义不计入列宽）。
  *  表头按 spec 用 bold + cyan 染色；ANSI 序列由 visibleWidth 剥离不影响列宽。 */
@@ -120,7 +120,7 @@ function renderAlignedTable(headers, rows) {
     const colWidths = headers.map((h, i) => {
         let w = visibleWidth(h);
         for (const row of rows) {
-            const cw = visibleWidth(row[i] || "");
+            const cw = visibleWidth(row[i] || '');
             if (cw > w)
                 w = cw;
         }
@@ -129,34 +129,34 @@ function renderAlignedTable(headers, rows) {
     const lines = [];
     lines.push(headers
         .map((h, i) => colors_1.c.header(padVisibleEnd(h, colWidths[i])))
-        .join("  ")
+        .join('  ')
         .trimEnd());
     for (const row of rows) {
         lines.push(row
-            .map((cell, i) => padVisibleEnd(cell || "", colWidths[i]))
-            .join("  ")
+            .map((cell, i) => padVisibleEnd(cell || '', colWidths[i]))
+            .join('  ')
             .trimEnd());
     }
-    return lines.join("\n");
+    return lines.join('\n');
 }
 /** 渲染 non-TTY tab 分隔（字段原值，ISO 时间）。 */
 function renderTsv(headers, rows) {
     const lines = [];
-    lines.push(headers.join("\t"));
+    lines.push(headers.join('\t'));
     for (const row of rows) {
-        lines.push(row.join("\t"));
+        lines.push(row.join('\t'));
     }
-    return lines.join("\n");
+    return lines.join('\n');
 }
 /** 渲染 key-value 多行（用于 stat 等单条详情）。key 右对齐 + bold cyan 染色。 */
 function renderKeyValue(pairs, isTty) {
     if (pairs.length === 0)
-        return "";
+        return '';
     if (!isTty) {
-        return pairs.map(([k, v]) => `${k}\t${v}`).join("\n");
+        return pairs.map(([k, v]) => `${k}\t${v}`).join('\n');
     }
     const keyWidth = Math.max(...pairs.map(([k]) => k.length));
-    return pairs.map(([k, v]) => `${colors_1.c.header(k.padStart(keyWidth))}:  ${v}`).join("\n");
+    return pairs.map(([k, v]) => `${colors_1.c.header(k.padStart(keyWidth))}:  ${v}`).join('\n');
 }
 /** 通用 isTTY 判定（stdout 是否交互终端）。Node 运行时 isTTY 为 true 或 undefined；TS 类型上 tty.WriteStream 定义为固定 true，绕开做运行时判断。 */
 function isStdoutTty() {
@@ -170,15 +170,15 @@ function parseDuration(input) {
         throw new Error(`Invalid duration: ${input}`);
     }
     const n = Number(m[1]);
-    const unit = m[2] || "s";
+    const unit = m[2] || 's';
     switch (unit) {
-        case "s":
+        case 's':
             return n;
-        case "m":
+        case 'm':
             return n * 60;
-        case "h":
+        case 'h':
             return n * 3600;
-        case "d":
+        case 'd':
             return n * 86400;
         default:
             return n;
@@ -191,15 +191,15 @@ function parseSize(input) {
         throw new Error(`Invalid size: ${input}`);
     }
     const n = Number(m[1]);
-    const unit = (m[2] || "B").toUpperCase();
+    const unit = (m[2] || 'B').toUpperCase();
     switch (unit) {
-        case "B":
+        case 'B':
             return Math.round(n);
-        case "KB":
+        case 'KB':
             return Math.round(n * 1024);
-        case "MB":
+        case 'MB':
             return Math.round(n * 1024 * 1024);
-        case "GB":
+        case 'GB':
             return Math.round(n * 1024 * 1024 * 1024);
         default:
             return Math.round(n);

package/dist/utils/spinner.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startSpinner = startSpinner;
+const config_1 = require("./config");
+/**
+ * TTY 友好的 loading 指示器，写到 stderr 上避免污染 stdout（保证 --json 输出干净）。
+ *
+ * 设计：
+ *   - 仅 stderr.isTTY 且非 --json 模式启用；其他情况静默（CI / 管道 / JSON 输出场景）
+ *   - 80ms 一帧 braille 旋转字符 + 累计 elapsed 秒数
+ *   - 返回 stop() 函数；调用方 finally 里调用，无论成功失败都清掉 spinner 行
+ *
+ * 用法：
+ *   const stop = startSpinner('Applying migration to online');
+ *   try { await someLongTask(); } finally { stop(); }
+ */
+const FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const HIDE_CURSOR = '[?25l';
+const SHOW_CURSOR = '[?25h';
+const CLEAR_LINE = '\r';
+function startSpinner(label) {
+    // 非 TTY / JSON 模式：静默 noop，避免污染管道与结构化输出
+    if (!process.stderr.isTTY || (0, config_1.getConfig)().json) {
+        return () => {
+            /* noop */
+        };
+    }
+    let frame = 0;
+    const start = Date.now();
+    process.stderr.write(HIDE_CURSOR);
+    const render = () => {
+        const elapsedSec = Math.round((Date.now() - start) / 1000);
+        process.stderr.write(`${CLEAR_LINE}${FRAMES[frame]} ${label}... ${String(elapsedSec)}s`);
+        frame = (frame + 1) % FRAMES.length;
+    };
+    render();
+    const timer = setInterval(render, 80);
+    let stopped = false;
+    return () => {
+        if (stopped)
+            return;
+        stopped = true;
+        clearInterval(timer);
+        process.stderr.write(`${CLEAR_LINE}${SHOW_CURSOR}`);
+    };
+}