applesauce-content 4.0.0 → 6.0.0

package/dist/helpers/index.d.ts

@@ -1,2 +1 @@
-export * from "./regexp.js";
 export * from "./media.js";

package/dist/helpers/index.js

@@ -1,2 +1 @@
-export * from "./regexp.js";
 export * from "./media.js";

package/dist/helpers/media.d.ts

@@ -1,3 +1,3 @@
-import { MediaAttachment } from "applesauce-core/helpers/file-metadata";
+import { MediaAttachment } from "applesauce-common/helpers/file-metadata";
 /** Returns all URLs in a content string that contain a sha256 hash */
 export declare function getMediaAttachmentURLsFromContent(content: string): MediaAttachment[];

package/dist/helpers/media.js

@@ -1,5 +1,5 @@
-import { getSha256FromURL } from "applesauce-core/helpers/file-metadata";
-import { Tokens } from "./regexp.js";
+import { getSha256FromURL } from "applesauce-common/helpers/file-metadata";
+import { Tokens } from "applesauce-core/helpers/regexp";
 /** Returns all URLs in a content string that contain a sha256 hash */
 export function getMediaAttachmentURLsFromContent(content) {
     return (Array.from(content.matchAll(Tokens.link))

package/dist/markdown/blossom.d.ts

@@ -0,0 +1,9 @@
+import { ParsedBlossomURI } from "applesauce-common/helpers/blossom";
+import { Link, Nodes } from "mdast";
+import { Transformer } from "unified";
+export interface BlossomMdastLink extends Link {
+    type: "link";
+    data: ParsedBlossomURI;
+}
+/** Finds and creates BUD-10 `blossom:` URI links in a mdast tree */
+export declare function remarkBlossomURIs(): Transformer<Nodes>;

package/dist/markdown/blossom.js

@@ -0,0 +1,22 @@
+import { parseBlossomURI } from "applesauce-common/helpers/blossom";
+import { Tokens } from "applesauce-core/helpers/regexp";
+import { findAndReplace } from "mdast-util-find-and-replace";
+/** Finds and creates BUD-10 `blossom:` URI links in a mdast tree */
+export function remarkBlossomURIs() {
+    return (tree) => {
+        findAndReplace(tree, [
+            Tokens.blossom,
+            (raw) => {
+                const parsed = parseBlossomURI(raw);
+                if (!parsed)
+                    return false;
+                return {
+                    type: "link",
+                    data: parsed,
+                    url: raw,
+                    children: [{ type: "text", value: raw }],
+                };
+            },
+        ]);
+    };
+}

package/dist/markdown/index.d.ts

@@ -1 +1,2 @@
 export * from "./mentions.js";
+export * from "./blossom.js";

package/dist/markdown/index.js

@@ -1 +1,2 @@
 export * from "./mentions.js";
+export * from "./blossom.js";

package/dist/markdown/mentions.js

@@ -1,6 +1,6 @@
+import { decodePointer } from "applesauce-core/helpers/pointers";
+import { Tokens } from "applesauce-core/helpers/regexp";
 import { findAndReplace } from "mdast-util-find-and-replace";
-import { decode } from "nostr-tools/nip19";
-import { Tokens } from "../helpers/regexp.js";
 export function remarkNostrMentions() {
     return (tree) => {
         findAndReplace(tree, [
@@ -9,7 +9,7 @@ export function remarkNostrMentions() {
                 try {
                     return {
                         type: "link",
-                        data: decode($1),
+                        data: decodePointer($1),
                         children: [],
                         url: "nostr:" + $1,
                     };

package/dist/nast/truncate.js

@@ -13,6 +13,9 @@ export function truncateContent(tree, maxLength = 256) {
             case "cashu":
                 length += node.raw.length;
                 break;
+            case "blossom":
+                length += node.raw.length;
+                break;
             case "gallery":
                 length += node.links.reduce((t, l) => t + l.length, 0);
                 break;

package/dist/nast/types.d.ts

@@ -1,7 +1,7 @@
 import { type Token } from "@cashu/cashu-ts";
-import { type DecodeResult } from "applesauce-core/helpers";
-import { type ParsedInvoice } from "applesauce-core/helpers/bolt11";
-import { type EventTemplate, type NostrEvent } from "nostr-tools";
+import { type ParsedInvoice } from "applesauce-common/helpers/bolt11";
+import { type EventTemplate, type NostrEvent } from "applesauce-core/helpers/event";
+import { type DecodeResult } from "applesauce-core/helpers/pointers";
 import { type Parent, type Node as UnistNode } from "unist";
 export interface CommonData {
     eol?: boolean;
@@ -53,6 +53,21 @@ export interface Emoji extends Node {
     url: string;
     tag: ["emoji", ...string[]];
 }
+export interface BlossomURI extends Node {
+    type: "blossom";
+    /** The original matched text, e.g. `blossom:<hash>.pdf?xs=...` */
+    raw: string;
+    /** 64 character lowercase hex sha256 hash of the blob */
+    sha256: string;
+    /** File extension without the leading dot */
+    ext: string;
+    /** Optional exact blob size in bytes */
+    size?: number;
+    /** Server hints from repeated `xs` query parameters */
+    servers: string[];
+    /** Author hex pubkeys from repeated `as` query parameters */
+    authors: string[];
+}
 export interface ContentMap {
     text: Text;
     link: Link;
@@ -62,6 +77,7 @@ export interface ContentMap {
     hashtag: Hashtag;
     emoji: Emoji;
     gallery: Gallery;
+    blossom: BlossomURI;
 }
 export type Content = ContentMap[keyof ContentMap];
 export interface Root extends Parent {

package/dist/text/blossom.d.ts

@@ -0,0 +1,4 @@
+import { Transformer } from "unified";
+import { Root } from "../nast/types.js";
+/** Finds and creates BUD-10 blossom URI nodes in the tree */
+export declare function blossomURIs(): Transformer<Root>;

package/dist/text/blossom.js

@@ -0,0 +1,23 @@
+import { parseBlossomURI } from "applesauce-common/helpers/blossom";
+import { Tokens } from "applesauce-core/helpers/regexp";
+import { findAndReplace } from "../nast/find-and-replace.js";
+/** Finds and creates BUD-10 blossom URI nodes in the tree */
+export function blossomURIs() {
+    return (tree) => {
+        findAndReplace(tree, [
+            [
+                Tokens.blossom,
+                (raw) => {
+                    const parsed = parseBlossomURI(raw);
+                    if (!parsed)
+                        return false;
+                    return {
+                        type: "blossom",
+                        raw,
+                        ...parsed,
+                    };
+                },
+            ],
+        ]);
+    };
+}

package/dist/text/cashu.js

@@ -1,5 +1,5 @@
 import { getDecodedToken } from "@cashu/cashu-ts";
-import { Tokens } from "../helpers/regexp.js";
+import { Tokens } from "applesauce-core/helpers/regexp";
 import { findAndReplace } from "../nast/find-and-replace.js";
 /** Parse cashu tokens from an ATS tree */
 export function cashuTokens() {

package/dist/text/content.d.ts

@@ -1,5 +1,5 @@
 import { Transformer } from "unified";
-import { EventTemplate, NostrEvent } from "nostr-tools";
+import { EventTemplate, NostrEvent } from "applesauce-core/helpers/event";
 import { Root } from "../nast/types.js";
 import { galleries } from "./gallery.js";
 export declare const TextNoteContentSymbol: unique symbol;

package/dist/text/content.js

@@ -9,9 +9,11 @@ import { galleries } from "./gallery.js";
 import { lightningInvoices } from "./lightning.js";
 import { eolMetadata } from "../nast/eol-metadata.js";
 import { links } from "./links.js";
+import { blossomURIs } from "./blossom.js";
 export const TextNoteContentSymbol = Symbol.for("text-note-content");
 // default kind 1 transformers
 export const textNoteTransformers = [
+    blossomURIs,
     links,
     nostrMentions,
     galleries,
@@ -48,6 +50,5 @@ export function getParsedContent(event, content, transformers = textNoteTransfor
     });
 }
 export function removeParsedTextContent(event) {
-    // @ts-expect-error
-    delete event[TextNoteContentSymbol];
+    Reflect.deleteProperty(event, TextNoteContentSymbol);
 }

package/dist/text/emoji.js

@@ -1,5 +1,5 @@
-import { getEmojiTag } from "applesauce-core/helpers/emoji";
-import { Tokens } from "../helpers/regexp.js";
+import { getEmojiTag } from "applesauce-common/helpers/emoji";
+import { Tokens } from "applesauce-core/helpers/regexp";
 import { findAndReplace } from "../nast/find-and-replace.js";
 /** Finds and creates emoji nodes in the tree */
 export function emojis() {

package/dist/text/gallery.d.ts

@@ -1,4 +1,8 @@
 import { Transformer } from "unified";
 import { Root } from "../nast/types.js";
+export interface GalleriesOptions {
+    /** When true, adjacent `blossom:` image URIs are clustered alongside HTTP image links. Defaults to false. */
+    includeBlossom?: boolean;
+}
 /** Group images into galleries in an ATS tree */
-export declare function galleries(types?: string[]): Transformer<Root>;
+export declare function galleries(types?: string[], options?: GalleriesOptions): Transformer<Root>;

package/dist/text/gallery.js

@@ -1,21 +1,23 @@
 import { convertToUrl, getURLFilename, IMAGE_EXT } from "applesauce-core/helpers/url";
 /** Group images into galleries in an ATS tree */
-export function galleries(types = IMAGE_EXT) {
+export function galleries(types = IMAGE_EXT, options = {}) {
+    const { includeBlossom = false } = options;
     return (tree) => {
-        let links = [];
+        let items = [];
+        const getItemHref = (item) => (item.type === "link" ? item.href : item.raw);
         const commit = (index) => {
             // only create a gallery if there are more than a single image
-            if (links.length > 1) {
-                const start = tree.children.indexOf(links[0]);
-                const end = tree.children.indexOf(links[links.length - 1]);
+            if (items.length > 1) {
+                const start = tree.children.indexOf(items[0]);
+                const end = tree.children.indexOf(items[items.length - 1]);
                 // replace all nodes with a gallery
-                tree.children.splice(start, 1 + end - start, { type: "gallery", links: links.map((l) => l.href) });
-                links = [];
+                tree.children.splice(start, 1 + end - start, { type: "gallery", links: items.map(getItemHref) });
+                items = [];
                 // return new cursor
                 return end - 1;
             }
             else {
-                links = [];
+                items = [];
                 return index;
             }
         };
@@ -26,13 +28,21 @@ export function galleries(types = IMAGE_EXT) {
                     const url = convertToUrl(node.href);
                     const filename = getURLFilename(url);
                     if (filename && types.some((ext) => filename.endsWith(ext))) {
-                        links.push(node);
+                        items.push(node);
                     }
                     else {
                         i = commit(i);
                     }
                 }
-                else if (node.type === "text" && links.length > 0) {
+                else if (node.type === "blossom" && includeBlossom) {
+                    if (types.some((ext) => ext === `.${node.ext.toLowerCase()}`)) {
+                        items.push(node);
+                    }
+                    else {
+                        i = commit(i);
+                    }
+                }
+                else if (node.type === "text" && items.length > 0) {
                     const isEmpty = node.value === "\n" || !node.value.match(/[^\s]/g);
                     if (!isEmpty)
                         i = commit(i);

package/dist/text/hashtag.js

@@ -1,5 +1,5 @@
-import { getHashtagTag } from "applesauce-core/helpers/hashtag";
-import { Tokens } from "../helpers/regexp.js";
+import { getHashtagTag } from "applesauce-common/helpers/hashtag";
+import { Tokens } from "applesauce-core/helpers/regexp";
 import { findAndReplace } from "../nast/find-and-replace.js";
 /** Find and create hashtag notes in provided tree */
 export function hashtags() {

package/dist/text/index.d.ts

@@ -7,3 +7,4 @@ export * from "./parser.js";
 export * from "./hashtag.js";
 export * from "./gallery.js";
 export * from "./lightning.js";
+export * from "./blossom.js";

package/dist/text/index.js

@@ -7,3 +7,4 @@ export * from "./parser.js";
 export * from "./hashtag.js";
 export * from "./gallery.js";
 export * from "./lightning.js";
+export * from "./blossom.js";

package/dist/text/lightning.js

@@ -1,5 +1,5 @@
-import { parseBolt11 } from "applesauce-core/helpers/bolt11";
-import { Tokens } from "../helpers/regexp.js";
+import { parseBolt11 } from "applesauce-common/helpers/bolt11";
+import { Tokens } from "applesauce-core/helpers/regexp";
 import { findAndReplace } from "../nast/find-and-replace.js";
 /** Finds and creates lightning invoice nodes in the tree */
 export function lightningInvoices() {

package/dist/text/links.js

@@ -1,4 +1,4 @@
-import { Tokens } from "../helpers/regexp.js";
+import { Tokens } from "applesauce-core/helpers";
 import { findAndReplace } from "../nast/find-and-replace.js";
 /** Finds and creates web links in the tree */
 export function links() {

package/dist/text/mentions.js

@@ -1,5 +1,5 @@
-import { decode } from "nostr-tools/nip19";
-import { Tokens } from "../helpers/regexp.js";
+import { decodePointer } from "applesauce-core/helpers/pointers";
+import { Tokens } from "applesauce-core/helpers/regexp";
 import { findAndReplace } from "../nast/find-and-replace.js";
 /** Finds and creates NIP-19 nostr mentions in the tree */
 export function nostrMentions() {
@@ -11,7 +11,7 @@ export function nostrMentions() {
                     try {
                         return {
                             type: "mention",
-                            decoded: decode($1),
+                            decoded: decodePointer($1),
                             encoded: $1,
                         };
                     }

package/dist/text/parser.d.ts

@@ -1,4 +1,4 @@
-import { EventTemplate, NostrEvent } from "nostr-tools";
+import { EventTemplate, NostrEvent } from "applesauce-core/helpers/event";
 import { Root } from "../nast/types.js";
 /** Creates a {@link Root} ATS node for a text note */
 export declare function createEventContentTree(event: NostrEvent | EventTemplate | string, content?: string): Root;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-content",
-  "version": "4.0.0",
+  "version": "6.0.0",
   "description": "Unified plugins for processing event content",
   "type": "module",
   "main": "dist/index.js",
@@ -46,23 +46,23 @@
     }
   },
   "dependencies": {
-    "@cashu/cashu-ts": "^2.7.2",
+    "@cashu/cashu-ts": "^3.1.1",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.3",
-    "applesauce-core": "^4.0.0",
+    "applesauce-common": "^6.0.0",
+    "applesauce-core": "^6.0.0",
     "mdast-util-find-and-replace": "^3.0.2",
-    "nostr-tools": "~2.17",
     "remark": "^15.0.1",
     "remark-parse": "^11.0.0",
     "unified": "^11.0.5",
     "unist-util-visit-parents": "^6.0.1"
   },
   "devDependencies": {
-    "applesauce-signers": "^4.0.0",
+    "applesauce-signers": "^6.0.0",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.15"
   },
   "funding": {
     "type": "lightning",

package/dist/helpers/regexp.d.ts

@@ -1,19 +0,0 @@
-export declare const Expressions: {
-    readonly url: RegExp;
-    readonly link: RegExp;
-    readonly cashu: RegExp;
-    readonly nostrLink: RegExp;
-    readonly emoji: RegExp;
-    readonly hashtag: RegExp;
-    readonly lightning: RegExp;
-};
-/** A list of Regular Expressions that match tokens surrounded by whitespace to avoid matching in URLs */
-export declare const Tokens: {
-    readonly url: RegExp;
-    readonly link: RegExp;
-    readonly cashu: RegExp;
-    readonly nostrLink: RegExp;
-    readonly emoji: RegExp;
-    readonly hashtag: RegExp;
-    readonly lightning: RegExp;
-};

package/dist/helpers/regexp.js

@@ -1,48 +0,0 @@
-export const Expressions = {
-    get url() {
-        return /(?:https?|wss?|ircs?|s?ftp):\/\/([a-zA-Z0-9\.\-]+\.[a-zA-Z]+(?::\d+)?)([\/\?#][\p{L}\p{N}\p{M}&\.-\/\?=#\-@%\+_,:!~*]*)?/gu;
-    },
-    get link() {
-        return /https?:\/\/([a-zA-Z0-9\.\-]+\.[a-zA-Z]+(?::\d+)?)([\/\?#][\p{L}\p{N}\p{M}&\.-\/\?=#\-@%\+_,:!~*]*)?/gu;
-    },
-    get cashu() {
-        return /(?:cashu:\/{0,2})?(cashu(?:A|B)[A-Za-z0-9_-]{100,}={0,3})/gi;
-    },
-    get nostrLink() {
-        return /(?:nostr:)?((npub|note|nprofile|nevent|naddr)1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]{58,})/gi;
-    },
-    get emoji() {
-        return /:([a-zA-Z0-9_-]+):/gi;
-    },
-    get hashtag() {
-        // NOTE: cant use \b here because it uses \w which only matches latin letters
-        return /(?<=^|[^\p{L}#\/])#([\p{L}\p{N}\p{M}]+)(?=\p{Z}|$|\s)/gu;
-    },
-    get lightning() {
-        return /(?:lightning:)?(LNBC[A-Za-z0-9]+)/gim;
-    },
-};
-/** A list of Regular Expressions that match tokens surrounded by whitespace to avoid matching in URLs */
-export const Tokens = {
-    get url() {
-        return Expressions.url;
-    },
-    get link() {
-        return Expressions.link;
-    },
-    get cashu() {
-        return new RegExp(`(?<=^|\\s)${Expressions.cashu.source}`, "gi");
-    },
-    get nostrLink() {
-        return new RegExp(`(?<=^|\\s)${Expressions.nostrLink.source}`, "gi");
-    },
-    get emoji() {
-        return Expressions.emoji;
-    },
-    get hashtag() {
-        return Expressions.hashtag;
-    },
-    get lightning() {
-        return new RegExp(`(?<=^|\\s)${Expressions.lightning.source}`, "gim");
-    },
-};