applesauce-content 0.0.0-next-20250522030625 → 0.0.0-next-20250606170247

package/dist/__tests__/exports.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/exports.test.js

@@ -0,0 +1,14 @@
+import { describe, expect, it } from "vitest";
+import * as exports from "../index.js";
+describe("exports", () => {
+    it("should export the expected functions", () => {
+        expect(Object.keys(exports).sort()).toMatchInlineSnapshot(`
+      [
+        "Helpers",
+        "Markdown",
+        "Nast",
+        "Text",
+      ]
+    `);
+    });
+});

package/dist/__tests__/fake-user.d.ts

@@ -0,0 +1,9 @@
+import { SimpleSigner } from "applesauce-signers/signers/simple-signer";
+import type { EventTemplate, NostrEvent } from "nostr-tools";
+export declare class FakeUser extends SimpleSigner {
+    pubkey: string;
+    event(data?: Partial<EventTemplate>): NostrEvent;
+    note(content?: string, extra?: Partial<EventTemplate>): import("nostr-tools").Event;
+    profile(profile: any, extra?: Partial<EventTemplate>): import("nostr-tools").Event;
+    contacts(pubkeys?: string[]): import("nostr-tools").Event;
+}

package/dist/__tests__/fake-user.js

@@ -0,0 +1,23 @@
+import { unixNow } from "applesauce-core/helpers";
+import { SimpleSigner } from "applesauce-signers/signers/simple-signer";
+import { finalizeEvent, getPublicKey, kinds } from "nostr-tools";
+export class FakeUser extends SimpleSigner {
+    pubkey = getPublicKey(this.key);
+    event(data) {
+        return finalizeEvent({
+            kind: data?.kind ?? kinds.ShortTextNote,
+            content: data?.content || "",
+            created_at: data?.created_at ?? unixNow(),
+            tags: data?.tags || [],
+        }, this.key);
+    }
+    note(content = "Hello World", extra) {
+        return this.event({ kind: kinds.ShortTextNote, content, ...extra });
+    }
+    profile(profile, extra) {
+        return this.event({ kind: kinds.Metadata, content: JSON.stringify({ ...profile }), ...extra });
+    }
+    contacts(pubkeys = []) {
+        return this.event({ kind: kinds.Contacts, tags: pubkeys.map((p) => ["p", p]) });
+    }
+}

package/dist/helpers/__test__/regexp.test.js

@@ -92,6 +92,17 @@ describe("Regular Expressions", () => {
             expect(matches).toHaveLength(1);
             expect(matches[0][1]).toBe("npub180cvv07tjdrrgpa0j7j7tmnyl2yr6yr7l8j4s3evf6u64th6gkwsyjh6w6");
         });
+        it("should match nostr links in URLs", () => {
+            const text = "https://npub1wyuh3scfgzqmxn709a2fzuemps389rxnk7nfgege6s847zze3tuqfl87ez.nsite.lol/n/nevent1qvzqqqqqqypzp022u0n8u2vkf4y5zu3xrhz989wgna4a9em5vshrvcf8zuwlhq04qyghwumn8ghj7mn0wd68ytnhd9hx2tcppemhxue69uhkummn9ekx7mp0qqsz7ck33xzlpcf2338ufrarks2cxqzk2rp925qe38wvlevhxv9pg6syy7gc7";
+            const matches = Array.from(text.matchAll(Expressions.nostrLink));
+            expect(matches).toHaveLength(2);
+            expect(matches).toEqual([
+                expect.arrayContaining(["npub1wyuh3scfgzqmxn709a2fzuemps389rxnk7nfgege6s847zze3tuqfl87ez"]),
+                expect.arrayContaining([
+                    "nevent1qvzqqqqqqypzp022u0n8u2vkf4y5zu3xrhz989wgna4a9em5vshrvcf8zuwlhq04qyghwumn8ghj7mn0wd68ytnhd9hx2tcppemhxue69uhkummn9ekx7mp0qqsz7ck33xzlpcf2338ufrarks2cxqzk2rp925qe38wvlevhxv9pg6syy7gc7",
+                ]),
+            ]);
+        });
     });
     describe("Expressions.emoji", () => {
         it("should match emoji shortcodes", () => {
@@ -149,6 +160,11 @@ describe("Regular Expressions", () => {
             expect(matches[0][1]).toBe("世界");
             expect(matches[1][1]).toBe("привет");
         });
+        it("should not match hashtags in URLs", () => {
+            const text = "testing urls wss://relay.damus.io ircs://irc.zeronode.net:6697/#nostr https://github.com/hzrd149/applesauce?tab=readme-ov-file#running-tests";
+            const matches = Array.from(text.matchAll(Expressions.hashtag));
+            expect(matches).toHaveLength(0);
+        });
     });
     describe("Expressions.lightning", () => {
         it("should match lightning invoices", () => {
@@ -213,6 +229,11 @@ describe("Token Regular Expressions", () => {
             expect(matches).toHaveLength(1);
             expect(matches[0][0].trim()).toBe(npub);
         });
+        it("should not match links in URLs", async () => {
+            const text = "Checkout my app https://zap.stream/naddr1qqjx2wtzx93rycmz94nrqvf3956rqep3943xgvec956xxvnxxucxze33v93rvq3qeaz6dwsnvwkha5sn5puwwyxjgy26uusundrm684lg3vw4ma5c2jsxpqqqpmxw6td7rf";
+            const matches = Array.from(text.matchAll(Tokens.nostrLink));
+            expect(matches).toHaveLength(0);
+        });
     });
     describe("Tokens.emoji", () => {
         it("should match emoji shortcodes surrounded by whitespace", () => {

package/dist/helpers/regexp.d.ts

@@ -1,4 +1,5 @@
 export declare const Expressions: {
+    readonly url: RegExp;
     readonly link: RegExp;
     readonly cashu: RegExp;
     readonly nostrLink: RegExp;
@@ -8,6 +9,7 @@ export declare const Expressions: {
 };
 /** 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;

package/dist/helpers/regexp.js

@@ -1,4 +1,7 @@
 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;
     },
@@ -12,7 +15,8 @@ export const Expressions = {
         return /:([a-zA-Z0-9_-]+):/gi;
     },
     get hashtag() {
-        return /(?<=^|[^\p{L}#])#([\p{L}\p{N}\p{M}]+)/gu;
+        // 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;
@@ -20,14 +24,17 @@ export const Expressions = {
 };
 /** 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 new RegExp(`\\b${Expressions.link.source}\\b`, "gu");
+        return Expressions.link;
     },
     get cashu() {
-        return new RegExp(`\\b${Expressions.cashu.source}\\b`, "gi");
+        return new RegExp(`(?<=^|\\s)${Expressions.cashu.source}`, "gi");
     },
     get nostrLink() {
-        return new RegExp(`\\b${Expressions.nostrLink.source}\\b`, "gi");
+        return new RegExp(`(?<=^|\\s)${Expressions.nostrLink.source}`, "gi");
     },
     get emoji() {
         return Expressions.emoji;
@@ -36,6 +43,6 @@ export const Tokens = {
         return Expressions.hashtag;
     },
     get lightning() {
-        return new RegExp(`\\b${Expressions.lightning.source}\\b`, "gim");
+        return new RegExp(`(?<=^|\\s)${Expressions.lightning.source}`, "gim");
     },
 };

package/dist/nast/types.d.ts

@@ -43,7 +43,8 @@ export interface Hashtag extends Node {
     name: string;
     /** The lowercase canonical name */
     hashtag: string;
-    tag: ["t", ...string[]];
+    /** The indexable tag for the hashtag. will be undefined if none was found */
+    tag?: ["t", ...string[]];
 }
 export interface Emoji extends Node {
     type: "emoji";

package/dist/text/__tests__/exports.test.js

@@ -6,6 +6,7 @@ describe("exports", () => {
       [
         "TextNoteContentSymbol",
         "cashuTokens",
+        "createEventContentTree",
         "createTextNoteATS",
         "emojis",
         "galleries",

package/dist/text/__tests__/gallery.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/text/__tests__/gallery.test.js

@@ -0,0 +1,38 @@
+import { describe, expect, it } from "vitest";
+import { getParsedContent } from "../content.js";
+import { galleries } from "../gallery.js";
+import { links } from "../links.js";
+describe("gallery", () => {
+    it("should group image urls into galleries", () => {
+        expect(getParsedContent("Hello https://example.com/image.png https://example.com/image2.png", undefined, [
+            links,
+            galleries,
+        ]).children).toEqual([
+            expect.objectContaining({ type: "text" }),
+            expect.objectContaining({
+                type: "gallery",
+                links: ["https://example.com/image.png", "https://example.com/image2.png"],
+            }),
+        ]);
+    });
+    it("should not match a single image link", () => {
+        expect(getParsedContent("Hello https://example.com/image.png", undefined, [links, galleries]).children).toEqual([
+            expect.objectContaining({ type: "text" }),
+            expect.objectContaining({ type: "link" }),
+        ]);
+    });
+    it("should match multiple galleries", () => {
+        expect(getParsedContent("Hello https://example.com/image.png\nhttps://example.com/image2.png\n\nAnd here are the other images https://example.com/image3.png\n\nhttps://example.com/image4.png", undefined, [links, galleries]).children).toEqual([
+            expect.objectContaining({ type: "text" }),
+            expect.objectContaining({
+                type: "gallery",
+                links: ["https://example.com/image.png", "https://example.com/image2.png"],
+            }),
+            expect.objectContaining({ type: "text" }),
+            expect.objectContaining({
+                type: "gallery",
+                links: ["https://example.com/image3.png", "https://example.com/image4.png"],
+            }),
+        ]);
+    });
+});

package/dist/text/__tests__/hashtag.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/text/__tests__/hashtag.test.js

@@ -0,0 +1,48 @@
+import { describe, expect, it } from "vitest";
+import { getParsedContent } from "../content.js";
+import { hashtags } from "../hashtag.js";
+import { FakeUser } from "../../__tests__/fake-user.js";
+const user = new FakeUser();
+describe("hashtags", () => {
+    it("should match all hashtags if event is missing", () => {
+        expect(getParsedContent("Hello #hashtag", undefined, [hashtags]).children).toMatchInlineSnapshot(`
+      [
+        {
+          "type": "text",
+          "value": "Hello ",
+        },
+        {
+          "hashtag": "hashtag",
+          "name": "hashtag",
+          "tag": undefined,
+          "type": "hashtag",
+        },
+      ]
+    `);
+    });
+    describe("with event", () => {
+        it("should match all hashtags", () => {
+            expect(getParsedContent(user.event({ content: "Hello #hashtag", tags: [["t", "hashtag"]] }), undefined, [hashtags])
+                .children).toMatchInlineSnapshot(`
+        [
+          {
+            "type": "text",
+            "value": "Hello ",
+          },
+          {
+            "hashtag": "hashtag",
+            "name": "hashtag",
+            "tag": [
+              "t",
+              "hashtag",
+            ],
+            "type": "hashtag",
+          },
+        ]
+      `);
+        });
+        it("should not match hashtags with missing t tags", () => {
+            expect(getParsedContent(user.event({ content: "Hello #hashtag", tags: [] }), undefined, [hashtags]).children).not.toEqual(expect.arrayContaining([expect.objectContaining({ type: "hashtag" })]));
+        });
+    });
+});

package/dist/text/content.js

@@ -3,7 +3,7 @@ import { getOrComputeCachedValue } from "applesauce-core/helpers/cache";
 import { nostrMentions } from "./mentions.js";
 import { cashuTokens } from "./cashu.js";
 import { emojis } from "./emoji.js";
-import { createTextNoteATS } from "./parser.js";
+import { createEventContentTree } from "./parser.js";
 import { hashtags } from "./hashtag.js";
 import { galleries } from "./gallery.js";
 import { lightningInvoices } from "./lightning.js";
@@ -29,7 +29,7 @@ export function getParsedContent(event, content, transformers = textNoteTransfor
         for (const transformer of transformers) {
             processor.use(transformer);
         }
-        return processor.runSync(createTextNoteATS(event, content));
+        return processor.runSync(createEventContentTree(event, content));
     }
     // no caching
     if (!cacheKey) {
@@ -37,14 +37,14 @@ export function getParsedContent(event, content, transformers = textNoteTransfor
         for (const transformer of transformers) {
             processor.use(transformer);
         }
-        return processor.runSync(createTextNoteATS(event, content));
+        return processor.runSync(createEventContentTree(event, content));
     }
     return getOrComputeCachedValue(event, cacheKey, () => {
         const processor = unified();
         for (const transformer of transformers) {
             processor.use(transformer);
         }
-        return processor.runSync(createTextNoteATS(event, content));
+        return processor.runSync(createEventContentTree(event, content));
     });
 }
 export function removeParsedTextContent(event) {

package/dist/text/emoji.d.ts

@@ -1,4 +1,4 @@
 import { type Transformer } from "unified";
 import { Root } from "../nast/types.js";
-/** Adds emoji tags to text ATS */
+/** Finds and creates emoji nodes in the tree */
 export declare function emojis(): Transformer<Root>;

package/dist/text/emoji.js

@@ -1,7 +1,7 @@
 import { getEmojiTag } from "applesauce-core/helpers/emoji";
 import { Tokens } from "../helpers/regexp.js";
 import { findAndReplace } from "../nast/find-and-replace.js";
-/** Adds emoji tags to text ATS */
+/** Finds and creates emoji nodes in the tree */
 export function emojis() {
     return (tree) => {
         const event = tree.event;

package/dist/text/gallery.d.ts

@@ -1,4 +1,4 @@
 import { Transformer } from "unified";
 import { Root } from "../nast/types.js";
-/** Groups images into galleries in an ATS tree */
+/** Group images into galleries in an ATS tree */
 export declare function galleries(types?: string[]): Transformer<Root>;

package/dist/text/gallery.js

@@ -1,5 +1,5 @@
 import { convertToUrl, getURLFilename, IMAGE_EXT } from "applesauce-core/helpers/url";
-/** Groups images into galleries in an ATS tree */
+/** Group images into galleries in an ATS tree */
 export function galleries(types = IMAGE_EXT) {
     return (tree) => {
         let links = [];

package/dist/text/hashtag.d.ts

@@ -1,3 +1,4 @@
 import { Transformer } from "unified";
 import { Root } from "../nast/types.js";
+/** Find and create hashtag notes in provided tree */
 export declare function hashtags(): Transformer<Root>;

package/dist/text/hashtag.js

@@ -1,24 +1,24 @@
 import { getHashtagTag } from "applesauce-core/helpers/hashtag";
 import { Tokens } from "../helpers/regexp.js";
 import { findAndReplace } from "../nast/find-and-replace.js";
+/** Find and create hashtag notes in provided tree */
 export function hashtags() {
     return (tree) => {
         const event = tree.event;
-        if (!event)
-            return;
         findAndReplace(tree, [
             [
                 Tokens.hashtag,
                 (_, $1) => {
                     try {
-                        const tag = getHashtagTag(event, $1);
-                        if (!tag)
+                        const tag = event && getHashtagTag(event, $1);
+                        // Skip if the match if no tag was found in the event
+                        if (!tag && event)
                             return false;
                         return {
                             type: "hashtag",
                             tag,
                             name: $1,
-                            hashtag: tag[1].toLowerCase(),
+                            hashtag: tag?.[1].toLowerCase() || $1.toLowerCase(),
                         };
                     }
                     catch (error) { }

package/dist/text/lightning.d.ts

@@ -1,3 +1,4 @@
 import { type Transformer } from "unified";
 import { Root } from "../nast/types.js";
+/** Finds and creates lightning invoice nodes in the tree */
 export declare function lightningInvoices(): Transformer<Root>;

package/dist/text/lightning.js

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

package/dist/text/links.d.ts

@@ -1,3 +1,4 @@
 import { Transformer } from "unified";
 import { Root } from "../nast/types.js";
+/** Finds and creates web links in the tree */
 export declare function links(): Transformer<Root>;

package/dist/text/links.js

@@ -1,5 +1,6 @@
 import { Tokens } from "../helpers/regexp.js";
 import { findAndReplace } from "../nast/find-and-replace.js";
+/** Finds and creates web links in the tree */
 export function links() {
     return (tree) => {
         findAndReplace(tree, [

package/dist/text/mentions.d.ts

@@ -1,3 +1,4 @@
 import { Transformer } from "unified";
 import { Root } from "../nast/types.js";
+/** Finds and creates NIP-19 nostr mentions in the tree */
 export declare function nostrMentions(): Transformer<Root>;

package/dist/text/mentions.js

@@ -1,6 +1,7 @@
 import { decode } from "nostr-tools/nip19";
 import { Tokens } from "../helpers/regexp.js";
 import { findAndReplace } from "../nast/find-and-replace.js";
+/** Finds and creates NIP-19 nostr mentions in the tree */
 export function nostrMentions() {
     return (tree) => {
         findAndReplace(tree, [

package/dist/text/parser.d.ts

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

package/dist/text/parser.js

@@ -1,5 +1,5 @@
 /** Creates a {@link Root} ATS node for a text note */
-export function createTextNoteATS(event, content) {
+export function createEventContentTree(event, content) {
     return {
         type: "root",
         event: typeof event !== "string" ? event : undefined,
@@ -11,3 +11,5 @@ export function createTextNoteATS(event, content) {
         ],
     };
 }
+/** @deprecated use createEventContentTree instead */
+export const createTextNoteATS = createEventContentTree;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-content",
-  "version": "0.0.0-next-20250522030625",
+  "version": "0.0.0-next-20250606170247",
   "description": "Unified plugins for processing event content",
   "type": "module",
   "main": "dist/index.js",
@@ -52,7 +52,7 @@
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.3",
-    "applesauce-core": "0.0.0-next-20250522030625",
+    "applesauce-core": "0.0.0-next-20250606170247",
     "mdast-util-find-and-replace": "^3.0.2",
     "nostr-tools": "^2.13",
     "remark": "^15.0.1",
@@ -62,6 +62,7 @@
   },
   "devDependencies": {
     "typescript": "^5.8.3",
+    "applesauce-signers": "0.0.0-next-20250606170247",
     "vitest": "^3.1.1"
   },
   "funding": {