fluncle 0.47.0 → 0.48.0

package/bin/fluncle.mjs

@@ -2497,7 +2497,24 @@ var require_main = __commonJS((exports, module) => {
   module.exports = DotenvModule;
 });
 
+// ../../packages/contracts/src/util.ts
+function formatDuration(durationMs) {
+  const totalSeconds = Math.round(durationMs / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes}:${seconds.toString().padStart(2, "0")}`;
+}
+function formatError(error) {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return String(error);
+}
+
 // src/output.ts
+function isJsonFailure(value) {
+  return typeof value === "object" && value !== null && typeof value.code === "string" && typeof value.message === "string";
+}
 function printJson2(value) {
   console.log(JSON.stringify(value, null, 2));
 }
@@ -2539,7 +2556,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.47.0".trim() ? "0.47.0".trim() : "0.1.0";
+  currentVersion = "0.48.0".trim() ? "0.48.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -2727,11 +2744,20 @@ import { homedir as homedir2 } from "node:os";
 import { join as join2 } from "node:path";
 function loadEnv(keys) {
   loadConfig();
-  const missing = keys.filter((key) => !process.env[key]);
+  const result = {};
+  const missing = [];
+  for (const key of keys) {
+    const value = process.env[key];
+    if (value === undefined) {
+      missing.push(key);
+      continue;
+    }
+    result[key] = value;
+  }
   if (missing.length > 0) {
     throw new Error(`Missing required env vars: ${missing.join(", ")}`);
   }
-  return Object.fromEntries(keys.map((key) => [key, process.env[key]]));
+  return result;
 }
 function getApiBaseUrl() {
   loadConfig();
@@ -2833,7 +2859,7 @@ async function apiRequest(path, init = {}) {
   const text = await response.text();
   const data = parseJson(text);
   if (!response.ok) {
-    const failure = data;
+    const failure = isJsonFailure(data) ? data : undefined;
     throw new CliError2(failure?.code ?? `http_${response.status}`, failure?.message ?? `${response.status} ${response.statusText}`);
   }
   return data;
@@ -3485,6 +3511,7 @@ function artistTitle(track) {
   return `${track.artists.join(", ")} — ${track.title}`;
 }
 var COORD_FALLBACK = "—";
+var init_format = () => {};
 
 // src/interactive.ts
 import { createInterface } from "node:readline/promises";
@@ -3732,6 +3759,7 @@ function buildSelectorLines(tracks, selectedIndex, columns) {
 }
 var TELEGRAM_APP_URI = "tg://resolve?domain=fluncle", SPOTIFY_PLAYLIST_OPEN_URL, SELECT_NON_INTERACTIVE_MESSAGE = "fluncle open requires an interactive terminal. Use fluncle recent to list tracks.";
 var init_open = __esm(() => {
+  init_format();
   init_interactive();
   init_output();
   init_recent2();
@@ -4001,7 +4029,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.47.0".trim() ? "0.47.0".trim() : "0.1.0";
+  currentVersion2 = "0.48.0".trim() ? "0.48.0".trim() : "0.1.0";
 });
 
 // src/commands/track.ts
@@ -5221,12 +5249,6 @@ function vehicleRows(rows) {
     return `${coordinate2(row).padEnd(coordWidth)}  ${foundDate(row.addedAt)}  ${row.vehicle ?? COORD_FALLBACK2}`;
   });
 }
-function formatDuration(durationMs) {
-  const totalSeconds = Math.round(durationMs / 1000);
-  const minutes = Math.floor(totalSeconds / 60);
-  const seconds = totalSeconds % 60;
-  return `${minutes}:${seconds.toString().padStart(2, "0")}`;
-}
 function trackDetailLines(track) {
   const lines = [`${coordinate2(track)}  ${artistTitle2(track)}`];
   const meta = [];
@@ -5242,6 +5264,7 @@ function trackDetailLines(track) {
   return lines;
 }
 var COORD_FALLBACK2 = "—";
+var init_format2 = () => {};
 
 // src/cli.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
@@ -5325,15 +5348,6 @@ function toJsonFailure(error) {
     ok: false
   };
 }
-
-// src/retry.ts
-function formatError(error) {
-  if (error instanceof Error) {
-    return error.message;
-  }
-  return String(error);
-}
-
 // src/cli.ts
 function createProgram() {
   const program2 = configureCommand(new Command);
@@ -6088,7 +6102,7 @@ async function runRecent(options, recentCommand3) {
   if (options.limit === undefined && !options.json && process.stdout.isTTY === true && process.stdin.isTTY === true) {
     const { fetchRecentPage: fetchRecentPage2 } = await Promise.resolve().then(() => (init_recent(), exports_recent));
     const { paginateWithKeyboard: paginateWithKeyboard2 } = await Promise.resolve().then(() => (init_interactive2(), exports_interactive));
-    const { trackRows: trackRows3 } = await Promise.resolve().then(() => exports_format);
+    const { trackRows: trackRows3 } = await Promise.resolve().then(() => (init_format2(), exports_format));
     await paginateWithKeyboard2({
       emptyMessage: "No findings logged yet.",
       fetchPage: async (cursor) => {
@@ -6116,7 +6130,7 @@ async function runRecent(options, recentCommand3) {
     console.log("No findings logged yet.");
     return;
   }
-  const { trackRows: trackRows2 } = await Promise.resolve().then(() => exports_format);
+  const { trackRows: trackRows2 } = await Promise.resolve().then(() => (init_format2(), exports_format));
   console.log(trackRows2(tracks).join(`
 `));
 }
@@ -6130,7 +6144,7 @@ async function runMixtapes(options, mixtapesCommand2) {
     console.log("No mixtapes logged yet.");
     return;
   }
-  const { trackRows: trackRows2 } = await Promise.resolve().then(() => exports_format);
+  const { trackRows: trackRows2 } = await Promise.resolve().then(() => (init_format2(), exports_format));
   console.log(trackRows2(mixtapes).join(`
 `));
 }
@@ -6158,7 +6172,7 @@ async function runAdminQueue(options, queueCommand2) {
     console.log("Every finding has a video. Nothing in the render queue.");
     return;
   }
-  const { trackRows: trackRows2 } = await Promise.resolve().then(() => exports_format);
+  const { trackRows: trackRows2 } = await Promise.resolve().then(() => (init_format2(), exports_format));
   const noun = tracks.length === 1 ? "finding" : "findings";
   console.log(`${tracks.length} ${noun} awaiting a video, oldest first:`);
   console.log(trackRows2(tracks).join(`
@@ -6178,7 +6192,7 @@ async function runAdminContextQueue(options, contextQueueCommand2) {
     console.log("Every finding has its field notes. Nothing waiting on context.");
     return;
   }
-  const { trackRows: trackRows2 } = await Promise.resolve().then(() => exports_format);
+  const { trackRows: trackRows2 } = await Promise.resolve().then(() => (init_format2(), exports_format));
   const noun = tracks.length === 1 ? "finding" : "findings";
   console.log(`${tracks.length} ${noun} missing field notes, oldest first:`);
   console.log(trackRows2(tracks).join(`
@@ -6198,7 +6212,7 @@ async function runAdminObserveQueue(options, observeQueueCommand2) {
     console.log("Every finding with notes has its observation. Nothing waiting on a voice.");
     return;
   }
-  const { trackRows: trackRows2 } = await Promise.resolve().then(() => exports_format);
+  const { trackRows: trackRows2 } = await Promise.resolve().then(() => (init_format2(), exports_format));
   const noun = tracks.length === 1 ? "finding" : "findings";
   console.log(`${tracks.length} ${noun} awaiting an observation, oldest first:`);
   console.log(trackRows2(tracks).join(`
@@ -6218,7 +6232,7 @@ async function runAdminEnrichQueue(options, enrichQueueCommand2) {
     console.log("Nothing awaiting enrichment. Every finding is enriched.");
     return;
   }
-  const { trackRows: trackRows2 } = await Promise.resolve().then(() => exports_format);
+  const { trackRows: trackRows2 } = await Promise.resolve().then(() => (init_format2(), exports_format));
   const noun = tracks.length === 1 ? "finding" : "findings";
   console.log(`${tracks.length} ${noun} needing (re-)enrichment, oldest first:`);
   console.log(trackRows2(tracks).join(`
@@ -6267,7 +6281,7 @@ async function runAdminVehicles(options, vehiclesCommand2) {
     console.log("No videos rendered yet.");
     return;
   }
-  const { vehicleRows: vehicleRows2 } = await Promise.resolve().then(() => exports_format);
+  const { vehicleRows: vehicleRows2 } = await Promise.resolve().then(() => (init_format2(), exports_format));
   console.log("Recent video vehicles, newest first:");
   console.log(vehicleRows2(vehicles).join(`
 `));
@@ -6309,7 +6323,7 @@ async function runRandom(options, randomCommand2) {
     });
     return;
   }
-  const { trackDetailLines: trackDetailLines2 } = await Promise.resolve().then(() => exports_format);
+  const { trackDetailLines: trackDetailLines2 } = await Promise.resolve().then(() => (init_format2(), exports_format));
   console.log(trackDetailLines2(track).join(`
 `));
   if (track.note) {

package/package.json

@@ -31,5 +31,5 @@
     "url": "git+https://github.com/mauricekleine/fluncle.git"
   },
   "type": "module",
-  "version": "0.47.0"
+  "version": "0.48.0"
 }