applesauce-content 1.0.0 → 2.0.0

package/dist/helpers/media.js

@@ -1,8 +1,8 @@
 import { getSha256FromURL } from "applesauce-core/helpers/file-metadata";
-import Expressions from "./regexp.js";
+import { Tokens } from "./regexp.js";
 /** Returns all URLs in a content string that contain a sha256 hash */
 export function getMediaAttachmentURLsFromContent(content) {
-    return (Array.from(content.matchAll(Expressions.link))
+    return (Array.from(content.matchAll(Tokens.link))
         .map((match) => match[0])
         // filter out invalid URLs
         .filter((str) => URL.canParse(str))

package/dist/helpers/regexp.d.ts

@@ -1,4 +1,15 @@
 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;
@@ -6,4 +17,3 @@ export declare const Expressions: {
     readonly hashtag: RegExp;
     readonly lightning: RegExp;
 };
-export default Expressions;

package/dist/helpers/regexp.js

@@ -1,21 +1,48 @@
 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(?:A|B)[A-Za-z0-9_-]{100,10000}={0,3})/gi;
+        return /(?:cashu:\/{0,2})?(cashu(?:A|B)[A-Za-z0-9_-]{100,10000}={0,3})/gi;
     },
     get nostrLink() {
-        return /nostr:((npub|note|nprofile|nevent|naddr)1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]{58,})/gi;
+        return /(?:nostr:)?((npub|note|nprofile|nevent|naddr)1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]{58,})/gi;
     },
     get emoji() {
         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;
     },
 };
-export default 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 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");
+    },
+};

package/dist/markdown/mentions.d.ts

@@ -1,6 +1,6 @@
-import { Transformer } from "unified";
+import { DecodeResult } from "applesauce-core/helpers";
 import { Link, Nodes } from "mdast";
-import { DecodeResult } from "nostr-tools/nip19";
+import { Transformer } from "unified";
 export interface NostrMention extends Link {
     type: "link";
     data: DecodeResult;

package/dist/markdown/mentions.js

@@ -1,10 +1,10 @@
 import { findAndReplace } from "mdast-util-find-and-replace";
 import { decode } from "nostr-tools/nip19";
-import Expressions from "../helpers/regexp.js";
+import { Tokens } from "../helpers/regexp.js";
 export function remarkNostrMentions() {
     return (tree) => {
         findAndReplace(tree, [
-            Expressions.nostrLink,
+            Tokens.nostrLink,
             (_, $1) => {
                 try {
                     return {

package/dist/nast/types.d.ts

@@ -1,8 +1,8 @@
-import { EventTemplate, NostrEvent } from "nostr-tools";
-import { DecodeResult } from "nostr-tools/nip19";
-import { Node as UnistNode, Parent } from "unist";
 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 Parent, type Node as UnistNode } from "unist";
 export interface CommonData {
     eol?: boolean;
 }
@@ -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/cashu.js

@@ -1,12 +1,12 @@
 import { getDecodedToken } from "@cashu/cashu-ts";
-import Expressions from "../helpers/regexp.js";
+import { Tokens } from "../helpers/regexp.js";
 import { findAndReplace } from "../nast/find-and-replace.js";
 /** Parse cashu tokens from an ATS tree */
 export function cashuTokens() {
     return (tree) => {
         findAndReplace(tree, [
             [
-                Expressions.cashu,
+                Tokens.cashu,
                 (_, $1) => {
                     try {
                         const token = getDecodedToken($1);

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 Expressions from "../helpers/regexp.js";
+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;
@@ -9,7 +9,7 @@ export function emojis() {
             return;
         findAndReplace(tree, [
             [
-                Expressions.emoji,
+                Tokens.emoji,
                 (full, $1) => {
                     try {
                         const tag = getEmojiTag(event, $1);

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 Expressions from "../helpers/regexp.js";
+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, [
             [
-                Expressions.hashtag,
+                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,11 +1,12 @@
 import { parseBolt11 } from "applesauce-core/helpers/bolt11";
-import Expressions from "../helpers/regexp.js";
+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, [
             [
-                Expressions.lightning,
+                Tokens.lightning,
                 (_, $1) => {
                     try {
                         const invoice = $1;

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,10 +1,11 @@
-import Expressions from "../helpers/regexp.js";
+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, [
             [
-                Expressions.link,
+                Tokens.link,
                 (_) => {
                     try {
                         return {

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,11 +1,12 @@
 import { decode } from "nostr-tools/nip19";
-import Expressions from "../helpers/regexp.js";
+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, [
             [
-                Expressions.nostrLink,
+                Tokens.nostrLink,
                 (_, $1) => {
                     try {
                         return {

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": "1.0.0",
+  "version": "2.0.0",
   "description": "Unified plugins for processing event content",
   "type": "module",
   "main": "dist/index.js",
@@ -52,9 +52,9 @@
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.3",
-    "applesauce-core": "^1.0.0",
+    "applesauce-core": "^2.0.0",
     "mdast-util-find-and-replace": "^3.0.2",
-    "nostr-tools": "^2.10.4",
+    "nostr-tools": "^2.13",
     "remark": "^15.0.1",
     "remark-parse": "^11.0.0",
     "unified": "^11.0.5",
@@ -62,7 +62,8 @@
   },
   "devDependencies": {
     "typescript": "^5.8.3",
-    "vitest": "^3.1.1"
+    "applesauce-signers": "^2.0.0",
+    "vitest": "^3.2.3"
   },
   "funding": {
     "type": "lightning",