@adminforth/markdown 1.3.0 → 1.5.0

package/dist/index.js

@@ -54,6 +54,18 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                 if (!field) {
                     throw new Error(`Field '${this.options.attachments.attachmentFieldName}' not found in resource '${this.options.attachments.attachmentResource}'`);
                 }
+                if (this.options.attachments.attachmentTitleFieldName) {
+                    const titleField = yield resource.columns.find(c => c.name === this.options.attachments.attachmentTitleFieldName);
+                    if (!titleField) {
+                        throw new Error(`Field '${this.options.attachments.attachmentTitleFieldName}' not found in resource '${this.options.attachments.attachmentResource}'`);
+                    }
+                }
+                if (this.options.attachments.attachmentAltFieldName) {
+                    const altField = yield resource.columns.find(c => c.name === this.options.attachments.attachmentAltFieldName);
+                    if (!altField) {
+                        throw new Error(`Field '${this.options.attachments.attachmentAltFieldName}' not found in resource '${this.options.attachments.attachmentResource}'`);
+                    }
+                }
                 const plugin = yield adminforth.activatedPlugins.find(p => p.resourceConfig.resourceId === this.options.attachments.attachmentResource &&
                     p.pluginOptions.pathColumnName === this.options.attachments.attachmentFieldName);
                 if (!plugin) {
@@ -99,36 +111,77 @@ export default class MarkdownPlugin extends AdminForthPlugin {
             };
             const editorRecordPkField = resourceConfig.columns.find(c => c.primaryKey);
             if (this.options.attachments) {
-                function getAttachmentPathes(markdown) {
+                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 [];
                     }
-                    const s3PathRegex = /!\[.*?\]\((https:\/\/.*?\/.*?)(\?.*)?\)/g;
-                    const matches = [...markdown.matchAll(s3PathRegex)];
-                    return matches
-                        .map(match => match[1])
-                        .filter(src => src.includes("s3") || src.includes("amazonaws"));
+                    // Minimal image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
+                    // 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 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,
+                            title: titleRaw,
+                        });
+                    }
+                    return [...byKey.values()];
                 }
-                const createAttachmentRecords = (adminforth, options, recordId, s3Paths, adminUser) => __awaiter(this, void 0, void 0, function* () {
-                    const extractKey = (s3Paths) => s3Paths.replace(/^https:\/\/[^\/]+\/+/, '');
+                const createAttachmentRecords = (adminforth, options, recordId, metas, adminUser) => __awaiter(this, void 0, void 0, function* () {
+                    if (!metas.length) {
+                        return;
+                    }
                     process.env.HEAVY_DEBUG && console.log('📸 Creating attachment records', JSON.stringify(recordId));
                     try {
-                        yield Promise.all(s3Paths.map((s3Path) => __awaiter(this, void 0, void 0, function* () {
-                            console.log('Processing path:', s3Path);
+                        yield Promise.all(metas.map((meta) => __awaiter(this, void 0, void 0, function* () {
                             try {
+                                const recordToCreate = {
+                                    [options.attachments.attachmentFieldName]: meta.key,
+                                    [options.attachments.attachmentRecordIdFieldName]: recordId,
+                                    [options.attachments.attachmentResourceIdFieldName]: resourceConfig.resourceId,
+                                };
+                                if (options.attachments.attachmentTitleFieldName) {
+                                    recordToCreate[options.attachments.attachmentTitleFieldName] = meta.title;
+                                }
+                                if (options.attachments.attachmentAltFieldName) {
+                                    recordToCreate[options.attachments.attachmentAltFieldName] = meta.alt;
+                                }
                                 yield adminforth.createResourceRecord({
                                     resource: this.attachmentResource,
-                                    record: {
-                                        [options.attachments.attachmentFieldName]: extractKey(s3Path),
-                                        [options.attachments.attachmentRecordIdFieldName]: recordId,
-                                        [options.attachments.attachmentResourceIdFieldName]: resourceConfig.resourceId,
-                                    },
+                                    record: recordToCreate,
                                     adminUser,
                                 });
-                                console.log('Successfully created record for:', s3Path);
                             }
                             catch (err) {
-                                console.error('Error creating record for', s3Path, err);
+                                console.error('Error creating record for', meta.key, err);
                             }
                         })));
                     }
@@ -136,12 +189,16 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                         console.error('Error in Promise.all', err);
                     }
                 });
-                const deleteAttachmentRecords = (adminforth, options, s3Paths, adminUser) => __awaiter(this, void 0, void 0, function* () {
-                    if (!s3Paths.length) {
+                const deleteAttachmentRecords = (adminforth, options, recordId, keys, adminUser) => __awaiter(this, void 0, void 0, function* () {
+                    if (!keys.length) {
                         return;
                     }
                     const attachmentPrimaryKeyField = this.attachmentResource.columns.find(c => c.primaryKey);
-                    const attachments = yield adminforth.resource(options.attachments.attachmentResource).list(Filters.IN(options.attachments.attachmentFieldName, s3Paths));
+                    const attachments = yield adminforth.resource(options.attachments.attachmentResource).list([
+                        Filters.EQ(options.attachments.attachmentRecordIdFieldName, recordId),
+                        Filters.EQ(options.attachments.attachmentResourceIdFieldName, resourceConfig.resourceId),
+                        Filters.IN(options.attachments.attachmentFieldName, keys),
+                    ]);
                     yield Promise.all(attachments.map((a) => __awaiter(this, void 0, void 0, function* () {
                         yield adminforth.deleteResourceRecord({
                             resource: this.attachmentResource,
@@ -151,12 +208,58 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                         });
                     })));
                 });
+                const updateAttachmentRecordsMetadata = (adminforth, options, recordId, metas, adminUser) => __awaiter(this, void 0, void 0, function* () {
+                    if (!metas.length) {
+                        return;
+                    }
+                    if (!options.attachments.attachmentTitleFieldName && !options.attachments.attachmentAltFieldName) {
+                        return;
+                    }
+                    const attachmentPrimaryKeyField = this.attachmentResource.columns.find(c => c.primaryKey);
+                    const metaByKey = new Map(metas.map(m => [m.key, m]));
+                    const existingAparts = yield adminforth.resource(options.attachments.attachmentResource).list([
+                        Filters.EQ(options.attachments.attachmentRecordIdFieldName, recordId),
+                        Filters.EQ(options.attachments.attachmentResourceIdFieldName, resourceConfig.resourceId)
+                    ]);
+                    yield Promise.all(existingAparts.map((a) => __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b, _c, _d;
+                        const key = a[options.attachments.attachmentFieldName];
+                        const meta = metaByKey.get(key);
+                        if (!meta) {
+                            return;
+                        }
+                        const patch = {};
+                        if (options.attachments.attachmentTitleFieldName) {
+                            const field = options.attachments.attachmentTitleFieldName;
+                            if (((_a = a[field]) !== null && _a !== void 0 ? _a : null) !== ((_b = meta.title) !== null && _b !== void 0 ? _b : null)) {
+                                patch[field] = meta.title;
+                            }
+                        }
+                        if (options.attachments.attachmentAltFieldName) {
+                            const field = options.attachments.attachmentAltFieldName;
+                            if (((_c = a[field]) !== null && _c !== void 0 ? _c : null) !== ((_d = meta.alt) !== null && _d !== void 0 ? _d : null)) {
+                                patch[field] = meta.alt;
+                            }
+                        }
+                        if (!Object.keys(patch).length) {
+                            return;
+                        }
+                        yield adminforth.updateResourceRecord({
+                            resource: this.attachmentResource,
+                            recordId: a[attachmentPrimaryKeyField.name],
+                            record: patch,
+                            oldRecord: a,
+                            adminUser,
+                        });
+                    })));
+                });
                 (resourceConfig.hooks.create.afterSave).push((_a) => __awaiter(this, [_a], void 0, function* ({ record, adminUser }) {
                     // find all s3Paths in the html
-                    const s3Paths = getAttachmentPathes(record[this.options.fieldName]);
-                    process.env.HEAVY_DEBUG && console.log('📸 Found s3Paths', s3Paths);
+                    const metas = getAttachmentMetas(record[this.options.fieldName]);
+                    const keys = metas.map(m => m.key);
+                    process.env.HEAVY_DEBUG && console.log('📸 Found attachment keys', keys);
                     // create attachment records
-                    yield createAttachmentRecords(adminforth, this.options, record[editorRecordPkField.name], s3Paths, adminUser);
+                    yield createAttachmentRecords(adminforth, this.options, record[editorRecordPkField.name], metas, adminUser);
                     return { ok: true };
                 }));
                 // after edit we need to delete attachments that are not in the html anymore
@@ -172,18 +275,22 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                         Filters.EQ(this.options.attachments.attachmentRecordIdFieldName, recordId),
                         Filters.EQ(this.options.attachments.attachmentResourceIdFieldName, resourceConfig.resourceId)
                     ]);
-                    const existingS3Paths = existingAparts.map((a) => a[this.options.attachments.attachmentFieldName]);
-                    const newS3Paths = getAttachmentPathes(record[this.options.fieldName]);
-                    process.env.HEAVY_DEBUG && console.log('📸 Existing s3Paths (from db)', existingS3Paths);
-                    process.env.HEAVY_DEBUG && console.log('📸 Found new s3Paths (from text)', newS3Paths);
-                    const toDelete = existingS3Paths.filter(s3Path => !newS3Paths.includes(s3Path));
-                    const toAdd = newS3Paths.filter(s3Path => !existingS3Paths.includes(s3Path));
-                    process.env.HEAVY_DEBUG && console.log('📸 Found s3Paths to delete', toDelete);
-                    process.env.HEAVY_DEBUG && console.log('📸 Found s3Paths to add', toAdd);
+                    const existingKeys = existingAparts.map((a) => a[this.options.attachments.attachmentFieldName]);
+                    const metas = getAttachmentMetas(record[this.options.fieldName]);
+                    const newKeys = metas.map(m => m.key);
+                    process.env.HEAVY_DEBUG && console.log('📸 Existing keys (from db)', existingKeys);
+                    process.env.HEAVY_DEBUG && console.log('📸 Found new keys (from text)', newKeys);
+                    const toDelete = existingKeys.filter(key => !newKeys.includes(key));
+                    const toAdd = newKeys.filter(key => !existingKeys.includes(key));
+                    process.env.HEAVY_DEBUG && console.log('📸 Found keys to delete', toDelete);
+                    process.env.HEAVY_DEBUG && console.log('📸 Found keys to add', toAdd);
+                    const metasToAdd = metas.filter(m => toAdd.includes(m.key));
                     yield Promise.all([
-                        deleteAttachmentRecords(adminforth, this.options, toDelete, adminUser),
-                        createAttachmentRecords(adminforth, this.options, recordId, toAdd, adminUser)
+                        deleteAttachmentRecords(adminforth, this.options, recordId, toDelete, adminUser),
+                        createAttachmentRecords(adminforth, this.options, recordId, metasToAdd, adminUser)
                     ]);
+                    // Keep alt/title in sync for existing attachments too
+                    yield updateAttachmentRecordsMetadata(adminforth, this.options, recordId, metas, adminUser);
                     return { ok: true };
                 }));
                 // after delete we need to delete all attachments
@@ -192,9 +299,9 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                         Filters.EQ(this.options.attachments.attachmentRecordIdFieldName, record[editorRecordPkField.name]),
                         Filters.EQ(this.options.attachments.attachmentResourceIdFieldName, resourceConfig.resourceId)
                     ]);
-                    const existingS3Paths = existingAparts.map((a) => a[this.options.attachments.attachmentFieldName]);
-                    process.env.HEAVY_DEBUG && console.log('📸 Found s3Paths to delete', existingS3Paths);
-                    yield deleteAttachmentRecords(adminforth, this.options, existingS3Paths, adminUser);
+                    const existingKeys = existingAparts.map((a) => a[this.options.attachments.attachmentFieldName]);
+                    process.env.HEAVY_DEBUG && console.log('📸 Found keys to delete', existingKeys);
+                    yield deleteAttachmentRecords(adminforth, this.options, record[editorRecordPkField.name], existingKeys, adminUser);
                     return { ok: true };
                 }));
             }

package/index.ts

@@ -52,6 +52,20 @@ export default class MarkdownPlugin extends AdminForthPlugin {
       if (!field) {
         throw new Error(`Field '${this.options.attachments!.attachmentFieldName}' not found in resource '${this.options.attachments!.attachmentResource}'`);
       }
+
+      if (this.options.attachments.attachmentTitleFieldName) {
+        const titleField = await resource.columns.find(c => c.name === this.options.attachments!.attachmentTitleFieldName);
+        if (!titleField) {
+          throw new Error(`Field '${this.options.attachments!.attachmentTitleFieldName}' not found in resource '${this.options.attachments!.attachmentResource}'`);
+        }
+      }
+
+      if (this.options.attachments.attachmentAltFieldName) {
+        const altField = await resource.columns.find(c => c.name === this.options.attachments!.attachmentAltFieldName);
+        if (!altField) {
+          throw new Error(`Field '${this.options.attachments!.attachmentAltFieldName}' not found in resource '${this.options.attachments!.attachmentResource}'`);
+        }
+      }
       
       const plugin = await adminforth.activatedPlugins.find(p => 
         p.resourceConfig!.resourceId === this.options.attachments!.attachmentResource && 
@@ -106,43 +120,91 @@ export default class MarkdownPlugin extends AdminForthPlugin {
     const editorRecordPkField = resourceConfig.columns.find(c => c.primaryKey);
     if (this.options.attachments) {
 
-      function getAttachmentPathes(markdown: string): string[] {
+      type AttachmentMeta = { key: string; alt: string | null; title: string | null };
+
+      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) {
           return [];
         }
 
-        const s3PathRegex = /!\[.*?\]\((https:\/\/.*?\/.*?)(\?.*)?\)/g;
-      
-        const matches = [...markdown.matchAll(s3PathRegex)];
+        // Minimal image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
+        // We track external (http/https) and relative sources, but skip data: URLs.
+        const imageRegex = /!\[([^\]]*)\]\(\s*([^\s)]+)\s*(?:\s+(?:\"([^\"]*)\"|'([^']*)'))?\s*\)/g;
 
-        return matches
-          .map(match => match[1])
-          .filter(src => src.includes("s3") || src.includes("amazonaws"));
+        const byKey = new Map<string, AttachmentMeta>();
+        for (const match of markdown.matchAll(imageRegex)) {
+          const altRaw = match[1] ?? '';
+          const srcRaw = match[2];
+          const titleRaw = (match[3] ?? match[4]) ?? null;
+
+          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,
+            title: titleRaw,
+          });
+        }
+        return [...byKey.values()];
       }
 
       const createAttachmentRecords = async (
-        adminforth: IAdminForth, options: PluginOptions, recordId: any, s3Paths: string[], adminUser: AdminUser
+        adminforth: IAdminForth,
+        options: PluginOptions,
+        recordId: any,
+        metas: AttachmentMeta[],
+        adminUser: AdminUser
       ) => {
-        const extractKey = (s3Paths: string) => s3Paths.replace(/^https:\/\/[^\/]+\/+/, '');
+        if (!metas.length) {
+          return;
+        }
         process.env.HEAVY_DEBUG && console.log('📸 Creating attachment records', JSON.stringify(recordId))
         try {
-          await Promise.all(s3Paths.map(async (s3Path) => {
-            console.log('Processing path:', s3Path);
+          await Promise.all(metas.map(async (meta) => {
             try {
-              await adminforth.createResourceRecord(
-                {
-                  resource: this.attachmentResource,
-                  record: {
-                    [options.attachments.attachmentFieldName]: extractKey(s3Path),
-                    [options.attachments.attachmentRecordIdFieldName]: recordId,
-                    [options.attachments.attachmentResourceIdFieldName]: resourceConfig.resourceId,
-                  },
-                  adminUser,
-                }
-              );
-              console.log('Successfully created record for:', s3Path);
+              const recordToCreate: any = {
+                [options.attachments.attachmentFieldName]: meta.key,
+                [options.attachments.attachmentRecordIdFieldName]: recordId,
+                [options.attachments.attachmentResourceIdFieldName]: resourceConfig.resourceId,
+              };
+
+              if (options.attachments.attachmentTitleFieldName) {
+                recordToCreate[options.attachments.attachmentTitleFieldName] = meta.title;
+              }
+              if (options.attachments.attachmentAltFieldName) {
+                recordToCreate[options.attachments.attachmentAltFieldName] = meta.alt;
+              }
+
+              await adminforth.createResourceRecord({
+                resource: this.attachmentResource,
+                record: recordToCreate,
+                adminUser,
+              });
             } catch (err) {
-              console.error('Error creating record for', s3Path, err);
+              console.error('Error creating record for', meta.key, err);
             }
           }));
         } catch (err) {
@@ -151,35 +213,95 @@ export default class MarkdownPlugin extends AdminForthPlugin {
       }
 
       const deleteAttachmentRecords = async (
-        adminforth: IAdminForth, options: PluginOptions, s3Paths: string[], adminUser: AdminUser
+        adminforth: IAdminForth,
+        options: PluginOptions,
+        recordId: any,
+        keys: string[],
+        adminUser: AdminUser
       ) => {
-        if (!s3Paths.length) {
+        if (!keys.length) {
           return;
         }
         const attachmentPrimaryKeyField = this.attachmentResource.columns.find(c => c.primaryKey);
-        const attachments = await adminforth.resource(options.attachments.attachmentResource).list(
-          Filters.IN(options.attachments.attachmentFieldName, s3Paths)
-        );
+        const attachments = await adminforth.resource(options.attachments.attachmentResource).list([
+          Filters.EQ(options.attachments.attachmentRecordIdFieldName, recordId),
+          Filters.EQ(options.attachments.attachmentResourceIdFieldName, resourceConfig.resourceId),
+          Filters.IN(options.attachments.attachmentFieldName, keys),
+        ]);
+
         await Promise.all(attachments.map(async (a: any) => {
-          await adminforth.deleteResourceRecord(
-            {
-              resource: this.attachmentResource,
-              recordId: a[attachmentPrimaryKeyField.name],
-              adminUser,
-              record: a,
-            }
-          )
+          await adminforth.deleteResourceRecord({
+            resource: this.attachmentResource,
+            recordId: a[attachmentPrimaryKeyField.name],
+            adminUser,
+            record: a,
+          })
         }))
       }
+
+      const updateAttachmentRecordsMetadata = async (
+        adminforth: IAdminForth,
+        options: PluginOptions,
+        recordId: any,
+        metas: AttachmentMeta[],
+        adminUser: AdminUser
+      ) => {
+        if (!metas.length) {
+          return;
+        }
+        if (!options.attachments.attachmentTitleFieldName && !options.attachments.attachmentAltFieldName) {
+          return;
+        }
+        const attachmentPrimaryKeyField = this.attachmentResource.columns.find(c => c.primaryKey);
+        const metaByKey = new Map(metas.map(m => [m.key, m] as const));
+
+        const existingAparts = await adminforth.resource(options.attachments.attachmentResource).list([
+          Filters.EQ(options.attachments.attachmentRecordIdFieldName, recordId),
+          Filters.EQ(options.attachments.attachmentResourceIdFieldName, resourceConfig.resourceId)
+        ]);
+
+        await Promise.all(existingAparts.map(async (a: any) => {
+          const key = a[options.attachments.attachmentFieldName];
+          const meta = metaByKey.get(key);
+          if (!meta) {
+            return;
+          }
+
+          const patch: any = {};
+          if (options.attachments.attachmentTitleFieldName) {
+            const field = options.attachments.attachmentTitleFieldName;
+            if ((a[field] ?? null) !== (meta.title ?? null)) {
+              patch[field] = meta.title;
+            }
+          }
+          if (options.attachments.attachmentAltFieldName) {
+            const field = options.attachments.attachmentAltFieldName;
+            if ((a[field] ?? null) !== (meta.alt ?? null)) {
+              patch[field] = meta.alt;
+            }
+          }
+          if (!Object.keys(patch).length) {
+            return;
+          }
+
+          await adminforth.updateResourceRecord({
+            resource: this.attachmentResource,
+            recordId: a[attachmentPrimaryKeyField.name],
+            record: patch,
+            oldRecord: a,
+            adminUser,
+          });
+        }));
+      }
       
       (resourceConfig.hooks.create.afterSave).push(async ({ record, adminUser }: { record: any, adminUser: AdminUser }) => {
         // find all s3Paths in the html
-        const s3Paths = getAttachmentPathes(record[this.options.fieldName])
-        
-        process.env.HEAVY_DEBUG && console.log('📸 Found s3Paths', s3Paths);
+        const metas = getAttachmentMetas(record[this.options.fieldName]);
+        const keys = metas.map(m => m.key);
+        process.env.HEAVY_DEBUG && console.log('📸 Found attachment keys', keys);
         // create attachment records
         await createAttachmentRecords(
-          adminforth, this.options, record[editorRecordPkField.name], s3Paths, adminUser);
+          adminforth, this.options, record[editorRecordPkField.name], metas, adminUser);
 
         return { ok: true };
       });
@@ -198,19 +320,29 @@ export default class MarkdownPlugin extends AdminForthPlugin {
             Filters.EQ(this.options.attachments.attachmentRecordIdFieldName, recordId),
             Filters.EQ(this.options.attachments.attachmentResourceIdFieldName, resourceConfig.resourceId)
           ]);
-          const existingS3Paths = existingAparts.map((a: any) => a[this.options.attachments.attachmentFieldName]);
-          const newS3Paths = getAttachmentPathes(record[this.options.fieldName]);
-          process.env.HEAVY_DEBUG && console.log('📸 Existing s3Paths (from db)', existingS3Paths)
-          process.env.HEAVY_DEBUG && console.log('📸 Found new s3Paths (from text)', newS3Paths);
-          const toDelete = existingS3Paths.filter(s3Path => !newS3Paths.includes(s3Path));
-          const toAdd = newS3Paths.filter(s3Path => !existingS3Paths.includes(s3Path));
-          process.env.HEAVY_DEBUG && console.log('📸 Found s3Paths to delete', toDelete)
-          process.env.HEAVY_DEBUG && console.log('📸 Found s3Paths to add', toAdd);
+          const existingKeys = existingAparts.map((a: any) => a[this.options.attachments.attachmentFieldName]);
+
+          const metas = getAttachmentMetas(record[this.options.fieldName]);
+          const newKeys = metas.map(m => m.key);
+
+          process.env.HEAVY_DEBUG && console.log('📸 Existing keys (from db)', existingKeys)
+          process.env.HEAVY_DEBUG && console.log('📸 Found new keys (from text)', newKeys);
+
+          const toDelete = existingKeys.filter(key => !newKeys.includes(key));
+          const toAdd = newKeys.filter(key => !existingKeys.includes(key));
+
+          process.env.HEAVY_DEBUG && console.log('📸 Found keys to delete', toDelete)
+          process.env.HEAVY_DEBUG && console.log('📸 Found keys to add', toAdd);
+
+          const metasToAdd = metas.filter(m => toAdd.includes(m.key));
           await Promise.all([
-            deleteAttachmentRecords(adminforth, this.options, toDelete, adminUser),
-            createAttachmentRecords(adminforth, this.options, recordId, toAdd, adminUser)
+            deleteAttachmentRecords(adminforth, this.options, recordId, toDelete, adminUser),
+            createAttachmentRecords(adminforth, this.options, recordId, metasToAdd, adminUser)
           ]);
 
+          // Keep alt/title in sync for existing attachments too
+          await updateAttachmentRecordsMetadata(adminforth, this.options, recordId, metas, adminUser);
+
           return { ok: true };
 
         }
@@ -225,9 +357,9 @@ export default class MarkdownPlugin extends AdminForthPlugin {
               Filters.EQ(this.options.attachments.attachmentResourceIdFieldName, resourceConfig.resourceId)
             ]
           );
-          const existingS3Paths = existingAparts.map((a: any) => a[this.options.attachments.attachmentFieldName]);
-          process.env.HEAVY_DEBUG && console.log('📸 Found s3Paths to delete', existingS3Paths);
-          await deleteAttachmentRecords(adminforth, this.options, existingS3Paths, adminUser);
+          const existingKeys = existingAparts.map((a: any) => a[this.options.attachments.attachmentFieldName]);
+          process.env.HEAVY_DEBUG && console.log('📸 Found keys to delete', existingKeys);
+          await deleteAttachmentRecords(adminforth, this.options, record[editorRecordPkField.name], existingKeys, adminUser);
 
           return { ok: true };
         }

package/package.json

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

package/types.ts

@@ -38,5 +38,19 @@ export interface PluginOptions {
      * Why we force to store and ask for resource id if we already have record id? Because in amny use cases attachments resource is shared between multiple resources, and record id might be not be unique across resources, but resource id + record id will be always unique.
      */
     attachmentResourceIdFieldName: string; // e.g. 'apartment_resource_id',
+
+    /**
+     * Optional: field name in attachment resource where title of image will be stored.
+     * When in markdown title of image is mentioned e.g. ![alt](image.jpg "title"), it will be parsed and stored in attachment resource. 
+     * If you will update title in markdown, it will be updated in attachment resource as well.
+     */
+    attachmentTitleFieldName?: string; // e.g. 'title',
+
+    /**
+     * Optional: field name in attachment resource where alt of image will be stored.
+     * When in markdown alt of image is mentioned e.g. ![alt](image.jpg), it will be parsed and stored in attachment resource.
+     * If you will update alt in markdown, it will be updated in attachment resource as well.
+     */
+    attachmentAltFieldName?: string; // e.g. 'alt',
   },
 }