applesauce-content 0.8.0 → 0.10.0

package/README.md

@@ -5,13 +5,13 @@ applesauce package for parsing text note content
 ## Example
 
 ```ts
-import { getParsedTextContent } from "applesauce-content/text";
+import { getParsedContent } from "applesauce-content/text";
 
 const stringContent = `
 hello nostr!
 nostr:npub180cvv07tjdrrgpa0j7j7tmnyl2yr6yr7l8j4s3evf6u64th6gkwsyjh6w6
 `;
-const ats = getParsedTextContent(stringContent);
+const ats = getParsedContent(stringContent);
 
 console.log(ats);
 /*

package/dist/helpers/regexp.d.ts

@@ -1,7 +1,9 @@
 export declare const Expressions: {
+    readonly link: RegExp;
     readonly cashu: RegExp;
     readonly nostrLink: RegExp;
     readonly emoji: RegExp;
     readonly hashtag: RegExp;
+    readonly lightning: RegExp;
 };
 export default Expressions;

package/dist/helpers/regexp.js

@@ -1,9 +1,12 @@
 export const Expressions = {
+    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;
     },
     get nostrLink() {
-        return /(?:nostr:)?((npub|note|nprofile|nevent|nrelay|naddr)1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]{58,})/gi;
+        return /nostr:((npub|note|nprofile|nevent|naddr)1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]{58,})/gi;
     },
     get emoji() {
         return /:([a-zA-Z0-9_-]+):/gi;
@@ -11,5 +14,8 @@ export const Expressions = {
     get hashtag() {
         return /(?<=^|[^\p{L}#])#([\p{L}\p{N}\p{M}]+)/gu;
     },
+    get lightning() {
+        return /(?:lightning:)?(LNBC[A-Za-z0-9]+)/gim;
+    },
 };
 export default Expressions;

package/dist/nast/eol-metadata.js

@@ -1,11 +1,13 @@
 export function eolMetadata() {
     return (tree) => {
         for (let i = 0; i < tree.children.length; i++) {
-            // const node = tree.children[i];
+            const node = tree.children[i];
             const next = tree.children[i + 1];
-            if (next && next.type === "text" && next.value.startsWith("\n")) {
-                next.data = next.data || {};
-                next.data.eol = true;
+            if ((node.type === "text" && node.value.endsWith("\n")) ||
+                !next ||
+                (next.type === "text" && next.value.startsWith("\n"))) {
+                node.data = node.data || {};
+                node.data.eol = true;
             }
         }
     };

package/dist/nast/types.d.ts

@@ -2,6 +2,7 @@ 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 ParsedInvoice } from "applesauce-core/helpers/bolt11";
 export interface CommonData {
     eol?: boolean;
 }
@@ -34,6 +35,7 @@ export interface CashuToken extends Node {
 export interface LightningInvoice extends Node {
     type: "lightning";
     invoice: string;
+    parsed: ParsedInvoice;
 }
 export interface Hashtag extends Node {
     type: "hashtag";

package/dist/text/content.d.ts

@@ -2,8 +2,8 @@ import { Transformer } from "unified";
 import { EventTemplate, NostrEvent } from "nostr-tools";
 import { Root } from "../nast/types.js";
 import { galleries } from "./gallery.js";
-export declare const ParsedTextContentSymbol: unique symbol;
-export declare const defaultTransformers: (typeof galleries)[];
+export declare const TextNoteContentSymbol: unique symbol;
+export declare const textNoteTransformers: (typeof galleries)[];
 /** Parsed and process a note with custom transformers */
-export declare function getParsedTextContent(event: NostrEvent | EventTemplate | string, content?: string, transformers?: (() => Transformer<Root>)[]): Root;
+export declare function getParsedContent(event: NostrEvent | EventTemplate | string, content?: string, transformers?: (() => Transformer<Root>)[], cacheKey?: symbol | null | undefined): Root;
 export declare function removeParsedTextContent(event: NostrEvent | EventTemplate): void;

package/dist/text/content.js

@@ -6,11 +6,23 @@ import { emojis } from "./emoji.js";
 import { createTextNoteATS } from "./parser.js";
 import { hashtags } from "./hashtag.js";
 import { galleries } from "./gallery.js";
-export const ParsedTextContentSymbol = Symbol.for("parsed-text-content");
+import { lightningInvoices } from "./lightning.js";
+import { eolMetadata } from "../nast/eol-metadata.js";
+import { links } from "./links.js";
+export const TextNoteContentSymbol = Symbol.for("text-note-content");
 // default kind 1 transformers
-export const defaultTransformers = [nostrMentions, galleries, emojis, hashtags, cashuTokens];
+export const textNoteTransformers = [
+    links,
+    nostrMentions,
+    galleries,
+    emojis,
+    hashtags,
+    lightningInvoices,
+    cashuTokens,
+    eolMetadata,
+];
 /** Parsed and process a note with custom transformers */
-export function getParsedTextContent(event, content, transformers = defaultTransformers) {
+export function getParsedContent(event, content, transformers = textNoteTransformers, cacheKey = TextNoteContentSymbol) {
     // process strings
     if (typeof event === "string") {
         const processor = unified();
@@ -19,7 +31,15 @@ export function getParsedTextContent(event, content, transformers = defaultTrans
         }
         return processor.runSync(createTextNoteATS(event, content));
     }
-    return getOrComputeCachedValue(event, ParsedTextContentSymbol, () => {
+    // no caching
+    if (!cacheKey) {
+        const processor = unified();
+        for (const transformer of transformers) {
+            processor.use(transformer);
+        }
+        return processor.runSync(createTextNoteATS(event, content));
+    }
+    return getOrComputeCachedValue(event, cacheKey, () => {
         const processor = unified();
         for (const transformer of transformers) {
             processor.use(transformer);
@@ -29,5 +49,5 @@ export function getParsedTextContent(event, content, transformers = defaultTrans
 }
 export function removeParsedTextContent(event) {
     // @ts-expect-error
-    delete event[ParsedTextContentSymbol];
+    delete event[TextNoteContentSymbol];
 }

package/dist/text/emoji.d.ts

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

package/dist/text/index.d.ts

@@ -1,7 +1,9 @@
 export * from "./content.js";
+export * from "./links.js";
 export * from "./mentions.js";
 export * from "./cashu.js";
 export * from "./emoji.js";
 export * from "./parser.js";
 export * from "./hashtag.js";
 export * from "./gallery.js";
+export * from "./lightning.js";

package/dist/text/index.js

@@ -1,7 +1,9 @@
 export * from "./content.js";
+export * from "./links.js";
 export * from "./mentions.js";
 export * from "./cashu.js";
 export * from "./emoji.js";
 export * from "./parser.js";
 export * from "./hashtag.js";
 export * from "./gallery.js";
+export * from "./lightning.js";

package/dist/text/lightning.d.ts

@@ -0,0 +1,3 @@
+import { type Transformer } from "unified";
+import { Root } from "../nast/types.js";
+export declare function lightningInvoices(): Transformer<Root>;

package/dist/text/lightning.js

@@ -0,0 +1,25 @@
+import { parseBolt11 } from "applesauce-core/helpers/bolt11";
+import Expressions from "../helpers/regexp.js";
+import { findAndReplace } from "../nast/find-and-replace.js";
+export function lightningInvoices() {
+    return (tree) => {
+        findAndReplace(tree, [
+            [
+                Expressions.lightning,
+                (_, $1) => {
+                    try {
+                        const invoice = $1;
+                        const parsed = parseBolt11(invoice);
+                        return {
+                            type: "lightning",
+                            invoice,
+                            parsed,
+                        };
+                    }
+                    catch (error) { }
+                    return false;
+                },
+            ],
+        ]);
+    };
+}

package/dist/text/links.d.ts

@@ -0,0 +1,3 @@
+import { Transformer } from "unified";
+import { Root } from "../nast/types.js";
+export declare function links(): Transformer<Root>;

package/dist/text/links.js

@@ -0,0 +1,22 @@
+import Expressions from "../helpers/regexp.js";
+import { findAndReplace } from "../nast/find-and-replace.js";
+export function links() {
+    return (tree) => {
+        findAndReplace(tree, [
+            [
+                Expressions.link,
+                (_) => {
+                    try {
+                        return {
+                            type: "link",
+                            href: new URL(_).toString(),
+                            value: _,
+                        };
+                    }
+                    catch (error) { }
+                    return false;
+                },
+            ],
+        ]);
+    };
+}

package/dist/text/parser.js

@@ -1,15 +1,13 @@
-import { tokenize } from "linkifyjs";
 /** Creates a {@link Root} ATS node for a text note */
 export function createTextNoteATS(event, content) {
-    const tokens = tokenize(content || (typeof event === "string" ? event : event.content));
     return {
         type: "root",
         event: typeof event !== "string" ? event : undefined,
-        children: tokens.map((token) => {
-            if (token.isLink)
-                return { type: "link", href: token.toHref(), value: token.toString() };
-            else
-                return { type: "text", value: token.v };
-        }),
+        children: [
+            {
+                type: "text",
+                value: content || (typeof event === "string" ? event : event.content),
+            },
+        ],
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-content",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Unified plugins for processing event content",
   "type": "module",
   "main": "dist/index.js",
@@ -36,37 +36,30 @@
     }
   },
   "dependencies": {
-    "@cashu/cashu-ts": "^1.1.0",
+    "@cashu/cashu-ts": "2.0.0-rc1",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.3",
-    "applesauce-core": "^0.8.0",
-    "linkifyjs": "^4.1.3",
+    "applesauce-core": "^0.10.0",
     "mdast-util-find-and-replace": "^3.0.1",
-    "nostr-tools": "^2.7.2",
+    "nostr-tools": "^2.10.3",
     "remark": "^15.0.1",
     "remark-parse": "^11.0.0",
     "unified": "^11.0.5",
     "unist-util-visit-parents": "^6.0.1"
   },
   "devDependencies": {
-    "@jest/globals": "^29.7.0",
-    "@types/jest": "^29.5.13",
-    "jest": "^29.7.0",
-    "jest-extended": "^4.0.2"
+    "typescript": "^5.6.3",
+    "vitest": "^2.1.8"
   },
-  "jest": {
-    "roots": [
-      "dist"
-    ],
-    "setupFilesAfterEnv": [
-      "jest-extended/all"
-    ]
+  "funding": {
+    "type": "lightning",
+    "url": "lightning:nostrudel@geyser.fund"
   },
   "scripts": {
     "build": "tsc",
     "watch:build": "tsc --watch > /dev/null",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --passWithNoTests",
-    "watch:test": "(trap 'kill 0' SIGINT; pnpm run build -w > /dev/null & pnpm run test --watch)"
+    "test": "vitest run --passWithNoTests",
+    "watch:test": "vitest"
   }
 }