fluncle 0.72.0 → 0.73.0

package/bin/fluncle.mjs

@@ -380,6 +380,107 @@ function formatError(error) {
   }
   return String(error);
 }
+function parseDuration(input) {
+  const trimmed = input.trim();
+  if (!trimmed) {
+    return null;
+  }
+  if (trimmed.includes(":")) {
+    const parts = trimmed.split(":");
+    if (parts.length !== 2 && parts.length !== 3) {
+      return null;
+    }
+    const nums = parts.map((part) => Number(part));
+    if (nums.some((n) => !Number.isFinite(n) || n < 0)) {
+      return null;
+    }
+    if (parts.length === 3) {
+      const [hours, minutes2, seconds2] = nums;
+      if (hours === undefined || minutes2 === undefined || seconds2 === undefined) {
+        return null;
+      }
+      if (minutes2 >= 60 || seconds2 >= 60) {
+        return null;
+      }
+      return Math.round((hours * 3600 + minutes2 * 60 + seconds2) * 1000);
+    }
+    const [minutes, seconds] = nums;
+    if (minutes === undefined || seconds === undefined) {
+      return null;
+    }
+    if (seconds >= 60) {
+      return null;
+    }
+    return Math.round((minutes * 60 + seconds) * 1000);
+  }
+  const value = Number(trimmed);
+  return Number.isFinite(value) && value >= 0 ? value : null;
+}
+function isRemix(title) {
+  return REMIX_MARKER.test(title);
+}
+function stripVersionSuffix(title) {
+  const parts = title.split(/\s+-\s+/);
+  if (parts.length > 1 && VERSION_MARKER.test(parts[parts.length - 1] ?? "")) {
+    return parts.slice(0, -1).join(" - ").trim();
+  }
+  return title.trim();
+}
+function tokenize(value) {
+  return value.toLowerCase().normalize("NFKD").replace(/[̀-ͯ]/g, "").replace(/[^a-z0-9]+/g, " ").trim().split(" ").filter(Boolean);
+}
+function versionTokens(title) {
+  const parts = title.split(/\s+-\s+/);
+  const tail = parts.length > 1 ? parts[parts.length - 1] ?? "" : "";
+  if (parts.length > 1 && VERSION_MARKER.test(tail)) {
+    return new Set(tokenize(tail));
+  }
+  const bracketed = /[([]([^)\]]*?)[)\]]/.exec(title);
+  if (bracketed?.[1] && VERSION_MARKER.test(bracketed[1])) {
+    return new Set(tokenize(bracketed[1]));
+  }
+  return new Set;
+}
+function versionMatches(findingTitle, candidateTitle) {
+  const findingIsRemix = isRemix(findingTitle);
+  const candidateIsRemix = isRemix(candidateTitle);
+  if (findingIsRemix) {
+    if (!candidateIsRemix) {
+      return false;
+    }
+    const want = [...versionTokens(findingTitle)].filter((t) => !VERSION_STOPWORDS.has(t));
+    if (want.length === 0) {
+      return true;
+    }
+    const have = versionTokens(candidateTitle);
+    for (const token of want) {
+      if (!have.has(token)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return !candidateIsRemix;
+}
+function baseTitleMatches(findingTitle, candidateTitle) {
+  const want = new Set(tokenize(stripVersionSuffix(findingTitle)));
+  const have = new Set(tokenize(stripVersionSuffix(candidateTitle)));
+  if (want.size === 0) {
+    return false;
+  }
+  for (const token of want) {
+    if (!have.has(token)) {
+      return false;
+    }
+  }
+  return true;
+}
+var VERSION_MARKER, REMIX_MARKER, VERSION_STOPWORDS;
+var init_util = __esm(() => {
+  VERSION_MARKER = /\b(mix|edit|version|remix|dub|vip|bootleg|rework|re-?edit|flip|refix|remaster(?:ed)?|instrumental)\b/i;
+  REMIX_MARKER = /\b(remix|bootleg|vip|rework|re-?edit|flip|refix)\b/i;
+  VERSION_STOPWORDS = new Set(["mix", "the", "and", "feat", "ft", "edit", "version", "remix"]);
+});
 
 // src/output.ts
 function isJsonFailure(value) {
@@ -423,7 +524,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.72.0".trim() ? "0.72.0".trim() : "0.1.0";
+  currentVersion = "0.73.0".trim() ? "0.73.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -1431,43 +1532,8 @@ function parseCueSheet(text) {
   }
   return entries;
 }
-function parseDuration(input) {
-  const trimmed = input.trim();
-  if (!trimmed) {
-    return null;
-  }
-  if (trimmed.includes(":")) {
-    const parts = trimmed.split(":");
-    if (parts.length !== 2 && parts.length !== 3) {
-      return null;
-    }
-    const nums = parts.map((part) => Number(part));
-    if (nums.some((n) => !Number.isFinite(n) || n < 0)) {
-      return null;
-    }
-    if (parts.length === 3) {
-      const [hours, minutes2, seconds2] = nums;
-      if (hours === undefined || minutes2 === undefined || seconds2 === undefined) {
-        return null;
-      }
-      if (minutes2 >= 60 || seconds2 >= 60) {
-        return null;
-      }
-      return Math.round((hours * 3600 + minutes2 * 60 + seconds2) * 1000);
-    }
-    const [minutes, seconds] = nums;
-    if (minutes === undefined || seconds === undefined) {
-      return null;
-    }
-    if (seconds >= 60) {
-      return null;
-    }
-    return Math.round((minutes * 60 + seconds) * 1000);
-  }
-  const value = Number(trimmed);
-  return Number.isFinite(value) && value >= 0 ? value : null;
-}
 var init_mixtapes = __esm(() => {
+  init_util();
   init_api();
   init_output();
 });
@@ -1765,7 +1831,7 @@ function buildBody2(options) {
     body.soundcloudUrl = options.soundcloudUrl;
   }
   if (options.durationMs !== undefined) {
-    const parsed = parseDuration2(options.durationMs);
+    const parsed = parseDuration(options.durationMs);
     if (parsed === null) {
       throw new CliError2("invalid_duration", "Duration must be mm:ss or h:mm:ss, or a millisecond count");
     }
@@ -1821,7 +1887,7 @@ function parseCueSheet2(text) {
       if (time === undefined || ref === undefined) {
         continue;
       }
-      const startMs = parseDuration2(time);
+      const startMs = parseDuration(time);
       if (startMs === null) {
         continue;
       }
@@ -1832,43 +1898,8 @@ function parseCueSheet2(text) {
   }
   return entries;
 }
-function parseDuration2(input) {
-  const trimmed = input.trim();
-  if (!trimmed) {
-    return null;
-  }
-  if (trimmed.includes(":")) {
-    const parts = trimmed.split(":");
-    if (parts.length !== 2 && parts.length !== 3) {
-      return null;
-    }
-    const nums = parts.map((part) => Number(part));
-    if (nums.some((n) => !Number.isFinite(n) || n < 0)) {
-      return null;
-    }
-    if (parts.length === 3) {
-      const [hours, minutes2, seconds2] = nums;
-      if (hours === undefined || minutes2 === undefined || seconds2 === undefined) {
-        return null;
-      }
-      if (minutes2 >= 60 || seconds2 >= 60) {
-        return null;
-      }
-      return Math.round((hours * 3600 + minutes2 * 60 + seconds2) * 1000);
-    }
-    const [minutes, seconds] = nums;
-    if (minutes === undefined || seconds === undefined) {
-      return null;
-    }
-    if (seconds >= 60) {
-      return null;
-    }
-    return Math.round((minutes * 60 + seconds) * 1000);
-  }
-  const value = Number(trimmed);
-  return Number.isFinite(value) && value >= 0 ? value : null;
-}
 var init_mixtapes2 = __esm(() => {
+  init_util();
   init_api();
   init_output();
 });
@@ -1881,7 +1912,9 @@ function artistTitle(track) {
   return `${track.artists.join(", ")} — ${track.title}`;
 }
 var COORD_FALLBACK = "—";
-var init_format = () => {};
+var init_format = __esm(() => {
+  init_util();
+});
 
 // src/interactive.ts
 import { createInterface } from "node:readline/promises";
@@ -2388,12 +2421,13 @@ async function meCommand() {
   if (!me.user) {
     throw new Error("Your sign-in expired. Run `fluncle login` to link this device again.");
   }
+  const user = me.user;
   return {
     collectedCount: progress.collectedLogIds.length,
     deaths: progress.deaths,
-    joinedAt: me.user.createdAt,
-    name: me.user.displayUsername ?? me.user.username ?? "cosmonaut",
-    userId: me.user.id,
+    joinedAt: user.createdAt,
+    name: user.displayUsername ?? user.username ?? "cosmonaut",
+    userId: user.id,
     wins: progress.wins
   };
 }
@@ -2559,7 +2593,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.72.0".trim() ? "0.72.0".trim() : "0.1.0";
+  currentVersion2 = "0.73.0".trim() ? "0.73.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -3581,73 +3615,6 @@ var init_admin_tracks = __esm(() => {
   init_recent2();
 });
 
-// src/version-match.ts
-function isRemix(title) {
-  return REMIX_MARKER.test(title);
-}
-function stripVersionSuffix(title) {
-  const parts = title.split(/\s+-\s+/);
-  if (parts.length > 1 && VERSION_MARKER.test(parts[parts.length - 1] ?? "")) {
-    return parts.slice(0, -1).join(" - ").trim();
-  }
-  return title.trim();
-}
-function tokenize(value) {
-  return value.toLowerCase().normalize("NFKD").replace(/[̀-ͯ]/g, "").replace(/[^a-z0-9]+/g, " ").trim().split(" ").filter(Boolean);
-}
-function versionTokens(title) {
-  const parts = title.split(/\s+-\s+/);
-  const tail = parts.length > 1 ? parts[parts.length - 1] ?? "" : "";
-  if (parts.length > 1 && VERSION_MARKER.test(tail)) {
-    return new Set(tokenize(tail));
-  }
-  const bracketed = /[([]([^)\]]*?)[)\]]/.exec(title);
-  if (bracketed?.[1] && VERSION_MARKER.test(bracketed[1])) {
-    return new Set(tokenize(bracketed[1]));
-  }
-  return new Set;
-}
-function versionMatches(findingTitle, candidateTitle) {
-  const findingIsRemix = isRemix(findingTitle);
-  const candidateIsRemix = isRemix(candidateTitle);
-  if (findingIsRemix) {
-    if (!candidateIsRemix) {
-      return false;
-    }
-    const want = [...versionTokens(findingTitle)].filter((t) => !VERSION_STOPWORDS.has(t));
-    if (want.length === 0) {
-      return true;
-    }
-    const have = versionTokens(candidateTitle);
-    for (const token of want) {
-      if (!have.has(token)) {
-        return false;
-      }
-    }
-    return true;
-  }
-  return !candidateIsRemix;
-}
-function baseTitleMatches(findingTitle, candidateTitle) {
-  const want = new Set(tokenize(stripVersionSuffix(findingTitle)));
-  const have = new Set(tokenize(stripVersionSuffix(candidateTitle)));
-  if (want.size === 0) {
-    return false;
-  }
-  for (const token of want) {
-    if (!have.has(token)) {
-      return false;
-    }
-  }
-  return true;
-}
-var VERSION_MARKER, REMIX_MARKER, VERSION_STOPWORDS;
-var init_version_match = __esm(() => {
-  VERSION_MARKER = /\b(mix|edit|version|remix|dub|vip|bootleg|rework|re-?edit|flip|refix|remaster(?:ed)?|instrumental)\b/i;
-  REMIX_MARKER = /\b(remix|bootleg|vip|rework|re-?edit|flip|refix)\b/i;
-  VERSION_STOPWORDS = new Set(["mix", "the", "and", "feat", "ft", "edit", "version", "remix"]);
-});
-
 // src/commands/preview-archive.ts
 var exports_preview_archive = {};
 __export(exports_preview_archive, {
@@ -3844,8 +3811,8 @@ function normalize(value) {
 }
 var DURATION_TOLERANCE_S = 5;
 var init_preview_archive = __esm(() => {
+  init_util();
   init_api();
-  init_version_match();
 });
 
 // src/commands/mixtape-youtube.ts
@@ -4854,7 +4821,9 @@ function trackDetailLines(track) {
   return lines;
 }
 var COORD_FALLBACK2 = "—";
-var init_format2 = () => {};
+var init_format2 = __esm(() => {
+  init_util();
+});
 
 // src/cli.ts
 import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
@@ -6966,6 +6935,10 @@ function toJsonFailure(error) {
     ok: false
   };
 }
+
+// src/retry.ts
+init_util();
+
 // src/cli.ts
 function createProgram() {
   const program2 = configureCommand(new Command);

package/package.json

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