applesauce-content 0.0.0-next-20241108100553 → 0.0.0-next-20241112141526

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

@@ -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/text/content.js

@@ -7,9 +7,20 @@ import { createTextNoteATS } from "./parser.js";
 import { hashtags } from "./hashtag.js";
 import { galleries } from "./gallery.js";
 import { lightningInvoices } from "./lightning.js";
+import { eolMetadata } from "../nast/eol-metadata.js";
+import { links } from "./links.js";
 export const ParsedTextContentSymbol = Symbol.for("parsed-text-content");
 // default kind 1 transformers
-export const defaultTransformers = [nostrMentions, galleries, emojis, hashtags, lightningInvoices, cashuTokens];
+export const defaultTransformers = [
+    links,
+    nostrMentions,
+    galleries,
+    emojis,
+    hashtags,
+    lightningInvoices,
+    cashuTokens,
+    eolMetadata,
+];
 /** Parsed and process a note with custom transformers */
 export function getParsedTextContent(event, content, transformers = defaultTransformers) {
     // process strings

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-20241108100553",
+  "version": "0.0.0-next-20241112141526",
   "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-20241108100553",
-    "linkifyjs": "^4.1.3",
+    "applesauce-core": "0.0.0-next-20241112141526",
     "mdast-util-find-and-replace": "^3.0.1",
     "nostr-tools": "^2.10.1",
     "remark": "^15.0.1",