@silverbulletmd/silverbullet 2.5.3 → 2.7.0

package/plug-api/constants.ts

@@ -8,3 +8,23 @@ export const wrongSpacePathError: Error = new Error(
 );
 export const pingTimeout: number = 2000;
 export const pingInterval: number = 5000;
+
+/**
+ * Determines if an error thrown by fetch() is a network-level error
+ * (as opposed to a server-side or application error).
+ *
+ * Browser-specific error messages when there is no internet connection:
+ * - Firefox: "NetworkError when attempting to fetch resource"
+ * - Safari (service worker): "FetchEvent.respondWith received an error: TypeError: Load failed"
+ * - Safari (no service worker): "Load failed"
+ * - Chrome: "Failed to fetch"
+ */
+export function isNetworkError(e: any): boolean {
+  const msg = (e?.message || "").toLowerCase();
+  return (
+    msg.includes("fetch") ||
+    msg.includes("load failed") ||
+    msg.includes("networkerror") ||
+    msg.includes("unavailable")
+  );
+}

package/plug-api/lib/async.ts

@@ -1,6 +1,9 @@
-export function throttle(func: () => void, limit: number): () => void {
+export function throttle(
+  func: () => void,
+  limit: number,
+): (() => void) & { flush(): void } {
   let timer: any = null;
-  return () => {
+  const throttled = () => {
     if (!timer) {
       timer = setTimeout(() => {
         func();
@@ -8,6 +11,15 @@ export function throttle(func: () => void, limit: number): () => void {
       }, limit);
     }
   };
+  // Immediately execute any pending call and cancel the timer
+  throttled.flush = () => {
+    if (timer) {
+      clearTimeout(timer);
+      timer = null;
+      func();
+    }
+  };
+  return throttled;
 }
 
 export function throttleImmediately(
@@ -38,7 +50,7 @@ export function timeout(ms: number): Promise<never> {
   return new Promise((_resolve, reject) =>
     setTimeout(() => {
       reject(new Error("timeout"));
-    }, ms)
+    }, ms),
   );
 }
 
@@ -58,7 +70,7 @@ export class PromiseQueue {
     return new Promise((resolve, reject) => {
       this.queue.push({ fn, resolve, reject });
       if (!this.processing) {
-        this.process();
+        void this.process();
       }
     });
   }
@@ -79,7 +91,7 @@ export class PromiseQueue {
       reject(error);
     }
 
-    this.process(); // Continue processing the next promise in the queue
+    void this.process(); // Continue processing the next promise in the queue
   }
 }
 
@@ -105,7 +117,8 @@ export async function batchRequests<I, O>(
   const batchResults = await Promise.all(batches.map(fn));
   // Flatten the results
   for (const batchResult of batchResults) {
-    if (Array.isArray(batchResult)) { // If fn returns an array, collect them
+    if (Array.isArray(batchResult)) {
+      // If fn returns an array, collect them
       results.push(...batchResult);
     }
   }

package/plug-api/lib/crypto.ts

@@ -42,9 +42,8 @@ export async function hashSHA256(
 ): Promise<string> {
   // Transform the string into an ArrayBuffer
   const encoder = new TextEncoder();
-  const data: Uint8Array = typeof message === "string"
-    ? encoder.encode(message)
-    : message;
+  const data: Uint8Array =
+    typeof message === "string" ? encoder.encode(message) : message;
 
   // Generate the hash
   const hashBuffer = await globalThis.crypto.subtle.digest(
@@ -53,9 +52,9 @@ export async function hashSHA256(
   );
 
   // Transform the hash into a hex string
-  return Array.from(new Uint8Array(hashBuffer)).map((b) =>
-    b.toString(16).padStart(2, "0")
-  ).join("");
+  return Array.from(new Uint8Array(hashBuffer))
+    .map((b) => b.toString(16).padStart(2, "0"))
+    .join("");
 }
 
 /**

package/plug-api/lib/dates.ts

@@ -3,11 +3,19 @@ export function niceDate(d: Date): string {
 }
 
 export function localDateString(d: Date): string {
-  return d.getFullYear() +
-    "-" + String(d.getMonth() + 1).padStart(2, "0") +
-    "-" + String(d.getDate()).padStart(2, "0") +
-    "T" + String(d.getHours()).padStart(2, "0") +
-    ":" + String(d.getMinutes()).padStart(2, "0") +
-    ":" + String(d.getSeconds()).padStart(2, "0") +
-    "." + String(d.getMilliseconds()).padStart(3, "0");
+  return (
+    d.getFullYear() +
+    "-" +
+    String(d.getMonth() + 1).padStart(2, "0") +
+    "-" +
+    String(d.getDate()).padStart(2, "0") +
+    "T" +
+    String(d.getHours()).padStart(2, "0") +
+    ":" +
+    String(d.getMinutes()).padStart(2, "0") +
+    ":" +
+    String(d.getSeconds()).padStart(2, "0") +
+    "." +
+    String(d.getMilliseconds()).padStart(3, "0")
+  );
 }

package/plug-api/lib/json.ts

@@ -52,11 +52,17 @@ export function deepEqual(a: any, b: any): boolean {
 export function cleanStringDate(d: Date): string {
   // If no significant time, return a date string only
   if (
-    d.getUTCHours() === 0 && d.getUTCMinutes() === 0 && d.getUTCSeconds() === 0
+    d.getUTCHours() === 0 &&
+    d.getUTCMinutes() === 0 &&
+    d.getUTCSeconds() === 0
   ) {
-    return d.getUTCFullYear() + "-" +
-      String(d.getUTCMonth() + 1).padStart(2, "0") + "-" +
-      String(d.getUTCDate()).padStart(2, "0");
+    return (
+      d.getUTCFullYear() +
+      "-" +
+      String(d.getUTCMonth() + 1).padStart(2, "0") +
+      "-" +
+      String(d.getUTCDate()).padStart(2, "0")
+    );
   } else {
     return d.toISOString();
   }

package/plug-api/lib/ref.ts

@@ -23,7 +23,8 @@ export type Ref = {
   details?:
     | { type: "position"; pos: number }
     | { type: "linecolumn"; line: number; column: number }
-    | { type: "header"; header: string };
+    | { type: "header"; header: string }
+    | { type: "anchor"; name: string };
 };
 
 /**
@@ -77,8 +78,9 @@ export function isValidName(name: string): boolean {
   // If the name, parses as a link and doesn't provide any other info we can be
   // sure it was only parsed as a path and that the path then conforms to all
   // the requirements
-  return !!ref && !ref.details && !ref.meta && name !== "" &&
-    encodeRef(ref) === name;
+  return (
+    !!ref && !ref.details && !ref.meta && name !== "" && encodeRef(ref) === name
+  );
 }
 
 /**
@@ -95,7 +97,7 @@ export function isValidPath(path: string): path is Path {
  * TO THE INNER WORKINGS OF SILVERBULLET AND CHANGES COULD INTRODUCE MAJOR BUGS
  */
 const refRegex =
-  /^(?<meta>\^)?(?<path>(?!.*\.[a-zA-Z0-9]+\.md$)(?!\/?(\.|\^))(?!.*(?:\/|^)\.{1,2}(?:\/|$)|.*\/{2})(?!.*(?:\]\]|\[\[))[^@#|<>]*)(@(?<pos>\d+)|@[Ll](?<line>\d+)(?:[Cc](?<col>\d+))?|#\s*(?<header>.*))?$/;
+  /^(?<meta>\^)?(?<path>(?!.*\.[a-zA-Z0-9]+\.md$)(?!\/?(\.|\^))(?!.*(?:\/|^)\.{1,2}(?:\/|$)|.*\/{2})(?!.*(?:\]\]|\[\[))[^@#|<>$]*)(@(?<pos>\d+)|@[Ll](?<line>\d+)(?:[Cc](?<col>\d+))?|#\s*(?<header>.*)|\$(?<anchor>[A-Za-z_][A-Za-z0-9_/:-]*))?$/;
 
 /**
  * Parses a reference string into a ref object.
@@ -131,6 +133,8 @@ export function parseToRef(stringRef: string): Ref | null {
       type: "header",
       header: groups.header,
     };
+  } else if (groups.anchor !== undefined) {
+    ref.details = { type: "anchor", name: groups.anchor };
   }
 
   return ref;
@@ -157,6 +161,8 @@ export function encodeRef(ref: Ref): string {
     stringRef += `@${ref.details.pos}`;
   } else if (ref.details?.type === "header") {
     stringRef += `#${ref.details.header}`;
+  } else if (ref.details?.type === "anchor") {
+    stringRef += `$${ref.details.name}`;
   }
 
   return stringRef;
@@ -190,6 +196,8 @@ export function getOffsetFromRef(
     case "header": {
       return getOffsetFromHeader(parseTree, ref.details.header);
     }
+    case "anchor":
+      return -1;
   }
 }
 
@@ -206,23 +214,22 @@ export function getOffsetFromHeader(
   parseTree: ParseTree,
   header: string,
 ): number {
-  const node = findNodeMatching(
-    parseTree,
-    (subTree) => {
-      if (!subTree.type || !subTree.type.startsWith("ATXHeading")) {
-        return false;
-      }
-
-      const mark = findNodeOfType(subTree, "HeaderMark");
-      if (!mark || mark.from === undefined || mark.to === undefined) {
-        return false;
-      }
-
-      return renderToText(subTree)
+  const node = findNodeMatching(parseTree, (subTree) => {
+    if (!subTree.type || !subTree.type.startsWith("ATXHeading")) {
+      return false;
+    }
+
+    const mark = findNodeOfType(subTree, "HeaderMark");
+    if (!mark || mark.from === undefined || mark.to === undefined) {
+      return false;
+    }
+
+    return (
+      renderToText(subTree)
         .slice(mark.to - mark.from)
-        .trimStart() === header.trim();
-    },
-  );
+        .trimStart() === header.trim()
+    );
+  });
 
   if (!node) {
     return -1;

package/plug-api/lib/resolve.ts

@@ -4,9 +4,11 @@ import type { Path } from "@silverbulletmd/silverbullet/lib/ref";
  * Determines wether a url points into the world wide web or to the local SB instance
  */
 export function isLocalURL(url: string): boolean {
-  return !url.includes("://") &&
+  return (
+    !url.includes("://") &&
     !url.startsWith("mailto:") &&
-    !url.startsWith("tel:");
+    !url.startsWith("tel:")
+  );
 }
 
 /**
@@ -22,10 +24,7 @@ export function fileName(name: string | Path): string | Path {
   return name.split("/").pop()!;
 }
 
-const builtinPrefixes = [
-  "tag:",
-  "search:",
-];
+const builtinPrefixes = ["tag:", "search:"];
 
 /**
  * Builtin pages are pages which SB should automatically consider as existing
@@ -51,11 +50,8 @@ export function resolveMarkdownLink(
   if (relative.startsWith("/")) {
     return relative.slice(1);
   } else {
-    const splitAbsolute = absolute
-      .split("/")
-      .slice(0, -1);
-    const splitRelative = relative
-      .split("/");
+    const splitAbsolute = absolute.split("/").slice(0, -1);
+    const splitRelative = relative.split("/");
 
     while (splitRelative && splitRelative[0] === "..") {
       splitAbsolute.pop();

package/plug-api/lib/shortcut.ts

@@ -0,0 +1,16 @@
+export const isMacLike = typeof navigator !== "undefined" &&
+  /(Mac|iPhone|iPod|iPad)/i.test(navigator.platform);
+
+export function prettifyShortcut(shortcut: string): string {
+  if (!isMacLike) return shortcut;
+  const pretty = shortcut
+    .replace(/Mod-/g, "⌘")
+    .replace(/Cmd-/g, "⌘")
+    .replace(/Ctrl-/g, "⌃")
+    .replace(/Alt-/g, "⌥")
+    .replace(/Shift-/g, "⇧");
+  return pretty.replace(
+    /([⌘⌃⌥⇧])([a-z])$/,
+    (_, mod, key) => mod + key.toUpperCase(),
+  );
+}

package/plug-api/lib/tags.ts

@@ -1,15 +1,24 @@
+/** Check if a tag marks a page as a meta page (exact "meta" or "meta/..." subtag) */
+export function isMetaTag(tag: string): boolean {
+  return tag === "meta" || tag.startsWith("meta/");
+}
+
 /** Extract the name from hashtag text, removing # prefix and <angle brackets> if necessary */
 export function extractHashtag(text: string): string {
-  if (text[0] !== "#") { // you shouldn't call this function at all
+  if (text[0] !== "#") {
+    // you shouldn't call this function at all
     console.error("extractHashtag called on already clean string", text);
     return text;
   } else if (text[1] === "<") {
-    if (text.slice(-1) !== ">") { // this is malformed: #<name but maybe we're trying to autocomplete
+    if (text.slice(-1) !== ">") {
+      // this is malformed: #<name but maybe we're trying to autocomplete
       return text.slice(2);
-    } else { // this is correct #<name>
+    } else {
+      // this is correct #<name>
       return text.slice(2, -1);
     }
-  } else { // this is just #name
+  } else {
+    // this is just #name
     return text.slice(1);
   }
 }

package/plug-api/lib/transclusion.ts

@@ -1,7 +1,3 @@
-import {
-  isLocalURL,
-  resolveMarkdownLink,
-} from "@silverbulletmd/silverbullet/lib/resolve";
 import {
   mdLinkRegex,
   wikiLinkRegex,
@@ -34,9 +30,10 @@ export type ContentDimensions = {
  * Parse an alias, possibly containing dimensions into an object
  * @example "alias", "alias|100", "alias|100x200", "100", "100x200"
  */
-export function parseDimensionFromAlias(
-  text: string,
-): { alias: string; dimension?: ContentDimensions } {
+export function parseDimensionFromAlias(text: string): {
+  alias: string;
+  dimension?: ContentDimensions;
+} {
   let alias: string;
   let dim: ContentDimensions | undefined;
   if (text.includes("|")) {
@@ -71,10 +68,8 @@ export function parseDimensionFromAlias(
  * Parses a transclusion of the type `![[]]` or `![]()`
  * @param text
  */
-export function parseTransclusion(
-  text: string,
-): Transclusion | null {
-  let url, alias ;
+export function parseTransclusion(text: string): Transclusion | null {
+  let url, alias;
   let linktype: LinkType = "markdownlink";
   // TODO: Take in the tree and use tree nodes to get url and alias (Applies to all regex uses)
   mdLinkRegex.lastIndex = 0;
@@ -83,12 +78,6 @@ export function parseTransclusion(
   if ((match = mdLinkRegex.exec(text)) && match.groups) {
     ({ url, title: alias } = match.groups);
 
-    if (isLocalURL(url)) {
-      url = resolveMarkdownLink(
-        client.currentName(),
-        decodeURI(url),
-      );
-    }
     linktype = "markdownlink";
   } else if ((match = wikiLinkRegex.exec(text)) && match.groups) {
     ({ stringRef: url, alias } = match.groups);