@jrmc/adonis-attachment 3.2.1 → 3.2.3

package/build/src/attachment_manager.js

@@ -42,8 +42,8 @@ export class AttachmentManager {
     async createFromFile(input) {
         const attributes = {
             originalName: input.clientName,
-            extname: input.extname,
-            mimeType: `${input.type}/${input.subtype}`,
+            extname: input.extname || '',
+            mimeType: input.type && input.subtype ? `${input.type}/${input.subtype}` : '',
             size: input.size,
         };
         if (!input.tmpPath) {
@@ -142,15 +142,11 @@ export class AttachmentManager {
             await attachment.getDisk().delete(attachment.path);
             if (attachment instanceof Attachment) {
                 if (attachment.variants) {
-                    if (attachment.options?.disk == 'fs') {
-                        const variantPath = attachment.variants[0].folder;
-                        await attachment.getDisk().deleteAll(variantPath);
-                    }
-                    else {
-                        for (const key in attachment.variants) {
-                            if (Object.prototype.hasOwnProperty.call(attachment.variants, key)) {
-                                await attachment.getDisk().delete(attachment.variants[key].path);
-                            }
+                    const variantPath = attachment.variants[0].folder;
+                    await attachment.getDisk().deleteAll(variantPath); // not compatible Minio, necessary for fs as not to leave an empty directory
+                    for (const key in attachment.variants) {
+                        if (Object.prototype.hasOwnProperty.call(attachment.variants, key)) {
+                            await attachment.getDisk().delete(attachment.variants[key].path);
                         }
                     }
                 }

package/build/src/converter_manager.js

@@ -1,3 +1,4 @@
+import string from '@adonisjs/core/helpers/string';
 import db from '@adonisjs/lucid/services/db';
 import attachmentManager from '../services/main.js';
 import * as errors from './errors.js';
@@ -32,7 +33,7 @@ export class ConverterManager {
                 }
             }
         }
-        data[this.#attributeName] = JSON.stringify(attachment.toObject());
+        data[string.snakeCase(this.#attributeName)] = JSON.stringify(attachment.toObject());
         const trx = await db.transaction();
         trx.after('rollback', () => {
             for (const variant of attachment.variants) {

package/build/src/utils/actions.js

@@ -4,6 +4,7 @@
  * @license MIT
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
+import logger from '@adonisjs/core/services/logger';
 import attachmentManager from '../../services/main.js';
 import { getOptions } from './helpers.js';
 import { ConverterManager } from '../converter_manager.js';
@@ -75,16 +76,19 @@ export async function generateVariants(modelInstance, attributeName) {
     attachmentManager.queue.push({
         name: `${modelInstance.constructor.name}-${attributeName}`,
         async run() {
-            try {
-                const converterManager = new ConverterManager({
-                    record: modelInstance,
-                    attributeName,
-                });
-                await converterManager.save();
-            }
-            catch (err) {
-                throw new E_CANNOT_CREATE_VARIANT([err.message]);
-            }
+            const converterManager = new ConverterManager({
+                record: modelInstance,
+                attributeName,
+            });
+            await converterManager.save();
         },
-    });
+    })
+        .onError = function (error) {
+        if (error.message) {
+            logger.error(error.message);
+        }
+        else {
+            throw new E_CANNOT_CREATE_VARIANT([error]);
+        }
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jrmc/adonis-attachment",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "type": "module",
   "description": "Turn any field on your Lucid model to an attachment data type",
   "engines": {