@adminforth/markdown 1.4.0 → 1.5.0

package/dist/index.js

@@ -111,25 +111,42 @@ export default class MarkdownPlugin extends AdminForthPlugin {
             };
             const editorRecordPkField = resourceConfig.columns.find(c => c.primaryKey);
             if (this.options.attachments) {
-                const extractKeyFromUrl = (url) => url.replace(/^https:\/\/[^\/]+\/+/, '');
+                const stripQueryAndHash = (value) => value.split('#')[0].split('?')[0];
+                const extractKeyFromUrl = (url) => {
+                    // Supports absolute https/http URLs and protocol-relative URLs.
+                    // Returns the object key as a path without leading slashes.
+                    try {
+                        const normalized = url.startsWith('//') ? `https:${url}` : url;
+                        const u = new URL(normalized);
+                        return u.pathname.replace(/^\/+/, '');
+                    }
+                    catch (_a) {
+                        // Fallback: strip scheme/host if it looks like a URL, otherwise treat as a path.
+                        return stripQueryAndHash(url).replace(/^https?:\/\/[^\/]+\/+/, '').replace(/^\/+/, '');
+                    }
+                };
                 function getAttachmentMetas(markdown) {
                     var _a, _b, _c;
                     if (!markdown) {
                         return [];
                     }
                     // Minimal image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
-                    // We only track https URLs and only those that look like S3/AWS public URLs.
-                    const imageRegex = /!\[([^\]]*)\]\(\s*(https:\/\/[^\s)]+)\s*(?:\s+(?:"([^"]*)"|'([^']*)'))?\s*\)/g;
+                    // We track external (http/https) and relative sources, but skip data: URLs.
+                    const imageRegex = /!\[([^\]]*)\]\(\s*([^\s)]+)\s*(?:\s+(?:\"([^\"]*)\"|'([^']*)'))?\s*\)/g;
                     const byKey = new Map();
                     for (const match of markdown.matchAll(imageRegex)) {
                         const altRaw = (_a = match[1]) !== null && _a !== void 0 ? _a : '';
                         const srcRaw = match[2];
                         const titleRaw = (_c = ((_b = match[3]) !== null && _b !== void 0 ? _b : match[4])) !== null && _c !== void 0 ? _c : null;
-                        const srcNoQuery = srcRaw.split('?')[0];
-                        if (!srcNoQuery.includes('s3') && !srcNoQuery.includes('amazonaws')) {
+                        const srcTrimmed = srcRaw.trim().replace(/^<|>$/g, '');
+                        if (!srcTrimmed || srcTrimmed.startsWith('data:')) {
                             continue;
                         }
+                        const srcNoQuery = stripQueryAndHash(srcTrimmed);
                         const key = extractKeyFromUrl(srcNoQuery);
+                        if (!key) {
+                            continue;
+                        }
                         byKey.set(key, {
                             key,
                             alt: altRaw,

package/index.ts

@@ -122,7 +122,20 @@ export default class MarkdownPlugin extends AdminForthPlugin {
 
       type AttachmentMeta = { key: string; alt: string | null; title: string | null };
 
-      const extractKeyFromUrl = (url: string) => url.replace(/^https:\/\/[^\/]+\/+/, '');
+      const stripQueryAndHash = (value: string) => value.split('#')[0].split('?')[0];
+
+      const extractKeyFromUrl = (url: string) => {
+        // Supports absolute https/http URLs and protocol-relative URLs.
+        // Returns the object key as a path without leading slashes.
+        try {
+          const normalized = url.startsWith('//') ? `https:${url}` : url;
+          const u = new URL(normalized);
+          return u.pathname.replace(/^\/+/, '');
+        } catch {
+          // Fallback: strip scheme/host if it looks like a URL, otherwise treat as a path.
+          return stripQueryAndHash(url).replace(/^https?:\/\/[^\/]+\/+/, '').replace(/^\/+/, '');
+        }
+      };
 
       function getAttachmentMetas(markdown: string): AttachmentMeta[] {
         if (!markdown) {
@@ -130,8 +143,8 @@ export default class MarkdownPlugin extends AdminForthPlugin {
         }
 
         // Minimal image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
-        // We only track https URLs and only those that look like S3/AWS public URLs.
-        const imageRegex = /!\[([^\]]*)\]\(\s*(https:\/\/[^\s)]+)\s*(?:\s+(?:"([^"]*)"|'([^']*)'))?\s*\)/g;
+        // We track external (http/https) and relative sources, but skip data: URLs.
+        const imageRegex = /!\[([^\]]*)\]\(\s*([^\s)]+)\s*(?:\s+(?:\"([^\"]*)\"|'([^']*)'))?\s*\)/g;
 
         const byKey = new Map<string, AttachmentMeta>();
         for (const match of markdown.matchAll(imageRegex)) {
@@ -139,12 +152,16 @@ export default class MarkdownPlugin extends AdminForthPlugin {
           const srcRaw = match[2];
           const titleRaw = (match[3] ?? match[4]) ?? null;
 
-          const srcNoQuery = srcRaw.split('?')[0];
-          if (!srcNoQuery.includes('s3') && !srcNoQuery.includes('amazonaws')) {
+          const srcTrimmed = srcRaw.trim().replace(/^<|>$/g, '');
+          if (!srcTrimmed || srcTrimmed.startsWith('data:')) {
             continue;
           }
 
+          const srcNoQuery = stripQueryAndHash(srcTrimmed);
           const key = extractKeyFromUrl(srcNoQuery);
+          if (!key) {
+            continue;
+          }
           byKey.set(key, {
             key,
             alt: altRaw,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/markdown",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Markdown plugin for adminforth",
   "type": "module",
   "main": "dist/index.js",