nolo-cli 0.1.21 → 0.1.23

package/tableCommands.ts

@@ -1,4 +1,5 @@
 import { DEFAULT_NOLO_SERVER_URL } from "./defaultServer";
+import { includeTableActivityColumns } from "./render/table/activityColumns";
 
 type EnvLike = Record<string, string | undefined>;
 type OutputLike = { write(chunk: string): unknown };
@@ -34,10 +35,24 @@ function parseJsonOption<T>(args: string[], flag: string): T | undefined {
   }
 }
 
+function parseJsonOptionAlias<T>(args: string[], primaryFlag: string, aliasFlag: string): T | undefined {
+  const primary = readOption(args, primaryFlag);
+  const alias = readOption(args, aliasFlag);
+  const raw = primary || alias;
+  if (!raw) return undefined;
+  try {
+    return JSON.parse(raw) as T;
+  } catch (error) {
+    const usedFlag = primary ? primaryFlag : aliasFlag;
+    throw new Error(`${usedFlag} must be valid JSON: ${error instanceof Error ? error.message : String(error)}`);
+  }
+}
+
 function parseOutputMode(raw: string): OutputMode {
   if (!raw) return "full";
+  if (raw === "json") return "raw";
   if (raw === "full" || raw === "raw" || raw === "items" || raw === "jsonl") return raw;
-  throw new Error(`--output must be one of full, raw, items, jsonl; got ${raw}`);
+  throw new Error(`--output must be one of full, raw, items, json, jsonl; got ${raw}`);
 }
 
 function parseTableArg(raw: string): { tenantId?: string; tableId?: string } {
@@ -94,10 +109,26 @@ function formatOutput(input: { envelope: any; rawData: any; mode: OutputMode }):
   return Array.isArray(items) ? items.map((item) => JSON.stringify(item)).join("\n") : JSON.stringify(items);
 }
 
+function mergeQueryShortcutFilters(args: string[], filters: Record<string, unknown> | undefined): Record<string, unknown> | undefined {
+  const row = readOption(args, "--row") || readOption(args, "--row-id");
+  const rowDbKey = readOption(args, "--row-dbkey");
+  const shortcutFilters: Record<string, unknown> = {};
+  if (row) {
+    if (row.startsWith("row-")) shortcutFilters.dbKey = row;
+    else shortcutFilters.rowId = row;
+  }
+  if (rowDbKey) shortcutFilters.dbKey = rowDbKey;
+  if (Object.keys(shortcutFilters).length === 0) return filters;
+  return {
+    ...(filters ?? {}),
+    ...shortcutFilters,
+  };
+}
+
 function usage(): string {
   return [
     "Usage:",
-    "  nolo table query --table <tableId|metaKey> [--tenant-id <userId>] [--filters <json>] [--columns <json-array>] [--no-base-fields] [--output full|raw|items|jsonl]",
+    "  nolo table query --table <tableId|metaKey> [--tenant-id <userId>] [--filters <json>|--filter <json>] [--row <rowId|rowDbKey>] [--columns <json-array>] [--include-activity] [--no-base-fields] [--output full|raw|items|json|jsonl]",
     "",
   ].join("\n");
 }
@@ -117,7 +148,10 @@ export async function runTableQueryCommand(args: string[], deps: TableCommandDep
   try {
     outputMode = parseOutputMode(readOption(args, "--output"));
     columns = parseJsonOption<string[]>(args, "--columns");
-    filters = parseJsonOption<Record<string, unknown>>(args, "--filters");
+    filters = mergeQueryShortcutFilters(
+      args,
+      parseJsonOptionAlias<Record<string, unknown>>(args, "--filters", "--filter")
+    );
   } catch (error) {
     output.write(`[nolo] table query failed: ${error instanceof Error ? error.message : String(error)}\n`);
     return 1;
@@ -127,6 +161,7 @@ export async function runTableQueryCommand(args: string[], deps: TableCommandDep
   const authToken = resolveAuthToken(args, env);
   const tenantId = readOption(args, "--tenant-id") || tableArg.tenantId || env.USER_ID || parseJwtTenantId(authToken);
   const tableId = tableArg.tableId;
+  const hasSingleRowShortcut = Boolean(readOption(args, "--row") || readOption(args, "--row-id") || readOption(args, "--row-dbkey"));
   if (!tenantId || !tableId) {
     output.write(usage());
     return 1;
@@ -149,9 +184,11 @@ export async function runTableQueryCommand(args: string[], deps: TableCommandDep
         tenantId,
         tableId,
         filters: filters ?? {},
-        columns,
+        columns: hasFlag(args, "--include-activity")
+          ? includeTableActivityColumns(columns)
+          : columns,
         includeBaseFields: !hasFlag(args, "--no-base-fields"),
-        limit: Number(readOption(args, "--limit") || 20),
+        limit: Number(readOption(args, "--limit") || (hasSingleRowShortcut ? 1 : 20)),
         offset: Number(readOption(args, "--offset") || 0),
         sortBy: readOption(args, "--sort-by") || "updatedAt",
         sortOrder: readOption(args, "--sort-order") === "asc" ? "asc" : "desc",