mnemospark 0.5.0 → 0.6.0

package/dist/cli.js

@@ -2890,7 +2890,14 @@ import { CronExpressionParser } from "cron-parser";
 var LS_NAME_DISPLAY_MAX = 72;
 var LS_PAY_DISPLAY_MAX = 28;
 var LS_CRON_ID_MAX = 14;
-var LS_TIME_FIELD_WIDTH = 12;
+var LS_S3_COL_WIDTH = 12;
+var LS_NEXT_COL_WIDTH = Math.max(LS_S3_COL_WIDTH, "NEXT PAYMENT DATE".length);
+var HDR_SIZE = "SIZE";
+var HDR_S3_TIME = "S3_TIME";
+var HDR_CRON_JOB = "CRON JOB";
+var HDR_NEXT_PAYMENT = "NEXT PAYMENT DATE";
+var HDR_AMOUNT_DUE = "AMOUNT DUE";
+var HDR_FILE_OR_KEY = "FILE NAME OR OBJECT-KEY";
 var MONTHS_SHORT = [
   "Jan",
   "Feb",
@@ -2905,14 +2912,14 @@ var MONTHS_SHORT = [
   "Nov",
   "Dec"
 ];
-function formatLsTimeFieldUtc(iso, now) {
-  const placeholder = "         -  ".slice(0, LS_TIME_FIELD_WIDTH);
+function formatLsTimeFieldUtc(iso, now, fieldWidth = LS_S3_COL_WIDTH) {
+  const placeholder = "         -  ".slice(0, fieldWidth);
   if (!iso) {
-    return placeholder.padEnd(LS_TIME_FIELD_WIDTH, " ");
+    return placeholder.padEnd(fieldWidth, " ");
   }
   const d = new Date(iso);
   if (Number.isNaN(d.getTime())) {
-    return placeholder.padEnd(LS_TIME_FIELD_WIDTH, " ");
+    return placeholder.padEnd(fieldWidth, " ");
   }
   const mon = MONTHS_SHORT[d.getUTCMonth()] ?? "???";
   const day = String(d.getUTCDate()).padStart(2, " ");
@@ -2926,7 +2933,7 @@ function formatLsTimeFieldUtc(iso, now) {
   } else {
     core = `${mon} ${day}  ${y}`;
   }
-  return core.padEnd(LS_TIME_FIELD_WIDTH, " ");
+  return core.padEnd(fieldWidth, " ");
 }
 function truncateEnd(value, max) {
   if (value.length <= max) {
@@ -2966,18 +2973,26 @@ function formatPaymentCell(amount, network, maxWidth) {
   return truncateEnd(s, maxWidth).padStart(maxWidth, " ");
 }
 function formatNextCronUtc(schedule, cronStatus, now) {
-  const blank = "         -  ".slice(0, LS_TIME_FIELD_WIDTH).padEnd(LS_TIME_FIELD_WIDTH, " ");
+  const blank = "         -  ".slice(0, LS_NEXT_COL_WIDTH).padEnd(LS_NEXT_COL_WIDTH, " ");
   if (cronStatus !== "active") {
     return blank;
   }
   try {
     const expr = CronExpressionParser.parse(schedule, { tz: "UTC", currentDate: now });
     const next = expr.next().toDate();
-    return formatLsTimeFieldUtc(next.toISOString(), now);
+    return formatLsTimeFieldUtc(next.toISOString(), now, LS_NEXT_COL_WIDTH);
   } catch {
-    return "?".padEnd(LS_TIME_FIELD_WIDTH, " ");
+    return "?".padEnd(LS_NEXT_COL_WIDTH, " ");
   }
 }
+function buildLsProseIntro(bucket) {
+  return [
+    "\u2601\uFE0F mnemospark cloud files",
+    `S3 bucket: ${bucket}`,
+    "The columns: CRON JOB, NEXT PAYMENT DATE, AMOUNT DUE, FILE NAME are from this host's mnemospark SQLite catalog",
+    "mnemospark cloud only stores the OBJECT-KEY for privacy"
+  ];
+}
 async function prepareRows(objects, walletAddress, datastore, now) {
   const sorted = [...objects].sort((a, b) => {
     const ta = a.last_modified ? Date.parse(a.last_modified) : Number.NaN;
@@ -3000,9 +3015,9 @@ async function prepareRows(objects, walletAddress, datastore, now) {
     const friendly = await datastore.findLatestFriendlyNameForObjectKey(walletAddress, obj.key);
     const cp = await datastore.findCronAndPaymentForObjectKey(walletAddress, obj.key);
     const sizeStr = formatBytesForDisplay(obj.size_bytes);
-    const s3time = formatLsTimeFieldUtc(obj.last_modified, now);
+    const s3time = formatLsTimeFieldUtc(obj.last_modified, now, LS_S3_COL_WIDTH);
     let cronIdDisp = null;
-    let nextRun = "         -  ".slice(0, LS_TIME_FIELD_WIDTH).padEnd(LS_TIME_FIELD_WIDTH, " ");
+    let nextRun = "         -  ".slice(0, LS_NEXT_COL_WIDTH).padEnd(LS_NEXT_COL_WIDTH, " ");
     let payCell = "";
     if (cp) {
       cronIdDisp = cp.cronId;
@@ -3013,10 +3028,6 @@ async function prepareRows(objects, walletAddress, datastore, now) {
     }
     const nameRaw = friendly ? `${friendly} (${obj.key})` : obj.key;
     rows.push({
-      perm: "----------",
-      ln: " 1",
-      user: "-       ",
-      grp: "-       ",
       sizeStr,
       s3time,
       cronIdRaw: cronIdDisp,
@@ -3028,68 +3039,57 @@ async function prepareRows(objects, walletAddress, datastore, now) {
   return rows;
 }
 function columnWidths(rows) {
-  let sizeW = 4;
-  let cronW = 4;
-  let payW = 3;
+  let sizeW = HDR_SIZE.length;
+  let s3W = Math.max(LS_S3_COL_WIDTH, HDR_S3_TIME.length);
+  let nextW = LS_NEXT_COL_WIDTH;
+  let cronW = HDR_CRON_JOB.length;
+  let payW = HDR_AMOUNT_DUE.length;
   for (const r of rows) {
     sizeW = Math.max(sizeW, r.sizeStr.length);
+    s3W = Math.max(s3W, r.s3time.length);
+    nextW = Math.max(nextW, r.nextRun.length);
     const cid = r.cronIdRaw ? truncateEnd(r.cronIdRaw, LS_CRON_ID_MAX) : "";
     cronW = Math.max(cronW, cid.length || 1);
     payW = Math.max(payW, r.payRaw.length);
   }
-  cronW = Math.min(Math.max(cronW, 4), LS_CRON_ID_MAX);
-  payW = Math.min(Math.max(payW, 3), LS_PAY_DISPLAY_MAX);
-  return { sizeW, cronW, payW };
+  cronW = Math.min(Math.max(cronW, HDR_CRON_JOB.length), LS_CRON_ID_MAX);
+  payW = Math.min(Math.max(payW, HDR_AMOUNT_DUE.length), LS_PAY_DISPLAY_MAX);
+  return { sizeW, s3W, cronW, nextW, payW };
 }
 function renderRow(r, w) {
   const cronPadded = formatCronIdCell(r.cronIdRaw, w.cronW);
-  const sizePadded = r.sizeStr.padStart(w.sizeW, " ");
-  const payPadded = r.payRaw.padStart(w.payW, " ");
   return [
-    r.perm,
-    r.ln,
-    r.user,
-    r.grp,
-    sizePadded,
-    r.s3time,
+    r.sizeStr.padStart(w.sizeW, " "),
+    r.s3time.padEnd(w.s3W, " "),
     cronPadded,
-    r.nextRun,
-    payPadded,
+    r.nextRun.padEnd(w.nextW, " "),
+    r.payRaw.padStart(w.payW, " "),
     r.nameRaw
   ].join(" ");
 }
 function renderHeader(w) {
   return [
-    "PERM      ",
-    "LN",
-    "USER    ",
-    "GRP     ",
-    "SIZE".padStart(w.sizeW, " "),
-    "S3_TIME     ".slice(0, LS_TIME_FIELD_WIDTH).padEnd(LS_TIME_FIELD_WIDTH, " "),
-    "CRON".padStart(w.cronW, " "),
-    "NEXT        ".slice(0, LS_TIME_FIELD_WIDTH).padEnd(LS_TIME_FIELD_WIDTH, " "),
-    "PAY".padStart(w.payW, " "),
-    "NAME"
+    HDR_SIZE.padStart(w.sizeW, " "),
+    HDR_S3_TIME.padEnd(w.s3W, " "),
+    HDR_CRON_JOB.padStart(w.cronW, " "),
+    HDR_NEXT_PAYMENT.padEnd(w.nextW, " "),
+    HDR_AMOUNT_DUE.padStart(w.payW, " "),
+    HDR_FILE_OR_KEY
   ].join(" ");
 }
 async function buildMnemosparkLsMessage(result, ctx) {
   const now = ctx.now ?? /* @__PURE__ */ new Date();
   if (isStorageLsListResponse(result)) {
-    const disclaimer2 = "Names, cron, and payment columns come from this machine's SQLite catalog when available; `-` means unknown locally. S3 is authoritative for which keys exist.";
-    const legend2 = "Legend: S3_TIME and NEXT are UTC. NEXT is the next cron fire from the stored expression.";
-    const bucketLine = `bucket: ${result.bucket}`;
-    const sortLine = "sorted by: S3 last_modified descending (missing dates last), then key ascending.";
+    const intro = buildLsProseIntro(result.bucket);
     if (result.objects.length === 0) {
-      const lines = [disclaimer2, "", bucketLine, "", "No objects in this bucket."];
-      return lines.join("\n");
+      return [...intro, "", "No objects in this bucket."].join("\n");
     }
     const rows = await prepareRows(result.objects, ctx.walletAddress, ctx.datastore, now);
     const w2 = columnWidths(rows);
     const header2 = renderHeader(w2);
     const bodyLines = rows.map((r) => renderRow(r, w2));
-    const totalLine = `total ${String(result.objects.length)}`;
     const truncLine = result.is_truncated ? "List truncated; more objects in bucket." : null;
-    const prose2 = [disclaimer2, legend2, bucketLine, sortLine, totalLine, truncLine].filter((x) => Boolean(x)).join("\n");
+    const prose2 = [...intro, ...truncLine ? [truncLine] : []].join("\n");
     const fence2 = ["```", [header2, ...bodyLines].join("\n"), "```"].join("\n");
     return `${prose2}
 
@@ -3101,10 +3101,10 @@ ${fence2}`;
   );
   const cp = await ctx.datastore.findCronAndPaymentForObjectKey(ctx.walletAddress, result.key);
   const sizeStr = formatBytesForDisplay(result.size_bytes);
-  const s3time = formatLsTimeFieldUtc(void 0, now);
+  const s3time = formatLsTimeFieldUtc(void 0, now, LS_S3_COL_WIDTH);
   let payCell = formatPaymentCell(null, null, LS_PAY_DISPLAY_MAX);
   let cronIdDisp = null;
-  let nextRun = "         -  ".slice(0, LS_TIME_FIELD_WIDTH).padEnd(LS_TIME_FIELD_WIDTH, " ");
+  let nextRun = "         -  ".slice(0, LS_NEXT_COL_WIDTH).padEnd(LS_NEXT_COL_WIDTH, " ");
   if (cp) {
     cronIdDisp = cp.cronId;
     nextRun = formatNextCronUtc(cp.schedule, cp.cronStatus, now);
@@ -3116,10 +3116,6 @@ ${fence2}`;
     8
   );
   const prep = {
-    perm: "----------",
-    ln: " 1",
-    user: "-       ",
-    grp: "-       ",
     sizeStr,
     s3time,
     cronIdRaw: cronIdDisp,
@@ -3130,11 +3126,10 @@ ${fence2}`;
   const w = columnWidths([prep]);
   const header = renderHeader(w);
   const line = renderRow(prep, w);
-  const disclaimer = "Names, cron, and payment columns come from this machine's SQLite catalog when available; `-` means unknown locally.";
-  const legend = "Legend: S3_TIME and NEXT are UTC.";
-  const prose = [disclaimer, legend, `bucket: ${result.bucket}`, ""].join("\n");
+  const prose = buildLsProseIntro(result.bucket).join("\n");
   const fence = ["```", [header, line].join("\n"), "```"].join("\n");
   return `${prose}
+
 ${fence}`;
 }