applesauce-content 0.0.0-next-20241111095753 → 0.0.0-next-20241113103021

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,4 +1,5 @@
 export declare const Expressions: {
+    readonly link: RegExp;
     readonly cashu: RegExp;
     readonly nostrLink: RegExp;
     readonly emoji: RegExp;

package/dist/helpers/regexp.js

@@ -1,4 +1,7 @@
 export const Expressions = {
+    get link() {
+        return /https?:\/\/([a-zA-Z0-9\.\-]+\.[a-zA-Z]+)([\/\?#][\p{L}\p{N}\p{M}&\.-\/\?=#\-@%\+_,:!~*]*)?/gu;
+    },
     get cashu() {
         return /(cashu(?:A|B)[A-Za-z0-9_-]{100,10000}={0,3})/gi;
     },

package/dist/nast/eol-metadata.js

@@ -3,7 +3,9 @@ export function eolMetadata() {
         for (let i = 0; i < tree.children.length; i++) {
             const node = tree.children[i];
             const next = tree.children[i + 1];
-            if (!next || (next.type === "text" && next.value.startsWith("\n"))) {
+            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/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

@@ -8,9 +8,11 @@ import { hashtags } from "./hashtag.js";
 import { galleries } from "./gallery.js";
 import { lightningInvoices } from "./lightning.js";
 import { eolMetadata } from "../nast/eol-metadata.js";
-export const ParsedTextContentSymbol = Symbol.for("parsed-text-content");
+import { links } from "./links.js";
+export const TextNoteContentSymbol = Symbol.for("text-note-content");
 // default kind 1 transformers
-export const defaultTransformers = [
+export const textNoteTransformers = [
+    links,
     nostrMentions,
     galleries,
     emojis,
@@ -20,7 +22,7 @@ export const defaultTransformers = [
     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();
@@ -29,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);
@@ -39,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,4 +1,5 @@
 export * from "./content.js";
+export * from "./links.js";
 export * from "./mentions.js";
 export * from "./cashu.js";
 export * from "./emoji.js";

package/dist/text/index.js

@@ -1,4 +1,5 @@
 export * from "./content.js";
+export * from "./links.js";
 export * from "./mentions.js";
 export * from "./cashu.js";
 export * from "./emoji.js";

package/dist/text/link.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/link.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/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.0.0-next-20241111095753",
+  "version": "0.0.0-next-20241113103021",
   "description": "Unified plugins for processing event content",
   "type": "module",
   "main": "dist/index.js",
@@ -40,8 +40,7 @@
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.3",
-    "applesauce-core": "0.0.0-next-20241111095753",
-    "linkifyjs": "^4.1.3",
+    "applesauce-core": "0.0.0-next-20241113103021",
     "mdast-util-find-and-replace": "^3.0.1",
     "nostr-tools": "^2.10.1",
     "remark": "^15.0.1",