applesauce-content 0.0.0-next-20250522030625 → 0.0.0-next-20250526151506

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-content",
-  "version": "0.0.0-next-20250522030625",
+  "version": "0.0.0-next-20250526151506",
   "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-20250526151506",
     "mdast-util-find-and-replace": "^3.0.2",
     "nostr-tools": "^2.13",
     "remark": "^15.0.1",