gangtise-openapi-cli 0.10.5 → 0.10.7

package/dist/src/cli.js

@@ -86,7 +86,7 @@ async function printData(data, format, output, cache) {
     }
     if (normalized && typeof normalized === "object" && !Array.isArray(normalized)) {
         const meta = normalized;
-        if (typeof meta.total === "number") {
+        if (typeof meta.total === "number" && format !== "json") {
             const listLen = Array.isArray(meta.list) ? meta.list.length : 0;
             process.stderr.write(`Total: ${meta.total}, showing: ${listLen}\n`);
         }
@@ -193,19 +193,25 @@ async function saveDownloadResult(result, fallbackName, output) {
 }
 const POLL_MAX_ATTEMPTS = 12;
 const POLL_DELAY_MS = 15_000;
+function isAsyncPending(error) {
+    return error instanceof ApiError && error.code === "410110";
+}
 async function pollAsyncContent(client, getContentEndpoint, dataId, format, output) {
     for (let attempt = 1; attempt <= POLL_MAX_ATTEMPTS; attempt++) {
         try {
             const result = await client.call(getContentEndpoint, { dataId });
-            if (result?.content) {
+            if (result?.content != null) {
                 await printData(result, format, output);
                 return true;
             }
         }
         catch (error) {
-            if (!(error instanceof ApiError && (error.code === "410110" || error.message?.includes("生成中")))) {
-                throw error;
+            if (error instanceof ApiError && error.code === "410111") {
+                process.stderr.write("Content generation failed (terminal). Do not retry.\n");
+                return false;
             }
+            if (!isAsyncPending(error))
+                throw error;
         }
         if (attempt < POLL_MAX_ATTEMPTS) {
             process.stderr.write(`Attempt ${attempt}/${POLL_MAX_ATTEMPTS}: content not ready, retrying in 15s...\n`);
@@ -214,22 +220,24 @@ async function pollAsyncContent(client, getContentEndpoint, dataId, format, outp
     }
     return false;
 }
-function checkAsyncContent(client, getContentEndpoint, dataId, format, output) {
-    return (async () => {
-        try {
-            const result = await client.call(getContentEndpoint, { dataId });
-            if (result?.content) {
-                await printData(result, format, output);
-                return;
-            }
+async function checkAsyncContent(client, getContentEndpoint, dataId, format, output) {
+    try {
+        const result = await client.call(getContentEndpoint, { dataId });
+        if (result?.content != null) {
+            await printData(result, format, output);
+            return;
         }
-        catch (error) {
-            if (!(error instanceof ApiError && (error.code === "410110" || error.message?.includes("生成中")))) {
-                throw error;
-            }
+    }
+    catch (error) {
+        if (error instanceof ApiError && error.code === "410111") {
+            process.stderr.write("Content generation failed (terminal). Do not retry.\n");
+            process.exitCode = 1;
+            return;
         }
-        process.stdout.write(`${JSON.stringify({ dataId, status: "pending", hint: "Content not ready yet, retry in ~2 minutes" })}\n`);
-    })();
+        if (!isAsyncPending(error))
+            throw error;
+    }
+    process.stdout.write(`${JSON.stringify({ dataId, status: "pending", hint: "Content not ready yet, retry in ~2 minutes" })}\n`);
 }
 function addTimeFilters(command) {
     return command
@@ -438,9 +446,25 @@ fundamental.command("main-business").requiredOption("--security-code <code>").op
     const client = await createClient();
     await printData(await client.call("fundamental.main-business", { securityCode: options.securityCode, startDate: options.startDate, endDate: options.endDate, breakdown: options.breakdown, periodList: maybeArray(options.period), fieldList: maybeArray(options.field) }), parseFormat(options.format), options.output);
 });
-fundamental.command("valuation-analysis").requiredOption("--security-code <code>").addOption(new Option("--indicator <name>", "Indicator").choices(["peTtm", "pbMrq", "peg", "psTtm", "pcfTtm", "em"]).makeOptionMandatory()).option("--start-date <date>").option("--end-date <date>").option("--limit <number>").option("--field <field>", "Field", collectList, []).option("--format <format>", "Output format", "table").option("--output <path>").action(async (options) => {
-    const client = await createClient();
-    await printData(await client.call("fundamental.valuation-analysis", { securityCode: options.securityCode, indicator: options.indicator, startDate: options.startDate, endDate: options.endDate, limit: options.limit ? Number(options.limit) : undefined, fieldList: maybeArray(options.field) }), parseFormat(options.format), options.output);
+fundamental.command("valuation-analysis").requiredOption("--security-code <code>").addOption(new Option("--indicator <name>", "Indicator").choices(["peTtm", "pbMrq", "peg", "psTtm", "pcfTtm", "em"]).makeOptionMandatory()).option("--start-date <date>").option("--end-date <date>").option("--limit <number>").option("--field <field>", "Field", collectList, []).option("--skip-null", "Drop rows where value or percentileRank is null").option("--format <format>", "Output format", "table").option("--output <path>").action(async (options) => {
+    const client = await createClient();
+    let data = await client.call("fundamental.valuation-analysis", { securityCode: options.securityCode, indicator: options.indicator, startDate: options.startDate, endDate: options.endDate, limit: options.limit ? Number(options.limit) : undefined, fieldList: maybeArray(options.field) });
+    if (options.skipNull) {
+        const normalized = await normalizeRows(data);
+        if (normalized && typeof normalized === "object" && !Array.isArray(normalized)) {
+            const rec = normalized;
+            if (Array.isArray(rec.list)) {
+                const filtered = rec.list.filter((row) => {
+                    if (!row || typeof row !== "object")
+                        return false;
+                    const r = row;
+                    return r.value != null && r.percentileRank != null;
+                });
+                data = { ...rec, list: filtered, total: filtered.length };
+            }
+        }
+    }
+    await printData(data, parseFormat(options.format), options.output);
 });
 fundamental.command("earning-forecast").requiredOption("--security-code <code>").option("--start-date <date>", "Start date (default: 1 year before end-date)").option("--end-date <date>", "End date (default: today)").option("--consensus <name>", "Consensus indicator: netIncome/netIncomeYoy/eps/pe/bps/pb/peg/roe/ps", collectList, []).option("--format <format>", "Output format", "table").option("--output <path>").action(async (options) => {
     const client = await createClient();

package/dist/src/version.js

@@ -1,2 +1,2 @@
 // Auto-generated — DO NOT EDIT
-export const CLI_VERSION = "0.10.5";
+export const CLI_VERSION = "0.10.7";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gangtise-openapi-cli",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "description": "CLI for Gangtise OpenAPI",
   "license": "MIT",
   "repository": {